X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FObject%2FThread.php;h=4eda1f8f7eedd2c730b36f26c9613b2d3774c2a6;hb=b543ee8ac78168328c7a7f2d725ee01bb333e941;hp=0068fa2fb9d7ac81ddadd78f409a45207b07fb49;hpb=7efde8e334d6ca52fd1608fb9a78babcea4bdc9f;p=friendica.git

diff --git a/src/Object/Thread.php b/src/Object/Thread.php
index 0068fa2fb9..4eda1f8f7e 100644
--- a/src/Object/Thread.php
+++ b/src/Object/Thread.php
@@ -7,7 +7,7 @@ namespace Friendica\Object;
 use Friendica\BaseObject;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
-use Friendica\Object\Post;
+use Friendica\Protocol\Activity;
 use Friendica\Util\Security;
 
 /**
@@ -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)
 	{
@@ -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')) {