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

Merge pull request #13234 from annando/unseen 

Fix: Unseen marker wasn't set / Don't mark activities as unseen
This commit is contained in:
Hypolite Petovan 2023-06-25 09:50:35 -04:00 committed by GitHub
parent ff1409e626 420bd9bcf9
commit 9f9898d47a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Model/Post/User.php
View File

@ -25,6 +25,8 @@ use Friendica\Database\DBA;
use \BadMethodCallException;
use Friendica\Database\Database;
use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Protocol\Activity;
class User
{
@ -49,8 +51,8 @@ class User
$fields['uri-id'] = $uri_id;
$fields['uid'] = $uid;
// Public posts are always seen
if ($uid == 0) {
// Public posts and activities (like, dislike, ...) are always seen
if ($uid == 0 || (($data['gravity'] == Item::GRAVITY_ACTIVITY) && ($data['verb'] != Activity::ANNOUNCE))) {
$fields['unseen'] = false;
}

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

@ -471,7 +471,7 @@ class Network extends BaseModule
}
if (DBA::isResult($items)) {
$parents = array_column($items, 'parent-uri-id');
$parents = array_column($items, 'uri-id');
} else {
$parents = [];
}