diff options
| author | Mario <mario@mariovavti.com> | 2021-03-14 09:01:12 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-03-14 10:03:03 +0100 |
| commit | 97c7b010edd30087a98ee61183934dccfdc357a2 (patch) | |
| tree | d6b4c3e4110091b38b412df8e420407d40f758f2 /Zotlabs/Lib | |
| parent | b9e1c38773d761a85132e6656995431b3e5980dd (diff) | |
| download | volse-hubzilla-97c7b010edd30087a98ee61183934dccfdc357a2.tar.gz volse-hubzilla-97c7b010edd30087a98ee61183934dccfdc357a2.tar.bz2 volse-hubzilla-97c7b010edd30087a98ee61183934dccfdc357a2.zip | |
mod subthread issue continued
(cherry picked from commit b6d30f67345f37dae8dfffd96b065e6139364bcd)
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 9370c2aa5..882bf4a1c 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -379,6 +379,8 @@ class Activity { $ret = []; + + if ($i['verb'] === ACTIVITY_FRIEND) { // Hubzilla 'make-friend' activity, no direct mapping from AS1 to AS2 - make it a note $objtype = 'Note'; @@ -724,7 +726,6 @@ class Activity { $ret = []; $reply = false; - if ($i['verb'] === ACTIVITY_FRIEND) { // Hubzilla 'make-friend' activity, no direct mapping from AS1 to AS2 - make it a note $ret['obj'] = []; @@ -2098,6 +2099,15 @@ class Activity { static function decode_note($act) { + // Within our family of projects, Follow/Unfollow of a thread is an internal activity which should not be transmitted, + // hence if we receive it - ignore or reject it. + // Unfollow is not defined by ActivityStreams, which prefers Undo->Follow. + // This may have to be revisited if AP projects start using Follow for objects other than actors. + + if (in_array($act->type, [ 'Follow', 'Unfollow' ])) { + return false; + } + $response_activity = false; $s = []; |