harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more z6 compatibility fixes

Browse Source
This commit is contained in:
zotlabs 2019-01-16 15:28:30 -08:00
parent 7b30fc4b82
commit eaa375936f
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Daemon/Onepoll.php
View File

@ -69,7 +69,7 @@ class Onepoll {
return; return;
} }
if($contact['xchan_network'] !== 'zot') if(! in_array($contact['xchan_network'],['zot','zot6']))
return; return;
// update permissions // update permissions

2
Zotlabs/Daemon/Poller.php
View File

@ -110,7 +110,7 @@ class Poller {
} }
if($contact['xchan_network'] !== 'zot') if(! in_array($contact['xchan_network'],['zot','zot6']))
continue; continue;
if($c == $t) { if($c == $t) {

6
Zotlabs/Lib/Activity.php
View File

@ -568,6 +568,9 @@ class Activity {
'http://activitystrea.ms/schema/1.0/tag' => 'Add', 'http://activitystrea.ms/schema/1.0/tag' => 'Add',
'http://activitystrea.ms/schema/1.0/follow' => 'Follow', 'http://activitystrea.ms/schema/1.0/follow' => 'Follow',
'http://activitystrea.ms/schema/1.0/unfollow' => 'Unfollow', '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/tag' => 'Add',
'http://activitystrea.ms/schema/1.0/follow' => 'Follow', 'http://activitystrea.ms/schema/1.0/follow' => 'Follow',
'http://activitystrea.ms/schema/1.0/unfollow' => 'Unfollow', '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'
]; ];

2
include/follow.php
View File

@ -190,7 +190,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
return $result; return $result;
} }
$allowed = (($is_zot || $r[0]['xchan_network'] === 'rss') ? 1 : 0); $allowed = (($is_zot || in_array($r[0]['xchan_network'],['rss','zot6'])) ? 1 : 0);
$x = array('channel_id' => $uid, 'follow_address' => $url, 'xchan' => $r[0], 'allowed' => $allowed, 'singleton' => 0); $x = array('channel_id' => $uid, 'follow_address' => $url, 'xchan' => $r[0], 'allowed' => $allowed, 'singleton' => 0);