keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into user-defined-channels

Browse source
This commit is contained in:
Michael 2023-09-20 14:14:35 +00:00
commit 1ec8b62b58
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Module/Conversation/Network.php
View file

@ -348,14 +348,16 @@ class Network extends Timeline
$this->order = 'commented'; $this->order = 'commented';
} }
$this->selectedTab = $this->selectedTab ?? $this->order;
// Upon updates in the background and order by last comment we order by received date, // 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. // 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 == TimelineEntity::COMMENTED)) {
$this->order = 'received'; $this->order = 'received';
$request['last_received'] = $request['last_commented'] ?? null;
$request['first_received'] = $request['first_commented'] ?? null;
} }
$this->selectedTab = $this->selectedTab ?? $this->order;
// Prohibit combined usage of "star" and "mention" // Prohibit combined usage of "star" and "mention"
if ($this->selectedTab == TimelineEntity::STAR) { if ($this->selectedTab == TimelineEntity::STAR) {
$this->mention = false; $this->mention = false;