diff options
| author | zotlabs <mike@macgirvin.com> | 2019-01-16 15:28:30 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2019-01-16 15:28:30 -0800 |
| commit | eaa375936fc3c23f1b6629cba56fce2eb116a1c6 (patch) | |
| tree | e911e6524a3b1421c184fb4ea832fd87bc92ab98 /Zotlabs | |
| parent | 7b30fc4b82da0a64e152cdeb82564f8d52b7177e (diff) | |
| download | volse-hubzilla-eaa375936fc3c23f1b6629cba56fce2eb116a1c6.tar.gz volse-hubzilla-eaa375936fc3c23f1b6629cba56fce2eb116a1c6.tar.bz2 volse-hubzilla-eaa375936fc3c23f1b6629cba56fce2eb116a1c6.zip | |
more z6 compatibility fixes
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Daemon/Onepoll.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Poller.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/Zotlabs/Daemon/Onepoll.php b/Zotlabs/Daemon/Onepoll.php index 920916828..1d9fd5f72 100644 --- a/Zotlabs/Daemon/Onepoll.php +++ b/Zotlabs/Daemon/Onepoll.php @@ -69,7 +69,7 @@ class Onepoll { return; } - if($contact['xchan_network'] !== 'zot') + if(! in_array($contact['xchan_network'],['zot','zot6'])) return; // update permissions diff --git a/Zotlabs/Daemon/Poller.php b/Zotlabs/Daemon/Poller.php index 49151437c..a8cf34ce2 100644 --- a/Zotlabs/Daemon/Poller.php +++ b/Zotlabs/Daemon/Poller.php @@ -110,7 +110,7 @@ class Poller { } - if($contact['xchan_network'] !== 'zot') + if(! in_array($contact['xchan_network'],['zot','zot6'])) continue; if($c == $t) { diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index ef6ee6c3e..b4c833594 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -568,6 +568,9 @@ class Activity { 'http://activitystrea.ms/schema/1.0/tag' => 'Add', 'http://activitystrea.ms/schema/1.0/follow' => 'Follow', 'http://activitystrea.ms/schema/1.0/unfollow' => 'Unfollow', + 'http://purl.org/zot/activity/attendyes' => 'Accept', + 'http://purl.org/zot/activity/attendno' => 'Reject', + 'http://purl.org/zot/activity/attendmaybe' => 'TentativeAccept' ]; @@ -607,6 +610,9 @@ class Activity { 'http://activitystrea.ms/schema/1.0/tag' => 'Add', 'http://activitystrea.ms/schema/1.0/follow' => 'Follow', 'http://activitystrea.ms/schema/1.0/unfollow' => 'Unfollow', + 'http://purl.org/zot/activity/attendyes' => 'Accept', + 'http://purl.org/zot/activity/attendno' => 'Reject', + 'http://purl.org/zot/activity/attendmaybe' => 'TentativeAccept' ]; |