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

possible xchan (protocol) confusion in include/follow

Browse Source
This commit is contained in:
zotlabs 2019-05-06 04:15:34 -07:00
parent 88d283a89d
commit 6e0bf04276
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/follow.php
View File

@ -169,18 +169,19 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
} }
if($wf || $d) { if($wf || $d) {
$r = q("select * from xchan where xchan_hash = '%s' or xchan_url = '%s' limit 1", $r = q("select * from xchan where xchan_hash = '%s' or xchan_url = '%s'",
dbesc(($wf) ? $wf : $url), dbesc(($wf) ? $wf : $url),
dbesc($url) dbesc($url)
); );
} }
} }
$xchan = zot_record_preferred($r,'xchan_network');
// if discovery was a success we should have an xchan record in $r // if discovery was a success we should have an xchan record in $r
if($r) { if($xchan) {
$xchan = $r[0]; $xchan_hash = $xchan['xchan_hash'];
$xchan_hash = $r[0]['xchan_hash'];
$their_perms = 0; $their_perms = 0;
} }
} }
@ -191,7 +192,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
return $result; return $result;
} }
$allowed = (($is_zot || in_array($r[0]['xchan_network'],['rss','zot6'])) ? 1 : 0); $allowed = (($is_zot || in_array($xchan['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);