diff --git a/database.sql b/database.sql index c66de5bdd..6bad8340a 100644 --- a/database.sql +++ b/database.sql @@ -1,6 +1,6 @@ -- ------------------------------------------ -- Friendica 2023.09-dev (Giant Rhubarb) --- DB_UPDATE_VERSION 1530 +-- DB_UPDATE_VERSION 1531 -- ------------------------------------------ @@ -1300,6 +1300,23 @@ CREATE TABLE IF NOT EXISTS `post-delivery-data` ( FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Delivery data for items'; +-- +-- TABLE post-engagement +-- +CREATE TABLE IF NOT EXISTS `post-engagement` ( + `uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri', + `author-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the author of this item', + `contact-type` tinyint NOT NULL DEFAULT 0 COMMENT 'Person, organisation, news, community, relay', + `created` datetime COMMENT '', + `comments` mediumint unsigned COMMENT 'Number of comments', + `activities` mediumint unsigned COMMENT 'Number of activities (like, dislike, ...)', + PRIMARY KEY(`uri-id`), + INDEX `author-id` (`author-id`), + INDEX `created` (`created`), + FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE, + FOREIGN KEY (`author-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT +) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Engagement data per post'; + -- -- TABLE post-history -- diff --git a/doc/Accesskeys.md b/doc/Accesskeys.md index 9a68c62de..255c7f65c 100644 --- a/doc/Accesskeys.md +++ b/doc/Accesskeys.md @@ -16,6 +16,7 @@ General ------- * p - Profile * n - Network +* l - Channel * c - Community * s - Search * a - Admin @@ -28,6 +29,12 @@ General * l - Local community * g - Global community +../channel +-------- +* h - what's hot +* y - for you +* f - followers + ../profile -------- * m - Status Messages and Posts diff --git a/doc/database.md b/doc/database.md index 284870657..25b9baefb 100644 --- a/doc/database.md +++ b/doc/database.md @@ -61,6 +61,7 @@ Database Tables | [post-content](help/database/db_post-content) | Content for all posts | | [post-delivery](help/database/db_post-delivery) | Delivery data for posts for the batch processing | | [post-delivery-data](help/database/db_post-delivery-data) | Delivery data for items | +| [post-engagement](help/database/db_post-engagement) | Engagement data per post | | [post-history](help/database/db_post-history) | Post history | | [post-link](help/database/db_post-link) | Post related external links | | [post-media](help/database/db_post-media) | Attached media | diff --git a/doc/database/db_post-engagement.md b/doc/database/db_post-engagement.md new file mode 100644 index 000000000..e49881502 --- /dev/null +++ b/doc/database/db_post-engagement.md @@ -0,0 +1,35 @@ +Table post-engagement +=========== + +Engagement data per post + +Fields +------ + +| Field | Description | Type | Null | Key | Default | Extra | +| ------------ | --------------------------------------------------------------- | ------------------ | ---- | --- | ------- | ----- | +| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL | | +| author-id | Link to the contact table with uid=0 of the author of this item | int unsigned | NO | | 0 | | +| contact-type | Person, organisation, news, community, relay | tinyint | NO | | 0 | | +| created | | datetime | YES | | NULL | | +| comments | Number of comments | mediumint unsigned | YES | | NULL | | +| activities | Number of activities (like, dislike, ...) | mediumint unsigned | YES | | NULL | | + +Indexes +------------ + +| Name | Fields | +| --------- | --------- | +| PRIMARY | uri-id | +| author-id | author-id | +| created | created | + +Foreign Keys +------------ + +| Field | Target Table | Target Field | +|-------|--------------|--------------| +| uri-id | [item-uri](help/database/db_item-uri) | id | +| author-id | [contact](help/database/db_contact) | id | + +Return to [database documentation](help/database) diff --git a/doc/database/db_user-gserver.md b/doc/database/db_user-gserver.md index 6cfbe34eb..7ad6de485 100644 --- a/doc/database/db_user-gserver.md +++ b/doc/database/db_user-gserver.md @@ -8,8 +8,8 @@ Fields | Field | Description | Type | Null | Key | Default | Extra | | ------- | ---------------------------------------- | ------------------ | ---- | --- | ------- | ----- | -| uid | Owner User id | mediumint unsigned | NO | | 0 | | -| gsid | Gserver id | int unsigned | NO | | 0 | | +| uid | Owner User id | mediumint unsigned | NO | PRI | 0 | | +| gsid | Gserver id | int unsigned | NO | PRI | 0 | | | ignored | server accounts are ignored for the user | boolean | NO | | 0 | | Indexes diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php index 7edd4415d..9e7348469 100644 --- a/src/Content/Conversation.php +++ b/src/Content/Conversation.php @@ -57,6 +57,7 @@ use Psr\Log\LoggerInterface; class Conversation { + const MODE_CHANNEL = 'channel'; const MODE_COMMUNITY = 'community'; const MODE_CONTACTS = 'contacts'; const MODE_CONTACT_POSTS = 'contact-posts'; @@ -530,6 +531,17 @@ class Conversation . ""; } + } elseif ($mode === self::MODE_CHANNEL) { + $items = $this->addChildren($items, true, $order, $uid, $mode, $ignoredGsids); + + if (!$update) { + $live_update_div = '
' . "\r\n" + . "\r\n"; + } } elseif ($mode === self::MODE_COMMUNITY) { $items = $this->addChildren($items, true, $order, $uid, $mode, $ignoredGsids); @@ -621,7 +633,7 @@ class Conversation unset($conv_responses['dislike']); } - if (in_array($mode, [self::MODE_COMMUNITY, self::MODE_CONTACTS, self::MODE_PROFILE])) { + if (in_array($mode, [self::MODE_CHANNEL, self::MODE_COMMUNITY, self::MODE_CONTACTS, self::MODE_PROFILE])) { $writable = true; } else { $writable = $items[0]['writable'] || ($items[0]['uid'] == 0) && in_array($items[0]['network'], Protocol::FEDERATED); @@ -1009,7 +1021,7 @@ class Conversation $items[$key]['user-collapsed-owner'] = !$always_display && in_array($row['owner-id'], $collapses); if ( - in_array($mode, [self::MODE_COMMUNITY, self::MODE_NETWORK]) && + in_array($mode, [self::MODE_CHANNEL, self::MODE_COMMUNITY, self::MODE_NETWORK]) && (in_array($row['author-id'], $blocks) || in_array($row['owner-id'], $blocks) || in_array($row['author-id'], $ignores) || in_array($row['owner-id'], $ignores)) ) { unset($items[$key]); diff --git a/src/Content/Nav.php b/src/Content/Nav.php index c6634a95c..67195775a 100644 --- a/src/Content/Nav.php +++ b/src/Content/Nav.php @@ -42,6 +42,7 @@ class Nav private static $selected = [ 'global' => null, 'community' => null, + 'channel' => null, 'network' => null, 'home' => null, 'profiles' => null, @@ -199,6 +200,7 @@ class Nav 'moderation' => null, 'apps' => null, 'community' => null, + 'channel' => null, 'home' => null, 'calendar' => null, 'login' => null, @@ -287,6 +289,8 @@ class Nav $nav['community'] = ['community', $this->l10n->t('Community'), '', $this->l10n->t('Conversations on this and other servers')]; } + $nav['channel'] = ['channel', $this->l10n->t('Channel'), '', $this->l10n->t('Current posts, filtered by several rules')]; + if ($this->session->getLocalUserId()) { $nav['calendar'] = ['calendar', $this->l10n->t('Calendar'), '', $this->l10n->t('Calendar')]; } diff --git a/src/Model/Item.php b/src/Model/Item.php index 9eddf885c..1e16f85d9 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -1405,6 +1405,8 @@ class Item self::updateDisplayCache($posted_item['uri-id']); } + Post\Engagement::storeFromItem($posted_item); + return $post_user_id; } diff --git a/src/Model/Post/Engagement.php b/src/Model/Post/Engagement.php new file mode 100644 index 000000000..84d106b7a --- /dev/null +++ b/src/Model/Post/Engagement.php @@ -0,0 +1,98 @@ +. + * + */ + +namespace Friendica\Model\Post; + +use Friendica\Core\Logger; +use Friendica\Core\Protocol; +use Friendica\Database\Database; +use Friendica\Database\DBA; +use Friendica\Model\Contact; +use Friendica\Model\Item; +use Friendica\Model\Post; +use Friendica\Model\Verb; +use Friendica\Protocol\Activity; +use Friendica\Util\DateTimeFormat; + +// Channel + +class Engagement +{ + public static function storeFromItem(array $item) + { + if (!in_array($item['network'], Protocol::FEDERATED)) { + Logger::debug('No federated network', ['uri-id' => $item['uri-id'], 'parent-uri-id' => $item['parent-uri-id'], 'network' => $item['network']]); + return; + } + + if ($item['gravity'] == Item::GRAVITY_PARENT) { + Logger::debug('Parent posts are not stored', ['uri-id' => $item['uri-id'], 'parent-uri-id' => $item['parent-uri-id']]); + return; + } + + if (($item['uid'] != 0) && ($item['gravity'] == Item::GRAVITY_COMMENT)) { + Logger::debug('Non public comments are not stored', ['uri-id' => $item['uri-id'], 'parent-uri-id' => $item['parent-uri-id'], 'uid' => $item['uid']]); + return; + } + + if (in_array($item['verb'], [Activity::FOLLOW, Activity::VIEW, Activity::READ])) { + Logger::debug('Technical activities are not stored', ['uri-id' => $item['uri-id'], 'parent-uri-id' => $item['parent-uri-id'], 'verb' => $item['verb']]); + return; + } + + $parent = Post::selectFirst(['created', 'author-id', 'uid', 'private', 'contact-contact-type'], ['uri-id' => $item['parent-uri-id']]); + if ($parent['private'] != Item::PUBLIC) { + Logger::debug('Non public posts are not stored', ['uri-id' => $item['uri-id'], 'parent-uri-id' => $item['parent-uri-id'], 'uid' => $parent['uid'], 'private' => $parent['private']]); + return; + } + + if ($parent['contact-contact-type'] == Contact::TYPE_COMMUNITY) { + Logger::debug('Group posts are not stored', ['uri-id' => $item['uri-id'], 'parent-uri-id' => $item['parent-uri-id'], 'author-id' => $parent['author-id']]); + return; + } + + if ($parent['created'] < DateTimeFormat::utc('now - 1 day')) { + Logger::debug('Post is too old', ['uri-id' => $item['uri-id'], 'parent-uri-id' => $item['parent-uri-id'], 'created' => $parent['created']]); + return; + } + + $engagement = [ + 'uri-id' => $item['parent-uri-id'], + 'author-id' => $parent['author-id'], + 'contact-type' => $parent['contact-contact-type'], + 'created' => $parent['created'], + 'comments' => DBA::count('post', ['parent-uri-id' => $item['parent-uri-id'], 'gravity' => Item::GRAVITY_COMMENT]), + 'activities' => DBA::count('post', [ + "`parent-uri-id` = ? AND `gravity` = ? AND NOT `vid` IN (?, ?, ?)", + $item['parent-uri-id'], Item::GRAVITY_ACTIVITY, + Verb::getID(Activity::FOLLOW), Verb::getID(Activity::VIEW), Verb::getID(Activity::READ) + ]) + ]; + $ret = DBA::insert('post-engagement', $engagement, Database::INSERT_UPDATE); + Logger::debug('Engagement stored', ['fields' => $engagement, 'ret' => $ret]); + } + + public static function expire() + { + DBA::delete('post-engagement', ["`created` < ?", DateTimeFormat::utc('now - 1 day')]); + Logger::notice('Cleared expired engagements', ['rows' => DBA::affectedRows()]); + } +} diff --git a/src/Module/Conversation/Channel.php b/src/Module/Conversation/Channel.php new file mode 100644 index 000000000..5881cafda --- /dev/null +++ b/src/Module/Conversation/Channel.php @@ -0,0 +1,305 @@ +. + * + * See update_profile.php for documentation + */ + +namespace Friendica\Module\Conversation; + +use Friendica\BaseModule; +use Friendica\Content\BoundariesPager; +use Friendica\Content\Conversation; +use Friendica\Content\Feature; +use Friendica\Content\Nav; +use Friendica\Content\Text\HTML; +use Friendica\Content\Widget; +use Friendica\Content\Widget\TrendingTags; +use Friendica\Core\Logger; +use Friendica\Core\Renderer; +use Friendica\Database\DBA; +use Friendica\DI; +use Friendica\Model\Contact; +use Friendica\Model\Post; +use Friendica\Model\User; +use Friendica\Module\Security\Login; +use Friendica\Network\HTTPException; + +class Channel extends BaseModule +{ + const WHATSHOT = 'whatshot'; + const FORYOU = 'foryou'; + const FOLLOWERS = 'followers'; + /** + * @} + */ + + protected static $content; + protected static $accountTypeString; + protected static $accountType; + protected static $itemsPerPage; + protected static $min_id; + protected static $max_id; + protected static $item_id; + + protected function content(array $request = []): string + { + if (!DI::userSession()->getLocalUserId()) { + return Login::form(); + } + + $this->parseRequest(); + + $t = Renderer::getMarkupTemplate("community.tpl"); + $o = Renderer::replaceMacros($t, [ + '$content' => '', + '$header' => '', + ]); + + if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'infinite_scroll')) { + $tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl'); + $o .= Renderer::replaceMacros($tpl, ['$reload_uri' => DI::args()->getQueryString()]); + } + + if (empty($_GET['mode']) || ($_GET['mode'] != 'raw')) { + $tabs = []; + + $tabs[] = [ + 'label' => DI::l10n()->t('Whats Hot'), + 'url' => 'channel/' . self::WHATSHOT, + 'sel' => self::$content == self::WHATSHOT ? 'active' : '', + 'title' => DI::l10n()->t('Posts with a lot of interactions'), + 'id' => 'channel-whatshot-tab', + 'accesskey' => 'h' + ]; + + $tabs[] = [ + 'label' => DI::l10n()->t('For you'), + 'url' => 'channel/' . self::FORYOU, + 'sel' => self::$content == self::FORYOU ? 'active' : '', + 'title' => DI::l10n()->t('Posts from contacts you interact with and who interact with you'), + 'id' => 'channel-foryou-tab', + 'accesskey' => 'y' + ]; + + $tabs[] = [ + 'label' => DI::l10n()->t('Followers'), + 'url' => 'channel/' . self::FOLLOWERS, + 'sel' => self::$content == self::FOLLOWERS ? 'active' : '', + 'title' => DI::l10n()->t('Posts from your followers that you don\'t follow'), + 'id' => 'channel-followers-tab', + 'accesskey' => 'f' + ]; + + $tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl'); + $o .= Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]); + + Nav::setSelected('channel'); + + DI::page()['aside'] .= Widget::accountTypes('channel/' . self::$content, self::$accountTypeString); + + if ((self::$content != self::FOLLOWERS) && DI::config()->get('system', 'community_no_sharer')) { + $path = self::$content; + if (!empty($this->parameters['accounttype'])) { + $path .= '/' . $this->parameters['accounttype']; + } + $query_parameters = []; + + if (!empty($_GET['min_id'])) { + $query_parameters['min_id'] = $_GET['min_id']; + } + if (!empty($_GET['max_id'])) { + $query_parameters['max_id'] = $_GET['max_id']; + } + if (!empty($_GET['last_created'])) { + $query_parameters['max_id'] = $_GET['last_created']; + } + + $path_all = $path . (!empty($query_parameters) ? '?' . http_build_query($query_parameters) : ''); + $path_no_sharer = $path . '?' . http_build_query(array_merge($query_parameters, ['no_sharer' => true])); + DI::page()['aside'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/community_sharer.tpl'), [ + '$title' => DI::l10n()->t('Own Contacts'), + '$path_all' => $path_all, + '$path_no_sharer' => $path_no_sharer, + '$no_sharer' => !empty($_REQUEST['no_sharer']), + '$all' => DI::l10n()->t('Include'), + '$no_sharer_label' => DI::l10n()->t('Hide'), + '$base' => 'channel', + ]); + } + + if (Feature::isEnabled(DI::userSession()->getLocalUserId(), 'trending_tags')) { + DI::page()['aside'] .= TrendingTags::getHTML(self::$content); + } + + // We need the editor here to be able to reshare an item. + $o .= DI::conversation()->statusEditor([], 0, true); + } + + $items = self::getItems(); + + if (!DBA::isResult($items)) { + DI::sysmsg()->addNotice(DI::l10n()->t('No results.')); + return $o; + } + + $o .= DI::conversation()->render($items, Conversation::MODE_CHANNEL, false, false, 'created', DI::userSession()->getLocalUserId()); + + $pager = new BoundariesPager( + DI::l10n(), + DI::args()->getQueryString(), + $items[0]['created'], + $items[count($items) - 1]['created'], + self::$itemsPerPage + ); + + if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'infinite_scroll')) { + $o .= HTML::scrollLoader(); + } else { + $o .= $pager->renderMinimal(count($items)); + } + + return $o; + } + + /** + * Computes module parameters from the request and local configuration + * + * @throws HTTPException\BadRequestException + * @throws HTTPException\ForbiddenException + */ + protected function parseRequest() + { + self::$accountTypeString = $_GET['accounttype'] ?? $this->parameters['accounttype'] ?? ''; + self::$accountType = User::getAccountTypeByString(self::$accountTypeString); + + self::$content = $this->parameters['content'] ?? ''; + if (!self::$content) { + self::$content = self::WHATSHOT; + } + + if (!in_array(self::$content, [self::WHATSHOT, self::FORYOU, self::FOLLOWERS])) { + throw new HTTPException\BadRequestException(DI::l10n()->t('Channel not available.')); + } + + if (DI::mode()->isMobile()) { + self::$itemsPerPage = DI::pConfig()->get( + DI::userSession()->getLocalUserId(), + 'system', + 'itemspage_mobile_network', + DI::config()->get('system', 'itemspage_network_mobile') + ); + } else { + self::$itemsPerPage = DI::pConfig()->get( + DI::userSession()->getLocalUserId(), + 'system', + 'itemspage_network', + DI::config()->get('system', 'itemspage_network') + ); + } + + if (!empty($_GET['item'])) { + $item = Post::selectFirst(['parent-uri-id'], ['id' => $_GET['item']]); + self::$item_id = $item['parent-uri-id'] ?? 0; + } else { + self::$item_id = 0; + } + + Logger::debug('Blubb', ['get' => $_GET]); + self::$min_id = $_GET['min_id'] ?? null; + self::$max_id = $_GET['max_id'] ?? null; + self::$max_id = $_GET['last_created'] ?? self::$max_id; + } + + /** + * Computes the displayed items. + * + * Community pages have a restriction on how many successive posts by the same author can show on any given page, + * so we may have to retrieve more content beyond the first query + * + * @return array + * @throws \Exception + */ + protected static function getItems() + { + $post = DBA::selectToArray('post-engagement', ['comments'], [], ['order' => ['comments' => true], 'limit' => [100, 1]]); + + if (self::$content == self::WHATSHOT) { + $comments = $post[0]['comments'] ?? 0; + if (!is_null(self::$accountType)) { + $condition = ["`comments` >= ? AND `contact-type` = ?", $comments, self::$accountType]; + } else { + $condition = ["`comments` >= ?", $comments]; + } + } elseif (self::$content == self::FORYOU) { + $cid = Contact::getPublicIdByUserId(DI::userSession()->getLocalUserId()); + if (!is_null(self::$accountType)) { + $condition = ["`author-id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `thread-score` > ? AND `relation-thread-score` > ?) AND `contact-type` = ?", $cid, 0, 0, self::$accountType]; + } else { + $condition = ["`author-id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `thread-score` > ? AND `relation-thread-score` > ?)", $cid, 0, 0]; + } + } elseif (self::$content == self::FOLLOWERS) { + if (!is_null(self::$accountType)) { + $condition = ["`author-id` IN (SELECT `pid` FROM `account-user-view` WHERE uid` = ? AND `rel` = ?) AND `contact-type` = ?", DI::userSession()->getLocalUserId(), Contact::FOLLOWER, self::$accountType]; + } else { + $condition = ["`author-id` IN (SELECT `pid` FROM `account-user-view` WHERE `uid` = ? AND `rel` = ?)", DI::userSession()->getLocalUserId(), Contact::FOLLOWER]; + } + } + + $params = ['order' => ['created' => true], 'limit' => self::$itemsPerPage]; + + if (!empty(self::$item_id)) { + // @todo + $condition[0] .= " AND `uri-id` = ?"; + $condition[] = self::$item_id; + } else { + if (!empty($_REQUEST['no_sharer'])) { + $condition[0] .= " AND NOT `uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE `post-user`.`uid` = ? AND `post-user`.`uri-id` = `post-engagement`.`uri-id`)"; + $condition[] = DI::userSession()->getLocalUserId(); + } + + if (isset(self::$max_id)) { + $condition[0] .= " AND `created` < ?"; + $condition[] = self::$max_id; + } + + if (isset(self::$min_id)) { + $condition[0] .= " AND `created` > ?"; + $condition[] = self::$min_id; + + // Previous page case: we want the items closest to min_id but for that we need to reverse the query order + if (!isset(self::$max_id)) { + $params['order']['created'] = false; + } + } + } + + $items = DBA::selectToArray('post-engagement', ['uri-id', 'created'], $condition, $params); + + if (empty($items)) { + return []; + } + + // Previous page case: once we get the relevant items closest to min_id, we need to restore the expected display order + if (empty(self::$item_id) && isset(self::$min_id) && !isset(self::$max_id)) { + $items = array_reverse($items); + } + + return $items; + } +} diff --git a/src/Module/Conversation/Community.php b/src/Module/Conversation/Community.php index 3c3bbb8a8..977224842 100644 --- a/src/Module/Conversation/Community.php +++ b/src/Module/Conversation/Community.php @@ -137,6 +137,7 @@ class Community extends BaseModule '$no_sharer' => !empty($_REQUEST['no_sharer']), '$all' => DI::l10n()->t('Include'), '$no_sharer_label' => DI::l10n()->t('Hide'), + '$base' => 'community', ]); } @@ -245,8 +246,8 @@ class Community extends BaseModule } self::$min_id = $_GET['min_id'] ?? null; - self::$max_id = $_GET['max_id'] ?? null; - self::$max_id = $_GET['last_commented'] ?? self::$max_id; + self::$max_id = $_GET['max_id'] ?? null; + self::$max_id = $_GET['last_commented'] ?? self::$max_id; } /** diff --git a/src/Module/Update/Channel.php b/src/Module/Update/Channel.php new file mode 100644 index 000000000..aceeae15a --- /dev/null +++ b/src/Module/Update/Channel.php @@ -0,0 +1,48 @@ +. + * + * See update_profile.php for documentation + */ + +namespace Friendica\Module\Update; + +use Friendica\Content\Conversation; +use Friendica\Core\System; +use Friendica\DI; +use Friendica\Module\Conversation\Channel as ChannelModule; + +/** + * Asynchronous update module for the Channel page + * + * @package Friendica\Module\Update + */ +class Channel extends ChannelModule +{ + protected function rawContent(array $request = []) + { + $this->parseRequest(); + + $o = ''; + if (!empty($request['force'])) { + $o = DI::conversation()->render(self::getItems(), Conversation::MODE_CHANNEL, true, false, 'created', DI::userSession()->getLocalUserId()); + } + + System::htmlUpdateExit($o); + } +} diff --git a/src/Object/Thread.php b/src/Object/Thread.php index adc822b6a..8b594eab5 100644 --- a/src/Object/Thread.php +++ b/src/Object/Thread.php @@ -21,6 +21,7 @@ namespace Friendica\Object; +use Friendica\Content\Conversation; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\DI; @@ -73,24 +74,28 @@ class Thread $a = DI::app(); switch ($mode) { - case 'network': - case 'notes': + case Conversation::MODE_NETWORK: + case Conversation::MODE_NOTES: $this->profile_owner = DI::userSession()->getLocalUserId(); $this->writable = true; break; - case 'profile': + case Conversation::MODE_PROFILE: $this->profile_owner = $a->getProfileOwner(); $this->writable = Security::canWriteToUserWall($this->profile_owner) || $writable; break; - case 'display': + case Conversation::MODE_DISPLAY: $this->profile_owner = $a->getProfileOwner(); $this->writable = Security::canWriteToUserWall($this->profile_owner) || $writable; break; - case 'community': + case Conversation::MODE_CHANNEL: $this->profile_owner = 0; $this->writable = $writable; break; - case 'contacts': + case Conversation::MODE_COMMUNITY: + $this->profile_owner = 0; + $this->writable = $writable; + break; + case Conversation::MODE_CONTACTS: $this->profile_owner = 0; $this->writable = $writable; break; diff --git a/src/Worker/OptimizeTables.php b/src/Worker/OptimizeTables.php index 784c72fde..ad2ac444d 100644 --- a/src/Worker/OptimizeTables.php +++ b/src/Worker/OptimizeTables.php @@ -45,6 +45,7 @@ class OptimizeTables DBA::optimizeTable('oembed'); DBA::optimizeTable('parsed_url'); DBA::optimizeTable('session'); + DBA::optimizeTable('post-engagement'); if (DI::config()->get('system', 'optimize_all_tables')) { DBA::optimizeTable('apcontact'); diff --git a/src/Worker/UpdateScores.php b/src/Worker/UpdateScores.php index 66f776ad7..1f02bf415 100644 --- a/src/Worker/UpdateScores.php +++ b/src/Worker/UpdateScores.php @@ -24,6 +24,7 @@ namespace Friendica\Worker; use Friendica\Core\Logger; use Friendica\Database\DBA; use Friendica\Model\Contact\Relation; +use Friendica\Model\Post; /** * Update the interaction scores @@ -41,6 +42,9 @@ class UpdateScores DBA::close($users); Logger::notice('Score update done'); + + Post\Engagement::expire(); + return; } } diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index 7520a1109..8912e4982 100644 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -56,7 +56,7 @@ use Friendica\Database\DBA; // This file is required several times during the test in DbaDefinition which justifies this condition if (!defined('DB_UPDATE_VERSION')) { - define('DB_UPDATE_VERSION', 1530); + define('DB_UPDATE_VERSION', 1531); } return [ @@ -162,8 +162,8 @@ return [ "user-gserver" => [ "comment" => "User settings about remote servers", "fields" => [ - "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "Owner User id"], - "gsid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["gserver" => "id"], "comment" => "Gserver id"], + "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "primary" => "1", "comment" => "Owner User id"], + "gsid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["gserver" => "id"], "primary" => "1", "comment" => "Gserver id"], "ignored" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "server accounts are ignored for the user"], ], "indexes" => [ @@ -1323,6 +1323,22 @@ return [ "PRIMARY" => ["uri-id"], ] ], + "post-engagement" => [ + "comment" => "Engagement data per post", + "fields" => [ + "uri-id" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"], + "author-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Link to the contact table with uid=0 of the author of this item"], + "contact-type" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => "Person, organisation, news, community, relay"], + "created" => ["type" => "datetime", "comment" => ""], + "comments" => ["type" => "mediumint unsigned", "comment" => "Number of comments"], + "activities" => ["type" => "mediumint unsigned", "comment" => "Number of activities (like, dislike, ...)"], + ], + "indexes" => [ + "PRIMARY" => ["uri-id"], + "author-id" => ["author-id"], + "created" => ["created"], + ] + ], "post-history" => [ "comment" => "Post history", "fields" => [ diff --git a/static/routes.config.php b/static/routes.config.php index 36ba2f249..55b40bcf3 100644 --- a/static/routes.config.php +++ b/static/routes.config.php @@ -391,6 +391,7 @@ return [ '/event/{mode:edit|copy}/{id:\d+}' => [Module\Calendar\Event\Form::class, [R::GET ]], ], + '/channel[/{content}]' => [Module\Conversation\Channel::class, [R::GET]], '/community[/{content}]' => [Module\Conversation\Community::class, [R::GET]], '/compose[/{type}]' => [Module\Item\Compose::class, [R::GET, R::POST]], @@ -686,6 +687,7 @@ return [ '/toggle_mobile' => [Module\ToggleMobile::class, [R::GET]], '/tos' => [Module\Tos::class, [R::GET]], + '/update_channel[/{content}]' => [Module\Update\Channel::class, [R::GET]], '/update_community[/{content}]' => [Module\Update\Community::class, [R::GET]], '/update_display' => [Module\Update\Display::class, [R::GET]], diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index b758e68c0..c348ea6bb 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-08-28 04:37+0000\n" +"POT-Creation-Date: 2023-09-01 21:25+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -219,7 +219,7 @@ msgstr "" msgid "Your password has been changed at %s" msgstr "" -#: mod/message.php:46 mod/message.php:128 src/Content/Nav.php:319 +#: mod/message.php:46 mod/message.php:128 src/Content/Nav.php:323 msgid "New Message" msgstr "" @@ -245,7 +245,7 @@ msgstr "" msgid "Discard" msgstr "" -#: mod/message.php:135 src/Content/Nav.php:316 view/theme/frio/theme.php:241 +#: mod/message.php:135 src/Content/Nav.php:320 view/theme/frio/theme.php:241 msgid "Messages" msgstr "" @@ -281,7 +281,7 @@ msgstr "" msgid "Your message:" msgstr "" -#: mod/message.php:199 mod/message.php:354 src/Content/Conversation.php:367 +#: mod/message.php:199 mod/message.php:354 src/Content/Conversation.php:368 #: src/Module/Post/Edit.php:131 msgid "Upload photo" msgstr "" @@ -292,7 +292,7 @@ msgid "Insert web link" msgstr "" #: mod/message.php:201 mod/message.php:357 mod/photos.php:1301 -#: src/Content/Conversation.php:398 src/Content/Conversation.php:1534 +#: src/Content/Conversation.php:399 src/Content/Conversation.php:1546 #: src/Module/Item/Compose.php:206 src/Module/Post/Edit.php:145 #: src/Module/Profile/UnkMail.php:154 src/Object/Post.php:578 msgid "Please wait" @@ -449,7 +449,7 @@ msgstr "" msgid "%1$s was tagged in %2$s by %3$s" msgstr "" -#: mod/photos.php:582 src/Module/Conversation/Community.php:188 +#: mod/photos.php:582 src/Module/Conversation/Community.php:189 #: src/Module/Directory.php:48 src/Module/Profile/Photos.php:295 #: src/Module/Search/Index.php:65 msgid "Public access denied." @@ -480,7 +480,7 @@ msgstr "" msgid "Do not show a status post for this upload" msgstr "" -#: mod/photos.php:736 mod/photos.php:1097 src/Content/Conversation.php:400 +#: mod/photos.php:736 mod/photos.php:1097 src/Content/Conversation.php:401 #: src/Module/Calendar/Event/Form.php:253 src/Module/Post/Edit.php:183 msgid "Permissions" msgstr "" @@ -493,7 +493,7 @@ msgstr "" msgid "Delete Album" msgstr "" -#: mod/photos.php:803 mod/photos.php:903 src/Content/Conversation.php:416 +#: mod/photos.php:803 mod/photos.php:903 src/Content/Conversation.php:417 #: src/Module/Contact/Follow.php:173 src/Module/Contact/Revoke.php:109 #: src/Module/Contact/Unfollow.php:126 #: src/Module/Media/Attachment/Browser.php:77 @@ -611,23 +611,23 @@ msgid "Comment" msgstr "" #: mod/photos.php:1143 mod/photos.php:1199 mod/photos.php:1279 -#: src/Content/Conversation.php:413 src/Module/Calendar/Event/Form.php:248 +#: src/Content/Conversation.php:414 src/Module/Calendar/Event/Form.php:248 #: src/Module/Item/Compose.php:201 src/Module/Post/Edit.php:165 #: src/Object/Post.php:1108 msgid "Preview" msgstr "" -#: mod/photos.php:1144 src/Content/Conversation.php:366 +#: mod/photos.php:1144 src/Content/Conversation.php:367 #: src/Module/Post/Edit.php:130 src/Object/Post.php:1096 msgid "Loading..." msgstr "" -#: mod/photos.php:1236 src/Content/Conversation.php:1449 +#: mod/photos.php:1236 src/Content/Conversation.php:1461 #: src/Object/Post.php:260 msgid "Select" msgstr "" -#: mod/photos.php:1237 src/Content/Conversation.php:1450 +#: mod/photos.php:1237 src/Content/Conversation.php:1462 #: src/Module/Moderation/Users/Active.php:136 #: src/Module/Moderation/Users/Blocked.php:136 #: src/Module/Moderation/Users/Index.php:151 @@ -793,8 +793,8 @@ msgid "All contacts" msgstr "" #: src/BaseModule.php:433 src/Content/Widget.php:239 src/Core/ACL.php:195 -#: src/Module/Contact.php:415 src/Module/PermissionTooltip.php:127 -#: src/Module/PermissionTooltip.php:149 +#: src/Module/Contact.php:415 src/Module/Conversation/Channel.php:101 +#: src/Module/PermissionTooltip.php:127 src/Module/PermissionTooltip.php:149 msgid "Followers" msgstr "" @@ -1140,65 +1140,65 @@ msgstr "" msgid "%s (via %s)" msgstr "" -#: src/Content/Conversation.php:225 +#: src/Content/Conversation.php:226 msgid "and" msgstr "" -#: src/Content/Conversation.php:228 +#: src/Content/Conversation.php:229 #, php-format msgid "and %d other people" msgstr "" -#: src/Content/Conversation.php:234 +#: src/Content/Conversation.php:235 #, php-format msgid "%2$s likes this." msgid_plural "%2$s like this." msgstr[0] "" msgstr[1] "" -#: src/Content/Conversation.php:236 +#: src/Content/Conversation.php:237 #, php-format msgid "%2$s doesn't like this." msgid_plural "%2$s don't like this." msgstr[0] "" msgstr[1] "" -#: src/Content/Conversation.php:238 +#: src/Content/Conversation.php:239 #, php-format msgid "%2$s attends." msgid_plural "%2$s attend." msgstr[0] "" msgstr[1] "" -#: src/Content/Conversation.php:240 +#: src/Content/Conversation.php:241 #, php-format msgid "%2$s doesn't attend." msgid_plural "%2$s don't attend." msgstr[0] "" msgstr[1] "" -#: src/Content/Conversation.php:242 +#: src/Content/Conversation.php:243 #, php-format msgid "%2$s attends maybe." msgid_plural "%2$s attend maybe." msgstr[0] "" msgstr[1] "" -#: src/Content/Conversation.php:244 +#: src/Content/Conversation.php:245 #, php-format msgid "%2$s reshared this." msgid_plural "%2$s reshared this." msgstr[0] "" msgstr[1] "" -#: src/Content/Conversation.php:273 +#: src/Content/Conversation.php:274 #, php-format msgid " likes this" msgid_plural " like this" msgstr[0] "" msgstr[1] "" -#: src/Content/Conversation.php:276 +#: src/Content/Conversation.php:277 #, php-format msgid " doesn't like this" msgid_plural "" @@ -1206,309 +1206,309 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: src/Content/Conversation.php:279 +#: src/Content/Conversation.php:280 #, php-format msgid " attends" msgid_plural " attend" msgstr[0] "" msgstr[1] "" -#: src/Content/Conversation.php:282 +#: src/Content/Conversation.php:283 #, php-format msgid " doesn't attend" msgid_plural " don't attend" msgstr[0] "" msgstr[1] "" -#: src/Content/Conversation.php:285 +#: src/Content/Conversation.php:286 #, php-format msgid " attends maybe" msgid_plural " attend maybe" msgstr[0] "" msgstr[1] "" -#: src/Content/Conversation.php:288 +#: src/Content/Conversation.php:289 #, php-format msgid " reshared this" msgid_plural " reshared this" msgstr[0] "" msgstr[1] "" -#: src/Content/Conversation.php:335 +#: src/Content/Conversation.php:336 msgid "Visible to everybody" msgstr "" -#: src/Content/Conversation.php:336 src/Module/Item/Compose.php:200 +#: src/Content/Conversation.php:337 src/Module/Item/Compose.php:200 #: src/Object/Post.php:1107 msgid "Please enter a image/video/audio/webpage URL:" msgstr "" -#: src/Content/Conversation.php:337 +#: src/Content/Conversation.php:338 msgid "Tag term:" msgstr "" -#: src/Content/Conversation.php:338 src/Module/Filer/SaveTag.php:73 +#: src/Content/Conversation.php:339 src/Module/Filer/SaveTag.php:73 msgid "Save to Folder:" msgstr "" -#: src/Content/Conversation.php:339 +#: src/Content/Conversation.php:340 msgid "Where are you right now?" msgstr "" -#: src/Content/Conversation.php:340 +#: src/Content/Conversation.php:341 msgid "Delete item(s)?" msgstr "" -#: src/Content/Conversation.php:352 src/Module/Item/Compose.php:175 +#: src/Content/Conversation.php:353 src/Module/Item/Compose.php:175 msgid "Created at" msgstr "" -#: src/Content/Conversation.php:362 +#: src/Content/Conversation.php:363 msgid "New Post" msgstr "" -#: src/Content/Conversation.php:365 +#: src/Content/Conversation.php:366 msgid "Share" msgstr "" -#: src/Content/Conversation.php:368 src/Module/Post/Edit.php:132 +#: src/Content/Conversation.php:369 src/Module/Post/Edit.php:132 msgid "upload photo" msgstr "" -#: src/Content/Conversation.php:369 src/Module/Post/Edit.php:133 +#: src/Content/Conversation.php:370 src/Module/Post/Edit.php:133 msgid "Attach file" msgstr "" -#: src/Content/Conversation.php:370 src/Module/Post/Edit.php:134 +#: src/Content/Conversation.php:371 src/Module/Post/Edit.php:134 msgid "attach file" msgstr "" -#: src/Content/Conversation.php:371 src/Module/Item/Compose.php:190 +#: src/Content/Conversation.php:372 src/Module/Item/Compose.php:190 #: src/Module/Post/Edit.php:171 src/Object/Post.php:1097 msgid "Bold" msgstr "" -#: src/Content/Conversation.php:372 src/Module/Item/Compose.php:191 +#: src/Content/Conversation.php:373 src/Module/Item/Compose.php:191 #: src/Module/Post/Edit.php:172 src/Object/Post.php:1098 msgid "Italic" msgstr "" -#: src/Content/Conversation.php:373 src/Module/Item/Compose.php:192 +#: src/Content/Conversation.php:374 src/Module/Item/Compose.php:192 #: src/Module/Post/Edit.php:173 src/Object/Post.php:1099 msgid "Underline" msgstr "" -#: src/Content/Conversation.php:374 src/Module/Item/Compose.php:193 +#: src/Content/Conversation.php:375 src/Module/Item/Compose.php:193 #: src/Module/Post/Edit.php:174 src/Object/Post.php:1101 msgid "Quote" msgstr "" -#: src/Content/Conversation.php:375 src/Module/Item/Compose.php:194 +#: src/Content/Conversation.php:376 src/Module/Item/Compose.php:194 #: src/Module/Post/Edit.php:175 src/Object/Post.php:1102 msgid "Add emojis" msgstr "" -#: src/Content/Conversation.php:376 src/Module/Item/Compose.php:195 +#: src/Content/Conversation.php:377 src/Module/Item/Compose.php:195 #: src/Object/Post.php:1100 msgid "Content Warning" msgstr "" -#: src/Content/Conversation.php:377 src/Module/Item/Compose.php:196 +#: src/Content/Conversation.php:378 src/Module/Item/Compose.php:196 #: src/Module/Post/Edit.php:176 src/Object/Post.php:1103 msgid "Code" msgstr "" -#: src/Content/Conversation.php:378 src/Module/Item/Compose.php:197 +#: src/Content/Conversation.php:379 src/Module/Item/Compose.php:197 #: src/Object/Post.php:1104 msgid "Image" msgstr "" -#: src/Content/Conversation.php:379 src/Module/Item/Compose.php:198 +#: src/Content/Conversation.php:380 src/Module/Item/Compose.php:198 #: src/Module/Post/Edit.php:177 src/Object/Post.php:1105 msgid "Link" msgstr "" -#: src/Content/Conversation.php:380 src/Module/Item/Compose.php:199 +#: src/Content/Conversation.php:381 src/Module/Item/Compose.php:199 #: src/Module/Post/Edit.php:178 src/Object/Post.php:1106 msgid "Link or Media" msgstr "" -#: src/Content/Conversation.php:381 +#: src/Content/Conversation.php:382 msgid "Video" msgstr "" -#: src/Content/Conversation.php:382 src/Module/Item/Compose.php:202 +#: src/Content/Conversation.php:383 src/Module/Item/Compose.php:202 #: src/Module/Post/Edit.php:141 msgid "Set your location" msgstr "" -#: src/Content/Conversation.php:383 src/Module/Post/Edit.php:142 +#: src/Content/Conversation.php:384 src/Module/Post/Edit.php:142 msgid "set location" msgstr "" -#: src/Content/Conversation.php:384 src/Module/Post/Edit.php:143 +#: src/Content/Conversation.php:385 src/Module/Post/Edit.php:143 msgid "Clear browser location" msgstr "" -#: src/Content/Conversation.php:385 src/Module/Post/Edit.php:144 +#: src/Content/Conversation.php:386 src/Module/Post/Edit.php:144 msgid "clear location" msgstr "" -#: src/Content/Conversation.php:387 src/Module/Item/Compose.php:207 +#: src/Content/Conversation.php:388 src/Module/Item/Compose.php:207 #: src/Module/Post/Edit.php:157 msgid "Set title" msgstr "" -#: src/Content/Conversation.php:389 src/Module/Item/Compose.php:208 +#: src/Content/Conversation.php:390 src/Module/Item/Compose.php:208 #: src/Module/Post/Edit.php:159 msgid "Categories (comma-separated list)" msgstr "" -#: src/Content/Conversation.php:394 src/Module/Item/Compose.php:224 +#: src/Content/Conversation.php:395 src/Module/Item/Compose.php:224 msgid "Scheduled at" msgstr "" -#: src/Content/Conversation.php:399 src/Module/Post/Edit.php:146 +#: src/Content/Conversation.php:400 src/Module/Post/Edit.php:146 msgid "Permission settings" msgstr "" -#: src/Content/Conversation.php:409 src/Module/Post/Edit.php:155 +#: src/Content/Conversation.php:410 src/Module/Post/Edit.php:155 msgid "Public post" msgstr "" -#: src/Content/Conversation.php:423 src/Content/Widget/VCard.php:120 +#: src/Content/Conversation.php:424 src/Content/Widget/VCard.php:120 #: src/Model/Profile.php:467 src/Module/Admin/Logs/View.php:92 #: src/Module/Post/Edit.php:181 msgid "Message" msgstr "" -#: src/Content/Conversation.php:424 src/Module/Post/Edit.php:182 +#: src/Content/Conversation.php:425 src/Module/Post/Edit.php:182 #: src/Module/Settings/TwoFactor/Trusted.php:140 msgid "Browser" msgstr "" -#: src/Content/Conversation.php:426 src/Module/Post/Edit.php:185 +#: src/Content/Conversation.php:427 src/Module/Post/Edit.php:185 msgid "Open Compose page" msgstr "" -#: src/Content/Conversation.php:581 +#: src/Content/Conversation.php:593 msgid "remove" msgstr "" -#: src/Content/Conversation.php:585 +#: src/Content/Conversation.php:597 msgid "Delete Selected Items" msgstr "" -#: src/Content/Conversation.php:740 src/Content/Conversation.php:743 -#: src/Content/Conversation.php:746 src/Content/Conversation.php:749 -#: src/Content/Conversation.php:752 +#: src/Content/Conversation.php:752 src/Content/Conversation.php:755 +#: src/Content/Conversation.php:758 src/Content/Conversation.php:761 +#: src/Content/Conversation.php:764 #, php-format msgid "You had been addressed (%s)." msgstr "" -#: src/Content/Conversation.php:755 +#: src/Content/Conversation.php:767 #, php-format msgid "You are following %s." msgstr "" -#: src/Content/Conversation.php:760 +#: src/Content/Conversation.php:772 #, php-format msgid "You subscribed to %s." msgstr "" -#: src/Content/Conversation.php:762 +#: src/Content/Conversation.php:774 msgid "You subscribed to one or more tags in this post." msgstr "" -#: src/Content/Conversation.php:782 +#: src/Content/Conversation.php:794 #, php-format msgid "%s reshared this." msgstr "" -#: src/Content/Conversation.php:784 +#: src/Content/Conversation.php:796 msgid "Reshared" msgstr "" -#: src/Content/Conversation.php:784 +#: src/Content/Conversation.php:796 #, php-format msgid "Reshared by %s <%s>" msgstr "" -#: src/Content/Conversation.php:787 +#: src/Content/Conversation.php:799 #, php-format msgid "%s is participating in this thread." msgstr "" -#: src/Content/Conversation.php:790 +#: src/Content/Conversation.php:802 msgid "Stored for general reasons" msgstr "" -#: src/Content/Conversation.php:793 +#: src/Content/Conversation.php:805 msgid "Global post" msgstr "" -#: src/Content/Conversation.php:796 +#: src/Content/Conversation.php:808 msgid "Sent via an relay server" msgstr "" -#: src/Content/Conversation.php:796 +#: src/Content/Conversation.php:808 #, php-format msgid "Sent via the relay server %s <%s>" msgstr "" -#: src/Content/Conversation.php:799 +#: src/Content/Conversation.php:811 msgid "Fetched" msgstr "" -#: src/Content/Conversation.php:799 +#: src/Content/Conversation.php:811 #, php-format msgid "Fetched because of %s <%s>" msgstr "" -#: src/Content/Conversation.php:802 +#: src/Content/Conversation.php:814 msgid "Stored because of a child post to complete this thread." msgstr "" -#: src/Content/Conversation.php:805 +#: src/Content/Conversation.php:817 msgid "Local delivery" msgstr "" -#: src/Content/Conversation.php:808 +#: src/Content/Conversation.php:820 msgid "Stored because of your activity (like, comment, star, ...)" msgstr "" -#: src/Content/Conversation.php:811 +#: src/Content/Conversation.php:823 msgid "Distributed" msgstr "" -#: src/Content/Conversation.php:814 +#: src/Content/Conversation.php:826 msgid "Pushed to us" msgstr "" -#: src/Content/Conversation.php:1477 src/Object/Post.php:247 +#: src/Content/Conversation.php:1489 src/Object/Post.php:247 msgid "Pinned item" msgstr "" -#: src/Content/Conversation.php:1494 src/Object/Post.php:521 +#: src/Content/Conversation.php:1506 src/Object/Post.php:521 #: src/Object/Post.php:522 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: src/Content/Conversation.php:1507 src/Object/Post.php:509 +#: src/Content/Conversation.php:1519 src/Object/Post.php:509 msgid "Categories:" msgstr "" -#: src/Content/Conversation.php:1508 src/Object/Post.php:510 +#: src/Content/Conversation.php:1520 src/Object/Post.php:510 msgid "Filed under:" msgstr "" -#: src/Content/Conversation.php:1516 src/Object/Post.php:535 +#: src/Content/Conversation.php:1528 src/Object/Post.php:535 #, php-format msgid "%s from %s" msgstr "" -#: src/Content/Conversation.php:1532 +#: src/Content/Conversation.php:1544 msgid "View in context" msgstr "" @@ -1624,7 +1624,7 @@ msgid "" "Contact birthday events are private to you." msgstr "" -#: src/Content/GroupManager.php:152 src/Content/Nav.php:276 +#: src/Content/GroupManager.php:152 src/Content/Nav.php:278 #: src/Content/Text/HTML.php:880 src/Content/Widget.php:537 #: src/Model/User.php:1255 msgid "Groups" @@ -1647,7 +1647,7 @@ msgstr "" msgid "Create new group" msgstr "" -#: src/Content/Item.php:331 src/Model/Item.php:3002 +#: src/Content/Item.php:331 src/Model/Item.php:3004 msgid "event" msgstr "" @@ -1655,7 +1655,7 @@ msgstr "" msgid "status" msgstr "" -#: src/Content/Item.php:340 src/Model/Item.php:3004 +#: src/Content/Item.php:340 src/Model/Item.php:3006 #: src/Module/Post/Tag/Add.php:123 msgid "photo" msgstr "" @@ -1669,31 +1669,31 @@ msgstr "" msgid "Follow Thread" msgstr "" -#: src/Content/Item.php:429 src/Model/Contact.php:1211 +#: src/Content/Item.php:429 src/Model/Contact.php:1216 msgid "View Status" msgstr "" -#: src/Content/Item.php:430 src/Content/Item.php:451 src/Model/Contact.php:1160 -#: src/Model/Contact.php:1203 src/Model/Contact.php:1212 +#: src/Content/Item.php:430 src/Content/Item.php:451 src/Model/Contact.php:1165 +#: src/Model/Contact.php:1208 src/Model/Contact.php:1217 #: src/Module/Directory.php:157 src/Module/Settings/Profile/Index.php:259 msgid "View Profile" msgstr "" -#: src/Content/Item.php:431 src/Model/Contact.php:1213 +#: src/Content/Item.php:431 src/Model/Contact.php:1218 msgid "View Photos" msgstr "" -#: src/Content/Item.php:432 src/Model/Contact.php:1204 -#: src/Model/Contact.php:1214 +#: src/Content/Item.php:432 src/Model/Contact.php:1209 +#: src/Model/Contact.php:1219 msgid "Network Posts" msgstr "" -#: src/Content/Item.php:433 src/Model/Contact.php:1205 -#: src/Model/Contact.php:1215 +#: src/Content/Item.php:433 src/Model/Contact.php:1210 +#: src/Model/Contact.php:1220 msgid "View Contact" msgstr "" -#: src/Content/Item.php:434 src/Model/Contact.php:1216 +#: src/Content/Item.php:434 src/Model/Contact.php:1221 msgid "Send PM" msgstr "" @@ -1728,7 +1728,7 @@ msgid "Languages" msgstr "" #: src/Content/Item.php:448 src/Content/Widget.php:80 -#: src/Model/Contact.php:1206 src/Model/Contact.php:1217 +#: src/Model/Contact.php:1211 src/Model/Contact.php:1222 #: src/Module/Contact/Follow.php:167 view/theme/vier/theme.php:195 msgid "Connect/Follow" msgstr "" @@ -1737,79 +1737,79 @@ msgstr "" msgid "Unable to fetch user." msgstr "" -#: src/Content/Nav.php:120 +#: src/Content/Nav.php:121 msgid "Nothing new here" msgstr "" -#: src/Content/Nav.php:124 src/Module/Special/HTTPException.php:77 +#: src/Content/Nav.php:125 src/Module/Special/HTTPException.php:77 msgid "Go back" msgstr "" -#: src/Content/Nav.php:125 +#: src/Content/Nav.php:126 msgid "Clear notifications" msgstr "" -#: src/Content/Nav.php:126 src/Content/Text/HTML.php:867 +#: src/Content/Nav.php:127 src/Content/Text/HTML.php:867 msgid "@name, !group, #tags, content" msgstr "" -#: src/Content/Nav.php:220 src/Module/Security/Login.php:157 +#: src/Content/Nav.php:222 src/Module/Security/Login.php:157 msgid "Logout" msgstr "" -#: src/Content/Nav.php:220 +#: src/Content/Nav.php:222 msgid "End this session" msgstr "" -#: src/Content/Nav.php:222 src/Module/Bookmarklet.php:44 +#: src/Content/Nav.php:224 src/Module/Bookmarklet.php:44 #: src/Module/Security/Login.php:158 msgid "Login" msgstr "" -#: src/Content/Nav.php:222 +#: src/Content/Nav.php:224 msgid "Sign in" msgstr "" -#: src/Content/Nav.php:227 src/Module/BaseProfile.php:57 +#: src/Content/Nav.php:229 src/Module/BaseProfile.php:57 #: src/Module/Contact.php:512 msgid "Conversations" msgstr "" -#: src/Content/Nav.php:227 +#: src/Content/Nav.php:229 msgid "Conversations you started" msgstr "" -#: src/Content/Nav.php:228 src/Module/BaseProfile.php:49 +#: src/Content/Nav.php:230 src/Module/BaseProfile.php:49 #: src/Module/BaseSettings.php:100 src/Module/Contact.php:504 #: src/Module/Contact/Profile.php:413 src/Module/Profile/Profile.php:268 #: src/Module/Welcome.php:57 view/theme/frio/theme.php:230 msgid "Profile" msgstr "" -#: src/Content/Nav.php:228 view/theme/frio/theme.php:230 +#: src/Content/Nav.php:230 view/theme/frio/theme.php:230 msgid "Your profile page" msgstr "" -#: src/Content/Nav.php:229 src/Module/BaseProfile.php:65 +#: src/Content/Nav.php:231 src/Module/BaseProfile.php:65 #: src/Module/Media/Photo/Browser.php:74 view/theme/frio/theme.php:234 msgid "Photos" msgstr "" -#: src/Content/Nav.php:229 view/theme/frio/theme.php:234 +#: src/Content/Nav.php:231 view/theme/frio/theme.php:234 msgid "Your photos" msgstr "" -#: src/Content/Nav.php:230 src/Module/BaseProfile.php:73 +#: src/Content/Nav.php:232 src/Module/BaseProfile.php:73 #: src/Module/BaseProfile.php:76 src/Module/Contact.php:528 #: view/theme/frio/theme.php:235 msgid "Media" msgstr "" -#: src/Content/Nav.php:230 view/theme/frio/theme.php:235 +#: src/Content/Nav.php:232 view/theme/frio/theme.php:235 msgid "Your postings with media" msgstr "" -#: src/Content/Nav.php:231 src/Content/Nav.php:291 +#: src/Content/Nav.php:233 src/Content/Nav.php:295 #: src/Module/BaseProfile.php:85 src/Module/BaseProfile.php:88 #: src/Module/BaseProfile.php:96 src/Module/BaseProfile.php:99 #: src/Module/Settings/Display.php:252 view/theme/frio/theme.php:236 @@ -1817,36 +1817,36 @@ msgstr "" msgid "Calendar" msgstr "" -#: src/Content/Nav.php:231 view/theme/frio/theme.php:236 +#: src/Content/Nav.php:233 view/theme/frio/theme.php:236 msgid "Your calendar" msgstr "" -#: src/Content/Nav.php:232 +#: src/Content/Nav.php:234 msgid "Personal notes" msgstr "" -#: src/Content/Nav.php:232 +#: src/Content/Nav.php:234 msgid "Your personal notes" msgstr "" -#: src/Content/Nav.php:249 src/Content/Nav.php:306 +#: src/Content/Nav.php:251 src/Content/Nav.php:310 msgid "Home" msgstr "" -#: src/Content/Nav.php:249 src/Module/Settings/OAuth.php:73 +#: src/Content/Nav.php:251 src/Module/Settings/OAuth.php:73 msgid "Home Page" msgstr "" -#: src/Content/Nav.php:253 src/Module/Register.php:168 +#: src/Content/Nav.php:255 src/Module/Register.php:168 #: src/Module/Security/Login.php:124 msgid "Register" msgstr "" -#: src/Content/Nav.php:253 +#: src/Content/Nav.php:255 msgid "Create an account" msgstr "" -#: src/Content/Nav.php:259 src/Module/Help.php:67 +#: src/Content/Nav.php:261 src/Module/Help.php:67 #: src/Module/Settings/TwoFactor/AppSpecific.php:129 #: src/Module/Settings/TwoFactor/Index.php:118 #: src/Module/Settings/TwoFactor/Recovery.php:107 @@ -1854,158 +1854,166 @@ msgstr "" msgid "Help" msgstr "" -#: src/Content/Nav.php:259 +#: src/Content/Nav.php:261 msgid "Help and documentation" msgstr "" -#: src/Content/Nav.php:263 +#: src/Content/Nav.php:265 msgid "Apps" msgstr "" -#: src/Content/Nav.php:263 +#: src/Content/Nav.php:265 msgid "Addon applications, utilities, games" msgstr "" -#: src/Content/Nav.php:267 src/Content/Text/HTML.php:865 +#: src/Content/Nav.php:269 src/Content/Text/HTML.php:865 #: src/Module/Admin/Logs/View.php:86 src/Module/Search/Index.php:112 msgid "Search" msgstr "" -#: src/Content/Nav.php:267 +#: src/Content/Nav.php:269 msgid "Search site content" msgstr "" -#: src/Content/Nav.php:270 src/Content/Text/HTML.php:874 +#: src/Content/Nav.php:272 src/Content/Text/HTML.php:874 msgid "Full Text" msgstr "" -#: src/Content/Nav.php:271 src/Content/Text/HTML.php:875 +#: src/Content/Nav.php:273 src/Content/Text/HTML.php:875 #: src/Content/Widget/TagCloud.php:68 msgid "Tags" msgstr "" -#: src/Content/Nav.php:272 src/Content/Nav.php:327 +#: src/Content/Nav.php:274 src/Content/Nav.php:331 #: src/Content/Text/HTML.php:876 src/Module/BaseProfile.php:127 #: src/Module/BaseProfile.php:130 src/Module/Contact.php:427 #: src/Module/Contact.php:536 view/theme/frio/theme.php:243 msgid "Contacts" msgstr "" -#: src/Content/Nav.php:287 +#: src/Content/Nav.php:289 msgid "Community" msgstr "" -#: src/Content/Nav.php:287 +#: src/Content/Nav.php:289 msgid "Conversations on this and other servers" msgstr "" -#: src/Content/Nav.php:294 +#: src/Content/Nav.php:292 +msgid "Channel" +msgstr "" + +#: src/Content/Nav.php:292 +msgid "Current posts, filtered by several rules" +msgstr "" + +#: src/Content/Nav.php:298 msgid "Directory" msgstr "" -#: src/Content/Nav.php:294 +#: src/Content/Nav.php:298 msgid "People directory" msgstr "" -#: src/Content/Nav.php:296 src/Module/BaseAdmin.php:85 +#: src/Content/Nav.php:300 src/Module/BaseAdmin.php:85 #: src/Module/BaseModeration.php:108 msgid "Information" msgstr "" -#: src/Content/Nav.php:296 +#: src/Content/Nav.php:300 msgid "Information about this friendica instance" msgstr "" -#: src/Content/Nav.php:299 src/Module/Admin/Tos.php:78 +#: src/Content/Nav.php:303 src/Module/Admin/Tos.php:78 #: src/Module/BaseAdmin.php:95 src/Module/Register.php:176 #: src/Module/Tos.php:101 msgid "Terms of Service" msgstr "" -#: src/Content/Nav.php:299 +#: src/Content/Nav.php:303 msgid "Terms of Service of this Friendica instance" msgstr "" -#: src/Content/Nav.php:304 view/theme/frio/theme.php:239 +#: src/Content/Nav.php:308 view/theme/frio/theme.php:239 msgid "Network" msgstr "" -#: src/Content/Nav.php:304 view/theme/frio/theme.php:239 +#: src/Content/Nav.php:308 view/theme/frio/theme.php:239 msgid "Conversations from your friends" msgstr "" -#: src/Content/Nav.php:306 view/theme/frio/theme.php:229 +#: src/Content/Nav.php:310 view/theme/frio/theme.php:229 msgid "Your posts and conversations" msgstr "" -#: src/Content/Nav.php:310 +#: src/Content/Nav.php:314 msgid "Introductions" msgstr "" -#: src/Content/Nav.php:310 +#: src/Content/Nav.php:314 msgid "Friend Requests" msgstr "" -#: src/Content/Nav.php:311 src/Module/BaseNotifications.php:149 +#: src/Content/Nav.php:315 src/Module/BaseNotifications.php:149 #: src/Module/Notifications/Introductions.php:75 msgid "Notifications" msgstr "" -#: src/Content/Nav.php:312 +#: src/Content/Nav.php:316 msgid "See all notifications" msgstr "" -#: src/Content/Nav.php:313 src/Module/Settings/Connectors.php:244 +#: src/Content/Nav.php:317 src/Module/Settings/Connectors.php:244 msgid "Mark as seen" msgstr "" -#: src/Content/Nav.php:313 +#: src/Content/Nav.php:317 msgid "Mark all system notifications as seen" msgstr "" -#: src/Content/Nav.php:316 view/theme/frio/theme.php:241 +#: src/Content/Nav.php:320 view/theme/frio/theme.php:241 msgid "Private mail" msgstr "" -#: src/Content/Nav.php:317 +#: src/Content/Nav.php:321 msgid "Inbox" msgstr "" -#: src/Content/Nav.php:318 +#: src/Content/Nav.php:322 msgid "Outbox" msgstr "" -#: src/Content/Nav.php:322 +#: src/Content/Nav.php:326 msgid "Accounts" msgstr "" -#: src/Content/Nav.php:322 +#: src/Content/Nav.php:326 msgid "Manage other pages" msgstr "" -#: src/Content/Nav.php:325 src/Module/Admin/Addons/Details.php:114 +#: src/Content/Nav.php:329 src/Module/Admin/Addons/Details.php:114 #: src/Module/Admin/Themes/Details.php:93 src/Module/BaseSettings.php:177 #: src/Module/Welcome.php:52 view/theme/frio/theme.php:242 msgid "Settings" msgstr "" -#: src/Content/Nav.php:325 view/theme/frio/theme.php:242 +#: src/Content/Nav.php:329 view/theme/frio/theme.php:242 msgid "Account settings" msgstr "" -#: src/Content/Nav.php:327 view/theme/frio/theme.php:243 +#: src/Content/Nav.php:331 view/theme/frio/theme.php:243 msgid "Manage/edit friends and contacts" msgstr "" -#: src/Content/Nav.php:332 src/Module/BaseAdmin.php:119 +#: src/Content/Nav.php:336 src/Module/BaseAdmin.php:119 msgid "Admin" msgstr "" -#: src/Content/Nav.php:332 +#: src/Content/Nav.php:336 msgid "Site setup and configuration" msgstr "" -#: src/Content/Nav.php:333 src/Module/BaseModeration.php:127 +#: src/Content/Nav.php:337 src/Module/BaseModeration.php:127 #: src/Module/Moderation/Blocklist/Contact.php:110 #: src/Module/Moderation/Blocklist/Server/Add.php:121 #: src/Module/Moderation/Blocklist/Server/Import.php:118 @@ -2019,15 +2027,15 @@ msgstr "" msgid "Moderation" msgstr "" -#: src/Content/Nav.php:333 +#: src/Content/Nav.php:337 msgid "Content and user moderation" msgstr "" -#: src/Content/Nav.php:336 +#: src/Content/Nav.php:340 msgid "Navigation" msgstr "" -#: src/Content/Nav.php:336 +#: src/Content/Nav.php:340 msgid "Site map" msgstr "" @@ -2066,8 +2074,8 @@ msgid "" "%2$s %3$s" msgstr "" -#: src/Content/Text/BBCode.php:939 src/Model/Item.php:3744 -#: src/Model/Item.php:3750 src/Model/Item.php:3751 +#: src/Content/Text/BBCode.php:939 src/Model/Item.php:3746 +#: src/Model/Item.php:3752 src/Model/Item.php:3753 msgid "Link to source" msgstr "" @@ -2083,11 +2091,11 @@ msgstr "" msgid "Encrypted content" msgstr "" -#: src/Content/Text/BBCode.php:1897 +#: src/Content/Text/BBCode.php:1901 msgid "Invalid source protocol" msgstr "" -#: src/Content/Text/BBCode.php:1916 +#: src/Content/Text/BBCode.php:1920 msgid "Invalid link protocol" msgstr "" @@ -2235,7 +2243,7 @@ msgstr "" msgid "Organisations" msgstr "" -#: src/Content/Widget.php:536 src/Model/Contact.php:1681 +#: src/Content/Widget.php:536 src/Model/Contact.php:1687 msgid "News" msgstr "" @@ -2316,8 +2324,8 @@ msgstr "" msgid "Network:" msgstr "" -#: src/Content/Widget/VCard.php:118 src/Model/Contact.php:1207 -#: src/Model/Contact.php:1218 src/Model/Profile.php:463 +#: src/Content/Widget/VCard.php:118 src/Model/Contact.php:1212 +#: src/Model/Contact.php:1223 src/Model/Profile.php:463 #: src/Module/Contact/Profile.php:450 msgid "Unfollow" msgstr "" @@ -3070,82 +3078,82 @@ msgstr "" msgid "Edit circles" msgstr "" -#: src/Model/Contact.php:1224 src/Module/Moderation/Users/Pending.php:102 +#: src/Model/Contact.php:1229 src/Module/Moderation/Users/Pending.php:102 #: src/Module/Notifications/Introductions.php:132 #: src/Module/Notifications/Introductions.php:204 msgid "Approve" msgstr "" -#: src/Model/Contact.php:1677 +#: src/Model/Contact.php:1683 msgid "Organisation" msgstr "" -#: src/Model/Contact.php:1685 +#: src/Model/Contact.php:1691 msgid "Group" msgstr "" -#: src/Model/Contact.php:2988 +#: src/Model/Contact.php:2994 msgid "Disallowed profile URL." msgstr "" -#: src/Model/Contact.php:2993 src/Module/Friendica.php:101 +#: src/Model/Contact.php:2999 src/Module/Friendica.php:101 msgid "Blocked domain" msgstr "" -#: src/Model/Contact.php:2998 +#: src/Model/Contact.php:3004 msgid "Connect URL missing." msgstr "" -#: src/Model/Contact.php:3007 +#: src/Model/Contact.php:3013 msgid "" "The contact could not be added. Please check the relevant network " "credentials in your Settings -> Social Networks page." msgstr "" -#: src/Model/Contact.php:3025 +#: src/Model/Contact.php:3031 #, php-format msgid "Expected network %s does not match actual network %s" msgstr "" -#: src/Model/Contact.php:3042 +#: src/Model/Contact.php:3048 msgid "The profile address specified does not provide adequate information." msgstr "" -#: src/Model/Contact.php:3044 +#: src/Model/Contact.php:3050 msgid "No compatible communication protocols or feeds were discovered." msgstr "" -#: src/Model/Contact.php:3047 +#: src/Model/Contact.php:3053 msgid "An author or name was not found." msgstr "" -#: src/Model/Contact.php:3050 +#: src/Model/Contact.php:3056 msgid "No browser URL could be matched to this address." msgstr "" -#: src/Model/Contact.php:3053 +#: src/Model/Contact.php:3059 msgid "" "Unable to match @-style Identity Address with a known protocol or email " "contact." msgstr "" -#: src/Model/Contact.php:3054 +#: src/Model/Contact.php:3060 msgid "Use mailto: in front of address to force email check." msgstr "" -#: src/Model/Contact.php:3060 +#: src/Model/Contact.php:3066 msgid "" "The profile address specified belongs to a network which has been disabled " "on this site." msgstr "" -#: src/Model/Contact.php:3065 +#: src/Model/Contact.php:3071 msgid "" "Limited profile. This person will be unable to receive direct/personal " "notifications from you." msgstr "" -#: src/Model/Contact.php:3131 +#: src/Model/Contact.php:3137 msgid "Unable to retrieve contact information." msgstr "" @@ -3250,81 +3258,81 @@ msgstr "" msgid "Happy Birthday %s" msgstr "" -#: src/Model/Item.php:2061 +#: src/Model/Item.php:2063 #, php-format msgid "Detected languages in this post:\\n%s" msgstr "" -#: src/Model/Item.php:3006 +#: src/Model/Item.php:3008 msgid "activity" msgstr "" -#: src/Model/Item.php:3008 +#: src/Model/Item.php:3010 msgid "comment" msgstr "" -#: src/Model/Item.php:3011 src/Module/Post/Tag/Add.php:123 +#: src/Model/Item.php:3013 src/Module/Post/Tag/Add.php:123 msgid "post" msgstr "" -#: src/Model/Item.php:3181 -#, php-format -msgid "%s is blocked" -msgstr "" - #: src/Model/Item.php:3183 #, php-format -msgid "%s is ignored" +msgid "%s is blocked" msgstr "" #: src/Model/Item.php:3185 #, php-format +msgid "%s is ignored" +msgstr "" + +#: src/Model/Item.php:3187 +#, php-format msgid "Content from %s is collapsed" msgstr "" -#: src/Model/Item.php:3189 +#: src/Model/Item.php:3191 #, php-format msgid "Content warning: %s" msgstr "" -#: src/Model/Item.php:3651 +#: src/Model/Item.php:3653 msgid "bytes" msgstr "" -#: src/Model/Item.php:3682 +#: src/Model/Item.php:3684 #, php-format msgid "%2$s (%3$d%%, %1$d vote)" msgid_plural "%2$s (%3$d%%, %1$d votes)" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3684 +#: src/Model/Item.php:3686 #, php-format msgid "%2$s (%1$d vote)" msgid_plural "%2$s (%1$d votes)" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3689 +#: src/Model/Item.php:3691 #, php-format msgid "%d voter. Poll end: %s" msgid_plural "%d voters. Poll end: %s" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3691 +#: src/Model/Item.php:3693 #, php-format msgid "%d voter." msgid_plural "%d voters." msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3693 +#: src/Model/Item.php:3695 #, php-format msgid "Poll end: %s" msgstr "" -#: src/Model/Item.php:3727 src/Model/Item.php:3728 +#: src/Model/Item.php:3729 src/Model/Item.php:3730 msgid "View on separate page" msgstr "" @@ -6124,7 +6132,7 @@ msgstr[0] "" msgstr[1] "" #: src/Module/Contact/Follow.php:70 src/Module/Contact/Redir.php:62 -#: src/Module/Contact/Redir.php:222 src/Module/Conversation/Community.php:194 +#: src/Module/Contact/Redir.php:222 src/Module/Conversation/Community.php:195 #: src/Module/Debug/ItemBody.php:38 src/Module/Diaspora/Receive.php:57 #: src/Module/Item/Display.php:96 src/Module/Item/Feed.php:59 #: src/Module/Item/Follow.php:41 src/Module/Item/Ignore.php:41 @@ -6518,6 +6526,51 @@ msgstr "" msgid "Unable to unfollow this contact, please contact your administrator" msgstr "" +#: src/Module/Conversation/Channel.php:83 +msgid "Whats Hot" +msgstr "" + +#: src/Module/Conversation/Channel.php:86 +msgid "Posts with a lot of interactions" +msgstr "" + +#: src/Module/Conversation/Channel.php:92 +msgid "For you" +msgstr "" + +#: src/Module/Conversation/Channel.php:95 +msgid "Posts from contacts you interact with and who interact with you" +msgstr "" + +#: src/Module/Conversation/Channel.php:104 +msgid "Posts from your followers that you don't follow" +msgstr "" + +#: src/Module/Conversation/Channel.php:136 +#: src/Module/Conversation/Community.php:134 +msgid "Own Contacts" +msgstr "" + +#: src/Module/Conversation/Channel.php:140 +#: src/Module/Conversation/Community.php:138 +msgid "Include" +msgstr "" + +#: src/Module/Conversation/Channel.php:141 +#: src/Module/Conversation/Community.php:139 +msgid "Hide" +msgstr "" + +#: src/Module/Conversation/Channel.php:157 +#: src/Module/Conversation/Community.php:157 src/Module/Search/Index.php:152 +#: src/Module/Search/Index.php:194 +msgid "No results." +msgstr "" + +#: src/Module/Conversation/Channel.php:197 +msgid "Channel not available." +msgstr "" + #: src/Module/Conversation/Community.php:74 msgid "" "This community stream shows all public posts received by this node. They may " @@ -6540,28 +6593,11 @@ msgstr "" msgid "Posts from users of the whole federated network" msgstr "" -#: src/Module/Conversation/Community.php:134 -msgid "Own Contacts" -msgstr "" - -#: src/Module/Conversation/Community.php:138 -msgid "Include" -msgstr "" - -#: src/Module/Conversation/Community.php:139 -msgid "Hide" -msgstr "" - -#: src/Module/Conversation/Community.php:156 src/Module/Search/Index.php:152 -#: src/Module/Search/Index.php:194 -msgid "No results." -msgstr "" - -#: src/Module/Conversation/Community.php:212 +#: src/Module/Conversation/Community.php:213 msgid "Community option not available." msgstr "" -#: src/Module/Conversation/Community.php:228 +#: src/Module/Conversation/Community.php:229 msgid "Not available." msgstr "" diff --git a/view/templates/nav.tpl b/view/templates/nav.tpl index b7a332d99..f3aecc710 100644 --- a/view/templates/nav.tpl +++ b/view/templates/nav.tpl @@ -32,6 +32,9 @@ {{$nav.home.1}} {{/if}} + {{if $nav.channel}} + {{$nav.channel.1}} + {{/if}} {{if $nav.community}} {{$nav.community.1}} {{/if}} diff --git a/view/templates/widget/community_sharer.tpl b/view/templates/widget/community_sharer.tpl index 591d2a62f..7b2c0f847 100644 --- a/view/templates/widget/community_sharer.tpl +++ b/view/templates/widget/community_sharer.tpl @@ -6,8 +6,8 @@

{{$title}}