Merge pull request #11959 from annando/notice

[friendica.git] / src / Protocol / Activity.php

diff --git a/src/Protocol/Activity.php b/src/Protocol/Activity.php
index bba7909fdf062f2eca6549eb7c080ba86691b6e2..ea1feeefee82c2d4259f05ac3e5c0ea1bc4ee2f8 100644 (file)
--- a/src/Protocol/Activity.php
+++ b/src/Protocol/Activity.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -164,17 +164,22 @@ final class Activity
         */
        const ANNOUNCE   = ActivityNamespace::ACTIVITY2 . 'Announce';
 
+       const O_UNFOLLOW    = ActivityNamespace::OSTATUS . '/unfollow';
+       const O_UNFAVOURITE = ActivityNamespace::OSTATUS . '/unfavorite';
+
        /**
-        * Pokes an user.
+        * React to a post via an emoji 
         *
-        * @see https://github.com/friendica/friendica/wiki/ActivityStreams#activity_poke
         * @var string
         */
-       const POKE       = ActivityNamespace::ZOT . '/activity/poke';
+       const EMOJIREACT = ActivityNamespace::LITEPUB . '/emojireact';
 
-
-       const O_UNFOLLOW    = ActivityNamespace::OSTATUS . '/unfollow';
-       const O_UNFAVOURITE = ActivityNamespace::OSTATUS . '/unfavorite';
+       /**
+        * View notification from Peertube
+        *
+        * @var string
+        */
+       const VIEW       = ActivityNamespace::PEERTUBE . '/view';
 
        /**
         * likes (etc.) can apply to other things besides posts. Check if they are post children,
@@ -183,10 +188,12 @@ final class Activity
         * Hidden activities, which doesn't need to be shown
         */
        const HIDDEN_ACTIVITIES = [
-               Activity::LIKE, Activity::DISLIKE,
-               Activity::ATTEND, Activity::ATTENDNO, Activity::ATTENDMAYBE,
-               Activity::FOLLOW,
-               Activity::ANNOUNCE,
+               self::LIKE, self::DISLIKE,
+               self::ATTEND, self::ATTENDNO, self::ATTENDMAYBE,
+               self::FOLLOW,
+               self::ANNOUNCE,
+               self::EMOJIREACT,
+               self::VIEW,
        ];
 
        /**
@@ -196,7 +203,7 @@ final class Activity
         *
         * @return bool True, if the activity is hidden
         */
-       public function isHidden(string $activity)
+       public function isHidden(string $activity): bool
        {
                foreach (self::HIDDEN_ACTIVITIES as $hiddenActivity) {
                        if ($this->match($activity, $hiddenActivity)) {
@@ -215,7 +222,7 @@ final class Activity
         *
         * @return boolean
         */
-       public function match(string $haystack, string $needle)
+       public function match(string $haystack, string $needle): bool
        {
                return (($haystack === $needle) ||
                        ((basename($needle) === $haystack) &&