diff options
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 80 | ||||
| -rw-r--r-- | Zotlabs/Lib/ActivityStreams.php | 2 | ||||
| -rw-r--r-- | include/feedutils.php | 7 |
3 files changed, 64 insertions, 25 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 7e6f7d42d..a93ad9d23 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -1523,22 +1523,31 @@ class Activity { } - static function actor_store($url, $person_obj, $force = false) { + static function actor_store($url, $person_obj = null, $force = false) { + + if ($person_obj === null) { + $tgt = self::fetch($url); + if (is_array($tgt) && ActivityStreams::is_an_actor($tgt['type'])) { + self::actor_store($tgt['id'], $tgt); + } + return; + } if (!is_array($person_obj)) { return; } /* not implemented - if (array_key_exists('movedTo',$person_obj) && $person_obj['movedTo'] && ! is_array($person_obj['movedTo'])) { - $tgt = self::fetch($person_obj['movedTo']); - if (is_array($tgt)) { - self::actor_store($person_obj['movedTo'],$tgt); - ActivityPub::move($person_obj['id'],$tgt); - } - return; - } + if (array_key_exists('movedTo',$person_obj) && $person_obj['movedTo'] && ! is_array($person_obj['movedTo'])) { + $tgt = self::fetch($person_obj['movedTo']); + if (is_array($tgt)) { + self::actor_store($person_obj['movedTo'],$tgt); + ActivityPub::move($person_obj['id'],$tgt); + } + return; + } */ + $ap_hubloc = null; $hublocs = self::get_actor_hublocs($url); @@ -2281,12 +2290,6 @@ class Activity { } } - if ($act->type === 'Announce') { - $s['author_xchan'] = $obj_actor['id']; - $s['mid'] = $act->obj['id']; - $s['parent_mid'] = $act->obj['id']; - } - if ($act->type === 'emojiReaction') { $content['content'] = (($act->tgt && $act->tgt['type'] === 'Image') ? '[img=32x32]' . $act->tgt['url'] . '[/img]' : '&#x' . $act->tgt['name'] . ';'); } @@ -2465,12 +2468,17 @@ class Activity { $s['comments_closed'] = datetime_convert('UTC', 'UTC', $act->obj['closed']); } + if (!$response_activity) { + if ($act->type === 'Announce') { + $s['author_xchan'] = self::get_attributed_to_actor_url($act); + $s['mid'] = $act->obj['id']; + $s['parent_mid'] = $act->obj['id']; + } - // we will need a hook here to extract magnet links e.g. peertube - // right now just link to the largest mp4 we find that will fit in our - // standard content region + // we will need a hook here to extract magnet links e.g. peertube + // right now just link to the largest mp4 we find that will fit in our + // standard content region - if (!$response_activity) { if ($act->obj['type'] === 'Video') { $vtypes = [ @@ -2766,6 +2774,7 @@ class Activity { set_iconfig($s, 'activitypub', 'recips', $act->raw_recips); + $hookinfo = [ 'act' => $act, 's' => $s @@ -2775,6 +2784,8 @@ class Activity { $s = $hookinfo['s']; + + return $s; } @@ -3982,4 +3993,35 @@ class Activity { return $ret; } + static function get_attributed_to_actor_url($act) { + + $url = ''; + + if (!isset($act->obj['attributedTo'])) { + return $url; + } + + if (is_string($act->obj['attributedTo'])) { + $url = $act->obj['attributedTo']; + } + + if (is_array($act->obj['attributedTo'])) { + foreach($act->obj['attributedTo'] as $a) { + if (is_array($a) && isset($a['type']) && $a['type'] === 'Person') { + if (isset($a['id'])) { + $url = $a['id']; + break; + } + } + elseif (is_string($a)) { + $url = $a; + break; + } + } + } + + return $url; + + } + } diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php index fc580e9aa..a07fdacb7 100644 --- a/Zotlabs/Lib/ActivityStreams.php +++ b/Zotlabs/Lib/ActivityStreams.php @@ -294,7 +294,7 @@ class ActivityStreams { if (!$s) { return false; } - return (in_array($s, ['Like', 'Dislike', 'Flag', 'Block', 'Announce', 'Accept', 'Reject', 'TentativeAccept', 'TentativeReject', 'emojiReaction', 'EmojiReaction', 'EmojiReact'])); + return (in_array($s, ['Like', 'Dislike', 'Flag', 'Block', 'Accept', 'Reject', 'TentativeAccept', 'TentativeReject', 'emojiReaction', 'EmojiReaction', 'EmojiReact'])); } /** diff --git a/include/feedutils.php b/include/feedutils.php index 33bacc2bb..814e9c163 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -271,11 +271,8 @@ function get_atom_author($feed, $item) { $found_author = $item->get_author(); if($found_author) { $rawauthor = $feed->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'author'); - hz_syslog('rawauthor: ' . print_r($rawauthor, true)); - - if($rawauthor) { - if(isset($rawauthor[0]['child'][NAMESPACE_POCO]['displayName'][0]['data'])) - $author['full_name'] = unxmlify($rawauthor[0]['child'][NAMESPACE_POCO]['displayName'][0]['data']); + if(isset($rawauthor[0]['child'][NAMESPACE_POCO]['displayName'][0]['data'])) { + $author['full_name'] = unxmlify($rawauthor[0]['child'][NAMESPACE_POCO]['displayName'][0]['data']); } $author['author_name'] = unxmlify($found_author->get_name()); |