Update nc vue components to v7

babel.config.js

@@ -0,0 +1,3 @@
+const babelConfig = require('@nextcloud/babel-config')
+
+module.exports = babelConfig

lib/AppInfo/Application.php

@@ -37,11 +37,13 @@
 use OCA\Social\Service\ConfigService;
 use OCA\Social\Service\UpdateService;
 use OCA\Social\WellKnown\WebfingerHandler;
+use OCA\Social\Listeners\ProfileSectionListener;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\QueryException;
+use OCP\Profile\BeforeTemplateRenderedEvent;
 use OCP\IDBConnection;
 use OCP\IServerContainer;
 use OC\DB\SchemaWrapper;
@@ -62,19 +64,12 @@ public function __construct(array $params = []) {
 		parent::__construct(self::APP_NAME, $params);
 	}
 
-
-	/**
-	 * @param IRegistrationContext $context
-	 */
 	public function register(IRegistrationContext $context): void {
 		$context->registerSearchProvider(UnifiedSearchProvider::class);
 		$context->registerWellKnownHandler(WebfingerHandler::class);
+		$context->registerEventListener(BeforeTemplateRenderedEvent::class, ProfileSectionListener::class);
 	}
 
-
-	/**
-	 * @param IBootContext $context
-	 */
 	public function boot(IBootContext $context): void {
 		$manager = $context->getServerContainer()
 						   ->getNotificationManager();

lib/Controller/LocalController.php

@@ -124,18 +124,26 @@ public function uploadAttachement(): DataResponse {
 	 *
 	 * @NoAdminRequired
 	 */
-	public function postCreate(array $data): DataResponse {
+	public function postCreate(string $content = '', $to = null, string $type = null, ?string $replyTo = null, $attachments = null, ?string $hashtags = null): DataResponse {
+		$content = $content ?? '';
+		$to = is_string($to) ? [$to] : $to;
+		$to = $to ?? [];
+		$replyTo = $replyTo ?? '';
+		$type = $type ?? Stream::TYPE_PUBLIC;
+		$hashtags = $hashtags === '' ? [] : $hashtags;
+		$hashtags = $hashtags ?? [];
+		$attachments = $attachments ?? [];
+
 		try {
 			$actor = $this->accountService->getActorFromUserId($this->userId);
 
 			$post = new Post($actor);
-			$post->setContent($this->get('content', $data, ''));
-			$post->setReplyTo($this->get('replyTo', $data, ''));
-			$post->setTo($this->getArray('to', $data, []));
-			$post->addTo($this->get('to', $data, ''));
-			$post->setType($this->get('type', $data, Stream::TYPE_PUBLIC));
-			$post->setHashtags($this->getArray('hashtags', $data, []));
-			$post->setAttachments($this->getArray('attachments', $data, []));
+			$post->setContent($content);
+			$post->setReplyTo($replyTo);
+			$post->setTo($to);
+			$post->setType($type);
+			$post->setHashtags($hashtags);
+			$post->setAttachments($attachments);
 
 			$token = '';
 			$activity = $this->postService->createPost($post, $token);
@@ -151,7 +159,6 @@ public function postCreate(array $data): DataResponse {
 		}
 	}
 
-
 	/**
 	 * Get info about a post (limited to viewer rights).
 	 *

lib/Db/CoreRequestBuilder.php

@@ -46,7 +46,6 @@
 use OCA\Social\Service\ConfigService;
 use OCA\Social\Service\MiscService;
 use OCP\DB\QueryBuilder\IQueryBuilder;
-use OCP\DB\QueryBuilder\IQueryFunction;
 use OCP\IDBConnection;
 use OCP\IURLGenerator;
 use Psr\Log\LoggerInterface;
@@ -584,7 +583,7 @@ protected function filterDBField(
 	protected function exprLimitToDBField(
 		IQueryBuilder &$qb, string $field, string $value, bool $eq = true, bool $cs = true,
 		string $alias = ''
-	): IQueryFunction {
+	): string {
 		$expr = $qb->expr();
 
 		$pf = '';
@@ -618,7 +617,7 @@ protected function limitToDBFieldInt(
 
 	protected function exprLimitToDBFieldInt(
 		IQueryBuilder &$qb, string $field, int $value, string $alias = ''
-	): IQueryFunction {
+	): string {
 		$expr = $qb->expr();
 
 		$pf = '';

lib/Listeners/ProfileSectionListener.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+// SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+namespace OCA\Social\Listeners;
+
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\Profile\BeforeTemplateRenderedEvent;
+use OCP\Util;
+
+class ProfileSectionListener implements IEventListener {
+	public function handle(Event $event): void {
+		if (!($event instanceof BeforeTemplateRenderedEvent)) {
+			return;
+		}
+		Util::addScript('social', 'social-profilePage');
+	}
+}

lib/Service/CacheDocumentService.php

@@ -137,6 +137,24 @@ public function saveContentToCache(Document $document, string $content, string &
 		$document->setResizedCopy($resized);
 	}
 
+	public function saveFromTempToCache(Document $document, string $tmpPath) {
+		$mime = mime_content_type($tmpPath);
+
+		$this->filterMimeTypes($mime);
+
+		$document->setMediaType($mime);
+		$document->setMimeType($mime);
+
+		$file = fopen($tmpPath, 'r');
+		$content = fread($file, filesize($tmpPath));
+
+		$filename = $this->generateFileFromContent($content);
+		$document->setLocalCopy($filename);
+		$this->resizeImage($content);
+		$resized = $this->generateFileFromContent($content);
+		$document->setResizedCopy($resized);
+	}
+
 
 	/**
 	 * @param string $content

lib/Service/PostService.php

@@ -53,41 +53,28 @@
 use OCA\Social\Model\Post;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
+use Psr\Log\LoggerInterface;
 
 class PostService {
 	private StreamService $streamService;
-
 	private AccountService $accountService;
-
 	private ActivityService $activityService;
-
 	private CacheDocumentService $cacheDocumentService;
-
 	private ConfigService $configService;
-
 	private MiscService $miscService;
+	private LoggerInterface $logger;
 
-
-	/**
-	 * PostService constructor.
-	 *
-	 * @param StreamService $streamService
-	 * @param AccountService $accountService
-	 * @param ActivityService $activityService
-	 * @param CacheDocumentService $cacheDocumentService
-	 * @param ConfigService $configService
-	 * @param MiscService $miscService
-	 */
 	public function __construct(
 		StreamService $streamService, AccountService $accountService, ActivityService $activityService,
-		CacheDocumentService $cacheDocumentService, ConfigService $configService, MiscService $miscService
+		CacheDocumentService $cacheDocumentService, ConfigService $configService, MiscService $miscService, LoggerInterface $logger
 	) {
 		$this->streamService = $streamService;
 		$this->accountService = $accountService;
 		$this->activityService = $activityService;
 		$this->cacheDocumentService = $cacheDocumentService;
 		$this->configService = $configService;
 		$this->miscService = $miscService;
+		$this->logger = $logger;
 	}
 
 
@@ -142,15 +129,48 @@ public function createPost(Post $post, &$token = ''): ACore {
 	 */
 	private function generateDocumentsFromAttachments(Note $note, Post $post) {
 		$documents = [];
-		foreach ($post->getAttachments() as $attachment) {
+		\OC::$server->getLogger()->error(var_export($_FILES["attachments"], true));
+		if (!isset($_FILES['attachments'])) {
+			return [];
+		}
+		if (is_array($_FILES["attachments"]["error"])) {
+			foreach ($_FILES["attachments"]["error"] as $key => $error) {
+				if ($error == UPLOAD_ERR_OK) {
+					try {
+						$document = $this->generateDocumentFromAttachment($note, $key);
+
+						$service = AP::$activityPub->getInterfaceForItem($document);
+						$service->save($document);
+
+						$documents[] = $document;
+					} catch (Exception $e) {
+					}
+				}
+			}
+		} else {
 			try {
-				$document = $this->generateDocumentFromAttachment($note, $attachment);
+				$tmp_name = $_FILES["attachments"]["tmp_name"];
+				$name = basename($_FILES["attachments"]["name"]);
+				$tmpFile = tmpfile();
+				$tmpPath = stream_get_meta_data($tmpFile)['uri'];
+				if (move_uploaded_file($tmp_name, $tmpPath)) {
+					$document = new Document();
+					$document->setUrlCloud($this->configService->getCloudUrl());
+					$document->generateUniqueId('/documents/local');
+					$document->setParentId($note->getId());
+					$document->setPublic(true);
+
+					$this->cacheDocumentService->saveFromTempToCache($document, $tmpPath);
+				}
 
 				$service = AP::$activityPub->getInterfaceForItem($document);
 				$service->save($document);
 
 				$documents[] = $document;
 			} catch (Exception $e) {
+				$this->logger->error($e->getMessage(), [
+					'exception' => $e,
+				]);
 			}
 		}
 		$post->setDocuments($documents);
@@ -168,21 +188,21 @@ private function generateDocumentsFromAttachments(Note $note, Post $post) {
 	 * @throws SocialAppConfigException
 	 * @throws UrlCloudException
 	 */
-	private function generateDocumentFromAttachment(Note $note, string $attachment): Document {
-		list(, $data) = explode(';', $attachment);
-		list(, $data) = explode(',', $data);
-		$content = base64_decode($data);
-
+	private function generateDocumentFromAttachment(Note $note, int $key): Document {
+		$tmp_name = $_FILES["attachments"]["tmp_name"][$key];
+		$name = basename($_FILES["attachments"]["name"][$key]);
+		$tmpFile = tmpfile();
+		$tmpPath = stream_get_meta_data($tmpFile)['uri'];
+		if (move_uploaded_file($tmp_name, $tmpPath)) {
 			$document = new Document();
 			$document->setUrlCloud($this->configService->getCloudUrl());
 			$document->generateUniqueId('/documents/local');
 			$document->setParentId($note->getId());
 			$document->setPublic(true);
 
-		$mime = '';
-		$this->cacheDocumentService->saveLocalUploadToCache($document, $content, $mime);
-		$document->setMediaType($mime);
-		$document->setMimeType($mime);
+			$this->cacheDocumentService->saveFromTempToCache($document, $tmpPath);
+		}
+
 
 		return $document;
 	}

lib/Tools/Db/ExtendedQueryBuilder.php

@@ -42,7 +42,6 @@
 use OC\DB\QueryBuilder\QueryBuilder;
 use OCP\DB\QueryBuilder\ICompositeExpression;
 use OCP\DB\QueryBuilder\IQueryBuilder;
-use OCP\DB\QueryBuilder\IQueryFunction;
 
 /**
  * Class ExtendedQueryBuilder
@@ -174,7 +173,7 @@ public function filterDBField(string $field, string $value, bool $cs = true, str
 
 	public function exprLimitToDBField(
 		string $field, string $value, bool $eq = true, bool $cs = true, string $alias = ''
-	): IQueryFunction {
+	): string {
 		$expr = $this->expr();
 
 		$pf = '';
@@ -295,7 +294,7 @@ public function filterDBFieldInt(string $field, int $value, string $alias = '')
 	}
 
 	public function exprLimitToDBFieldInt(string $field, int $value, string $alias = '', bool $eq = true
-	): IQueryFunction {
+	): string {
 		$expr = $this->expr();
 
 		$pf = '';

lib/Tools/IExtendedQueryBuilder.php

@@ -35,7 +35,6 @@
 use Exception;
 use OCP\DB\QueryBuilder\ICompositeExpression;
 use OCP\DB\QueryBuilder\IQueryBuilder;
-use OCP\DB\QueryBuilder\IQueryFunction;
 
 /**
  * Interface IExtendedQueryBuilder
@@ -134,7 +133,7 @@ public function filterDBField(string $field, string $value, bool $cs = true, str
 
 	public function exprLimitToDBField(
 		string $field, string $value, bool $eq = true, bool $cs = true, string $alias = ''
-	): IQueryFunction;
+	): string;
 
 	public function limitToDBFieldArray(
 		string $field, array $values, bool $cs = true, string $alias = ''
@@ -191,7 +190,7 @@ public function filterDBFieldInt(string $field, int $value, string $alias = '');
 	 * @param int $value
 	 * @param string $alias
 	 */
-	public function exprLimitToDBFieldInt(string $field, int $value, string $alias = ''): IQueryFunction;
+	public function exprLimitToDBFieldInt(string $field, int $value, string $alias = ''): string;
 
 
 	/**