fixes

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

11 files changed, 5 insertions, 22 deletions

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 1fcd9d62..6a07ee14 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -18,7 +18,7 @@
 
 **🕸 Open standards:** We use the established ActivityPub standard!
 	]]></description>
-	<version>0.6.0-beta1</version>
+	<version>0.6.0-beta2</version>
 	<licence>agpl</licence>
 	<author mail="maxence@artificial-owl.com" homepage="https://artificial-owl.com/">Maxence Lange</author>
 	<author mail="jus@bitgrid.net">Julius Härtl</author>
diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php
index a577be45..b7aa1a60 100644
--- a/lib/Db/CoreRequestBuilder.php
+++ b/lib/Db/CoreRequestBuilder.php
@@ -1192,8 +1192,8 @@ class CoreRequestBuilder {
 		   ->selectAlias($prefix . '_f.follow_id', $prefix . '_follow_id')
 		   ->selectAlias($prefix . '_f.creation', $prefix . '_creation')
 		   ->leftJoin(
-			   $this->defaultSelectAlias, CoreRequestBuilder::TABLE_FOLLOWS, $prefix . '_f',
-			   $andX
+		   	$this->defaultSelectAlias, CoreRequestBuilder::TABLE_FOLLOWS, $prefix . '_f',
+		   	$andX
 		   );
 	}
 
diff --git a/lib/Migration/Version1000Date20221118000001.php b/lib/Migration/Version1000Date20221118000001.php
index 1b107707..89ddb82c 100644
--- a/lib/Migration/Version1000Date20221118000001.php
+++ b/lib/Migration/Version1000Date20221118000001.php
@@ -1020,7 +1020,7 @@ class Version1000Date20221118000001 extends SimpleMigrationStep {
 			]
 		);
 
-		$table->setPrimaryKey(['id_prim']);
+		$table->setPrimaryKey(['nid']);
 	}
 
 	/**
diff --git a/lib/Model/ActivityPub/Object/Document.php b/lib/Model/ActivityPub/Object/Document.php
index 7644b037..364824bc 100644
--- a/lib/Model/ActivityPub/Object/Document.php
+++ b/lib/Model/ActivityPub/Object/Document.php
@@ -386,5 +386,4 @@ class Document extends ACore implements JsonSerializable {
 
 		return $media;
 	}
-
 }
diff --git a/lib/Model/ActivityPub/Object/Note.php b/lib/Model/ActivityPub/Object/Note.php
index 1cd4701f..36fb1e8c 100644
--- a/lib/Model/ActivityPub/Object/Note.php
+++ b/lib/Model/ActivityPub/Object/Note.php
@@ -30,12 +30,8 @@ declare(strict_types=1);
 
 namespace OCA\Social\Model\ActivityPub\Object;
 
-use Exception;
 use JsonSerializable;
-use OCA\Social\AP;
-use OCA\Social\Exceptions\InvalidResourceEntryException;
 use OCA\Social\Exceptions\ItemAlreadyExistsException;
-use OCA\Social\Exceptions\ItemUnknownException;
 use OCA\Social\Model\ActivityPub\ACore;
 use OCA\Social\Model\ActivityPub\Stream;
 
diff --git a/lib/Model/ActivityPub/Stream.php b/lib/Model/ActivityPub/Stream.php
index 92607364..83cfeb3b 100644
--- a/lib/Model/ActivityPub/Stream.php
+++ b/lib/Model/ActivityPub/Stream.php
@@ -44,7 +44,6 @@ use OCA\Social\Model\ActivityPub\Object\Follow;
 use OCA\Social\Model\ActivityPub\Object\Image;
 use OCA\Social\Model\ActivityPub\Object\Like;
 use OCA\Social\Model\Client\MediaAttachment;
-use OCA\Social\Model\Post;
 use OCA\Social\Model\StreamAction;
 use OCA\Social\Tools\IQueryRow;
 use OCA\Social\Tools\Model\Cache;
diff --git a/lib/Model/Client/AttachmentMetaDim.php b/lib/Model/Client/AttachmentMetaDim.php
index 4cd7a789..d4d8d895 100644
--- a/lib/Model/Client/AttachmentMetaDim.php
+++ b/lib/Model/Client/AttachmentMetaDim.php
@@ -68,7 +68,7 @@ class AttachmentMetaDim implements JsonSerializable {
 		return $this;
 	}
 
-	public function getHeight(): int {
+	public function getHeight(): ?int {
 		return $this->height;
 	}
 
diff --git a/lib/Service/BlurService.php b/lib/Service/BlurService.php
index 6d1c241a..139aaa86 100644
--- a/lib/Service/BlurService.php
+++ b/lib/Service/BlurService.php
@@ -33,7 +33,6 @@ use GdImage;
 use kornrunner\Blurhash\Blurhash;
 
 class BlurService {
-
 	public function __construct() {
 	}
 
diff --git a/lib/Service/CacheDocumentService.php b/lib/Service/CacheDocumentService.php
index a1365196..4f8f0c04 100644
--- a/lib/Service/CacheDocumentService.php
+++ b/lib/Service/CacheDocumentService.php
@@ -219,8 +219,6 @@ class CacheDocumentService {
 
 	/**
 	 * @param string $content
-	 *
-	 * @return string
 	 */
 	private function resizeImage(Document $document, string &$content): void {
 		try {
diff --git a/lib/Service/DocumentService.php b/lib/Service/DocumentService.php
index 4e4de938..0b1cf72c 100644
--- a/lib/Service/DocumentService.php
+++ b/lib/Service/DocumentService.php
@@ -244,7 +244,6 @@ class DocumentService {
 
 
 	public function getByLocalId(int $id, string &$mimeType = '', bool $public = false): ISimpleFile {
-
 	}
 
 
diff --git a/lib/Service/StreamService.php b/lib/Service/StreamService.php
index 7a3704e2..a41ff8cd 100644
--- a/lib/Service/StreamService.php
+++ b/lib/Service/StreamService.php
@@ -282,13 +282,6 @@ class StreamService {
 	}
 
 
-	/**
-	 * @param Note $note
-	 * @param Document[] $documents
-	 */
-	public function addAttachments(Note $note, array $documents) {
-		$note->setAttachments($documents);
-	}
 
 
 	/**