Merge remote-tracking branch 'upstream/develop' into move-delivery

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

diff --git a/src/Protocol/Activity.php b/src/Protocol/Activity.php
index 637669a61e8bc7acd3744db6f87c224d0e954687..7212e919410fb2f236d65e6d1c1375743490436c 100644 (file)
--- a/src/Protocol/Activity.php
+++ b/src/Protocol/Activity.php
@@ -163,15 +163,13 @@ final class Activity
         * @var string
         */
        const ANNOUNCE   = ActivityNamespace::ACTIVITY2 . 'Announce';
-
        /**
-        * Pokes an user.
+        * Indicates that the actor has read the object.
         *
-        * @see https://github.com/friendica/friendica/wiki/ActivityStreams#activity_poke
+        * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-read
         * @var string
         */
-       const POKE       = ActivityNamespace::ZOT . '/activity/poke';
-
+       const READ       = ActivityNamespace::ACTIVITY2 . 'read';
 
        const O_UNFOLLOW    = ActivityNamespace::OSTATUS . '/unfollow';
        const O_UNFAVOURITE = ActivityNamespace::OSTATUS . '/unfavorite';
@@ -183,6 +181,13 @@ final class Activity
         */
        const EMOJIREACT = ActivityNamespace::LITEPUB . '/emojireact';
 
+       /**
+        * 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,
         * in which case we handle them specially
@@ -195,6 +200,8 @@ final class Activity
                self::FOLLOW,
                self::ANNOUNCE,
                self::EMOJIREACT,
+               self::VIEW,
+               self::READ,
        ];
 
        /**
@@ -204,7 +211,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)) {
@@ -223,7 +230,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) &&