clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Issue 13909: Filter channels by network (#13924)

This commit is contained in:
Michael Vogel 2024-02-20 07:11:26 +01:00 committed by GitHub
parent d95c9d28a8
commit 71384e6f39
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
database.sql
View File

@ -1,6 +1,6 @@
-- ------------------------------------------
-- Friendica 2024.03-rc (Yellow Archangel)
-- DB_UPDATE_VERSION 1553
-- DB_UPDATE_VERSION 1554
-- ------------------------------------------
@ -1352,6 +1352,7 @@ CREATE TABLE IF NOT EXISTS `post-engagement` (
`searchtext` mediumtext COMMENT 'Simplified text for the full text search',
`size` int unsigned COMMENT 'Body size',
`created` datetime COMMENT '',
`network` char(4) 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',
`activities` mediumint unsigned COMMENT 'Number of activities (like, dislike, ...)',
@ -2123,6 +2124,7 @@ CREATE VIEW `post-searchindex-user-view` AS SELECT
`post-thread-user`.`commented` AS `commented`,
`post-thread-user`.`received` AS `received`,
`post-thread-user`.`created` AS `created`,
`post-thread-user`.`network` AS `network`,
`post-searchindex`.`language` AS `restricted`,
0 AS `comments`,
0 AS `activities`

1
doc/database/db_post-engagement.md
View File

@ -16,6 +16,7 @@ Fields
| searchtext | Simplified text for the full text search | mediumtext | YES | | NULL | |
| size | Body size | int unsigned | YES | | NULL | |
| created | | datetime | YES | | NULL | |
| network | | char(4) | 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 | |
| activities | Number of activities (like, dislike, ...) | mediumint unsigned | YES | | NULL | |

1
src/Model/Post/Engagement.php
View File

@ -118,6 +118,7 @@ class Engagement
'searchtext' => $searchtext,
'size' => self::getContentSize($parent),
'created' => $parent['created'],
'network' => $parent['network'],
'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]),
'activities' => DBA::count('post', [

2
src/Module/Conversation/Network.php
View File

@ -65,8 +65,6 @@ class Network extends Timeline
/** @var int */
protected $circleId;
/** @var string */
protected $network;
/** @var string */
protected $dateFrom;
/** @var string */
protected $dateTo;

6
src/Module/Conversation/Timeline.php
View File

@ -74,6 +74,8 @@ class Timeline extends BaseModule
protected $raw;
/** @var string */
protected $order;
/** @var string */
protected $network;
/** @var App\Mode $mode */
protected $mode;
@ -372,6 +374,10 @@ class Timeline extends BaseModule
$this->setMaxMinByOrder($request);
if (!empty($this->network)) {
$condition = DBA::mergeConditions($condition, ['network' => $this->network]);
}
if (($this->selectedTab != ChannelEntity::LANGUAGE) && !is_numeric($this->selectedTab)) {
$condition = $this->addLanguageCondition($uid, $condition);
}

3
static/dbstructure.config.php
View File

@ -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', 1553);
define('DB_UPDATE_VERSION', 1554);
}
return [
@ -1373,6 +1373,7 @@ return [
"searchtext" => ["type" => "mediumtext", "comment" => "Simplified text for the full text search"],
"size" => ["type" => "int unsigned", "comment" => "Body size"],
"created" => ["type" => "datetime", "comment" => ""],
"network" => ["type" => "char(4)", "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"],
"activities" => ["type" => "mediumint unsigned", "comment" => "Number of activities (like, dislike, ...)"],

1
static/dbview.config.php
View File

@ -154,6 +154,7 @@
"commented" => ["post-thread-user", "commented"],
"received" => ["post-thread-user", "received"],
"created" => ["post-thread-user", "created"],
"network" => ["post-thread-user", "network"],
"restricted" => ["post-searchindex", "language"],
"comments" => "0",
"activities" => "0",

7
update.php
View File

@ -1429,3 +1429,10 @@ function update_1552()
return Update::SUCCESS;
}
function update_1554()
{
DBA::e("UPDATE `post-engagement` INNER JOIN `post` ON `post`.`uri-id` = `post-engagement`.`uri-id` SET `post-engagement`.`network` = `post`.`network`");
return Update::SUCCESS;
}