Revert "Use last entry for Content-Type"

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 2fe8ca04e10027541edd8709bc115b7850b31727..ef6b0b324e2aa123b73a6a90667af8cd788e927f 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -36,6 +36,7 @@ use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Post\Category;
 use Friendica\Model\Profile;
+use Friendica\Model\User;
 use Friendica\Module\Contact as ModuleContact;
 use Friendica\Module\Security\Login;
 use Friendica\Util\DateTimeFormat;
@@ -131,6 +132,13 @@ function network_init(App $a)
                DI::page()['aside'] = '';
        }
 
+       if (!empty(User::getAccountTypeByString($a->argv[1] ?? ''))) {
+               $accounttype = $a->argv[1];
+       } else {
+               $accounttype = '';
+       }
+
+       DI::page()['aside'] .= Widget::accounts('network', $accounttype);
        DI::page()['aside'] .= Group::sidebarWidget('network/0', 'network', 'standard', $group_id);
        DI::page()['aside'] .= ForumManager::widget(local_user(), $cid);
        DI::page()['aside'] .= Widget::postedByYear('network', local_user(), false);
@@ -288,12 +296,16 @@ function network_content(App $a, $update = 0, $parent = 0)
        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 = '';
        }
 
+       $account = User::getAccountTypeByString($a->argv[1] ?? '');
+
        if (!empty($_GET['file'])) {
-               $o .= networkFlatView($a, $update);
+               $o .= networkFlatView($a, $update, $account);
        } else {
-               $o .= networkThreadedView($a, $update, $parent);
+               $o .= networkThreadedView($a, $update, $parent, $account);
        }
 
        if (!$update && ($o === '')) {
@@ -313,7 +325,7 @@ function network_content(App $a, $update = 0, $parent = 0)
  * @throws \Friendica\Network\HTTPException\InternalServerErrorException
  * @global Pager  $pager
  */
-function networkFlatView(App $a, $update = 0)
+function networkFlatView(App $a, $update, $account)
 {
        global $pager;
        // Rawmode is used for fetching new content at the end of the page
@@ -381,6 +393,10 @@ function networkFlatView(App $a, $update = 0)
                networkSetSeen(['unseen' => true, 'uid' => local_user()]);
        }
 
+       if (!empty($account)) {
+               $item_condition['contact-type'] = $account;
+       }
+
        $result = Item::selectForUser(local_user(), [], $item_condition, $item_params);
        $items = Item::inArray($result);
        $o .= networkConversation($a, $items, $pager, 'network-new', $update);
@@ -399,7 +415,7 @@ function networkFlatView(App $a, $update = 0)
  * @throws \Friendica\Network\HTTPException\InternalServerErrorException
  * @global Pager   $pager
  */
-function networkThreadedView(App $a, $update, $parent)
+function networkThreadedView(App $a, $update, $parent, $account)
 {
        /// @TODO this will have to be converted to a static property of the converted Module\Network class
        global $pager;
@@ -505,6 +521,10 @@ function networkThreadedView(App $a, $update, $parent)
        $conditionFields = ['uid' => local_user()];
        $conditionStrings = [];
 
+       if (!empty($account)) {
+               $conditionFields['contact-type'] = $account;
+       }
+
        if ($star) {
                $conditionFields['starred'] = true;
        }