Replace BaseObject class with DI::* calls

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

diff --git a/src/Object/Thread.php b/src/Object/Thread.php
index c36aa8ea6e9390301896f7b6f402a88e4a32ff80..f88dee2c41262357e266b706fb6b581aa173e232 100644 (file)
--- a/src/Object/Thread.php
+++ b/src/Object/Thread.php
@@ -4,9 +4,10 @@
  */
 namespace Friendica\Object;
 
-use Friendica\BaseObject;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\DI;
+use Friendica\Protocol\Activity;
 use Friendica\Util\Security;
 
 /**
@@ -14,7 +15,7 @@ use Friendica\Util\Security;
  *
  * We should think about making this a SPL Iterator
  */
-class Thread extends BaseObject
+class Thread
 {
        private $parents = [];
        private $mode = null;
@@ -51,7 +52,7 @@ class Thread extends BaseObject
                        return;
                }
 
-               $a = self::getApp();
+               $a = DI::app();
 
                switch ($mode) {
                        case 'network':
@@ -154,7 +155,7 @@ class Thread extends BaseObject
                        return false;
                }
 
-               if ($item->getDataValue('verb') === ACTIVITY_LIKE || $item->getDataValue('verb') === ACTIVITY_DISLIKE) {
+               if ($item->getDataValue('verb') === Activity::LIKE || $item->getDataValue('verb') === Activity::DISLIKE) {
                        Logger::log('[WARN] Conversation::addThread : Thread is a (dis)like ('. $item->getId() .').', Logger::DEBUG);
                        return false;
                }
@@ -170,7 +171,7 @@ class Thread extends BaseObject
         *
         * We should find a way to avoid using those arguments (at least most of them)
         *
-        * @param object $conv_responses data
+        * @param array $conv_responses data
         *
         * @return mixed The data requested on success
         *               false on failure
@@ -178,9 +179,7 @@ class Thread extends BaseObject
         */
        public function getTemplateData($conv_responses)
        {
-               $a = self::getApp();
                $result = [];
-               $i = 0;
 
                foreach ($this->parents as $item) {
                        if ($item->getDataValue('network') === Protocol::MAIL && local_user() != $item->getDataValue('uid')) {