Issue 7285: Perform duplicate check for item URI also with AP

[friendica.git] / mod / community.php

diff --git a/mod/community.php b/mod/community.php
index 7474fc24290b569cb77cd86c1d13762c827844a1..5ffb00729fd8aa8a33aebc037174aea275795080 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -4,15 +4,18 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Feature;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
+use Friendica\Content\Widget\TrendingTags;
 use Friendica\Core\ACL;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
-use Friendica\Model\Contact;
 use Friendica\Model\Item;
+use Friendica\Model\User;
 
 function community_init(App $a)
 {
@@ -43,16 +46,16 @@ function community_content(App $a, $update = 0)
        if ($a->argc > 2) {
                switch ($a->argv[2]) {
                        case 'person':
-                               $accounttype = Contact::ACCOUNT_TYPE_PERSON;
+                               $accounttype = User::ACCOUNT_TYPE_PERSON;
                                break;
                        case 'organisation':
-                               $accounttype = Contact::ACCOUNT_TYPE_ORGANISATION;
+                               $accounttype = User::ACCOUNT_TYPE_ORGANISATION;
                                break;
                        case 'news':
-                               $accounttype = Contact::ACCOUNT_TYPE_NEWS;
+                               $accounttype = User::ACCOUNT_TYPE_NEWS;
                                break;
                        case 'community':
-                               $accounttype = Contact::ACCOUNT_TYPE_COMMUNITY;
+                               $accounttype = User::ACCOUNT_TYPE_COMMUNITY;
                                break;
                }
        }
@@ -92,8 +95,6 @@ function community_content(App $a, $update = 0)
                }
        }
 
-       require_once 'include/conversation.php';
-
        if (!$update) {
                $tabs = [];
 
@@ -119,8 +120,8 @@ function community_content(App $a, $update = 0)
                        ];
                }
 
-               $tab_tpl = get_markup_template('common_tabs.tpl');
-               $o .= replace_macros($tab_tpl, ['$tabs' => $tabs]);
+               $tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
+               $o .= Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
 
                Nav::setSelected('community');
 
@@ -154,7 +155,7 @@ function community_content(App $a, $update = 0)
                $itemspage_network = $a->force_max_items;
        }
 
-       $pager = new Pager($a->query_string, null, $itemspage_network);
+       $pager = new Pager($a->query_string, $itemspage_network);
 
        $r = community_getitems($pager->getStart(), $pager->getItemsPerPage(), $content, $accounttype);
 
@@ -198,8 +199,16 @@ function community_content(App $a, $update = 0)
                $o .= $pager->renderMinimal(count($r));
        }
 
-       $t = get_markup_template("community.tpl");
-       return replace_macros($t, [
+       if (empty($a->page['aside'])) {
+               $a->page['aside'] = '';
+       }
+
+       if (Feature::isEnabled(local_user(), 'trending_tags')) {
+               $a->page['aside'] .= TrendingTags::getHTML($content);
+       }
+
+       $t = Renderer::getMarkupTemplate("community.tpl");
+       return Renderer::replaceMacros($t, [
                '$content' => $o,
                '$header' => '',
                '$show_global_community_hint' => ($content == 'global') && Config::get('system', 'show_global_community_hint'),
@@ -219,9 +228,9 @@ function community_getitems($start, $itemspage, $content, $accounttype)
                }
 
                $r = DBA::p("SELECT `item`.`uri`, `author`.`url` AS `author-link` FROM `thread`
-                       INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
-                       INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
-                       INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
+                       STRAIGHT_JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
+                       STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
+                       STRAIGHT_JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
                        WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
                        AND NOT `thread`.`private` AND `thread`.`wall` AND `thread`.`origin` $sql_accounttype
                        ORDER BY `thread`.`commented` DESC LIMIT ?, ?", $values);