Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-09 23:02:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix: Saving of channel languages

Browse source
This commit is contained in:
Michael 2024-02-03 11:01:17 +00:00
parent b6e958fdcf
commit f1efb8d277
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Module/Conversation/Timeline.php
View file

@ -275,6 +275,9 @@ class Timeline extends BaseModule
{ {
$uid = $this->session->getLocalUserId(); $uid = $this->session->getLocalUserId();
$table = 'post-engagement';
$fields = ['uri-id', 'created', 'owner-id', 'comments', 'activities'];
if ($this->selectedTab == ChannelEntity::WHATSHOT) { if ($this->selectedTab == ChannelEntity::WHATSHOT) {
if (!is_null($this->accountType)) { if (!is_null($this->accountType)) {
$condition = ["(`comments` > ? OR `activities` > ?) AND `contact-type` = ?", $this->getMedianComments($uid, 4), $this->getMedianActivities($uid, 4), $this->accountType]; $condition = ["(`comments` > ? OR `activities` > ?) AND `contact-type` = ?", $this->getMedianComments($uid, 4), $this->getMedianActivities($uid, 4), $this->accountType];
@ -327,15 +330,17 @@ class Timeline extends BaseModule
$condition = ["`language` = ?", User::getLanguageCode($uid)]; $condition = ["`language` = ?", User::getLanguageCode($uid)];
} elseif (is_numeric($this->selectedTab)) { } elseif (is_numeric($this->selectedTab)) {
$condition = $this->getUserChannelConditions($this->selectedTab, $uid); $condition = $this->getUserChannelConditions($this->selectedTab, $uid);
//$table = 'post-searchindex';
//$fields = ['uri-id', 'created', 'owner-id'];
} }
if (($this->selectedTab != ChannelEntity::LANGUAGE) && !is_numeric($this->selectedTab)) { if (($this->selectedTab != ChannelEntity::LANGUAGE) && !is_numeric($this->selectedTab)) {
$condition = $this->addLanguageCondition($uid, $condition); $condition = $this->addLanguageCondition($uid, $condition);
} }
$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 `restricted` OR EXISTS(SELECT `id` FROM `post-user` WHERE `uid` = ? AND `uri-id` = `$table`.`uri-id`))", $uid]);
$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]); $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]);
if (($this->selectedTab != ChannelEntity::WHATSHOT) && !is_null($this->accountType)) { if (($this->selectedTab != ChannelEntity::WHATSHOT) && !is_null($this->accountType)) {
$condition = DBA::mergeConditions($condition, ['contact-type' => $this->accountType]); $condition = DBA::mergeConditions($condition, ['contact-type' => $this->accountType]);
@ -347,7 +352,7 @@ class Timeline extends BaseModule
$condition = DBA::mergeConditions($condition, ['uri-id' => $this->itemUriId]); $condition = DBA::mergeConditions($condition, ['uri-id' => $this->itemUriId]);
} else { } else {
if ($this->noSharer) { 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` = `post-engagement`.`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` = `$table`.`uri-id`)", $this->session->getLocalUserId()]);
} }
if (isset($this->maxId)) { if (isset($this->maxId)) {
@ -365,7 +370,7 @@ class Timeline extends BaseModule
} }
$items = []; $items = [];
$result = $this->database->select('post-engagement', ['uri-id', 'created', 'owner-id', 'comments', 'activities'], $condition, $params); $result = $this->database->select($table, $fields, $condition, $params);
if ($this->database->errorNo()) { if ($this->database->errorNo()) {
throw new \Exception($this->database->errorMessage(), $this->database->errorNo()); throw new \Exception($this->database->errorMessage(), $this->database->errorNo());
} }

2
src/Module/Settings/Channels.php
View file

@ -101,7 +101,7 @@ class Channels extends BaseSettings
continue; continue;
} }
if (!array_diff((array)$request['languages'][$id], $channel_languages)) { if (!array_diff((array)$request['languages'][$id], $channel_languages) && (count((array)$request['languages'][$id]) == count($channel_languages))) {
$request['languages'][$id] = null; $request['languages'][$id] = null;
} }