aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-05-02 20:33:45 -0700
committerzotlabs <mike@macgirvin.com>2019-05-02 20:33:45 -0700
commit76757ad1f263fc2da10cd774070d0899f7c317b3 (patch)
tree34923f613a1dd8501c63a227c9d9476159818123
parente0fdafc7e5adfce2e629b6e55c25e0c4c665a64e (diff)
parent347e88dc65b1240dc6d1690570531dc3015a4452 (diff)
downloadvolse-hubzilla-76757ad1f263fc2da10cd774070d0899f7c317b3.tar.gz
volse-hubzilla-76757ad1f263fc2da10cd774070d0899f7c317b3.tar.bz2
volse-hubzilla-76757ad1f263fc2da10cd774070d0899f7c317b3.zip
Merge branch 'dev' of /home/macgirvin/hz into dev
-rw-r--r--Zotlabs/Lib/Activity.php4
-rw-r--r--Zotlabs/Module/Apschema.php56
-rwxr-xr-xboot.php2
3 files changed, 59 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 9df7db169..83c8790df 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -710,7 +710,7 @@ class Activity {
// Reactions will just map to normal activities
if(strpos($verb,ACTIVITY_REACT) !== false)
- return 'Create';
+ return 'emojiReaction';
if(strpos($verb,ACTIVITY_MOOD) !== false)
return 'Create';
@@ -1486,7 +1486,7 @@ class Activity {
}
- if(in_array($act->type, [ 'Like', 'Dislike', 'Flag', 'Block', 'Announce', 'Accept', 'Reject', 'TentativeAccept' ])) {
+ if(in_array($act->type, [ 'Like', 'Dislike', 'Flag', 'Block', 'Announce', 'Accept', 'Reject', 'TentativeAccept', 'emojiReaction' ])) {
$response_activity = true;
diff --git a/Zotlabs/Module/Apschema.php b/Zotlabs/Module/Apschema.php
new file mode 100644
index 000000000..5b249bfe8
--- /dev/null
+++ b/Zotlabs/Module/Apschema.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Zotlabs\Module;
+
+
+class Apschema extends \Zotlabs\Web\Controller {
+
+ function init() {
+
+ $base = z_root();
+
+ $arr = [
+ '@context' => [
+ 'zot' => z_root() . '/apschema#',
+ 'id' => '@id',
+ 'type' => '@type',
+ 'commentPolicy' => 'as:commentPolicy',
+ 'meData' => 'zot:meData',
+ 'meDataType' => 'zot:meDataType',
+ 'meEncoding' => 'zot:meEncoding',
+ 'meAlgorithm' => 'zot:meAlgorithm',
+ 'meCreator' => 'zot:meCreator',
+ 'meSignatureValue' => 'zot:meSignatureValue',
+ 'locationAddress' => 'zot:locationAddress',
+ 'locationPrimary' => 'zot:locationPrimary',
+ 'locationDeleted' => 'zot:locationDeleted',
+ 'nomadicLocation' => 'zot:nomadicLocation',
+ 'nomadicHubs' => 'zot:nomadicHubs',
+ 'emojiReaction' => 'zot:emojiReaction',
+
+ 'magicEnv' => [
+ '@id' => 'zot:magicEnv',
+ '@type' => '@id'
+ ],
+
+ 'nomadicLocations' => [
+ '@id' => 'zot:nomadicLocations',
+ '@type' => '@id'
+ ],
+
+ 'ostatus' => 'http://ostatus.org#',
+ 'conversation' => 'ostatus:conversation'
+
+ ]
+ ];
+
+ header('Content-Type: application/ld+json');
+ echo json_encode($arr,JSON_UNESCAPED_SLASHES);
+ killme();
+
+ }
+
+
+
+
+} \ No newline at end of file
diff --git a/boot.php b/boot.php
index 6a52c2ca4..89c6d5e1f 100755
--- a/boot.php
+++ b/boot.php
@@ -467,7 +467,7 @@ define ( 'NAMESPACE_YMEDIA', 'http://search.yahoo.com/mrss/' );
define ( 'ACTIVITYSTREAMS_JSONLD_REV', 'https://www.w3.org/ns/activitystreams' );
-define ( 'ZOT_APSCHEMA_REV', '/apschema/v1.3' );
+define ( 'ZOT_APSCHEMA_REV', '/apschema/v1.4' );
/**
* activity stream defines
*/