Merge pull request #743 from nextcloud/feature/noid/subtypeifavailable

import subtype

lib/Db/StreamRequestBuilder.php

@@ -94,7 +94,7 @@ class StreamRequestBuilder extends CoreRequestBuilder {
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectDistinct('s.id')
 		   ->addSelect(
-			   's.type', 's.to', 's.to_array', 's.cc', 's.bcc', 's.content',
+			   's.type', 's.subtype', 's.to', 's.to_array', 's.cc', 's.bcc', 's.content',
 			   's.summary', 's.attachments', 's.published', 's.published_time', 's.cache',
 			   's.object_id', 's.attributed_to', 's.in_reply_to', 's.source', 's.local',
 			   's.instances', 's.creation', 's.hidden_on_timeline', 's.details', 's.hashtags'

lib/Model/ActivityPub/ACore.php

@@ -632,6 +632,7 @@ class ACore extends Item implements JsonSerializable {
 	public function importFromDatabase(array $data) {
 		$this->setId($this->validate(self::AS_ID, 'id', $data, ''));
 		$this->setType($this->validate(self::AS_TYPE, 'type', $data, ''));
+		$this->setSubType($this->validate(self::AS_TYPE, 'subtype', $data, ''));
 		$this->setUrl($this->validate(self::AS_URL, 'url', $data, ''));
 		$this->setSummary($this->validate(self::AS_STRING, 'summary', $data, ''));
 		$this->setTo($this->validate(self::AS_ID, 'to', $data, ''));
@@ -667,6 +668,7 @@ class ACore extends Item implements JsonSerializable {
 
 		$this->addEntry('id', $this->getId());
 		$this->addEntry('type', $this->getType());
+		$this->addEntry('subtype', $this->getSubType());
 		$this->addEntry('url', $this->getUrl());
 		$this->addEntry('to', $this->getTo());
 		$this->addEntryArray('to', $this->getToArray());