friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #14068 from annando/wall-read 

Don't set posts to seen on channel ping
pull/14069/head
Hypolite Petovan 2024-04-02 21:22:13 -04:00 committed by GitHub
parent c8fff8c50c 626ab7cb54
commit c71f4eb1df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -378,6 +378,11 @@ class Network extends Timeline
} }
} }
protected function setPing(bool $ping)
{
$this->ping = $ping;
}
protected function getItems() protected function getItems()
{ {
$conditionFields = ['uid' => $this->session->getLocalUserId()]; $conditionFields = ['uid' => $this->session->getLocalUserId()];

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

@ -71,6 +71,8 @@ class Timeline extends BaseModule
/** @var bool */ /** @var bool */
protected $update; protected $update;
/** @var bool */ /** @var bool */
protected $ping;
/** @var bool */
protected $raw; protected $raw;
/** @var string */ /** @var string */
protected $order; protected $order;
@ -823,7 +825,7 @@ class Timeline extends BaseModule
*/ */
protected function setItemsSeenByCondition(array $condition) protected function setItemsSeenByCondition(array $condition)
{ {
if (empty($condition)) { if (empty($condition) || $this->ping) {
return; return;
} }

1
src/Module/Ping/Network.php
View File

@ -46,6 +46,7 @@ class Network extends NetworkModule
System::httpExit(''); System::httpExit('');
} }
$this->setPing(true);
$this->itemsPerPage = 100; $this->itemsPerPage = 100;
if ($this->channel->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())) {