diff options
| author | Mario <mario@mariovavti.com> | 2024-02-02 20:23:06 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2024-02-02 20:23:06 +0000 |
| commit | fab3c92a7c881be049cba62a950e90732d8c1ec5 (patch) | |
| tree | cb4ab6b418fe24524d397cd0687eb28478eca975 | |
| parent | 8ad7376865b45f8943499c803a6014d961a73cb4 (diff) | |
| download | volse-hubzilla-fab3c92a7c881be049cba62a950e90732d8c1ec5.tar.gz volse-hubzilla-fab3c92a7c881be049cba62a950e90732d8c1ec5.tar.bz2 volse-hubzilla-fab3c92a7c881be049cba62a950e90732d8c1ec5.zip | |
streams collection branch compatibility
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 12 | ||||
| -rw-r--r-- | include/conversation.php | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 782773da3..089fb3687 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -1203,7 +1203,7 @@ class Activity { 'http://activitystrea.ms/schema/1.0/like' => 'Like', 'http://activitystrea.ms/schema/1.0/favorite' => 'Like', 'http://purl.org/zot/activity/dislike' => 'Dislike', - 'http://activitystrea.ms/schema/1.0/tag' => 'Add', + // 'http://activitystrea.ms/schema/1.0/tag' => 'Add', 'http://activitystrea.ms/schema/1.0/follow' => 'Follow', 'http://activitystrea.ms/schema/1.0/unfollow' => 'Unfollow', 'http://activitystrea.ms/schema/1.0/stop-following' => 'Unfollow', @@ -1213,7 +1213,9 @@ class Activity { 'Announce' => 'Announce', 'Invite' => 'Invite', 'Delete' => 'Delete', - 'Undo' => 'Undo' + 'Undo' => 'Undo', + 'Add' => 'Add', + 'Remove' => 'Remove' ]; call_hooks('activity_mapper', $acts); @@ -1252,7 +1254,7 @@ class Activity { 'http://activitystrea.ms/schema/1.0/like' => 'Like', 'http://activitystrea.ms/schema/1.0/favorite' => 'Like', 'http://purl.org/zot/activity/dislike' => 'Dislike', - 'http://activitystrea.ms/schema/1.0/tag' => 'Add', + // 'http://activitystrea.ms/schema/1.0/tag' => 'Add', 'http://activitystrea.ms/schema/1.0/follow' => 'Follow', 'http://activitystrea.ms/schema/1.0/unfollow' => 'Unfollow', 'http://activitystrea.ms/schema/1.0/stop-following' => 'Unfollow', @@ -1262,7 +1264,9 @@ class Activity { 'Announce' => 'Announce', 'Invite' => 'Invite', 'Delete' => 'Delete', - 'Undo' => 'Undo' + 'Undo' => 'Undo', + 'Add' => 'Add', + 'Remove' => 'Remove' ]; call_hooks('activity_decode_mapper', $acts); diff --git a/include/conversation.php b/include/conversation.php index 9683e02f0..c04e32999 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -457,6 +457,10 @@ function visible_activity($item) { return false; } + if (in_array($item['verb'], ['Add', 'Remove'])) { + return false; + } + foreach($hidden_activities as $act) { if((activity_match($item['verb'], $act)) && ($item['mid'] != $item['parent_mid'])) { return false; |