From d68572ea44ccf76bdff8e951df94074702d8cac4 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 19 Sep 2023 09:05:28 +0000 Subject: [PATCH 01/31] Channels can now be created by users --- database.sql | 20 +++- doc/database.md | 1 + doc/database/db_channel.md | 36 +++++++ src/Content/Conversation/Entity/Timeline.php | 41 +++++-- src/Content/Conversation/Factory/Timeline.php | 39 ++++++- .../Conversation/Repository/Channel.php | 100 ++++++++++++++++++ src/DI.php | 8 ++ src/Module/Conversation/Channel.php | 9 +- src/Module/Conversation/Community.php | 5 +- src/Module/Conversation/Network.php | 16 +-- src/Module/Conversation/Timeline.php | 42 +++++++- src/Module/Update/Channel.php | 2 +- src/Module/Update/Network.php | 2 +- static/dbstructure.config.php | 20 +++- 14 files changed, 306 insertions(+), 35 deletions(-) create mode 100644 doc/database/db_channel.md create mode 100644 src/Content/Conversation/Repository/Channel.php diff --git a/database.sql b/database.sql index 329381b95b..8598f6fe60 100644 --- a/database.sql +++ b/database.sql @@ -1,6 +1,6 @@ -- ------------------------------------------ -- Friendica 2023.09-dev (Giant Rhubarb) --- DB_UPDATE_VERSION 1534 +-- DB_UPDATE_VERSION 1535 -- ------------------------------------------ @@ -492,6 +492,24 @@ CREATE TABLE IF NOT EXISTS `cache` ( INDEX `k_expires` (`k`,`expires`) ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Stores temporary data'; +-- +-- TABLE channel +-- +CREATE TABLE IF NOT EXISTS `channel` ( + `id` int unsigned NOT NULL auto_increment COMMENT '', + `uid` mediumint unsigned NOT NULL COMMENT 'User id', + `label` varchar(64) NOT NULL COMMENT 'Channel label', + `description` varchar(64) COMMENT 'Channel description', + `access-key` varchar(1) COMMENT 'Access key', + `include-tags` varchar(255) COMMENT 'Comma separated list of tags that will be included in the channel', + `exclude-tags` varchar(255) COMMENT 'Comma separated list of tags that aren\'t allowed in the channel', + `full-text-search` varchar(255) COMMENT 'Full text search pattern, see https://mariadb.com/kb/en/full-text-index-overview/#in-boolean-mode', + `media-type` smallint unsigned COMMENT 'Filtered media types', + PRIMARY KEY(`id`), + INDEX `uid` (`uid`), + FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE +) DEFAULT COLLATE utf8mb4_general_ci COMMENT='User defined Channels'; + -- -- TABLE config -- diff --git a/doc/database.md b/doc/database.md index 25b9baefb1..516be3bae1 100644 --- a/doc/database.md +++ b/doc/database.md @@ -17,6 +17,7 @@ Database Tables | [arrived-activity](help/database/db_arrived-activity) | Id of arrived activities | | [attach](help/database/db_attach) | file attachments | | [cache](help/database/db_cache) | Stores temporary data | +| [channel](help/database/db_channel) | User defined Channels | | [config](help/database/db_config) | main configuration storage | | [contact](help/database/db_contact) | contact table | | [contact-relation](help/database/db_contact-relation) | Contact relations | diff --git a/doc/database/db_channel.md b/doc/database/db_channel.md new file mode 100644 index 0000000000..1d5bfc73e4 --- /dev/null +++ b/doc/database/db_channel.md @@ -0,0 +1,36 @@ +Table channel +=========== + +User defined Channels + +Fields +------ + +| Field | Description | Type | Null | Key | Default | Extra | +| ---------------- | ------------------------------------------------------------------------------------------------- | ------------------ | ---- | --- | ------- | -------------- | +| id | | int unsigned | NO | PRI | NULL | auto_increment | +| uid | User id | mediumint unsigned | NO | | NULL | | +| label | Channel label | varchar(64) | NO | | NULL | | +| description | Channel description | varchar(64) | YES | | NULL | | +| access-key | Access key | varchar(1) | YES | | NULL | | +| include-tags | Comma separated list of tags that will be included in the channel | varchar(255) | YES | | NULL | | +| exclude-tags | Comma separated list of tags that aren't allowed in the channel | varchar(255) | YES | | NULL | | +| full-text-search | Full text search pattern, see https://mariadb.com/kb/en/full-text-index-overview/#in-boolean-mode | varchar(255) | YES | | NULL | | +| media-type | Filtered media types | smallint unsigned | YES | | NULL | | + +Indexes +------------ + +| Name | Fields | +| ------- | ------ | +| PRIMARY | id | +| uid | uid | + +Foreign Keys +------------ + +| Field | Target Table | Target Field | +|-------|--------------|--------------| +| uid | [user](help/database/db_user) | uid | + +Return to [database documentation](help/database) diff --git a/src/Content/Conversation/Entity/Timeline.php b/src/Content/Conversation/Entity/Timeline.php index b9ab1e1a01..ce9e3c62fc 100644 --- a/src/Content/Conversation/Entity/Timeline.php +++ b/src/Content/Conversation/Entity/Timeline.php @@ -22,11 +22,15 @@ namespace Friendica\Content\Conversation\Entity; /** - * @property-read string $code Channel code - * @property-read string $label Channel label - * @property-read string $description Channel description - * @property-read string $accessKey Access key - * @property-read string $path Path + * @property-read string $code Channel code + * @property-read string $label Channel label + * @property-read string $description Channel description + * @property-read string $accessKey Access key + * @property-read string $path Path + * @property-read int $uid User of the channel + * @property-read string $includeTags The tags to include in the channel + * @property-read string $excludeTags The tags to exclude in the channel + * @property-read string $fullTextSearch full text search pattern */ final class Timeline extends \Friendica\BaseEntity { @@ -56,13 +60,28 @@ final class Timeline extends \Friendica\BaseEntity protected $accessKey; /** @var string */ protected $path; + /** @var int */ + protected $uid; + /** @var string */ + protected $includeTags; + /** @var string */ + protected $excludeTags; + /** @var string */ + protected $fullTextSearch; + /** @var int */ + protected $mediaType; - public function __construct(string $code, string $label, string $description, string $accessKey, string $path = null) + public function __construct(string $code = null, string $label = null, string $description = null, string $accessKey = null, string $path = null, int $uid = null, string $includeTags = null, string $excludeTags = null, string $fullTextSearch = null, int $mediaType = null) { - $this->code = $code; - $this->label = $label; - $this->description = $description; - $this->accessKey = $accessKey; - $this->path = $path; + $this->code = $code; + $this->label = $label; + $this->description = $description; + $this->accessKey = $accessKey; + $this->path = $path; + $this->uid = $uid; + $this->includeTags = $includeTags; + $this->excludeTags = $excludeTags; + $this->fullTextSearch = $fullTextSearch; + $this->mediaType = $mediaType; } } diff --git a/src/Content/Conversation/Factory/Timeline.php b/src/Content/Conversation/Factory/Timeline.php index 817f617131..0e4c0b76d6 100644 --- a/src/Content/Conversation/Factory/Timeline.php +++ b/src/Content/Conversation/Factory/Timeline.php @@ -21,27 +21,48 @@ namespace Friendica\Content\Conversation\Factory; +use Friendica\Capabilities\ICanCreateFromTableRow; use Friendica\Content\Conversation\Collection\Timelines; use Friendica\Model\User; use Friendica\Content\Conversation\Entity\Timeline as TimelineEntity; +use Friendica\Content\Conversation\Repository\Channel; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\L10n; use Friendica\Module\Conversation\Community; use Psr\Log\LoggerInterface; -final class Timeline extends \Friendica\BaseFactory +final class Timeline extends \Friendica\BaseFactory implements ICanCreateFromTableRow { /** @var L10n */ protected $l10n; /** @var IManageConfigValues The config */ protected $config; + /** @var Channel */ + protected $channel; - public function __construct(L10n $l10n, LoggerInterface $logger, IManageConfigValues $config) + public function __construct(Channel $channel, L10n $l10n, LoggerInterface $logger, IManageConfigValues $config) { parent::__construct($logger); - $this->l10n = $l10n; - $this->config = $config; + $this->channel = $channel; + $this->l10n = $l10n; + $this->config = $config; + } + + public function createFromTableRow(array $row): TimelineEntity + { + return new TimelineEntity( + $row['id'] ?? null, + $row['label'], + $row['description'] ?? null, + $row['access-key'] ?? null, + null, + $row['uid'], + $row['include-tags'] ?? null, + $row['exclude-tags'] ?? null, + $row['full-text-search'] ?? null, + $row['media-type'] ?? null, + ); } /** @@ -65,6 +86,11 @@ final class Timeline extends \Friendica\BaseFactory new TimelineEntity(TimelineEntity::AUDIO, $this->l10n->t('Audio'), $this->l10n->t('Posts with audio'), 'd'), new TimelineEntity(TimelineEntity::VIDEO, $this->l10n->t('Videos'), $this->l10n->t('Posts with videos'), 'v'), ]; + + foreach ($this->channel->selectByUid($uid) as $channel) { + $tabs[] = $channel; + } + return new Timelines($tabs); } @@ -113,8 +139,11 @@ final class Timeline extends \Friendica\BaseFactory return in_array($selectedTab, [TimelineEntity::LOCAL, TimelineEntity::GLOBAL]); } - public function isChannel(string $selectedTab): bool + public function isChannel(string $selectedTab, int $uid): bool { + if (is_numeric($selectedTab) && $uid && $this->channel->existsById($selectedTab, $uid)) { + return true; + } return in_array($selectedTab, [TimelineEntity::WHATSHOT, TimelineEntity::FORYOU, TimelineEntity::FOLLOWERS, TimelineEntity::SHARERSOFSHARERS, TimelineEntity::IMAGE, TimelineEntity::VIDEO, TimelineEntity::AUDIO, TimelineEntity::LANGUAGE]); } } diff --git a/src/Content/Conversation/Repository/Channel.php b/src/Content/Conversation/Repository/Channel.php new file mode 100644 index 0000000000..a88a2f5776 --- /dev/null +++ b/src/Content/Conversation/Repository/Channel.php @@ -0,0 +1,100 @@ +. + * + */ + +namespace Friendica\Content\Conversation\Repository; + +use Friendica\BaseCollection; +use Friendica\Content\Conversation\Entity\Timeline as EntityTimeline; +use Friendica\Content\Conversation\Factory\Timeline; +use Friendica\Database\Database; +use Psr\Log\LoggerInterface; + +class Channel extends \Friendica\BaseRepository +{ + protected static $table_name = 'channel'; + + public function __construct(Database $database, LoggerInterface $logger, Timeline $factory) + { + parent::__construct($database, $logger, $factory); + } + + /** + * Fetch a single user channel + * + * @param int $id + * @param int $uid + * @return EntityTimeline + * @throws \Friendica\Network\HTTPException\NotFoundException + */ + public function selectById(int $id, int $uid): EntityTimeline + { + return $this->_selectOne(['id' => $id, 'uid' => $uid]); + } + + /** + * Checks if the provided channel id exists for this user + * + * @param integer $id + * @param integer $uid + * @return boolean + */ + public function existsById(int $id, int $uid): bool + { + return $this->exists(['id' => $id, 'uid' => $uid]); + } + + /** + * Fetch all user channels + * + * @param integer $uid + * @return BaseCollection + */ + public function selectByUid(int $uid): BaseCollection + { + return $this->_select(['uid' => $uid]); + } + + public function save(EntityTimeline $Channel): EntityTimeline + { + $fields = [ + 'label' => $Channel->label, + 'description' => $Channel->description, + 'access-key' => $Channel->accessKey, + 'uid' => $Channel->uid, + 'include-tags' => $Channel->includeTags, + 'exclude-tags' => $Channel->excludeTags, + 'full-text-search' => $Channel->fullTextSearch, + 'media-type' => $Channel->mediaType, + ]; + + if ($Channel->code) { + $this->db->update(self::$table_name, $fields, ['uid' => $Channel->uid, 'id' => $Channel->code]); + } else { + $this->db->insert(self::$table_name, $fields, Database::INSERT_IGNORE); + + $newChannelId = $this->db->lastInsertId(); + + $Channel = $this->selectById($newChannelId, $Channel->uid); + } + + return $Channel; + } +} diff --git a/src/DI.php b/src/DI.php index 681c8fcbc1..7c221b5efe 100644 --- a/src/DI.php +++ b/src/DI.php @@ -555,6 +555,14 @@ abstract class DI return self::$dice->create(Content\Conversation\Factory\Timeline::class); } + /** + * @return Content\Conversation\Repository\Channel + */ + public static function ChannelRepository() + { + return self::$dice->create(Content\Conversation\Repository\Channel::class); + } + /** * @return Contact\Introduction\Repository\Introduction */ diff --git a/src/Module/Conversation/Channel.php b/src/Module/Conversation/Channel.php index 35c988ce7c..9bb3a42333 100644 --- a/src/Module/Conversation/Channel.php +++ b/src/Module/Conversation/Channel.php @@ -27,6 +27,7 @@ use Friendica\Content\BoundariesPager; use Friendica\Content\Conversation; use Friendica\Content\Conversation\Entity\Timeline as TimelineEntity; use Friendica\Content\Conversation\Factory\Timeline as TimelineFactory; +use Friendica\Content\Conversation\Repository\Channel as RepositoryChannel; use Friendica\Content\Feature; use Friendica\Content\Nav; use Friendica\Content\Text\HTML; @@ -57,9 +58,9 @@ class Channel extends Timeline /** @var SystemMessages */ protected $systemMessages; - public function __construct(TimelineFactory $timeline, Conversation $conversation, App\Page $page, SystemMessages $systemMessages, Mode $mode, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) + public function __construct(RepositoryChannel $channel, TimelineFactory $timeline, Conversation $conversation, App\Page $page, SystemMessages $systemMessages, Mode $mode, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) { - parent::__construct($mode, $session, $database, $pConfig, $config, $cache, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); + parent::__construct($channel, $mode, $session, $database, $pConfig, $config, $cache, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); $this->timeline = $timeline; $this->conversation = $conversation; @@ -109,7 +110,7 @@ class Channel extends Timeline $o .= $this->conversation->statusEditor([], 0, true); } - if ($this->timeline->isChannel($this->selectedTab)) { + if ($this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId())) { $items = $this->getChannelItems(); $order = 'created'; } else { @@ -155,7 +156,7 @@ class Channel extends Timeline $this->selectedTab = TimelineEntity::FORYOU; } - if (!$this->timeline->isChannel($this->selectedTab) && !$this->timeline->isCommunity($this->selectedTab)) { + if (!$this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId()) && !$this->timeline->isCommunity($this->selectedTab)) { throw new HTTPException\BadRequestException($this->l10n->t('Channel not available.')); } diff --git a/src/Module/Conversation/Community.php b/src/Module/Conversation/Community.php index 42f5620967..75f937d351 100644 --- a/src/Module/Conversation/Community.php +++ b/src/Module/Conversation/Community.php @@ -28,6 +28,7 @@ use Friendica\Content\BoundariesPager; use Friendica\Content\Conversation; use Friendica\Content\Conversation\Entity\Timeline as TimelineEntity; use Friendica\Content\Conversation\Factory\Timeline as TimelineFactory; +use Friendica\Content\Conversation\Repository\Channel; use Friendica\Content\Feature; use Friendica\Content\Nav; use Friendica\Content\Text\HTML; @@ -69,9 +70,9 @@ class Community extends Timeline /** @var SystemMessages */ protected $systemMessages; - public function __construct(TimelineFactory $timeline, Conversation $conversation, App\Page $page, SystemMessages $systemMessages, Mode $mode, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) + public function __construct(Channel $channel, TimelineFactory $timeline, Conversation $conversation, App\Page $page, SystemMessages $systemMessages, Mode $mode, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) { - parent::__construct($mode, $session, $database, $pConfig, $config, $cache, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); + parent::__construct($channel, $mode, $session, $database, $pConfig, $config, $cache, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); $this->timeline = $timeline; $this->conversation = $conversation; diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php index 21ead331f0..04f3f232f5 100644 --- a/src/Module/Conversation/Network.php +++ b/src/Module/Conversation/Network.php @@ -27,6 +27,7 @@ use Friendica\Content\BoundariesPager; use Friendica\Content\Conversation; use Friendica\Content\Conversation\Entity\Timeline as TimelineEntity; use Friendica\Content\Conversation\Factory\Timeline as TimelineFactory; +use Friendica\Content\Conversation\Repository\Channel; use Friendica\Content\Feature; use Friendica\Content\GroupManager; use Friendica\Content\Nav; @@ -96,9 +97,9 @@ class Network extends Timeline /** @var TimelineFactory */ protected $timeline; - public function __construct(App $app, TimelineFactory $timeline, SystemMessages $systemMessages, Mode $mode, Conversation $conversation, App\Page $page, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) + public function __construct(Channel $channel, App $app, TimelineFactory $timeline, SystemMessages $systemMessages, Mode $mode, Conversation $conversation, App\Page $page, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) { - parent::__construct($mode, $session, $database, $pConfig, $config, $cache, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); + parent::__construct($channel, $mode, $session, $database, $pConfig, $config, $cache, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); $this->app = $app; $this->timeline = $timeline; @@ -125,7 +126,7 @@ class Network extends Timeline $o = ''; - if ($this->timeline->isChannel($this->selectedTab)) { + if ($this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId())) { if (!in_array($this->selectedTab, [TimelineEntity::FOLLOWERS, TimelineEntity::FORYOU]) && $this->config->get('system', 'community_no_sharer')) { $this->page['aside'] .= $this->getNoSharerWidget($module); } @@ -274,7 +275,6 @@ class Network extends Timeline */ private function getTabsHTML() { - // @todo user confgurable selection of tabs $tabs = $this->getTabArray($this->timeline->getNetworkFeeds($this->args->getCommand()), 'network'); $network_timelines = $this->pConfig->get($this->session->getLocalUserId(), 'system', 'network_timelines', []); @@ -289,7 +289,7 @@ class Network extends Timeline if (!empty($network_timelines)) { $tabs = []; - foreach (array_keys($arr['tabs']) as $tab) { + foreach (array_column($arr['tabs'], 'code') as $tab) { if (in_array($tab, $network_timelines)) { $tabs[] = $arr['tabs'][$tab]; } @@ -313,11 +313,11 @@ class Network extends Timeline if (!$this->selectedTab) { $this->selectedTab = self::getTimelineOrderBySession($this->session, $this->pConfig); - } elseif (!$this->timeline->isChannel($this->selectedTab) && !$this->timeline->isCommunity($this->selectedTab)) { + } elseif (!$this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId()) && !$this->timeline->isCommunity($this->selectedTab)) { throw new HTTPException\BadRequestException($this->l10n->t('Network feed not available.')); } - if (($this->network || $this->circleId || $this->groupContactId) && ($this->timeline->isChannel($this->selectedTab) || $this->timeline->isCommunity($this->selectedTab))) { + if (($this->network || $this->circleId || $this->groupContactId) && ($this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId()) || $this->timeline->isCommunity($this->selectedTab))) { $this->selectedTab = TimelineEntity::RECEIVED; } @@ -342,7 +342,7 @@ class Network extends Timeline $this->mention = false; } elseif (in_array($this->selectedTab, [TimelineEntity::RECEIVED, TimelineEntity::STAR]) || $this->timeline->isCommunity($this->selectedTab)) { $this->order = 'received'; - } elseif (($this->selectedTab == TimelineEntity::CREATED) || $this->timeline->isChannel($this->selectedTab)) { + } elseif (($this->selectedTab == TimelineEntity::CREATED) || $this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId())) { $this->order = 'created'; } else { $this->order = 'commented'; diff --git a/src/Module/Conversation/Timeline.php b/src/Module/Conversation/Timeline.php index 1a4d98e61c..9c53634ea8 100644 --- a/src/Module/Conversation/Timeline.php +++ b/src/Module/Conversation/Timeline.php @@ -26,6 +26,7 @@ use Friendica\App\Mode; use Friendica\BaseModule; use Friendica\Content\Conversation\Collection\Timelines; use Friendica\Content\Conversation\Entity\Timeline as TimelineEntity; +use Friendica\Content\Conversation\Repository\Channel; use Friendica\Core\Cache\Capability\ICanCache; use Friendica\Core\Cache\Enum\Duration; use Friendica\Core\Config\Capability\IManageConfigValues; @@ -79,11 +80,14 @@ class Timeline extends BaseModule protected $config; /** @var ICanCache */ protected $cache; + /** @var Channel */ + protected $channel; - public function __construct(Mode $mode, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) + public function __construct(Channel $channel, Mode $mode, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) { parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); + $this->channel = $channel; $this->mode = $mode; $this->session = $session; $this->database = $database; @@ -176,6 +180,7 @@ class Timeline extends BaseModule $path = $tab->path ?? $prefix . '/' . $tab->code; } $tabs[$tab->code] = [ + 'code' => $tab->code, 'label' => $tab->label, 'url' => $path, 'sel' => $this->selectedTab == $tab->code ? 'active' : '', @@ -300,6 +305,8 @@ class Timeline extends BaseModule $condition = ["`media-type` & ?", 4]; } elseif ($this->selectedTab == TimelineEntity::LANGUAGE) { $condition = ["JSON_EXTRACT(JSON_KEYS(language), '$[0]') = ?", $this->l10n->convertCodeForLanguageDetection(User::getLanguageCode($uid))]; + } elseif (is_numeric($this->selectedTab)) { + $condition = $this->getUserChannelConditions($this->selectedTab, $this->session->getLocalUserId()); } if ($this->selectedTab != TimelineEntity::LANGUAGE) { @@ -359,6 +366,39 @@ class Timeline extends BaseModule return $items; } + private function getUserChannelConditions(int $id, int $uid): array + { + $channel = $this->channel->selectById($id, $uid); + if (empty($channel)) { + return []; + } + + $condition = []; + + if (!empty($channel->fullTextSearch)) { + $first = $this->database->selectFirst('post-engagement', ['uri-id']); + $condition = DBA::mergeConditions($condition, ["`uri-id` IN (SELECT `uri-id` FROM `post-content` WHERE `uri-id` >= ? AND MATCH (`title`, `content-warning`, `body`) AGAINST (? IN BOOLEAN MODE))", $first['uri-id'], $channel->fullTextSearch]); + } + + if (!empty($channel->includeTags)) { + $search = explode(',', mb_strtolower($channel->includeTags)); + $placeholders = substr(str_repeat("?, ", count($search)), 0, -2); + $condition = DBA::mergeConditions($condition, array_merge(["`uri-id` IN (SELECT `uri-id` FROM `post-tag` INNER JOIN `tag` ON `tag`.`id` = `post-tag`.`tid` WHERE `post-tag`.`type` = 1 AND `name` IN (" . $placeholders . "))"], $search)); + } + + if (!empty($channel->excludeTags)) { + $search = explode(',', mb_strtolower($channel->excludeTags)); + $placeholders = substr(str_repeat("?, ", count($search)), 0, -2); + $condition = DBA::mergeConditions($condition, array_merge(["NOT `uri-id` IN (SELECT `uri-id` FROM `post-tag` INNER JOIN `tag` ON `tag`.`id` = `post-tag`.`tid` WHERE `post-tag`.`type` = 1 AND `name` IN (" . $placeholders . "))"], $search)); + } + + if (!empty($channel->mediaType)) { + $condition = DBA::mergeConditions($condition, ["`media-type` & ?", $channel->mediaType]); + } + + return $condition; + } + private function addLanguageCondition(int $uid, array $condition): array { $conditions = []; diff --git a/src/Module/Update/Channel.php b/src/Module/Update/Channel.php index ac35d9c26b..0abe036d6f 100644 --- a/src/Module/Update/Channel.php +++ b/src/Module/Update/Channel.php @@ -38,7 +38,7 @@ class Channel extends ChannelModule $o = ''; if ($this->update || $this->force) { - if ($this->timeline->isChannel($this->selectedTab)) { + if ($this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId())) { $items = $this->getChannelItems(); } else { $items = $this->getCommunityItems(); diff --git a/src/Module/Update/Network.php b/src/Module/Update/Network.php index e8a2dce07d..612d4079c8 100644 --- a/src/Module/Update/Network.php +++ b/src/Module/Update/Network.php @@ -41,7 +41,7 @@ class Network extends NetworkModule System::htmlUpdateExit($o); } - if ($this->timeline->isChannel($this->selectedTab)) { + if ($this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId())) { $items = $this->getChannelItems(); } elseif ($this->timeline->isCommunity($this->selectedTab)) { $items = $this->getCommunityItems(); diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index 606173b817..e918a44913 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', 1534); + define('DB_UPDATE_VERSION', 1535); } return [ @@ -551,6 +551,24 @@ return [ "k_expires" => ["k", "expires"], ] ], + "channel" => [ + "comment" => "User defined Channels", + "fields" => [ + "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""], + "uid" => ["type" => "mediumint unsigned", "not null" => "1", "foreign" => ["user" => "uid"], "comment" => "User id"], + "label" => ["type" => "varchar(64)", "not null" => "1", "comment" => "Channel label"], + "description" => ["type" => "varchar(64)", "comment" => "Channel description"], + "access-key" => ["type" => "varchar(1)", "comment" => "Access key"], + "include-tags" => ["type" => "varchar(255)", "comment" => "Comma separated list of tags that will be included in the channel"], + "exclude-tags" => ["type" => "varchar(255)", "comment" => "Comma separated list of tags that aren't allowed in the channel"], + "full-text-search" => ["type" => "varchar(255)", "comment" => "Full text search pattern, see https://mariadb.com/kb/en/full-text-index-overview/#in-boolean-mode"], + "media-type" => ["type" => "smallint unsigned", "comment" => "Filtered media types"], + ], + "indexes" => [ + "PRIMARY" => ["id"], + "uid" => ["uid"], + ] + ], "config" => [ "comment" => "main configuration storage", "fields" => [ From a2f119e18ea276776a46d3deafe9b2bd89bbfcef Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 19 Sep 2023 09:09:20 +0000 Subject: [PATCH 02/31] Fix code standards --- src/Content/Conversation/Repository/Channel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Content/Conversation/Repository/Channel.php b/src/Content/Conversation/Repository/Channel.php index a88a2f5776..7c4fe1dcd4 100644 --- a/src/Content/Conversation/Repository/Channel.php +++ b/src/Content/Conversation/Repository/Channel.php @@ -38,7 +38,7 @@ class Channel extends \Friendica\BaseRepository /** * Fetch a single user channel - * + * * @param int $id * @param int $uid * @return EntityTimeline From 00eb6b01ff62fbb98e1e619a35cc160df3c828ff Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 19 Sep 2023 09:23:27 +0000 Subject: [PATCH 03/31] Fix selected timelines --- src/Module/Conversation/Network.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php index 04f3f232f5..095b2ccebe 100644 --- a/src/Module/Conversation/Network.php +++ b/src/Module/Conversation/Network.php @@ -289,9 +289,9 @@ class Network extends Timeline if (!empty($network_timelines)) { $tabs = []; - foreach (array_column($arr['tabs'], 'code') as $tab) { - if (in_array($tab, $network_timelines)) { - $tabs[] = $arr['tabs'][$tab]; + foreach ($arr['tabs'] as $tab) { + if (in_array($tab['code'], $network_timelines)) { + $tabs[] = $tab; } } } else { From 5056c95d60a3e2e891ab1da0196d52d2c8f80712 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 19 Sep 2023 10:20:15 +0000 Subject: [PATCH 04/31] Show network elements in the channel widget --- src/Content/Conversation/Factory/Timeline.php | 5 +++++ src/Content/Widget.php | 4 ++++ src/Module/Conversation/Network.php | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Content/Conversation/Factory/Timeline.php b/src/Content/Conversation/Factory/Timeline.php index 0e4c0b76d6..2a6e12330f 100644 --- a/src/Content/Conversation/Factory/Timeline.php +++ b/src/Content/Conversation/Factory/Timeline.php @@ -134,6 +134,11 @@ final class Timeline extends \Friendica\BaseFactory implements ICanCreateFromTab return new Timelines($tabs); } + public function isNetwork(string $selectedTab): bool + { + return in_array($selectedTab, [TimelineEntity::COMMENTED, TimelineEntity::RECEIVED, TimelineEntity::CREATED, TimelineEntity::MENTION, TimelineEntity::STAR]); + } + public function isCommunity(string $selectedTab): bool { return in_array($selectedTab, [TimelineEntity::LOCAL, TimelineEntity::GLOBAL]); diff --git a/src/Content/Widget.php b/src/Content/Widget.php index 1f73f04495..486bada7d5 100644 --- a/src/Content/Widget.php +++ b/src/Content/Widget.php @@ -560,6 +560,10 @@ class Widget { $channels = []; + foreach (DI::TimelineFactory()->getNetworkFeeds('') as $channel) { + $channels[] = ['ref' => $channel->code, 'name' => $channel->label]; + } + foreach (DI::TimelineFactory()->getChannelsForUser($uid) as $channel) { $channels[] = ['ref' => $channel->code, 'name' => $channel->label]; } diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php index 095b2ccebe..c05a06d393 100644 --- a/src/Module/Conversation/Network.php +++ b/src/Module/Conversation/Network.php @@ -313,7 +313,7 @@ class Network extends Timeline if (!$this->selectedTab) { $this->selectedTab = self::getTimelineOrderBySession($this->session, $this->pConfig); - } elseif (!$this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId()) && !$this->timeline->isCommunity($this->selectedTab)) { + } elseif (!$this->timeline->isNetwork($this->selectedTab) && !$this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId()) && !$this->timeline->isCommunity($this->selectedTab)) { throw new HTTPException\BadRequestException($this->l10n->t('Network feed not available.')); } From 63921ccfcac6e0c6be6964e811eb0536b6b2a419 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 19 Sep 2023 14:23:02 +0000 Subject: [PATCH 05/31] Changed class names --- src/Content/Conversation/Repository/Channel.php | 8 ++++---- src/Module/Conversation/Channel.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Content/Conversation/Repository/Channel.php b/src/Content/Conversation/Repository/Channel.php index 7c4fe1dcd4..c067c5d7a9 100644 --- a/src/Content/Conversation/Repository/Channel.php +++ b/src/Content/Conversation/Repository/Channel.php @@ -22,7 +22,7 @@ namespace Friendica\Content\Conversation\Repository; use Friendica\BaseCollection; -use Friendica\Content\Conversation\Entity\Timeline as EntityTimeline; +use Friendica\Content\Conversation\Entity\Timeline as TimelineEntity; use Friendica\Content\Conversation\Factory\Timeline; use Friendica\Database\Database; use Psr\Log\LoggerInterface; @@ -41,10 +41,10 @@ class Channel extends \Friendica\BaseRepository * * @param int $id * @param int $uid - * @return EntityTimeline + * @return TimelineEntity * @throws \Friendica\Network\HTTPException\NotFoundException */ - public function selectById(int $id, int $uid): EntityTimeline + public function selectById(int $id, int $uid): TimelineEntity { return $this->_selectOne(['id' => $id, 'uid' => $uid]); } @@ -72,7 +72,7 @@ class Channel extends \Friendica\BaseRepository return $this->_select(['uid' => $uid]); } - public function save(EntityTimeline $Channel): EntityTimeline + public function save(TimelineEntity $Channel): TimelineEntity { $fields = [ 'label' => $Channel->label, diff --git a/src/Module/Conversation/Channel.php b/src/Module/Conversation/Channel.php index 9bb3a42333..3affa1a156 100644 --- a/src/Module/Conversation/Channel.php +++ b/src/Module/Conversation/Channel.php @@ -27,7 +27,7 @@ use Friendica\Content\BoundariesPager; use Friendica\Content\Conversation; use Friendica\Content\Conversation\Entity\Timeline as TimelineEntity; use Friendica\Content\Conversation\Factory\Timeline as TimelineFactory; -use Friendica\Content\Conversation\Repository\Channel as RepositoryChannel; +use Friendica\Content\Conversation\Repository\Channel as ChannelRepository; use Friendica\Content\Feature; use Friendica\Content\Nav; use Friendica\Content\Text\HTML; @@ -58,7 +58,7 @@ class Channel extends Timeline /** @var SystemMessages */ protected $systemMessages; - public function __construct(RepositoryChannel $channel, TimelineFactory $timeline, Conversation $conversation, App\Page $page, SystemMessages $systemMessages, Mode $mode, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) + public function __construct(ChannelRepository $channel, TimelineFactory $timeline, Conversation $conversation, App\Page $page, SystemMessages $systemMessages, Mode $mode, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) { parent::__construct($channel, $mode, $session, $database, $pConfig, $config, $cache, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); From 42e22ed91bc6193ad63e82002139a664b753c1f0 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 20 Sep 2023 21:39:05 +0000 Subject: [PATCH 06/31] Channel frontend added --- .../Conversation/Repository/Channel.php | 12 ++ src/Module/Settings/Channels.php | 170 ++++++++++++++++++ static/routes.config.php | 1 + view/templates/settings/channels.tpl | 41 +++++ 4 files changed, 224 insertions(+) create mode 100644 src/Module/Settings/Channels.php create mode 100644 view/templates/settings/channels.tpl diff --git a/src/Content/Conversation/Repository/Channel.php b/src/Content/Conversation/Repository/Channel.php index c067c5d7a9..ba2e26c468 100644 --- a/src/Content/Conversation/Repository/Channel.php +++ b/src/Content/Conversation/Repository/Channel.php @@ -61,6 +61,18 @@ class Channel extends \Friendica\BaseRepository return $this->exists(['id' => $id, 'uid' => $uid]); } + /** + * Delete the given channel + * + * @param integer $id + * @param integer $uid + * @return boolean + */ + public function deleteById(int $id, int $uid): bool + { + return $this->db->delete('channel', ['id' => $id, 'uid' => $uid]); + } + /** * Fetch all user channels * diff --git a/src/Module/Settings/Channels.php b/src/Module/Settings/Channels.php new file mode 100644 index 0000000000..1c5e8b286b --- /dev/null +++ b/src/Module/Settings/Channels.php @@ -0,0 +1,170 @@ +. + * + */ + +namespace Friendica\Module\Settings; + +use Friendica\App; +use Friendica\Content\Conversation\Factory\Timeline; +use Friendica\Content\Conversation\Repository\Channel; +use Friendica\Core\L10n; +use Friendica\Core\Renderer; +use Friendica\Core\Session\Capability\IHandleUserSessions; +use Friendica\Module\BaseSettings; +use Friendica\Module\Response; +use Friendica\Network\HTTPException; +use Friendica\Util\Profiler; +use Psr\Log\LoggerInterface; + +class Channels extends BaseSettings +{ + /** @var Channel */ + private $channel; + /** @var Timeline */ + private $timeline; + + public function __construct(Timeline $timeline, Channel $channel, App\Page $page, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) + { + parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); + + $this->timeline = $timeline; + $this->channel = $channel; + } + + protected function post(array $request = []) + { + $uid = $this->session->getLocalUserId(); + if (!$uid) { + throw new HTTPException\ForbiddenException($this->t('Permission denied.')); + } + + if (empty($request['edit_channel']) && empty($request['add_channel'])) { + return; + } + + self::checkFormSecurityTokenRedirectOnError('/settings/channels', 'settings_channels'); + + if (!empty($request['add_channel'])) { + $channel = $this->timeline->createFromTableRow([ + 'label' => $request['new_label'], + 'description' => $request['new_description'], + 'access-key' => substr(mb_strtolower($request['new_access_key']), 0, 1), + 'uid' => $uid, + 'include-tags' => $this->cleanTags($request['new_include_tags']), + 'exclude-tags' => $this->cleanTags($request['new_exclude_tags']), + 'full-text-search' => null, // Currently not supported for performance reasons + 'media-type' => ($request['new_image'] ? 1 : 0) | ($request['new_video'] ? 2 : 0) | ($request['new_audio'] ? 4 : 0), + ]); + $saved = $this->channel->save($channel); + $this->logger->debug('New channel added', ['saved' => $saved]); + return; + } + + foreach (array_keys($request['label']) as $id) { + if ($request['delete'][$id]) { + $success = $this->channel->deleteById($id, $uid); + $this->logger->debug('Channel deleted', ['id' => $id, 'success' => $success]); + continue; + } + + $channel = $this->timeline->createFromTableRow([ + 'id' => $id, + 'label' => $request['label'][$id], + 'description' => $request['description'][$id], + 'access-key' => substr(mb_strtolower($request['access_key'][$id]), 0, 1), + 'uid' => $uid, + 'include-tags' => $this->cleanTags($request['include_tags'][$id]), + 'exclude-tags' => $this->cleanTags($request['exclude_tags'][$id]), + 'full-text-search' => null, // Currently not supported for performance reasons + 'media-type' => ($request['image'][$id] ? 1 : 0) | ($request['video'][$id] ? 2 : 0) | ($request['audio'][$id] ? 4 : 0), + ]); + $saved = $this->channel->save($channel); + $this->logger->debug('Save channel', ['id' => $id, 'saved' => $saved]); + } + + $this->baseUrl->redirect('/settings/channels'); + } + + protected function content(array $request = []): string + { + parent::content(); + + $uid = $this->session->getLocalUserId(); + if (!$uid) { + throw new HTTPException\ForbiddenException($this->t('Permission denied.')); + } + + $blocklistform = []; + foreach ($this->channel->selectByUid($uid) as $channel) { + $blocklistform[] = [ + 'label' => ["label[$channel->code]", $this->t('Label'), $channel->label, '', $this->t('Required')], + 'description' => ["description[$channel->code]", $this->t("Description"), $channel->description], + 'access_key' => ["access_key[$channel->code]", $this->t("Access Key"), $channel->accessKey], + 'include_tags' => ["include_tags[$channel->code]", $this->t("Include Tags"), $channel->includeTags], + 'exclude_tags' => ["exclude_tags[$channel->code]", $this->t("Exclude Tags"), $channel->excludeTags], + 'image' => ["image[$channel->code]", $this->t("Images"), $channel->mediaType & 1], + 'video' => ["video[$channel->code]", $this->t("Videos"), $channel->mediaType & 2], + 'audio' => ["audio[$channel->code]", $this->t("Audio"), $channel->mediaType & 4], + 'delete' => ["delete[$channel->code]", $this->t("Delete channel") . ' (' . $channel->label . ')', false, $this->t("Check to delete this entry from the channel list")] + ]; + } + + $t = Renderer::getMarkupTemplate('settings/channels.tpl'); + return Renderer::replaceMacros($t, [ + 'label' => ["new_label", $this->t('Label'), '', $this->t('Short name for the channel. It is displayed on the channels widget.'), $this->t('Required')], + 'description' => ["new_description", $this->t("Description"), '', $this->t('This should describe the content of the channel in a few word.')], + 'access_key' => ["new_access_key", $this->t("Access Key"), '', $this->t('When you want to access this channel via an access key, you can define it here. Pay attentioon to not use an already used one.')], + 'include_tags' => ["new_include_tags", $this->t("Include Tags"), '', $this->t('Comma separated list of tags. A post will be used when it contains any of the listed tags.')], + 'exclude_tags' => ["new_exclude_tags", $this->t("Exclude Tags"), '', $this->t('Comma separated list of tags. If a post contain any of these tags, then it will not be part of nthis channel.')], + 'image' => ['new_image', $this->t("Images"), false, $this->t("Check to display images in the channel.")], + 'video' => ["new_video", $this->t("Videos"), false, $this->t("Check to display videos in the channel.")], + 'audio' => ["new_audio", $this->t("Audio"), false, $this->t("Check to display audio in the channel.")], + '$l10n' => [ + 'title' => $this->t('Channels'), + 'intro' => $this->t('This page can be used to define your own channels.'), + 'addtitle' => $this->t('Add new entry to the channel list'), + 'addsubmit' => $this->t('Add'), + 'savechanges' => $this->t('Save'), + 'currenttitle' => $this->t('Current Entries in the channel list'), + 'thurl' => $this->t('Blocked server domain pattern'), + 'threason' => $this->t('Reason for the block'), + 'delentry' => $this->t('Delete entry from the channel list'), + 'confirm_delete' => $this->t('Delete entry from the channel list?'), + ], + '$entries' => $blocklistform, + '$baseurl' => $this->baseUrl, + + '$form_security_token' => self::getFormSecurityToken('settings_channels'), + ]); + } + + private function cleanTags(string $tag_list): string + { + $tags = []; + $tagitems = explode(',', mb_strtolower($tag_list)); + foreach ($tagitems as $tag) { + $tag = trim($tag, '# '); + if (!empty($tag)) { + $tags[] = $tag; + } + } + return implode(',', $tags); + } +} diff --git a/static/routes.config.php b/static/routes.config.php index afad469fd3..1b708140ca 100644 --- a/static/routes.config.php +++ b/static/routes.config.php @@ -651,6 +651,7 @@ return [ '/{open}' => [Module\Settings\Account::class, [R::GET, R::POST]], ], '/addons[/{addon}]' => [Module\Settings\Addons::class, [R::GET, R::POST]], + '/channels' => [Module\Settings\Channels::class, [R::GET, R::POST]], '/connectors[/{connector}]' => [Module\Settings\Connectors::class, [R::GET, R::POST]], '/delegation[/{action}/{user_id}]' => [Module\Settings\Delegation::class, [R::GET, R::POST]], '/display' => [Module\Settings\Display::class, [R::GET, R::POST]], diff --git a/view/templates/settings/channels.tpl b/view/templates/settings/channels.tpl new file mode 100644 index 0000000000..b4543cd563 --- /dev/null +++ b/view/templates/settings/channels.tpl @@ -0,0 +1,41 @@ +
+

{{$l10n.title}}

+

{{$l10n.intro}}

+

{{$l10n.addtitle}}

+
+ + {{include file="field_input.tpl" field=$label}} + {{include file="field_input.tpl" field=$description}} + {{include file="field_input.tpl" field=$access_key}} + {{include file="field_input.tpl" field=$include_tags}} + {{include file="field_input.tpl" field=$exclude_tags}} + {{include file="field_checkbox.tpl" field=$image}} + {{include file="field_checkbox.tpl" field=$video}} + {{include file="field_checkbox.tpl" field=$audio}} +
+ +
+
+ + {{if $entries}} +

{{$l10n.currenttitle}}

+
+ + {{foreach $entries as $e}} + {{include file="field_input.tpl" field=$e.label}} + {{include file="field_input.tpl" field=$e.description}} + {{include file="field_input.tpl" field=$e.access_key}} + {{include file="field_input.tpl" field=$e.include_tags}} + {{include file="field_input.tpl" field=$e.exclude_tags}} + {{include file="field_checkbox.tpl" field=$e.image}} + {{include file="field_checkbox.tpl" field=$e.video}} + {{include file="field_checkbox.tpl" field=$e.audio}} + {{include file="field_checkbox.tpl" field=$e.delete}} +
+ {{/foreach}} +
+ +
+ {{/if}} +
+
From c9f74cc55fa13359e7e33cc4d566707c4f600074 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 20 Sep 2023 21:42:37 +0000 Subject: [PATCH 07/31] Code standards --- src/Module/Settings/Channels.php | 3 +- view/lang/C/messages.po | 199 ++++++++++++++++++++++--------- 2 files changed, 147 insertions(+), 55 deletions(-) diff --git a/src/Module/Settings/Channels.php b/src/Module/Settings/Channels.php index 1c5e8b286b..490d9f9ab3 100644 --- a/src/Module/Settings/Channels.php +++ b/src/Module/Settings/Channels.php @@ -136,7 +136,7 @@ class Channels extends BaseSettings 'image' => ['new_image', $this->t("Images"), false, $this->t("Check to display images in the channel.")], 'video' => ["new_video", $this->t("Videos"), false, $this->t("Check to display videos in the channel.")], 'audio' => ["new_audio", $this->t("Audio"), false, $this->t("Check to display audio in the channel.")], - '$l10n' => [ + '$l10n' => [ 'title' => $this->t('Channels'), 'intro' => $this->t('This page can be used to define your own channels.'), 'addtitle' => $this->t('Add new entry to the channel list'), @@ -158,6 +158,7 @@ class Channels extends BaseSettings private function cleanTags(string $tag_list): string { $tags = []; + $tagitems = explode(',', mb_strtolower($tag_list)); foreach ($tagitems as $tag) { $tag = trim($tag, '# '); diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 6ca0fe4dad..64ef38e5c9 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-09-18 05:30+0000\n" +"POT-Creation-Date: 2023-09-20 21:42+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -68,6 +68,7 @@ msgstr "" #: src/Module/Register.php:90 src/Module/Register.php:206 #: src/Module/Register.php:245 src/Module/Search/Directory.php:37 #: src/Module/Settings/Account.php:50 src/Module/Settings/Account.php:408 +#: src/Module/Settings/Channels.php:55 src/Module/Settings/Channels.php:111 #: src/Module/Settings/Delegation.php:41 src/Module/Settings/Delegation.php:71 #: src/Module/Settings/Display.php:73 src/Module/Settings/Display.php:160 #: src/Module/Settings/Profile/Photo/Crop.php:165 @@ -384,7 +385,7 @@ msgstr "" #: mod/notes.php:57 src/Content/Text/HTML.php:859 #: src/Module/Admin/Storage.php:142 src/Module/Filer/SaveTag.php:74 -#: src/Module/Post/Edit.php:129 +#: src/Module/Post/Edit.php:129 src/Module/Settings/Channels.php:144 msgid "Save" msgstr "" @@ -449,7 +450,7 @@ msgstr "" msgid "%1$s was tagged in %2$s by %3$s" msgstr "" -#: mod/photos.php:582 src/Module/Conversation/Community.php:159 +#: mod/photos.php:582 src/Module/Conversation/Community.php:160 #: src/Module/Directory.php:48 src/Module/Profile/Photos.php:295 #: src/Module/Search/Index.php:65 msgid "Public access denied." @@ -793,7 +794,7 @@ msgstr "" msgid "All contacts" msgstr "" -#: src/BaseModule.php:433 src/Content/Conversation/Factory/Timeline.php:62 +#: src/BaseModule.php:433 src/Content/Conversation/Factory/Timeline.php:83 #: 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 msgid "Followers" @@ -1513,117 +1514,120 @@ msgstr "" msgid "View in context" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:59 +#: src/Content/Conversation/Factory/Timeline.php:80 msgid "For you" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:59 +#: src/Content/Conversation/Factory/Timeline.php:80 msgid "Posts from contacts you interact with and who interact with you" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:60 +#: src/Content/Conversation/Factory/Timeline.php:81 msgid "What's Hot" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:60 +#: src/Content/Conversation/Factory/Timeline.php:81 msgid "Posts with a lot of interactions" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:61 +#: src/Content/Conversation/Factory/Timeline.php:82 #, php-format msgid "Posts in %s" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:62 +#: src/Content/Conversation/Factory/Timeline.php:83 msgid "Posts from your followers that you don't follow" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:63 +#: src/Content/Conversation/Factory/Timeline.php:84 msgid "Sharers of sharers" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:63 +#: src/Content/Conversation/Factory/Timeline.php:84 msgid "Posts from accounts that are followed by accounts that you follow" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:64 +#: src/Content/Conversation/Factory/Timeline.php:85 +#: src/Module/Settings/Channels.php:122 src/Module/Settings/Channels.php:136 msgid "Images" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:64 +#: src/Content/Conversation/Factory/Timeline.php:85 msgid "Posts with images" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:65 +#: src/Content/Conversation/Factory/Timeline.php:86 +#: src/Module/Settings/Channels.php:124 src/Module/Settings/Channels.php:138 msgid "Audio" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:65 +#: src/Content/Conversation/Factory/Timeline.php:86 msgid "Posts with audio" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:66 +#: src/Content/Conversation/Factory/Timeline.php:87 +#: src/Module/Settings/Channels.php:123 src/Module/Settings/Channels.php:137 msgid "Videos" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:66 +#: src/Content/Conversation/Factory/Timeline.php:87 msgid "Posts with videos" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:85 +#: src/Content/Conversation/Factory/Timeline.php:110 msgid "Local Community" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:85 +#: src/Content/Conversation/Factory/Timeline.php:110 msgid "Posts from local users on this server" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:89 +#: src/Content/Conversation/Factory/Timeline.php:114 msgid "Global Community" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:89 +#: src/Content/Conversation/Factory/Timeline.php:114 msgid "Posts from users of the whole federated network" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:103 +#: src/Content/Conversation/Factory/Timeline.php:128 msgid "Latest Activity" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:103 +#: src/Content/Conversation/Factory/Timeline.php:128 msgid "Sort by latest activity" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:104 +#: src/Content/Conversation/Factory/Timeline.php:129 msgid "Latest Posts" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:104 +#: src/Content/Conversation/Factory/Timeline.php:129 msgid "Sort by post received date" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:105 +#: src/Content/Conversation/Factory/Timeline.php:130 msgid "Latest Creation" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:105 +#: src/Content/Conversation/Factory/Timeline.php:130 msgid "Sort by post creation date" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:106 +#: src/Content/Conversation/Factory/Timeline.php:131 #: src/Module/Settings/Profile/Index.php:260 msgid "Personal" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:106 +#: src/Content/Conversation/Factory/Timeline.php:131 msgid "Posts that mention or involve you" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:107 src/Object/Post.php:380 +#: src/Content/Conversation/Factory/Timeline.php:132 src/Object/Post.php:380 msgid "Starred" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:107 +#: src/Content/Conversation/Factory/Timeline.php:132 msgid "Favourite Posts" msgstr "" @@ -2362,7 +2366,8 @@ msgstr "" msgid "All" msgstr "" -#: src/Content/Widget.php:573 src/Module/Settings/Display.php:266 +#: src/Content/Widget.php:577 src/Module/Settings/Channels.php:140 +#: src/Module/Settings/Display.php:266 msgid "Channels" msgstr "" @@ -5842,6 +5847,7 @@ msgstr "" #: src/Module/Moderation/Blocklist/Server/Index.php:116 #: src/Module/Moderation/Item/Delete.php:67 src/Module/Register.php:148 #: src/Module/Security/TwoFactor/Verify.php:101 +#: src/Module/Settings/Channels.php:117 src/Module/Settings/Channels.php:131 #: src/Module/Settings/TwoFactor/Index.php:140 #: src/Module/Settings/TwoFactor/Verify.php:155 msgid "Required" @@ -5937,7 +5943,7 @@ msgid "Contact not found." msgstr "" #: src/Module/Circle.php:102 src/Module/Contact/Contacts.php:66 -#: src/Module/Conversation/Network.php:232 +#: src/Module/Conversation/Network.php:233 msgid "Invalid contact." msgstr "" @@ -6249,7 +6255,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:165 +#: src/Module/Contact/Redir.php:222 src/Module/Conversation/Community.php:166 #: 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 @@ -6699,35 +6705,35 @@ msgstr "" msgid "Unable to unfollow this contact, please contact your administrator" msgstr "" -#: src/Module/Conversation/Channel.php:121 -#: src/Module/Conversation/Community.php:125 src/Module/Search/Index.php:152 +#: src/Module/Conversation/Channel.php:122 +#: src/Module/Conversation/Community.php:126 src/Module/Search/Index.php:152 #: src/Module/Search/Index.php:194 msgid "No results." msgstr "" -#: src/Module/Conversation/Channel.php:159 +#: src/Module/Conversation/Channel.php:160 msgid "Channel not available." msgstr "" -#: src/Module/Conversation/Community.php:91 +#: src/Module/Conversation/Community.php:92 msgid "" "This community stream shows all public posts received by this node. They may " "not reflect the opinions of this node’s users." msgstr "" -#: src/Module/Conversation/Community.php:179 +#: src/Module/Conversation/Community.php:180 msgid "Community option not available." msgstr "" -#: src/Module/Conversation/Community.php:195 +#: src/Module/Conversation/Community.php:196 msgid "Not available." msgstr "" -#: src/Module/Conversation/Network.php:218 +#: src/Module/Conversation/Network.php:219 msgid "No such circle" msgstr "" -#: src/Module/Conversation/Network.php:222 +#: src/Module/Conversation/Network.php:223 #, php-format msgid "Circle: %s" msgstr "" @@ -6736,15 +6742,15 @@ msgstr "" msgid "Network feed not available." msgstr "" -#: src/Module/Conversation/Timeline.php:158 +#: src/Module/Conversation/Timeline.php:162 msgid "Own Contacts" msgstr "" -#: src/Module/Conversation/Timeline.php:162 +#: src/Module/Conversation/Timeline.php:166 msgid "Include" msgstr "" -#: src/Module/Conversation/Timeline.php:163 +#: src/Module/Conversation/Timeline.php:167 msgid "Hide" msgstr "" @@ -7113,6 +7119,7 @@ msgstr "" #: src/Module/Friendica.php:102 #: src/Module/Moderation/Blocklist/Server/Index.php:87 #: src/Module/Moderation/Blocklist/Server/Index.php:111 +#: src/Module/Settings/Channels.php:147 msgid "Reason for the block" msgstr "" @@ -7860,6 +7867,7 @@ msgstr "" #: src/Module/Moderation/Blocklist/Server/Index.php:86 #: src/Module/Moderation/Blocklist/Server/Index.php:110 +#: src/Module/Settings/Channels.php:146 msgid "Blocked server domain pattern" msgstr "" @@ -9901,6 +9909,97 @@ msgstr "" msgid "No Addon settings configured" msgstr "" +#: src/Module/Settings/Channels.php:117 src/Module/Settings/Channels.php:131 +msgid "Label" +msgstr "" + +#: src/Module/Settings/Channels.php:118 src/Module/Settings/Channels.php:132 +#: src/Module/Settings/TwoFactor/AppSpecific.php:134 +msgid "Description" +msgstr "" + +#: src/Module/Settings/Channels.php:119 src/Module/Settings/Channels.php:133 +msgid "Access Key" +msgstr "" + +#: src/Module/Settings/Channels.php:120 src/Module/Settings/Channels.php:134 +msgid "Include Tags" +msgstr "" + +#: src/Module/Settings/Channels.php:121 src/Module/Settings/Channels.php:135 +msgid "Exclude Tags" +msgstr "" + +#: src/Module/Settings/Channels.php:125 +msgid "Delete channel" +msgstr "" + +#: src/Module/Settings/Channels.php:125 +msgid "Check to delete this entry from the channel list" +msgstr "" + +#: src/Module/Settings/Channels.php:131 +msgid "Short name for the channel. It is displayed on the channels widget." +msgstr "" + +#: src/Module/Settings/Channels.php:132 +msgid "This should describe the content of the channel in a few word." +msgstr "" + +#: src/Module/Settings/Channels.php:133 +msgid "" +"When you want to access this channel via an access key, you can define it " +"here. Pay attentioon to not use an already used one." +msgstr "" + +#: src/Module/Settings/Channels.php:134 +msgid "" +"Comma separated list of tags. A post will be used when it contains any of " +"the listed tags." +msgstr "" + +#: src/Module/Settings/Channels.php:135 +msgid "" +"Comma separated list of tags. If a post contain any of these tags, then it " +"will not be part of nthis channel." +msgstr "" + +#: src/Module/Settings/Channels.php:136 +msgid "Check to display images in the channel." +msgstr "" + +#: src/Module/Settings/Channels.php:137 +msgid "Check to display videos in the channel." +msgstr "" + +#: src/Module/Settings/Channels.php:138 +msgid "Check to display audio in the channel." +msgstr "" + +#: src/Module/Settings/Channels.php:141 +msgid "This page can be used to define your own channels." +msgstr "" + +#: src/Module/Settings/Channels.php:142 +msgid "Add new entry to the channel list" +msgstr "" + +#: src/Module/Settings/Channels.php:143 src/Module/Settings/Delegation.php:181 +msgid "Add" +msgstr "" + +#: src/Module/Settings/Channels.php:145 +msgid "Current Entries in the channel list" +msgstr "" + +#: src/Module/Settings/Channels.php:148 +msgid "Delete entry from the channel list" +msgstr "" + +#: src/Module/Settings/Channels.php:149 +msgid "Delete entry from the channel list?" +msgstr "" + #: src/Module/Settings/Connectors.php:120 msgid "Failed to connect with email account using the settings provided." msgstr "" @@ -10166,10 +10265,6 @@ msgstr "" msgid "Potential Delegates" msgstr "" -#: src/Module/Settings/Delegation.php:181 -msgid "Add" -msgstr "" - #: src/Module/Settings/Delegation.php:182 msgid "No entries." msgstr "" @@ -10688,10 +10783,6 @@ msgid "" "see it again!" msgstr "" -#: src/Module/Settings/TwoFactor/AppSpecific.php:134 -msgid "Description" -msgstr "" - #: src/Module/Settings/TwoFactor/AppSpecific.php:135 msgid "Last Used" msgstr "" From 073da9735dabe974679ba4042c2ff73d64d0ecb9 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 21 Sep 2023 06:49:07 +0000 Subject: [PATCH 08/31] Channels are now added to the settings menu --- src/Module/BaseSettings.php | 7 +++++++ view/lang/C/messages.po | 22 +++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/Module/BaseSettings.php b/src/Module/BaseSettings.php index f3acb19a21..495c175bde 100644 --- a/src/Module/BaseSettings.php +++ b/src/Module/BaseSettings.php @@ -121,6 +121,13 @@ class BaseSettings extends BaseModule 'accesskey' => 'i', ]; + $tabs[] = [ + 'label' => $this->t('Channels'), + 'url' => 'settings/channels', + 'selected' => static::class == Settings\Display::class ? 'active' : '', + 'accesskey' => '', + ]; + $tabs[] = [ 'label' => $this->t('Social Networks'), 'url' => 'settings/connectors', diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 64ef38e5c9..12f4b91404 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-09-20 21:42+0000\n" +"POT-Creation-Date: 2023-09-21 06:47+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2103,7 +2103,7 @@ msgid "Manage other pages" msgstr "" #: src/Content/Nav.php:327 src/Module/Admin/Addons/Details.php:114 -#: src/Module/Admin/Themes/Details.php:93 src/Module/BaseSettings.php:175 +#: src/Module/Admin/Themes/Details.php:93 src/Module/BaseSettings.php:182 #: src/Module/Welcome.php:52 view/theme/frio/theme.php:242 msgid "Settings" msgstr "" @@ -2366,8 +2366,8 @@ msgstr "" msgid "All" msgstr "" -#: src/Content/Widget.php:577 src/Module/Settings/Channels.php:140 -#: src/Module/Settings/Display.php:266 +#: src/Content/Widget.php:577 src/Module/BaseSettings.php:125 +#: src/Module/Settings/Channels.php:140 src/Module/Settings/Display.php:266 msgid "Channels" msgstr "" @@ -3900,7 +3900,7 @@ msgid "Administration" msgstr "" #: src/Module/Admin/Addons/Details.php:112 src/Module/Admin/Addons/Index.php:68 -#: src/Module/BaseAdmin.php:92 src/Module/BaseSettings.php:132 +#: src/Module/BaseAdmin.php:92 src/Module/BaseSettings.php:139 msgid "Addons" msgstr "" @@ -5768,27 +5768,27 @@ msgstr "" msgid "Display" msgstr "" -#: src/Module/BaseSettings.php:125 src/Module/Settings/Connectors.php:204 +#: src/Module/BaseSettings.php:132 src/Module/Settings/Connectors.php:204 msgid "Social Networks" msgstr "" -#: src/Module/BaseSettings.php:139 src/Module/Settings/Delegation.php:172 +#: src/Module/BaseSettings.php:146 src/Module/Settings/Delegation.php:172 msgid "Manage Accounts" msgstr "" -#: src/Module/BaseSettings.php:146 +#: src/Module/BaseSettings.php:153 msgid "Connected apps" msgstr "" -#: src/Module/BaseSettings.php:153 +#: src/Module/BaseSettings.php:160 msgid "Remote servers" msgstr "" -#: src/Module/BaseSettings.php:160 src/Module/Settings/UserExport.php:98 +#: src/Module/BaseSettings.php:167 src/Module/Settings/UserExport.php:98 msgid "Export personal data" msgstr "" -#: src/Module/BaseSettings.php:167 +#: src/Module/BaseSettings.php:174 msgid "Remove account" msgstr "" From fac76a33df6ea81717fc1b553257adbc7d8f8b39 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 21 Sep 2023 20:43:14 +0000 Subject: [PATCH 09/31] Improved timeline menu --- src/Content/Widget.php | 14 ++++-- src/Module/Conversation/Network.php | 13 +---- src/Module/Settings/Display.php | 47 ++++++++++++++++--- .../theme/frio/templates/settings/display.tpl | 22 ++++++++- 4 files changed, 74 insertions(+), 22 deletions(-) diff --git a/src/Content/Widget.php b/src/Content/Widget.php index 486bada7d5..7078c4fe06 100644 --- a/src/Content/Widget.php +++ b/src/Content/Widget.php @@ -560,16 +560,24 @@ class Widget { $channels = []; + $enabled = DI::pConfig()->get($uid, 'system', 'enabled_timelines', []); + foreach (DI::TimelineFactory()->getNetworkFeeds('') as $channel) { - $channels[] = ['ref' => $channel->code, 'name' => $channel->label]; + if (empty($enabled) || in_array($channel->code, $enabled)) { + $channels[] = ['ref' => $channel->code, 'name' => $channel->label]; + } } foreach (DI::TimelineFactory()->getChannelsForUser($uid) as $channel) { - $channels[] = ['ref' => $channel->code, 'name' => $channel->label]; + if (empty($enabled) || in_array($channel->code, $enabled)) { + $channels[] = ['ref' => $channel->code, 'name' => $channel->label]; + } } foreach (DI::TimelineFactory()->getCommunities(true) as $community) { - $channels[] = ['ref' => $community->code, 'name' => $community->label]; + if (empty($enabled) || in_array($community->code, $enabled)) { + $channels[] = ['ref' => $community->code, 'name' => $community->label]; + } } return self::filter( diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php index 656383b706..40a1b731b6 100644 --- a/src/Module/Conversation/Network.php +++ b/src/Module/Conversation/Network.php @@ -118,25 +118,14 @@ class Network extends Timeline $module = 'network'; - $this->page['aside'] .= Widget::channels($module, $this->selectedTab, $this->session->getLocalUserId()); - $this->page['aside'] .= Widget::accountTypes($module, $this->accountTypeString); - $arr = ['query' => $this->args->getQueryString()]; Hook::callAll('network_content_init', $arr); $o = ''; if ($this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId())) { - if (!in_array($this->selectedTab, [TimelineEntity::FOLLOWERS, TimelineEntity::FORYOU]) && $this->config->get('system', 'community_no_sharer')) { - $this->page['aside'] .= $this->getNoSharerWidget($module); - } - $items = $this->getChannelItems(); } elseif ($this->timeline->isCommunity($this->selectedTab)) { - if ($this->session->getLocalUserId() && $this->config->get('system', 'community_no_sharer')) { - $this->page['aside'] .= $this->getNoSharerWidget($module); - } - $items = $this->getCommunityItems(); } else { $items = $this->getItems(); @@ -146,6 +135,8 @@ class Network extends Timeline $this->page['aside'] .= GroupManager::widget($module . '/group', $this->session->getLocalUserId(), $this->groupContactId); $this->page['aside'] .= Widget::postedByYear($module . '/archive', $this->session->getLocalUserId(), false); $this->page['aside'] .= Widget::networks($module, !$this->groupContactId ? $this->network : ''); + $this->page['aside'] .= Widget::accountTypes($module, $this->accountTypeString); + $this->page['aside'] .= Widget::channels($module, $this->selectedTab, $this->session->getLocalUserId()); $this->page['aside'] .= Widget\SavedSearches::getHTML($this->args->getQueryString()); $this->page['aside'] .= Widget::fileAs('filed', ''); diff --git a/src/Module/Settings/Display.php b/src/Module/Settings/Display.php index 71c4caed59..bbae7d5990 100644 --- a/src/Module/Settings/Display.php +++ b/src/Module/Settings/Display.php @@ -80,7 +80,8 @@ class Display extends BaseSettings $theme = !empty($request['theme']) ? trim($request['theme']) : $user['theme']; $mobile_theme = !empty($request['mobile_theme']) ? trim($request['mobile_theme']) : ''; $enable_smile = !empty($request['enable_smile']) ? intval($request['enable_smile']) : 0; - $network_timelines = !empty($request['network_timelines']) ? $request['network_timelines'] : []; + $enable = !empty($request['enable']) ? $request['enable'] : []; + $bookmark = !empty($request['bookmark']) ? $request['bookmark'] : []; $channel_languages = !empty($request['channel_languages']) ? $request['channel_languages'] : []; $first_day_of_week = !empty($request['first_day_of_week']) ? intval($request['first_day_of_week']) : 0; $calendar_default_view = !empty($request['calendar_default_view']) ? trim($request['calendar_default_view']) : 'month'; @@ -98,6 +99,20 @@ class Display extends BaseSettings } } + $enabled_timelines = []; + foreach ($enable as $code => $enabled) { + if ($enabled) { + $enabled_timelines[] = $code; + } + } + + $network_timelines = []; + foreach ($bookmark as $code => $bookmarked) { + if ($bookmarked) { + $network_timelines[] = $code; + } + } + $itemspage_network = !empty($request['itemspage_network']) ? intval($request['itemspage_network']) : $this->config->get('system', 'itemspage_network'); @@ -127,6 +142,7 @@ class Display extends BaseSettings $this->pConfig->set($uid, 'system', 'preview_mode' , $preview_mode); $this->pConfig->set($uid, 'system', 'network_timelines' , $network_timelines); + $this->pConfig->set($uid, 'system', 'enabled_timelines' , $enabled_timelines); $this->pConfig->set($uid, 'channel', 'languages' , $channel_languages); $this->pConfig->set($uid, 'calendar', 'first_day_of_week' , $first_day_of_week); @@ -224,10 +240,21 @@ class Display extends BaseSettings BBCode::PREVIEW_LARGE => $this->t('Large Image'), ]; - $network_timelines = $this->pConfig->get($uid, 'system', 'network_timelines', array_keys($this->getAvailableTimelines($uid, true))); + $bookmarked_timelines = $this->pConfig->get($uid, 'system', 'network_timelines', array_keys($this->getAvailableTimelines($uid, true))); + $enabled_timelines = $this->pConfig->get($uid, 'system', 'enabled_timelines', array_keys($this->getAvailableTimelines($uid, false))); + $channel_languages = $this->pConfig->get($uid, 'channel', 'languages', [User::getLanguageCode($uid)]); $languages = $this->l10n->getAvailableLanguages(true); - $timelines = $this->getAvailableTimelines($uid); + + $timelines = []; + foreach ($this->getAvailableTimelines($uid) as $code => $timeline) { + $timelines[] = [ + 'label' => $timeline['label'], + 'description' => $timeline['description'], + 'enable' => ["enable[$code]", '', in_array($code, $enabled_timelines)], + 'bookmark' => ["bookmark[$code]", '', in_array($code, $bookmarked_timelines)], + ]; + } $first_day_of_week = $this->pConfig->get($uid, 'calendar', 'first_day_of_week', 0); $weekdays = [ @@ -284,7 +311,13 @@ class Display extends BaseSettings '$stay_local' => ['stay_local' , $this->t('Stay local'), $stay_local, $this->t("Don't go to a remote system when following a contact link.")], '$preview_mode' => ['preview_mode' , $this->t('Link preview mode'), $preview_mode, $this->t('Appearance of the link preview that is added to each post with a link.'), $preview_modes, false], - '$network_timelines' => ['network_timelines[]', $this->t('Timelines for the network page:'), $network_timelines, $this->t('Select all the timelines that you want to see on your network page.'), $timelines, 'multiple'], + '$timeline_label' => $this->t('Label'), + '$timeline_descriptiom' => $this->t('Description'), + '$timeline_enable' => $this->t('Enable'), + '$timeline_bookmark' => $this->t('Bookmark'), + '$timelines' => $timelines, + '$timeline_explanation' => $this->t('Enable timelines that you want to see in the channels widget. Bookmark timelines that you want to see in the top menu.'), + '$channel_languages' => ['channel_languages[]', $this->t('Channel languages:'), $channel_languages, $this->t('Select all languages that you want to see in your channels.'), $languages, 'multiple'], '$first_day_of_week' => ['first_day_of_week' , $this->t('Beginning of week:') , $first_day_of_week , '', $weekdays , false], @@ -297,7 +330,7 @@ class Display extends BaseSettings $timelines = []; foreach ($this->timeline->getNetworkFeeds('') as $channel) { - $timelines[$channel->code] = $this->t('%s: %s', $channel->label, $channel->description); + $timelines[$channel->code] = ['label' => $channel->label, 'description' => $channel->description]; } if ($only_network) { @@ -305,11 +338,11 @@ class Display extends BaseSettings } foreach ($this->timeline->getChannelsForUser($uid) as $channel) { - $timelines[$channel->code] = $this->t('%s: %s', $channel->label, $channel->description); + $timelines[$channel->code] = ['label' => $channel->label, 'description' => $channel->description]; } foreach ($this->timeline->getCommunities(true) as $community) { - $timelines[$community->code] = $this->t('%s: %s', $community->label, $community->description); + $timelines[$community->code] = ['label' => $community->label, 'description' => $community->description]; } return $timelines; diff --git a/view/theme/frio/templates/settings/display.tpl b/view/theme/frio/templates/settings/display.tpl index f361fe9535..41dd11c10b 100644 --- a/view/theme/frio/templates/settings/display.tpl +++ b/view/theme/frio/templates/settings/display.tpl @@ -84,7 +84,27 @@
- {{include file="field_select.tpl" field=$network_timelines}} + {{$timeline_explanation}} + + + + + + + + + + + {{foreach $timelines as $t}} + + + + + + + {{/foreach}} + +
{{$timeline_label}}{{$timeline_descriptiom}}{{$timeline_enable}}{{$timeline_bookmark}}
{{$t.label}}{{$t.description}}{{include file="field_checkbox.tpl" field=$t.enable}}{{include file="field_checkbox.tpl" field=$t.bookmark}}
From 508d84b2b70dde8e43579ec0405ebc867bd1fc92 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 21 Sep 2023 23:27:05 +0000 Subject: [PATCH 10/31] Use full text search --- database.sql | 2 + doc/database/db_post-engagement.md | 12 +- src/Content/Text/BBCode.php | 1 + src/Model/Post/Engagement.php | 18 ++- src/Module/Conversation/Timeline.php | 3 +- src/Module/Settings/Channels.php | 6 +- static/dbstructure.config.php | 2 + view/lang/C/messages.po | 226 ++++++++++++++------------- view/templates/settings/channels.tpl | 2 + view/templates/settings/display.tpl | 22 ++- 10 files changed, 173 insertions(+), 121 deletions(-) diff --git a/database.sql b/database.sql index 8598f6fe60..25f94cac85 100644 --- a/database.sql +++ b/database.sql @@ -1327,6 +1327,7 @@ CREATE TABLE IF NOT EXISTS `post-engagement` ( `contact-type` tinyint NOT NULL DEFAULT 0 COMMENT 'Person, organisation, news, community, relay', `media-type` tinyint NOT NULL DEFAULT 0 COMMENT 'Type of media in a bit array (1 = image, 2 = video, 4 = audio', `language` varbinary(128) COMMENT 'Language information about this post', + `searchtext` mediumtext COMMENT 'Simplified text for the full text search', `created` datetime COMMENT '', `restricted` boolean NOT NULL DEFAULT '0' COMMENT 'If true, this post is either unlisted or not from a federated network', `comments` mediumint unsigned COMMENT 'Number of comments', @@ -1334,6 +1335,7 @@ CREATE TABLE IF NOT EXISTS `post-engagement` ( PRIMARY KEY(`uri-id`), INDEX `owner-id` (`owner-id`), INDEX `created` (`created`), + FULLTEXT INDEX `searchtext` (`searchtext`), FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE, FOREIGN KEY (`owner-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Engagement data per post'; diff --git a/doc/database/db_post-engagement.md b/doc/database/db_post-engagement.md index 19cb64d54f..edca447f3d 100644 --- a/doc/database/db_post-engagement.md +++ b/doc/database/db_post-engagement.md @@ -13,6 +13,7 @@ Fields | contact-type | Person, organisation, news, community, relay | tinyint | NO | | 0 | | | media-type | Type of media in a bit array (1 = image, 2 = video, 4 = audio | tinyint | NO | | 0 | | | language | Language information about this post | varbinary(128) | YES | | NULL | | +| searchtext | Simplified text for the full text search | mediumtext | YES | | NULL | | | created | | datetime | YES | | NULL | | | restricted | If true, this post is either unlisted or not from a federated network | boolean | NO | | 0 | | | comments | Number of comments | mediumint unsigned | YES | | NULL | | @@ -21,11 +22,12 @@ Fields Indexes ------------ -| Name | Fields | -| -------- | -------- | -| PRIMARY | uri-id | -| owner-id | owner-id | -| created | created | +| Name | Fields | +| ---------- | -------------------- | +| PRIMARY | uri-id | +| owner-id | owner-id | +| created | created | +| searchtext | FULLTEXT, searchtext | Foreign Keys ------------ diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index ab7300da18..a981f97d28 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -230,6 +230,7 @@ class BBCode { DI::profiler()->startRecording('rendering'); // Remove pictures in advance to avoid unneeded proxy calls + $text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", ' ', $text); $text = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/ism", ' $2 ', $text); $text = preg_replace("/\[img.*?\[\/img\]/ism", ' ', $text); diff --git a/src/Model/Post/Engagement.php b/src/Model/Post/Engagement.php index 80f1247a65..3df364b907 100644 --- a/src/Model/Post/Engagement.php +++ b/src/Model/Post/Engagement.php @@ -21,6 +21,7 @@ namespace Friendica\Model\Post; +use Friendica\Content\Text\BBCode; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Database\Database; @@ -52,7 +53,7 @@ class Engagement return; } - $parent = Post::selectFirst(['created', 'owner-id', 'uid', 'private', 'contact-contact-type', 'language'], ['uri-id' => $item['parent-uri-id']]); + $parent = Post::selectFirst(['uri-id', 'created', 'owner-id', 'uid', 'private', 'contact-contact-type', 'language', 'title', 'content-warning', 'body'], ['uri-id' => $item['parent-uri-id']]); if ($parent['created'] < DateTimeFormat::utc('now - ' . DI::config()->get('channel', 'engagement_hours') . ' hour')) { Logger::debug('Post is too old', ['uri-id' => $item['uri-id'], 'parent-uri-id' => $item['parent-uri-id'], 'created' => $parent['created']]); @@ -87,6 +88,7 @@ class Engagement 'contact-type' => $parent['contact-contact-type'], 'media-type' => $mediatype, 'language' => $parent['language'], + 'searchtext' => self::getSearchText($parent), 'created' => $parent['created'], 'restricted' => !in_array($item['network'], Protocol::FEDERATED) || ($parent['private'] != Item::PUBLIC), 'comments' => DBA::count('post', ['parent-uri-id' => $item['parent-uri-id'], 'gravity' => Item::GRAVITY_COMMENT]), @@ -104,6 +106,20 @@ class Engagement Logger::debug('Engagement stored', ['fields' => $engagement, 'ret' => $ret]); } + private static function getSearchText(array $item): string + { + $body = $item['title'] . "\n" . $item['content-warning'] . "\n" . $item['body'] . "\n"; + $body = Post\Media::addAttachmentsToBody($item['uri-id'], $body); + $text = BBCode::toPlaintext($body, false); + + do { + $oldtext = $text; + $text = str_replace([' ', "\n", "\r"], ' ', $text); + } while ($oldtext != $text); + + return $text; + } + private static function getMediaType(int $uri_id): int { $media = Post\Media::getByURIId($uri_id); diff --git a/src/Module/Conversation/Timeline.php b/src/Module/Conversation/Timeline.php index 9c53634ea8..44149d1ecc 100644 --- a/src/Module/Conversation/Timeline.php +++ b/src/Module/Conversation/Timeline.php @@ -376,8 +376,7 @@ class Timeline extends BaseModule $condition = []; if (!empty($channel->fullTextSearch)) { - $first = $this->database->selectFirst('post-engagement', ['uri-id']); - $condition = DBA::mergeConditions($condition, ["`uri-id` IN (SELECT `uri-id` FROM `post-content` WHERE `uri-id` >= ? AND MATCH (`title`, `content-warning`, `body`) AGAINST (? IN BOOLEAN MODE))", $first['uri-id'], $channel->fullTextSearch]); + $condition = DBA::mergeConditions($condition, ["MATCH (`searchtext`) AGAINST (? IN BOOLEAN MODE)", $channel->fullTextSearch]); } if (!empty($channel->includeTags)) { diff --git a/src/Module/Settings/Channels.php b/src/Module/Settings/Channels.php index 490d9f9ab3..ca9e8d1686 100644 --- a/src/Module/Settings/Channels.php +++ b/src/Module/Settings/Channels.php @@ -69,7 +69,7 @@ class Channels extends BaseSettings 'uid' => $uid, 'include-tags' => $this->cleanTags($request['new_include_tags']), 'exclude-tags' => $this->cleanTags($request['new_exclude_tags']), - 'full-text-search' => null, // Currently not supported for performance reasons + 'full-text-search' => $this->cleanTags($request['new_text_search']), 'media-type' => ($request['new_image'] ? 1 : 0) | ($request['new_video'] ? 2 : 0) | ($request['new_audio'] ? 4 : 0), ]); $saved = $this->channel->save($channel); @@ -92,7 +92,7 @@ class Channels extends BaseSettings 'uid' => $uid, 'include-tags' => $this->cleanTags($request['include_tags'][$id]), 'exclude-tags' => $this->cleanTags($request['exclude_tags'][$id]), - 'full-text-search' => null, // Currently not supported for performance reasons + 'full-text-search' => $this->cleanTags($request['text_search'][$id]), 'media-type' => ($request['image'][$id] ? 1 : 0) | ($request['video'][$id] ? 2 : 0) | ($request['audio'][$id] ? 4 : 0), ]); $saved = $this->channel->save($channel); @@ -119,6 +119,7 @@ class Channels extends BaseSettings 'access_key' => ["access_key[$channel->code]", $this->t("Access Key"), $channel->accessKey], 'include_tags' => ["include_tags[$channel->code]", $this->t("Include Tags"), $channel->includeTags], 'exclude_tags' => ["exclude_tags[$channel->code]", $this->t("Exclude Tags"), $channel->excludeTags], + 'text_search' => ["text_search[$channel->code]", $this->t("Full Text Search"), $channel->fullTextSearch], 'image' => ["image[$channel->code]", $this->t("Images"), $channel->mediaType & 1], 'video' => ["video[$channel->code]", $this->t("Videos"), $channel->mediaType & 2], 'audio' => ["audio[$channel->code]", $this->t("Audio"), $channel->mediaType & 4], @@ -133,6 +134,7 @@ class Channels extends BaseSettings 'access_key' => ["new_access_key", $this->t("Access Key"), '', $this->t('When you want to access this channel via an access key, you can define it here. Pay attentioon to not use an already used one.')], 'include_tags' => ["new_include_tags", $this->t("Include Tags"), '', $this->t('Comma separated list of tags. A post will be used when it contains any of the listed tags.')], 'exclude_tags' => ["new_exclude_tags", $this->t("Exclude Tags"), '', $this->t('Comma separated list of tags. If a post contain any of these tags, then it will not be part of nthis channel.')], + 'text_search' => ["new_text_search", $this->t("Full Text Search"), '', $this->t('Search terms for the body.')], 'image' => ['new_image', $this->t("Images"), false, $this->t("Check to display images in the channel.")], 'video' => ["new_video", $this->t("Videos"), false, $this->t("Check to display videos in the channel.")], 'audio' => ["new_audio", $this->t("Audio"), false, $this->t("Check to display audio in the channel.")], diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index e918a44913..22c399736c 100644 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -1350,6 +1350,7 @@ return [ "contact-type" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => "Person, organisation, news, community, relay"], "media-type" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => "Type of media in a bit array (1 = image, 2 = video, 4 = audio"], "language" => ["type" => "varbinary(128)", "comment" => "Language information about this post"], + "searchtext" => ["type" => "mediumtext", "comment" => "Simplified text for the full text search"], "created" => ["type" => "datetime", "comment" => ""], "restricted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "If true, this post is either unlisted or not from a federated network"], "comments" => ["type" => "mediumint unsigned", "comment" => "Number of comments"], @@ -1359,6 +1360,7 @@ return [ "PRIMARY" => ["uri-id"], "owner-id" => ["owner-id"], "created" => ["created"], + "searchtext" => ["FULLTEXT", "searchtext"], ] ], "post-history" => [ diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 12f4b91404..b35273d544 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-09-21 06:47+0000\n" +"POT-Creation-Date: 2023-09-21 23:26+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -70,7 +70,7 @@ msgstr "" #: src/Module/Settings/Account.php:50 src/Module/Settings/Account.php:408 #: src/Module/Settings/Channels.php:55 src/Module/Settings/Channels.php:111 #: src/Module/Settings/Delegation.php:41 src/Module/Settings/Delegation.php:71 -#: src/Module/Settings/Display.php:73 src/Module/Settings/Display.php:160 +#: src/Module/Settings/Display.php:73 src/Module/Settings/Display.php:176 #: src/Module/Settings/Profile/Photo/Crop.php:165 #: src/Module/Settings/Profile/Photo/Index.php:111 #: src/Module/Settings/RemoveMe.php:117 src/Module/Settings/UserExport.php:80 @@ -385,7 +385,7 @@ msgstr "" #: mod/notes.php:57 src/Content/Text/HTML.php:859 #: src/Module/Admin/Storage.php:142 src/Module/Filer/SaveTag.php:74 -#: src/Module/Post/Edit.php:129 src/Module/Settings/Channels.php:144 +#: src/Module/Post/Edit.php:129 src/Module/Settings/Channels.php:146 msgid "Save" msgstr "" @@ -1548,7 +1548,7 @@ msgid "Posts from accounts that are followed by accounts that you follow" msgstr "" #: src/Content/Conversation/Factory/Timeline.php:85 -#: src/Module/Settings/Channels.php:122 src/Module/Settings/Channels.php:136 +#: src/Module/Settings/Channels.php:123 src/Module/Settings/Channels.php:138 msgid "Images" msgstr "" @@ -1557,7 +1557,7 @@ msgid "Posts with images" msgstr "" #: src/Content/Conversation/Factory/Timeline.php:86 -#: src/Module/Settings/Channels.php:124 src/Module/Settings/Channels.php:138 +#: src/Module/Settings/Channels.php:125 src/Module/Settings/Channels.php:140 msgid "Audio" msgstr "" @@ -1566,7 +1566,7 @@ msgid "Posts with audio" msgstr "" #: src/Content/Conversation/Factory/Timeline.php:87 -#: src/Module/Settings/Channels.php:123 src/Module/Settings/Channels.php:137 +#: src/Module/Settings/Channels.php:124 src/Module/Settings/Channels.php:139 msgid "Videos" msgstr "" @@ -1931,7 +1931,7 @@ msgstr "" #: src/Content/Nav.php:233 src/Content/Nav.php:293 #: 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:267 view/theme/frio/theme.php:236 +#: src/Module/Settings/Display.php:294 view/theme/frio/theme.php:236 #: view/theme/frio/theme.php:240 msgid "Calendar" msgstr "" @@ -2174,39 +2174,39 @@ msgstr "" msgid "last" msgstr "" -#: src/Content/Text/BBCode.php:696 src/Content/Text/BBCode.php:1636 -#: src/Content/Text/BBCode.php:1637 +#: src/Content/Text/BBCode.php:697 src/Content/Text/BBCode.php:1637 +#: src/Content/Text/BBCode.php:1638 msgid "Image/photo" msgstr "" -#: src/Content/Text/BBCode.php:914 +#: src/Content/Text/BBCode.php:915 #, php-format msgid "" "%2$s %3$s" msgstr "" -#: src/Content/Text/BBCode.php:939 src/Model/Item.php:3745 +#: src/Content/Text/BBCode.php:940 src/Model/Item.php:3745 #: src/Model/Item.php:3751 src/Model/Item.php:3752 msgid "Link to source" msgstr "" -#: src/Content/Text/BBCode.php:1543 src/Content/Text/HTML.php:904 +#: src/Content/Text/BBCode.php:1544 src/Content/Text/HTML.php:904 msgid "Click to open/close" msgstr "" -#: src/Content/Text/BBCode.php:1576 +#: src/Content/Text/BBCode.php:1577 msgid "$1 wrote:" msgstr "" -#: src/Content/Text/BBCode.php:1641 src/Content/Text/BBCode.php:1642 +#: src/Content/Text/BBCode.php:1642 src/Content/Text/BBCode.php:1643 msgid "Encrypted content" msgstr "" -#: src/Content/Text/BBCode.php:1901 +#: src/Content/Text/BBCode.php:1902 msgid "Invalid source protocol" msgstr "" -#: src/Content/Text/BBCode.php:1920 +#: src/Content/Text/BBCode.php:1921 msgid "Invalid link protocol" msgstr "" @@ -2366,8 +2366,8 @@ msgstr "" msgid "All" msgstr "" -#: src/Content/Widget.php:577 src/Module/BaseSettings.php:125 -#: src/Module/Settings/Channels.php:140 src/Module/Settings/Display.php:266 +#: src/Content/Widget.php:585 src/Module/BaseSettings.php:125 +#: src/Module/Settings/Channels.php:142 src/Module/Settings/Display.php:293 msgid "Channels" msgstr "" @@ -2826,37 +2826,37 @@ msgid "Could not connect to database." msgstr "" #: src/Core/L10n.php:476 src/Model/Event.php:430 -#: src/Module/Settings/Display.php:235 +#: src/Module/Settings/Display.php:262 msgid "Monday" msgstr "" #: src/Core/L10n.php:476 src/Model/Event.php:431 -#: src/Module/Settings/Display.php:236 +#: src/Module/Settings/Display.php:263 msgid "Tuesday" msgstr "" #: src/Core/L10n.php:476 src/Model/Event.php:432 -#: src/Module/Settings/Display.php:237 +#: src/Module/Settings/Display.php:264 msgid "Wednesday" msgstr "" #: src/Core/L10n.php:476 src/Model/Event.php:433 -#: src/Module/Settings/Display.php:238 +#: src/Module/Settings/Display.php:265 msgid "Thursday" msgstr "" #: src/Core/L10n.php:476 src/Model/Event.php:434 -#: src/Module/Settings/Display.php:239 +#: src/Module/Settings/Display.php:266 msgid "Friday" msgstr "" #: src/Core/L10n.php:476 src/Model/Event.php:435 -#: src/Module/Settings/Display.php:240 +#: src/Module/Settings/Display.php:267 msgid "Saturday" msgstr "" #: src/Core/L10n.php:476 src/Model/Event.php:429 -#: src/Module/Settings/Display.php:234 +#: src/Module/Settings/Display.php:261 msgid "Sunday" msgstr "" @@ -3301,17 +3301,17 @@ msgid "today" msgstr "" #: src/Model/Event.php:463 src/Module/Calendar/Show.php:129 -#: src/Module/Settings/Display.php:245 src/Util/Temporal.php:353 +#: src/Module/Settings/Display.php:272 src/Util/Temporal.php:353 msgid "month" msgstr "" #: src/Model/Event.php:464 src/Module/Calendar/Show.php:130 -#: src/Module/Settings/Display.php:246 src/Util/Temporal.php:354 +#: src/Module/Settings/Display.php:273 src/Util/Temporal.php:354 msgid "week" msgstr "" #: src/Model/Event.php:465 src/Module/Calendar/Show.php:131 -#: src/Module/Settings/Display.php:247 src/Util/Temporal.php:355 +#: src/Module/Settings/Display.php:274 src/Util/Temporal.php:355 msgid "day" msgstr "" @@ -3884,7 +3884,7 @@ msgid "Disable" msgstr "" #: src/Module/Admin/Addons/Details.php:91 -#: src/Module/Admin/Themes/Details.php:49 +#: src/Module/Admin/Themes/Details.php:49 src/Module/Settings/Display.php:316 msgid "Enable" msgstr "" @@ -3934,7 +3934,7 @@ msgstr "" #: src/Module/Settings/Account.php:561 src/Module/Settings/Addons.php:78 #: src/Module/Settings/Connectors.php:160 #: src/Module/Settings/Connectors.php:246 -#: src/Module/Settings/Delegation.php:171 src/Module/Settings/Display.php:260 +#: src/Module/Settings/Delegation.php:171 src/Module/Settings/Display.php:287 #: src/Module/Settings/Features.php:76 msgid "Save Settings" msgstr "" @@ -4295,11 +4295,11 @@ msgstr "" msgid "%s is no valid input for maximum image size" msgstr "" -#: src/Module/Admin/Site.php:313 src/Module/Settings/Display.php:178 +#: src/Module/Admin/Site.php:313 src/Module/Settings/Display.php:194 msgid "No special theme for mobile devices" msgstr "" -#: src/Module/Admin/Site.php:330 src/Module/Settings/Display.php:188 +#: src/Module/Admin/Site.php:330 src/Module/Settings/Display.php:204 #, php-format msgid "%s - (Experimental)" msgstr "" @@ -5847,7 +5847,7 @@ msgstr "" #: src/Module/Moderation/Blocklist/Server/Index.php:116 #: src/Module/Moderation/Item/Delete.php:67 src/Module/Register.php:148 #: src/Module/Security/TwoFactor/Verify.php:101 -#: src/Module/Settings/Channels.php:117 src/Module/Settings/Channels.php:131 +#: src/Module/Settings/Channels.php:117 src/Module/Settings/Channels.php:132 #: src/Module/Settings/TwoFactor/Index.php:140 #: src/Module/Settings/TwoFactor/Verify.php:155 msgid "Required" @@ -5909,7 +5909,7 @@ msgstr "" msgid "Create New Event" msgstr "" -#: src/Module/Calendar/Show.php:132 src/Module/Settings/Display.php:248 +#: src/Module/Calendar/Show.php:132 src/Module/Settings/Display.php:275 msgid "list" msgstr "" @@ -5943,7 +5943,7 @@ msgid "Contact not found." msgstr "" #: src/Module/Circle.php:102 src/Module/Contact/Contacts.php:66 -#: src/Module/Conversation/Network.php:233 +#: src/Module/Conversation/Network.php:224 msgid "Invalid contact." msgstr "" @@ -6729,16 +6729,16 @@ msgstr "" msgid "Not available." msgstr "" -#: src/Module/Conversation/Network.php:219 +#: src/Module/Conversation/Network.php:210 msgid "No such circle" msgstr "" -#: src/Module/Conversation/Network.php:223 +#: src/Module/Conversation/Network.php:214 #, php-format msgid "Circle: %s" msgstr "" -#: src/Module/Conversation/Network.php:317 +#: src/Module/Conversation/Network.php:308 msgid "Network feed not available." msgstr "" @@ -7119,7 +7119,7 @@ msgstr "" #: src/Module/Friendica.php:102 #: src/Module/Moderation/Blocklist/Server/Index.php:87 #: src/Module/Moderation/Blocklist/Server/Index.php:111 -#: src/Module/Settings/Channels.php:147 +#: src/Module/Settings/Channels.php:149 msgid "Reason for the block" msgstr "" @@ -7867,7 +7867,7 @@ msgstr "" #: src/Module/Moderation/Blocklist/Server/Index.php:86 #: src/Module/Moderation/Blocklist/Server/Index.php:110 -#: src/Module/Settings/Channels.php:146 +#: src/Module/Settings/Channels.php:148 msgid "Blocked server domain pattern" msgstr "" @@ -9909,94 +9909,104 @@ msgstr "" msgid "No Addon settings configured" msgstr "" -#: src/Module/Settings/Channels.php:117 src/Module/Settings/Channels.php:131 +#: src/Module/Settings/Channels.php:117 src/Module/Settings/Channels.php:132 +#: src/Module/Settings/Display.php:314 msgid "Label" msgstr "" -#: src/Module/Settings/Channels.php:118 src/Module/Settings/Channels.php:132 +#: src/Module/Settings/Channels.php:118 src/Module/Settings/Channels.php:133 +#: src/Module/Settings/Display.php:315 #: src/Module/Settings/TwoFactor/AppSpecific.php:134 msgid "Description" msgstr "" -#: src/Module/Settings/Channels.php:119 src/Module/Settings/Channels.php:133 +#: src/Module/Settings/Channels.php:119 src/Module/Settings/Channels.php:134 msgid "Access Key" msgstr "" -#: src/Module/Settings/Channels.php:120 src/Module/Settings/Channels.php:134 +#: src/Module/Settings/Channels.php:120 src/Module/Settings/Channels.php:135 msgid "Include Tags" msgstr "" -#: src/Module/Settings/Channels.php:121 src/Module/Settings/Channels.php:135 +#: src/Module/Settings/Channels.php:121 src/Module/Settings/Channels.php:136 msgid "Exclude Tags" msgstr "" -#: src/Module/Settings/Channels.php:125 +#: src/Module/Settings/Channels.php:122 src/Module/Settings/Channels.php:137 +msgid "Full Text Search" +msgstr "" + +#: src/Module/Settings/Channels.php:126 msgid "Delete channel" msgstr "" -#: src/Module/Settings/Channels.php:125 +#: src/Module/Settings/Channels.php:126 msgid "Check to delete this entry from the channel list" msgstr "" -#: src/Module/Settings/Channels.php:131 +#: src/Module/Settings/Channels.php:132 msgid "Short name for the channel. It is displayed on the channels widget." msgstr "" -#: src/Module/Settings/Channels.php:132 +#: src/Module/Settings/Channels.php:133 msgid "This should describe the content of the channel in a few word." msgstr "" -#: src/Module/Settings/Channels.php:133 +#: src/Module/Settings/Channels.php:134 msgid "" "When you want to access this channel via an access key, you can define it " "here. Pay attentioon to not use an already used one." msgstr "" -#: src/Module/Settings/Channels.php:134 +#: src/Module/Settings/Channels.php:135 msgid "" "Comma separated list of tags. A post will be used when it contains any of " "the listed tags." msgstr "" -#: src/Module/Settings/Channels.php:135 +#: src/Module/Settings/Channels.php:136 msgid "" "Comma separated list of tags. If a post contain any of these tags, then it " "will not be part of nthis channel." msgstr "" -#: src/Module/Settings/Channels.php:136 -msgid "Check to display images in the channel." -msgstr "" - #: src/Module/Settings/Channels.php:137 -msgid "Check to display videos in the channel." +msgid "Search terms for the body." msgstr "" #: src/Module/Settings/Channels.php:138 +msgid "Check to display images in the channel." +msgstr "" + +#: src/Module/Settings/Channels.php:139 +msgid "Check to display videos in the channel." +msgstr "" + +#: src/Module/Settings/Channels.php:140 msgid "Check to display audio in the channel." msgstr "" -#: src/Module/Settings/Channels.php:141 +#: src/Module/Settings/Channels.php:143 msgid "This page can be used to define your own channels." msgstr "" -#: src/Module/Settings/Channels.php:142 +#: src/Module/Settings/Channels.php:144 msgid "Add new entry to the channel list" msgstr "" -#: src/Module/Settings/Channels.php:143 src/Module/Settings/Delegation.php:181 +#: src/Module/Settings/Channels.php:145 src/Module/Settings/Delegation.php:181 msgid "Add" msgstr "" -#: src/Module/Settings/Channels.php:145 +#: src/Module/Settings/Channels.php:147 msgid "Current Entries in the channel list" msgstr "" -#: src/Module/Settings/Channels.php:148 +#: src/Module/Settings/Channels.php:150 msgid "Delete entry from the channel list" msgstr "" -#: src/Module/Settings/Channels.php:149 +#: src/Module/Settings/Channels.php:151 msgid "Delete entry from the channel list?" msgstr "" @@ -10269,171 +10279,167 @@ msgstr "" msgid "No entries." msgstr "" -#: src/Module/Settings/Display.php:146 +#: src/Module/Settings/Display.php:162 msgid "The theme you chose isn't available." msgstr "" -#: src/Module/Settings/Display.php:186 +#: src/Module/Settings/Display.php:202 #, php-format msgid "%s - (Unsupported)" msgstr "" -#: src/Module/Settings/Display.php:221 +#: src/Module/Settings/Display.php:237 msgid "No preview" msgstr "" -#: src/Module/Settings/Display.php:222 +#: src/Module/Settings/Display.php:238 msgid "No image" msgstr "" -#: src/Module/Settings/Display.php:223 +#: src/Module/Settings/Display.php:239 msgid "Small Image" msgstr "" -#: src/Module/Settings/Display.php:224 +#: src/Module/Settings/Display.php:240 msgid "Large Image" msgstr "" -#: src/Module/Settings/Display.php:259 +#: src/Module/Settings/Display.php:286 msgid "Display Settings" msgstr "" -#: src/Module/Settings/Display.php:261 +#: src/Module/Settings/Display.php:288 msgid "General Theme Settings" msgstr "" -#: src/Module/Settings/Display.php:262 +#: src/Module/Settings/Display.php:289 msgid "Custom Theme Settings" msgstr "" -#: src/Module/Settings/Display.php:263 +#: src/Module/Settings/Display.php:290 msgid "Content Settings" msgstr "" -#: src/Module/Settings/Display.php:264 view/theme/duepuntozero/config.php:86 +#: src/Module/Settings/Display.php:291 view/theme/duepuntozero/config.php:86 #: view/theme/frio/config.php:172 view/theme/quattro/config.php:88 #: view/theme/vier/config.php:136 msgid "Theme settings" msgstr "" -#: src/Module/Settings/Display.php:265 +#: src/Module/Settings/Display.php:292 msgid "Timelines" msgstr "" -#: src/Module/Settings/Display.php:272 +#: src/Module/Settings/Display.php:299 msgid "Display Theme:" msgstr "" -#: src/Module/Settings/Display.php:273 +#: src/Module/Settings/Display.php:300 msgid "Mobile Theme:" msgstr "" -#: src/Module/Settings/Display.php:276 +#: src/Module/Settings/Display.php:303 msgid "Number of items to display per page:" msgstr "" -#: src/Module/Settings/Display.php:276 src/Module/Settings/Display.php:277 +#: src/Module/Settings/Display.php:303 src/Module/Settings/Display.php:304 msgid "Maximum of 100 items" msgstr "" -#: src/Module/Settings/Display.php:277 +#: src/Module/Settings/Display.php:304 msgid "Number of items to display per page when viewed from mobile device:" msgstr "" -#: src/Module/Settings/Display.php:278 +#: src/Module/Settings/Display.php:305 msgid "Update browser every xx seconds" msgstr "" -#: src/Module/Settings/Display.php:278 +#: src/Module/Settings/Display.php:305 msgid "Minimum of 10 seconds. Enter -1 to disable it." msgstr "" -#: src/Module/Settings/Display.php:279 +#: src/Module/Settings/Display.php:306 msgid "Display emoticons" msgstr "" -#: src/Module/Settings/Display.php:279 +#: src/Module/Settings/Display.php:306 msgid "When enabled, emoticons are replaced with matching symbols." msgstr "" -#: src/Module/Settings/Display.php:280 +#: src/Module/Settings/Display.php:307 msgid "Infinite scroll" msgstr "" -#: src/Module/Settings/Display.php:280 +#: src/Module/Settings/Display.php:307 msgid "Automatic fetch new items when reaching the page end." msgstr "" -#: src/Module/Settings/Display.php:281 +#: src/Module/Settings/Display.php:308 msgid "Enable Smart Threading" msgstr "" -#: src/Module/Settings/Display.php:281 +#: src/Module/Settings/Display.php:308 msgid "Enable the automatic suppression of extraneous thread indentation." msgstr "" -#: src/Module/Settings/Display.php:282 +#: src/Module/Settings/Display.php:309 msgid "Display the Dislike feature" msgstr "" -#: src/Module/Settings/Display.php:282 +#: src/Module/Settings/Display.php:309 msgid "Display the Dislike button and dislike reactions on posts and comments." msgstr "" -#: src/Module/Settings/Display.php:283 +#: src/Module/Settings/Display.php:310 msgid "Display the resharer" msgstr "" -#: src/Module/Settings/Display.php:283 +#: src/Module/Settings/Display.php:310 msgid "Display the first resharer as icon and text on a reshared item." msgstr "" -#: src/Module/Settings/Display.php:284 +#: src/Module/Settings/Display.php:311 msgid "Stay local" msgstr "" -#: src/Module/Settings/Display.php:284 +#: src/Module/Settings/Display.php:311 msgid "Don't go to a remote system when following a contact link." msgstr "" -#: src/Module/Settings/Display.php:285 +#: src/Module/Settings/Display.php:312 msgid "Link preview mode" msgstr "" -#: src/Module/Settings/Display.php:285 +#: src/Module/Settings/Display.php:312 msgid "Appearance of the link preview that is added to each post with a link." msgstr "" -#: src/Module/Settings/Display.php:287 -msgid "Timelines for the network page:" +#: src/Module/Settings/Display.php:317 +msgid "Bookmark" msgstr "" -#: src/Module/Settings/Display.php:287 -msgid "Select all the timelines that you want to see on your network page." +#: src/Module/Settings/Display.php:319 +msgid "" +"Enable timelines that you want to see in the channels widget. Bookmark " +"timelines that you want to see in the top menu." msgstr "" -#: src/Module/Settings/Display.php:288 +#: src/Module/Settings/Display.php:321 msgid "Channel languages:" msgstr "" -#: src/Module/Settings/Display.php:288 +#: src/Module/Settings/Display.php:321 msgid "Select all languages that you want to see in your channels." msgstr "" -#: src/Module/Settings/Display.php:290 +#: src/Module/Settings/Display.php:323 msgid "Beginning of week:" msgstr "" -#: src/Module/Settings/Display.php:291 +#: src/Module/Settings/Display.php:324 msgid "Default calendar view:" msgstr "" -#: src/Module/Settings/Display.php:300 src/Module/Settings/Display.php:308 -#: src/Module/Settings/Display.php:312 -#, php-format -msgid "%s: %s" -msgstr "" - #: src/Module/Settings/Features.php:74 msgid "Additional Features" msgstr "" diff --git a/view/templates/settings/channels.tpl b/view/templates/settings/channels.tpl index b4543cd563..d393c3b3c4 100644 --- a/view/templates/settings/channels.tpl +++ b/view/templates/settings/channels.tpl @@ -9,6 +9,7 @@ {{include file="field_input.tpl" field=$access_key}} {{include file="field_input.tpl" field=$include_tags}} {{include file="field_input.tpl" field=$exclude_tags}} + {{include file="field_input.tpl" field=$text_search}} {{include file="field_checkbox.tpl" field=$image}} {{include file="field_checkbox.tpl" field=$video}} {{include file="field_checkbox.tpl" field=$audio}} @@ -27,6 +28,7 @@ {{include file="field_input.tpl" field=$e.access_key}} {{include file="field_input.tpl" field=$e.include_tags}} {{include file="field_input.tpl" field=$e.exclude_tags}} + {{include file="field_input.tpl" field=$e.text_search}} {{include file="field_checkbox.tpl" field=$e.image}} {{include file="field_checkbox.tpl" field=$e.video}} {{include file="field_checkbox.tpl" field=$e.audio}} diff --git a/view/templates/settings/display.tpl b/view/templates/settings/display.tpl index 868acb38a2..d1cba7a195 100644 --- a/view/templates/settings/display.tpl +++ b/view/templates/settings/display.tpl @@ -22,7 +22,27 @@ {{include file="field_select.tpl" field=$preview_mode}}

{{$timeline_title}}

- {{include file="field_select.tpl" field=$network_timelines}} + {{$timeline_explanation}} + + + + + + + + + + + {{foreach $timelines as $t}} + + + + + + + {{/foreach}} + +
{{$timeline_label}}{{$timeline_descriptiom}}{{$timeline_enable}}{{$timeline_bookmark}}
{{$t.label}}{{$t.description}}{{include file="field_checkbox.tpl" field=$t.enable}}{{include file="field_checkbox.tpl" field=$t.bookmark}}

{{$channel_title}}

{{include file="field_select.tpl" field=$channel_languages}} From c66e841c38db202c6879fc1d9a267ae1c7ce9d10 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 22 Sep 2023 05:16:46 +0000 Subject: [PATCH 11/31] Add author to the search content / fix sidebar link to channels --- src/Model/Post/Engagement.php | 9 +++++++-- src/Module/BaseSettings.php | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Model/Post/Engagement.php b/src/Model/Post/Engagement.php index 3df364b907..3aec0c1e12 100644 --- a/src/Model/Post/Engagement.php +++ b/src/Model/Post/Engagement.php @@ -53,7 +53,9 @@ class Engagement return; } - $parent = Post::selectFirst(['uri-id', 'created', 'owner-id', 'uid', 'private', 'contact-contact-type', 'language', 'title', 'content-warning', 'body'], ['uri-id' => $item['parent-uri-id']]); + $parent = Post::selectFirst(['uri-id', 'created', 'owner-id', 'uid', 'private', 'contact-contact-type', 'language', + 'title', 'content-warning', 'body', 'author-name', 'author-nick', 'author-addr', 'owner-name', 'owner-nick', 'owner-addr'], + ['uri-id' => $item['parent-uri-id']]); if ($parent['created'] < DateTimeFormat::utc('now - ' . DI::config()->get('channel', 'engagement_hours') . ' hour')) { Logger::debug('Post is too old', ['uri-id' => $item['uri-id'], 'parent-uri-id' => $item['parent-uri-id'], 'created' => $parent['created']]); @@ -108,7 +110,10 @@ class Engagement private static function getSearchText(array $item): string { - $body = $item['title'] . "\n" . $item['content-warning'] . "\n" . $item['body'] . "\n"; + $body = $item['title'] . ' ' . $item['content-warning'] . ' ' . $item['body'] . ' ' . + $item['author-name'] . ' ' . $item['author-nick'] . ' ' . $item['author-addr'] . ' ' . + $item['owner-name'] . ' ' . $item['owner-nick'] . ' ' . $item['owner-addr']; + $body = Post\Media::addAttachmentsToBody($item['uri-id'], $body); $text = BBCode::toPlaintext($body, false); diff --git a/src/Module/BaseSettings.php b/src/Module/BaseSettings.php index 495c175bde..c1033e730c 100644 --- a/src/Module/BaseSettings.php +++ b/src/Module/BaseSettings.php @@ -124,7 +124,7 @@ class BaseSettings extends BaseModule $tabs[] = [ 'label' => $this->t('Channels'), 'url' => 'settings/channels', - 'selected' => static::class == Settings\Display::class ? 'active' : '', + 'selected' => static::class == Settings\Channels::class ? 'active' : '', 'accesskey' => '', ]; From a8a9f93e09c0923427509bfe16dd9bcaf0ac14e7 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 22 Sep 2023 10:28:00 +0000 Subject: [PATCH 12/31] Special search keywords added --- database.sql | 4 +++ src/Model/Post/Engagement.php | 53 +++++++++++++++++++++++++--- src/Module/Conversation/Timeline.php | 6 +++- src/Module/Settings/Channels.php | 2 +- static/dbview.config.php | 4 +++ 5 files changed, 62 insertions(+), 7 deletions(-) diff --git a/database.sql b/database.sql index 25f94cac85..a2b5887752 100644 --- a/database.sql +++ b/database.sql @@ -2090,6 +2090,7 @@ CREATE VIEW `post-user-view` AS SELECT `author`.`blocked` AS `author-blocked`, `author`.`hidden` AS `author-hidden`, `author`.`updated` AS `author-updated`, + `author`.`contact-type` AS `author-contact-type`, `author`.`gsid` AS `author-gsid`, `author`.`baseurl` AS `author-baseurl`, `post-user`.`owner-id` AS `owner-id`, @@ -2274,6 +2275,7 @@ CREATE VIEW `post-thread-user-view` AS SELECT `author`.`blocked` AS `author-blocked`, `author`.`hidden` AS `author-hidden`, `author`.`updated` AS `author-updated`, + `author`.`contact-type` AS `author-contact-type`, `author`.`gsid` AS `author-gsid`, `post-thread-user`.`owner-id` AS `owner-id`, `owner`.`uri-id` AS `owner-uri-id`, @@ -2442,6 +2444,7 @@ CREATE VIEW `post-view` AS SELECT `author`.`blocked` AS `author-blocked`, `author`.`hidden` AS `author-hidden`, `author`.`updated` AS `author-updated`, + `author`.`contact-type` AS `author-contact-type`, `author`.`gsid` AS `author-gsid`, `post`.`owner-id` AS `owner-id`, `owner`.`uri-id` AS `owner-uri-id`, @@ -2587,6 +2590,7 @@ CREATE VIEW `post-thread-view` AS SELECT `author`.`blocked` AS `author-blocked`, `author`.`hidden` AS `author-hidden`, `author`.`updated` AS `author-updated`, + `author`.`contact-type` AS `author-contact-type`, `author`.`gsid` AS `author-gsid`, `post-thread`.`owner-id` AS `owner-id`, `owner`.`uri-id` AS `owner-uri-id`, diff --git a/src/Model/Post/Engagement.php b/src/Model/Post/Engagement.php index 3aec0c1e12..a23fe01840 100644 --- a/src/Model/Post/Engagement.php +++ b/src/Model/Post/Engagement.php @@ -53,8 +53,8 @@ class Engagement return; } - $parent = Post::selectFirst(['uri-id', 'created', 'owner-id', 'uid', 'private', 'contact-contact-type', 'language', - 'title', 'content-warning', 'body', 'author-name', 'author-nick', 'author-addr', 'owner-name', 'owner-nick', 'owner-addr'], + $parent = Post::selectFirst(['uri-id', 'created', 'author-id', 'owner-id', 'uid', 'private', 'contact-contact-type', 'language', 'network', + 'title', 'content-warning', 'body', 'author-contact-type', 'author-nick', 'author-addr', 'owner-contact-type', 'owner-nick', 'owner-addr'], ['uri-id' => $item['parent-uri-id']]); if ($parent['created'] < DateTimeFormat::utc('now - ' . DI::config()->get('channel', 'engagement_hours') . ' hour')) { @@ -110,9 +110,52 @@ class Engagement private static function getSearchText(array $item): string { - $body = $item['title'] . ' ' . $item['content-warning'] . ' ' . $item['body'] . ' ' . - $item['author-name'] . ' ' . $item['author-nick'] . ' ' . $item['author-addr'] . ' ' . - $item['owner-name'] . ' ' . $item['owner-nick'] . ' ' . $item['owner-addr']; + $body = '[nosmile]network:' . $item['network']; + + switch ($item['private']) { + case Item::PUBLIC: + $body .= ' visibility:public'; + break; + case Item::UNLISTED: + $body .= ' visibility:unlisted'; + break; + case Item::PRIVATE: + $body .= ' visibility:private'; + break; + } + + if ($item['author-contact-type'] == Contact::TYPE_COMMUNITY) { + $body .= ' group:' . $item['author-nick'] . ' group:' . $item['author-addr']; + } elseif (in_array($item['author-contact-type'], [Contact::TYPE_PERSON, Contact::TYPE_NEWS, Contact::TYPE_ORGANISATION])) { + $body .= ' from:' . $item['author-nick'] . ' from:' . $item['author-addr']; + } + + if ($item['author-id'] != $item['owner-id']) { + if ($item['owner-contact-type'] == Contact::TYPE_COMMUNITY) { + $body .= ' group:' . $item['owner-nick'] . ' group:' . $item['owner-addr']; + } elseif (in_array($item['owner-contact-type'], [Contact::TYPE_PERSON, Contact::TYPE_NEWS, Contact::TYPE_ORGANISATION])) { + $body .= ' from:' . $item['owner-nick'] . ' from:' . $item['owner-addr']; + } + } + + foreach (Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION, Tag::AUDIENCE]) as $tag) { + $contact = Contact::getByURL($tag['name'], false, ['nick', 'addr', 'contact-type']); + if (empty($contact)) { + continue; + } + + if (($contact['contact-type'] == Contact::TYPE_COMMUNITY) && !strpos($body, 'group:' . $contact['addr'])) { + $body .= ' group:' . $contact['nick'] . ' group:' . $contact['addr']; + } elseif (in_array($contact['contact-type'], [Contact::TYPE_PERSON, Contact::TYPE_NEWS, Contact::TYPE_ORGANISATION])) { + $body .= ' to:' . $contact['nick'] . ' to:' . $contact['addr']; + } + } + + foreach (Tag::getByURIId($item['uri-id'], [Tag::HASHTAG]) as $tag) { + $body .= ' tag:' . $tag['name']; + } + + $body .= ' ' . $item['title'] . ' ' . $item['content-warning'] . ' ' . $item['body']; $body = Post\Media::addAttachmentsToBody($item['uri-id'], $body); $text = BBCode::toPlaintext($body, false); diff --git a/src/Module/Conversation/Timeline.php b/src/Module/Conversation/Timeline.php index 44149d1ecc..a33bee4d07 100644 --- a/src/Module/Conversation/Timeline.php +++ b/src/Module/Conversation/Timeline.php @@ -376,7 +376,11 @@ class Timeline extends BaseModule $condition = []; if (!empty($channel->fullTextSearch)) { - $condition = DBA::mergeConditions($condition, ["MATCH (`searchtext`) AGAINST (? IN BOOLEAN MODE)", $channel->fullTextSearch]); + $search = $channel->fullTextSearch; + foreach (['from', 'to', 'group', 'tag', 'network', 'visibility'] as $keyword) { + $search = preg_replace('~(' . $keyword . ':.[\w@\.-]+)~', '"$1"', $search); + } + $condition = DBA::mergeConditions($condition, ["MATCH (`searchtext`) AGAINST (? IN BOOLEAN MODE)", $search]); } if (!empty($channel->includeTags)) { diff --git a/src/Module/Settings/Channels.php b/src/Module/Settings/Channels.php index ca9e8d1686..0d4f47e148 100644 --- a/src/Module/Settings/Channels.php +++ b/src/Module/Settings/Channels.php @@ -134,7 +134,7 @@ class Channels extends BaseSettings 'access_key' => ["new_access_key", $this->t("Access Key"), '', $this->t('When you want to access this channel via an access key, you can define it here. Pay attentioon to not use an already used one.')], 'include_tags' => ["new_include_tags", $this->t("Include Tags"), '', $this->t('Comma separated list of tags. A post will be used when it contains any of the listed tags.')], 'exclude_tags' => ["new_exclude_tags", $this->t("Exclude Tags"), '', $this->t('Comma separated list of tags. If a post contain any of these tags, then it will not be part of nthis channel.')], - 'text_search' => ["new_text_search", $this->t("Full Text Search"), '', $this->t('Search terms for the body.')], + 'text_search' => ["new_text_search", $this->t("Full Text Search"), '', $this->t('Search terms for the body.')], // @todo Add dcumentation for the keywords 'image' => ['new_image', $this->t("Images"), false, $this->t("Check to display images in the channel.")], 'video' => ["new_video", $this->t("Videos"), false, $this->t("Check to display videos in the channel.")], 'audio' => ["new_audio", $this->t("Audio"), false, $this->t("Check to display audio in the channel.")], diff --git a/static/dbview.config.php b/static/dbview.config.php index d688cef3fa..057c8fccc5 100644 --- a/static/dbview.config.php +++ b/static/dbview.config.php @@ -184,6 +184,7 @@ "author-blocked" => ["author", "blocked"], "author-hidden" => ["author", "hidden"], "author-updated" => ["author", "updated"], + "author-contact-type" => ["author", "contact-type"], "author-gsid" => ["author", "gsid"], "author-baseurl" => ["author", "baseurl"], "owner-id" => ["post-user", "owner-id"], @@ -366,6 +367,7 @@ "author-blocked" => ["author", "blocked"], "author-hidden" => ["author", "hidden"], "author-updated" => ["author", "updated"], + "author-contact-type" => ["author", "contact-type"], "author-gsid" => ["author", "gsid"], "owner-id" => ["post-thread-user", "owner-id"], "owner-uri-id" => ["owner", "uri-id"], @@ -532,6 +534,7 @@ "author-blocked" => ["author", "blocked"], "author-hidden" => ["author", "hidden"], "author-updated" => ["author", "updated"], + "author-contact-type" => ["author", "contact-type"], "author-gsid" => ["author", "gsid"], "owner-id" => ["post", "owner-id"], "owner-uri-id" => ["owner", "uri-id"], @@ -675,6 +678,7 @@ "author-blocked" => ["author", "blocked"], "author-hidden" => ["author", "hidden"], "author-updated" => ["author", "updated"], + "author-contact-type" => ["author", "contact-type"], "author-gsid" => ["author", "gsid"], "owner-id" => ["post-thread", "owner-id"], "owner-uri-id" => ["owner", "uri-id"], From aa429be4d9f634421dacfe16709a31936098e38b Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 22 Sep 2023 19:09:23 +0000 Subject: [PATCH 13/31] Remove links from search text --- src/Model/Post/Engagement.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Model/Post/Engagement.php b/src/Model/Post/Engagement.php index a23fe01840..d55a09527f 100644 --- a/src/Model/Post/Engagement.php +++ b/src/Model/Post/Engagement.php @@ -157,6 +157,8 @@ class Engagement $body .= ' ' . $item['title'] . ' ' . $item['content-warning'] . ' ' . $item['body']; + $body = preg_replace("~\[url\=.*\]https?:.*\[\/url\]~", '', $body); + $body = Post\Media::addAttachmentsToBody($item['uri-id'], $body); $text = BBCode::toPlaintext($body, false); From 7c6d872964df81faa5d4952b604a3d360ac2897f Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 22 Sep 2023 20:12:10 +0000 Subject: [PATCH 14/31] Only add images --- src/Model/Post/Engagement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model/Post/Engagement.php b/src/Model/Post/Engagement.php index d55a09527f..4c6f6e0e55 100644 --- a/src/Model/Post/Engagement.php +++ b/src/Model/Post/Engagement.php @@ -159,7 +159,7 @@ class Engagement $body = preg_replace("~\[url\=.*\]https?:.*\[\/url\]~", '', $body); - $body = Post\Media::addAttachmentsToBody($item['uri-id'], $body); + $body = Post\Media::addAttachmentsToBody($item['uri-id'], $body, [Post\Media::IMAGE]); $text = BBCode::toPlaintext($body, false); do { From 21647874996c71db0c5a17416bea00f09d9f18b2 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 23 Sep 2023 14:46:15 +0000 Subject: [PATCH 15/31] Channel documentation added --- doc/Channels.md | 61 ++++++++++++++++++++++++++++++++ doc/Home.md | 1 + doc/de/Home.md | 1 + src/Module/Settings/Channels.php | 4 +-- view/lang/C/messages.po | 10 ++++-- 5 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 doc/Channels.md diff --git a/doc/Channels.md b/doc/Channels.md new file mode 100644 index 0000000000..a588933e14 --- /dev/null +++ b/doc/Channels.md @@ -0,0 +1,61 @@ +Channels +===== + +* [Home](help) + +Channels are a way to discover new content or to display content that you might have missed otherwise. +There are several predefined channels, additionally you can create your own channels, based on some rules. + +In the display settings in the section "Timelines" you can define which channels and other timelines you want to see in the "Channels" widget on the network page and which channels should appear in the menu bar at the top of the page. + +Predefined Channels +--- + +* Whats hot: Posts from the last 24 hours with the most interactions. +* For you: Posts from the last 24 hours from contact you interact on a lot, or you follow (and the post has some comments) or posts from people you want to be notified when they post. +* Followers: Posts from the last 24 hours created by contacts that follow you, but you don't follow them. +* Images: Posts from the last 24 hours with pictures. +* Videos: Posts from the last 24 hours with videos +* Audio: Posts from the last 24 hours with audio + +User defined Channels +--- + +In the "Channels" settings you can create your own channels. + +Each channel is defined by these values: + +* Label: This value is mandatory and is used for the menu label. +* Description: A short description of the content. This can help to keep the overview, when you have got a lot of channels. +* Access Key: When you want to access this channel via an access key, you can define it here. Pay attention to not use an already used one. +* Include Tags: Comma separated list of tags. A post will be used when it contains any of the listed tags. +* Exclude Tags: Comma separated list of tags. If a post contain any of these tags, then it will not be part of nthis channel. +* Full Text Search: This can be used to include or exclude content, based on the content and some additional keywords. It uses the "boolean mode" operators from MariaDB: https://mariadb.com/kb/en/full-text-index-overview/#in-boolean-mode +* Images, Videos, Audio: When selected, you will see content with the selected media type. This can be combined. If none of these fields are checked, you will see any content, with or without attacked media. + +Additional keywords for the full text search +--- + +Additionally to the search for content, there are additional keywords that can be used in the full text search: + +* from - Use "from:nickname" or "from:nickname@domain.tld" to search for posts from a specific author. +* to - Use "from:nickname" or "from:nickname@domain.tld" to search for posts with the given contact as receiver. +* group - Use "from:nickname" or "from:nickname@domain.tld" to search for group post of the given group. +* tag - Use "tag:tagname" to search for a specific tag. +* network - Use this to include or exclude some networks from your channel. + * network:apub - ActivityPub (Used by the systems in the Fediverse) + * network:dfrn - Legacy Friendica protocol. Nowayday Friendica mostly uses ActivityPub. + * network:dspr - The Diaspora protocol is mainly used by Diaspora itself. Some other systems support the protocol as well like Hubzilla, Socialhome or Ganggo. + * network:feed - RSS/Atom feeds + * network:mail - Mails that had been imported via IMAP. + * network:stat - The OStatus protocol is mainly used by old GNU Social installations. + * network:dscs - Posts that are received by the Discourse connector. + * network:tmbl - Posts that are received by the Tumblr connector. + * network:bsky - Posts that are received by the Bluesky connector. +* visibility - You have the choice between different visibilities. You can only see unlisted or private posts that you have the access for. + * visibility:public + * visibility:unlisted + * visibility:private + +Remember that you can combine these kerywords. +So for example you can create a channel with all posts that talk about the Fediverse - that aren't posted in the Fediverse with the search terms: "fediverse -network:apub -network:dfrn" \ No newline at end of file diff --git a/doc/Home.md b/doc/Home.md index 9578e914a0..33ed640746 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -17,6 +17,7 @@ Friendica Documentation and Resources * [Circles and Privacy](help/Circles-and-Privacy) * [Tags and Mentions](help/Tags-and-Mentions) * [Community Groups](help/Groups) + * [Channels](help/Channels) * [Chats](help/Chats) * Further information * [Move your account](help/Move-Account) diff --git a/doc/de/Home.md b/doc/de/Home.md index 91976bb282..6cd6e5ea87 100644 --- a/doc/de/Home.md +++ b/doc/de/Home.md @@ -17,6 +17,7 @@ Friendica - Dokumentation und Ressourcen * [Circles und Privatsphäre](help/Circles-and-Privacy) * [Tags und Erwähnungen](help/Tags-and-Mentions) * [Community-Gruppen](help/Groups) + * [Channels](help/Channels) * [Chats](help/Chats) * Weiterführende Informationen * [Account umziehen](help/Move-Account) diff --git a/src/Module/Settings/Channels.php b/src/Module/Settings/Channels.php index 0d4f47e148..c1c8d0b4c7 100644 --- a/src/Module/Settings/Channels.php +++ b/src/Module/Settings/Channels.php @@ -131,10 +131,10 @@ class Channels extends BaseSettings return Renderer::replaceMacros($t, [ 'label' => ["new_label", $this->t('Label'), '', $this->t('Short name for the channel. It is displayed on the channels widget.'), $this->t('Required')], 'description' => ["new_description", $this->t("Description"), '', $this->t('This should describe the content of the channel in a few word.')], - 'access_key' => ["new_access_key", $this->t("Access Key"), '', $this->t('When you want to access this channel via an access key, you can define it here. Pay attentioon to not use an already used one.')], + 'access_key' => ["new_access_key", $this->t("Access Key"), '', $this->t('When you want to access this channel via an access key, you can define it here. Pay attention to not use an already used one.')], 'include_tags' => ["new_include_tags", $this->t("Include Tags"), '', $this->t('Comma separated list of tags. A post will be used when it contains any of the listed tags.')], 'exclude_tags' => ["new_exclude_tags", $this->t("Exclude Tags"), '', $this->t('Comma separated list of tags. If a post contain any of these tags, then it will not be part of nthis channel.')], - 'text_search' => ["new_text_search", $this->t("Full Text Search"), '', $this->t('Search terms for the body.')], // @todo Add dcumentation for the keywords + 'text_search' => ["new_text_search", $this->t("Full Text Search"), '', $this->t('Search terms for the body, supports the "boolean mode" operators from MariaDB. See the help for a complete list of operators and additional keywords: %s', 'help/Channels')], 'image' => ['new_image', $this->t("Images"), false, $this->t("Check to display images in the channel.")], 'video' => ["new_video", $this->t("Videos"), false, $this->t("Check to display videos in the channel.")], 'audio' => ["new_audio", $this->t("Audio"), false, $this->t("Check to display audio in the channel.")], diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index b35273d544..05a3b18e81 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-09-21 23:26+0000\n" +"POT-Creation-Date: 2023-09-23 14:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -9955,7 +9955,7 @@ msgstr "" #: src/Module/Settings/Channels.php:134 msgid "" "When you want to access this channel via an access key, you can define it " -"here. Pay attentioon to not use an already used one." +"here. Pay attention to not use an already used one." msgstr "" #: src/Module/Settings/Channels.php:135 @@ -9971,7 +9971,11 @@ msgid "" msgstr "" #: src/Module/Settings/Channels.php:137 -msgid "Search terms for the body." +#, php-format +msgid "" +"Search terms for the body, supports the \"boolean mode\" operators from " +"MariaDB. See the help for a complete list of operators and additional " +"keywords: %s" msgstr "" #: src/Module/Settings/Channels.php:138 From 9f23bee6e48aab42993c3ee4b9f896a14c84d089 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 24 Sep 2023 00:45:07 +0000 Subject: [PATCH 16/31] User defined channels can now base on circles/channels --- database.sql | 1 + doc/database/db_channel.md | 1 + src/Content/Conversation/Entity/Timeline.php | 5 +- src/Content/Conversation/Factory/Timeline.php | 1 + .../Conversation/Repository/Channel.php | 1 + src/Model/Circle.php | 16 ++ src/Module/Conversation/Timeline.php | 13 +- src/Module/Settings/Channels.php | 15 ++ static/dbstructure.config.php | 1 + view/lang/C/messages.po | 153 ++++++++++-------- view/templates/settings/channels.tpl | 2 + 11 files changed, 136 insertions(+), 73 deletions(-) diff --git a/database.sql b/database.sql index a2b5887752..2f4bec6897 100644 --- a/database.sql +++ b/database.sql @@ -500,6 +500,7 @@ CREATE TABLE IF NOT EXISTS `channel` ( `uid` mediumint unsigned NOT NULL COMMENT 'User id', `label` varchar(64) NOT NULL COMMENT 'Channel label', `description` varchar(64) COMMENT 'Channel description', + `circle` int COMMENT 'Circle or channel that this channel is based on', `access-key` varchar(1) COMMENT 'Access key', `include-tags` varchar(255) COMMENT 'Comma separated list of tags that will be included in the channel', `exclude-tags` varchar(255) COMMENT 'Comma separated list of tags that aren\'t allowed in the channel', diff --git a/doc/database/db_channel.md b/doc/database/db_channel.md index 1d5bfc73e4..e37aa93d11 100644 --- a/doc/database/db_channel.md +++ b/doc/database/db_channel.md @@ -12,6 +12,7 @@ Fields | uid | User id | mediumint unsigned | NO | | NULL | | | label | Channel label | varchar(64) | NO | | NULL | | | description | Channel description | varchar(64) | YES | | NULL | | +| circle | Circle or channel that this channel is based on | int | YES | | NULL | | | access-key | Access key | varchar(1) | YES | | NULL | | | include-tags | Comma separated list of tags that will be included in the channel | varchar(255) | YES | | NULL | | | exclude-tags | Comma separated list of tags that aren't allowed in the channel | varchar(255) | YES | | NULL | | diff --git a/src/Content/Conversation/Entity/Timeline.php b/src/Content/Conversation/Entity/Timeline.php index ce9e3c62fc..40a39cbb10 100644 --- a/src/Content/Conversation/Entity/Timeline.php +++ b/src/Content/Conversation/Entity/Timeline.php @@ -62,6 +62,8 @@ final class Timeline extends \Friendica\BaseEntity protected $path; /** @var int */ protected $uid; + /** @var int */ + protected $circle; /** @var string */ protected $includeTags; /** @var string */ @@ -71,7 +73,7 @@ final class Timeline extends \Friendica\BaseEntity /** @var int */ protected $mediaType; - public function __construct(string $code = null, string $label = null, string $description = null, string $accessKey = null, string $path = null, int $uid = null, string $includeTags = null, string $excludeTags = null, string $fullTextSearch = null, int $mediaType = null) + public function __construct(string $code = null, string $label = null, string $description = null, string $accessKey = null, string $path = null, int $uid = null, string $includeTags = null, string $excludeTags = null, string $fullTextSearch = null, int $mediaType = null, int $circle = null) { $this->code = $code; $this->label = $label; @@ -83,5 +85,6 @@ final class Timeline extends \Friendica\BaseEntity $this->excludeTags = $excludeTags; $this->fullTextSearch = $fullTextSearch; $this->mediaType = $mediaType; + $this->circle = $circle; } } diff --git a/src/Content/Conversation/Factory/Timeline.php b/src/Content/Conversation/Factory/Timeline.php index 2a6e12330f..459f061b12 100644 --- a/src/Content/Conversation/Factory/Timeline.php +++ b/src/Content/Conversation/Factory/Timeline.php @@ -62,6 +62,7 @@ final class Timeline extends \Friendica\BaseFactory implements ICanCreateFromTab $row['exclude-tags'] ?? null, $row['full-text-search'] ?? null, $row['media-type'] ?? null, + $row['circle'] ?? null, ); } diff --git a/src/Content/Conversation/Repository/Channel.php b/src/Content/Conversation/Repository/Channel.php index ba2e26c468..897bec8c29 100644 --- a/src/Content/Conversation/Repository/Channel.php +++ b/src/Content/Conversation/Repository/Channel.php @@ -91,6 +91,7 @@ class Channel extends \Friendica\BaseRepository 'description' => $Channel->description, 'access-key' => $Channel->accessKey, 'uid' => $Channel->uid, + 'circle' => $Channel->circle, 'include-tags' => $Channel->includeTags, 'exclude-tags' => $Channel->excludeTags, 'full-text-search' => $Channel->fullTextSearch, diff --git a/src/Model/Circle.php b/src/Model/Circle.php index 2b32103db9..2233b58b0c 100644 --- a/src/Model/Circle.php +++ b/src/Model/Circle.php @@ -478,6 +478,22 @@ class Circle return $return; } + public static function getByUID(int $uid): array + { + $circles = []; + + $stmt = DBA::select('group', [], ['deleted' => false, 'uid' => $uid, 'cid' => null], ['order' => ['id']]); + while ($circle = DBA::fetch($stmt)) { + $circles[] = [ + 'id' => $circle['id'], + 'name' => $circle['name'], + ]; + } + DBA::close($stmt); + + return $circles; + } + /** * Returns a templated circle selection list * diff --git a/src/Module/Conversation/Timeline.php b/src/Module/Conversation/Timeline.php index a33bee4d07..2ee98527b2 100644 --- a/src/Module/Conversation/Timeline.php +++ b/src/Module/Conversation/Timeline.php @@ -375,6 +375,16 @@ class Timeline extends BaseModule $condition = []; + if (!empty($channel->circle)) { + if ($channel->circle == -1) { + $condition = ["`owner-id` IN (SELECT `pid` FROM `account-user-view` WHERE `uid` = ? AND `rel` IN (?, ?))", $uid, Contact::SHARING, Contact::FRIEND]; + } elseif ($channel->circle == -2) { + $condition = ["`owner-id` IN (SELECT `pid` FROM `account-user-view` WHERE `uid` = ? AND `rel` = ?)", $uid, Contact::FOLLOWER]; + } elseif ($channel->circle > 0) { + $condition = DBA::mergeConditions($condition, ["`owner-id` IN (SELECT `pid` FROM `group_member` INNER JOIN `account-user-view` ON `group_member`.`contact-id` = `account-user-view`.`id` WHERE `gid` = ? AND `account-user-view`.`uid` = ?)", $channel->circle, $uid]); + } + } + if (!empty($channel->fullTextSearch)) { $search = $channel->fullTextSearch; foreach (['from', 'to', 'group', 'tag', 'network', 'visibility'] as $keyword) { @@ -399,7 +409,8 @@ class Timeline extends BaseModule $condition = DBA::mergeConditions($condition, ["`media-type` & ?", $channel->mediaType]); } - return $condition; + // For "addLanguageCondition" to work, the condition must not be empty + return $condition ?: ["true"]; } private function addLanguageCondition(int $uid, array $condition): array diff --git a/src/Module/Settings/Channels.php b/src/Module/Settings/Channels.php index c1c8d0b4c7..4e2c8f5f15 100644 --- a/src/Module/Settings/Channels.php +++ b/src/Module/Settings/Channels.php @@ -27,6 +27,7 @@ use Friendica\Content\Conversation\Repository\Channel; use Friendica\Core\L10n; use Friendica\Core\Renderer; use Friendica\Core\Session\Capability\IHandleUserSessions; +use Friendica\Model\Circle; use Friendica\Module\BaseSettings; use Friendica\Module\Response; use Friendica\Network\HTTPException; @@ -67,6 +68,7 @@ class Channels extends BaseSettings 'description' => $request['new_description'], 'access-key' => substr(mb_strtolower($request['new_access_key']), 0, 1), 'uid' => $uid, + 'circle' => (int)$request['new_circle'], 'include-tags' => $this->cleanTags($request['new_include_tags']), 'exclude-tags' => $this->cleanTags($request['new_exclude_tags']), 'full-text-search' => $this->cleanTags($request['new_text_search']), @@ -90,6 +92,7 @@ class Channels extends BaseSettings 'description' => $request['description'][$id], 'access-key' => substr(mb_strtolower($request['access_key'][$id]), 0, 1), 'uid' => $uid, + 'circle' => (int)$request['circle'][$id], 'include-tags' => $this->cleanTags($request['include_tags'][$id]), 'exclude-tags' => $this->cleanTags($request['exclude_tags'][$id]), 'full-text-search' => $this->cleanTags($request['text_search'][$id]), @@ -111,12 +114,23 @@ class Channels extends BaseSettings throw new HTTPException\ForbiddenException($this->t('Permission denied.')); } + $circles = [ + 0 => $this->l10n->t('Global Community'), + -1 => $this->l10n->t('Following'), + -2 => $this->l10n->t('Followers'), + ]; + + foreach (Circle::getByUID($uid) as $circle) { + $circles[$circle['id']] = $circle['name']; + } + $blocklistform = []; foreach ($this->channel->selectByUid($uid) as $channel) { $blocklistform[] = [ 'label' => ["label[$channel->code]", $this->t('Label'), $channel->label, '', $this->t('Required')], 'description' => ["description[$channel->code]", $this->t("Description"), $channel->description], 'access_key' => ["access_key[$channel->code]", $this->t("Access Key"), $channel->accessKey], + 'circle' => ["circle[$channel->code]", $this->t('Circle/Channel'), $channel->circle, '', $circles], 'include_tags' => ["include_tags[$channel->code]", $this->t("Include Tags"), $channel->includeTags], 'exclude_tags' => ["exclude_tags[$channel->code]", $this->t("Exclude Tags"), $channel->excludeTags], 'text_search' => ["text_search[$channel->code]", $this->t("Full Text Search"), $channel->fullTextSearch], @@ -132,6 +146,7 @@ class Channels extends BaseSettings 'label' => ["new_label", $this->t('Label'), '', $this->t('Short name for the channel. It is displayed on the channels widget.'), $this->t('Required')], 'description' => ["new_description", $this->t("Description"), '', $this->t('This should describe the content of the channel in a few word.')], 'access_key' => ["new_access_key", $this->t("Access Key"), '', $this->t('When you want to access this channel via an access key, you can define it here. Pay attention to not use an already used one.')], + 'circle' => ['new_circle', $this->t('Circle/Channel'), 0, $this->t('Select a circle or channel, that your channel should be based on.'), $circles], 'include_tags' => ["new_include_tags", $this->t("Include Tags"), '', $this->t('Comma separated list of tags. A post will be used when it contains any of the listed tags.')], 'exclude_tags' => ["new_exclude_tags", $this->t("Exclude Tags"), '', $this->t('Comma separated list of tags. If a post contain any of these tags, then it will not be part of nthis channel.')], 'text_search' => ["new_text_search", $this->t("Full Text Search"), '', $this->t('Search terms for the body, supports the "boolean mode" operators from MariaDB. See the help for a complete list of operators and additional keywords: %s', 'help/Channels')], diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index 22c399736c..30aed566ee 100644 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -558,6 +558,7 @@ return [ "uid" => ["type" => "mediumint unsigned", "not null" => "1", "foreign" => ["user" => "uid"], "comment" => "User id"], "label" => ["type" => "varchar(64)", "not null" => "1", "comment" => "Channel label"], "description" => ["type" => "varchar(64)", "comment" => "Channel description"], + "circle" => ["type" => "int", "comment" => "Circle or channel that this channel is based on"], "access-key" => ["type" => "varchar(1)", "comment" => "Access key"], "include-tags" => ["type" => "varchar(255)", "comment" => "Comma separated list of tags that will be included in the channel"], "exclude-tags" => ["type" => "varchar(255)", "comment" => "Comma separated list of tags that aren't allowed in the channel"], diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 05a3b18e81..a8a90b7cde 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-09-23 14:19+0000\n" +"POT-Creation-Date: 2023-09-24 00:43+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -68,7 +68,7 @@ msgstr "" #: src/Module/Register.php:90 src/Module/Register.php:206 #: src/Module/Register.php:245 src/Module/Search/Directory.php:37 #: src/Module/Settings/Account.php:50 src/Module/Settings/Account.php:408 -#: src/Module/Settings/Channels.php:55 src/Module/Settings/Channels.php:111 +#: src/Module/Settings/Channels.php:56 src/Module/Settings/Channels.php:114 #: src/Module/Settings/Delegation.php:41 src/Module/Settings/Delegation.php:71 #: src/Module/Settings/Display.php:73 src/Module/Settings/Display.php:176 #: src/Module/Settings/Profile/Photo/Crop.php:165 @@ -385,7 +385,7 @@ msgstr "" #: mod/notes.php:57 src/Content/Text/HTML.php:859 #: src/Module/Admin/Storage.php:142 src/Module/Filer/SaveTag.php:74 -#: src/Module/Post/Edit.php:129 src/Module/Settings/Channels.php:146 +#: src/Module/Post/Edit.php:129 src/Module/Settings/Channels.php:161 msgid "Save" msgstr "" @@ -794,13 +794,15 @@ msgstr "" msgid "All contacts" msgstr "" -#: src/BaseModule.php:433 src/Content/Conversation/Factory/Timeline.php:83 +#: src/BaseModule.php:433 src/Content/Conversation/Factory/Timeline.php:84 #: 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/Settings/Channels.php:120 msgid "Followers" msgstr "" #: src/BaseModule.php:438 src/Content/Widget.php:240 src/Module/Contact.php:418 +#: src/Module/Settings/Channels.php:119 msgid "Following" msgstr "" @@ -1514,120 +1516,121 @@ msgstr "" msgid "View in context" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:80 +#: src/Content/Conversation/Factory/Timeline.php:81 msgid "For you" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:80 +#: src/Content/Conversation/Factory/Timeline.php:81 msgid "Posts from contacts you interact with and who interact with you" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:81 +#: src/Content/Conversation/Factory/Timeline.php:82 msgid "What's Hot" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:81 +#: src/Content/Conversation/Factory/Timeline.php:82 msgid "Posts with a lot of interactions" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:82 +#: src/Content/Conversation/Factory/Timeline.php:83 #, php-format msgid "Posts in %s" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:83 +#: src/Content/Conversation/Factory/Timeline.php:84 msgid "Posts from your followers that you don't follow" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:84 +#: src/Content/Conversation/Factory/Timeline.php:85 msgid "Sharers of sharers" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:84 +#: src/Content/Conversation/Factory/Timeline.php:85 msgid "Posts from accounts that are followed by accounts that you follow" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:85 -#: src/Module/Settings/Channels.php:123 src/Module/Settings/Channels.php:138 +#: src/Content/Conversation/Factory/Timeline.php:86 +#: src/Module/Settings/Channels.php:137 src/Module/Settings/Channels.php:153 msgid "Images" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:85 +#: src/Content/Conversation/Factory/Timeline.php:86 msgid "Posts with images" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:86 -#: src/Module/Settings/Channels.php:125 src/Module/Settings/Channels.php:140 +#: src/Content/Conversation/Factory/Timeline.php:87 +#: src/Module/Settings/Channels.php:139 src/Module/Settings/Channels.php:155 msgid "Audio" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:86 +#: src/Content/Conversation/Factory/Timeline.php:87 msgid "Posts with audio" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:87 -#: src/Module/Settings/Channels.php:124 src/Module/Settings/Channels.php:139 +#: src/Content/Conversation/Factory/Timeline.php:88 +#: src/Module/Settings/Channels.php:138 src/Module/Settings/Channels.php:154 msgid "Videos" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:87 +#: src/Content/Conversation/Factory/Timeline.php:88 msgid "Posts with videos" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:110 +#: src/Content/Conversation/Factory/Timeline.php:111 msgid "Local Community" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:110 +#: src/Content/Conversation/Factory/Timeline.php:111 msgid "Posts from local users on this server" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:114 +#: src/Content/Conversation/Factory/Timeline.php:115 +#: src/Module/Settings/Channels.php:118 msgid "Global Community" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:114 +#: src/Content/Conversation/Factory/Timeline.php:115 msgid "Posts from users of the whole federated network" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:128 +#: src/Content/Conversation/Factory/Timeline.php:129 msgid "Latest Activity" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:128 +#: src/Content/Conversation/Factory/Timeline.php:129 msgid "Sort by latest activity" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:129 +#: src/Content/Conversation/Factory/Timeline.php:130 msgid "Latest Posts" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:129 +#: src/Content/Conversation/Factory/Timeline.php:130 msgid "Sort by post received date" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:130 +#: src/Content/Conversation/Factory/Timeline.php:131 msgid "Latest Creation" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:130 +#: src/Content/Conversation/Factory/Timeline.php:131 msgid "Sort by post creation date" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:131 +#: src/Content/Conversation/Factory/Timeline.php:132 #: src/Module/Settings/Profile/Index.php:260 msgid "Personal" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:131 +#: src/Content/Conversation/Factory/Timeline.php:132 msgid "Posts that mention or involve you" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:132 src/Object/Post.php:380 +#: src/Content/Conversation/Factory/Timeline.php:133 src/Object/Post.php:380 msgid "Starred" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:132 +#: src/Content/Conversation/Factory/Timeline.php:133 msgid "Favourite Posts" msgstr "" @@ -2289,7 +2292,7 @@ msgstr "" msgid "Local Directory" msgstr "" -#: src/Content/Widget.php:215 src/Model/Circle.php:600 +#: src/Content/Widget.php:215 src/Model/Circle.php:616 #: src/Module/Contact.php:401 src/Module/Welcome.php:76 msgid "Circles" msgstr "" @@ -2367,7 +2370,7 @@ msgid "All" msgstr "" #: src/Content/Widget.php:585 src/Module/BaseSettings.php:125 -#: src/Module/Settings/Channels.php:142 src/Module/Settings/Display.php:293 +#: src/Module/Settings/Channels.php:157 src/Module/Settings/Display.php:293 msgid "Channels" msgstr "" @@ -3161,36 +3164,36 @@ msgid "" "not what you intended, please create another circle with a different name." msgstr "" -#: src/Model/Circle.php:543 +#: src/Model/Circle.php:559 msgid "Everybody" msgstr "" -#: src/Model/Circle.php:562 +#: src/Model/Circle.php:578 msgid "edit" msgstr "" -#: src/Model/Circle.php:599 +#: src/Model/Circle.php:615 msgid "add" msgstr "" -#: src/Model/Circle.php:604 +#: src/Model/Circle.php:620 msgid "Edit circle" msgstr "" -#: src/Model/Circle.php:605 src/Module/Circle.php:193 +#: src/Model/Circle.php:621 src/Module/Circle.php:193 msgid "Contacts not in any circle" msgstr "" -#: src/Model/Circle.php:607 +#: src/Model/Circle.php:623 msgid "Create a new circle" msgstr "" -#: src/Model/Circle.php:608 src/Module/Circle.php:178 src/Module/Circle.php:201 +#: src/Model/Circle.php:624 src/Module/Circle.php:178 src/Module/Circle.php:201 #: src/Module/Circle.php:276 msgid "Circle Name: " msgstr "" -#: src/Model/Circle.php:609 +#: src/Model/Circle.php:625 msgid "Edit circles" msgstr "" @@ -5847,7 +5850,7 @@ msgstr "" #: src/Module/Moderation/Blocklist/Server/Index.php:116 #: src/Module/Moderation/Item/Delete.php:67 src/Module/Register.php:148 #: src/Module/Security/TwoFactor/Verify.php:101 -#: src/Module/Settings/Channels.php:117 src/Module/Settings/Channels.php:132 +#: src/Module/Settings/Channels.php:130 src/Module/Settings/Channels.php:146 #: src/Module/Settings/TwoFactor/Index.php:140 #: src/Module/Settings/TwoFactor/Verify.php:155 msgid "Required" @@ -7119,7 +7122,7 @@ msgstr "" #: src/Module/Friendica.php:102 #: src/Module/Moderation/Blocklist/Server/Index.php:87 #: src/Module/Moderation/Blocklist/Server/Index.php:111 -#: src/Module/Settings/Channels.php:149 +#: src/Module/Settings/Channels.php:164 msgid "Reason for the block" msgstr "" @@ -7867,7 +7870,7 @@ msgstr "" #: src/Module/Moderation/Blocklist/Server/Index.php:86 #: src/Module/Moderation/Blocklist/Server/Index.php:110 -#: src/Module/Settings/Channels.php:148 +#: src/Module/Settings/Channels.php:163 msgid "Blocked server domain pattern" msgstr "" @@ -9909,68 +9912,76 @@ msgstr "" msgid "No Addon settings configured" msgstr "" -#: src/Module/Settings/Channels.php:117 src/Module/Settings/Channels.php:132 +#: src/Module/Settings/Channels.php:130 src/Module/Settings/Channels.php:146 #: src/Module/Settings/Display.php:314 msgid "Label" msgstr "" -#: src/Module/Settings/Channels.php:118 src/Module/Settings/Channels.php:133 +#: src/Module/Settings/Channels.php:131 src/Module/Settings/Channels.php:147 #: src/Module/Settings/Display.php:315 #: src/Module/Settings/TwoFactor/AppSpecific.php:134 msgid "Description" msgstr "" -#: src/Module/Settings/Channels.php:119 src/Module/Settings/Channels.php:134 +#: src/Module/Settings/Channels.php:132 src/Module/Settings/Channels.php:148 msgid "Access Key" msgstr "" -#: src/Module/Settings/Channels.php:120 src/Module/Settings/Channels.php:135 +#: src/Module/Settings/Channels.php:133 src/Module/Settings/Channels.php:149 +msgid "Circle/Channel" +msgstr "" + +#: src/Module/Settings/Channels.php:134 src/Module/Settings/Channels.php:150 msgid "Include Tags" msgstr "" -#: src/Module/Settings/Channels.php:121 src/Module/Settings/Channels.php:136 +#: src/Module/Settings/Channels.php:135 src/Module/Settings/Channels.php:151 msgid "Exclude Tags" msgstr "" -#: src/Module/Settings/Channels.php:122 src/Module/Settings/Channels.php:137 +#: src/Module/Settings/Channels.php:136 src/Module/Settings/Channels.php:152 msgid "Full Text Search" msgstr "" -#: src/Module/Settings/Channels.php:126 +#: src/Module/Settings/Channels.php:140 msgid "Delete channel" msgstr "" -#: src/Module/Settings/Channels.php:126 +#: src/Module/Settings/Channels.php:140 msgid "Check to delete this entry from the channel list" msgstr "" -#: src/Module/Settings/Channels.php:132 +#: src/Module/Settings/Channels.php:146 msgid "Short name for the channel. It is displayed on the channels widget." msgstr "" -#: src/Module/Settings/Channels.php:133 +#: src/Module/Settings/Channels.php:147 msgid "This should describe the content of the channel in a few word." msgstr "" -#: src/Module/Settings/Channels.php:134 +#: src/Module/Settings/Channels.php:148 msgid "" "When you want to access this channel via an access key, you can define it " "here. Pay attention to not use an already used one." msgstr "" -#: src/Module/Settings/Channels.php:135 +#: src/Module/Settings/Channels.php:149 +msgid "Select a circle or channel, that your channel should be based on." +msgstr "" + +#: src/Module/Settings/Channels.php:150 msgid "" "Comma separated list of tags. A post will be used when it contains any of " "the listed tags." msgstr "" -#: src/Module/Settings/Channels.php:136 +#: src/Module/Settings/Channels.php:151 msgid "" "Comma separated list of tags. If a post contain any of these tags, then it " "will not be part of nthis channel." msgstr "" -#: src/Module/Settings/Channels.php:137 +#: src/Module/Settings/Channels.php:152 #, php-format msgid "" "Search terms for the body, supports the \"boolean mode\" operators from " @@ -9978,39 +9989,39 @@ msgid "" "keywords: %s" msgstr "" -#: src/Module/Settings/Channels.php:138 +#: src/Module/Settings/Channels.php:153 msgid "Check to display images in the channel." msgstr "" -#: src/Module/Settings/Channels.php:139 +#: src/Module/Settings/Channels.php:154 msgid "Check to display videos in the channel." msgstr "" -#: src/Module/Settings/Channels.php:140 +#: src/Module/Settings/Channels.php:155 msgid "Check to display audio in the channel." msgstr "" -#: src/Module/Settings/Channels.php:143 +#: src/Module/Settings/Channels.php:158 msgid "This page can be used to define your own channels." msgstr "" -#: src/Module/Settings/Channels.php:144 +#: src/Module/Settings/Channels.php:159 msgid "Add new entry to the channel list" msgstr "" -#: src/Module/Settings/Channels.php:145 src/Module/Settings/Delegation.php:181 +#: src/Module/Settings/Channels.php:160 src/Module/Settings/Delegation.php:181 msgid "Add" msgstr "" -#: src/Module/Settings/Channels.php:147 +#: src/Module/Settings/Channels.php:162 msgid "Current Entries in the channel list" msgstr "" -#: src/Module/Settings/Channels.php:150 +#: src/Module/Settings/Channels.php:165 msgid "Delete entry from the channel list" msgstr "" -#: src/Module/Settings/Channels.php:151 +#: src/Module/Settings/Channels.php:166 msgid "Delete entry from the channel list?" msgstr "" diff --git a/view/templates/settings/channels.tpl b/view/templates/settings/channels.tpl index d393c3b3c4..16bb510d6c 100644 --- a/view/templates/settings/channels.tpl +++ b/view/templates/settings/channels.tpl @@ -7,6 +7,7 @@ {{include file="field_input.tpl" field=$label}} {{include file="field_input.tpl" field=$description}} {{include file="field_input.tpl" field=$access_key}} + {{include file="field_select.tpl" field=$circle}} {{include file="field_input.tpl" field=$include_tags}} {{include file="field_input.tpl" field=$exclude_tags}} {{include file="field_input.tpl" field=$text_search}} @@ -26,6 +27,7 @@ {{include file="field_input.tpl" field=$e.label}} {{include file="field_input.tpl" field=$e.description}} {{include file="field_input.tpl" field=$e.access_key}} + {{include file="field_select.tpl" field=$e.circle}} {{include file="field_input.tpl" field=$e.include_tags}} {{include file="field_input.tpl" field=$e.exclude_tags}} {{include file="field_input.tpl" field=$e.text_search}} From 6ba26e65b80caaf265c79b24c06ca34d905beab9 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 25 Sep 2023 11:19:06 +0000 Subject: [PATCH 17/31] Improved channel documentation --- doc/Channels.md | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/doc/Channels.md b/doc/Channels.md index a588933e14..260b962942 100644 --- a/doc/Channels.md +++ b/doc/Channels.md @@ -5,18 +5,33 @@ Channels Channels are a way to discover new content or to display content that you might have missed otherwise. There are several predefined channels, additionally you can create your own channels, based on some rules. +Channels only display posts from the last 24 hours (this value can be changed by the admin). In the display settings in the section "Timelines" you can define which channels and other timelines you want to see in the "Channels" widget on the network page and which channels should appear in the menu bar at the top of the page. +Also in the display settings in the section "Channels" you can define all the languages that you want to see in your channels. Here you can select more than one language. + +On the contact page you can define the channel frequency for every contact. The options are: + +* Default frequency: Posts by this contact are displayed in the "for you" channel if you interact often with this contact or if a post reached some level of interaction. +* Display all posts of this contact: All posts from this contact will appear on the "for you" channel. +* Display only few posts: When a contact creates a lot of posts in a short period, this setting reduces the number of displayed posts in every channel. +* Never display posts: Posts from this contact will never be displayed in any channel. + Predefined Channels --- -* Whats hot: Posts from the last 24 hours with the most interactions. -* For you: Posts from the last 24 hours from contact you interact on a lot, or you follow (and the post has some comments) or posts from people you want to be notified when they post. -* Followers: Posts from the last 24 hours created by contacts that follow you, but you don't follow them. -* Images: Posts from the last 24 hours with pictures. -* Videos: Posts from the last 24 hours with videos -* Audio: Posts from the last 24 hours with audio +* For you: Posts from contacts you interact with and who interact with you. In detail, it consists of: + * Posts from people you interact with on a more than average level. + * Posts from the accounts that you follow with a more than average number of interactions- + * Posts from accounts where you activated "notify on new posts" or where you have set the channel frequency accordingly. +* What's Hot: Posts with a more than average number of interactions. +* Language: Posts in your language. +* Followers: Posts from your followers that you don't follow. +* Sharers of sharers: Posts from accounts that are followed by accounts that you follow. +* Images: Posts with images. +* Audio: Posts with audio. +* Videos: Posts with videos. User defined Channels --- @@ -28,6 +43,7 @@ Each channel is defined by these values: * Label: This value is mandatory and is used for the menu label. * Description: A short description of the content. This can help to keep the overview, when you have got a lot of channels. * Access Key: When you want to access this channel via an access key, you can define it here. Pay attention to not use an already used one. +* Circle: This defines the data source for this channel. By default it is set to the public timeline. There are some predefined values, like the accounts that you follow or the accounts that follow you. Also all of your circles can be selected. * Include Tags: Comma separated list of tags. A post will be used when it contains any of the listed tags. * Exclude Tags: Comma separated list of tags. If a post contain any of these tags, then it will not be part of nthis channel. * Full Text Search: This can be used to include or exclude content, based on the content and some additional keywords. It uses the "boolean mode" operators from MariaDB: https://mariadb.com/kb/en/full-text-index-overview/#in-boolean-mode From 84b38beb9ae58a6d080789517b600e28afb3f2bf Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 25 Sep 2023 22:05:53 +0000 Subject: [PATCH 18/31] Improved link removal --- src/Content/Text/BBCode.php | 1 + src/Model/Post/Engagement.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index a981f97d28..5779ab3a2c 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -1113,6 +1113,7 @@ class BBCode public static function removeLinks(string $bbcode): string { DI::profiler()->startRecording('rendering'); + $bbcode = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", ' ', $bbcode); $bbcode = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/ism", ' $1 ', $bbcode); $bbcode = preg_replace("/\[img.*?\[\/img\]/ism", ' ', $bbcode); diff --git a/src/Model/Post/Engagement.php b/src/Model/Post/Engagement.php index 4c6f6e0e55..ca6ef8d9fc 100644 --- a/src/Model/Post/Engagement.php +++ b/src/Model/Post/Engagement.php @@ -35,6 +35,7 @@ use Friendica\Model\Verb; use Friendica\Protocol\Activity; use Friendica\Protocol\Relay; use Friendica\Util\DateTimeFormat; +use Friendica\Util\Strings; // Channel @@ -161,6 +162,7 @@ class Engagement $body = Post\Media::addAttachmentsToBody($item['uri-id'], $body, [Post\Media::IMAGE]); $text = BBCode::toPlaintext($body, false); + $text = preg_replace(Strings::autoLinkRegEx(), '', $text); do { $oldtext = $text; From 82684cd6cd4e6aa44cdd04241c6999c25cf0af28 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 26 Sep 2023 05:05:51 +0000 Subject: [PATCH 19/31] Changes after review --- src/Content/Conversation/Repository/Channel.php | 4 ++-- src/Model/Circle.php | 16 ---------------- src/Module/Settings/Channels.php | 2 +- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/Content/Conversation/Repository/Channel.php b/src/Content/Conversation/Repository/Channel.php index 897bec8c29..2c5bb31799 100644 --- a/src/Content/Conversation/Repository/Channel.php +++ b/src/Content/Conversation/Repository/Channel.php @@ -39,8 +39,8 @@ class Channel extends \Friendica\BaseRepository /** * Fetch a single user channel * - * @param int $id - * @param int $uid + * @param int $id The id of the user defined channel + * @param int $uid The user that this channel belongs to. (Not part of the primary key) * @return TimelineEntity * @throws \Friendica\Network\HTTPException\NotFoundException */ diff --git a/src/Model/Circle.php b/src/Model/Circle.php index 2233b58b0c..2b32103db9 100644 --- a/src/Model/Circle.php +++ b/src/Model/Circle.php @@ -478,22 +478,6 @@ class Circle return $return; } - public static function getByUID(int $uid): array - { - $circles = []; - - $stmt = DBA::select('group', [], ['deleted' => false, 'uid' => $uid, 'cid' => null], ['order' => ['id']]); - while ($circle = DBA::fetch($stmt)) { - $circles[] = [ - 'id' => $circle['id'], - 'name' => $circle['name'], - ]; - } - DBA::close($stmt); - - return $circles; - } - /** * Returns a templated circle selection list * diff --git a/src/Module/Settings/Channels.php b/src/Module/Settings/Channels.php index 4e2c8f5f15..39d83a7e00 100644 --- a/src/Module/Settings/Channels.php +++ b/src/Module/Settings/Channels.php @@ -120,7 +120,7 @@ class Channels extends BaseSettings -2 => $this->l10n->t('Followers'), ]; - foreach (Circle::getByUID($uid) as $circle) { + foreach (Circle::getByUserId($uid) as $circle) { $circles[$circle['id']] = $circle['name']; } From ae33a6bce140da14a39b268295692ac0473af922 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 26 Sep 2023 05:08:42 +0000 Subject: [PATCH 20/31] Removed unused function --- src/DI.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/DI.php b/src/DI.php index 7c221b5efe..681c8fcbc1 100644 --- a/src/DI.php +++ b/src/DI.php @@ -555,14 +555,6 @@ abstract class DI return self::$dice->create(Content\Conversation\Factory\Timeline::class); } - /** - * @return Content\Conversation\Repository\Channel - */ - public static function ChannelRepository() - { - return self::$dice->create(Content\Conversation\Repository\Channel::class); - } - /** * @return Contact\Introduction\Repository\Introduction */ From 5e1c292927a3a6fe4df7071c14918bf7533bd6fd Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 26 Sep 2023 16:00:06 +0000 Subject: [PATCH 21/31] Configuration for the maximum number of post engagement entries --- src/Model/Post/Engagement.php | 26 +++++++++++++++++++++++--- static/defaults.config.php | 6 +++++- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/Model/Post/Engagement.php b/src/Model/Post/Engagement.php index ca6ef8d9fc..9ffd48aa00 100644 --- a/src/Model/Post/Engagement.php +++ b/src/Model/Post/Engagement.php @@ -58,7 +58,7 @@ class Engagement 'title', 'content-warning', 'body', 'author-contact-type', 'author-nick', 'author-addr', 'owner-contact-type', 'owner-nick', 'owner-addr'], ['uri-id' => $item['parent-uri-id']]); - if ($parent['created'] < DateTimeFormat::utc('now - ' . DI::config()->get('channel', 'engagement_hours') . ' hour')) { + if ($parent['created'] < self::getCreationDateLimit(false)) { Logger::debug('Post is too old', ['uri-id' => $item['uri-id'], 'parent-uri-id' => $item['parent-uri-id'], 'created' => $parent['created']]); return; } @@ -195,7 +195,27 @@ class Engagement */ public static function expire() { - DBA::delete('post-engagement', ["`created` < ?", DateTimeFormat::utc('now - ' . DI::config()->get('channel', 'engagement_hours') . ' hour')]); - Logger::notice('Cleared expired engagements', ['rows' => DBA::affectedRows()]); + $limit = self::getCreationDateLimit(true); + if (empty($limit)) { + Logger::notice('Expiration limit not reached'); + return; + } + DBA::delete('post-engagement', ["`created` < ?", $limit]); + Logger::notice('Cleared expired engagements', ['limit' => $limit, 'rows' => DBA::affectedRows()]); + } + + private static function getCreationDateLimit(bool $forDeletion): string + { + $posts = DI::config()->get('channel', 'engagement_post_limit'); + if (!empty($posts)) { + $limit = DBA::selectToArray('post-engagement', ['created'], [], ['limit' => [$posts, 1], 'order' => ['created' => true]]); + if (!empty($limit)) { + return $limit[0]['created']; + } elseif ($forDeletion) { + return ''; + } + } + + return DateTimeFormat::utc('now - ' . DI::config()->get('channel', 'engagement_hours') . ' hour'); } } diff --git a/static/defaults.config.php b/static/defaults.config.php index ceb60c4151..b639e19166 100644 --- a/static/defaults.config.php +++ b/static/defaults.config.php @@ -798,9 +798,13 @@ return [ ], 'channel' => [ // engagement_hours (Integer) - // Number of hours posts are held in the engagement table + // Maximum age of incoming posts for the engagement table, when the engagement post limit is 0 or hasn't been reached yet. 'engagement_hours' => 24, + // engagement_post_limit (Integer) + // NUmber of posts that are held in the engagement table + 'engagement_post_limit' => 20000, + // interaction_score_days (Integer) // Number of days that are used to calculate the interaction score. 'interaction_score_days' => 30, From afb6913a2f3ebf8c5047d73ce3b542aeb81dbf66 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 30 Sep 2023 18:51:35 +0000 Subject: [PATCH 22/31] Timelines are now an object instead of an array --- src/Module/Settings/Display.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Module/Settings/Display.php b/src/Module/Settings/Display.php index bbae7d5990..4c8688ba20 100644 --- a/src/Module/Settings/Display.php +++ b/src/Module/Settings/Display.php @@ -249,8 +249,8 @@ class Display extends BaseSettings $timelines = []; foreach ($this->getAvailableTimelines($uid) as $code => $timeline) { $timelines[] = [ - 'label' => $timeline['label'], - 'description' => $timeline['description'], + 'label' => $timeline->label, + 'description' => $timeline->description, 'enable' => ["enable[$code]", '', in_array($code, $enabled_timelines)], 'bookmark' => ["bookmark[$code]", '', in_array($code, $bookmarked_timelines)], ]; @@ -330,7 +330,7 @@ class Display extends BaseSettings $timelines = []; foreach ($this->timeline->getNetworkFeeds('') as $channel) { - $timelines[$channel->code] = ['label' => $channel->label, 'description' => $channel->description]; + $timelines[$channel->code] = $channel; } if ($only_network) { @@ -338,11 +338,11 @@ class Display extends BaseSettings } foreach ($this->timeline->getChannelsForUser($uid) as $channel) { - $timelines[$channel->code] = ['label' => $channel->label, 'description' => $channel->description]; + $timelines[$channel->code] = $channel; } foreach ($this->timeline->getCommunities(true) as $community) { - $timelines[$community->code] = ['label' => $community->label, 'description' => $community->description]; + $timelines[$community->code] = $community; } return $timelines; From 73e9190ce7ea6b5c910a3a6b7bd2a94da52c3c4f Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 5 Oct 2023 03:16:44 +0000 Subject: [PATCH 23/31] Changes after review --- src/Module/Settings/Display.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Module/Settings/Display.php b/src/Module/Settings/Display.php index 4c8688ba20..6b472a6b97 100644 --- a/src/Module/Settings/Display.php +++ b/src/Module/Settings/Display.php @@ -22,6 +22,7 @@ namespace Friendica\Module\Settings; use Friendica\App; +use Friendica\Content\Conversation\Collection\Timelines; use Friendica\Content\Text\BBCode; use Friendica\Content\Conversation\Factory\Timeline as TimelineFactory; use Friendica\Core\Config\Capability\IManageConfigValues; @@ -240,19 +241,18 @@ class Display extends BaseSettings BBCode::PREVIEW_LARGE => $this->t('Large Image'), ]; - $bookmarked_timelines = $this->pConfig->get($uid, 'system', 'network_timelines', array_keys($this->getAvailableTimelines($uid, true))); - $enabled_timelines = $this->pConfig->get($uid, 'system', 'enabled_timelines', array_keys($this->getAvailableTimelines($uid, false))); - + $bookmarked_timelines = $this->pConfig->get($uid, 'system', 'network_timelines', $this->getAvailableTimelines($uid, true)->column('code')); + $enabled_timelines = $this->pConfig->get($uid, 'system', 'enabled_timelines', $this->getAvailableTimelines($uid, false)->column('code')); $channel_languages = $this->pConfig->get($uid, 'channel', 'languages', [User::getLanguageCode($uid)]); $languages = $this->l10n->getAvailableLanguages(true); $timelines = []; - foreach ($this->getAvailableTimelines($uid) as $code => $timeline) { + foreach ($this->getAvailableTimelines($uid) as $timeline) { $timelines[] = [ 'label' => $timeline->label, 'description' => $timeline->description, - 'enable' => ["enable[$code]", '', in_array($code, $enabled_timelines)], - 'bookmark' => ["bookmark[$code]", '', in_array($code, $bookmarked_timelines)], + 'enable' => ["enable{$timeline->code}", '', in_array($timeline->code, $enabled_timelines)], + 'bookmark' => ["bookmark{$timeline->code}", '', in_array($timeline->code, $bookmarked_timelines)], ]; } @@ -325,7 +325,7 @@ class Display extends BaseSettings ]); } - private function getAvailableTimelines(int $uid, bool $only_network = false): array + private function getAvailableTimelines(int $uid, bool $only_network = false): Timelines { $timelines = []; @@ -334,7 +334,7 @@ class Display extends BaseSettings } if ($only_network) { - return $timelines; + return new Timelines($timelines); } foreach ($this->timeline->getChannelsForUser($uid) as $channel) { @@ -345,6 +345,6 @@ class Display extends BaseSettings $timelines[$community->code] = $community; } - return $timelines; + return new Timelines($timelines); } } From 5d6e02bef3e3279ac84089c15e05f121e3c8bda9 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 5 Oct 2023 03:17:55 +0000 Subject: [PATCH 24/31] Some more changes after review --- src/Module/Settings/Display.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Module/Settings/Display.php b/src/Module/Settings/Display.php index 6b472a6b97..44be88ec15 100644 --- a/src/Module/Settings/Display.php +++ b/src/Module/Settings/Display.php @@ -330,7 +330,7 @@ class Display extends BaseSettings $timelines = []; foreach ($this->timeline->getNetworkFeeds('') as $channel) { - $timelines[$channel->code] = $channel; + $timelines[] = $channel; } if ($only_network) { @@ -338,11 +338,11 @@ class Display extends BaseSettings } foreach ($this->timeline->getChannelsForUser($uid) as $channel) { - $timelines[$channel->code] = $channel; + $timelines[] = $channel; } foreach ($this->timeline->getCommunities(true) as $community) { - $timelines[$community->code] = $community; + $timelines[] = $community; } return new Timelines($timelines); From 6a86eeda10779d323af9312b5760807ff3e2e46f Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 5 Oct 2023 05:36:12 +0000 Subject: [PATCH 25/31] Timeline classes are split into multiple classes --- src/Content/Conversation/Entity/Channel.php | 39 ++++++++ src/Content/Conversation/Entity/Community.php | 33 +++++++ src/Content/Conversation/Entity/Network.php | 36 +++++++ src/Content/Conversation/Entity/Timeline.php | 20 +--- .../Entity/UserDefinedChannel.php | 30 ++++++ src/Content/Conversation/Factory/Channel.php | 93 +++++++++++++++++++ .../Conversation/Factory/Community.php | 86 +++++++++++++++++ src/Content/Conversation/Factory/Network.php | 77 +++++++++++++++ src/Content/Conversation/Factory/Timeline.php | 92 +----------------- .../Conversation/Repository/Channel.php | 8 +- src/Content/Widget.php | 6 +- src/DI.php | 24 +++++ src/Module/Conversation/Channel.php | 28 ++++-- src/Module/Conversation/Community.php | 26 +++--- src/Module/Conversation/Network.php | 50 ++++++---- src/Module/Conversation/Timeline.php | 22 ++--- src/Module/Settings/Display.php | 20 +++- src/Module/Update/Channel.php | 2 +- src/Module/Update/Network.php | 4 +- 19 files changed, 523 insertions(+), 173 deletions(-) create mode 100644 src/Content/Conversation/Entity/Channel.php create mode 100644 src/Content/Conversation/Entity/Community.php create mode 100644 src/Content/Conversation/Entity/Network.php create mode 100644 src/Content/Conversation/Entity/UserDefinedChannel.php create mode 100644 src/Content/Conversation/Factory/Channel.php create mode 100644 src/Content/Conversation/Factory/Community.php create mode 100644 src/Content/Conversation/Factory/Network.php diff --git a/src/Content/Conversation/Entity/Channel.php b/src/Content/Conversation/Entity/Channel.php new file mode 100644 index 0000000000..669309cce1 --- /dev/null +++ b/src/Content/Conversation/Entity/Channel.php @@ -0,0 +1,39 @@ +. + * + */ + +namespace Friendica\Content\Conversation\Entity; + +class Channel extends Timeline +{ + const WHATSHOT = 'whatshot'; + const FORYOU = 'foryou'; + const FOLLOWERS = 'followers'; + const SHARERSOFSHARERS = 'sharersofsharers'; + const IMAGE = 'image'; + const VIDEO = 'video'; + const AUDIO = 'audio'; + const LANGUAGE = 'language'; + + public function __construct(string $code = null, string $label = null, string $description = null, string $accessKey = null, string $path = null, int $uid = null, string $includeTags = null, string $excludeTags = null, string $fullTextSearch = null, int $mediaType = null, int $circle = null) + { + parent::__construct($code, $label, $description, $accessKey, $path, $uid, $includeTags, $excludeTags, $fullTextSearch, $mediaType, $circle); + } +} diff --git a/src/Content/Conversation/Entity/Community.php b/src/Content/Conversation/Entity/Community.php new file mode 100644 index 0000000000..f7faf280b7 --- /dev/null +++ b/src/Content/Conversation/Entity/Community.php @@ -0,0 +1,33 @@ +. + * + */ + +namespace Friendica\Content\Conversation\Entity; + +final class Community extends Timeline +{ + const LOCAL = 'local'; + const GLOBAL = 'global'; + + public function __construct(string $code = null, string $label = null, string $description = null, string $accessKey = null, string $path = null, int $uid = null, string $includeTags = null, string $excludeTags = null, string $fullTextSearch = null, int $mediaType = null, int $circle = null) + { + parent::__construct($code, $label, $description, $accessKey, $path, $uid, $includeTags, $excludeTags, $fullTextSearch, $mediaType, $circle); + } +} diff --git a/src/Content/Conversation/Entity/Network.php b/src/Content/Conversation/Entity/Network.php new file mode 100644 index 0000000000..a212b97b89 --- /dev/null +++ b/src/Content/Conversation/Entity/Network.php @@ -0,0 +1,36 @@ +. + * + */ + +namespace Friendica\Content\Conversation\Entity; + +final class Network extends Timeline +{ + const STAR = 'star'; + const MENTION = 'mention'; + const RECEIVED = 'received'; + const COMMENTED = 'commented'; + const CREATED = 'created'; + + public function __construct(string $code = null, string $label = null, string $description = null, string $accessKey = null, string $path = null, int $uid = null, string $includeTags = null, string $excludeTags = null, string $fullTextSearch = null, int $mediaType = null, int $circle = null) + { + parent::__construct($code, $label, $description, $accessKey, $path, $uid, $includeTags, $excludeTags, $fullTextSearch, $mediaType, $circle); + } +} diff --git a/src/Content/Conversation/Entity/Timeline.php b/src/Content/Conversation/Entity/Timeline.php index 40a39cbb10..20223d5182 100644 --- a/src/Content/Conversation/Entity/Timeline.php +++ b/src/Content/Conversation/Entity/Timeline.php @@ -31,25 +31,11 @@ namespace Friendica\Content\Conversation\Entity; * @property-read string $includeTags The tags to include in the channel * @property-read string $excludeTags The tags to exclude in the channel * @property-read string $fullTextSearch full text search pattern + * @property-read int $mediaType Media types that are included in the channel + * @property-read int $circle Circle or timeline this channel is based on */ -final class Timeline extends \Friendica\BaseEntity +class Timeline extends \Friendica\BaseEntity { - const WHATSHOT = 'whatshot'; - const FORYOU = 'foryou'; - const FOLLOWERS = 'followers'; - const SHARERSOFSHARERS = 'sharersofsharers'; - const IMAGE = 'image'; - const VIDEO = 'video'; - const AUDIO = 'audio'; - const LANGUAGE = 'language'; - const LOCAL = 'local'; - const GLOBAL = 'global'; - const STAR = 'star'; - const MENTION = 'mention'; - const RECEIVED = 'received'; - const COMMENTED = 'commented'; - const CREATED = 'created'; - /** @var string */ protected $code; /** @var string */ diff --git a/src/Content/Conversation/Entity/UserDefinedChannel.php b/src/Content/Conversation/Entity/UserDefinedChannel.php new file mode 100644 index 0000000000..99124086c4 --- /dev/null +++ b/src/Content/Conversation/Entity/UserDefinedChannel.php @@ -0,0 +1,30 @@ +. + * + */ + +namespace Friendica\Content\Conversation\Entity; + +class UserDefinedChannel extends Channel +{ + public function __construct(string $code = null, string $label = null, string $description = null, string $accessKey = null, string $path = null, int $uid = null, string $includeTags = null, string $excludeTags = null, string $fullTextSearch = null, int $mediaType = null, int $circle = null) + { + parent::__construct($code, $label, $description, $accessKey, $path, $uid, $includeTags, $excludeTags, $fullTextSearch, $mediaType, $circle); + } +} diff --git a/src/Content/Conversation/Factory/Channel.php b/src/Content/Conversation/Factory/Channel.php new file mode 100644 index 0000000000..e151c99287 --- /dev/null +++ b/src/Content/Conversation/Factory/Channel.php @@ -0,0 +1,93 @@ +. + * + */ + +namespace Friendica\Content\Conversation\Factory; + +use Friendica\Content\Conversation\Collection\Timelines; +use Friendica\Content\Conversation\Entity\Channel as ChannelEntity; +use Friendica\Model\User; +use Friendica\Content\Conversation\Entity\Timeline as TimelineEntity; +use Friendica\Content\Conversation\Repository\Channel as ChannelRepository; +use Friendica\Core\Config\Capability\IManageConfigValues; +use Friendica\Core\L10n; +use Psr\Log\LoggerInterface; + +class Channel extends Timeline +{ + public function __construct(ChannelRepository $channel, L10n $l10n, LoggerInterface $logger, IManageConfigValues $config) + { + parent::__construct($channel, $l10n, $logger, $config); + } + + public function createFromTableRow(array $row): TimelineEntity + { + return new TimelineEntity( + $row['id'] ?? null, + $row['label'], + $row['description'] ?? null, + $row['access-key'] ?? null, + null, + $row['uid'], + $row['include-tags'] ?? null, + $row['exclude-tags'] ?? null, + $row['full-text-search'] ?? null, + $row['media-type'] ?? null, + $row['circle'] ?? null, + ); + } + + /** + * List of available channels + * + * @param integer $uid + * @return Timelines + */ + public function getForUser(int $uid): Timelines + { + $language = User::getLanguageCode($uid); + $languages = $this->l10n->getAvailableLanguages(true); + + $tabs = [ + new ChannelEntity(ChannelEntity::FORYOU, $this->l10n->t('For you'), $this->l10n->t('Posts from contacts you interact with and who interact with you'), 'y'), + new ChannelEntity(ChannelEntity::WHATSHOT, $this->l10n->t('What\'s Hot'), $this->l10n->t('Posts with a lot of interactions'), 'h'), + new ChannelEntity(ChannelEntity::LANGUAGE, $languages[$language], $this->l10n->t('Posts in %s', $languages[$language]), 'g'), + new ChannelEntity(ChannelEntity::FOLLOWERS, $this->l10n->t('Followers'), $this->l10n->t('Posts from your followers that you don\'t follow'), 'f'), + new ChannelEntity(ChannelEntity::SHARERSOFSHARERS, $this->l10n->t('Sharers of sharers'), $this->l10n->t('Posts from accounts that are followed by accounts that you follow'), 'r'), + new ChannelEntity(ChannelEntity::IMAGE, $this->l10n->t('Images'), $this->l10n->t('Posts with images'), 'i'), + new ChannelEntity(ChannelEntity::AUDIO, $this->l10n->t('Audio'), $this->l10n->t('Posts with audio'), 'd'), + new ChannelEntity(ChannelEntity::VIDEO, $this->l10n->t('Videos'), $this->l10n->t('Posts with videos'), 'v'), + ]; + + foreach ($this->channel->selectByUid($uid) as $channel) { + $tabs[] = $channel; + } + + return new Timelines($tabs); + } + + public function isTimeline(string $selectedTab, int $uid): bool + { + if (is_numeric($selectedTab) && $uid && $this->channel->existsById($selectedTab, $uid)) { + return true; + } + return in_array($selectedTab, [ChannelEntity::WHATSHOT, ChannelEntity::FORYOU, ChannelEntity::FOLLOWERS, ChannelEntity::SHARERSOFSHARERS, ChannelEntity::IMAGE, ChannelEntity::VIDEO, ChannelEntity::AUDIO, ChannelEntity::LANGUAGE]); + } +} diff --git a/src/Content/Conversation/Factory/Community.php b/src/Content/Conversation/Factory/Community.php new file mode 100644 index 0000000000..a21eb8d4eb --- /dev/null +++ b/src/Content/Conversation/Factory/Community.php @@ -0,0 +1,86 @@ +. + * + */ + +namespace Friendica\Content\Conversation\Factory; + +use Friendica\Content\Conversation\Collection\Timelines; +use Friendica\Content\Conversation\Entity\Channel as ChannelEntity; +use Friendica\Content\Conversation\Entity\Community as CommunityEntity; +use Friendica\Content\Conversation\Entity\Network; +use Friendica\Model\User; +use Friendica\Content\Conversation\Entity\Timeline as TimelineEntity; +use Friendica\Content\Conversation\Repository\Channel; +use Friendica\Core\Config\Capability\IManageConfigValues; +use Friendica\Core\L10n; +use Friendica\Module\Conversation\Community as CommunityModule; +use Psr\Log\LoggerInterface; + +class Community extends Timeline +{ + public function __construct(Channel $channel, L10n $l10n, LoggerInterface $logger, IManageConfigValues $config) + { + parent::__construct($channel, $l10n, $logger, $config); + } + + public function createFromTableRow(array $row): TimelineEntity + { + return new TimelineEntity( + $row['id'] ?? null, + $row['label'], + $row['description'] ?? null, + $row['access-key'] ?? null, + null, + $row['uid'], + $row['include-tags'] ?? null, + $row['exclude-tags'] ?? null, + $row['full-text-search'] ?? null, + $row['media-type'] ?? null, + $row['circle'] ?? null, + ); + } + + /** + * List of available communities + * + * @param boolean $authenticated + * @return Timelines + */ + public function getTimelines(bool $authenticated): Timelines + { + $page_style = $this->config->get('system', 'community_page_style'); + + $tabs = []; + + if (($authenticated || in_array($page_style, [CommunityModule::LOCAL_AND_GLOBAL, CommunityModule::LOCAL])) && empty($this->config->get('system', 'singleuser'))) { + $tabs[] = new CommunityEntity(CommunityEntity::LOCAL, $this->l10n->t('Local Community'), $this->l10n->t('Posts from local users on this server'), 'l'); + } + + if ($authenticated || in_array($page_style, [CommunityModule::LOCAL_AND_GLOBAL, CommunityModule::GLOBAL])) { + $tabs[] = new CommunityEntity(CommunityEntity::GLOBAL, $this->l10n->t('Global Community'), $this->l10n->t('Posts from users of the whole federated network'), 'g'); + } + return new Timelines($tabs); + } + + public function isTimeline(string $selectedTab): bool + { + return in_array($selectedTab, [CommunityEntity::LOCAL, CommunityEntity::GLOBAL]); + } +} diff --git a/src/Content/Conversation/Factory/Network.php b/src/Content/Conversation/Factory/Network.php new file mode 100644 index 0000000000..873cb150c5 --- /dev/null +++ b/src/Content/Conversation/Factory/Network.php @@ -0,0 +1,77 @@ +. + * + */ + +namespace Friendica\Content\Conversation\Factory; + +use Friendica\Content\Conversation\Collection\Timelines; +use Friendica\Content\Conversation\Entity\Network as NetworkEntity; +use Friendica\Content\Conversation\Repository\Channel; +use Friendica\Core\Config\Capability\IManageConfigValues; +use Friendica\Core\L10n; +use Psr\Log\LoggerInterface; + +final class Network extends Timeline +{ + public function __construct(Channel $channel, L10n $l10n, LoggerInterface $logger, IManageConfigValues $config) + { + parent::__construct($channel, $l10n, $logger, $config); + } + + public function createFromTableRow(array $row): NetworkEntity + { + return new NetworkEntity( + $row['id'] ?? null, + $row['label'], + $row['description'] ?? null, + $row['access-key'] ?? null, + null, + $row['uid'], + $row['include-tags'] ?? null, + $row['exclude-tags'] ?? null, + $row['full-text-search'] ?? null, + $row['media-type'] ?? null, + $row['circle'] ?? null, + ); + } + + /** + * List of available network timelines + * + * @param string $command + * @return Timelines + */ + public function getTimelines(string $command): Timelines + { + $tabs = [ + new NetworkEntity(NetworkEntity::COMMENTED, $this->l10n->t('Latest Activity'), $this->l10n->t('Sort by latest activity'), 'e', $command . '?' . http_build_query(['order' => 'commented'])), + new NetworkEntity(NetworkEntity::RECEIVED, $this->l10n->t('Latest Posts'), $this->l10n->t('Sort by post received date'), 't', $command . '?' . http_build_query(['order' => 'received'])), + new NetworkEntity(NetworkEntity::CREATED, $this->l10n->t('Latest Creation'), $this->l10n->t('Sort by post creation date'), 'q', $command . '?' . http_build_query(['order' => 'created'])), + new NetworkEntity(NetworkEntity::MENTION, $this->l10n->t('Personal'), $this->l10n->t('Posts that mention or involve you'), 'r', $command . '?' . http_build_query(['mention' => true])), + new NetworkEntity(NetworkEntity::STAR, $this->l10n->t('Starred'), $this->l10n->t('Favourite Posts'), 'm', $command . '?' . http_build_query(['star' => true])), + ]; + return new Timelines($tabs); + } + + public function isTimeline(string $selectedTab): bool + { + return in_array($selectedTab, [NetworkEntity::COMMENTED, NetworkEntity::RECEIVED, NetworkEntity::CREATED, NetworkEntity::MENTION, NetworkEntity::STAR]); + } +} diff --git a/src/Content/Conversation/Factory/Timeline.php b/src/Content/Conversation/Factory/Timeline.php index 459f061b12..eb40100819 100644 --- a/src/Content/Conversation/Factory/Timeline.php +++ b/src/Content/Conversation/Factory/Timeline.php @@ -22,16 +22,13 @@ namespace Friendica\Content\Conversation\Factory; use Friendica\Capabilities\ICanCreateFromTableRow; -use Friendica\Content\Conversation\Collection\Timelines; -use Friendica\Model\User; use Friendica\Content\Conversation\Entity\Timeline as TimelineEntity; use Friendica\Content\Conversation\Repository\Channel; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\L10n; -use Friendica\Module\Conversation\Community; use Psr\Log\LoggerInterface; -final class Timeline extends \Friendica\BaseFactory implements ICanCreateFromTableRow +class Timeline extends \Friendica\BaseFactory implements ICanCreateFromTableRow { /** @var L10n */ protected $l10n; @@ -65,91 +62,4 @@ final class Timeline extends \Friendica\BaseFactory implements ICanCreateFromTab $row['circle'] ?? null, ); } - - /** - * List of available channels - * - * @param integer $uid - * @return Timelines - */ - public function getChannelsForUser(int $uid): Timelines - { - $language = User::getLanguageCode($uid); - $languages = $this->l10n->getAvailableLanguages(true); - - $tabs = [ - new TimelineEntity(TimelineEntity::FORYOU, $this->l10n->t('For you'), $this->l10n->t('Posts from contacts you interact with and who interact with you'), 'y'), - new TimelineEntity(TimelineEntity::WHATSHOT, $this->l10n->t('What\'s Hot'), $this->l10n->t('Posts with a lot of interactions'), 'h'), - new TimelineEntity(TimelineEntity::LANGUAGE, $languages[$language], $this->l10n->t('Posts in %s', $languages[$language]), 'g'), - new TimelineEntity(TimelineEntity::FOLLOWERS, $this->l10n->t('Followers'), $this->l10n->t('Posts from your followers that you don\'t follow'), 'f'), - new TimelineEntity(TimelineEntity::SHARERSOFSHARERS, $this->l10n->t('Sharers of sharers'), $this->l10n->t('Posts from accounts that are followed by accounts that you follow'), 'r'), - new TimelineEntity(TimelineEntity::IMAGE, $this->l10n->t('Images'), $this->l10n->t('Posts with images'), 'i'), - new TimelineEntity(TimelineEntity::AUDIO, $this->l10n->t('Audio'), $this->l10n->t('Posts with audio'), 'd'), - new TimelineEntity(TimelineEntity::VIDEO, $this->l10n->t('Videos'), $this->l10n->t('Posts with videos'), 'v'), - ]; - - foreach ($this->channel->selectByUid($uid) as $channel) { - $tabs[] = $channel; - } - - return new Timelines($tabs); - } - - /** - * List of available communities - * - * @param boolean $authenticated - * @return Timelines - */ - public function getCommunities(bool $authenticated): Timelines - { - $page_style = $this->config->get('system', 'community_page_style'); - - $tabs = []; - - if (($authenticated || in_array($page_style, [Community::LOCAL_AND_GLOBAL, Community::LOCAL])) && empty($this->config->get('system', 'singleuser'))) { - $tabs[] = new TimelineEntity(TimelineEntity::LOCAL, $this->l10n->t('Local Community'), $this->l10n->t('Posts from local users on this server'), 'l'); - } - - if ($authenticated || in_array($page_style, [Community::LOCAL_AND_GLOBAL, Community::GLOBAL])) { - $tabs[] = new TimelineEntity(TimelineEntity::GLOBAL, $this->l10n->t('Global Community'), $this->l10n->t('Posts from users of the whole federated network'), 'g'); - } - return new Timelines($tabs); - } - - /** - * List of available network feeds - * - * @param string $command - * @return Timelines - */ - public function getNetworkFeeds(string $command): Timelines - { - $tabs = [ - new TimelineEntity(TimelineEntity::COMMENTED, $this->l10n->t('Latest Activity'), $this->l10n->t('Sort by latest activity'), 'e', $command . '?' . http_build_query(['order' => 'commented'])), - new TimelineEntity(TimelineEntity::RECEIVED, $this->l10n->t('Latest Posts'), $this->l10n->t('Sort by post received date'), 't', $command . '?' . http_build_query(['order' => 'received'])), - new TimelineEntity(TimelineEntity::CREATED, $this->l10n->t('Latest Creation'), $this->l10n->t('Sort by post creation date'), 'q', $command . '?' . http_build_query(['order' => 'created'])), - new TimelineEntity(TimelineEntity::MENTION, $this->l10n->t('Personal'), $this->l10n->t('Posts that mention or involve you'), 'r', $command . '?' . http_build_query(['mention' => true])), - new TimelineEntity(TimelineEntity::STAR, $this->l10n->t('Starred'), $this->l10n->t('Favourite Posts'), 'm', $command . '?' . http_build_query(['star' => true])), - ]; - return new Timelines($tabs); - } - - public function isNetwork(string $selectedTab): bool - { - return in_array($selectedTab, [TimelineEntity::COMMENTED, TimelineEntity::RECEIVED, TimelineEntity::CREATED, TimelineEntity::MENTION, TimelineEntity::STAR]); - } - - public function isCommunity(string $selectedTab): bool - { - return in_array($selectedTab, [TimelineEntity::LOCAL, TimelineEntity::GLOBAL]); - } - - public function isChannel(string $selectedTab, int $uid): bool - { - if (is_numeric($selectedTab) && $uid && $this->channel->existsById($selectedTab, $uid)) { - return true; - } - return in_array($selectedTab, [TimelineEntity::WHATSHOT, TimelineEntity::FORYOU, TimelineEntity::FOLLOWERS, TimelineEntity::SHARERSOFSHARERS, TimelineEntity::IMAGE, TimelineEntity::VIDEO, TimelineEntity::AUDIO, TimelineEntity::LANGUAGE]); - } } diff --git a/src/Content/Conversation/Repository/Channel.php b/src/Content/Conversation/Repository/Channel.php index 2c5bb31799..19defd59d3 100644 --- a/src/Content/Conversation/Repository/Channel.php +++ b/src/Content/Conversation/Repository/Channel.php @@ -22,7 +22,7 @@ namespace Friendica\Content\Conversation\Repository; use Friendica\BaseCollection; -use Friendica\Content\Conversation\Entity\Timeline as TimelineEntity; +use Friendica\Content\Conversation\Entity\UserDefinedChannel; use Friendica\Content\Conversation\Factory\Timeline; use Friendica\Database\Database; use Psr\Log\LoggerInterface; @@ -41,10 +41,10 @@ class Channel extends \Friendica\BaseRepository * * @param int $id The id of the user defined channel * @param int $uid The user that this channel belongs to. (Not part of the primary key) - * @return TimelineEntity + * @return UserDefinedChannel * @throws \Friendica\Network\HTTPException\NotFoundException */ - public function selectById(int $id, int $uid): TimelineEntity + public function selectById(int $id, int $uid): UserDefinedChannel { return $this->_selectOne(['id' => $id, 'uid' => $uid]); } @@ -84,7 +84,7 @@ class Channel extends \Friendica\BaseRepository return $this->_select(['uid' => $uid]); } - public function save(TimelineEntity $Channel): TimelineEntity + public function save(UserDefinedChannel $Channel): UserDefinedChannel { $fields = [ 'label' => $Channel->label, diff --git a/src/Content/Widget.php b/src/Content/Widget.php index 7078c4fe06..d69467ebcd 100644 --- a/src/Content/Widget.php +++ b/src/Content/Widget.php @@ -562,19 +562,19 @@ class Widget $enabled = DI::pConfig()->get($uid, 'system', 'enabled_timelines', []); - foreach (DI::TimelineFactory()->getNetworkFeeds('') as $channel) { + foreach (DI::NetworkFactory()->getTimelines('') as $channel) { if (empty($enabled) || in_array($channel->code, $enabled)) { $channels[] = ['ref' => $channel->code, 'name' => $channel->label]; } } - foreach (DI::TimelineFactory()->getChannelsForUser($uid) as $channel) { + foreach (DI::ChannelFactory()->getForUser($uid) as $channel) { if (empty($enabled) || in_array($channel->code, $enabled)) { $channels[] = ['ref' => $channel->code, 'name' => $channel->label]; } } - foreach (DI::TimelineFactory()->getCommunities(true) as $community) { + foreach (DI::CommunityFactory()->getTimelines(true) as $community) { if (empty($enabled) || in_array($community->code, $enabled)) { $channels[] = ['ref' => $community->code, 'name' => $community->label]; } diff --git a/src/DI.php b/src/DI.php index 5ffce51752..22dec89dba 100644 --- a/src/DI.php +++ b/src/DI.php @@ -555,6 +555,30 @@ abstract class DI return self::$dice->create(Content\Conversation\Factory\Timeline::class); } + /** + * @return Content\Conversation\Factory\Community + */ + public static function CommunityFactory() + { + return self::$dice->create(Content\Conversation\Factory\Community::class); + } + + /** + * @return Content\Conversation\Factory\Channel + */ + public static function ChannelFactory() + { + return self::$dice->create(Content\Conversation\Factory\Channel::class); + } + + /** + * @return Content\Conversation\Factory\Network + */ + public static function NetworkFactory() + { + return self::$dice->create(Content\Conversation\Factory\Network::class); + } + /** * @return Contact\Introduction\Repository\Introduction */ diff --git a/src/Module/Conversation/Channel.php b/src/Module/Conversation/Channel.php index 3affa1a156..20b0187804 100644 --- a/src/Module/Conversation/Channel.php +++ b/src/Module/Conversation/Channel.php @@ -25,9 +25,12 @@ use Friendica\App; use Friendica\App\Mode; use Friendica\Content\BoundariesPager; use Friendica\Content\Conversation; -use Friendica\Content\Conversation\Entity\Timeline as TimelineEntity; +use Friendica\Content\Conversation\Entity\Channel as ChannelEntity; use Friendica\Content\Conversation\Factory\Timeline as TimelineFactory; use Friendica\Content\Conversation\Repository\Channel as ChannelRepository; +use Friendica\Content\Conversation\Factory\Channel as ChannelFactory; +use Friendica\Content\Conversation\Factory\Community as CommunityFactory; +use Friendica\Content\Conversation\Factory\Network as NetworkFactory; use Friendica\Content\Feature; use Friendica\Content\Nav; use Friendica\Content\Text\HTML; @@ -57,8 +60,14 @@ class Channel extends Timeline protected $page; /** @var SystemMessages */ protected $systemMessages; + /** @var ChannelFactory */ + protected $channel; + /** @var CommunityFactory */ + protected $community; + /** @var NetworkFactory */ + protected $networkFactory; - public function __construct(ChannelRepository $channel, TimelineFactory $timeline, Conversation $conversation, App\Page $page, SystemMessages $systemMessages, Mode $mode, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) + public function __construct(NetworkFactory $network, CommunityFactory $community, ChannelFactory $channelFactory, ChannelRepository $channel, TimelineFactory $timeline, Conversation $conversation, App\Page $page, SystemMessages $systemMessages, Mode $mode, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) { parent::__construct($channel, $mode, $session, $database, $pConfig, $config, $cache, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); @@ -66,6 +75,9 @@ class Channel extends Timeline $this->conversation = $conversation; $this->page = $page; $this->systemMessages = $systemMessages; + //$this->channel = $channelFactory; + $this->community = $community; + $this->networkFactory = $network; } protected function content(array $request = []): string @@ -88,8 +100,8 @@ class Channel extends Timeline } if (empty($request['mode']) || ($request['mode'] != 'raw')) { - $tabs = $this->getTabArray($this->timeline->getChannelsForUser($this->session->getLocalUserId()), 'channel'); - $tabs = array_merge($tabs, $this->getTabArray($this->timeline->getCommunities(true), 'channel')); + $tabs = $this->getTabArray($this->channel->getForUser($this->session->getLocalUserId()), 'channel'); + $tabs = array_merge($tabs, $this->getTabArray($this->community->getTimelines(true), 'channel')); $tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl'); $o .= Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]); @@ -98,7 +110,7 @@ class Channel extends Timeline $this->page['aside'] .= Widget::accountTypes('channel/' . $this->selectedTab, $this->accountTypeString); - if (!in_array($this->selectedTab, [TimelineEntity::FOLLOWERS, TimelineEntity::FORYOU]) && $this->config->get('system', 'community_no_sharer')) { + if (!in_array($this->selectedTab, [ChannelEntity::FOLLOWERS, ChannelEntity::FORYOU]) && $this->config->get('system', 'community_no_sharer')) { $this->page['aside'] .= $this->getNoSharerWidget('channel'); } @@ -110,7 +122,7 @@ class Channel extends Timeline $o .= $this->conversation->statusEditor([], 0, true); } - if ($this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId())) { + if ($this->channel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { $items = $this->getChannelItems(); $order = 'created'; } else { @@ -153,10 +165,10 @@ class Channel extends Timeline parent::parseRequest($request); if (!$this->selectedTab) { - $this->selectedTab = TimelineEntity::FORYOU; + $this->selectedTab = ChannelEntity::FORYOU; } - if (!$this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId()) && !$this->timeline->isCommunity($this->selectedTab)) { + if (!$this->channel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) && !$this->community->isTimeline($this->selectedTab)) { throw new HTTPException\BadRequestException($this->l10n->t('Channel not available.')); } diff --git a/src/Module/Conversation/Community.php b/src/Module/Conversation/Community.php index 75f937d351..89af00043f 100644 --- a/src/Module/Conversation/Community.php +++ b/src/Module/Conversation/Community.php @@ -26,8 +26,8 @@ use Friendica\App; use Friendica\App\Mode; use Friendica\Content\BoundariesPager; use Friendica\Content\Conversation; -use Friendica\Content\Conversation\Entity\Timeline as TimelineEntity; -use Friendica\Content\Conversation\Factory\Timeline as TimelineFactory; +use Friendica\Content\Conversation\Entity\Community as CommunityEntity; +use Friendica\Content\Conversation\Factory\Community as CommunityFactory; use Friendica\Content\Conversation\Repository\Channel; use Friendica\Content\Feature; use Friendica\Content\Nav; @@ -61,8 +61,8 @@ class Community extends Timeline protected $pageStyle; - /** @var TimelineFactory */ - protected $timeline; + /** @var CommunityFactory */ + protected $community; /** @var Conversation */ protected $conversation; /** @var App\Page */ @@ -70,11 +70,11 @@ class Community extends Timeline /** @var SystemMessages */ protected $systemMessages; - public function __construct(Channel $channel, TimelineFactory $timeline, Conversation $conversation, App\Page $page, SystemMessages $systemMessages, Mode $mode, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) + public function __construct(Channel $channel, CommunityFactory $community, Conversation $conversation, App\Page $page, SystemMessages $systemMessages, Mode $mode, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) { parent::__construct($channel, $mode, $session, $database, $pConfig, $config, $cache, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); - $this->timeline = $timeline; + $this->community = $community; $this->conversation = $conversation; $this->page = $page; $this->systemMessages = $systemMessages; @@ -88,7 +88,7 @@ class Community extends Timeline $o = Renderer::replaceMacros($t, [ '$content' => '', '$header' => '', - '$show_global_community_hint' => ($this->selectedTab == TimelineEntity::GLOBAL) && $this->config->get('system', 'show_global_community_hint'), + '$show_global_community_hint' => ($this->selectedTab == CommunityEntity::GLOBAL) && $this->config->get('system', 'show_global_community_hint'), '$global_community_hint' => $this->l10n->t("This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users.") ]); @@ -98,7 +98,7 @@ class Community extends Timeline } if (empty($request['mode']) || ($request['mode'] != 'raw')) { - $tabs = $this->getTabArray($this->timeline->getCommunities($this->session->isAuthenticated()), 'community'); + $tabs = $this->getTabArray($this->community->getTimelines($this->session->isAuthenticated()), 'community'); $tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl'); $o .= Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]); @@ -169,14 +169,14 @@ class Community extends Timeline if (!$this->selectedTab) { if (!empty($this->config->get('system', 'singleuser'))) { // On single user systems only the global page does make sense - $this->selectedTab = TimelineEntity::GLOBAL; + $this->selectedTab = CommunityEntity::GLOBAL; } else { // When only the global community is allowed, we use this as default - $this->selectedTab = $this->pageStyle == self::GLOBAL ? TimelineEntity::GLOBAL : TimelineEntity::LOCAL; + $this->selectedTab = $this->pageStyle == self::GLOBAL ? CommunityEntity::GLOBAL : CommunityEntity::LOCAL; } } - if (!$this->timeline->isCommunity($this->selectedTab)) { + if (!$this->community->isTimeline($this->selectedTab)) { throw new HTTPException\BadRequestException($this->l10n->t('Community option not available.')); } @@ -185,11 +185,11 @@ class Community extends Timeline $available = $this->pageStyle == self::LOCAL_AND_GLOBAL; if (!$available) { - $available = ($this->pageStyle == self::LOCAL) && ($this->selectedTab == TimelineEntity::LOCAL); + $available = ($this->pageStyle == self::LOCAL) && ($this->selectedTab == CommunityEntity::LOCAL); } if (!$available) { - $available = ($this->pageStyle == self::GLOBAL) && ($this->selectedTab == TimelineEntity::GLOBAL); + $available = ($this->pageStyle == self::GLOBAL) && ($this->selectedTab == CommunityEntity::GLOBAL); } if (!$available) { diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php index 40a1b731b6..656c4410c3 100644 --- a/src/Module/Conversation/Network.php +++ b/src/Module/Conversation/Network.php @@ -25,9 +25,12 @@ use Friendica\App; use Friendica\App\Mode; use Friendica\Content\BoundariesPager; use Friendica\Content\Conversation; -use Friendica\Content\Conversation\Entity\Timeline as TimelineEntity; +use Friendica\Content\Conversation\Entity\Network as NetworkEntity; use Friendica\Content\Conversation\Factory\Timeline as TimelineFactory; use Friendica\Content\Conversation\Repository\Channel; +use Friendica\Content\Conversation\Factory\Channel as ChannelFactory; +use Friendica\Content\Conversation\Factory\Community as CommunityFactory; +use Friendica\Content\Conversation\Factory\Network as NetworkFactory; use Friendica\Content\Feature; use Friendica\Content\GroupManager; use Friendica\Content\Nav; @@ -96,8 +99,14 @@ class Network extends Timeline protected $database; /** @var TimelineFactory */ protected $timeline; + /** @var ChannelFactory */ + protected $channel; + /** @var CommunityFactory */ + protected $community; + /** @var NetworkFactory */ + protected $networkFactory; - public function __construct(Channel $channel, App $app, TimelineFactory $timeline, SystemMessages $systemMessages, Mode $mode, Conversation $conversation, App\Page $page, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) + public function __construct(NetworkFactory $network, CommunityFactory $community, ChannelFactory $channelFactory, Channel $channel, App $app, TimelineFactory $timeline, SystemMessages $systemMessages, Mode $mode, Conversation $conversation, App\Page $page, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) { parent::__construct($channel, $mode, $session, $database, $pConfig, $config, $cache, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); @@ -106,6 +115,9 @@ class Network extends Timeline $this->systemMessages = $systemMessages; $this->conversation = $conversation; $this->page = $page; + $this->channel = $channelFactory; + $this->community = $community; + $this->networkFactory = $network; } protected function content(array $request = []): string @@ -123,9 +135,9 @@ class Network extends Timeline $o = ''; - if ($this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId())) { + if ($this->channel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { $items = $this->getChannelItems(); - } elseif ($this->timeline->isCommunity($this->selectedTab)) { + } elseif ($this->community->isTimeline($this->selectedTab)) { $items = $this->getCommunityItems(); } else { $items = $this->getItems(); @@ -266,12 +278,12 @@ class Network extends Timeline */ private function getTabsHTML() { - $tabs = $this->getTabArray($this->timeline->getNetworkFeeds($this->args->getCommand()), 'network'); + $tabs = $this->getTabArray($this->networkFactory->getTimelines($this->args->getCommand()), 'network'); $network_timelines = $this->pConfig->get($this->session->getLocalUserId(), 'system', 'network_timelines', []); if (!empty($network_timelines)) { - $tabs = array_merge($tabs, $this->getTabArray($this->timeline->getChannelsForUser($this->session->getLocalUserId()), 'network', 'channel')); - $tabs = array_merge($tabs, $this->getTabArray($this->timeline->getCommunities(true), 'network', 'channel')); + $tabs = array_merge($tabs, $this->getTabArray($this->channel->getForUser($this->session->getLocalUserId()), 'network', 'channel')); + $tabs = array_merge($tabs, $this->getTabArray($this->community->getTimelines(true), 'network', 'channel')); } $arr = ['tabs' => $tabs]; @@ -304,26 +316,26 @@ class Network extends Timeline if (!$this->selectedTab) { $this->selectedTab = self::getTimelineOrderBySession($this->session, $this->pConfig); - } elseif (!$this->timeline->isNetwork($this->selectedTab) && !$this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId()) && !$this->timeline->isCommunity($this->selectedTab)) { + } elseif (!$this->networkFactory->isTimeline($this->selectedTab) && !$this->channel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) && !$this->community->isTimeline($this->selectedTab)) { throw new HTTPException\BadRequestException($this->l10n->t('Network feed not available.')); } - if (($this->network || $this->circleId || $this->groupContactId) && ($this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId()) || $this->timeline->isCommunity($this->selectedTab))) { - $this->selectedTab = TimelineEntity::RECEIVED; + if (($this->network || $this->circleId || $this->groupContactId) && ($this->channel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) || $this->community->isTimeline($this->selectedTab))) { + $this->selectedTab = NetworkEntity::RECEIVED; } if (!empty($request['star'])) { - $this->selectedTab = TimelineEntity::STAR; + $this->selectedTab = NetworkEntity::STAR; $this->star = true; } else { - $this->star = $this->selectedTab == TimelineEntity::STAR; + $this->star = $this->selectedTab == NetworkEntity::STAR; } if (!empty($request['mention'])) { - $this->selectedTab = TimelineEntity::MENTION; + $this->selectedTab = NetworkEntity::MENTION; $this->mention = true; } else { - $this->mention = $this->selectedTab == TimelineEntity::MENTION; + $this->mention = $this->selectedTab == NetworkEntity::MENTION; } if (!empty($request['order'])) { @@ -331,9 +343,9 @@ class Network extends Timeline $this->order = $request['order']; $this->star = false; $this->mention = false; - } elseif (in_array($this->selectedTab, [TimelineEntity::RECEIVED, TimelineEntity::STAR]) || $this->timeline->isCommunity($this->selectedTab)) { + } elseif (in_array($this->selectedTab, [NetworkEntity::RECEIVED, NetworkEntity::STAR]) || $this->community->isTimeline($this->selectedTab)) { $this->order = 'received'; - } elseif (($this->selectedTab == TimelineEntity::CREATED) || $this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId())) { + } elseif (($this->selectedTab == NetworkEntity::CREATED) || $this->channel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { $this->order = 'created'; } else { $this->order = 'commented'; @@ -343,16 +355,16 @@ class Network extends Timeline // Upon updates in the background and order by last comment we order by received date, // since otherwise the feed will optically jump, when some already visible thread has been updated. - if ($this->update && ($this->selectedTab == TimelineEntity::COMMENTED)) { + if ($this->update && ($this->selectedTab == NetworkEntity::COMMENTED)) { $this->order = 'received'; $request['last_received'] = $request['last_commented'] ?? null; $request['first_received'] = $request['first_commented'] ?? null; } // Prohibit combined usage of "star" and "mention" - if ($this->selectedTab == TimelineEntity::STAR) { + if ($this->selectedTab == NetworkEntity::STAR) { $this->mention = false; - } elseif ($this->selectedTab == TimelineEntity::MENTION) { + } elseif ($this->selectedTab == NetworkEntity::MENTION) { $this->star = false; } diff --git a/src/Module/Conversation/Timeline.php b/src/Module/Conversation/Timeline.php index 2ee98527b2..3f7f3ef759 100644 --- a/src/Module/Conversation/Timeline.php +++ b/src/Module/Conversation/Timeline.php @@ -25,7 +25,7 @@ use Friendica\App; use Friendica\App\Mode; use Friendica\BaseModule; use Friendica\Content\Conversation\Collection\Timelines; -use Friendica\Content\Conversation\Entity\Timeline as TimelineEntity; +use Friendica\Content\Conversation\Entity\Channel as ChannelEntity; use Friendica\Content\Conversation\Repository\Channel; use Friendica\Core\Cache\Capability\ICanCache; use Friendica\Core\Cache\Enum\Duration; @@ -269,13 +269,13 @@ class Timeline extends BaseModule { $uid = $this->session->getLocalUserId(); - if ($this->selectedTab == TimelineEntity::WHATSHOT) { + if ($this->selectedTab == ChannelEntity::WHATSHOT) { if (!is_null($this->accountType)) { $condition = ["(`comments` > ? OR `activities` > ?) AND `contact-type` = ?", $this->getMedianComments($uid, 4), $this->getMedianActivities($uid, 4), $this->accountType]; } else { $condition = ["(`comments` > ? OR `activities` > ?) AND `contact-type` != ?", $this->getMedianComments($uid, 4), $this->getMedianActivities($uid, 4), Contact::TYPE_COMMUNITY]; } - } elseif ($this->selectedTab == TimelineEntity::FORYOU) { + } elseif ($this->selectedTab == ChannelEntity::FORYOU) { $cid = Contact::getPublicIdByUserId($uid); $condition = [ @@ -285,9 +285,9 @@ class Timeline extends BaseModule $cid, $this->getMedianRelationThreadScore($cid, 4), $this->getMedianComments($uid, 4), $this->getMedianActivities($uid, 4), $cid, $uid, Contact\User::FREQUENCY_ALWAYS ]; - } elseif ($this->selectedTab == TimelineEntity::FOLLOWERS) { + } elseif ($this->selectedTab == ChannelEntity::FOLLOWERS) { $condition = ["`owner-id` IN (SELECT `pid` FROM `account-user-view` WHERE `uid` = ? AND `rel` = ?)", $uid, Contact::FOLLOWER]; - } elseif ($this->selectedTab == TimelineEntity::SHARERSOFSHARERS) { + } elseif ($this->selectedTab == ChannelEntity::SHARERSOFSHARERS) { $cid = Contact::getPublicIdByUserId($uid); // @todo Suggest posts from contacts that are followed most by our followers @@ -297,19 +297,19 @@ class Timeline extends BaseModule AND NOT `cid` IN (SELECT `cid` FROM `contact-relation` WHERE `follows` AND `relation-cid` = ?))", DateTimeFormat::utc('now - ' . $this->config->get('channel', 'sharer_interaction_days') . ' day'), $cid, $this->getMedianRelationThreadScore($cid, 4), $cid ]; - } elseif ($this->selectedTab == TimelineEntity::IMAGE) { + } elseif ($this->selectedTab == ChannelEntity::IMAGE) { $condition = ["`media-type` & ?", 1]; - } elseif ($this->selectedTab == TimelineEntity::VIDEO) { + } elseif ($this->selectedTab == ChannelEntity::VIDEO) { $condition = ["`media-type` & ?", 2]; - } elseif ($this->selectedTab == TimelineEntity::AUDIO) { + } elseif ($this->selectedTab == ChannelEntity::AUDIO) { $condition = ["`media-type` & ?", 4]; - } elseif ($this->selectedTab == TimelineEntity::LANGUAGE) { + } elseif ($this->selectedTab == ChannelEntity::LANGUAGE) { $condition = ["JSON_EXTRACT(JSON_KEYS(language), '$[0]') = ?", $this->l10n->convertCodeForLanguageDetection(User::getLanguageCode($uid))]; } elseif (is_numeric($this->selectedTab)) { $condition = $this->getUserChannelConditions($this->selectedTab, $this->session->getLocalUserId()); } - if ($this->selectedTab != TimelineEntity::LANGUAGE) { + if ($this->selectedTab != ChannelEntity::LANGUAGE) { $condition = $this->addLanguageCondition($uid, $condition); } @@ -317,7 +317,7 @@ class Timeline extends BaseModule $condition = DBA::mergeConditions($condition, ["NOT EXISTS(SELECT `cid` FROM `user-contact` WHERE `uid` = ? AND `cid` = `post-engagement`.`owner-id` AND (`ignored` OR `blocked` OR `collapsed` OR `is-blocked` OR `channel-frequency` = ?))", $uid, Contact\User::FREQUENCY_NEVER]); - if (($this->selectedTab != TimelineEntity::WHATSHOT) && !is_null($this->accountType)) { + if (($this->selectedTab != ChannelEntity::WHATSHOT) && !is_null($this->accountType)) { $condition = DBA::mergeConditions($condition, ['contact-type' => $this->accountType]); } diff --git a/src/Module/Settings/Display.php b/src/Module/Settings/Display.php index 44be88ec15..3c5311482f 100644 --- a/src/Module/Settings/Display.php +++ b/src/Module/Settings/Display.php @@ -24,6 +24,9 @@ namespace Friendica\Module\Settings; use Friendica\App; use Friendica\Content\Conversation\Collection\Timelines; use Friendica\Content\Text\BBCode; +use Friendica\Content\Conversation\Factory\Channel as ChannelFactory; +use Friendica\Content\Conversation\Factory\Community as CommunityFactory; +use Friendica\Content\Conversation\Factory\Network as NetworkFactory; use Friendica\Content\Conversation\Factory\Timeline as TimelineFactory; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Hook; @@ -53,10 +56,16 @@ class Display extends BaseSettings private $app; /** @var SystemMessages */ private $systemMessages; + /** @var ChannelFactory */ + protected $channel; + /** @var CommunityFactory */ + protected $community; + /** @var NetworkFactory */ + protected $network; /** @var TimelineFactory */ protected $timeline; - public function __construct(TimelineFactory $timeline, SystemMessages $systemMessages, App $app, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, IHandleUserSessions $session, App\Page $page, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) + public function __construct(NetworkFactory $network, CommunityFactory $community, ChannelFactory $channel, TimelineFactory $timeline, SystemMessages $systemMessages, App $app, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, IHandleUserSessions $session, App\Page $page, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) { parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); @@ -65,6 +74,9 @@ class Display extends BaseSettings $this->app = $app; $this->systemMessages = $systemMessages; $this->timeline = $timeline; + $this->channel = $channel; + $this->community = $community; + $this->network = $network; } protected function post(array $request = []) @@ -329,7 +341,7 @@ class Display extends BaseSettings { $timelines = []; - foreach ($this->timeline->getNetworkFeeds('') as $channel) { + foreach ($this->network->getTimelines('') as $channel) { $timelines[] = $channel; } @@ -337,11 +349,11 @@ class Display extends BaseSettings return new Timelines($timelines); } - foreach ($this->timeline->getChannelsForUser($uid) as $channel) { + foreach ($this->channel->getForUser($uid) as $channel) { $timelines[] = $channel; } - foreach ($this->timeline->getCommunities(true) as $community) { + foreach ($this->community->getTimelines(true) as $community) { $timelines[] = $community; } diff --git a/src/Module/Update/Channel.php b/src/Module/Update/Channel.php index 0abe036d6f..2cff325850 100644 --- a/src/Module/Update/Channel.php +++ b/src/Module/Update/Channel.php @@ -38,7 +38,7 @@ class Channel extends ChannelModule $o = ''; if ($this->update || $this->force) { - if ($this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId())) { + if ($this->channel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { $items = $this->getChannelItems(); } else { $items = $this->getCommunityItems(); diff --git a/src/Module/Update/Network.php b/src/Module/Update/Network.php index 612d4079c8..140900876d 100644 --- a/src/Module/Update/Network.php +++ b/src/Module/Update/Network.php @@ -41,9 +41,9 @@ class Network extends NetworkModule System::htmlUpdateExit($o); } - if ($this->timeline->isChannel($this->selectedTab, $this->session->getLocalUserId())) { + if ($this->channel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { $items = $this->getChannelItems(); - } elseif ($this->timeline->isCommunity($this->selectedTab)) { + } elseif ($this->community->isTimeline($this->selectedTab)) { $items = $this->getCommunityItems(); } else { $items = $this->getItems(); From aae5f006f9750c487e68e622fd112ea3da260d08 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 5 Oct 2023 09:25:23 +0000 Subject: [PATCH 26/31] Remove unneeded functions --- src/Content/Conversation/Factory/Channel.php | 20 +--------------- .../Conversation/Factory/Community.php | 23 +------------------ src/Content/Conversation/Factory/Network.php | 17 -------------- 3 files changed, 2 insertions(+), 58 deletions(-) diff --git a/src/Content/Conversation/Factory/Channel.php b/src/Content/Conversation/Factory/Channel.php index e151c99287..1a788d725c 100644 --- a/src/Content/Conversation/Factory/Channel.php +++ b/src/Content/Conversation/Factory/Channel.php @@ -24,36 +24,18 @@ namespace Friendica\Content\Conversation\Factory; use Friendica\Content\Conversation\Collection\Timelines; use Friendica\Content\Conversation\Entity\Channel as ChannelEntity; use Friendica\Model\User; -use Friendica\Content\Conversation\Entity\Timeline as TimelineEntity; use Friendica\Content\Conversation\Repository\Channel as ChannelRepository; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\L10n; use Psr\Log\LoggerInterface; -class Channel extends Timeline +final class Channel extends Timeline { public function __construct(ChannelRepository $channel, L10n $l10n, LoggerInterface $logger, IManageConfigValues $config) { parent::__construct($channel, $l10n, $logger, $config); } - public function createFromTableRow(array $row): TimelineEntity - { - return new TimelineEntity( - $row['id'] ?? null, - $row['label'], - $row['description'] ?? null, - $row['access-key'] ?? null, - null, - $row['uid'], - $row['include-tags'] ?? null, - $row['exclude-tags'] ?? null, - $row['full-text-search'] ?? null, - $row['media-type'] ?? null, - $row['circle'] ?? null, - ); - } - /** * List of available channels * diff --git a/src/Content/Conversation/Factory/Community.php b/src/Content/Conversation/Factory/Community.php index a21eb8d4eb..e08352d631 100644 --- a/src/Content/Conversation/Factory/Community.php +++ b/src/Content/Conversation/Factory/Community.php @@ -22,41 +22,20 @@ namespace Friendica\Content\Conversation\Factory; use Friendica\Content\Conversation\Collection\Timelines; -use Friendica\Content\Conversation\Entity\Channel as ChannelEntity; use Friendica\Content\Conversation\Entity\Community as CommunityEntity; -use Friendica\Content\Conversation\Entity\Network; -use Friendica\Model\User; -use Friendica\Content\Conversation\Entity\Timeline as TimelineEntity; use Friendica\Content\Conversation\Repository\Channel; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\L10n; use Friendica\Module\Conversation\Community as CommunityModule; use Psr\Log\LoggerInterface; -class Community extends Timeline +final class Community extends Timeline { public function __construct(Channel $channel, L10n $l10n, LoggerInterface $logger, IManageConfigValues $config) { parent::__construct($channel, $l10n, $logger, $config); } - public function createFromTableRow(array $row): TimelineEntity - { - return new TimelineEntity( - $row['id'] ?? null, - $row['label'], - $row['description'] ?? null, - $row['access-key'] ?? null, - null, - $row['uid'], - $row['include-tags'] ?? null, - $row['exclude-tags'] ?? null, - $row['full-text-search'] ?? null, - $row['media-type'] ?? null, - $row['circle'] ?? null, - ); - } - /** * List of available communities * diff --git a/src/Content/Conversation/Factory/Network.php b/src/Content/Conversation/Factory/Network.php index 873cb150c5..8b71a96190 100644 --- a/src/Content/Conversation/Factory/Network.php +++ b/src/Content/Conversation/Factory/Network.php @@ -35,23 +35,6 @@ final class Network extends Timeline parent::__construct($channel, $l10n, $logger, $config); } - public function createFromTableRow(array $row): NetworkEntity - { - return new NetworkEntity( - $row['id'] ?? null, - $row['label'], - $row['description'] ?? null, - $row['access-key'] ?? null, - null, - $row['uid'], - $row['include-tags'] ?? null, - $row['exclude-tags'] ?? null, - $row['full-text-search'] ?? null, - $row['media-type'] ?? null, - $row['circle'] ?? null, - ); - } - /** * List of available network timelines * From ed24d06e0c676662fe1c5a7656049daae8bf3358 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 5 Oct 2023 19:10:20 +0000 Subject: [PATCH 27/31] Now there are user defined channels --- database.sql | 2 +- src/Content/Conversation/Factory/Channel.php | 11 +--- .../Factory/UserDefinedChannel.php | 56 +++++++++++++++++++ src/Content/Widget.php | 8 ++- src/DI.php | 8 +++ src/Module/Conversation/Channel.php | 28 ++++++---- src/Module/Conversation/Network.php | 33 ++++++----- src/Module/Conversation/Timeline.php | 1 + src/Module/Settings/Display.php | 28 ++++++---- src/Module/Update/Channel.php | 2 +- src/Module/Update/Network.php | 2 +- static/dbstructure.config.php | 2 +- 12 files changed, 132 insertions(+), 49 deletions(-) create mode 100644 src/Content/Conversation/Factory/UserDefinedChannel.php diff --git a/database.sql b/database.sql index caf8d47b0a..ec7adc5c7a 100644 --- a/database.sql +++ b/database.sql @@ -1,6 +1,6 @@ -- ------------------------------------------ -- Friendica 2023.09-rc (Giant Rhubarb) --- DB_UPDATE_VERSION 1535 +-- DB_UPDATE_VERSION 1536 -- ------------------------------------------ diff --git a/src/Content/Conversation/Factory/Channel.php b/src/Content/Conversation/Factory/Channel.php index 1a788d725c..b2ad4048f0 100644 --- a/src/Content/Conversation/Factory/Channel.php +++ b/src/Content/Conversation/Factory/Channel.php @@ -42,7 +42,7 @@ final class Channel extends Timeline * @param integer $uid * @return Timelines */ - public function getForUser(int $uid): Timelines + public function getTimelines(int $uid): Timelines { $language = User::getLanguageCode($uid); $languages = $this->l10n->getAvailableLanguages(true); @@ -58,18 +58,11 @@ final class Channel extends Timeline new ChannelEntity(ChannelEntity::VIDEO, $this->l10n->t('Videos'), $this->l10n->t('Posts with videos'), 'v'), ]; - foreach ($this->channel->selectByUid($uid) as $channel) { - $tabs[] = $channel; - } - return new Timelines($tabs); } - public function isTimeline(string $selectedTab, int $uid): bool + public function isTimeline(string $selectedTab): bool { - if (is_numeric($selectedTab) && $uid && $this->channel->existsById($selectedTab, $uid)) { - return true; - } return in_array($selectedTab, [ChannelEntity::WHATSHOT, ChannelEntity::FORYOU, ChannelEntity::FOLLOWERS, ChannelEntity::SHARERSOFSHARERS, ChannelEntity::IMAGE, ChannelEntity::VIDEO, ChannelEntity::AUDIO, ChannelEntity::LANGUAGE]); } } diff --git a/src/Content/Conversation/Factory/UserDefinedChannel.php b/src/Content/Conversation/Factory/UserDefinedChannel.php new file mode 100644 index 0000000000..fe469a7b6f --- /dev/null +++ b/src/Content/Conversation/Factory/UserDefinedChannel.php @@ -0,0 +1,56 @@ +. + * + */ + +namespace Friendica\Content\Conversation\Factory; + +use Friendica\Content\Conversation\Collection\Timelines; +use Friendica\Content\Conversation\Repository\Channel as ChannelRepository; +use Friendica\Core\Config\Capability\IManageConfigValues; +use Friendica\Core\L10n; +use Psr\Log\LoggerInterface; + +final class UserDefinedChannel extends Timeline +{ + public function __construct(ChannelRepository $channel, L10n $l10n, LoggerInterface $logger, IManageConfigValues $config) + { + parent::__construct($channel, $l10n, $logger, $config); + } + + /** + * List of available user defined channels + * + * @param integer $uid + * @return Timelines + */ + public function getForUser(int $uid): Timelines + { + foreach ($this->channel->selectByUid($uid) as $channel) { + $tabs[] = $channel; + } + + return new Timelines($tabs); + } + + public function isTimeline(string $selectedTab, int $uid): bool + { + return is_numeric($selectedTab) && $uid && $this->channel->existsById($selectedTab, $uid); + } +} diff --git a/src/Content/Widget.php b/src/Content/Widget.php index d69467ebcd..876fbc79e4 100644 --- a/src/Content/Widget.php +++ b/src/Content/Widget.php @@ -568,7 +568,13 @@ class Widget } } - foreach (DI::ChannelFactory()->getForUser($uid) as $channel) { + foreach (DI::ChannelFactory()->getTimelines($uid) as $channel) { + if (empty($enabled) || in_array($channel->code, $enabled)) { + $channels[] = ['ref' => $channel->code, 'name' => $channel->label]; + } + } + + foreach (DI::UserDefinedChannelFactory()->getForUser($uid) as $channel) { if (empty($enabled) || in_array($channel->code, $enabled)) { $channels[] = ['ref' => $channel->code, 'name' => $channel->label]; } diff --git a/src/DI.php b/src/DI.php index 22dec89dba..0cb194ef40 100644 --- a/src/DI.php +++ b/src/DI.php @@ -571,6 +571,14 @@ abstract class DI return self::$dice->create(Content\Conversation\Factory\Channel::class); } + /** + * @return Content\Conversation\Factory\UserDefinedChannel + */ + public static function UserDefinedChannelFactory() + { + return self::$dice->create(Content\Conversation\Factory\UserDefinedChannel::class); + } + /** * @return Content\Conversation\Factory\Network */ diff --git a/src/Module/Conversation/Channel.php b/src/Module/Conversation/Channel.php index 20b0187804..bb6a805d65 100644 --- a/src/Module/Conversation/Channel.php +++ b/src/Module/Conversation/Channel.php @@ -26,11 +26,13 @@ use Friendica\App\Mode; use Friendica\Content\BoundariesPager; use Friendica\Content\Conversation; use Friendica\Content\Conversation\Entity\Channel as ChannelEntity; +use Friendica\Content\Conversation\Factory\UserDefinedChannel as UserDefinedChannelFactory; use Friendica\Content\Conversation\Factory\Timeline as TimelineFactory; use Friendica\Content\Conversation\Repository\Channel as ChannelRepository; use Friendica\Content\Conversation\Factory\Channel as ChannelFactory; use Friendica\Content\Conversation\Factory\Community as CommunityFactory; use Friendica\Content\Conversation\Factory\Network as NetworkFactory; +use Friendica\Content\Conversation\Factory\UserDefinedChannel; use Friendica\Content\Feature; use Friendica\Content\Nav; use Friendica\Content\Text\HTML; @@ -62,22 +64,25 @@ class Channel extends Timeline protected $systemMessages; /** @var ChannelFactory */ protected $channel; + /** @var UserDefinedChannelFactory */ + protected $userDefinedChannel; /** @var CommunityFactory */ protected $community; /** @var NetworkFactory */ protected $networkFactory; - public function __construct(NetworkFactory $network, CommunityFactory $community, ChannelFactory $channelFactory, ChannelRepository $channel, TimelineFactory $timeline, Conversation $conversation, App\Page $page, SystemMessages $systemMessages, Mode $mode, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) + public function __construct(UserDefinedChannelFactory $userDefinedChannel, NetworkFactory $network, CommunityFactory $community, ChannelFactory $channelFactory, ChannelRepository $channel, TimelineFactory $timeline, Conversation $conversation, App\Page $page, SystemMessages $systemMessages, Mode $mode, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) { parent::__construct($channel, $mode, $session, $database, $pConfig, $config, $cache, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); - $this->timeline = $timeline; - $this->conversation = $conversation; - $this->page = $page; - $this->systemMessages = $systemMessages; - //$this->channel = $channelFactory; - $this->community = $community; - $this->networkFactory = $network; + $this->timeline = $timeline; + $this->conversation = $conversation; + $this->page = $page; + $this->systemMessages = $systemMessages; + $this->channel = $channelFactory; + $this->community = $community; + $this->networkFactory = $network; + $this->userDefinedChannel = $userDefinedChannel; } protected function content(array $request = []): string @@ -100,7 +105,8 @@ class Channel extends Timeline } if (empty($request['mode']) || ($request['mode'] != 'raw')) { - $tabs = $this->getTabArray($this->channel->getForUser($this->session->getLocalUserId()), 'channel'); + $tabs = $this->getTabArray($this->channel->getTimelines($this->session->getLocalUserId()), 'channel'); + $tabs = array_merge($tabs, $this->getTabArray($this->userDefinedChannel->getForUser($this->session->getLocalUserId()), 'channel')); $tabs = array_merge($tabs, $this->getTabArray($this->community->getTimelines(true), 'channel')); $tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl'); @@ -122,7 +128,7 @@ class Channel extends Timeline $o .= $this->conversation->statusEditor([], 0, true); } - if ($this->channel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { + if ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { $items = $this->getChannelItems(); $order = 'created'; } else { @@ -168,7 +174,7 @@ class Channel extends Timeline $this->selectedTab = ChannelEntity::FORYOU; } - if (!$this->channel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) && !$this->community->isTimeline($this->selectedTab)) { + if (!$this->channel->isTimeline($this->selectedTab) && !$this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) && !$this->community->isTimeline($this->selectedTab)) { throw new HTTPException\BadRequestException($this->l10n->t('Channel not available.')); } diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php index 656c4410c3..40f7d1239e 100644 --- a/src/Module/Conversation/Network.php +++ b/src/Module/Conversation/Network.php @@ -29,6 +29,7 @@ use Friendica\Content\Conversation\Entity\Network as NetworkEntity; use Friendica\Content\Conversation\Factory\Timeline as TimelineFactory; use Friendica\Content\Conversation\Repository\Channel; use Friendica\Content\Conversation\Factory\Channel as ChannelFactory; +use Friendica\Content\Conversation\Factory\UserDefinedChannel as UserDefinedChannelFactory; use Friendica\Content\Conversation\Factory\Community as CommunityFactory; use Friendica\Content\Conversation\Factory\Network as NetworkFactory; use Friendica\Content\Feature; @@ -101,23 +102,26 @@ class Network extends Timeline protected $timeline; /** @var ChannelFactory */ protected $channel; + /** @var UserDefinedChannelFactory */ + protected $userDefinedChannel; /** @var CommunityFactory */ protected $community; /** @var NetworkFactory */ protected $networkFactory; - public function __construct(NetworkFactory $network, CommunityFactory $community, ChannelFactory $channelFactory, Channel $channel, App $app, TimelineFactory $timeline, SystemMessages $systemMessages, Mode $mode, Conversation $conversation, App\Page $page, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) + public function __construct(UserDefinedChannelFactory $userDefinedChannel, NetworkFactory $network, CommunityFactory $community, ChannelFactory $channelFactory, Channel $channel, App $app, TimelineFactory $timeline, SystemMessages $systemMessages, Mode $mode, Conversation $conversation, App\Page $page, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) { parent::__construct($channel, $mode, $session, $database, $pConfig, $config, $cache, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); - $this->app = $app; - $this->timeline = $timeline; - $this->systemMessages = $systemMessages; - $this->conversation = $conversation; - $this->page = $page; - $this->channel = $channelFactory; - $this->community = $community; - $this->networkFactory = $network; + $this->app = $app; + $this->timeline = $timeline; + $this->systemMessages = $systemMessages; + $this->conversation = $conversation; + $this->page = $page; + $this->channel = $channelFactory; + $this->community = $community; + $this->networkFactory = $network; + $this->userDefinedChannel = $userDefinedChannel; } protected function content(array $request = []): string @@ -135,7 +139,7 @@ class Network extends Timeline $o = ''; - if ($this->channel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { + if ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { $items = $this->getChannelItems(); } elseif ($this->community->isTimeline($this->selectedTab)) { $items = $this->getCommunityItems(); @@ -282,7 +286,8 @@ class Network extends Timeline $network_timelines = $this->pConfig->get($this->session->getLocalUserId(), 'system', 'network_timelines', []); if (!empty($network_timelines)) { - $tabs = array_merge($tabs, $this->getTabArray($this->channel->getForUser($this->session->getLocalUserId()), 'network', 'channel')); + $tabs = array_merge($tabs, $this->getTabArray($this->channel->getTimelines($this->session->getLocalUserId()), 'network', 'channel')); + $tabs = array_merge($tabs, $this->getTabArray($this->userDefinedChannel->getForUser($this->session->getLocalUserId()), 'network', 'channel')); $tabs = array_merge($tabs, $this->getTabArray($this->community->getTimelines(true), 'network', 'channel')); } @@ -316,11 +321,11 @@ class Network extends Timeline if (!$this->selectedTab) { $this->selectedTab = self::getTimelineOrderBySession($this->session, $this->pConfig); - } elseif (!$this->networkFactory->isTimeline($this->selectedTab) && !$this->channel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) && !$this->community->isTimeline($this->selectedTab)) { + } elseif (!$this->networkFactory->isTimeline($this->selectedTab) && !$this->channel->isTimeline($this->selectedTab) && !$this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) && !$this->community->isTimeline($this->selectedTab)) { throw new HTTPException\BadRequestException($this->l10n->t('Network feed not available.')); } - if (($this->network || $this->circleId || $this->groupContactId) && ($this->channel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) || $this->community->isTimeline($this->selectedTab))) { + if (($this->network || $this->circleId || $this->groupContactId) && ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) || $this->community->isTimeline($this->selectedTab))) { $this->selectedTab = NetworkEntity::RECEIVED; } @@ -345,7 +350,7 @@ class Network extends Timeline $this->mention = false; } elseif (in_array($this->selectedTab, [NetworkEntity::RECEIVED, NetworkEntity::STAR]) || $this->community->isTimeline($this->selectedTab)) { $this->order = 'received'; - } elseif (($this->selectedTab == NetworkEntity::CREATED) || $this->channel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { + } elseif (($this->selectedTab == NetworkEntity::CREATED) || $this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { $this->order = 'created'; } else { $this->order = 'commented'; diff --git a/src/Module/Conversation/Timeline.php b/src/Module/Conversation/Timeline.php index 3f7f3ef759..7d3a7b2971 100644 --- a/src/Module/Conversation/Timeline.php +++ b/src/Module/Conversation/Timeline.php @@ -26,6 +26,7 @@ use Friendica\App\Mode; use Friendica\BaseModule; use Friendica\Content\Conversation\Collection\Timelines; use Friendica\Content\Conversation\Entity\Channel as ChannelEntity; +use Friendica\Content\Conversation\Entity\UserDefinedChannel as UserDefinedChannelEntity; use Friendica\Content\Conversation\Repository\Channel; use Friendica\Core\Cache\Capability\ICanCache; use Friendica\Core\Cache\Enum\Duration; diff --git a/src/Module/Settings/Display.php b/src/Module/Settings/Display.php index 3c5311482f..68ac500212 100644 --- a/src/Module/Settings/Display.php +++ b/src/Module/Settings/Display.php @@ -28,6 +28,7 @@ use Friendica\Content\Conversation\Factory\Channel as ChannelFactory; use Friendica\Content\Conversation\Factory\Community as CommunityFactory; use Friendica\Content\Conversation\Factory\Network as NetworkFactory; use Friendica\Content\Conversation\Factory\Timeline as TimelineFactory; +use Friendica\Content\Conversation\Factory\UserDefinedChannel as UserDefinedChannelFactory; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Hook; use Friendica\Core\L10n; @@ -58,6 +59,8 @@ class Display extends BaseSettings private $systemMessages; /** @var ChannelFactory */ protected $channel; + /** @var UserDefinedChannelFactory */ + protected $userDefinedChannel; /** @var CommunityFactory */ protected $community; /** @var NetworkFactory */ @@ -65,18 +68,19 @@ class Display extends BaseSettings /** @var TimelineFactory */ protected $timeline; - public function __construct(NetworkFactory $network, CommunityFactory $community, ChannelFactory $channel, TimelineFactory $timeline, SystemMessages $systemMessages, App $app, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, IHandleUserSessions $session, App\Page $page, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) + public function __construct(UserDefinedChannelFactory $userDefinedChannel, NetworkFactory $network, CommunityFactory $community, ChannelFactory $channel, TimelineFactory $timeline, SystemMessages $systemMessages, App $app, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, IHandleUserSessions $session, App\Page $page, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) { parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); - $this->config = $config; - $this->pConfig = $pConfig; - $this->app = $app; - $this->systemMessages = $systemMessages; - $this->timeline = $timeline; - $this->channel = $channel; - $this->community = $community; - $this->network = $network; + $this->config = $config; + $this->pConfig = $pConfig; + $this->app = $app; + $this->systemMessages = $systemMessages; + $this->timeline = $timeline; + $this->channel = $channel; + $this->community = $community; + $this->network = $network; + $this->userDefinedChannel = $userDefinedChannel; } protected function post(array $request = []) @@ -349,7 +353,11 @@ class Display extends BaseSettings return new Timelines($timelines); } - foreach ($this->channel->getForUser($uid) as $channel) { + foreach ($this->channel->getTimelines($uid) as $channel) { + $timelines[] = $channel; + } + + foreach ($this->userDefinedChannel->getForUser($uid) as $channel) { $timelines[] = $channel; } diff --git a/src/Module/Update/Channel.php b/src/Module/Update/Channel.php index 2cff325850..8435a7cc1b 100644 --- a/src/Module/Update/Channel.php +++ b/src/Module/Update/Channel.php @@ -38,7 +38,7 @@ class Channel extends ChannelModule $o = ''; if ($this->update || $this->force) { - if ($this->channel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { + if ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { $items = $this->getChannelItems(); } else { $items = $this->getCommunityItems(); diff --git a/src/Module/Update/Network.php b/src/Module/Update/Network.php index 140900876d..983680ac0b 100644 --- a/src/Module/Update/Network.php +++ b/src/Module/Update/Network.php @@ -41,7 +41,7 @@ class Network extends NetworkModule System::htmlUpdateExit($o); } - if ($this->channel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { + if ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { $items = $this->getChannelItems(); } elseif ($this->community->isTimeline($this->selectedTab)) { $items = $this->getCommunityItems(); diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index 30aed566ee..3439b901d3 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', 1535); + define('DB_UPDATE_VERSION', 1536); } return [ From 22e0bb58d9e51bd1386378aa4a51fbedd8579f8f Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 6 Oct 2023 08:20:17 +0000 Subject: [PATCH 28/31] Channel class confusion solved --- src/Content/Conversation/Repository/Channel.php | 5 +++-- src/Module/Conversation/Channel.php | 10 +++++----- src/Module/Conversation/Network.php | 14 +++++++------- src/Module/Conversation/Timeline.php | 1 - src/Module/Update/Channel.php | 2 +- src/Module/Update/Network.php | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Content/Conversation/Repository/Channel.php b/src/Content/Conversation/Repository/Channel.php index 19defd59d3..19fac3b0d8 100644 --- a/src/Content/Conversation/Repository/Channel.php +++ b/src/Content/Conversation/Repository/Channel.php @@ -22,6 +22,7 @@ namespace Friendica\Content\Conversation\Repository; use Friendica\BaseCollection; +use Friendica\Content\Conversation\Entity\Timeline as TimelineEntity; use Friendica\Content\Conversation\Entity\UserDefinedChannel; use Friendica\Content\Conversation\Factory\Timeline; use Friendica\Database\Database; @@ -41,10 +42,10 @@ class Channel extends \Friendica\BaseRepository * * @param int $id The id of the user defined channel * @param int $uid The user that this channel belongs to. (Not part of the primary key) - * @return UserDefinedChannel + * @return TimelineEntity * @throws \Friendica\Network\HTTPException\NotFoundException */ - public function selectById(int $id, int $uid): UserDefinedChannel + public function selectById(int $id, int $uid): TimelineEntity { return $this->_selectOne(['id' => $id, 'uid' => $uid]); } diff --git a/src/Module/Conversation/Channel.php b/src/Module/Conversation/Channel.php index bb6a805d65..261a5a5d48 100644 --- a/src/Module/Conversation/Channel.php +++ b/src/Module/Conversation/Channel.php @@ -63,7 +63,7 @@ class Channel extends Timeline /** @var SystemMessages */ protected $systemMessages; /** @var ChannelFactory */ - protected $channel; + protected $channelFactory; /** @var UserDefinedChannelFactory */ protected $userDefinedChannel; /** @var CommunityFactory */ @@ -79,7 +79,7 @@ class Channel extends Timeline $this->conversation = $conversation; $this->page = $page; $this->systemMessages = $systemMessages; - $this->channel = $channelFactory; + $this->channelFactory = $channelFactory; $this->community = $community; $this->networkFactory = $network; $this->userDefinedChannel = $userDefinedChannel; @@ -105,7 +105,7 @@ class Channel extends Timeline } if (empty($request['mode']) || ($request['mode'] != 'raw')) { - $tabs = $this->getTabArray($this->channel->getTimelines($this->session->getLocalUserId()), 'channel'); + $tabs = $this->getTabArray($this->channelFactory->getTimelines($this->session->getLocalUserId()), 'channel'); $tabs = array_merge($tabs, $this->getTabArray($this->userDefinedChannel->getForUser($this->session->getLocalUserId()), 'channel')); $tabs = array_merge($tabs, $this->getTabArray($this->community->getTimelines(true), 'channel')); @@ -128,7 +128,7 @@ class Channel extends Timeline $o .= $this->conversation->statusEditor([], 0, true); } - if ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { + if ($this->channelFactory->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { $items = $this->getChannelItems(); $order = 'created'; } else { @@ -174,7 +174,7 @@ class Channel extends Timeline $this->selectedTab = ChannelEntity::FORYOU; } - if (!$this->channel->isTimeline($this->selectedTab) && !$this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) && !$this->community->isTimeline($this->selectedTab)) { + if (!$this->channelFactory->isTimeline($this->selectedTab) && !$this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) && !$this->community->isTimeline($this->selectedTab)) { throw new HTTPException\BadRequestException($this->l10n->t('Channel not available.')); } diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php index 40f7d1239e..f754b41260 100644 --- a/src/Module/Conversation/Network.php +++ b/src/Module/Conversation/Network.php @@ -101,7 +101,7 @@ class Network extends Timeline /** @var TimelineFactory */ protected $timeline; /** @var ChannelFactory */ - protected $channel; + protected $channelFactory; /** @var UserDefinedChannelFactory */ protected $userDefinedChannel; /** @var CommunityFactory */ @@ -118,7 +118,7 @@ class Network extends Timeline $this->systemMessages = $systemMessages; $this->conversation = $conversation; $this->page = $page; - $this->channel = $channelFactory; + $this->channelFactory = $channelFactory; $this->community = $community; $this->networkFactory = $network; $this->userDefinedChannel = $userDefinedChannel; @@ -139,7 +139,7 @@ class Network extends Timeline $o = ''; - if ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { + if ($this->channelFactory->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { $items = $this->getChannelItems(); } elseif ($this->community->isTimeline($this->selectedTab)) { $items = $this->getCommunityItems(); @@ -286,7 +286,7 @@ class Network extends Timeline $network_timelines = $this->pConfig->get($this->session->getLocalUserId(), 'system', 'network_timelines', []); if (!empty($network_timelines)) { - $tabs = array_merge($tabs, $this->getTabArray($this->channel->getTimelines($this->session->getLocalUserId()), 'network', 'channel')); + $tabs = array_merge($tabs, $this->getTabArray($this->channelFactory->getTimelines($this->session->getLocalUserId()), 'network', 'channel')); $tabs = array_merge($tabs, $this->getTabArray($this->userDefinedChannel->getForUser($this->session->getLocalUserId()), 'network', 'channel')); $tabs = array_merge($tabs, $this->getTabArray($this->community->getTimelines(true), 'network', 'channel')); } @@ -321,11 +321,11 @@ class Network extends Timeline if (!$this->selectedTab) { $this->selectedTab = self::getTimelineOrderBySession($this->session, $this->pConfig); - } elseif (!$this->networkFactory->isTimeline($this->selectedTab) && !$this->channel->isTimeline($this->selectedTab) && !$this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) && !$this->community->isTimeline($this->selectedTab)) { + } elseif (!$this->networkFactory->isTimeline($this->selectedTab) && !$this->channelFactory->isTimeline($this->selectedTab) && !$this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) && !$this->community->isTimeline($this->selectedTab)) { throw new HTTPException\BadRequestException($this->l10n->t('Network feed not available.')); } - if (($this->network || $this->circleId || $this->groupContactId) && ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) || $this->community->isTimeline($this->selectedTab))) { + if (($this->network || $this->circleId || $this->groupContactId) && ($this->channelFactory->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) || $this->community->isTimeline($this->selectedTab))) { $this->selectedTab = NetworkEntity::RECEIVED; } @@ -350,7 +350,7 @@ class Network extends Timeline $this->mention = false; } elseif (in_array($this->selectedTab, [NetworkEntity::RECEIVED, NetworkEntity::STAR]) || $this->community->isTimeline($this->selectedTab)) { $this->order = 'received'; - } elseif (($this->selectedTab == NetworkEntity::CREATED) || $this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { + } elseif (($this->selectedTab == NetworkEntity::CREATED) || $this->channelFactory->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { $this->order = 'created'; } else { $this->order = 'commented'; diff --git a/src/Module/Conversation/Timeline.php b/src/Module/Conversation/Timeline.php index 7d3a7b2971..3f7f3ef759 100644 --- a/src/Module/Conversation/Timeline.php +++ b/src/Module/Conversation/Timeline.php @@ -26,7 +26,6 @@ use Friendica\App\Mode; use Friendica\BaseModule; use Friendica\Content\Conversation\Collection\Timelines; use Friendica\Content\Conversation\Entity\Channel as ChannelEntity; -use Friendica\Content\Conversation\Entity\UserDefinedChannel as UserDefinedChannelEntity; use Friendica\Content\Conversation\Repository\Channel; use Friendica\Core\Cache\Capability\ICanCache; use Friendica\Core\Cache\Enum\Duration; diff --git a/src/Module/Update/Channel.php b/src/Module/Update/Channel.php index 8435a7cc1b..9382512da5 100644 --- a/src/Module/Update/Channel.php +++ b/src/Module/Update/Channel.php @@ -38,7 +38,7 @@ class Channel extends ChannelModule $o = ''; if ($this->update || $this->force) { - if ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { + if ($this->channelFactory->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { $items = $this->getChannelItems(); } else { $items = $this->getCommunityItems(); diff --git a/src/Module/Update/Network.php b/src/Module/Update/Network.php index 983680ac0b..64f5ea5733 100644 --- a/src/Module/Update/Network.php +++ b/src/Module/Update/Network.php @@ -41,7 +41,7 @@ class Network extends NetworkModule System::htmlUpdateExit($o); } - if ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { + if ($this->channelFactory->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { $items = $this->getChannelItems(); } elseif ($this->community->isTimeline($this->selectedTab)) { $items = $this->getCommunityItems(); From 134cbacf3180b0484e2fda7da6322d54f93c4feb Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 6 Oct 2023 10:02:27 +0000 Subject: [PATCH 29/31] Updates messages.po --- view/lang/C/messages.po | 228 ++++++++++++++++++++-------------------- 1 file changed, 115 insertions(+), 113 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 3f5001d628..20b5d8f7b5 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-05 20:02+0000\n" +"POT-Creation-Date: 2023-10-06 10:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -70,7 +70,7 @@ msgstr "" #: src/Module/Settings/Account.php:50 src/Module/Settings/Account.php:408 #: src/Module/Settings/Channels.php:56 src/Module/Settings/Channels.php:114 #: src/Module/Settings/Delegation.php:41 src/Module/Settings/Delegation.php:71 -#: src/Module/Settings/Display.php:73 src/Module/Settings/Display.php:176 +#: src/Module/Settings/Display.php:90 src/Module/Settings/Display.php:193 #: src/Module/Settings/Profile/Photo/Crop.php:165 #: src/Module/Settings/Profile/Photo/Index.php:111 #: src/Module/Settings/RemoveMe.php:117 src/Module/Settings/UserExport.php:80 @@ -794,7 +794,7 @@ msgstr "" msgid "All contacts" msgstr "" -#: src/BaseModule.php:435 src/Content/Conversation/Factory/Timeline.php:62 +#: src/BaseModule.php:435 src/Content/Conversation/Factory/Channel.php:54 #: 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/Settings/Channels.php:120 @@ -802,6 +802,7 @@ msgid "Followers" msgstr "" #: src/BaseModule.php:440 src/Content/Widget.php:240 src/Module/Contact.php:418 +#: src/Module/Settings/Channels.php:119 msgid "Following" msgstr "" @@ -1515,120 +1516,121 @@ msgstr "" msgid "View in context" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:81 +#: src/Content/Conversation/Factory/Channel.php:51 msgid "For you" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:81 +#: src/Content/Conversation/Factory/Channel.php:51 msgid "Posts from contacts you interact with and who interact with you" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:82 +#: src/Content/Conversation/Factory/Channel.php:52 msgid "What's Hot" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:82 +#: src/Content/Conversation/Factory/Channel.php:52 msgid "Posts with a lot of interactions" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:83 +#: src/Content/Conversation/Factory/Channel.php:53 #, php-format msgid "Posts in %s" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:84 +#: src/Content/Conversation/Factory/Channel.php:54 msgid "Posts from your followers that you don't follow" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:85 +#: src/Content/Conversation/Factory/Channel.php:55 msgid "Sharers of sharers" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:85 +#: src/Content/Conversation/Factory/Channel.php:55 msgid "Posts from accounts that are followed by accounts that you follow" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:86 +#: src/Content/Conversation/Factory/Channel.php:56 #: src/Module/Settings/Channels.php:137 src/Module/Settings/Channels.php:153 msgid "Images" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:86 +#: src/Content/Conversation/Factory/Channel.php:56 msgid "Posts with images" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:87 +#: src/Content/Conversation/Factory/Channel.php:57 #: src/Module/Settings/Channels.php:139 src/Module/Settings/Channels.php:155 msgid "Audio" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:87 +#: src/Content/Conversation/Factory/Channel.php:57 msgid "Posts with audio" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:88 +#: src/Content/Conversation/Factory/Channel.php:58 #: src/Module/Settings/Channels.php:138 src/Module/Settings/Channels.php:154 msgid "Videos" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:88 +#: src/Content/Conversation/Factory/Channel.php:58 msgid "Posts with videos" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:84 +#: src/Content/Conversation/Factory/Community.php:52 msgid "Local Community" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:84 +#: src/Content/Conversation/Factory/Community.php:52 msgid "Posts from local users on this server" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:88 +#: src/Content/Conversation/Factory/Community.php:56 +#: src/Module/Settings/Channels.php:118 msgid "Global Community" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:88 +#: src/Content/Conversation/Factory/Community.php:56 msgid "Posts from users of the whole federated network" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:102 +#: src/Content/Conversation/Factory/Network.php:47 msgid "Latest Activity" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:102 +#: src/Content/Conversation/Factory/Network.php:47 msgid "Sort by latest activity" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:103 +#: src/Content/Conversation/Factory/Network.php:48 msgid "Latest Posts" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:103 +#: src/Content/Conversation/Factory/Network.php:48 msgid "Sort by post received date" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:104 +#: src/Content/Conversation/Factory/Network.php:49 msgid "Latest Creation" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:104 +#: src/Content/Conversation/Factory/Network.php:49 msgid "Sort by post creation date" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:105 +#: src/Content/Conversation/Factory/Network.php:50 #: src/Module/Settings/Profile/Index.php:260 msgid "Personal" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:105 +#: src/Content/Conversation/Factory/Network.php:50 msgid "Posts that mention or involve you" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:106 src/Object/Post.php:380 +#: src/Content/Conversation/Factory/Network.php:51 src/Object/Post.php:380 msgid "Starred" msgstr "" -#: src/Content/Conversation/Factory/Timeline.php:106 +#: src/Content/Conversation/Factory/Network.php:51 msgid "Favourite Posts" msgstr "" @@ -1931,7 +1933,7 @@ msgstr "" #: src/Content/Nav.php:233 src/Content/Nav.php:293 #: 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:294 view/theme/frio/theme.php:236 +#: src/Module/Settings/Display.php:310 view/theme/frio/theme.php:236 #: view/theme/frio/theme.php:240 msgid "Calendar" msgstr "" @@ -2174,12 +2176,12 @@ msgstr "" msgid "last" msgstr "" -#: src/Content/Text/BBCode.php:697 src/Content/Text/BBCode.php:1637 -#: src/Content/Text/BBCode.php:1638 +#: src/Content/Text/BBCode.php:751 src/Content/Text/BBCode.php:1692 +#: src/Content/Text/BBCode.php:1693 msgid "Image/photo" msgstr "" -#: src/Content/Text/BBCode.php:915 +#: src/Content/Text/BBCode.php:969 #, php-format msgid "" "%2$s %3$s" @@ -2190,23 +2192,23 @@ msgstr "" msgid "Link to source" msgstr "" -#: src/Content/Text/BBCode.php:1544 src/Content/Text/HTML.php:904 +#: src/Content/Text/BBCode.php:1599 src/Content/Text/HTML.php:904 msgid "Click to open/close" msgstr "" -#: src/Content/Text/BBCode.php:1577 +#: src/Content/Text/BBCode.php:1632 msgid "$1 wrote:" msgstr "" -#: src/Content/Text/BBCode.php:1642 src/Content/Text/BBCode.php:1643 +#: src/Content/Text/BBCode.php:1697 src/Content/Text/BBCode.php:1698 msgid "Encrypted content" msgstr "" -#: src/Content/Text/BBCode.php:1902 +#: src/Content/Text/BBCode.php:1957 msgid "Invalid source protocol" msgstr "" -#: src/Content/Text/BBCode.php:1921 +#: src/Content/Text/BBCode.php:1976 msgid "Invalid link protocol" msgstr "" @@ -2289,7 +2291,7 @@ msgstr "" msgid "Local Directory" msgstr "" -#: src/Content/Widget.php:215 src/Model/Circle.php:616 +#: src/Content/Widget.php:215 src/Model/Circle.php:601 #: src/Module/Contact.php:401 src/Module/Welcome.php:76 msgid "Circles" msgstr "" @@ -2366,8 +2368,8 @@ msgstr "" msgid "All" msgstr "" -#: src/Content/Widget.php:585 src/Module/BaseSettings.php:125 -#: src/Module/Settings/Channels.php:157 src/Module/Settings/Display.php:293 +#: src/Content/Widget.php:591 src/Module/BaseSettings.php:125 +#: src/Module/Settings/Channels.php:157 src/Module/Settings/Display.php:309 msgid "Channels" msgstr "" @@ -2839,37 +2841,37 @@ msgid "Could not connect to database." msgstr "" #: src/Core/L10n.php:507 src/Model/Event.php:430 -#: src/Module/Settings/Display.php:235 +#: src/Module/Settings/Display.php:278 msgid "Monday" msgstr "" #: src/Core/L10n.php:507 src/Model/Event.php:431 -#: src/Module/Settings/Display.php:236 +#: src/Module/Settings/Display.php:279 msgid "Tuesday" msgstr "" #: src/Core/L10n.php:507 src/Model/Event.php:432 -#: src/Module/Settings/Display.php:237 +#: src/Module/Settings/Display.php:280 msgid "Wednesday" msgstr "" #: src/Core/L10n.php:507 src/Model/Event.php:433 -#: src/Module/Settings/Display.php:238 +#: src/Module/Settings/Display.php:281 msgid "Thursday" msgstr "" #: src/Core/L10n.php:507 src/Model/Event.php:434 -#: src/Module/Settings/Display.php:239 +#: src/Module/Settings/Display.php:282 msgid "Friday" msgstr "" #: src/Core/L10n.php:507 src/Model/Event.php:435 -#: src/Module/Settings/Display.php:240 +#: src/Module/Settings/Display.php:283 msgid "Saturday" msgstr "" #: src/Core/L10n.php:507 src/Model/Event.php:429 -#: src/Module/Settings/Display.php:234 +#: src/Module/Settings/Display.php:277 msgid "Sunday" msgstr "" @@ -3174,36 +3176,36 @@ msgid "" "not what you intended, please create another circle with a different name." msgstr "" -#: src/Model/Circle.php:559 +#: src/Model/Circle.php:544 msgid "Everybody" msgstr "" -#: src/Model/Circle.php:578 +#: src/Model/Circle.php:563 msgid "edit" msgstr "" -#: src/Model/Circle.php:615 +#: src/Model/Circle.php:600 msgid "add" msgstr "" -#: src/Model/Circle.php:620 +#: src/Model/Circle.php:605 msgid "Edit circle" msgstr "" -#: src/Model/Circle.php:621 src/Module/Circle.php:193 +#: src/Model/Circle.php:606 src/Module/Circle.php:193 msgid "Contacts not in any circle" msgstr "" -#: src/Model/Circle.php:623 +#: src/Model/Circle.php:608 msgid "Create a new circle" msgstr "" -#: src/Model/Circle.php:624 src/Module/Circle.php:178 src/Module/Circle.php:201 +#: src/Model/Circle.php:609 src/Module/Circle.php:178 src/Module/Circle.php:201 #: src/Module/Circle.php:276 msgid "Circle Name: " msgstr "" -#: src/Model/Circle.php:625 +#: src/Model/Circle.php:610 msgid "Edit circles" msgstr "" @@ -3314,17 +3316,17 @@ msgid "today" msgstr "" #: src/Model/Event.php:463 src/Module/Calendar/Show.php:129 -#: src/Module/Settings/Display.php:272 src/Util/Temporal.php:353 +#: src/Module/Settings/Display.php:288 src/Util/Temporal.php:353 msgid "month" msgstr "" #: src/Model/Event.php:464 src/Module/Calendar/Show.php:130 -#: src/Module/Settings/Display.php:273 src/Util/Temporal.php:354 +#: src/Module/Settings/Display.php:289 src/Util/Temporal.php:354 msgid "week" msgstr "" #: src/Model/Event.php:465 src/Module/Calendar/Show.php:131 -#: src/Module/Settings/Display.php:274 src/Util/Temporal.php:355 +#: src/Module/Settings/Display.php:290 src/Util/Temporal.php:355 msgid "day" msgstr "" @@ -3897,7 +3899,7 @@ msgid "Disable" msgstr "" #: src/Module/Admin/Addons/Details.php:91 -#: src/Module/Admin/Themes/Details.php:49 src/Module/Settings/Display.php:316 +#: src/Module/Admin/Themes/Details.php:49 src/Module/Settings/Display.php:332 msgid "Enable" msgstr "" @@ -3947,7 +3949,7 @@ msgstr "" #: src/Module/Settings/Account.php:561 src/Module/Settings/Addons.php:78 #: src/Module/Settings/Connectors.php:160 #: src/Module/Settings/Connectors.php:246 -#: src/Module/Settings/Delegation.php:171 src/Module/Settings/Display.php:287 +#: src/Module/Settings/Delegation.php:171 src/Module/Settings/Display.php:303 #: src/Module/Settings/Features.php:76 msgid "Save Settings" msgstr "" @@ -4308,11 +4310,11 @@ msgstr "" msgid "%s is no valid input for maximum image size" msgstr "" -#: src/Module/Admin/Site.php:313 src/Module/Settings/Display.php:194 +#: src/Module/Admin/Site.php:313 src/Module/Settings/Display.php:211 msgid "No special theme for mobile devices" msgstr "" -#: src/Module/Admin/Site.php:330 src/Module/Settings/Display.php:204 +#: src/Module/Admin/Site.php:330 src/Module/Settings/Display.php:221 #, php-format msgid "%s - (Experimental)" msgstr "" @@ -5922,7 +5924,7 @@ msgstr "" msgid "Create New Event" msgstr "" -#: src/Module/Calendar/Show.php:132 src/Module/Settings/Display.php:275 +#: src/Module/Calendar/Show.php:132 src/Module/Settings/Display.php:291 msgid "list" msgstr "" @@ -5956,7 +5958,7 @@ msgid "Contact not found." msgstr "" #: src/Module/Circle.php:102 src/Module/Contact/Contacts.php:66 -#: src/Module/Conversation/Network.php:224 +#: src/Module/Conversation/Network.php:240 msgid "Invalid contact." msgstr "" @@ -6718,13 +6720,13 @@ msgstr "" msgid "Unable to unfollow this contact, please contact your administrator" msgstr "" -#: src/Module/Conversation/Channel.php:122 +#: src/Module/Conversation/Channel.php:140 #: src/Module/Conversation/Community.php:126 src/Module/Search/Index.php:152 #: src/Module/Search/Index.php:194 msgid "No results." msgstr "" -#: src/Module/Conversation/Channel.php:160 +#: src/Module/Conversation/Channel.php:178 msgid "Channel not available." msgstr "" @@ -6742,16 +6744,16 @@ msgstr "" msgid "Not available." msgstr "" -#: src/Module/Conversation/Network.php:210 +#: src/Module/Conversation/Network.php:226 msgid "No such circle" msgstr "" -#: src/Module/Conversation/Network.php:214 +#: src/Module/Conversation/Network.php:230 #, php-format msgid "Circle: %s" msgstr "" -#: src/Module/Conversation/Network.php:308 +#: src/Module/Conversation/Network.php:325 msgid "Network feed not available." msgstr "" @@ -9919,12 +9921,12 @@ msgid "No Addon settings configured" msgstr "" #: src/Module/Settings/Channels.php:130 src/Module/Settings/Channels.php:146 -#: src/Module/Settings/Display.php:314 +#: src/Module/Settings/Display.php:330 msgid "Label" msgstr "" #: src/Module/Settings/Channels.php:131 src/Module/Settings/Channels.php:147 -#: src/Module/Settings/Display.php:315 +#: src/Module/Settings/Display.php:331 #: src/Module/Settings/TwoFactor/AppSpecific.php:134 msgid "Description" msgstr "" @@ -10300,164 +10302,164 @@ msgstr "" msgid "No entries." msgstr "" -#: src/Module/Settings/Display.php:162 +#: src/Module/Settings/Display.php:179 msgid "The theme you chose isn't available." msgstr "" -#: src/Module/Settings/Display.php:202 +#: src/Module/Settings/Display.php:219 #, php-format msgid "%s - (Unsupported)" msgstr "" -#: src/Module/Settings/Display.php:237 +#: src/Module/Settings/Display.php:254 msgid "No preview" msgstr "" -#: src/Module/Settings/Display.php:238 +#: src/Module/Settings/Display.php:255 msgid "No image" msgstr "" -#: src/Module/Settings/Display.php:239 +#: src/Module/Settings/Display.php:256 msgid "Small Image" msgstr "" -#: src/Module/Settings/Display.php:240 +#: src/Module/Settings/Display.php:257 msgid "Large Image" msgstr "" -#: src/Module/Settings/Display.php:286 +#: src/Module/Settings/Display.php:302 msgid "Display Settings" msgstr "" -#: src/Module/Settings/Display.php:288 +#: src/Module/Settings/Display.php:304 msgid "General Theme Settings" msgstr "" -#: src/Module/Settings/Display.php:289 +#: src/Module/Settings/Display.php:305 msgid "Custom Theme Settings" msgstr "" -#: src/Module/Settings/Display.php:290 +#: src/Module/Settings/Display.php:306 msgid "Content Settings" msgstr "" -#: src/Module/Settings/Display.php:291 view/theme/duepuntozero/config.php:86 +#: src/Module/Settings/Display.php:307 view/theme/duepuntozero/config.php:86 #: view/theme/frio/config.php:172 view/theme/quattro/config.php:88 #: view/theme/vier/config.php:136 msgid "Theme settings" msgstr "" -#: src/Module/Settings/Display.php:292 +#: src/Module/Settings/Display.php:308 msgid "Timelines" msgstr "" -#: src/Module/Settings/Display.php:299 +#: src/Module/Settings/Display.php:315 msgid "Display Theme:" msgstr "" -#: src/Module/Settings/Display.php:300 +#: src/Module/Settings/Display.php:316 msgid "Mobile Theme:" msgstr "" -#: src/Module/Settings/Display.php:303 +#: src/Module/Settings/Display.php:319 msgid "Number of items to display per page:" msgstr "" -#: src/Module/Settings/Display.php:303 src/Module/Settings/Display.php:304 +#: src/Module/Settings/Display.php:319 src/Module/Settings/Display.php:320 msgid "Maximum of 100 items" msgstr "" -#: src/Module/Settings/Display.php:304 +#: src/Module/Settings/Display.php:320 msgid "Number of items to display per page when viewed from mobile device:" msgstr "" -#: src/Module/Settings/Display.php:305 +#: src/Module/Settings/Display.php:321 msgid "Update browser every xx seconds" msgstr "" -#: src/Module/Settings/Display.php:305 +#: src/Module/Settings/Display.php:321 msgid "Minimum of 10 seconds. Enter -1 to disable it." msgstr "" -#: src/Module/Settings/Display.php:306 +#: src/Module/Settings/Display.php:322 msgid "Display emoticons" msgstr "" -#: src/Module/Settings/Display.php:306 +#: src/Module/Settings/Display.php:322 msgid "When enabled, emoticons are replaced with matching symbols." msgstr "" -#: src/Module/Settings/Display.php:307 +#: src/Module/Settings/Display.php:323 msgid "Infinite scroll" msgstr "" -#: src/Module/Settings/Display.php:307 +#: src/Module/Settings/Display.php:323 msgid "Automatic fetch new items when reaching the page end." msgstr "" -#: src/Module/Settings/Display.php:308 +#: src/Module/Settings/Display.php:324 msgid "Enable Smart Threading" msgstr "" -#: src/Module/Settings/Display.php:308 +#: src/Module/Settings/Display.php:324 msgid "Enable the automatic suppression of extraneous thread indentation." msgstr "" -#: src/Module/Settings/Display.php:309 +#: src/Module/Settings/Display.php:325 msgid "Display the Dislike feature" msgstr "" -#: src/Module/Settings/Display.php:309 +#: src/Module/Settings/Display.php:325 msgid "Display the Dislike button and dislike reactions on posts and comments." msgstr "" -#: src/Module/Settings/Display.php:310 +#: src/Module/Settings/Display.php:326 msgid "Display the resharer" msgstr "" -#: src/Module/Settings/Display.php:310 +#: src/Module/Settings/Display.php:326 msgid "Display the first resharer as icon and text on a reshared item." msgstr "" -#: src/Module/Settings/Display.php:311 +#: src/Module/Settings/Display.php:327 msgid "Stay local" msgstr "" -#: src/Module/Settings/Display.php:311 +#: src/Module/Settings/Display.php:327 msgid "Don't go to a remote system when following a contact link." msgstr "" -#: src/Module/Settings/Display.php:312 +#: src/Module/Settings/Display.php:328 msgid "Link preview mode" msgstr "" -#: src/Module/Settings/Display.php:312 +#: src/Module/Settings/Display.php:328 msgid "Appearance of the link preview that is added to each post with a link." msgstr "" -#: src/Module/Settings/Display.php:317 +#: src/Module/Settings/Display.php:333 msgid "Bookmark" msgstr "" -#: src/Module/Settings/Display.php:319 +#: src/Module/Settings/Display.php:335 msgid "" "Enable timelines that you want to see in the channels widget. Bookmark " "timelines that you want to see in the top menu." msgstr "" -#: src/Module/Settings/Display.php:321 +#: src/Module/Settings/Display.php:337 msgid "Channel languages:" msgstr "" -#: src/Module/Settings/Display.php:321 +#: src/Module/Settings/Display.php:337 msgid "Select all languages that you want to see in your channels." msgstr "" -#: src/Module/Settings/Display.php:323 +#: src/Module/Settings/Display.php:339 msgid "Beginning of week:" msgstr "" -#: src/Module/Settings/Display.php:324 +#: src/Module/Settings/Display.php:340 msgid "Default calendar view:" msgstr "" From 3f6480c12704a1f616a350977930c3ab0e3836cb Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 6 Oct 2023 11:38:29 +0000 Subject: [PATCH 30/31] Clean channel confusion --- src/Content/Conversation/Factory/Timeline.php | 8 ++++---- .../Factory/UserDefinedChannel.php | 4 ++-- src/Module/Conversation/Channel.php | 11 +++++------ src/Module/Conversation/Network.php | 14 +++++++------- src/Module/Conversation/Timeline.php | 18 +++++++++--------- src/Module/Update/Channel.php | 2 +- src/Module/Update/Network.php | 2 +- 7 files changed, 29 insertions(+), 30 deletions(-) diff --git a/src/Content/Conversation/Factory/Timeline.php b/src/Content/Conversation/Factory/Timeline.php index eb40100819..804f6a3382 100644 --- a/src/Content/Conversation/Factory/Timeline.php +++ b/src/Content/Conversation/Factory/Timeline.php @@ -35,15 +35,15 @@ class Timeline extends \Friendica\BaseFactory implements ICanCreateFromTableRow /** @var IManageConfigValues The config */ protected $config; /** @var Channel */ - protected $channel; + protected $channelRepository; public function __construct(Channel $channel, L10n $l10n, LoggerInterface $logger, IManageConfigValues $config) { parent::__construct($logger); - $this->channel = $channel; - $this->l10n = $l10n; - $this->config = $config; + $this->channelRepository = $channel; + $this->l10n = $l10n; + $this->config = $config; } public function createFromTableRow(array $row): TimelineEntity diff --git a/src/Content/Conversation/Factory/UserDefinedChannel.php b/src/Content/Conversation/Factory/UserDefinedChannel.php index fe469a7b6f..cb3e86c1d7 100644 --- a/src/Content/Conversation/Factory/UserDefinedChannel.php +++ b/src/Content/Conversation/Factory/UserDefinedChannel.php @@ -42,7 +42,7 @@ final class UserDefinedChannel extends Timeline */ public function getForUser(int $uid): Timelines { - foreach ($this->channel->selectByUid($uid) as $channel) { + foreach ($this->channelRepository->selectByUid($uid) as $channel) { $tabs[] = $channel; } @@ -51,6 +51,6 @@ final class UserDefinedChannel extends Timeline public function isTimeline(string $selectedTab, int $uid): bool { - return is_numeric($selectedTab) && $uid && $this->channel->existsById($selectedTab, $uid); + return is_numeric($selectedTab) && $uid && $this->channelRepository->existsById($selectedTab, $uid); } } diff --git a/src/Module/Conversation/Channel.php b/src/Module/Conversation/Channel.php index 261a5a5d48..dab17c4e19 100644 --- a/src/Module/Conversation/Channel.php +++ b/src/Module/Conversation/Channel.php @@ -32,7 +32,6 @@ use Friendica\Content\Conversation\Repository\Channel as ChannelRepository; use Friendica\Content\Conversation\Factory\Channel as ChannelFactory; use Friendica\Content\Conversation\Factory\Community as CommunityFactory; use Friendica\Content\Conversation\Factory\Network as NetworkFactory; -use Friendica\Content\Conversation\Factory\UserDefinedChannel; use Friendica\Content\Feature; use Friendica\Content\Nav; use Friendica\Content\Text\HTML; @@ -63,7 +62,7 @@ class Channel extends Timeline /** @var SystemMessages */ protected $systemMessages; /** @var ChannelFactory */ - protected $channelFactory; + protected $channel; /** @var UserDefinedChannelFactory */ protected $userDefinedChannel; /** @var CommunityFactory */ @@ -79,7 +78,7 @@ class Channel extends Timeline $this->conversation = $conversation; $this->page = $page; $this->systemMessages = $systemMessages; - $this->channelFactory = $channelFactory; + $this->channel = $channelFactory; $this->community = $community; $this->networkFactory = $network; $this->userDefinedChannel = $userDefinedChannel; @@ -105,7 +104,7 @@ class Channel extends Timeline } if (empty($request['mode']) || ($request['mode'] != 'raw')) { - $tabs = $this->getTabArray($this->channelFactory->getTimelines($this->session->getLocalUserId()), 'channel'); + $tabs = $this->getTabArray($this->channel->getTimelines($this->session->getLocalUserId()), 'channel'); $tabs = array_merge($tabs, $this->getTabArray($this->userDefinedChannel->getForUser($this->session->getLocalUserId()), 'channel')); $tabs = array_merge($tabs, $this->getTabArray($this->community->getTimelines(true), 'channel')); @@ -128,7 +127,7 @@ class Channel extends Timeline $o .= $this->conversation->statusEditor([], 0, true); } - if ($this->channelFactory->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { + if ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { $items = $this->getChannelItems(); $order = 'created'; } else { @@ -174,7 +173,7 @@ class Channel extends Timeline $this->selectedTab = ChannelEntity::FORYOU; } - if (!$this->channelFactory->isTimeline($this->selectedTab) && !$this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) && !$this->community->isTimeline($this->selectedTab)) { + if (!$this->channel->isTimeline($this->selectedTab) && !$this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) && !$this->community->isTimeline($this->selectedTab)) { throw new HTTPException\BadRequestException($this->l10n->t('Channel not available.')); } diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php index f754b41260..40f7d1239e 100644 --- a/src/Module/Conversation/Network.php +++ b/src/Module/Conversation/Network.php @@ -101,7 +101,7 @@ class Network extends Timeline /** @var TimelineFactory */ protected $timeline; /** @var ChannelFactory */ - protected $channelFactory; + protected $channel; /** @var UserDefinedChannelFactory */ protected $userDefinedChannel; /** @var CommunityFactory */ @@ -118,7 +118,7 @@ class Network extends Timeline $this->systemMessages = $systemMessages; $this->conversation = $conversation; $this->page = $page; - $this->channelFactory = $channelFactory; + $this->channel = $channelFactory; $this->community = $community; $this->networkFactory = $network; $this->userDefinedChannel = $userDefinedChannel; @@ -139,7 +139,7 @@ class Network extends Timeline $o = ''; - if ($this->channelFactory->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { + if ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { $items = $this->getChannelItems(); } elseif ($this->community->isTimeline($this->selectedTab)) { $items = $this->getCommunityItems(); @@ -286,7 +286,7 @@ class Network extends Timeline $network_timelines = $this->pConfig->get($this->session->getLocalUserId(), 'system', 'network_timelines', []); if (!empty($network_timelines)) { - $tabs = array_merge($tabs, $this->getTabArray($this->channelFactory->getTimelines($this->session->getLocalUserId()), 'network', 'channel')); + $tabs = array_merge($tabs, $this->getTabArray($this->channel->getTimelines($this->session->getLocalUserId()), 'network', 'channel')); $tabs = array_merge($tabs, $this->getTabArray($this->userDefinedChannel->getForUser($this->session->getLocalUserId()), 'network', 'channel')); $tabs = array_merge($tabs, $this->getTabArray($this->community->getTimelines(true), 'network', 'channel')); } @@ -321,11 +321,11 @@ class Network extends Timeline if (!$this->selectedTab) { $this->selectedTab = self::getTimelineOrderBySession($this->session, $this->pConfig); - } elseif (!$this->networkFactory->isTimeline($this->selectedTab) && !$this->channelFactory->isTimeline($this->selectedTab) && !$this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) && !$this->community->isTimeline($this->selectedTab)) { + } elseif (!$this->networkFactory->isTimeline($this->selectedTab) && !$this->channel->isTimeline($this->selectedTab) && !$this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) && !$this->community->isTimeline($this->selectedTab)) { throw new HTTPException\BadRequestException($this->l10n->t('Network feed not available.')); } - if (($this->network || $this->circleId || $this->groupContactId) && ($this->channelFactory->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) || $this->community->isTimeline($this->selectedTab))) { + if (($this->network || $this->circleId || $this->groupContactId) && ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId()) || $this->community->isTimeline($this->selectedTab))) { $this->selectedTab = NetworkEntity::RECEIVED; } @@ -350,7 +350,7 @@ class Network extends Timeline $this->mention = false; } elseif (in_array($this->selectedTab, [NetworkEntity::RECEIVED, NetworkEntity::STAR]) || $this->community->isTimeline($this->selectedTab)) { $this->order = 'received'; - } elseif (($this->selectedTab == NetworkEntity::CREATED) || $this->channelFactory->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { + } elseif (($this->selectedTab == NetworkEntity::CREATED) || $this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { $this->order = 'created'; } else { $this->order = 'commented'; diff --git a/src/Module/Conversation/Timeline.php b/src/Module/Conversation/Timeline.php index 3f7f3ef759..8ddba16c71 100644 --- a/src/Module/Conversation/Timeline.php +++ b/src/Module/Conversation/Timeline.php @@ -81,19 +81,19 @@ class Timeline extends BaseModule /** @var ICanCache */ protected $cache; /** @var Channel */ - protected $channel; + protected $channelRepository; public function __construct(Channel $channel, Mode $mode, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) { parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); - $this->channel = $channel; - $this->mode = $mode; - $this->session = $session; - $this->database = $database; - $this->pConfig = $pConfig; - $this->config = $config; - $this->cache = $cache; + $this->channelRepository = $channel; + $this->mode = $mode; + $this->session = $session; + $this->database = $database; + $this->pConfig = $pConfig; + $this->config = $config; + $this->cache = $cache; } /** @@ -368,7 +368,7 @@ class Timeline extends BaseModule private function getUserChannelConditions(int $id, int $uid): array { - $channel = $this->channel->selectById($id, $uid); + $channel = $this->channelRepository->selectById($id, $uid); if (empty($channel)) { return []; } diff --git a/src/Module/Update/Channel.php b/src/Module/Update/Channel.php index 9382512da5..8435a7cc1b 100644 --- a/src/Module/Update/Channel.php +++ b/src/Module/Update/Channel.php @@ -38,7 +38,7 @@ class Channel extends ChannelModule $o = ''; if ($this->update || $this->force) { - if ($this->channelFactory->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { + if ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { $items = $this->getChannelItems(); } else { $items = $this->getCommunityItems(); diff --git a/src/Module/Update/Network.php b/src/Module/Update/Network.php index 64f5ea5733..983680ac0b 100644 --- a/src/Module/Update/Network.php +++ b/src/Module/Update/Network.php @@ -41,7 +41,7 @@ class Network extends NetworkModule System::htmlUpdateExit($o); } - if ($this->channelFactory->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { + if ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) { $items = $this->getChannelItems(); } elseif ($this->community->isTimeline($this->selectedTab)) { $items = $this->getCommunityItems(); From b5df3cb104b144a004adb97ad1a0de9e3c570211 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 6 Oct 2023 21:08:33 +0000 Subject: [PATCH 31/31] Unneeded constructors removed --- src/Content/Conversation/Entity/Channel.php | 5 ----- src/Content/Conversation/Entity/Community.php | 5 ----- src/Content/Conversation/Entity/Network.php | 5 ----- src/Content/Conversation/Entity/UserDefinedChannel.php | 4 ---- src/Content/Conversation/Factory/Channel.php | 9 --------- src/Content/Conversation/Factory/Community.php | 9 --------- src/Content/Conversation/Factory/Network.php | 9 --------- .../Conversation/Factory/UserDefinedChannel.php | 10 +--------- 8 files changed, 1 insertion(+), 55 deletions(-) diff --git a/src/Content/Conversation/Entity/Channel.php b/src/Content/Conversation/Entity/Channel.php index 669309cce1..8166b7906b 100644 --- a/src/Content/Conversation/Entity/Channel.php +++ b/src/Content/Conversation/Entity/Channel.php @@ -31,9 +31,4 @@ class Channel extends Timeline const VIDEO = 'video'; const AUDIO = 'audio'; const LANGUAGE = 'language'; - - public function __construct(string $code = null, string $label = null, string $description = null, string $accessKey = null, string $path = null, int $uid = null, string $includeTags = null, string $excludeTags = null, string $fullTextSearch = null, int $mediaType = null, int $circle = null) - { - parent::__construct($code, $label, $description, $accessKey, $path, $uid, $includeTags, $excludeTags, $fullTextSearch, $mediaType, $circle); - } } diff --git a/src/Content/Conversation/Entity/Community.php b/src/Content/Conversation/Entity/Community.php index f7faf280b7..35c7add33e 100644 --- a/src/Content/Conversation/Entity/Community.php +++ b/src/Content/Conversation/Entity/Community.php @@ -25,9 +25,4 @@ final class Community extends Timeline { const LOCAL = 'local'; const GLOBAL = 'global'; - - public function __construct(string $code = null, string $label = null, string $description = null, string $accessKey = null, string $path = null, int $uid = null, string $includeTags = null, string $excludeTags = null, string $fullTextSearch = null, int $mediaType = null, int $circle = null) - { - parent::__construct($code, $label, $description, $accessKey, $path, $uid, $includeTags, $excludeTags, $fullTextSearch, $mediaType, $circle); - } } diff --git a/src/Content/Conversation/Entity/Network.php b/src/Content/Conversation/Entity/Network.php index a212b97b89..75775b7b3c 100644 --- a/src/Content/Conversation/Entity/Network.php +++ b/src/Content/Conversation/Entity/Network.php @@ -28,9 +28,4 @@ final class Network extends Timeline const RECEIVED = 'received'; const COMMENTED = 'commented'; const CREATED = 'created'; - - public function __construct(string $code = null, string $label = null, string $description = null, string $accessKey = null, string $path = null, int $uid = null, string $includeTags = null, string $excludeTags = null, string $fullTextSearch = null, int $mediaType = null, int $circle = null) - { - parent::__construct($code, $label, $description, $accessKey, $path, $uid, $includeTags, $excludeTags, $fullTextSearch, $mediaType, $circle); - } } diff --git a/src/Content/Conversation/Entity/UserDefinedChannel.php b/src/Content/Conversation/Entity/UserDefinedChannel.php index 99124086c4..3d88c6666b 100644 --- a/src/Content/Conversation/Entity/UserDefinedChannel.php +++ b/src/Content/Conversation/Entity/UserDefinedChannel.php @@ -23,8 +23,4 @@ namespace Friendica\Content\Conversation\Entity; class UserDefinedChannel extends Channel { - public function __construct(string $code = null, string $label = null, string $description = null, string $accessKey = null, string $path = null, int $uid = null, string $includeTags = null, string $excludeTags = null, string $fullTextSearch = null, int $mediaType = null, int $circle = null) - { - parent::__construct($code, $label, $description, $accessKey, $path, $uid, $includeTags, $excludeTags, $fullTextSearch, $mediaType, $circle); - } } diff --git a/src/Content/Conversation/Factory/Channel.php b/src/Content/Conversation/Factory/Channel.php index b2ad4048f0..f03b589251 100644 --- a/src/Content/Conversation/Factory/Channel.php +++ b/src/Content/Conversation/Factory/Channel.php @@ -24,18 +24,9 @@ namespace Friendica\Content\Conversation\Factory; use Friendica\Content\Conversation\Collection\Timelines; use Friendica\Content\Conversation\Entity\Channel as ChannelEntity; use Friendica\Model\User; -use Friendica\Content\Conversation\Repository\Channel as ChannelRepository; -use Friendica\Core\Config\Capability\IManageConfigValues; -use Friendica\Core\L10n; -use Psr\Log\LoggerInterface; final class Channel extends Timeline { - public function __construct(ChannelRepository $channel, L10n $l10n, LoggerInterface $logger, IManageConfigValues $config) - { - parent::__construct($channel, $l10n, $logger, $config); - } - /** * List of available channels * diff --git a/src/Content/Conversation/Factory/Community.php b/src/Content/Conversation/Factory/Community.php index e08352d631..bd86ce3a9f 100644 --- a/src/Content/Conversation/Factory/Community.php +++ b/src/Content/Conversation/Factory/Community.php @@ -23,19 +23,10 @@ namespace Friendica\Content\Conversation\Factory; use Friendica\Content\Conversation\Collection\Timelines; use Friendica\Content\Conversation\Entity\Community as CommunityEntity; -use Friendica\Content\Conversation\Repository\Channel; -use Friendica\Core\Config\Capability\IManageConfigValues; -use Friendica\Core\L10n; use Friendica\Module\Conversation\Community as CommunityModule; -use Psr\Log\LoggerInterface; final class Community extends Timeline { - public function __construct(Channel $channel, L10n $l10n, LoggerInterface $logger, IManageConfigValues $config) - { - parent::__construct($channel, $l10n, $logger, $config); - } - /** * List of available communities * diff --git a/src/Content/Conversation/Factory/Network.php b/src/Content/Conversation/Factory/Network.php index 8b71a96190..d7457a8460 100644 --- a/src/Content/Conversation/Factory/Network.php +++ b/src/Content/Conversation/Factory/Network.php @@ -23,18 +23,9 @@ namespace Friendica\Content\Conversation\Factory; use Friendica\Content\Conversation\Collection\Timelines; use Friendica\Content\Conversation\Entity\Network as NetworkEntity; -use Friendica\Content\Conversation\Repository\Channel; -use Friendica\Core\Config\Capability\IManageConfigValues; -use Friendica\Core\L10n; -use Psr\Log\LoggerInterface; final class Network extends Timeline { - public function __construct(Channel $channel, L10n $l10n, LoggerInterface $logger, IManageConfigValues $config) - { - parent::__construct($channel, $l10n, $logger, $config); - } - /** * List of available network timelines * diff --git a/src/Content/Conversation/Factory/UserDefinedChannel.php b/src/Content/Conversation/Factory/UserDefinedChannel.php index cb3e86c1d7..1b067d08b0 100644 --- a/src/Content/Conversation/Factory/UserDefinedChannel.php +++ b/src/Content/Conversation/Factory/UserDefinedChannel.php @@ -22,18 +22,9 @@ namespace Friendica\Content\Conversation\Factory; use Friendica\Content\Conversation\Collection\Timelines; -use Friendica\Content\Conversation\Repository\Channel as ChannelRepository; -use Friendica\Core\Config\Capability\IManageConfigValues; -use Friendica\Core\L10n; -use Psr\Log\LoggerInterface; final class UserDefinedChannel extends Timeline { - public function __construct(ChannelRepository $channel, L10n $l10n, LoggerInterface $logger, IManageConfigValues $config) - { - parent::__construct($channel, $l10n, $logger, $config); - } - /** * List of available user defined channels * @@ -42,6 +33,7 @@ final class UserDefinedChannel extends Timeline */ public function getForUser(int $uid): Timelines { + $tabs = []; foreach ($this->channelRepository->selectByUid($uid) as $channel) { $tabs[] = $channel; }