4 files changed, 15 insertions, 4 deletions
diff --git a/lib/Controller/NavigationController.php b/lib/Controller/NavigationController.php
index d6396122..33880792 100644
--- a/lib/Controller/NavigationController.php
+++ b/lib/Controller/NavigationController.php
@@ -44,8 +44,6 @@ use OCA\Social\Service\CheckService;
 use OCA\Social\Service\ConfigService;
 use OCA\Social\Service\MiscService;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\ContentSecurityPolicy;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\FileDisplayResponse;
 use OCP\AppFramework\Http\Response;
@@ -54,7 +52,6 @@ use OCP\IConfig;
 use OCP\IL10N;
 use OCP\IRequest;
 use OCP\IURLGenerator;
-use OCP\Http\Client\IClientService;
 
 class NavigationController extends Controller {
 
diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php
index b6e0780e..064eebca 100644
--- a/lib/Db/CoreRequestBuilder.php
+++ b/lib/Db/CoreRequestBuilder.php
@@ -405,7 +405,9 @@ class CoreRequestBuilder {
 		}
 
 		$qb->setMaxResults($limit);
-		$qb->orderBy('creation', 'desc');
+
+		$pf = $this->defaultSelectAlias;
+		$qb->orderBy($pf . '.creation', 'desc');
 	}
 
 
diff --git a/lib/Model/ActivityPub/ACore.php b/lib/Model/ActivityPub/ACore.php
index a71a3579..a3be9fd1 100644
--- a/lib/Model/ActivityPub/ACore.php
+++ b/lib/Model/ActivityPub/ACore.php
@@ -413,6 +413,16 @@ abstract class ACore extends Item implements JsonSerializable {
 
 				return $value;
 
+			case self::AS_USERNAME:
+				$value = strip_tags($value);
+
+				return $value;
+
+			case self::AS_ACCOUNT:
+				$value = strip_tags($value);
+
+				return $value;
+
 			default:
 				break;
 		}
diff --git a/lib/Model/ActivityPub/Person.php b/lib/Model/ActivityPub/Person.php
index f997a78a..91c584cf 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\InvalidResourceEntryException;
 use OCA\Social\Exceptions\UrlCloudException;
 
 
@@ -414,6 +415,7 @@ class Person extends ACore implements JsonSerializable {
 	 * @param array $data
 	 *
 	 * @throws UrlCloudException
+	 * @throws InvalidResourceEntryException
 	 */
 	public function import(array $data) {
 		parent::import($data);