From 4c6c07dda1b7844f5a8fe9701d5d8c0c2c6bf248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Mon, 26 Nov 2018 14:27:59 +0100
Subject: [PATCH 01/13] Fix small composer bugs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 src/components/Composer.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/Composer.vue b/src/components/Composer.vue
index 4fc87134..f32b2ad1 100644
--- a/src/components/Composer.vue
+++ b/src/components/Composer.vue
@@ -61,7 +61,7 @@
 				<input :value="t('social', 'Post')" :disabled="post.length < 1" class="submit primary"
 					type="submit" title="" data-original-title="Post">
 				<div>
-					<button :class="currentVisibilityIconClass" @click="togglePopoverMenu" />
+					<button :class="currentVisibilityIconClass" @click.prevent="togglePopoverMenu" />
 					<div :class="{open: menuOpened}" class="popovermenu">
 						<PopoverMenu :menu="visibilityPopover" />
 					</div>
@@ -308,6 +308,9 @@ export default {
 						+ '<a href="' + item.original.url + '" target="_blank"><img src="' + item.original.avatar + '" />@' + item.original.value + '</a></span>'
 				},
 				values: (text, cb) => {
+					if (text.length < 1) {
+						cb([])
+					}
 					this.remoteSearch(text).then((result) => {
 						let users = []
 						if (result.data.result.exact) {

From d383dc1d6ceaabbfa024c3c8e26b7dc443f03f2b Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon, 26 Nov 2018 21:03:45 +0100
Subject: [PATCH 02/13] Add compatibility for 16 dev version

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index cc73dcb2..90e62061 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -17,7 +17,7 @@
 	<bugs>https://github.com/nextcloud/social/issues</bugs>
 	<screenshot>https://raw.githubusercontent.com/nextcloud/social/master/screenshots/screenshot.png</screenshot>
 	<dependencies>
-		<nextcloud min-version="15" max-version="15"/>
+		<nextcloud min-version="15" max-version="16"/>
 	</dependencies>
 	<navigations>
 		<navigation>

From 0944d07da67725984051885870284e7832a09184 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Fri, 23 Nov 2018 19:36:35 -0100
Subject: [PATCH 03/13] cleaning/renaming

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 lib/Db/ActorsRequest.php                   |   2 +-
 lib/Db/ActorsRequestBuilder.php            |   6 +-
 lib/Db/CacheActorsRequestBuilder.php       |   4 +-
 lib/Db/CoreRequestBuilder.php              |  14 +-
 lib/Db/NotesRequestBuilder.php             |   1 +
 lib/Exceptions/UrlCloudException.php       |   8 ++
 lib/Model/ActivityPub/Cache/CacheActor.php | 157 ---------------------
 lib/Model/ActivityPub/Note.php             |   3 +-
 lib/Model/ActivityPub/Person.php           |  40 +++++-
 lib/Service/ActivityPub/FollowService.php  |  11 +-
 lib/Service/ActivityPub/NoteService.php    |   2 +-
 lib/Service/ActivityService.php            |   2 +-
 lib/Service/ImportService.php              |   1 +
 13 files changed, 79 insertions(+), 172 deletions(-)
 create mode 100644 lib/Exceptions/UrlCloudException.php
 delete mode 100644 lib/Model/ActivityPub/Cache/CacheActor.php

diff --git a/lib/Db/ActorsRequest.php b/lib/Db/ActorsRequest.php
index 208f9723..beec0ebc 100644
--- a/lib/Db/ActorsRequest.php
+++ b/lib/Db/ActorsRequest.php
@@ -64,7 +64,7 @@ class ActorsRequest extends ActorsRequestBuilder {
 	 */
 	public function create(Person $actor): string {
 
-		$id = $this->configService->getUrlRoot() . '@' . $actor->getPreferredUsername();
+		$id = $this->configService->getUrlSocial() . '@' . $actor->getPreferredUsername();
 
 		try {
 			$qb = $this->getActorsInsertSql();
diff --git a/lib/Db/ActorsRequestBuilder.php b/lib/Db/ActorsRequestBuilder.php
index 3d11b9ca..5cf283cb 100644
--- a/lib/Db/ActorsRequestBuilder.php
+++ b/lib/Db/ActorsRequestBuilder.php
@@ -109,10 +109,10 @@ class ActorsRequestBuilder extends CoreRequestBuilder {
 	 * @throws SocialAppConfigException
 	 */
 	protected function parseActorsSelectSql($data): Person {
-		$root = $this->configService->getUrlRoot();
+		$root = $this->configService->getUrlSocial();
 
 		$actor = new Person();
-		$actor->import($data);
+		$actor->importFromDatabase($data);
 		$actor->setInbox($actor->getId() . '/inbox')
 			  ->setOutbox($actor->getId() . '/outbox')
 			  ->setFollowers($actor->getId() . '/followers')
@@ -122,7 +122,7 @@ class ActorsRequestBuilder extends CoreRequestBuilder {
 			  ->setAccount(
 				  $actor->getPreferredUsername() . '@' . $this->configService->getCloudAddress(true)
 			  );
-		$actor->setUrlRoot($root)
+		$actor->setUrlSocial($root)
 			  ->setUrl($actor->getId());
 
 		return $actor;
diff --git a/lib/Db/CacheActorsRequestBuilder.php b/lib/Db/CacheActorsRequestBuilder.php
index 7f91e976..4049a274 100644
--- a/lib/Db/CacheActorsRequestBuilder.php
+++ b/lib/Db/CacheActorsRequestBuilder.php
@@ -31,7 +31,7 @@ namespace OCA\Social\Db;
 
 
 use daita\MySmallPhpTools\Traits\TArrayTools;
-use OCA\Social\Model\ActivityPub\Cache\CacheActor;
+use OCA\Social\Exceptions\InvalidResourceException;
 use OCA\Social\Model\ActivityPub\Person;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 
@@ -110,7 +110,7 @@ class CacheActorsRequestBuilder extends CoreRequestBuilder {
 	 */
 	protected function parseCacheActorsSelectSql(array $data): Person {
 		$actor = new Person();
-		$actor->import($data);
+		$actor->importFromDatabase($data);
 
 		return $actor;
 	}
diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php
index 7c41e594..c6496cef 100644
--- a/lib/Db/CoreRequestBuilder.php
+++ b/lib/Db/CoreRequestBuilder.php
@@ -27,24 +27,36 @@ declare(strict_types=1);
  *
  */
 
+
 namespace OCA\Social\Db;
 
 
 use Doctrine\DBAL\Query\QueryBuilder;
 use OCA\Social\Exceptions\InvalidResourceException;
+use OCA\Social\Exceptions\UrlCloudException;
+use OCA\Social\Model\ActivityPub\Document;
+use OCA\Social\Model\ActivityPub\Image;
 use OCA\Social\Model\ActivityPub\Person;
 use OCA\Social\Service\ConfigService;
 use OCA\Social\Service\MiscService;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
+
+/**
+ * Class CoreRequestBuilder
+ *
+ * @package OCA\Social\Db
+ */
 class CoreRequestBuilder {
 
+
 	const TABLE_SERVER_ACTORS = 'social_server_actors';
 	const TABLE_SERVER_NOTES = 'social_server_notes';
 	const TABLE_SERVER_FOLLOWS = 'social_server_follows';
 
 	const TABLE_CACHE_ACTORS = 'social_cache_actors';
+	const TABLE_CACHE_DOCUMENTS = 'social_cache_documents';
 
 
 	/** @var IDBConnection */
@@ -425,7 +437,7 @@ class CoreRequestBuilder {
 		}
 
 		$actor = new Person();
-		$actor->import($new);
+		$actor->importFromDatabase($new);
 
 		if ($actor->getType() !== Person::TYPE) {
 			throw new InvalidResourceException();
diff --git a/lib/Db/NotesRequestBuilder.php b/lib/Db/NotesRequestBuilder.php
index c4444eea..16c5999d 100644
--- a/lib/Db/NotesRequestBuilder.php
+++ b/lib/Db/NotesRequestBuilder.php
@@ -160,6 +160,7 @@ class NotesRequestBuilder extends CoreRequestBuilder {
 	protected function parseNotesSelectSql($data): Note {
 		$dTime = new DateTime($this->get('published_time', $data, 'yesterday'));
 
+		// TODO - use $note->importFromDatabase() ?
 		$note = new Note();
 		$note->setId($data['id'])
 			 ->setTo($data['to'])
diff --git a/lib/Exceptions/UrlCloudException.php b/lib/Exceptions/UrlCloudException.php
new file mode 100644
index 00000000..cfc7b40b
--- /dev/null
+++ b/lib/Exceptions/UrlCloudException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace OCA\Social\Exceptions;
+
+class UrlCloudException extends \Exception {
+
+}
+
diff --git a/lib/Model/ActivityPub/Cache/CacheActor.php b/lib/Model/ActivityPub/Cache/CacheActor.php
deleted file mode 100644
index 27768ae5..00000000
--- a/lib/Model/ActivityPub/Cache/CacheActor.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-declare(strict_types=1);
-
-
-/**
- * Nextcloud - Social Support
- *
- * This file is licensed under the Affero General Public License version 3 or
- * later. See the COPYING file.
- *
- * @author Maxence Lange <maxence@artificial-owl.com>
- * @copyright 2018, Maxence Lange <maxence@artificial-owl.com>
- * @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 <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Social\Model\ActivityPub\Cache;
-
-
-class CacheActor {
-
-	/** @var int */
-	private $id;
-
-	/** @var string */
-	private $account = '';
-
-	/** @var string */
-	private $url;
-
-	/** @var array */
-	private $actor = [];
-
-	/** @var int */
-	private $creation = 0;
-
-
-	/**
-	 * CacheActor constructor.
-	 *
-	 * @param int $id
-	 */
-	public function __construct($id = 0) {
-		$this->id = $id;
-	}
-
-
-	/**
-	 * @return int
-	 */
-	public function getId(): int {
-		return $this->id;
-	}
-
-	/**
-	 * @param int $id
-	 *
-	 * @return CacheActor
-	 */
-	public function setId(int $id): CacheActor {
-		$this->account = $id;
-
-		return $this;
-	}
-
-
-	/**
-	 * @return string
-	 */
-	public function getAccount(): string {
-		return $this->account;
-	}
-
-	/**
-	 * @param string $account
-	 *
-	 * @return CacheActor
-	 */
-	public function setAccount(string $account): CacheActor {
-		$this->account = $account;
-
-		return $this;
-	}
-
-
-	/**
-	 * @return string
-	 */
-	public function getUrl(): string {
-		return $this->url;
-	}
-
-	/**
-	 * @param string $url
-	 *
-	 * @return CacheActor
-	 */
-	public function setUrl(string $url): CacheActor {
-		$this->url = $url;
-
-		return $this;
-	}
-
-
-	/**
-	 * @return array
-	 */
-	public function getActor(): array {
-		return $this->actor;
-	}
-
-	/**
-	 * @param array $actor
-	 *
-	 * @return CacheActor
-	 */
-	public function setActor(array $actor): CacheActor {
-		$this->actor = $actor;
-
-		return $this;
-	}
-
-
-	/**
-	 * @return int
-	 */
-	public function getCreation(): int {
-		return $this->creation;
-	}
-
-	/**
-	 * @param int $creation
-	 *
-	 * @return CacheActor
-	 */
-	public function setCreation(int $creation): CacheActor {
-		$this->creation = $creation;
-
-		return $this;
-	}
-
-
-}
-
diff --git a/lib/Model/ActivityPub/Note.php b/lib/Model/ActivityPub/Note.php
index 7a71493c..53b91c06 100644
--- a/lib/Model/ActivityPub/Note.php
+++ b/lib/Model/ActivityPub/Note.php
@@ -199,7 +199,6 @@ class Note extends ACore implements JsonSerializable {
 	public function import(array $data) {
 		parent::import($data);
 
-		$this->setSummary($this->get('summary', $data, ''));
 		$this->setInReplyTo($this->get('inReplyTo', $data, ''));
 		$this->setAttributedTo($this->get('attributedTo', $data, ''));
 		$this->setSensitive($this->getBool('sensitive', $data, false));
@@ -219,7 +218,7 @@ class Note extends ACore implements JsonSerializable {
 			parent::jsonSerialize(),
 			[
 				'content'      => $this->getContent(),
-				'attributedTo' => $this->getUrlRoot() . $this->getAttributedTo(),
+				'attributedTo' => $this->getUrlSocial() . $this->getAttributedTo(),
 				'inReplyTo'    => $this->getInReplyTo(),
 				'sensitive'    => $this->isSensitive(),
 				'conversation' => $this->getConversation()
diff --git a/lib/Model/ActivityPub/Person.php b/lib/Model/ActivityPub/Person.php
index 18c73be6..41f3b375 100644
--- a/lib/Model/ActivityPub/Person.php
+++ b/lib/Model/ActivityPub/Person.php
@@ -32,6 +32,7 @@ namespace OCA\Social\Model\ActivityPub;
 
 
 use JsonSerializable;
+use OCA\Social\Exceptions\UrlCloudException;
 
 
 /**
@@ -340,9 +341,44 @@ class Person extends ACore implements JsonSerializable {
 
 	/**
 	 * @param array $data
+	 *
+	 * @throws UrlCloudException
 	 */
 	public function import(array $data) {
 		parent::import($data);
+		$this->setPreferredUsername($this->get('preferredUsername', $data, ''))
+			 ->setPublicKey($this->get('publicKey.publicKeyPem', $data))
+			 ->setSharedInbox($this->get('endpoints.sharedInbox', $data))
+			 ->setName($this->get('name', $data, ''))
+			 ->setAccount($this->get('account', $data, ''))
+			 ->setInbox($this->get('inbox', $data, ''))
+			 ->setOutbox($this->get('outbox', $data, ''))
+			 ->setFollowers($this->get('followers', $data, ''))
+			 ->setFollowing($this->get('following', $data, ''))
+			 ->setFeatured($this->get('featured', $data, ''));
+
+		$icon = new Image($this);
+		$icon->setUrlCloud($this->getUrlCloud());
+		$icon->import($this->getArray('icon', $data, []));
+
+		if ($icon->getType() === Image::TYPE) {
+			$this->setIcon($icon);
+		}
+
+
+//			 ->setCreation($this->getInt('creation', $data, 0));
+
+//		if ($this->getPreferredUsername() === '') {
+//			$this->setType('Invalid');
+//		}
+	}
+
+
+	/**
+	 * @param array $data
+	 */
+	public function importFromDatabase(array $data) {
+		parent::importFromDatabase($data);
 		$this->setPreferredUsername($this->get('preferred_username', $data, ''))
 			 ->setName($this->get('name', $data, ''))
 			 ->setAccount($this->get('account', $data, ''))
@@ -370,8 +406,8 @@ class Person extends ACore implements JsonSerializable {
 			parent::jsonSerialize(),
 			[
 				'aliases'           => [
-					$this->getUrlRoot() . '@' . $this->getPreferredUsername(),
-					$this->getUrlRoot() . 'users/' . $this->getPreferredUsername()
+					$this->getUrlSocial() . '@' . $this->getPreferredUsername(),
+					$this->getUrlSocial() . 'users/' . $this->getPreferredUsername()
 				],
 				'preferredUsername' => $this->getPreferredUsername(),
 				'name'              => $this->getName(),
diff --git a/lib/Service/ActivityPub/FollowService.php b/lib/Service/ActivityPub/FollowService.php
index 43871642..36423fbc 100644
--- a/lib/Service/ActivityPub/FollowService.php
+++ b/lib/Service/ActivityPub/FollowService.php
@@ -34,7 +34,9 @@ namespace OCA\Social\Service\ActivityPub;
 use Exception;
 use OCA\Social\Db\FollowsRequest;
 use OCA\Social\Exceptions\ActorDoesNotExistException;
+use OCA\Social\Exceptions\CacheActorDoesNotExistException;
 use OCA\Social\Exceptions\FollowDoesNotExistException;
+use OCA\Social\Exceptions\InvalidResourceException;
 use OCA\Social\Exceptions\RequestException;
 use OCA\Social\Exceptions\SocialAppConfigException;
 use OCA\Social\Model\ActivityPub\ACore;
@@ -96,14 +98,17 @@ class FollowService implements ICoreService {
 	 * @param Person $actor
 	 * @param string $account
 	 *
+	 * @throws ActorDoesNotExistException
 	 * @throws RequestException
 	 * @throws SocialAppConfigException
-	 * @throws ActorDoesNotExistException
+	 * @throws CacheActorDoesNotExistException
+	 * @throws InvalidResourceException
 	 */
 	public function followAccount(Person $actor, string $account) {
 		$remoteActor = $this->personService->getFromAccount($account);
 		$follow = new Follow();
-		$follow->generateUniqueId($this->configService->getCloudAddress());
+		$follow->setUrlCloud($this->configService->getCloudAddress());
+		$follow->generateUniqueId();
 		$follow->setActorId($actor->getId());
 		$follow->setObjectId($remoteActor->getId());
 
@@ -124,6 +129,8 @@ class FollowService implements ICoreService {
 	 * @param Person $actor
 	 * @param string $account
 	 *
+	 * @throws CacheActorDoesNotExistException
+	 * @throws InvalidResourceException
 	 * @throws RequestException
 	 */
 	public function unfollowAccount(Person $actor, string $account) {
diff --git a/lib/Service/ActivityPub/NoteService.php b/lib/Service/ActivityPub/NoteService.php
index 2adecf1c..7107c1fe 100644
--- a/lib/Service/ActivityPub/NoteService.php
+++ b/lib/Service/ActivityPub/NoteService.php
@@ -126,7 +126,7 @@ class NoteService implements ICoreService {
 		$note->setId($this->configService->generateId('@' . $actor->getPreferredUsername()));
 		$note->setPublished(date("c"));
 		$note->setAttributedTo(
-			$this->configService->getUrlRoot() . '@' . $actor->getPreferredUsername()
+			$this->configService->getUrlSocial() . '@' . $actor->getPreferredUsername()
 		);
 
 		$this->setRecipient($note, $actor, $type);
diff --git a/lib/Service/ActivityService.php b/lib/Service/ActivityService.php
index 7f402221..ac87e854 100644
--- a/lib/Service/ActivityService.php
+++ b/lib/Service/ActivityService.php
@@ -309,7 +309,7 @@ class ActivityService {
 		$localActor = $this->getActorFromItem($activity);
 
 		$localActorLink =
-			$this->configService->getUrlRoot() . '@' . $localActor->getPreferredUsername();
+			$this->configService->getUrlSocial() . '@' . $localActor->getPreferredUsername();
 		$signature = "(request-target): post " . $path->getPath() . "\nhost: " . $path->getAddress()
 					 . "\ndate: " . $date;
 
diff --git a/lib/Service/ImportService.php b/lib/Service/ImportService.php
index 294c6acd..ae7a96c0 100644
--- a/lib/Service/ImportService.php
+++ b/lib/Service/ImportService.php
@@ -153,6 +153,7 @@ class ImportService {
 				throw new UnknownItemException();
 		}
 
+		$item->setUrlCloud($this->configService->getCloudAddress());
 		$item->import($data);
 		$item->setSource(json_encode($data, JSON_UNESCAPED_SLASHES));
 

From 9aacccf719d1d115be48299d04f7cb72a68f1c87 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Fri, 23 Nov 2018 19:41:46 -0100
Subject: [PATCH 04/13] Document, Image and Caching

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 appinfo/database.xml                          |  67 ++++++
 lib/Db/CacheDocumentsRequest.php              |  87 ++++++++
 lib/Db/CacheDocumentsRequestBuilder.php       | 121 +++++++++++
 lib/Db/CoreRequestBuilder.php                 |  54 +++++
 .../CacheDocumentDoesNotExistException.php    |   8 +
 lib/Model/ActivityPub/Document.php            | 192 ++++++++++++++++++
 lib/Model/ActivityPub/Image.php               |  83 ++++++++
 lib/Service/ActivityPub/DocumentService.php   |  82 ++++++++
 8 files changed, 694 insertions(+)
 create mode 100644 lib/Db/CacheDocumentsRequest.php
 create mode 100644 lib/Db/CacheDocumentsRequestBuilder.php
 create mode 100644 lib/Exceptions/CacheDocumentDoesNotExistException.php
 create mode 100644 lib/Model/ActivityPub/Document.php
 create mode 100644 lib/Model/ActivityPub/Image.php
 create mode 100644 lib/Service/ActivityPub/DocumentService.php

diff --git a/appinfo/database.xml b/appinfo/database.xml
index d942c063..58e8360e 100644
--- a/appinfo/database.xml
+++ b/appinfo/database.xml
@@ -374,5 +374,72 @@
 		</declaration>
 	</table>
 
+	<table>
+		<name>*dbprefix*social_cache_documents</name>
+		<declaration>
+
+			<field>
+				<name>id</name>
+				<type>string</type>
+				<length>127</length>
+				<notnull>true</notnull>
+				<primary>true</primary>
+			</field>
+
+			<field>
+				<name>type</name>
+				<type>text</type>
+				<length>31</length>
+				<notnull>true</notnull>
+			</field>
+
+			<field>
+				<name>media_type</name>
+				<type>text</type>
+				<length>63</length>
+				<notnull>true</notnull>
+			</field>
+
+			<field>
+				<name>mime_type</name>
+				<type>text</type>
+				<length>63</length>
+				<notnull>true</notnull>
+			</field>
+
+			<field>
+				<name>url</name>
+				<type>text</type>
+				<length>127</length>
+				<notnull>true</notnull>
+			</field>
+
+			<field>
+				<name>local_copy</name>
+				<type>text</type>
+				<length>127</length>
+				<notnull>true</notnull>
+			</field>
+
+			<field>
+				<name>creation</name>
+				<type>timestamp</type>
+			</field>
+
+			<field>
+				<name>caching</name>
+				<type>timestamp</type>
+			</field>
+
+			<index>
+				<name>unique_url</name>
+				<unique>true</unique>
+				<field>
+					<name>url</name>
+				</field>
+			</index>
+		</declaration>
+	</table>
+
 </database>
 
diff --git a/lib/Db/CacheDocumentsRequest.php b/lib/Db/CacheDocumentsRequest.php
new file mode 100644
index 00000000..7837ad5d
--- /dev/null
+++ b/lib/Db/CacheDocumentsRequest.php
@@ -0,0 +1,87 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.com>
+ * @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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Social\Db;
+
+
+use DateTime;
+use OCA\Social\Exceptions\CacheDocumentDoesNotExistException;
+use OCA\Social\Exceptions\SocialAppConfigException;
+use OCA\Social\Exceptions\UrlCloudException;
+use OCA\Social\Model\ActivityPub\Document;
+use OCP\DB\QueryBuilder\IQueryBuilder;
+
+class CacheDocumentsRequest extends CacheDocumentsRequestBuilder {
+
+
+	/**
+	 * insert cache about an Actor in database.
+	 *
+	 * @param Document $document
+	 */
+	public function save(Document $document) {
+		$qb = $this->getCacheDocumentsInsertSql();
+		$qb->setValue('id', $qb->createNamedParameter($document->getId()))
+		   ->setValue('type', $qb->createNamedParameter($document->getType()))
+		   ->setValue('url', $qb->createNamedParameter($document->getUrl()))
+		   ->setValue('local_copy', $qb->createNamedParameter($document->getLocalCopy()))
+		   ->setValue(
+			   'creation',
+			   $qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
+		   );
+		$qb->execute();
+	}
+
+
+	/**
+	 * @param string $url
+	 *
+	 * @return Document
+	 * @throws CacheDocumentDoesNotExistException
+	 * @throws SocialAppConfigException
+	 * @throws UrlCloudException
+	 */
+	public function getFromSource(string $url) {
+		$qb = $this->getCacheDocumentsSelectSql();
+		$this->limitToUrl($qb, $url);
+
+
+		$cursor = $qb->execute();
+		$data = $cursor->fetch();
+		$cursor->closeCursor();
+
+		if ($data === false) {
+			throw new CacheDocumentDoesNotExistException();
+		}
+
+		return $this->parseCacheDocumentsSelectSql($data);
+	}
+
+}
+
diff --git a/lib/Db/CacheDocumentsRequestBuilder.php b/lib/Db/CacheDocumentsRequestBuilder.php
new file mode 100644
index 00000000..853ed0f4
--- /dev/null
+++ b/lib/Db/CacheDocumentsRequestBuilder.php
@@ -0,0 +1,121 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.com>
+ * @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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Social\Db;
+
+
+use daita\MySmallPhpTools\Traits\TArrayTools;
+use OCA\Social\Exceptions\SocialAppConfigException;
+use OCA\Social\Exceptions\UrlCloudException;
+use OCA\Social\Model\ActivityPub\Document;
+use OCP\DB\QueryBuilder\IQueryBuilder;
+
+class CacheDocumentsRequestBuilder extends CoreRequestBuilder {
+
+
+	use TArrayTools;
+
+
+	/**
+	 * Base of the Sql Insert request
+	 *
+	 * @return IQueryBuilder
+	 */
+	protected function getCacheDocumentsInsertSql(): IQueryBuilder {
+		$qb = $this->dbConnection->getQueryBuilder();
+		$qb->insert(self::TABLE_CACHE_DOCUMENTS);
+
+		return $qb;
+	}
+
+
+	/**
+	 * Base of the Sql Update request
+	 *
+	 * @return IQueryBuilder
+	 */
+	protected function getCacheDocumentsUpdateSql(): IQueryBuilder {
+		$qb = $this->dbConnection->getQueryBuilder();
+		$qb->update(self::TABLE_CACHE_DOCUMENTS);
+
+		return $qb;
+	}
+
+
+	/**
+	 * Base of the Sql Select request for Shares
+	 *
+	 * @return IQueryBuilder
+	 */
+	protected function getCacheDocumentsSelectSql(): IQueryBuilder {
+		$qb = $this->dbConnection->getQueryBuilder();
+
+		/** @noinspection PhpMethodParametersCountMismatchInspection */
+		$qb->select(
+			'cd.id', 'cd.type', 'cd.media_type', 'cd.mime_type', 'cd.url', 'cd.local_copy',
+			'cd.creation', 'cd.caching'
+		)
+		   ->from(self::TABLE_CACHE_DOCUMENTS, 'cd');
+
+		$this->defaultSelectAlias = 'cd';
+
+		return $qb;
+	}
+
+
+	/**
+	 * Base of the Sql Delete request
+	 *
+	 * @return IQueryBuilder
+	 */
+	protected function getCacheDocumentsDeleteSql(): IQueryBuilder {
+		$qb = $this->dbConnection->getQueryBuilder();
+		$qb->delete(self::TABLE_CACHE_DOCUMENTS);
+
+		return $qb;
+	}
+
+
+	/**
+	 * @param array $data
+	 *
+	 * @return Document
+	 * @throws UrlCloudException
+	 * @throws SocialAppConfigException
+	 */
+	protected function parseCacheDocumentsSelectSql(array $data): Document {
+		$document = new Document();
+		$document->setUrlCloud($this->configService->getCloudAddress());
+		$document->importFromDatabase($data);
+
+		return $document;
+	}
+
+}
+
diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php
index c6496cef..902b0888 100644
--- a/lib/Db/CoreRequestBuilder.php
+++ b/lib/Db/CoreRequestBuilder.php
@@ -446,6 +446,60 @@ class CoreRequestBuilder {
 		return $actor;
 	}
 
+
+	/**
+	 * @param IQueryBuilder $qb
+	 * @param string $fieldDocumentId
+	 */
+	protected function leftJoinCacheDocuments(IQueryBuilder &$qb, string $fieldDocumentId) {
+		if ($qb->getType() !== QueryBuilder::SELECT) {
+			return;
+		}
+
+		$expr = $qb->expr();
+		$pf = $this->defaultSelectAlias;
+
+//		/** @noinspection PhpMethodParametersCountMismatchInspection */
+		$qb->selectAlias('cd.id', 'cachedocument_id')
+		   ->selectAlias('cd.type', 'cachedocument_type')
+		   ->selectAlias('cd.mime_type', 'cachedocument_mime_type')
+		   ->selectAlias('cd.media_type', 'cachedocument_media_type')
+		   ->selectAlias('cd.url', 'cachedocument_url')
+		   ->selectAlias('cd.local_copy', 'cachedocument_local_copy')
+		   ->selectAlias('cd.caching', 'cachedocument_caching')
+		   ->selectAlias('ca.creation', 'cachedocument_creation')
+		   ->leftJoin(
+			   $this->defaultSelectAlias, CoreRequestBuilder::TABLE_CACHE_DOCUMENTS, 'cd',
+			   $expr->eq($pf . '.' . $fieldDocumentId, 'cd.id')
+		   );
+	}
+
+
+	/**
+	 * @param array $data
+	 *
+	 * @return Document
+	 * @throws InvalidResourceException
+	 */
+	protected function parseCacheDocumentsLeftJoin(array $data): Document {
+		$new = [];
+
+		foreach ($data as $k => $v) {
+			if (substr($k, 0, 14) === 'cachedocument_') {
+				$new[substr($k, 14)] = $v;
+			}
+		}
+		$document = new Document();
+
+		$document->importFromDatabase($new);
+
+		if ($document->getType() !== Image::TYPE) {
+			throw new InvalidResourceException();
+		}
+
+		return $document;
+	}
+
 }
 
 
diff --git a/lib/Exceptions/CacheDocumentDoesNotExistException.php b/lib/Exceptions/CacheDocumentDoesNotExistException.php
new file mode 100644
index 00000000..1bc25dda
--- /dev/null
+++ b/lib/Exceptions/CacheDocumentDoesNotExistException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace OCA\Social\Exceptions;
+
+class CacheDocumentDoesNotExistException extends \Exception {
+
+}
+
diff --git a/lib/Model/ActivityPub/Document.php b/lib/Model/ActivityPub/Document.php
new file mode 100644
index 00000000..fa14dda3
--- /dev/null
+++ b/lib/Model/ActivityPub/Document.php
@@ -0,0 +1,192 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.com>
+ * @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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\Social\Model\ActivityPub;
+
+
+use JsonSerializable;
+use OCA\Social\Exceptions\UrlCloudException;
+
+
+/**
+ * Class Document
+ *
+ * @package OCA\Social\Model\ActivityPub
+ */
+class Document extends ACore implements JsonSerializable {
+
+
+	const TYPE = 'Document';
+
+
+	/** @var string */
+	private $mediaType = '';
+
+	/** @var string */
+	private $mimeType = '';
+
+	/** @var string */
+	private $localCopy = '';
+
+	/** @var string */
+	private $caching = '';
+
+
+	/**
+	 * Document constructor.
+	 *
+	 * @param ACore $parent
+	 */
+	public function __construct($parent = null) {
+		parent::__construct($parent);
+
+		$this->setType(self::TYPE);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getMediaType(): string {
+		return $this->mediaType;
+	}
+
+	/**
+	 * @param string $mediaType
+	 *
+	 * @return ACore
+	 */
+	public function setMediaType(string $mediaType): ACore {
+		$this->mediaType = $mediaType;
+
+		return $this;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getMimeType(): string {
+		return $this->mimeType;
+	}
+
+	/**
+	 * @param string $mimeType
+	 *
+	 * @return ACore
+	 */
+	public function setMimeType(string $mimeType): ACore {
+		$this->mimeType = $mimeType;
+
+		return $this;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getLocalCopy(): string {
+		return $this->localCopy;
+	}
+
+	/**
+	 * @param string $localCopy
+	 *
+	 * @return Document
+	 */
+	public function setLocalCopy(string $localCopy): Document {
+		$this->localCopy = $localCopy;
+
+		return $this;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getCaching(): string {
+		return $this->caching;
+	}
+
+	/**
+	 * @param string $caching
+	 *
+	 * @return Document
+	 */
+	public function setCaching(string $caching): Document {
+		$this->caching = $caching;
+
+		return $this;
+	}
+
+
+	/**
+	 * @param array $data
+	 *
+	 * @throws UrlCloudException
+	 */
+	public function import(array $data) {
+		parent::import($data);
+
+		$this->setMediaType($this->get('mediaType', $data, ''));
+
+		if ($this->getId() === '') {
+			$this->generateUniqueId('/documents/g');
+		}
+	}
+
+
+	/**
+	 * @param array $data
+	 */
+	public function importFromDatabase(array $data) {
+		parent::importFromDatabase($data);
+
+		$this->setMediaType($this->get('media_type', $data, ''));
+		$this->setMimeType($this->get('mime_type', $data, ''));
+		$this->setCaching($this->get('caching', $data, ''));
+	}
+
+	/**
+	 * @return array
+	 */
+	public function jsonSerialize(): array {
+		return array_merge(
+			parent::jsonSerialize(),
+			[
+				'mediaType' => $this->getMediaType(),
+				'mimeType'  => $this->getMimeType(),
+				'localCopy' => $this->getLocalCopy()
+			]
+		);
+	}
+
+}
+
diff --git a/lib/Model/ActivityPub/Image.php b/lib/Model/ActivityPub/Image.php
new file mode 100644
index 00000000..5947c4a6
--- /dev/null
+++ b/lib/Model/ActivityPub/Image.php
@@ -0,0 +1,83 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.com>
+ * @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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\Social\Model\ActivityPub;
+
+
+use JsonSerializable;
+use OCA\Social\Exceptions\UrlCloudException;
+
+
+/**
+ * Class Image
+ *
+ * @package OCA\Social\Model\ActivityPub
+ */
+class Image extends Document implements JsonSerializable {
+
+
+	const TYPE = 'Image';
+
+
+	/**
+	 * Image constructor.
+	 *
+	 * @param ACore $parent
+	 */
+	public function __construct($parent = null) {
+		parent::__construct($parent);
+
+		$this->setType(self::TYPE);
+	}
+
+
+	/**
+	 * @param array $data
+	 *
+	 * @throws UrlCloudException
+	 */
+	public function import(array $data) {
+		parent::import($data);
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function jsonSerialize(): array {
+		return array_merge(
+			parent::jsonSerialize(),
+			[
+			]
+		);
+	}
+
+}
+
diff --git a/lib/Service/ActivityPub/DocumentService.php b/lib/Service/ActivityPub/DocumentService.php
new file mode 100644
index 00000000..dc72c46a
--- /dev/null
+++ b/lib/Service/ActivityPub/DocumentService.php
@@ -0,0 +1,82 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.com>
+ * @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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Social\Service\ActivityPub;
+
+
+use OCA\Social\Db\CacheDocumentsRequest;
+use OCA\Social\Model\ActivityPub\ACore;
+use OCA\Social\Service\ICoreService;
+use OCA\Social\Service\MiscService;
+
+
+class DocumentService implements ICoreService {
+
+	/** @var CacheDocumentsRequest */
+	private $cacheDocumentsRequest;
+
+	/** @var MiscService */
+	private $miscService;
+
+
+	/**
+	 * DocumentService constructor.
+	 *
+	 * @param CacheDocumentsRequest $cacheDocumentsRequest
+	 * @param MiscService $miscService
+	 */
+	public function __construct(
+		CacheDocumentsRequest $cacheDocumentsRequest, MiscService $miscService
+	) {
+		$this->cacheDocumentsRequest = $cacheDocumentsRequest;
+		$this->miscService = $miscService;
+	}
+
+
+	public function getFromCache(array $documents) {
+
+	}
+
+
+	/**
+	 * @param ACore $item
+	 */
+	public function parse(ACore $item) {
+		// TODO: Implement parse() method.
+	}
+
+	/**
+	 * @param ACore $item
+	 */
+	public function delete(ACore $item) {
+		// TODO: Implement delete() method.
+	}
+
+}
+

From fa41ac80d44437b45425fb45b67bc5b57ea88a9e Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Fri, 23 Nov 2018 19:52:14 -0100
Subject: [PATCH 05/13] adding Icon to Person

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 appinfo/database.xml                      |  7 ++++++
 lib/Db/CacheActorsRequest.php             |  9 +++++++
 lib/Db/CacheActorsRequestBuilder.php      |  7 ++++++
 lib/Model/ActivityPub/ACore.php           | 30 +++++++++++++++++++++++
 lib/Service/ActivityPub/PersonService.php | 12 +++++++++
 lib/Service/ImportService.php             | 11 +++++++++
 6 files changed, 76 insertions(+)

diff --git a/appinfo/database.xml b/appinfo/database.xml
index 58e8360e..5778099a 100644
--- a/appinfo/database.xml
+++ b/appinfo/database.xml
@@ -345,6 +345,13 @@
 				<notnull>true</notnull>
 			</field>
 
+			<field>
+				<name>icon_id</name>
+				<type>text</type>
+				<length>127</length>
+				<notnull>true</notnull>
+			</field>
+
 			<field>
 				<name>summary</name>
 				<type>text</type>
diff --git a/lib/Db/CacheActorsRequest.php b/lib/Db/CacheActorsRequest.php
index fe722dcc..724abf2d 100644
--- a/lib/Db/CacheActorsRequest.php
+++ b/lib/Db/CacheActorsRequest.php
@@ -80,6 +80,12 @@ class CacheActorsRequest extends CacheActorsRequestBuilder {
 		   ->setValue('public_key', $qb->createNamedParameter($actor->getPublicKey()))
 		   ->setValue('source', $qb->createNamedParameter($actor->getSource()));
 
+		if ($actor->gotIcon()) {
+			$iconId = $actor->getIcon()
+							->getId();
+			$qb->setValue('icon_id', $qb->createNamedParameter($iconId));
+		}
+
 		$qb->execute();
 
 		return $qb->getLastInsertId();
@@ -121,6 +127,7 @@ class CacheActorsRequest extends CacheActorsRequestBuilder {
 	public function getFromId(string $id): Person {
 		$qb = $this->getCacheActorsSelectSql();
 		$this->limitToIdString($qb, $id);
+		$this->leftJoinCacheDocuments($qb, 'icon_id');
 
 		$cursor = $qb->execute();
 		$data = $cursor->fetch();
@@ -145,6 +152,7 @@ class CacheActorsRequest extends CacheActorsRequestBuilder {
 	public function getFromAccount(string $account): Person {
 		$qb = $this->getCacheActorsSelectSql();
 		$this->limitToAccount($qb, $account);
+		$this->leftJoinCacheDocuments($qb, 'icon_id');
 
 		$cursor = $qb->execute();
 		$data = $cursor->fetch();
@@ -166,6 +174,7 @@ class CacheActorsRequest extends CacheActorsRequestBuilder {
 	public function searchAccounts(string $search): array {
 		$qb = $this->getCacheActorsSelectSql();
 		$this->searchInAccount($qb, $search);
+		$this->leftJoinCacheDocuments($qb, 'icon_id');
 
 		$accounts = [];
 		$cursor = $qb->execute();
diff --git a/lib/Db/CacheActorsRequestBuilder.php b/lib/Db/CacheActorsRequestBuilder.php
index 4049a274..3d6847d1 100644
--- a/lib/Db/CacheActorsRequestBuilder.php
+++ b/lib/Db/CacheActorsRequestBuilder.php
@@ -112,6 +112,13 @@ class CacheActorsRequestBuilder extends CoreRequestBuilder {
 		$actor = new Person();
 		$actor->importFromDatabase($data);
 
+		try {
+			$icon = $this->parseCacheDocumentsLeftJoin($data);
+			$icon->setParent($actor);
+			$actor->setIcon($icon);
+		} catch (InvalidResourceException $e) {
+		}
+
 		return $actor;
 	}
 
diff --git a/lib/Model/ActivityPub/ACore.php b/lib/Model/ActivityPub/ACore.php
index 58b40599..a230d40a 100644
--- a/lib/Model/ActivityPub/ACore.php
+++ b/lib/Model/ActivityPub/ACore.php
@@ -568,6 +568,36 @@ abstract class ACore implements JsonSerializable {
 	}
 
 
+	/**
+	 * @return bool
+	 */
+	public function gotIcon(): bool {
+		if ($this->icon === null) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @return Document
+	 */
+	public function getIcon(): Document {
+		return $this->icon;
+	}
+
+	/**
+	 * @param Document $icon
+	 *
+	 * @return ACore
+	 */
+	public function setIcon(Document $icon): ACore {
+		$this->icon = $icon;
+
+		return $this;
+	}
+
+
 	/**
 	 * @return bool
 	 */
diff --git a/lib/Service/ActivityPub/PersonService.php b/lib/Service/ActivityPub/PersonService.php
index a4d4eee1..23bb6bea 100644
--- a/lib/Service/ActivityPub/PersonService.php
+++ b/lib/Service/ActivityPub/PersonService.php
@@ -216,6 +216,18 @@ class PersonService implements ICoreService {
 			return;
 		}
 
+		if ($person->gotIcon()) {
+			try {
+				$icon = $this->cacheDocumentsRequest->getFromSource(
+					$person->getIcon()
+						   ->getUrl()
+				);
+				$person->setIcon($icon);
+			} catch (CacheDocumentDoesNotExistException $e) {
+				$this->cacheDocumentsRequest->save($person->getIcon());
+			}
+		}
+
 		$this->cacheActorsRequest->save($person);
 	}
 
diff --git a/lib/Service/ImportService.php b/lib/Service/ImportService.php
index ae7a96c0..95fae20a 100644
--- a/lib/Service/ImportService.php
+++ b/lib/Service/ImportService.php
@@ -133,6 +133,10 @@ class ImportService {
 				$item = new Note($root);
 				break;
 
+			case Image::TYPE:
+				$item = new Image($root);
+				break;
+
 			case Follow::TYPE:
 				$item = new Follow($root);
 				break;
@@ -163,6 +167,13 @@ class ImportService {
 		} catch (UnknownItemException $e) {
 		}
 
+		try {
+			/** @var Document $icon */
+			$icon = $this->createItem($this->getArray('icon', $data, []), $item);
+			$item->setIcon($icon);
+		} catch (UnknownItemException $e) {
+		}
+
 		return $item;
 	}
 

From 8f9ba58c71ac02361628e6cce2860e84a345a472 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Fri, 23 Nov 2018 19:53:01 -0100
Subject: [PATCH 06/13] cleaning/renaming

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 lib/Model/ActivityPub/ACore.php           | 90 +++++++++++++++++++----
 lib/Service/ActivityPub/PersonService.php | 83 ++++++++++++++-------
 lib/Service/ConfigService.php             |  9 +--
 lib/Service/ImportService.php             | 19 ++++-
 4 files changed, 155 insertions(+), 46 deletions(-)

diff --git a/lib/Model/ActivityPub/ACore.php b/lib/Model/ActivityPub/ACore.php
index a230d40a..0ea904bc 100644
--- a/lib/Model/ActivityPub/ACore.php
+++ b/lib/Model/ActivityPub/ACore.php
@@ -31,8 +31,10 @@ namespace OCA\Social\Model\ActivityPub;
 
 
 use daita\MySmallPhpTools\Traits\TArrayTools;
+use daita\MySmallPhpTools\Traits\TPathTools;
 use JsonSerializable;
 use OCA\Social\Exceptions\ActivityCantBeVerifiedException;
+use OCA\Social\Exceptions\UrlCloudException;
 use OCA\Social\Model\InstancePath;
 use OCA\Social\Service\ICoreService;
 
@@ -41,6 +43,7 @@ abstract class ACore implements JsonSerializable {
 
 
 	use TArrayTools;
+	use TPathTools;
 
 
 	const CONTEXT_ACTIVITYSTREAMS = 'https://www.w3.org/ns/activitystreams';
@@ -48,7 +51,10 @@ abstract class ACore implements JsonSerializable {
 
 
 	/** @var string */
-	private $root = '';
+	private $urlSocial = '';
+
+	/** @var string */
+	private $urlCloud = '';
 
 //	/** @var bool */
 //	private $isTopLevel = false;
@@ -101,6 +107,9 @@ abstract class ACore implements JsonSerializable {
 	/** @var string */
 	private $actorId = '';
 
+	/** @var Document */
+	private $icon = null;
+
 	/** @var ACore */
 	private $object = null;
 
@@ -155,14 +164,27 @@ abstract class ACore implements JsonSerializable {
 		return $this;
 	}
 
-	public function generateUniqueId(string $base) {
+	/**
+	 * @param string $base
+	 *
+	 * @throws UrlCloudException
+	 */
+	public function generateUniqueId(string $base = '') {
+		if ($this->getUrlCloud() === '') {
+			throw new UrlCloudException();
+		}
+
+		if ($base !== '') {
+			$base = $this->withoutEndSlash($this->withBeginSlash($base));
+		}
+
 		$uuid = sprintf(
 			'%04x%04x-%04x-%04x-%04x-%04x%04x%04x', mt_rand(0, 0xffff), mt_rand(0, 0xffff),
 			mt_rand(0, 0xffff), mt_rand(0, 0xfff) | 0x4000, mt_rand(0, 0x3fff) | 0x8000,
 			mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
 		);
 
-		$this->setId($base . '/' . $uuid);
+		$this->setId($this->getUrlCloud() . $base . '/' . $uuid);
 	}
 
 	/**
@@ -178,9 +200,10 @@ abstract class ACore implements JsonSerializable {
 	 * @return ACore
 	 */
 	public function setType(string $type): ACore {
-		if ($type !== '') {
-			$this->type = $type;
-		}
+//		if ($type !== '') {
+		$this->type = $type;
+
+//		}
 
 		return $this;
 	}
@@ -343,8 +366,8 @@ abstract class ACore implements JsonSerializable {
 	/**
 	 * @return string
 	 */
-	public function getUrlRoot(): string {
-		return $this->root;
+	public function getUrlSocial(): string {
+		return $this->urlSocial;
 	}
 
 	/**
@@ -352,8 +375,27 @@ abstract class ACore implements JsonSerializable {
 	 *
 	 * @return ACore
 	 */
-	public function setUrlRoot(string $path): ACore {
-		$this->root = $path;
+	public function setUrlSocial(string $path): ACore {
+		$this->urlSocial = $path;
+
+		return $this;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getUrlCloud(): string {
+		return $this->urlCloud;
+	}
+
+	/**
+	 * @param string $path
+	 *
+	 * @return ACore
+	 */
+	public function setUrlCloud(string $path): ACore {
+		$this->urlCloud = $path;
 
 		return $this;
 	}
@@ -653,7 +695,6 @@ abstract class ACore implements JsonSerializable {
 			return $this;
 		}
 
-
 		return $this->getParent()
 					->getRoot($chain);
 	}
@@ -822,6 +863,23 @@ abstract class ACore implements JsonSerializable {
 	 * @param array $data
 	 */
 	public function import(array $data) {
+		$this->setId($this->get('id', $data, ''));
+		$this->setType($this->get('type', $data, ''));
+		$this->setUrl($this->get('url', $data, ''));
+		$this->setSummary($this->get('summary', $data, ''));
+		$this->setToArray($this->getArray('to', $data, []));
+		$this->setCcArray($this->getArray('cc', $data, []));
+		$this->setPublished($this->get('published', $data, ''));
+		$this->setActorId($this->get('actor', $data, ''));
+		$this->setObjectId($this->get('object', $data, ''));
+		$this->setLocal(($this->getInt('local', $data, 0) === 1));
+	}
+
+
+	/**
+	 * @param array $data
+	 */
+	public function importFromDatabase(array $data) {
 		$this->setId($this->get('id', $data, ''));
 		$this->setType($this->get('type', $data, ''));
 		$this->setUrl($this->get('url', $data, ''));
@@ -851,7 +909,7 @@ abstract class ACore implements JsonSerializable {
 
 		$this->addEntry('id', $this->getId());
 		$this->addEntry('type', $this->getType());
-		$this->addEntry('url', $this->getId());
+		$this->addEntry('url', $this->getUrl());
 
 		$this->addEntry('to', $this->getTo());
 		$this->addEntryArray('to', $this->getToArray());
@@ -880,11 +938,17 @@ abstract class ACore implements JsonSerializable {
 			$this->addEntry('object', $this->getObjectId());
 		}
 
+		if ($this->gotIcon()) {
+			$this->addEntryItem('icon', $this->getIcon());
+		}
+
 		if ($this->isCompleteDetails()) {
 			$this->addEntry('source', $this->getSource());
 		}
 
-		$this->addEntryBool('local', $this->isLocal());
+		if ($this->isLocal()) {
+			$this->addEntryBool('local', $this->isLocal());
+		}
 
 		return $this->getEntries();
 	}
diff --git a/lib/Service/ActivityPub/PersonService.php b/lib/Service/ActivityPub/PersonService.php
index 23bb6bea..871bf7a3 100644
--- a/lib/Service/ActivityPub/PersonService.php
+++ b/lib/Service/ActivityPub/PersonService.php
@@ -34,11 +34,16 @@ namespace OCA\Social\Service\ActivityPub;
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use Exception;
 use OCA\Social\Db\CacheActorsRequest;
+use OCA\Social\Db\CacheDocumentsRequest;
 use OCA\Social\Exceptions\CacheActorDoesNotExistException;
+use OCA\Social\Exceptions\CacheDocumentDoesNotExistException;
 use OCA\Social\Exceptions\InvalidResourceException;
 use OCA\Social\Exceptions\RequestException;
+use OCA\Social\Exceptions\SocialAppConfigException;
+use OCA\Social\Exceptions\UrlCloudException;
 use OCA\Social\Model\ActivityPub\ACore;
 use OCA\Social\Model\ActivityPub\Person;
+use OCA\Social\Service\ConfigService;
 use OCA\Social\Service\ICoreService;
 use OCA\Social\Service\InstanceService;
 use OCA\Social\Service\MiscService;
@@ -58,9 +63,15 @@ class PersonService implements ICoreService {
 	/** @var CacheActorsRequest */
 	private $cacheActorsRequest;
 
+	/** @var CacheDocumentsRequest */
+	private $cacheDocumentsRequest;
+
 	/** @var InstanceService */
 	private $instanceService;
 
+	/** @var ConfigService */
+	private $configService;
+
 	/** @var MiscService */
 	private $miscService;
 
@@ -69,15 +80,19 @@ class PersonService implements ICoreService {
 	 * UndoService constructor.
 	 *
 	 * @param CacheActorsRequest $cacheActorsRequest
+	 * @param CacheDocumentsRequest $cacheDocumentsRequest
 	 * @param InstanceService $instanceService
+	 * @param ConfigService $configService
 	 * @param MiscService $miscService
 	 */
 	public function __construct(
-		CacheActorsRequest $cacheActorsRequest, InstanceService $instanceService,
-		MiscService $miscService
+		CacheActorsRequest $cacheActorsRequest, CacheDocumentsRequest $cacheDocumentsRequest,
+		InstanceService $instanceService, ConfigService $configService, MiscService $miscService
 	) {
 		$this->cacheActorsRequest = $cacheActorsRequest;
+		$this->cacheDocumentsRequest = $cacheDocumentsRequest;
 		$this->instanceService = $instanceService;
+		$this->configService = $configService;
 		$this->miscService = $miscService;
 	}
 
@@ -108,6 +123,8 @@ class PersonService implements ICoreService {
 	 * @return Person
 	 * @throws InvalidResourceException
 	 * @throws RequestException
+	 * @throws SocialAppConfigException
+	 * @throws UrlCloudException
 	 */
 	public function getFromId(string $id, bool $refresh = false): Person {
 
@@ -125,19 +142,8 @@ class PersonService implements ICoreService {
 			$actor = $this->cacheActorsRequest->getFromId($id);
 		} catch (CacheActorDoesNotExistException $e) {
 			$object = $this->instanceService->retrieveObject($id);
-			$actor = new Person();
-			$actor->import($object);
-			$actor->setSource(json_encode($object, JSON_UNESCAPED_SLASHES));
-
-			$actor->setPreferredUsername($this->get('preferredUsername', $object, ''));
-			$actor->setPublicKey($this->get('publicKey.publicKeyPem', $object));
-			$actor->setSharedInbox($this->get('endpoints.sharedInbox', $object));
+			$actor = $this->generateActorFromObject($object);
 			$actor->setAccount($actor->getPreferredUsername() . '@' . $this->get('_host', $object));
-
-			if ($actor->getType() !== Person::TYPE) {
-				throw new InvalidResourceException();
-			}
-
 			try {
 				$this->parse($actor);
 			} catch (Exception $e) {
@@ -158,6 +164,8 @@ class PersonService implements ICoreService {
 	 * @throws InvalidResourceException
 	 * @throws RequestException
 	 * @throws CacheActorDoesNotExistException
+	 * @throws SocialAppConfigException
+	 * @throws UrlCloudException
 	 */
 	public function getFromAccount(string $account, bool $retrieve = true): Person {
 
@@ -169,19 +177,8 @@ class PersonService implements ICoreService {
 			}
 
 			$object = $this->instanceService->retrieveAccount($account);
-
-			$actor = new Person();
-			$actor->import($object);
-
+			$actor = $this->generateActorFromObject($object);
 			$actor->setAccount($account);
-			$actor->setPreferredUsername($this->get('preferredUsername', $object, ''));
-			$actor->setPublicKey($this->get('publicKey.publicKeyPem', $object));
-			$actor->setSharedInbox($this->get('endpoints.sharedInbox', $object));
-
-			if ($actor->getType() !== Person::TYPE) {
-				throw new InvalidResourceException();
-			}
-
 			try {
 				$this->parse($actor);
 			} catch (Exception $e) {
@@ -193,6 +190,40 @@ class PersonService implements ICoreService {
 	}
 
 
+	/**
+	 * @param array $object
+	 *
+	 * @return Person
+	 * @throws InvalidResourceException
+	 * @throws SocialAppConfigException
+	 * @throws UrlCloudException
+	 */
+	private function generateActorFromObject(array $object) {
+
+		$actor = new Person();
+		$actor->setUrlCloud($this->configService->getCloudAddress());
+		$actor->import($object);
+
+		if ($actor->getType() !== Person::TYPE) {
+			throw new InvalidResourceException();
+		}
+
+		$actor->setSource(json_encode($object, JSON_UNESCAPED_SLASHES));
+//			$actor->setPreferredUsername($this->get('preferredUsername', $object, ''));
+//			$actor->setPublicKey($this->get('publicKey.publicKeyPem', $object));
+//			$actor->setSharedInbox($this->get('endpoints.sharedInbox', $object));
+//			$actor->setAccount($actor->getPreferredUsername() . '@' . $this->get('_host', $object));
+//
+//			$icon = new Image($actor);
+//			$icon->setUrlCloud($this->configService->getCloudAddress());
+//			$icon->import($this->getArray('icon', $object, []));
+//			if ($icon->getType() === Image::TYPE) {
+//				$actor->setIcon($icon);
+//			}
+//
+		return $actor;
+	}
+
 	/**
 	 * @param string $search
 	 *
diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php
index 4ecaa335..578db10e 100644
--- a/lib/Service/ConfigService.php
+++ b/lib/Service/ConfigService.php
@@ -211,13 +211,11 @@ class ConfigService {
 	}
 
 	/**
-	 * @param bool $host
+	 * @param string $cloudAddress
 	 *
 	 * @return string
-	 * @throws SocialAppConfigException
 	 */
 	public function setCloudAddress(string $cloudAddress) {
-		// TODO: Validate
 		$this->setAppValue(self::SOCIAL_ADDRESS, $cloudAddress);
 	}
 
@@ -249,10 +247,11 @@ class ConfigService {
 
 
 	/**
+	 * // TODO - check the Apps folder
 	 * @return string
 	 * @throws SocialAppConfigException
 	 */
-	public function getUrlRoot(): string {
+	public function getUrlSocial(): string {
 		return $this->getCloudAddress() . '/apps/social/';
 	}
 
@@ -267,7 +266,7 @@ class ConfigService {
 	public function generateId(string $path = '', $generateId = true): string {
 		$path = $this->withoutBeginSlash($this->withEndSlash($path));
 
-		$id = $this->getUrlRoot() . $path;
+		$id = $this->getUrlSocial() . $path;
 		if ($generateId === true) {
 			$id .= time() . crc32(uniqid());
 		}
diff --git a/lib/Service/ImportService.php b/lib/Service/ImportService.php
index 95fae20a..381fac1e 100644
--- a/lib/Service/ImportService.php
+++ b/lib/Service/ImportService.php
@@ -33,14 +33,18 @@ namespace OCA\Social\Service;
 
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use Exception;
+use OCA\Social\Exceptions\SocialAppConfigException;
 use OCA\Social\Exceptions\UnknownItemException;
+use OCA\Social\Exceptions\UrlCloudException;
 use OCA\Social\Model\ActivityPub\ACore;
 use OCA\Social\Model\ActivityPub\Activity\Accept;
 use OCA\Social\Model\ActivityPub\Activity\Create;
 use OCA\Social\Model\ActivityPub\Activity\Delete;
 use OCA\Social\Model\ActivityPub\Activity\Reject;
 use OCA\Social\Model\ActivityPub\Activity\Tombstone;
+use OCA\Social\Model\ActivityPub\Document;
 use OCA\Social\Model\ActivityPub\Follow;
+use OCA\Social\Model\ActivityPub\Image;
 use OCA\Social\Model\ActivityPub\Note;
 use OCA\Social\Model\ActivityPub\Activity\Undo;
 use OCA\Social\Service\ActivityPub\DeleteService;
@@ -67,6 +71,8 @@ class ImportService {
 	/** @var DeleteService */
 	private $deleteService;
 
+	private $configService;
+
 	/** @var MiscService */
 	private $miscService;
 
@@ -78,17 +84,18 @@ class ImportService {
 	 * @param UndoService $undoService
 	 * @param FollowService $followService
 	 * @param DeleteService $deleteService
+	 * @param ConfigService $configService
 	 * @param MiscService $miscService
 	 */
 	public function __construct(
 		NoteService $noteService, UndoService $undoService, FollowService $followService,
-		DeleteService $deleteService,
-		MiscService $miscService
+		DeleteService $deleteService, ConfigService $configService, MiscService $miscService
 	) {
 		$this->noteService = $noteService;
 		$this->undoService = $undoService;
 		$this->followService = $followService;
 		$this->deleteService = $deleteService;
+		$this->configService = $configService;
 		$this->miscService = $miscService;
 	}
 
@@ -98,6 +105,8 @@ class ImportService {
 	 *
 	 * @return ACore
 	 * @throws UnknownItemException
+	 * @throws UrlCloudException
+	 * @throws SocialAppConfigException
 	 */
 	public function import(string $json) {
 		$data = json_decode($json, true);
@@ -113,6 +122,8 @@ class ImportService {
 	 *
 	 * @return ACore
 	 * @throws UnknownItemException
+	 * @throws UrlCloudException
+	 * @throws SocialAppConfigException
 	 */
 	private function createItem(array $data, $root = null): ACore {
 
@@ -217,6 +228,10 @@ class ImportService {
 				$service = $this->followService;
 				break;
 
+//			case Image::TYPE:
+//				$service = $this->imageService;
+//				break;
+
 			case Note::TYPE:
 				$service = $this->noteService;
 				break;

From 56e011049ead960a32b60d7b06af77229a2e559c Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Fri, 23 Nov 2018 20:07:32 -0100
Subject: [PATCH 07/13] new routes

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 appinfo/info.xml                        |  2 +-
 appinfo/routes.php                      |  6 ++--
 lib/Controller/LocalController.php      | 33 ++++++++++++++++++
 lib/Controller/NavigationController.php | 45 +++++++++++++++++++++++++
 4 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 90e62061..1ac0da72 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -5,7 +5,7 @@
 	<name>Social</name>
 	<summary>🎉 Nextcloud becomes part of the federated social networks!</summary>
 	<description><![CDATA[test]]></description>
-	<version>0.0.37</version>
+	<version>0.0.41</version>
 	<licence>agpl</licence>
 	<author mail="maxence@artificial-owl.com">Maxence Lange</author>
 	<author mail="jus@bitgrid.net">Julius Härtl</author>
diff --git a/appinfo/routes.php b/appinfo/routes.php
index 3703c956..293d4bb7 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -20,8 +20,9 @@ return [
 			'name'         => 'Navigation#account', 'url' => '/account/{path}', 'verb' => 'GET',
 			'requirements' => ['path' => '.+'], 'defaults' => ['path' => '']
 		],
-		//		['name' => 'Navigation#public', 'url' => '/{username}', 'verb' => 'GET'],
-
+		['name' => 'Navigation#public', 'url' => '/{username}', 'verb' => 'GET'],
+		['name' => 'Navigation#documentsGet', 'url' => '/documents/get', 'verb' => 'GET'],
+		['name' => 'Navigation#documentsGetPublic', 'url' => '/documents/public', 'verb' => 'GET'],
 
 		//		['name' => 'Account#create', 'url' => '/local/account/{username}', 'verb' => 'POST'],
 		['name' => 'Account#info', 'url' => '/local/account/{username}', 'verb' => 'GET'],
@@ -47,6 +48,7 @@ return [
 		['name' => 'Local#accountsSearch', 'url' => '/api/v1/accounts/search', 'verb' => 'GET'],
 		['name' => 'Local#accountFollow', 'url' => '/api/v1/account/follow', 'verb' => 'PUT'],
 		['name' => 'Local#accountUnfollow', 'url' => '/api/v1/account/follow', 'verb' => 'DELETE'],
+		['name' => 'Local#accountInfo', 'url' => '/api/v1/account/info', 'verb' => 'GET'],
 		['name' => 'Local#actorInfo', 'url' => '/api/v1/actor/info', 'verb' => 'GET'],
 
 		[
diff --git a/lib/Controller/LocalController.php b/lib/Controller/LocalController.php
index c824aeaa..cd6bb0f3 100644
--- a/lib/Controller/LocalController.php
+++ b/lib/Controller/LocalController.php
@@ -37,6 +37,7 @@ use OCA\Social\AppInfo\Application;
 use OCA\Social\Exceptions\InvalidResourceException;
 use OCA\Social\Model\ActivityPub\ACore;
 use OCA\Social\Model\Post;
+use OCA\Social\Service\ActivityPub\DocumentService;
 use OCA\Social\Service\ActivityPub\FollowService;
 use OCA\Social\Service\ActivityPub\NoteService;
 use OCA\Social\Service\ActivityPub\PersonService;
@@ -78,6 +79,9 @@ class LocalController extends Controller {
 	/** @var NoteService */
 	private $noteService;
 
+	/** @var DocumentService */
+	private $documentService;
+
 	/** @var MiscService */
 	private $miscService;
 
@@ -92,12 +96,14 @@ class LocalController extends Controller {
 	 * @param ActorService $actorService
 	 * @param PostService $postService
 	 * @param NoteService $noteService
+	 * @param DocumentService $documentService
 	 * @param MiscService $miscService
 	 */
 	public function __construct(
 		IRequest $request, $userId, PersonService $personService,
 		FollowService $followService, ActorService $actorService,
 		PostService $postService, NoteService $noteService,
+		DocumentService $documentService,
 		MiscService $miscService
 	) {
 		parent::__construct(Application::APP_NAME, $request);
@@ -109,6 +115,7 @@ class LocalController extends Controller {
 		$this->followService = $followService;
 		$this->postService = $postService;
 		$this->noteService = $noteService;
+		$this->documentService = $documentService;
 		$this->miscService = $miscService;
 	}
 
@@ -179,6 +186,9 @@ class LocalController extends Controller {
 	 * @NoAdminRequired
 	 * @NoSubAdminRequired
 	 *
+	 * @param int $since
+	 * @param int $limit
+	 *
 	 * @return DataResponse
 	 */
 	public function streamHome(int $since = 0, int $limit = 5): DataResponse {
@@ -343,6 +353,29 @@ class LocalController extends Controller {
 	}
 
 
+	/**
+	 *
+	 * // TODO: Delete the NoCSRF check
+	 *
+	 * @NoCSRFRequired
+	 * @NoAdminRequired
+	 * @NoSubAdminRequired
+	 *
+	 * @param string $account
+	 *
+	 * @return DataResponse
+	 */
+	public function accountInfo(string $account): DataResponse {
+		try {
+			$actor = $this->personService->getFromAccount($account);
+
+			return $this->success(['account' => $actor]);
+		} catch (Exception $e) {
+			return $this->fail($e);
+		}
+	}
+
+
 	/**
 	 *
 	 * // TODO: Delete the NoCSRF check
diff --git a/lib/Controller/NavigationController.php b/lib/Controller/NavigationController.php
index 54c7e184..2801bcb3 100644
--- a/lib/Controller/NavigationController.php
+++ b/lib/Controller/NavigationController.php
@@ -32,6 +32,7 @@ namespace OCA\Social\Controller;
 
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use daita\MySmallPhpTools\Traits\Nextcloud\TNCDataResponse;
+use Exception;
 use OC\User\NoUserException;
 use OCA\Social\AppInfo\Application;
 use OCA\Social\Exceptions\AccountAlreadyExistsException;
@@ -237,4 +238,48 @@ class NavigationController extends Controller {
 		return $page;
 	}
 
+
+
+	/**
+	 *
+	 * // TODO: Delete the NoCSRF check
+	 *
+	 * @NoCSRFRequired
+	 * @NoAdminRequired
+	 * @NoSubAdminRequired
+	 *
+	 * @param string $id
+	 *
+	 * @return DataResponse
+	 */
+	public function documentsGet(string $id): DataResponse {
+		try {
+			return $this->success([$id]);
+		} catch (Exception $e) {
+			return $this->fail($e);
+		}
+	}
+
+
+	/**
+	 *
+	 * // TODO: Delete the NoCSRF check
+	 *
+	 * @PublicPage
+	 * @NoCSRFRequired
+	 * @NoAdminRequired
+	 * @NoSubAdminRequired
+	 *
+	 * @param string $id
+	 *
+	 * @return DataResponse
+	 */
+	public function documentsGetPublic(string $id): DataResponse {
+		try {
+			return $this->success([$id]);
+		} catch (Exception $e) {
+			return $this->fail($e);
+		}
+	}
+
 }

From d8f23b6fedb40a9d024c3ef02c9beb442f0f6dd4 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Sat, 24 Nov 2018 13:08:19 -0100
Subject: [PATCH 08/13] setPublic

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 appinfo/database.xml               |   6 +
 appinfo/info.xml                   |   2 +-
 lib/Model/ActivityPub/Document.php |  24 ++++
 lib/Service/CacheService.php       | 199 +++++++++++++++++++++++++++++
 4 files changed, 230 insertions(+), 1 deletion(-)
 create mode 100644 lib/Service/CacheService.php

diff --git a/appinfo/database.xml b/appinfo/database.xml
index 5778099a..21f239a2 100644
--- a/appinfo/database.xml
+++ b/appinfo/database.xml
@@ -428,6 +428,12 @@
 				<notnull>true</notnull>
 			</field>
 
+			<field>
+				<name>public</name>
+				<type>boolean</type>
+				<notnull>true</notnull>
+			</field>
+
 			<field>
 				<name>creation</name>
 				<type>timestamp</type>
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 1ac0da72..55a16624 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -5,7 +5,7 @@
 	<name>Social</name>
 	<summary>🎉 Nextcloud becomes part of the federated social networks!</summary>
 	<description><![CDATA[test]]></description>
-	<version>0.0.41</version>
+	<version>0.0.42</version>
 	<licence>agpl</licence>
 	<author mail="maxence@artificial-owl.com">Maxence Lange</author>
 	<author mail="jus@bitgrid.net">Julius Härtl</author>
diff --git a/lib/Model/ActivityPub/Document.php b/lib/Model/ActivityPub/Document.php
index fa14dda3..317917f1 100644
--- a/lib/Model/ActivityPub/Document.php
+++ b/lib/Model/ActivityPub/Document.php
@@ -58,6 +58,9 @@ class Document extends ACore implements JsonSerializable {
 	/** @var string */
 	private $caching = '';
 
+	/** @var bool */
+	private $public = false;
+
 
 	/**
 	 * Document constructor.
@@ -128,6 +131,25 @@ class Document extends ACore implements JsonSerializable {
 	}
 
 
+	/**
+	 * @return bool
+	 */
+	public function isPublic(): bool {
+		return $this->public;
+	}
+
+	/**
+	 * @param bool $public
+	 *
+	 * @return Document
+	 */
+	public function setPublic(bool $public): Document {
+		$this->public = $public;
+
+		return $this;
+	}
+
+
 	/**
 	 * @return string
 	 */
@@ -169,6 +191,8 @@ class Document extends ACore implements JsonSerializable {
 	public function importFromDatabase(array $data) {
 		parent::importFromDatabase($data);
 
+		$this->setPublic(($this->getInt('public', $data, 0) === 1) ? true : false);
+		$this->setLocalCopy($this->get('local_copy', $data, ''));
 		$this->setMediaType($this->get('media_type', $data, ''));
 		$this->setMimeType($this->get('mime_type', $data, ''));
 		$this->setCaching($this->get('caching', $data, ''));
diff --git a/lib/Service/CacheService.php b/lib/Service/CacheService.php
new file mode 100644
index 00000000..a2cdef98
--- /dev/null
+++ b/lib/Service/CacheService.php
@@ -0,0 +1,199 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.com>
+ * @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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Social\Service;
+
+
+use daita\MySmallPhpTools\Model\Request;
+use OCA\Social\Exceptions\RequestException;
+
+class CurlService {
+
+
+	/** @var MiscService */
+	private $miscService;
+
+
+	/**
+	 * CurlService constructor.
+	 *
+	 * @param MiscService $miscService
+	 */
+	public function __construct(MiscService $miscService) {
+		$this->miscService = $miscService;
+	}
+
+
+	/**
+	 * @param Request $request
+	 *
+	 * @return array
+	 * @throws RequestException
+	 */
+	public function request(Request $request): array {
+		$curl = $this->initRequest($request);
+
+		$this->initRequestPost($curl, $request);
+		$this->initRequestPut($curl, $request);
+		$this->initRequestDelete($curl, $request);
+
+		$result = curl_exec($curl);
+		$code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+
+		$this->parseRequestResultCode301($code);
+//		$this->parseRequestResultCode401($code);
+		$this->parseRequestResultCode404($code, $request);
+//		$this->parseRequestResultCode503($code);
+//		$this->parseRequestResultCode500($code);
+//		$this->parseRequestResult($result);
+
+		$ret = json_decode((string)$result, true);
+//		if ($ret === null) {
+//			throw new RequestException('500 Internal server error - could not parse JSON response');
+//		}
+		if (!is_array($ret)) {
+			$ret = ['_result' => $result];
+		}
+
+		$ret['_address'] = $request->getAddress();
+		$ret['_path'] = $request->getUrl();
+		$ret['_code'] = $code;
+
+		return $ret;
+	}
+
+
+	/**
+	 * @param Request $request
+	 *
+	 * @return resource
+	 */
+	private function initRequest(Request $request) {
+
+		$curl = $this->generateCurlRequest($request);
+		$headers = $request->getHeaders();
+
+		$headers[] = 'Accept: application/ld+json; profile="https://www.w3.org/ns/activitystreams"';
+
+		curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 10);
+		curl_setopt($curl, CURLOPT_TIMEOUT, 20);
+
+		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
+
+		return $curl;
+	}
+
+
+	/**
+	 * @param Request $request
+	 *
+	 * @return resource
+	 */
+	private function generateCurlRequest(Request $request) {
+		$url = 'https://' . $request->getAddress() . $request->getParsedUrl();
+		if ($request->getType() !== Request::TYPE_GET) {
+			$curl = curl_init($url);
+		} else {
+			$curl = curl_init($url . '?' . $request->getUrlData());
+		}
+
+		return $curl;
+	}
+
+
+	/**
+	 * @param resource $curl
+	 * @param Request $request
+	 */
+	private function initRequestPost($curl, Request $request) {
+		if ($request->getType() !== Request::TYPE_POST) {
+			return;
+		}
+
+		curl_setopt($curl, CURLOPT_POST, true);
+		curl_setopt($curl, CURLOPT_POSTFIELDS, $request->getDataBody());
+	}
+
+
+	/**
+	 * @param resource $curl
+	 * @param Request $request
+	 */
+	private function initRequestPut($curl, Request $request) {
+		if ($request->getType() !== Request::TYPE_PUT) {
+			return;
+		}
+
+		curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PUT");
+		curl_setopt($curl, CURLOPT_POSTFIELDS, $request->getDataBody());
+	}
+
+
+	/**
+	 * @param resource $curl
+	 * @param Request $request
+	 */
+	private function initRequestDelete($curl, Request $request) {
+		if ($request->getType() !== Request::TYPE_DELETE) {
+			return;
+		}
+
+		curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "DELETE");
+		curl_setopt($curl, CURLOPT_POSTFIELDS, $request->getDataBody());
+	}
+
+
+	/**
+	 * @param int $code
+	 *
+	 * @throws RequestException
+	 */
+	private function parseRequestResultCode301($code) {
+		if ($code === 301) {
+			throw new RequestException('301 Moved Permanently');
+		}
+	}
+
+
+	/**
+	 * @param int $code
+	 *
+	 * @param Request $request
+	 *
+	 * @throws RequestException
+	 */
+	private function parseRequestResultCode404(int $code, Request $request) {
+		if ($code === 404) {
+			throw new RequestException('404 Not Found - ' . json_encode($request));
+		}
+	}
+
+
+}

From 832302d678f1ca14dad2ecf2a157ef29a39c687d Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Sat, 24 Nov 2018 13:14:30 -0100
Subject: [PATCH 09/13] new routes

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 appinfo/routes.php                      |  5 +--
 lib/Controller/LocalController.php      | 31 +++++++++++++++++
 lib/Controller/NavigationController.php | 44 +++++++++++++++++--------
 3 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 293d4bb7..6f86395e 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -21,8 +21,8 @@ return [
 			'requirements' => ['path' => '.+'], 'defaults' => ['path' => '']
 		],
 		['name' => 'Navigation#public', 'url' => '/{username}', 'verb' => 'GET'],
-		['name' => 'Navigation#documentsGet', 'url' => '/documents/get', 'verb' => 'GET'],
-		['name' => 'Navigation#documentsGetPublic', 'url' => '/documents/public', 'verb' => 'GET'],
+		['name' => 'Navigation#documentGet', 'url' => '/document/get', 'verb' => 'GET'],
+		['name' => 'Navigation#documentGetPublic', 'url' => '/document/public', 'verb' => 'GET'],
 
 		//		['name' => 'Account#create', 'url' => '/local/account/{username}', 'verb' => 'POST'],
 		['name' => 'Account#info', 'url' => '/local/account/{username}', 'verb' => 'GET'],
@@ -50,6 +50,7 @@ return [
 		['name' => 'Local#accountUnfollow', 'url' => '/api/v1/account/follow', 'verb' => 'DELETE'],
 		['name' => 'Local#accountInfo', 'url' => '/api/v1/account/info', 'verb' => 'GET'],
 		['name' => 'Local#actorInfo', 'url' => '/api/v1/actor/info', 'verb' => 'GET'],
+		['name' => 'Local#documentsCache', 'url' => '/api/v1/documents/cache', 'verb' => 'POST'],
 
 		[
 			'name' => 'Config#setCloudAddress', 'url' => '/api/v1/config/cloudAddress',
diff --git a/lib/Controller/LocalController.php b/lib/Controller/LocalController.php
index cd6bb0f3..1217d523 100644
--- a/lib/Controller/LocalController.php
+++ b/lib/Controller/LocalController.php
@@ -398,4 +398,35 @@ class LocalController extends Controller {
 		}
 	}
 
+
+	/**
+	 * // TODO: Delete the NoCSRF check
+	 *
+	 * @NoCSRFRequired
+	 * @NoAdminRequired
+	 * @NoSubAdminRequired
+	 *
+	 * @param array $documents
+	 *
+	 * @return DataResponse
+	 */
+	public function documentsCache(array $documents): DataResponse {
+		try {
+			$cached = [];
+			foreach ($documents as $id) {
+				try {
+
+					$document = $this->documentService->cacheRemoteDocument($id);
+					$cached[] = $document;
+				} catch (Exception $e) {
+				}
+			}
+
+			return $this->success($cached);
+		} catch (Exception $e) {
+			return $this->fail($e);
+		}
+	}
+
 }
+
diff --git a/lib/Controller/NavigationController.php b/lib/Controller/NavigationController.php
index 2801bcb3..864b9eb8 100644
--- a/lib/Controller/NavigationController.php
+++ b/lib/Controller/NavigationController.php
@@ -33,16 +33,21 @@ namespace OCA\Social\Controller;
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use daita\MySmallPhpTools\Traits\Nextcloud\TNCDataResponse;
 use Exception;
+use OC\Files\Node\File;
+use OC\Files\SimpleFS\SimpleFile;
 use OC\User\NoUserException;
 use OCA\Social\AppInfo\Application;
 use OCA\Social\Exceptions\AccountAlreadyExistsException;
 use OCA\Social\Exceptions\SocialAppConfigException;
+use OCA\Social\Service\ActivityPub\DocumentService;
 use OCA\Social\Service\ActorService;
 use OCA\Social\Service\ConfigService;
 use OCA\Social\Service\MiscService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\Http\FileDisplayResponse;
 use OCP\AppFramework\Http\RedirectResponse;
+use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Http\Template\PublicTemplateResponse;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
@@ -69,6 +74,8 @@ class NavigationController extends Controller {
 	/** @var ActorService */
 	private $actorService;
 
+	private $documentService;
+
 	/** @var ConfigService */
 	private $configService;
 
@@ -86,14 +93,15 @@ class NavigationController extends Controller {
 	 * @param IConfig $config
 	 * @param IURLGenerator $urlGenerator
 	 * @param ActorService $actorService
+	 * @param DocumentService $documentService
 	 * @param ConfigService $configService
 	 * @param MiscService $miscService
 	 * @param IL10N $l10n
 	 */
 	public function __construct(
 		IRequest $request, $userId, IConfig $config, IURLGenerator $urlGenerator,
-		ActorService $actorService, ConfigService $configService, MiscService $miscService,
-		IL10N $l10n
+		ActorService $actorService, DocumentService $documentService, ConfigService $configService,
+		MiscService $miscService, IL10N $l10n
 	) {
 		parent::__construct(Application::APP_NAME, $request);
 
@@ -102,6 +110,7 @@ class NavigationController extends Controller {
 		$this->urlGenerator = $urlGenerator;
 
 		$this->actorService = $actorService;
+		$this->documentService = $documentService;
 		$this->configService = $configService;
 		$this->miscService = $miscService;
 		$this->l10n = $l10n;
@@ -131,13 +140,18 @@ class NavigationController extends Controller {
 			$data['serverData']['cloudAddress'] = $this->configService->getCloudAddress();
 		} catch (SocialAppConfigException $e) {
 			$data['serverData']['setup'] = true;
-			$data['serverData']['isAdmin'] = \OC::$server->getGroupManager()->isAdmin($this->userId);
+			$data['serverData']['isAdmin'] = \OC::$server->getGroupManager()
+														 ->isAdmin($this->userId);
 			if ($data['serverData']['isAdmin']) {
 				$cloudAddress = $this->request->getParam('cloudAddress');
 				if ($cloudAddress !== null) {
 					$this->configService->setCloudAddress($cloudAddress);
 				} else {
-					$data['serverData']['cliUrl'] = $this->config->getSystemValue('overwrite.cli.url', \OC::$server->getURLGenerator()->getBaseUrl());
+					$data['serverData']['cliUrl'] = $this->config->getSystemValue(
+						'overwrite.cli.url', \OC::$server->getURLGenerator()
+														 ->getBaseUrl()
+					);
+
 					return new TemplateResponse(Application::APP_NAME, 'main', $data);
 				}
 			}
@@ -154,8 +168,6 @@ class NavigationController extends Controller {
 	}
 
 
-
-
 	/**
 	 * Display the navigation page of the Social app.
 	 *
@@ -239,7 +251,6 @@ class NavigationController extends Controller {
 	}
 
 
-
 	/**
 	 *
 	 * // TODO: Delete the NoCSRF check
@@ -250,11 +261,14 @@ class NavigationController extends Controller {
 	 *
 	 * @param string $id
 	 *
-	 * @return DataResponse
+	 * @return Response
 	 */
-	public function documentsGet(string $id): DataResponse {
+	public function documentGet(string $id): Response {
+
 		try {
-			return $this->success([$id]);
+			$file = $this->documentService->getFromCache($id);
+
+			return new FileDisplayResponse($file);
 		} catch (Exception $e) {
 			return $this->fail($e);
 		}
@@ -272,14 +286,18 @@ class NavigationController extends Controller {
 	 *
 	 * @param string $id
 	 *
-	 * @return DataResponse
+	 * @return Response
 	 */
-	public function documentsGetPublic(string $id): DataResponse {
+	public function documentGetPublic(string $id): Response {
+
 		try {
-			return $this->success([$id]);
+			$file = $this->documentService->getFromCache($id, true);
+
+			return new FileDisplayResponse($file);
 		} catch (Exception $e) {
 			return $this->fail($e);
 		}
 	}
 
 }
+

From 90a5a13dfb12bbb7faccfe7207b16abe0e2be1b3 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Sat, 24 Nov 2018 13:15:26 -0100
Subject: [PATCH 10/13] Caching

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 lib/Db/CacheDocumentsRequest.php            |  61 +++++-
 lib/Db/CacheDocumentsRequestBuilder.php     |   5 +-
 lib/Db/CoreRequestBuilder.php               |  12 +-
 lib/Exceptions/CacheContentException.php    |   8 +
 lib/Service/ActivityPub/DocumentService.php |  62 ++++++-
 lib/Service/CacheService.php                | 194 +++++++-------------
 6 files changed, 206 insertions(+), 136 deletions(-)
 create mode 100644 lib/Exceptions/CacheContentException.php

diff --git a/lib/Db/CacheDocumentsRequest.php b/lib/Db/CacheDocumentsRequest.php
index 7837ad5d..fa6f8935 100644
--- a/lib/Db/CacheDocumentsRequest.php
+++ b/lib/Db/CacheDocumentsRequest.php
@@ -32,8 +32,6 @@ namespace OCA\Social\Db;
 
 use DateTime;
 use OCA\Social\Exceptions\CacheDocumentDoesNotExistException;
-use OCA\Social\Exceptions\SocialAppConfigException;
-use OCA\Social\Exceptions\UrlCloudException;
 use OCA\Social\Model\ActivityPub\Document;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 
@@ -50,7 +48,9 @@ class CacheDocumentsRequest extends CacheDocumentsRequestBuilder {
 		$qb->setValue('id', $qb->createNamedParameter($document->getId()))
 		   ->setValue('type', $qb->createNamedParameter($document->getType()))
 		   ->setValue('url', $qb->createNamedParameter($document->getUrl()))
+		   ->setValue('media_type', $qb->createNamedParameter($document->getMediaType()))
 		   ->setValue('local_copy', $qb->createNamedParameter($document->getLocalCopy()))
+		   ->setValue('public', $qb->createNamedParameter(($document->isPublic()) ? '1' : '0'))
 		   ->setValue(
 			   'creation',
 			   $qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
@@ -59,18 +59,69 @@ class CacheDocumentsRequest extends CacheDocumentsRequestBuilder {
 	}
 
 
+	/**
+	 * @param Document $document
+	 */
+	public function initCaching(Document $document) {
+		$qb = $this->getCacheDocumentsUpdateSql();
+		$this->limitToIdString($qb, $document->getId());
+		$qb->set(
+			'caching', $qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
+		);
+
+		$qb->execute();
+	}
+
+
+	/**
+	 * @param Document $document
+	 */
+	public function endCaching(Document $document) {
+		$qb = $this->getCacheDocumentsUpdateSql();
+		$this->limitToIdString($qb, $document->getId());
+		$qb->set('local_copy', $qb->createNamedParameter($document->getLocalCopy()));
+
+		$qb->execute();
+	}
+
+
 	/**
 	 * @param string $url
 	 *
 	 * @return Document
 	 * @throws CacheDocumentDoesNotExistException
-	 * @throws SocialAppConfigException
-	 * @throws UrlCloudException
 	 */
-	public function getFromSource(string $url) {
+	public function getBySource(string $url) {
 		$qb = $this->getCacheDocumentsSelectSql();
 		$this->limitToUrl($qb, $url);
 
+		$cursor = $qb->execute();
+		$data = $cursor->fetch();
+		$cursor->closeCursor();
+
+		if ($data === false) {
+			throw new CacheDocumentDoesNotExistException();
+		}
+
+		return $this->parseCacheDocumentsSelectSql($data);
+	}
+
+
+	/**
+	 * @param string $id
+	 *
+	 * @param bool $public
+	 *
+	 * @return Document
+	 * @throws CacheDocumentDoesNotExistException
+	 */
+	public function getById(string $id, bool $public = false) {
+		$qb = $this->getCacheDocumentsSelectSql();
+		$this->limitToIdString($qb, $id);
+
+		if ($public === true) {
+			$this->limitToPublic($qb);
+		}
 
 		$cursor = $qb->execute();
 		$data = $cursor->fetch();
diff --git a/lib/Db/CacheDocumentsRequestBuilder.php b/lib/Db/CacheDocumentsRequestBuilder.php
index 853ed0f4..6e52293e 100644
--- a/lib/Db/CacheDocumentsRequestBuilder.php
+++ b/lib/Db/CacheDocumentsRequestBuilder.php
@@ -79,7 +79,7 @@ class CacheDocumentsRequestBuilder extends CoreRequestBuilder {
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->select(
 			'cd.id', 'cd.type', 'cd.media_type', 'cd.mime_type', 'cd.url', 'cd.local_copy',
-			'cd.creation', 'cd.caching'
+			'cd.public', 'cd.creation', 'cd.caching'
 		)
 		   ->from(self::TABLE_CACHE_DOCUMENTS, 'cd');
 
@@ -106,12 +106,9 @@ class CacheDocumentsRequestBuilder extends CoreRequestBuilder {
 	 * @param array $data
 	 *
 	 * @return Document
-	 * @throws UrlCloudException
-	 * @throws SocialAppConfigException
 	 */
 	protected function parseCacheDocumentsSelectSql(array $data): Document {
 		$document = new Document();
-		$document->setUrlCloud($this->configService->getCloudAddress());
 		$document->importFromDatabase($data);
 
 		return $document;
diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php
index 902b0888..f5d2053c 100644
--- a/lib/Db/CoreRequestBuilder.php
+++ b/lib/Db/CoreRequestBuilder.php
@@ -33,7 +33,6 @@ namespace OCA\Social\Db;
 
 use Doctrine\DBAL\Query\QueryBuilder;
 use OCA\Social\Exceptions\InvalidResourceException;
-use OCA\Social\Exceptions\UrlCloudException;
 use OCA\Social\Model\ActivityPub\Document;
 use OCA\Social\Model\ActivityPub\Image;
 use OCA\Social\Model\ActivityPub\Person;
@@ -146,6 +145,17 @@ class CoreRequestBuilder {
 	}
 
 
+	/**
+	 * Limit the request to the ActorId
+	 *
+	 * @param IQueryBuilder $qb
+	 */
+	protected function limitToPublic(IQueryBuilder &$qb) {
+		$this->limitToDBFieldInt($qb, 'public', 1);
+	}
+
+
+
 	/**
 	 * Limit the request to the ActorId
 	 *
diff --git a/lib/Exceptions/CacheContentException.php b/lib/Exceptions/CacheContentException.php
new file mode 100644
index 00000000..7ef15f28
--- /dev/null
+++ b/lib/Exceptions/CacheContentException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace OCA\Social\Exceptions;
+
+class CacheContentException extends \Exception {
+
+}
+
diff --git a/lib/Service/ActivityPub/DocumentService.php b/lib/Service/ActivityPub/DocumentService.php
index dc72c46a..8f6bc8e0 100644
--- a/lib/Service/ActivityPub/DocumentService.php
+++ b/lib/Service/ActivityPub/DocumentService.php
@@ -27,20 +27,31 @@ declare(strict_types=1);
  *
  */
 
+
 namespace OCA\Social\Service\ActivityPub;
 
 
 use OCA\Social\Db\CacheDocumentsRequest;
+use OCA\Social\Exceptions\CacheContentException;
+use OCA\Social\Exceptions\CacheDocumentDoesNotExistException;
 use OCA\Social\Model\ActivityPub\ACore;
+use OCA\Social\Model\ActivityPub\Document;
+use OCA\Social\Service\CacheService;
 use OCA\Social\Service\ICoreService;
 use OCA\Social\Service\MiscService;
+use OCP\Files\NotPermittedException;
+use OCP\Files\SimpleFS\ISimpleFile;
 
 
 class DocumentService implements ICoreService {
 
+
 	/** @var CacheDocumentsRequest */
 	private $cacheDocumentsRequest;
 
+	/** @var CacheService */
+	private $cacheService;
+
 	/** @var MiscService */
 	private $miscService;
 
@@ -49,18 +60,65 @@ class DocumentService implements ICoreService {
 	 * DocumentService constructor.
 	 *
 	 * @param CacheDocumentsRequest $cacheDocumentsRequest
+	 * @param CacheService $cacheService
 	 * @param MiscService $miscService
 	 */
 	public function __construct(
-		CacheDocumentsRequest $cacheDocumentsRequest, MiscService $miscService
+		CacheDocumentsRequest $cacheDocumentsRequest, CacheService $cacheService,
+		MiscService $miscService
 	) {
 		$this->cacheDocumentsRequest = $cacheDocumentsRequest;
+		$this->cacheService = $cacheService;
 		$this->miscService = $miscService;
 	}
 
 
-	public function getFromCache(array $documents) {
+	/**
+	 * @param string $id
+	 *
+	 * @return Document
+	 * @throws CacheDocumentDoesNotExistException
+	 * @throws NotPermittedException
+	 */
+	public function cacheRemoteDocument(string $id) {
+		$document = $this->cacheDocumentsRequest->getById($id);
+		if ($document->getLocalCopy() !== '') {
+			return $document;
+		}
 
+		// TODO - check the size of the attachment, also to stop download after a certain size of content.
+		// TODO - ignore this is getCaching is older than 15 minutes
+		if ($document->getCaching() !== '') {
+			return $document;
+		}
+
+		$this->cacheDocumentsRequest->initCaching($document);
+
+		try {
+			$localCopy = $this->cacheService->saveRemoteFileToCache($document->getUrl(), $mime);
+			$document->setMimeType($mime);
+			$document->setLocalCopy($localCopy);
+			$this->cacheDocumentsRequest->endCaching($document);
+		} catch (CacheContentException $e) {
+		}
+
+		return $document;
+	}
+
+
+	/**
+	 * @param string $id
+	 *
+	 * @param bool $public
+	 *
+	 * @return ISimpleFile
+	 * @throws CacheContentException
+	 * @throws CacheDocumentDoesNotExistException
+	 */
+	public function getFromCache(string $id, bool $public = false) {
+		$document = $this->cacheDocumentsRequest->getById($id, $public);
+
+		return $this->cacheService->getContentFromCache($document->getLocalCopy());
 	}
 
 
diff --git a/lib/Service/CacheService.php b/lib/Service/CacheService.php
index a2cdef98..a9d27b51 100644
--- a/lib/Service/CacheService.php
+++ b/lib/Service/CacheService.php
@@ -30,169 +30,115 @@ declare(strict_types=1);
 namespace OCA\Social\Service;
 
 
-use daita\MySmallPhpTools\Model\Request;
-use OCA\Social\Exceptions\RequestException;
+use Exception;
+use OCA\Social\Exceptions\CacheContentException;
+use OCP\Files\IAppData;
+use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
+use OCP\Files\SimpleFS\ISimpleFile;
 
-class CurlService {
 
+class CacheService {
+
+
+	/** @var IAppData */
+	private $appData;
 
 	/** @var MiscService */
 	private $miscService;
 
 
 	/**
-	 * CurlService constructor.
+	 * CacheService constructor.
 	 *
+	 * @param IAppData $appData
 	 * @param MiscService $miscService
 	 */
-	public function __construct(MiscService $miscService) {
+	public function __construct(IAppData $appData, MiscService $miscService) {
+		$this->appData = $appData;
 		$this->miscService = $miscService;
 	}
 
 
 	/**
-	 * @param Request $request
+	 * @param string $url
 	 *
-	 * @return array
-	 * @throws RequestException
-	 */
-	public function request(Request $request): array {
-		$curl = $this->initRequest($request);
-
-		$this->initRequestPost($curl, $request);
-		$this->initRequestPut($curl, $request);
-		$this->initRequestDelete($curl, $request);
-
-		$result = curl_exec($curl);
-		$code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-
-		$this->parseRequestResultCode301($code);
-//		$this->parseRequestResultCode401($code);
-		$this->parseRequestResultCode404($code, $request);
-//		$this->parseRequestResultCode503($code);
-//		$this->parseRequestResultCode500($code);
-//		$this->parseRequestResult($result);
-
-		$ret = json_decode((string)$result, true);
-//		if ($ret === null) {
-//			throw new RequestException('500 Internal server error - could not parse JSON response');
-//		}
-		if (!is_array($ret)) {
-			$ret = ['_result' => $result];
-		}
-
-		$ret['_address'] = $request->getAddress();
-		$ret['_path'] = $request->getUrl();
-		$ret['_code'] = $code;
-
-		return $ret;
-	}
-
-
-	/**
-	 * @param Request $request
+	 * @param string $mime
 	 *
-	 * @return resource
+	 * @return string
+	 * @throws CacheContentException
+	 * @throws NotPermittedException
 	 */
-	private function initRequest(Request $request) {
+	public function saveRemoteFileToCache(string $url, &$mime = '') {
 
-		$curl = $this->generateCurlRequest($request);
-		$headers = $request->getHeaders();
+		$filename = sprintf(
+			'%04x%04x-%04x-%04x-%04x-%04x%04x%04x', mt_rand(0, 0xffff), mt_rand(0, 0xffff),
+			mt_rand(0, 0xffff), mt_rand(0, 0xfff) | 0x4000, mt_rand(0, 0x3fff) | 0x8000,
+			mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
+		);
 
-		$headers[] = 'Accept: application/ld+json; profile="https://www.w3.org/ns/activitystreams"';
+		// creating a path aa/bb/cc/dd/ from the filename aabbccdd-0123-[...]
+		$path = chunk_split(substr($filename, 0, 8), 2, '/');
 
-		curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 10);
-		curl_setopt($curl, CURLOPT_TIMEOUT, 20);
+		try {
+			$folder = $this->appData->getFolder($path);
+		} catch (NotFoundException $e) {
+			$folder = $this->appData->newFolder($path);
+		}
 
-		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
+		$content = $this->retrieveContent($url);
 
-		return $curl;
+		// TODO - get mime type in a better way.
+		// To get the mime type, we create a temp file
+		$tmpFile = tmpfile();
+		$tmpPath = stream_get_meta_data($tmpFile)['uri'];
+		fwrite($tmpFile, $content);
+		$mime = mime_content_type($tmpPath);
+		fclose($tmpFile);
+
+		$cache = $folder->newFile($filename);
+		$cache->putContent($content);
+
+		return $path . $filename;
 	}
 
 
 	/**
-	 * @param Request $request
+	 * @param string $path
 	 *
-	 * @return resource
+	 * @return ISimpleFile
+	 * @throws CacheContentException
 	 */
-	private function generateCurlRequest(Request $request) {
-		$url = 'https://' . $request->getAddress() . $request->getParsedUrl();
-		if ($request->getType() !== Request::TYPE_GET) {
-			$curl = curl_init($url);
-		} else {
-			$curl = curl_init($url . '?' . $request->getUrlData());
-		}
+	public function getContentFromCache(string $path) {
 
-		return $curl;
+		$pos = strrpos($path, '/');
+		$dir = substr($path, 0, $pos);
+		$filename = substr($path, $pos + 1);
+
+		try {
+			$file = $this->appData->getFolder($dir)
+								  ->getFile($filename);
+
+			return $file;
+		} catch (Exception $e) {
+			throw new CacheContentException();
+		}
 	}
 
 
 	/**
-	 * @param resource $curl
-	 * @param Request $request
-	 */
-	private function initRequestPost($curl, Request $request) {
-		if ($request->getType() !== Request::TYPE_POST) {
-			return;
-		}
-
-		curl_setopt($curl, CURLOPT_POST, true);
-		curl_setopt($curl, CURLOPT_POSTFIELDS, $request->getDataBody());
-	}
-
-
-	/**
-	 * @param resource $curl
-	 * @param Request $request
-	 */
-	private function initRequestPut($curl, Request $request) {
-		if ($request->getType() !== Request::TYPE_PUT) {
-			return;
-		}
-
-		curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PUT");
-		curl_setopt($curl, CURLOPT_POSTFIELDS, $request->getDataBody());
-	}
-
-
-	/**
-	 * @param resource $curl
-	 * @param Request $request
-	 */
-	private function initRequestDelete($curl, Request $request) {
-		if ($request->getType() !== Request::TYPE_DELETE) {
-			return;
-		}
-
-		curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "DELETE");
-		curl_setopt($curl, CURLOPT_POSTFIELDS, $request->getDataBody());
-	}
-
-
-	/**
-	 * @param int $code
+	 * @param string $url
 	 *
-	 * @throws RequestException
+	 * @return string
+	 * @throws CacheContentException
 	 */
-	private function parseRequestResultCode301($code) {
-		if ($code === 301) {
-			throw new RequestException('301 Moved Permanently');
+	public function retrieveContent(string $url) {
+		$content = file_get_contents($url);
+		if ($content === false) {
+			throw new CacheContentException();
 		}
-	}
 
-
-	/**
-	 * @param int $code
-	 *
-	 * @param Request $request
-	 *
-	 * @throws RequestException
-	 */
-	private function parseRequestResultCode404(int $code, Request $request) {
-		if ($code === 404) {
-			throw new RequestException('404 Not Found - ' . json_encode($request));
-		}
+		return $content;
 	}
 
 

From 7c7eb188486f7918c77c0330f8e8ea7192c730e2 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Sat, 24 Nov 2018 13:15:33 -0100
Subject: [PATCH 11/13] fix

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 lib/Service/ActivityPub/PersonService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Service/ActivityPub/PersonService.php b/lib/Service/ActivityPub/PersonService.php
index 871bf7a3..a657661a 100644
--- a/lib/Service/ActivityPub/PersonService.php
+++ b/lib/Service/ActivityPub/PersonService.php
@@ -249,7 +249,7 @@ class PersonService implements ICoreService {
 
 		if ($person->gotIcon()) {
 			try {
-				$icon = $this->cacheDocumentsRequest->getFromSource(
+				$icon = $this->cacheDocumentsRequest->getBySource(
 					$person->getIcon()
 						   ->getUrl()
 				);

From 4b516940d0521471232fe8eed7772a45b1e71219 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Sun, 25 Nov 2018 11:50:12 -0100
Subject: [PATCH 12/13] error on too big document

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 appinfo/database.xml                         |  7 +++++
 appinfo/info.xml                             |  2 +-
 lib/Db/CacheDocumentsRequest.php             |  1 +
 lib/Db/CacheDocumentsRequestBuilder.php      |  4 +--
 lib/Db/CoreRequestBuilder.php                |  3 +-
 lib/Exceptions/CacheContentSizeException.php |  8 +++++
 lib/Model/ActivityPub/Document.php           | 23 +++++++++++++++
 lib/Service/ActivityPub/DocumentService.php  |  3 ++
 lib/Service/CacheService.php                 | 31 ++++++++++++++++++--
 lib/Service/ConfigService.php                | 21 ++++++++++++-
 10 files changed, 94 insertions(+), 9 deletions(-)
 create mode 100644 lib/Exceptions/CacheContentSizeException.php

diff --git a/appinfo/database.xml b/appinfo/database.xml
index 21f239a2..54153c46 100644
--- a/appinfo/database.xml
+++ b/appinfo/database.xml
@@ -434,6 +434,13 @@
 				<notnull>true</notnull>
 			</field>
 
+			<field>
+				<name>error</name>
+				<type>integer</type>
+				<length>1</length>
+				<notnull>true</notnull>
+			</field>
+
 			<field>
 				<name>creation</name>
 				<type>timestamp</type>
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 55a16624..c036e24c 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -5,7 +5,7 @@
 	<name>Social</name>
 	<summary>🎉 Nextcloud becomes part of the federated social networks!</summary>
 	<description><![CDATA[test]]></description>
-	<version>0.0.42</version>
+	<version>0.0.43</version>
 	<licence>agpl</licence>
 	<author mail="maxence@artificial-owl.com">Maxence Lange</author>
 	<author mail="jus@bitgrid.net">Julius Härtl</author>
diff --git a/lib/Db/CacheDocumentsRequest.php b/lib/Db/CacheDocumentsRequest.php
index fa6f8935..70484f39 100644
--- a/lib/Db/CacheDocumentsRequest.php
+++ b/lib/Db/CacheDocumentsRequest.php
@@ -80,6 +80,7 @@ class CacheDocumentsRequest extends CacheDocumentsRequestBuilder {
 		$qb = $this->getCacheDocumentsUpdateSql();
 		$this->limitToIdString($qb, $document->getId());
 		$qb->set('local_copy', $qb->createNamedParameter($document->getLocalCopy()));
+		$qb->set('error', $qb->createNamedParameter($document->getError()));
 
 		$qb->execute();
 	}
diff --git a/lib/Db/CacheDocumentsRequestBuilder.php b/lib/Db/CacheDocumentsRequestBuilder.php
index 6e52293e..56e0c223 100644
--- a/lib/Db/CacheDocumentsRequestBuilder.php
+++ b/lib/Db/CacheDocumentsRequestBuilder.php
@@ -31,8 +31,6 @@ namespace OCA\Social\Db;
 
 
 use daita\MySmallPhpTools\Traits\TArrayTools;
-use OCA\Social\Exceptions\SocialAppConfigException;
-use OCA\Social\Exceptions\UrlCloudException;
 use OCA\Social\Model\ActivityPub\Document;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 
@@ -79,7 +77,7 @@ class CacheDocumentsRequestBuilder extends CoreRequestBuilder {
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->select(
 			'cd.id', 'cd.type', 'cd.media_type', 'cd.mime_type', 'cd.url', 'cd.local_copy',
-			'cd.public', 'cd.creation', 'cd.caching'
+			'cd.public', 'cd.error', 'cd.creation', 'cd.caching'
 		)
 		   ->from(self::TABLE_CACHE_DOCUMENTS, 'cd');
 
diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php
index f5d2053c..2e598bc2 100644
--- a/lib/Db/CoreRequestBuilder.php
+++ b/lib/Db/CoreRequestBuilder.php
@@ -155,7 +155,6 @@ class CoreRequestBuilder {
 	}
 
 
-
 	/**
 	 * Limit the request to the ActorId
 	 *
@@ -477,6 +476,8 @@ class CoreRequestBuilder {
 		   ->selectAlias('cd.url', 'cachedocument_url')
 		   ->selectAlias('cd.local_copy', 'cachedocument_local_copy')
 		   ->selectAlias('cd.caching', 'cachedocument_caching')
+		   ->selectAlias('cd.public', 'cachedocument_public')
+		   ->selectAlias('cd.error', 'cachedocument_error')
 		   ->selectAlias('ca.creation', 'cachedocument_creation')
 		   ->leftJoin(
 			   $this->defaultSelectAlias, CoreRequestBuilder::TABLE_CACHE_DOCUMENTS, 'cd',
diff --git a/lib/Exceptions/CacheContentSizeException.php b/lib/Exceptions/CacheContentSizeException.php
new file mode 100644
index 00000000..1a264915
--- /dev/null
+++ b/lib/Exceptions/CacheContentSizeException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace OCA\Social\Exceptions;
+
+class CacheContentSizeException extends \Exception {
+
+}
+
diff --git a/lib/Model/ActivityPub/Document.php b/lib/Model/ActivityPub/Document.php
index 317917f1..040d68d5 100644
--- a/lib/Model/ActivityPub/Document.php
+++ b/lib/Model/ActivityPub/Document.php
@@ -61,6 +61,9 @@ class Document extends ACore implements JsonSerializable {
 	/** @var bool */
 	private $public = false;
 
+	/** @var int */
+	private $error = 0;
+
 
 	/**
 	 * Document constructor.
@@ -150,6 +153,25 @@ class Document extends ACore implements JsonSerializable {
 	}
 
 
+	/**
+	 * @return int
+	 */
+	public function getError(): int {
+		return $this->error;
+	}
+
+	/**
+	 * @param int $error
+	 *
+	 * @return Document
+	 */
+	public function setError(int $error): Document {
+		$this->error = $error;
+
+		return $this;
+	}
+
+
 	/**
 	 * @return string
 	 */
@@ -192,6 +214,7 @@ class Document extends ACore implements JsonSerializable {
 		parent::importFromDatabase($data);
 
 		$this->setPublic(($this->getInt('public', $data, 0) === 1) ? true : false);
+		$this->setError($this->getInt('error', $data, 0));
 		$this->setLocalCopy($this->get('local_copy', $data, ''));
 		$this->setMediaType($this->get('media_type', $data, ''));
 		$this->setMimeType($this->get('mime_type', $data, ''));
diff --git a/lib/Service/ActivityPub/DocumentService.php b/lib/Service/ActivityPub/DocumentService.php
index 8f6bc8e0..94e4c085 100644
--- a/lib/Service/ActivityPub/DocumentService.php
+++ b/lib/Service/ActivityPub/DocumentService.php
@@ -33,6 +33,7 @@ namespace OCA\Social\Service\ActivityPub;
 
 use OCA\Social\Db\CacheDocumentsRequest;
 use OCA\Social\Exceptions\CacheContentException;
+use OCA\Social\Exceptions\CacheContentSizeException;
 use OCA\Social\Exceptions\CacheDocumentDoesNotExistException;
 use OCA\Social\Model\ActivityPub\ACore;
 use OCA\Social\Model\ActivityPub\Document;
@@ -99,6 +100,8 @@ class DocumentService implements ICoreService {
 			$document->setMimeType($mime);
 			$document->setLocalCopy($localCopy);
 			$this->cacheDocumentsRequest->endCaching($document);
+		} catch (CacheContentSizeException $e) {
+			$this->cacheDocumentsRequest->endCaching($document);
 		} catch (CacheContentException $e) {
 		}
 
diff --git a/lib/Service/CacheService.php b/lib/Service/CacheService.php
index a9d27b51..60c5827a 100644
--- a/lib/Service/CacheService.php
+++ b/lib/Service/CacheService.php
@@ -32,6 +32,7 @@ namespace OCA\Social\Service;
 
 use Exception;
 use OCA\Social\Exceptions\CacheContentException;
+use OCA\Social\Exceptions\CacheContentSizeException;
 use OCP\Files\IAppData;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
@@ -41,9 +42,15 @@ use OCP\Files\SimpleFS\ISimpleFile;
 class CacheService {
 
 
+	const ERROR_MAX_SIZE = 1;
+
+
 	/** @var IAppData */
 	private $appData;
 
+	/** @var ConfigService */
+	private $configService;
+
 	/** @var MiscService */
 	private $miscService;
 
@@ -52,10 +59,14 @@ class CacheService {
 	 * CacheService constructor.
 	 *
 	 * @param IAppData $appData
+	 * @param ConfigService $configService
 	 * @param MiscService $miscService
 	 */
-	public function __construct(IAppData $appData, MiscService $miscService) {
+	public function __construct(
+		IAppData $appData, ConfigService $configService, MiscService $miscService
+	) {
 		$this->appData = $appData;
+		$this->configService = $configService;
 		$this->miscService = $miscService;
 	}
 
@@ -68,6 +79,7 @@ class CacheService {
 	 * @return string
 	 * @throws CacheContentException
 	 * @throws NotPermittedException
+	 * @throws CacheContentSizeException
 	 */
 	public function saveRemoteFileToCache(string $url, &$mime = '') {
 
@@ -131,13 +143,26 @@ class CacheService {
 	 *
 	 * @return string
 	 * @throws CacheContentException
+	 * @throws CacheContentSizeException
 	 */
 	public function retrieveContent(string $url) {
-		$content = file_get_contents($url);
-		if ($content === false) {
+		$maxSize =
+			$this->configService->getAppValueInt(ConfigService::SOCIAL_MAX_SIZE) * 1024 * 1024;
+
+		$fd = fopen($url, "r");
+		if ($fd === false) {
 			throw new CacheContentException();
 		}
 
+		$content = '';
+		while (!feof($fd)) {
+			$content .= fread($fd, 4096);
+			if (strlen($content) > $maxSize) {
+				throw new CacheContentSizeException();
+			}
+		}
+		fclose($fd);
+
 		return $content;
 	}
 
diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php
index 578db10e..34d4bb16 100644
--- a/lib/Service/ConfigService.php
+++ b/lib/Service/ConfigService.php
@@ -52,10 +52,12 @@ class ConfigService {
 
 
 	const SOCIAL_ADDRESS = 'address';
+	const SOCIAL_MAX_SIZE = 'max_size';
 
 	/** @var array */
 	public $defaults = [
-		self::SOCIAL_ADDRESS => ''
+		self::SOCIAL_ADDRESS  => '',
+		self::SOCIAL_MAX_SIZE => 25
 	];
 
 	/** @var string */
@@ -111,6 +113,22 @@ class ConfigService {
 		return $this->config->getAppValue(Application::APP_NAME, $key, $defaultValue);
 	}
 
+	/**
+	 * Get a value by key
+	 *
+	 * @param string $key
+	 *
+	 * @return int
+	 */
+	public function getAppValueInt(string $key): int {
+		$defaultValue = null;
+		if (array_key_exists($key, $this->defaults)) {
+			$defaultValue = $this->defaults[$key];
+		}
+
+		return (int)$this->config->getAppValue(Application::APP_NAME, $key, $defaultValue);
+	}
+
 	/**
 	 * Set a value by key
 	 *
@@ -248,6 +266,7 @@ class ConfigService {
 
 	/**
 	 * // TODO - check the Apps folder
+	 *
 	 * @return string
 	 * @throws SocialAppConfigException
 	 */

From 5610142a090c0c4328bcc51596b1624b16bee272 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Mon, 26 Nov 2018 11:33:48 -0100
Subject: [PATCH 13/13] managing Cache from Cron and Command line

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 appinfo/info.xml                            |   5 +
 lib/Command/CacheRefresh.php                | 117 ++++++++++++++++++++
 lib/Cron/Cache.php                          | 114 +++++++++++++++++++
 lib/Db/ActorsRequest.php                    |  18 +++
 lib/Db/CacheActorsRequest.php               |  55 ++++-----
 lib/Db/CacheDocumentsRequest.php            |  24 ++++
 lib/Db/CoreRequestBuilder.php               |  73 +++++++++++-
 lib/Model/ActivityPub/Document.php          |  21 ++--
 lib/Service/ActivityPub/DocumentService.php |  23 +++-
 lib/Service/ActivityPub/PersonService.php   |  18 +++
 lib/Service/ActorService.php                |  30 +++--
 11 files changed, 447 insertions(+), 51 deletions(-)
 create mode 100644 lib/Command/CacheRefresh.php
 create mode 100644 lib/Cron/Cache.php

diff --git a/appinfo/info.xml b/appinfo/info.xml
index c036e24c..1283707a 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -26,7 +26,12 @@
 		</navigation>
 	</navigations>
 
+	<background-jobs>
+		<job>OCA\Social\Cron\Cache</job>
+	</background-jobs>
+
 	<commands>
+		<command>OCA\Social\Command\CacheRefresh</command>
 		<command>OCA\Social\Command\NoteCreate</command>
 	</commands>
 
diff --git a/lib/Command/CacheRefresh.php b/lib/Command/CacheRefresh.php
new file mode 100644
index 00000000..fae76806
--- /dev/null
+++ b/lib/Command/CacheRefresh.php
@@ -0,0 +1,117 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.com>
+ * @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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\Social\Command;
+
+
+use Exception;
+use OC\Core\Command\Base;
+use OCA\Social\Service\ActivityPub\DocumentService;
+use OCA\Social\Service\ActivityPub\PersonService;
+use OCA\Social\Service\ActorService;
+use OCA\Social\Service\ConfigService;
+use OCA\Social\Service\MiscService;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+
+class CacheRefresh extends Base {
+
+
+	/** @var ActorService */
+	private $actorService;
+
+	/** @var PersonService */
+	private $personService;
+
+	/** @var DocumentService */
+	private $documentService;
+
+	/** @var ConfigService */
+	private $configService;
+
+	/** @var MiscService */
+	private $miscService;
+
+
+	/**
+	 * CacheUpdate constructor.
+	 *
+	 * @param ActorService $actorService
+	 * @param PersonService $personService
+	 * @param DocumentService $documentService
+	 * @param ConfigService $configService
+	 * @param MiscService $miscService
+	 */
+	public function __construct(
+		ActorService $actorService, PersonService $personService, DocumentService $documentService,
+		ConfigService $configService, MiscService $miscService
+	) {
+		parent::__construct();
+
+		$this->actorService = $actorService;
+		$this->personService = $personService;
+		$this->documentService = $documentService;
+		$this->configService = $configService;
+		$this->miscService = $miscService;
+	}
+
+
+	/**
+	 *
+	 */
+	protected function configure() {
+		parent::configure();
+		$this->setName('social:cache:refresh')
+			 ->setDescription('Update the cache');
+	}
+
+
+	/**
+	 * @param InputInterface $input
+	 * @param OutputInterface $output
+	 *
+	 * @throws Exception
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output) {
+
+		$result = $this->actorService->manageCacheLocalActors();
+		$output->writeLn($result . ' local accounts regenerated');
+
+		$result = $this->personService->manageCacheRemoteActors();
+		$output->writeLn($result . ' remote accounts updated');
+
+		$result = $this->documentService->manageCacheDocuments();
+		$output->writeLn($result . ' documents cached');
+	}
+
+
+}
+
diff --git a/lib/Cron/Cache.php b/lib/Cron/Cache.php
new file mode 100644
index 00000000..df9b741a
--- /dev/null
+++ b/lib/Cron/Cache.php
@@ -0,0 +1,114 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.com>
+ * @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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\Social\Cron;
+
+
+use Exception;
+use OC\BackgroundJob\TimedJob;
+use OCA\Social\AppInfo\Application;
+use OCA\Social\Service\ActivityPub\DocumentService;
+use OCA\Social\Service\ActivityPub\PersonService;
+use OCA\Social\Service\ActorService;
+use OCA\Social\Service\ConfigService;
+use OCA\Social\Service\MiscService;
+use OCP\AppFramework\QueryException;
+
+
+/**
+ * Class Cache
+ *
+ * @package OCA\Social\Cron
+ */
+class Cache extends TimedJob {
+
+
+	/** @var ActorService */
+	private $actorService;
+
+	/** @var PersonService */
+	private $personService;
+
+	/** @var DocumentService */
+	private $documentService;
+
+	/** @var ConfigService */
+	private $configService;
+
+	/** @var MiscService */
+	private $miscService;
+
+
+	/**
+	 * Cache constructor.
+	 */
+	public function __construct() {
+		$this->setInterval(12 * 60); // 12 minutes
+	}
+
+
+	/**
+	 * @param mixed $argument
+	 *
+	 * @throws QueryException
+	 */
+	protected function run($argument) {
+		$app = new Application();
+		$c = $app->getContainer();
+
+		$this->actorService = $c->query(ActorService::class);
+		$this->personService = $c->query(PersonService::class);
+		$this->documentService = $c->query(DocumentService::class);
+		$this->configService = $c->query(ConfigService::class);
+		$this->miscService = $c->query(MiscService::class);
+
+		$this->manageCache();
+	}
+
+
+	private function manageCache() {
+		try {
+			$this->actorService->manageCacheLocalActors();
+		} catch (Exception $e) {
+		}
+
+		try {
+			$this->personService->manageCacheRemoteActors();
+		} catch (Exception $e) {
+		}
+
+		try {
+			$this->documentService->manageCacheDocuments();
+		} catch (Exception $e) {
+		}
+	}
+
+
+}
diff --git a/lib/Db/ActorsRequest.php b/lib/Db/ActorsRequest.php
index beec0ebc..09b37e4b 100644
--- a/lib/Db/ActorsRequest.php
+++ b/lib/Db/ActorsRequest.php
@@ -161,6 +161,24 @@ class ActorsRequest extends ActorsRequestBuilder {
 	}
 
 
+	/**
+	 * @return Person[]
+	 * @throws SocialAppConfigException
+	 */
+	public function getAll(): array {
+		$qb = $this->getActorsSelectSql();
+
+		$accounts = [];
+		$cursor = $qb->execute();
+		while ($data = $cursor->fetch()) {
+			$accounts[] = $this->parseActorsSelectSql($data);
+		}
+		$cursor->closeCursor();
+
+		return $accounts;
+	}
+
+
 	/**
 	 * @param string $search
 	 *
diff --git a/lib/Db/CacheActorsRequest.php b/lib/Db/CacheActorsRequest.php
index 724abf2d..dd3d9489 100644
--- a/lib/Db/CacheActorsRequest.php
+++ b/lib/Db/CacheActorsRequest.php
@@ -30,15 +30,20 @@ declare(strict_types=1);
 namespace OCA\Social\Db;
 
 
+use DateTime;
+use Exception;
 use OCA\Social\Exceptions\CacheActorDoesNotExistException;
 use OCA\Social\Model\ActivityPub\Person;
 use OCA\Social\Service\ConfigService;
 use OCA\Social\Service\MiscService;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
 class CacheActorsRequest extends CacheActorsRequestBuilder {
 
 
+	const CACHE_TTL = 60 * 24; // 1d
+
 	/**
 	 * CacheActorsRequest constructor.
 	 *
@@ -78,7 +83,11 @@ class CacheActorsRequest extends CacheActorsRequestBuilder {
 		   ->setValue('name', $qb->createNamedParameter($actor->getName()))
 		   ->setValue('summary', $qb->createNamedParameter($actor->getSummary()))
 		   ->setValue('public_key', $qb->createNamedParameter($actor->getPublicKey()))
-		   ->setValue('source', $qb->createNamedParameter($actor->getSource()));
+		   ->setValue('source', $qb->createNamedParameter($actor->getSource()))
+		   ->setValue(
+			   'creation',
+			   $qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
+		   );
 
 		if ($actor->gotIcon()) {
 			$iconId = $actor->getIcon()
@@ -92,30 +101,6 @@ class CacheActorsRequest extends CacheActorsRequestBuilder {
 	}
 
 
-//	/**
-//	 * get Cached value about an Actor, based on the account.
-//	 *
-//	 * @param string $account
-//	 *
-//	 * @return CacheActor
-//	 * @throws CacheActorDoesNotExistException
-//	 */
-//	public function getFromAccount(string $account): CacheActor {
-//		$qb = $this->getCacheActorsSelectSql();
-//		$this->limitToAccount($qb, $account);
-//
-//		$cursor = $qb->execute();
-//		$data = $cursor->fetch();
-//		$cursor->closeCursor();
-//
-//		if ($data === false) {
-//			throw new CacheActorDoesNotExistException();
-//		}
-//
-//		return $this->parseCacheActorsSelectSql($data);
-//	}
-
-
 	/**
 	 * get Cached version of an Actor, based on the UriId
 	 *
@@ -187,6 +172,26 @@ class CacheActorsRequest extends CacheActorsRequestBuilder {
 	}
 
 
+	/**
+	 * @return Person[]
+	 * @throws Exception
+	 */
+	public function getRemoteActorsToUpdate(): array {
+		$qb = $this->getCacheActorsSelectSql();
+		$this->limitToLocal($qb, false);
+		$this->limitToCreation($qb, self::CACHE_TTL);
+
+		$update = [];
+		$cursor = $qb->execute();
+		while ($data = $cursor->fetch()) {
+			$update[] = $this->parseCacheActorsSelectSql($data);
+		}
+		$cursor->closeCursor();
+
+		return $update;
+	}
+
+
 	/**
 	 * delete cached version of an Actor, based on the UriId
 	 *
diff --git a/lib/Db/CacheDocumentsRequest.php b/lib/Db/CacheDocumentsRequest.php
index 70484f39..7bba3f50 100644
--- a/lib/Db/CacheDocumentsRequest.php
+++ b/lib/Db/CacheDocumentsRequest.php
@@ -31,6 +31,7 @@ namespace OCA\Social\Db;
 
 
 use DateTime;
+use Exception;
 use OCA\Social\Exceptions\CacheDocumentDoesNotExistException;
 use OCA\Social\Model\ActivityPub\Document;
 use OCP\DB\QueryBuilder\IQueryBuilder;
@@ -38,6 +39,9 @@ use OCP\DB\QueryBuilder\IQueryBuilder;
 class CacheDocumentsRequest extends CacheDocumentsRequestBuilder {
 
 
+	const CACHE_TTL = 15; // 15 min
+
+
 	/**
 	 * insert cache about an Actor in database.
 	 *
@@ -135,5 +139,25 @@ class CacheDocumentsRequest extends CacheDocumentsRequestBuilder {
 		return $this->parseCacheDocumentsSelectSql($data);
 	}
 
+
+	/**
+	 * @return Document[]
+	 * @throws Exception
+	 */
+	public function getNotCachedDocuments() {
+		$qb = $this->getCacheDocumentsSelectSql();
+		$this->limitToDBFieldEmpty($qb, 'local_copy');
+		$this->limitToCaching($qb, self::CACHE_TTL);
+
+		$documents = [];
+		$cursor = $qb->execute();
+		while ($data = $cursor->fetch()) {
+			$documents[] = $this->parseCacheDocumentsSelectSql($data);
+		}
+		$cursor->closeCursor();
+
+		return $documents;
+	}
+
 }
 
diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php
index 2e598bc2..538d9751 100644
--- a/lib/Db/CoreRequestBuilder.php
+++ b/lib/Db/CoreRequestBuilder.php
@@ -31,7 +31,10 @@ declare(strict_types=1);
 namespace OCA\Social\Db;
 
 
+use DateInterval;
+use DateTime;
 use Doctrine\DBAL\Query\QueryBuilder;
+use Exception;
 use OCA\Social\Exceptions\InvalidResourceException;
 use OCA\Social\Model\ActivityPub\Document;
 use OCA\Social\Model\ActivityPub\Image;
@@ -212,6 +215,38 @@ class CoreRequestBuilder {
 	}
 
 
+	/**
+	 * Limit the request to the creation
+	 *
+	 * @param IQueryBuilder $qb
+	 * @param int $delay
+	 *
+	 * @throws Exception
+	 */
+	protected function limitToCreation(IQueryBuilder &$qb, int $delay = 0) {
+		$date = new DateTime('now');
+		$date->sub(new DateInterval('PT' . $delay . 'M'));
+
+		$this->limitToDBFieldDateTime($qb, 'creation', $date);
+	}
+
+
+	/**
+	 * Limit the request to the creation
+	 *
+	 * @param IQueryBuilder $qb
+	 * @param int $delay
+	 *
+	 * @throws Exception
+	 */
+	protected function limitToCaching(IQueryBuilder &$qb, int $delay = 0) {
+		$date = new DateTime('now');
+		$date->sub(new DateInterval('PT' . $delay . 'M'));
+
+		$this->limitToDBFieldDateTime($qb, 'caching', $date);
+	}
+
+
 	/**
 	 * Limit the request to the url
 	 *
@@ -320,7 +355,7 @@ class CoreRequestBuilder {
 	 * @param bool $cs - case sensitive
 	 * @param string $alias
 	 */
-	private function limitToDBField(
+	protected function limitToDBField(
 		IQueryBuilder &$qb, string $field, string $value, bool $cs = true, string $alias = ''
 	) {
 		$expr = $qb->expr();
@@ -347,7 +382,7 @@ class CoreRequestBuilder {
 	 * @param string $field
 	 * @param int $value
 	 */
-	private function limitToDBFieldInt(IQueryBuilder &$qb, string $field, int $value) {
+	protected function limitToDBFieldInt(IQueryBuilder &$qb, string $field, int $value) {
 		$expr = $qb->expr();
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->defaultSelectAlias . '.' : '';
 		$field = $pf . $field;
@@ -356,12 +391,42 @@ class CoreRequestBuilder {
 	}
 
 
+	/**
+	 * @param IQueryBuilder $qb
+	 * @param string $field
+	 */
+	protected function limitToDBFieldEmpty(IQueryBuilder &$qb, string $field) {
+		$expr = $qb->expr();
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->defaultSelectAlias . '.' : '';
+		$field = $pf . $field;
+
+		$qb->andWhere($expr->eq($field, $qb->createNamedParameter('')));
+	}
+
+
+	/**
+	 * @param IQueryBuilder $qb
+	 * @param string $field
+	 * @param DateTime $date
+	 */
+	protected function limitToDBFieldDateTime(IQueryBuilder &$qb, string $field, DateTime $date) {
+		$expr = $qb->expr();
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->defaultSelectAlias . '.' : '';
+		$field = $pf . $field;
+
+		$orX = $expr->orX();
+		$orX->add($expr->lte($field, $qb->createNamedParameter($date, IQueryBuilder::PARAM_DATE)));
+		$orX->add($expr->isNull($field));
+		$qb->andWhere($orX);
+	}
+
+
 	/**
 	 * @param IQueryBuilder $qb
 	 * @param string $field
 	 * @param array $values
 	 */
-	private function limitToDBFieldArray(IQueryBuilder &$qb, string $field, array $values) {
+	protected function limitToDBFieldArray(IQueryBuilder &$qb, string $field, array $values) {
 		$expr = $qb->expr();
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->defaultSelectAlias . '.' : '';
 		$field = $pf . $field;
@@ -384,7 +449,7 @@ class CoreRequestBuilder {
 	 * @param string $field
 	 * @param string $value
 	 */
-	private function searchInDBField(IQueryBuilder &$qb, string $field, string $value) {
+	protected function searchInDBField(IQueryBuilder &$qb, string $field, string $value) {
 		$expr = $qb->expr();
 
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->defaultSelectAlias . '.' : '';
diff --git a/lib/Model/ActivityPub/Document.php b/lib/Model/ActivityPub/Document.php
index 040d68d5..c7da00f8 100644
--- a/lib/Model/ActivityPub/Document.php
+++ b/lib/Model/ActivityPub/Document.php
@@ -31,6 +31,7 @@ declare(strict_types=1);
 namespace OCA\Social\Model\ActivityPub;
 
 
+use DateTime;
 use JsonSerializable;
 use OCA\Social\Exceptions\UrlCloudException;
 
@@ -55,8 +56,8 @@ class Document extends ACore implements JsonSerializable {
 	/** @var string */
 	private $localCopy = '';
 
-	/** @var string */
-	private $caching = '';
+	/** @var int */
+	private $caching = 0;
 
 	/** @var bool */
 	private $public = false;
@@ -173,18 +174,18 @@ class Document extends ACore implements JsonSerializable {
 
 
 	/**
-	 * @return string
+	 * @return int
 	 */
-	public function getCaching(): string {
+	public function getCaching(): int {
 		return $this->caching;
 	}
 
 	/**
-	 * @param string $caching
+	 * @param int $caching
 	 *
 	 * @return Document
 	 */
-	public function setCaching(string $caching): Document {
+	public function setCaching(int $caching): Document {
 		$this->caching = $caching;
 
 		return $this;
@@ -218,7 +219,13 @@ class Document extends ACore implements JsonSerializable {
 		$this->setLocalCopy($this->get('local_copy', $data, ''));
 		$this->setMediaType($this->get('media_type', $data, ''));
 		$this->setMimeType($this->get('mime_type', $data, ''));
-		$this->setCaching($this->get('caching', $data, ''));
+
+		if ($this->get('caching', $data, '') === '') {
+			$this->setCaching(0);
+		} else {
+			$date = new DateTime($this->get('caching', $data, ''));
+			$this->setCaching($date->getTimestamp());
+		}
 	}
 
 	/**
diff --git a/lib/Service/ActivityPub/DocumentService.php b/lib/Service/ActivityPub/DocumentService.php
index 94e4c085..8f4f76c4 100644
--- a/lib/Service/ActivityPub/DocumentService.php
+++ b/lib/Service/ActivityPub/DocumentService.php
@@ -31,6 +31,7 @@ declare(strict_types=1);
 namespace OCA\Social\Service\ActivityPub;
 
 
+use Exception;
 use OCA\Social\Db\CacheDocumentsRequest;
 use OCA\Social\Exceptions\CacheContentException;
 use OCA\Social\Exceptions\CacheContentSizeException;
@@ -87,9 +88,8 @@ class DocumentService implements ICoreService {
 			return $document;
 		}
 
-		// TODO - check the size of the attachment, also to stop download after a certain size of content.
-		// TODO - ignore this is getCaching is older than 15 minutes
-		if ($document->getCaching() !== '') {
+		// TODO - ignore this if getCaching is older than 15 minutes
+		if ($document->getCaching() > (time() - (CacheDocumentsRequest::CACHE_TTL * 60))) {
 			return $document;
 		}
 
@@ -125,6 +125,23 @@ class DocumentService implements ICoreService {
 	}
 
 
+	/**
+	 * @return int
+	 * @throws CacheDocumentDoesNotExistException
+	 * @throws NotPermittedException
+	 * @throws Exception
+	 */
+	public function manageCacheDocuments(): int {
+		$update = $this->cacheDocumentsRequest->getNotCachedDocuments();
+
+		foreach ($update as $item) {
+			$this->cacheRemoteDocument($item->getId());
+		}
+
+		return sizeof($update);
+	}
+
+
 	/**
 	 * @param ACore $item
 	 */
diff --git a/lib/Service/ActivityPub/PersonService.php b/lib/Service/ActivityPub/PersonService.php
index a657661a..432ab2a9 100644
--- a/lib/Service/ActivityPub/PersonService.php
+++ b/lib/Service/ActivityPub/PersonService.php
@@ -263,6 +263,24 @@ class PersonService implements ICoreService {
 	}
 
 
+	/**
+	 * @throws Exception
+	 * @return int
+	 */
+	public function manageCacheRemoteActors(): int {
+		$update = $this->cacheActorsRequest->getRemoteActorsToUpdate();
+
+		foreach ($update as $item) {
+			try {
+				$this->getFromId($item->getId(), true);
+			} catch (Exception $e) {
+			}
+		}
+
+		return sizeof($update);
+	}
+
+
 	/**
 	 * @param ACore $item
 	 */
diff --git a/lib/Service/ActorService.php b/lib/Service/ActorService.php
index 25758d89..348d1a1f 100644
--- a/lib/Service/ActorService.php
+++ b/lib/Service/ActorService.php
@@ -128,18 +128,6 @@ class ActorService {
 	}
 
 
-	/**
-	 * @param string $search
-	 *
-	 * @deprecated - used !?
-	 * @return Person[]
-	 * @throws SocialAppConfigException
-	 */
-	public function searchLocalAccounts(string $search): array {
-		return $this->actorsRequest->searchFromUsername($search);
-	}
-
-
 	/**
 	 * Method should be called by the frontend and will generate a fresh Social account for
 	 * the user, using the userId and the username.
@@ -234,4 +222,22 @@ class ActorService {
 	}
 
 
+	/**
+	 * @throws Exception
+	 * @return int
+	 */
+	public function manageCacheLocalActors(): int {
+		$update = $this->actorsRequest->getAll();
+
+		foreach ($update as $item) {
+			try {
+				$this->cacheLocalActorByUsername($item->getPreferredUsername(), true);
+			} catch (Exception $e) {
+			}
+		}
+
+		return sizeof($update);
+	}
+
+
 }