From f24442a1fb1be17daa4933e6d15765c0060913ab Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Tue, 17 Sep 2019 12:23:43 +0200
Subject: [PATCH] fixing/cleaning

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 lib/Db/CoreRequestBuilder.php                   | 11 ++++++-----
 lib/Db/StreamRequestBuilder.php                 | 10 +++++-----
 lib/Migration/Version0002Date20190916000001.php |  1 -
 lib/Model/ActivityPub/Item.php                  |  1 -
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php
index 040c1736..cac91ccb 100644
--- a/lib/Db/CoreRequestBuilder.php
+++ b/lib/Db/CoreRequestBuilder.php
@@ -74,7 +74,11 @@ class CoreRequestBuilder {
 	const TABLE_REQUEST_QUEUE = 'social_a2_request_queue';
 
 	const TABLE_ACTORS = 'social_a2_actors';
-	const TABLE_STREAMS = 'social_a2_stream';
+	const TABLE_STREAM = 'social_a2_stream';
+	const TABLE_STREAM_DEST = 'social_a2_stream_dest';
+	const TABLE_STREAM_QUEUE = 'social_a2_stream_queue';
+	const TABLE_STREAM_ACTIONS = 'social_a2_stream_action';
+
 	const TABLE_HASHTAGS = 'social_a2_hashtags';
 	const TABLE_FOLLOWS = 'social_a2_follows';
 	const TABLE_ACTIONS = 'social_a2_actions';
@@ -82,14 +86,11 @@ class CoreRequestBuilder {
 	const TABLE_CACHE_ACTORS = 'social_a2_cache_actors';
 	const TABLE_CACHE_DOCUMENTS = 'social_a2_cache_documts';
 
-	const TABLE_STREAM_QUEUE = 'social_a2_stream_queue';
-	const TABLE_STREAM_ACTIONS = 'social_a2_stream_action';
-
 	/** @var array */
 	private $tables = [
 		self::TABLE_REQUEST_QUEUE,
 		self::TABLE_ACTORS,
-		self::TABLE_STREAMS,
+		self::TABLE_STREAM,
 		self::TABLE_HASHTAGS,
 		self::TABLE_FOLLOWS,
 		self::TABLE_ACTIONS,
diff --git a/lib/Db/StreamRequestBuilder.php b/lib/Db/StreamRequestBuilder.php
index 45a6bc0f..d72c0cce 100644
--- a/lib/Db/StreamRequestBuilder.php
+++ b/lib/Db/StreamRequestBuilder.php
@@ -64,7 +64,7 @@ class StreamRequestBuilder extends CoreRequestBuilder {
 	 */
 	protected function getStreamInsertSql(): IQueryBuilder {
 		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->insert(self::TABLE_STREAMS);
+		$qb->insert(self::TABLE_STREAM);
 
 		return $qb;
 	}
@@ -77,7 +77,7 @@ class StreamRequestBuilder extends CoreRequestBuilder {
 	 */
 	protected function getStreamUpdateSql(): IQueryBuilder {
 		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->update(self::TABLE_STREAMS);
+		$qb->update(self::TABLE_STREAM);
 
 		return $qb;
 	}
@@ -99,7 +99,7 @@ class StreamRequestBuilder extends CoreRequestBuilder {
 			   's.object_id', 's.attributed_to', 's.in_reply_to', 's.source', 's.local',
 			   's.instances', 's.creation', 's.hidden_on_timeline', 's.details', 's.hashtags'
 		   )
-		   ->from(self::TABLE_STREAMS, 's');
+		   ->from(self::TABLE_STREAM, 's');
 
 		$this->defaultSelectAlias = 's';
 
@@ -115,7 +115,7 @@ class StreamRequestBuilder extends CoreRequestBuilder {
 	protected function countNotesSelectSql(): IQueryBuilder {
 		$qb = $this->dbConnection->getQueryBuilder();
 		$qb->selectAlias($qb->createFunction('COUNT(*)'), 'count')
-		   ->from(self::TABLE_STREAMS, 's');
+		   ->from(self::TABLE_STREAM, 's');
 
 		$this->defaultSelectAlias = 's';
 
@@ -130,7 +130,7 @@ class StreamRequestBuilder extends CoreRequestBuilder {
 	 */
 	protected function getStreamDeleteSql(): IQueryBuilder {
 		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->delete(self::TABLE_STREAMS);
+		$qb->delete(self::TABLE_STREAM);
 
 		return $qb;
 	}
diff --git a/lib/Migration/Version0002Date20190916000001.php b/lib/Migration/Version0002Date20190916000001.php
index 9000a06a..df87a3fe 100644
--- a/lib/Migration/Version0002Date20190916000001.php
+++ b/lib/Migration/Version0002Date20190916000001.php
@@ -231,7 +231,6 @@ class Version0002Date20190916000001 extends SimpleMigrationStep {
 				}
 			}
 		}
-
 	}
 
 }
diff --git a/lib/Model/ActivityPub/Item.php b/lib/Model/ActivityPub/Item.php
index a36ffe06..94e7b067 100644
--- a/lib/Model/ActivityPub/Item.php
+++ b/lib/Model/ActivityPub/Item.php
@@ -31,7 +31,6 @@ namespace OCA\Social\Model\ActivityPub;
 
 
 use daita\MySmallPhpTools\Traits\TArrayTools;
-use OCA\Social\Exceptions\ActorDoesNotExistException;
 use OCA\Social\Model\ActivityPub\Actor\Person;
 use OCA\Social\Model\InstancePath;