diff options
| author | Mario <mario@mariovavti.com> | 2020-05-10 10:55:57 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-05-10 10:55:57 +0000 |
| commit | 3d02758fee664a67c8f15f4a7a885ae629d90cf0 (patch) | |
| tree | 87ef953dc6ab983be1084b3d9b8b496450945284 | |
| parent | f473b5abfbbac4a6cadaf6fc26ed5fd950987ed6 (diff) | |
| download | volse-hubzilla-3d02758fee664a67c8f15f4a7a885ae629d90cf0.tar.gz volse-hubzilla-3d02758fee664a67c8f15f4a7a885ae629d90cf0.tar.bz2 volse-hubzilla-3d02758fee664a67c8f15f4a7a885ae629d90cf0.zip | |
deal with diaspora uuid
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 2b88b6683..3287dd6fb 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -346,6 +346,7 @@ class Activity { $ret['id'] = ((strpos($i['mid'],'http') === 0) ? $i['mid'] : z_root() . '/item/' . urlencode($i['mid'])); + $ret['diaspora:guid'] = $i['uuid']; if($i['title']) $ret['name'] = $i['title']; @@ -1662,6 +1663,7 @@ class Activity { $s['aid'] = $channel['channel_account_id']; $s['uid'] = $channel['channel_id']; $s['mid'] = urldecode($act->obj['id']); + $s['uuid'] = $act->obj['diaspora:guid']; $s['plink'] = urldecode($act->obj['id']); @@ -1953,6 +1955,7 @@ class Activity { self::actor_store($act->actor['id'],$act->actor); $s['mid'] = $act->obj['id']; + $s['uuid'] = $act->obj['diaspora:guid']; $s['parent_mid'] = $act->parent_id; if($act->data['published']) { @@ -2400,11 +2403,6 @@ class Activity { $item['aid'] = $channel['channel_account_id']; $item['uid'] = $channel['channel_id']; - $s['uuid'] = ''; - - // Friendica sends the diaspora guid in a nonstandard field via AP - if($act->obj['diaspora:guid']) - $s['uuid'] = $act->obj['diaspora:guid']; if(! ( $item['author_xchan'] && $item['owner_xchan'])) { logger('owner or author missing.'); |