aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Apschema.php
diff options
context:
space:
mode:
authorManuel Jiménez Friaza <mjfriaza@openmailbox.org>2019-08-11 10:39:03 +0200
committerManuel Jiménez Friaza <mjfriaza@openmailbox.org>2019-08-11 10:39:03 +0200
commitb89d2d7580e40cd417defaffd2514b5eed38577d (patch)
tree78ba9004d87b994dd9a531b475fd51b940bf3dd8 /Zotlabs/Module/Apschema.php
parent350e636e3d0a44323c69185555e89cc01a213aa2 (diff)
parent047dd31724f8da12c153b4a6f27dc5462f7b97e5 (diff)
downloadvolse-hubzilla-b89d2d7580e40cd417defaffd2514b5eed38577d.tar.gz
volse-hubzilla-b89d2d7580e40cd417defaffd2514b5eed38577d.tar.bz2
volse-hubzilla-b89d2d7580e40cd417defaffd2514b5eed38577d.zip
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'Zotlabs/Module/Apschema.php')
-rw-r--r--Zotlabs/Module/Apschema.php13
1 files changed, 10 insertions, 3 deletions
diff --git a/Zotlabs/Module/Apschema.php b/Zotlabs/Module/Apschema.php
index 5b249bfe8..756057a8a 100644
--- a/Zotlabs/Module/Apschema.php
+++ b/Zotlabs/Module/Apschema.php
@@ -27,7 +27,9 @@ class Apschema extends \Zotlabs\Web\Controller {
'nomadicLocation' => 'zot:nomadicLocation',
'nomadicHubs' => 'zot:nomadicHubs',
'emojiReaction' => 'zot:emojiReaction',
-
+ 'expires' => 'zot:expires',
+ 'directMessage' => 'zot:directMessage',
+
'magicEnv' => [
'@id' => 'zot:magicEnv',
'@type' => '@id'
@@ -39,8 +41,13 @@ class Apschema extends \Zotlabs\Web\Controller {
],
'ostatus' => 'http://ostatus.org#',
- 'conversation' => 'ostatus:conversation'
+ 'conversation' => 'ostatus:conversation',
+
+ 'diaspora' => 'https://diasporafoundation.org/ns/',
+ 'guid' => 'diaspora:guid',
+ 'Hashtag' => 'as:Hashtag'
+
]
];
@@ -53,4 +60,4 @@ class Apschema extends \Zotlabs\Web\Controller {
-} \ No newline at end of file
+}