X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FObject%2FThread.php;h=6b31ad7049bb2165a629879d3dd05c03ef9e988d;hb=ab5a447bc2261522d0f5560f8933dd928a6fc6e3;hp=b6d92e743c823b40c9b07f93930d53a159ecedb3;hpb=50da89d861dce3b648c8f9e5c1e4c480ee320a43;p=friendica.git

diff --git a/src/Object/Thread.php b/src/Object/Thread.php
index b6d92e743c..6b31ad7049 100644
--- a/src/Object/Thread.php
+++ b/src/Object/Thread.php
@@ -1,25 +1,40 @@
 <?php
 /**
- * @file src/Object/Thread.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Object;
 
-use Friendica\BaseObject;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
-use Friendica\Object\Post;
-use Friendica\Util\Security;
-
-require_once 'boot.php';
-require_once 'include/text.php';
+use Friendica\DI;
+use Friendica\Protocol\Activity;
+use Friendica\Security\Security;
 
 /**
  * A list of threads
  *
  * We should think about making this a SPL Iterator
  */
-class Thread extends BaseObject
+class Thread
 {
+	/** @var Post[] */
 	private $parents = [];
 	private $mode = null;
 	private $writable = false;
@@ -29,9 +44,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)
 	{
@@ -42,10 +58,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)
 	{
@@ -53,7 +70,7 @@ class Thread extends BaseObject
 			return;
 		}
 
-		$a = self::getApp();
+		$a = DI::app();
 
 		switch ($mode) {
 			case 'network':
@@ -62,7 +79,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':
@@ -128,10 +145,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)
 	{
@@ -155,7 +173,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;
 		}
@@ -171,16 +189,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')) {