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

Merge pull request #11855 from annando/contact-id2 

The contact-id of a wall posting is always the owner contact
This commit is contained in:
Hypolite Petovan 2022-08-22 04:26:45 -04:00 committed by GitHub
parent 17a394e23c 2a0ca80630
commit 2957a3def6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Model/Item.php
View File

@ -451,6 +451,12 @@ class Item
if ($item['uid'] == 0) {
return $item['author-id'];
}
if ($item['origin']) {
$owner = User::getOwnerDataById($item['uid']);
return $owner['id'];
}
if (!empty($item['causer-id']) && Contact::isSharing($item['causer-id'], $item['uid'], true)) {
$cdata = Contact::getPublicAndUserContactID($item['causer-id'], $item['uid']);
if (!empty($cdata['user'])) {
@ -930,9 +936,7 @@ class Item
Contact::checkAvatarCache($item['author-id']);
Contact::checkAvatarCache($item['owner-id']);
if (!Contact::isSharing($item['contact-id'], $item['uid'])) {
$item['contact-id'] = self::contactId($item);
}
$item['contact-id'] = self::contactId($item);
if (!empty($item['direction']) && in_array($item['direction'], [Conversation::PUSH, Conversation::RELAY]) &&
empty($item['origin']) && self::isTooOld($item)) {