Revert test changes / added saving of languages

diff --git a/src/Content/Conversation/Repository/UserDefinedChannel.php b/src/Content/Conversation/Repository/UserDefinedChannel.php
index 6515bc71967ba9826eb5f8cad7837c9f20331f1e..78386f890a1479e6d21ef85bfa163fbc202e67a5 100644 (file)
--- a/src/Content/Conversation/Repository/UserDefinedChannel.php
+++ b/src/Content/Conversation/Repository/UserDefinedChannel.php
@@ -134,7 +134,7 @@ class UserDefinedChannel extends \Friendica\BaseRepository
                        'max-size'         => $Channel->maxSize,
                        'full-text-search' => $Channel->fullTextSearch,
                        'media-type'       => $Channel->mediaType,
-                       'languages'        => serialize($Channel->languages),
+                       'languages'        => !empty($Channel->languages) ? serialize($Channel->languages) : null,
                        'publish'          => $Channel->publish,
                        'valid'            => $this->isValid($Channel->fullTextSearch),
                ];

diff --git a/src/Module/Conversation/Timeline.php b/src/Module/Conversation/Timeline.php
index fc9b138ef64d1b7259e6a454d272c64420bb9f40..ca3957e4a26c078c3012426986efb67089fbe9ed 100644 (file)
--- a/src/Module/Conversation/Timeline.php
+++ b/src/Module/Conversation/Timeline.php
@@ -275,9 +275,6 @@ class Timeline extends BaseModule
        {
                $uid = $this->session->getLocalUserId();
 
-               $table  = 'post-engagement';
-               $fields = ['uri-id', 'created', 'owner-id', 'comments', 'activities'];
-
                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];
@@ -330,17 +327,15 @@ class Timeline extends BaseModule
                        $condition = ["`language` = ?", User::getLanguageCode($uid)];
                } elseif (is_numeric($this->selectedTab)) {
                        $condition = $this->getUserChannelConditions($this->selectedTab, $uid);
-                       //$table  = 'post-searchindex';
-                       //$fields = ['uri-id', 'created', 'owner-id'];
                }
 
                if (($this->selectedTab != ChannelEntity::LANGUAGE) && !is_numeric($this->selectedTab)) {
                        $condition = $this->addLanguageCondition($uid, $condition);
                }
 
-               $condition = DBA::mergeConditions($condition, ["(NOT `restricted` OR EXISTS(SELECT `id` FROM `post-user` WHERE `uid` = ? AND `uri-id` = `$table`.`uri-id`))", $uid]);
+               $condition = DBA::mergeConditions($condition, ["(NOT `restricted` OR EXISTS(SELECT `id` FROM `post-user` WHERE `uid` = ? AND `uri-id` = `'post-engagement'`.`uri-id`))", $uid]);
 
-               $condition = DBA::mergeConditions($condition, ["NOT EXISTS(SELECT `cid` FROM `user-contact` WHERE `uid` = ? AND `cid` = `$table`.`owner-id` AND (`ignored` OR `blocked` OR `collapsed` OR `is-blocked` OR `channel-frequency` = ?))", $uid, Contact\User::FREQUENCY_NEVER]);
+               $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 != ChannelEntity::WHATSHOT) && !is_null($this->accountType)) {
                        $condition = DBA::mergeConditions($condition, ['contact-type' => $this->accountType]);
@@ -352,7 +347,7 @@ class Timeline extends BaseModule
                        $condition = DBA::mergeConditions($condition, ['uri-id' => $this->itemUriId]);
                } else {
                        if ($this->noSharer) {
-                               $condition = DBA::mergeConditions($condition, ["NOT `uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE `post-user`.`uid` = ? AND `post-user`.`uri-id` = `$table`.`uri-id`)", $this->session->getLocalUserId()]);
+                               $condition = DBA::mergeConditions($condition, ["NOT `uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE `post-user`.`uid` = ? AND `post-user`.`uri-id` = `'post-engagement'`.`uri-id`)", $this->session->getLocalUserId()]);
                        }
 
                        if (isset($this->maxId)) {
@@ -370,7 +365,7 @@ class Timeline extends BaseModule
                }
 
                $items = [];
-               $result = $this->database->select($table, $fields, $condition, $params);
+               $result = $this->database->select('post-engagement', ['uri-id', 'created', 'owner-id', 'comments', 'activities'], $condition, $params);
                if ($this->database->errorNo()) {
                        throw new \Exception($this->database->errorMessage(), $this->database->errorNo());
                }