friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #5839 from annando/like-owner 

The owner of a "like" should be the author
This commit is contained in:
Tobias Diekershoff 2018-10-06 11:09:42 +02:00 committed by GitHub
parent c7bbe08a48 510032444f
commit 5014779052
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Model/Item.php
View File

@ -3111,7 +3111,7 @@ class Item extends BaseObject
return true; return true;
} }
$objtype = $item['resource-id'] ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE ; $objtype = $item['resource-id'] ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE;
$new_item = [ $new_item = [
'guid' => System::createUUID(), 'guid' => System::createUUID(),
@ -3125,7 +3125,7 @@ class Item extends BaseObject
'parent' => $item['id'], 'parent' => $item['id'],
'parent-uri' => $item['uri'], 'parent-uri' => $item['uri'],
'thr-parent' => $item['uri'], 'thr-parent' => $item['uri'],
'owner-id' => $item['owner-id'], 'owner-id' => $author_id,
'author-id' => $author_id, 'author-id' => $author_id,
'body' => $activity, 'body' => $activity,
'verb' => $activity, 'verb' => $activity,

7
src/Protocol/Diaspora.php
View File

@ -1969,11 +1969,8 @@ class Diaspora
$datarray["contact-id"] = $author_contact["cid"]; $datarray["contact-id"] = $author_contact["cid"];
$datarray["network"] = $author_contact["network"]; $datarray["network"] = $author_contact["network"];
$datarray["author-link"] = $person["url"]; $datarray["owner-link"] = $datarray["author-link"] = $person["url"];
$datarray["author-id"] = Contact::getIdForURL($person["url"], 0); $datarray["owner-id"] = $datarray["author-id"] = Contact::getIdForURL($person["url"], 0);
$datarray["owner-link"] = $contact["url"];
$datarray["owner-id"] = Contact::getIdForURL($contact["url"], 0);
$datarray["guid"] = $guid; $datarray["guid"] = $guid;
$datarray["uri"] = self::getUriFromGuid($author, $guid); $datarray["uri"] = self::getUriFromGuid($author, $guid);