From 4d15cc01e28a3a76f92cdb686d1766bd4ddc29fd Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 13 Oct 2020 00:23:17 -0400 Subject: [PATCH] Move network module to src/ - Update ForumManager to use a base URL - Split network module into Conversation\Network and Search\Filed modules - Implement boundaries pager in network module - Allow no selection in filter widgets --- include/conversation.php | 4 +- src/Content/ForumManager.php | 9 +- src/Module/Conversation/Network.php | 445 ++++++++++++++++++++++++++++ src/Module/Search/Filed.php | 85 ++++++ src/Module/Update/Network.php | 61 ++++ static/routes.config.php | 10 + view/templates/widget/filter.tpl | 2 +- 7 files changed, 609 insertions(+), 7 deletions(-) create mode 100644 src/Module/Conversation/Network.php create mode 100644 src/Module/Search/Filed.php create mode 100644 src/Module/Update/Network.php diff --git a/include/conversation.php b/include/conversation.php index a0d1177c3b..7eda2277ba 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -501,7 +501,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o $writable = false; } - if (in_array($mode, ['network-new', 'search', 'contact-posts'])) { + if (in_array($mode, ['filed', 'search', 'contact-posts'])) { /* * "New Item View" on network page or search page results @@ -548,7 +548,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o $location_html = $locate['html'] ?: Strings::escapeHtml($locate['location'] ?: $locate['coord'] ?: ''); localize_item($item); - if ($mode === 'network-new') { + if ($mode === 'filed') { $dropping = true; } else { $dropping = false; diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php index 980e82522c..c25753a84f 100644 --- a/src/Content/ForumManager.php +++ b/src/Content/ForumManager.php @@ -99,13 +99,14 @@ class ForumManager * Sidebar widget to show subcribed friendica forums. If activated * in the settings, it appears at the notwork page sidebar * - * @param int $uid The ID of the User - * @param int $cid The contact id which is used to mark a forum as "selected" + * @param string $baseurl Base module path + * @param int $uid The ID of the User + * @param int $cid The contact id which is used to mark a forum as "selected" * @return string * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function widget($uid, $cid = 0) + public static function widget(string $baseurl, int $uid, int $cid = 0) { $o = ''; @@ -125,7 +126,7 @@ class ForumManager $selected = (($cid == $contact['id']) ? ' forum-selected' : ''); $entry = [ - 'url' => 'network?contactid=' . $contact['id'], + 'url' => $baseurl . '/' . $contact['id'], 'external_url' => Contact::magicLink($contact['url']), 'name' => $contact['name'], 'cid' => $contact['id'], diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php new file mode 100644 index 0000000000..ab3e917ee5 --- /dev/null +++ b/src/Module/Conversation/Network.php @@ -0,0 +1,445 @@ +getQueryString()); + DI::page()['aside'] .= Widget::fileAs('filed', null); + + $arr = ['query' => DI::args()->getQueryString()]; + Hook::callAll('network_content_init', $arr); + + $o = ''; + + // Fetch a page full of parent items for this page + $params = ['limit' => self::$itemsPerPage]; + $table = 'network-thread-view'; + + $items = self::getItems($table, $params); + + if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll') && ($_GET['mode'] ?? '') != 'minimal') { + $tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl'); + $o .= Renderer::replaceMacros($tpl, ['$reload_uri' => DI::args()->getQueryString()]); + } + + if (!(isset($_GET['mode']) AND ($_GET['mode'] == 'raw'))) { + $o .= self::getTabsHTML(self::$selectedTab); + + Nav::setSelected(DI::args()->get(0)); + + $content = ''; + + if (self::$forumContactId) { + // If self::$forumContactId belongs to a communitity forum or a privat goup,.add a mention to the status editor + $condition = ["`id` = ? AND (`forum` OR `prv`)", self::$forumContactId]; + $contact = DBA::selectFirst('contact', ['addr'], $condition); + if (!empty($contact['addr'])) { + $content = '!' . $contact['addr']; + } + } + + $a = DI::app(); + + $default_permissions = []; + if (self::$groupId) { + $default_permissions['allow_gid'] = [self::$groupId]; + } + + $allowedCids = []; + if (self::$forumContactId) { + $allowedCids[] = (int) self::$forumContactId; + } elseif (self::$network) { + $condition = [ + 'uid' => local_user(), + 'network' => self::$network, + 'self' => false, + 'blocked' => false, + 'pending' => false, + 'archive' => false, + 'rel' => [Contact::SHARING, Contact::FRIEND], + ]; + $contactStmt = DBA::select('contact', ['id'], $condition); + while ($contact = DBA::fetch($contactStmt)) { + $allowedCids[] = (int) $contact['id']; + } + DBA::close($contactStmt); + } + + if (count($allowedCids)) { + $default_permissions['allow_cid'] = $allowedCids; + } + + $x = [ + 'is_owner' => true, + 'allow_location' => $a->user['allow_location'], + 'default_location' => $a->user['default-location'], + 'nickname' => $a->user['nickname'], + 'lockstate' => (self::$groupId || self::$forumContactId || self::$network || (is_array($a->user) && + (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) || + strlen($a->user['deny_cid']) || strlen($a->user['deny_gid']))) ? 'lock' : 'unlock'), + 'default_perms' => ACL::getDefaultUserPermissions($a->user), + 'acl' => ACL::getFullSelectorHTML(DI::page(), $a->user, true, $default_permissions), + 'bang' => ((self::$groupId || self::$forumContactId || self::$network) ? '!' : ''), + 'visitor' => 'block', + 'profile_uid' => local_user(), + 'content' => $content, + ]; + + $o .= status_editor($a, $x); + } + + if (self::$groupId) { + $group = DBA::selectFirst('group', ['name'], ['id' => self::$groupId, 'uid' => local_user()]); + if (!DBA::isResult($group)) { + notice(DI::l10n()->t('No such group')); + } + + $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), [ + '$title' => DI::l10n()->t('Group: %s', $group['name']) + ]) . $o; + } elseif (self::$forumContactId) { + $contact = Contact::getById(self::$forumContactId); + if (DBA::isResult($contact)) { + $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('viewcontact_template.tpl'), [ + 'contacts' => [ModuleContact::getContactTemplateVars($contact)], + 'id' => DI::args()->get(0), + ]) . $o; + } else { + notice(DI::l10n()->t('Invalid contact.')); + } + } elseif (!DI::config()->get('theme', 'hide_eventlist')) { + $o .= Profile::getBirthdays(); + $o .= Profile::getEventsReminderHTML(); + } + + if (self::$order === 'received') { + $ordering = '`received`'; + } else { + $ordering = '`commented`'; + } + + $o .= conversation(DI::app(), $items, 'network', false, false, $ordering, local_user()); + + if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) { + $o .= HTML::scrollLoader(); + } else { + $pager = new BoundariesPager( + DI::l10n(), + DI::args()->getQueryString(), + $items[0][self::$order], + $items[count($items) - 1][self::$order], + self::$itemsPerPage + ); + + $o .= $pager->renderMinimal(count($items)); + } + + return $o; + } + + /** + * Sets items as seen + * + * @param array $condition The array with the SQL condition + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + */ + private static function setItemsSeenByCondition(array $condition) + { + if (empty($condition)) { + return; + } + + $unseen = Item::exists($condition); + + if ($unseen) { + Item::update(['unseen' => false], $condition); + } + } + + /** + * Get the network tabs menu + * + * @param string $selectedTab + * @return string Html of the network tabs + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + */ + private static function getTabsHTML(string $selectedTab) + { + $cmd = DI::args()->getCommand(); + + // tabs + $tabs = [ + [ + 'label' => DI::l10n()->t('Latest Activity'), + 'url' => $cmd . '?' . http_build_query(['order' => 'commented']), + 'sel' => !$selectedTab || $selectedTab == 'commented' ? 'active' : '', + 'title' => DI::l10n()->t('Sort by latest activity'), + 'id' => 'activity-order-tab', + 'accesskey' => 'e', + ], + [ + 'label' => DI::l10n()->t('Latest Posts'), + 'url' => $cmd . '?' . http_build_query(['order' => 'received']), + 'sel' => $selectedTab == 'received' ? 'active' : '', + 'title' => DI::l10n()->t('Sort by post received date'), + 'id' => 'post-order-tab', + 'accesskey' => 't', + ], + [ + 'label' => DI::l10n()->t('Personal'), + 'url' => $cmd . '?' . http_build_query(['mention' => true]), + 'sel' => $selectedTab == 'mention' ? 'active' : '', + 'title' => DI::l10n()->t('Posts that mention or involve you'), + 'id' => 'personal-tab', + 'accesskey' => 'r', + ], + [ + 'label' => DI::l10n()->t('Starred'), + 'url' => $cmd . '?' . http_build_query(['star' => true]), + 'sel' => $selectedTab == 'star' ? 'active' : '', + 'title' => DI::l10n()->t('Favourite Posts'), + 'id' => 'starred-posts-tab', + 'accesskey' => 'm', + ], + ]; + + $arr = ['tabs' => $tabs]; + Hook::callAll('network_tabs', $arr); + + $tpl = Renderer::getMarkupTemplate('common_tabs.tpl'); + + return Renderer::replaceMacros($tpl, ['$tabs' => $arr['tabs']]); + } + + protected static function parseRequest(array $parameters, array $get) + { + self::$groupId = $parameters['group_id'] ?? 0; + + self::$forumContactId = $parameters['contact_id'] ?? 0; + + self::$selectedTab = DI::pConfig()->get(local_user(), 'network.view', 'selected_tab', ''); + + if (!empty($get['star'])) { + self::$selectedTab = 'star'; + } + + if (!empty($get['mention'])) { + self::$selectedTab = 'mention'; + } + + if (!empty($get['order'])) { + self::$selectedTab = $get['order']; + } + + DI::pConfig()->set(local_user(), 'network.view', 'selected_tab', self::$selectedTab); + + self::$star = intval($get['star'] ?? 0); + self::$mention = intval($_GET['mention'] ?? 0); + self::$order = in_array(self::$selectedTab, ['received', 'commented', 'created', 'uriid']) ? self::$selectedTab : 'commented'; + + self::$accountType = User::getAccountTypeByString($parameters['accounttype'] ?? '') ?? ''; + + self::$network = $get['nets'] ?? ''; + + self::$dateFrom = $parameters['from'] ?? ''; + self::$dateTo = $parameters['to'] ?? ''; + + if (DI::mode()->isMobile()) { + self::$itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network', + DI::config()->get('system', 'itemspage_network_mobile')); + } else { + self::$itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_network', + DI::config()->get('system', 'itemspage_network')); + } + + self::$min_id = $_GET['min_id'] ?? null; + self::$max_id = $_GET['max_id'] ?? null; + + switch (self::$selectedTab) { + case 'received': + self::$max_id = $_GET['last_received'] ?? self::$max_id; + break; + case 'commented': + self::$max_id = $_GET['last_commented'] ?? self::$max_id; + break; + case 'created': + self::$max_id = $_GET['last_created'] ?? self::$max_id; + break; + case 'uriid': + self::$max_id = $_GET['last_uriid'] ?? self::$max_id; + break; + } + } + + protected static function getItems(string $table, array $params, array $conditionFields = []) + { + $conditionFields['uid'] = local_user(); + $conditionStrings = []; + + if (self::$accountType) { + $conditionFields['contact-type'] = self::$accountType; + } + + if (self::$star) { + $conditionFields['starred'] = true; + } + if (self::$mention) { + $conditionFields['mention'] = true; + } + if (self::$network) { + $conditionFields['network'] = self::$network; + } + + if (self::$dateFrom) { + $conditionStrings = DBA::mergeConditions($conditionStrings, ["`received` <= ? ", DateTimeFormat::convert(self::$dateFrom, 'UTC', date_default_timezone_get())]); + } + if (self::$dateTo) { + $conditionStrings = DBA::mergeConditions($conditionStrings, ["`received` >= ? ", DateTimeFormat::convert(self::$dateTo, 'UTC', date_default_timezone_get())]); + } + + if (self::$groupId) { + $conditionStrings = DBA::mergeConditions($conditionStrings, ["`contact-id` IN (SELECT `contact-id` FROM `group_member` WHERE `gid` = ?)", self::$groupId]); + } elseif (self::$forumContactId) { + $conditionFields['contact-id'] = self::$forumContactId; + } + + // Currently only the order modes "received" and "commented" are in use + if (isset(self::$max_id)) { + switch (self::$order) { + case 'received': + $conditionStrings = DBA::mergeConditions($conditionStrings, ["`received` < ?", self::$max_id]); + break; + case 'commented': + $conditionStrings = DBA::mergeConditions($conditionStrings, ["`commented` < ?", self::$max_id]); + break; + case 'created': + $conditionStrings = DBA::mergeConditions($conditionStrings, ["`created` < ?", self::$max_id]); + break; + case 'uriid': + $conditionStrings = DBA::mergeConditions($conditionStrings, ["`uri-id` < ?", self::$max_id]); + break; + } + } + + if (isset(self::$min_id)) { + switch (self::$order) { + case 'received': + $conditionStrings = DBA::mergeConditions($conditionStrings, ["`received` > ?", self::$min_id]); + break; + case 'commented': + $conditionStrings = DBA::mergeConditions($conditionStrings, ["`commented` > ?", self::$min_id]); + break; + case 'created': + $conditionStrings = DBA::mergeConditions($conditionStrings, ["`created` > ?", self::$min_id]); + break; + case 'uriid': + $conditionStrings = DBA::mergeConditions($conditionStrings, ["`uri-id` > ?", self::$min_id]); + break; + } + } + + if (isset(self::$min_id) && !isset(self::$max_id)) { + // min_id quirk: querying in reverse order with min_id gets the most recent rows, regardless of how close + // they are to min_id. We change the query ordering to get the expected data, and we need to reverse the + // order of the results. + $params['order'] = [self::$order => false]; + } else { + $params['order'] = [self::$order => true]; + } + + $items = DBA::selectToArray($table, [], DBA::mergeConditions($conditionFields, $conditionStrings), $params); + + // min_id quirk, continued + if (isset(self::$min_id) && !isset(self::$max_id)) { + $items = array_reverse($items); + } + + $parents_str = ''; + if (DBA::isResult($items)) { + $parents_arr = []; + + foreach ($items as $item) { + if (!in_array($item['parent'], $parents_arr) && ($item['parent'] > 0)) { + $parents_arr[] = $item['parent']; + } + } + $parents_str = implode(', ', $parents_arr); + } + + // We aren't going to try and figure out at the item, group, and page + // level which items you've seen and which you haven't. If you're looking + // at the top level network page just mark everything seen. + if (!self::$groupId && !self::$forumContactId && self::$selectedTab != 'star') { + $condition = ['unseen' => true, 'uid' => local_user()]; + self::setItemsSeenByCondition($condition); + } elseif ($parents_str) { + $condition = ["`uid` = ? AND `unseen` AND `parent` IN (" . DBA::escape($parents_str) . ")", local_user()]; + self::setItemsSeenByCondition($condition); + } + + return $items; + } +} diff --git a/src/Module/Search/Filed.php b/src/Module/Search/Filed.php new file mode 100644 index 0000000000..505950f715 --- /dev/null +++ b/src/Module/Search/Filed.php @@ -0,0 +1,85 @@ +getCommand(), $_GET['file'] ?? ''); + + if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll') && ($_GET['mode'] ?? '') != 'minimal') { + $tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl'); + $o = Renderer::replaceMacros($tpl, ['$reload_uri' => DI::args()->getQueryString()]); + } else { + $o = ''; + } + + $file = $_GET['file'] ?? ''; + + // Rawmode is used for fetching new content at the end of the page + if (!(isset($_GET['mode']) && ($_GET['mode'] == 'raw'))) { + Nav::setSelected(DI::args()->get(0)); + } + + if (DI::mode()->isMobile()) { + $itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network', + DI::config()->get('system', 'itemspage_network_mobile')); + } else { + $itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_network', + DI::config()->get('system', 'itemspage_network')); + } + + $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemspage_network); + + $term_condition = ['type' => Category::FILE, 'uid' => local_user()]; + if ($file) { + $term_condition['name'] = $file; + } + $term_params = ['order' => ['uri-id' => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]]; + $result = DBA::select('category-view', ['uri-id'], $term_condition, $term_params); + + $total = DBA::count('category-view', $term_condition); + + $posts = []; + while ($term = DBA::fetch($result)) { + $posts[] = $term['uri-id']; + } + DBA::close($result); + + if (count($posts) == 0) { + return ''; + } + $item_condition = ['uid' => local_user(), 'uri-id' => $posts]; + $item_params = ['order' => ['uri-id' => true]]; + + $result = Item::selectForUser(local_user(), [], $item_condition, $item_params); + $items = Item::inArray($result); + + $o .= conversation(DI::app(), $items, 'filed', false, false, '', local_user()); + + if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) { + $o .= HTML::scrollLoader(); + } else { + $o .= $pager->renderFull($total); + } + + return $o; + } +} diff --git a/src/Module/Update/Network.php b/src/Module/Update/Network.php new file mode 100644 index 0000000000..81bdf834e4 --- /dev/null +++ b/src/Module/Update/Network.php @@ -0,0 +1,61 @@ +get($profile_uid, 'system', 'no_auto_update') || ($_GET['force'] == 1)) { + if (!empty($_GET['item'])) { + $item = Item::selectFirst(['parent'], ['id' => $_GET['item']]); + $parent = $item['parent'] ?? 0; + } else { + $parent = 0; + } + + $conditionFields = []; + if (!empty($parent)) { + // Load only a single thread + $conditionFields['parent'] = $parent; + } elseif (self::$order === 'received') { + // Only load new toplevel posts + $conditionFields['unseen'] = true; + $conditionFields['gravity'] = GRAVITY_PARENT; + } else { + // Load all unseen items + $conditionFields['unseen'] = true; + } + + $params = ['limit' => 100]; + $table = 'network-item-view'; + + $items = self::getItems($table, $params, $conditionFields); + + if (self::$order === 'received') { + $ordering = '`received`'; + } else { + $ordering = '`commented`'; + } + + $o = conversation(DI::app(), $items, 'network', $profile_uid, false, $ordering, local_user()); + } + + System::htmlUpdateExit($o); + } +} diff --git a/static/routes.config.php b/static/routes.config.php index 6f48500063..13025d5426 100644 --- a/static/routes.config.php +++ b/static/routes.config.php @@ -164,6 +164,7 @@ return [ '/status_message/{guid}' => [Module\Diaspora\Fetch::class, [R::GET]], '/reshare/{guid}' => [Module\Diaspora\Fetch::class, [R::GET]], ], + '/filed' => [Module\Search\Filed::class, [R::GET]], '/filer[/{id:\d+}]' => [Module\Filer\SaveTag::class, [R::GET]], '/filerm/{id:\d+}' => [Module\Filer\RemoveTag::class, [R::GET]], '/follow_confirm' => [Module\FollowConfirm::class, [R::GET, R::POST]], @@ -298,6 +299,14 @@ return [ '/userexport[/{action}]' => [Module\Settings\UserExport::class, [R::GET, R::POST]], ], + '/network' => [ + '[/]' => [Module\Conversation\Network::class, [R::GET]], + '/archive/{from:\d\d\d\d-\d\d-\d\d}[/{to:\d\d\d\d-\d\d-\d\d}]' => [Module\Conversation\Network::class, [R::GET]], + '/forum/{contact_id:\d+}' => [Module\Conversation\Network::class, [R::GET]], + '/group/{group_id:\d+}' => [Module\Conversation\Network::class, [R::GET]], + '/accounttype/{accounttype}' => [Module\Conversation\Network::class, [R::GET]], + ], + '/randprof' => [Module\RandomProfile::class, [R::GET]], '/register' => [Module\Register::class, [R::GET, R::POST]], '/remote_follow/{profile}' => [Module\RemoteFollow::class, [R::GET, R::POST]], @@ -310,6 +319,7 @@ return [ '/tos' => [Module\Tos::class, [R::GET]], '/update_community[/{content}[/{accounttype}]]' => [Module\Update\Community::class, [R::GET]], + '/update_network' => [Module\Update\Network::class, [R::GET]], '/update_profile' => [Module\Update\Profile::class, [R::GET]], '/view/theme/{theme}/style.pcss' => [Module\Theme::class, [R::GET]], diff --git a/view/templates/widget/filter.tpl b/view/templates/widget/filter.tpl index 557b8794be..85a3298f56 100644 --- a/view/templates/widget/filter.tpl +++ b/view/templates/widget/filter.tpl @@ -7,7 +7,7 @@
{{$desc nofilter}}