mirror of
https://github.com/friendica/friendica
synced 2025-01-06 13:24:43 +00:00
Merge pull request #14068 from annando/wall-read
Don't set posts to seen on channel ping
This commit is contained in:
commit
c71f4eb1df
3 changed files with 9 additions and 1 deletions
|
@ -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()];
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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())) {
|
||||||
|
|
Loading…
Reference in a new issue