ReWork Notification Model/Module/Object/Repository/Factory

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

diff --git a/src/Object/Thread.php b/src/Object/Thread.php
index 0068fa2fb9d7ac81ddadd78f409a45207b07fb49..0d0def06120927c00b57f664b9494316b2af2cd4 100644 (file)
--- a/src/Object/Thread.php
+++ b/src/Object/Thread.php
@@ -4,10 +4,10 @@
  */
 namespace Friendica\Object;
 
-use Friendica\BaseObject;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
-use Friendica\Object\Post;
+use Friendica\DI;
+use Friendica\Protocol\Activity;
 use Friendica\Util\Security;
 
 /**
@@ -15,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;
@@ -26,9 +26,10 @@ class Thread extends BaseObject
        /**
         * Constructor
         *
-        * @param string  $mode    The mode
-        * @param boolean $preview Are we in the preview mode?
+        * @param string  $mode     The mode
+        * @param boolean $preview  Are we in the preview mode?
         * @param boolean $writable Override the writable check
+        * @throws \Exception
         */
        public function __construct($mode, $preview, $writable = false)
        {
@@ -39,10 +40,11 @@ class Thread extends BaseObject
        /**
         * Set the mode we'll be displayed on
         *
-        * @param string $mode The mode to set
+        * @param string  $mode     The mode to set
         * @param boolean $writable Override the writable check
         *
         * @return void
+        * @throws \Exception
         */
        private function setMode($mode, $writable)
        {
@@ -50,7 +52,7 @@ class Thread extends BaseObject
                        return;
                }
 
-               $a = self::getApp();
+               $a = DI::app();
 
                switch ($mode) {
                        case 'network':
@@ -59,7 +61,7 @@ class Thread extends BaseObject
                                $this->writable = true;
                                break;
                        case 'profile':
-                               $this->profile_owner = $a->profile['profile_uid'];
+                               $this->profile_owner = $a->profile['uid'];
                                $this->writable = Security::canWriteToUserWall($this->profile_owner);
                                break;
                        case 'display':
@@ -125,10 +127,11 @@ class Thread extends BaseObject
        /**
         * Add a thread to the conversation
         *
-        * @param object $item The item to insert
+        * @param Post $item The item to insert
         *
         * @return mixed The inserted item on success
         *               false on failure
+        * @throws \Exception
         */
        public function addParent(Post $item)
        {
@@ -152,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;
                }
@@ -168,16 +171,15 @@ 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
+        * @throws \Exception
         */
        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')) {