Move Activity/Namespaces defines to constants

[friendica.git] / src / Object / Post.php

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 12de457a519590a709b9f5015cb87cc14efca42b..9f392cb82efb2aded92a10e08d195d056de757d7 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -7,6 +7,7 @@ namespace Friendica\Object;
 use Friendica\BaseObject;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Feature;
+use Friendica\Content\Item as ContentItem;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
@@ -239,7 +240,7 @@ class Post extends BaseObject
 
                $isevent = false;
                $attend = [];
-               if ($item['object-type'] === ACTIVITY_OBJ_EVENT) {
+               if ($item['object-type'] === Activity::OBJ_EVENT) {
                        $response_verbs[] = 'attendyes';
                        $response_verbs[] = 'attendno';
                        $response_verbs[] = 'attendmaybe';
@@ -324,7 +325,10 @@ class Post extends BaseObject
 
                $body = Item::prepareBody($item, true);
 
-               list($categories, $folders) = get_cats_and_terms($item);
+               /** @var ContentItem $contItem */
+               $contItem = self::getClass(ContentItem::class);
+
+               list($categories, $folders) = $contItem->determineCategoriesTerms($item);
 
                $body_e       = $body;
                $text_e       = strip_tags($body);
@@ -527,8 +531,8 @@ class Post extends BaseObject
                 */
                if ($item->getDataValue('network') === Protocol::MAIL && local_user() != $item->getDataValue('uid')) {
                        return false;
-               } elseif ($activity->match($item->getDataValue('verb'), ACTIVITY_LIKE) ||
-                         $activity->match($item->getDataValue('verb'), ACTIVITY_DISLIKE)) {
+               } elseif ($activity->match($item->getDataValue('verb'), Activity::LIKE) ||
+                         $activity->match($item->getDataValue('verb'), Activity::DISLIKE)) {
                        return false;
                }