From ff63132a32ed7bcfe52e51847dbd7efec64a3f43 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 28 Dec 2019 14:37:52 +0000 Subject: pubstream: use search mode for tag filter view and add a title --- Zotlabs/Module/Pubstream.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Zotlabs/Module/Pubstream.php') diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index 84ac42f72..282c10989 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -62,6 +62,11 @@ class Pubstream extends \Zotlabs\Web\Controller { $static = ((array_key_exists('static',$_REQUEST)) ? intval($_REQUEST['static']) : 0); $net = ((array_key_exists('net',$_REQUEST)) ? escape_tags($_REQUEST['net']) : ''); + $title = replace_macros(get_markup_template("section_title.tpl"),array( + '$title' => (($hashtags) ? '#' . htmlspecialchars($hashtags, ENT_COMPAT,'UTF-8') : '') + )); + + $o = (($hashtags) ? $title : ''); if(local_channel() && (! $update)) { @@ -94,7 +99,7 @@ class Pubstream extends \Zotlabs\Web\Controller { 'reset' => t('Reset form') ); - $o = '
'; + $o .= '
'; $o .= status_editor($a,$x,false,'Pubstream'); $o .= '
'; } @@ -285,7 +290,7 @@ class Pubstream extends \Zotlabs\Web\Controller { } // fake it - $mode = ('pubstream'); + $mode = (($hashtags) ? 'search' : 'pubstream'); $o .= conversation($items,$mode,$update,$page_mode); -- cgit v1.2.3 From 2a0a06d74aa1e51b0e50459f90167ab35ba1411b Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 15 Jan 2020 21:43:47 +0000 Subject: some work on zot6 DMs --- Zotlabs/Module/Pubstream.php | 1 + 1 file changed, 1 insertion(+) (limited to 'Zotlabs/Module/Pubstream.php') diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index 282c10989..92ef44696 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -144,6 +144,7 @@ class Pubstream extends \Zotlabs\Web\Controller { '$conv' => '0', '$spam' => '0', '$fh' => '1', + '$dm' => '0', '$nouveau' => '0', '$wall' => '0', '$list' => '0', -- cgit v1.2.3 From 634a515ec15baff240a2e41603d576c1c5dc88c7 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 14 Jul 2020 12:43:34 +0000 Subject: reduce result sets and work around a regression in justifiedGallery --- Zotlabs/Module/Pubstream.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zotlabs/Module/Pubstream.php') diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index 92ef44696..76a3e0d9e 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -169,7 +169,7 @@ class Pubstream extends \Zotlabs\Web\Controller { $pager_sql = ''; } else { - \App::set_pager_itemspage(20); + \App::set_pager_itemspage(10); $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start'])); } -- cgit v1.2.3 From 96de38a1f06193d674f8fe89cb1852e0e4abb4cf Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 22 Oct 2020 11:33:25 +0000 Subject: adapt notifications and mark item seen handling to play well with client side page caching --- Zotlabs/Module/Pubstream.php | 1 - 1 file changed, 1 deletion(-) (limited to 'Zotlabs/Module/Pubstream.php') diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index 76a3e0d9e..55c96b23d 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -264,7 +264,6 @@ class Pubstream extends \Zotlabs\Web\Controller { // Then fetch all the children of the parents that are on this page $parents_str = ''; - $update_unseen = ''; if($r) { -- cgit v1.2.3