Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 05:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of ../z into sitechan

Browse source
This commit is contained in:
nobody 2021-09-20 22:47:35 -07:00
commit 97239639d3
2 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Zotlabs/Daemon/Notifier.php
View file

@ -606,7 +606,7 @@ class Notifier {
}
}
}
if (! $hubs) {
logger('notifier: no hubs', LOGGER_NORMAL, LOG_NOTICE);
return;

33
Zotlabs/Lib/Connect.php
View file

@ -84,11 +84,36 @@ class Connect {
$r = Libzot::zot_record_preferred($r,'xchan_network');
// Some Hubzilla records were originally stored as activitypub. If we find one, force rediscovery
// since Zap cannot connect with them.
// ensure there's a valid hubloc for this xchan before proceeding - you cannot connect without it
if (($r['xchan_network'] === 'activitypub') && (! $ap_allowed)) {
$r = null;
if (in_array($r['xchan_network'], [ 'zot6','activitypub' ])) {
$h = q("select * from hubloc where hubloc_hash = '%s'",
dbesc($r['xchan_hash'])
);
if (! $h) {
$r = null;
}
}
// we may have nulled out this record so check again
if ($r) {
// Check the site table to see if we should have a zot6 hubloc,
// If so, clear the xchan and start fresh
if ($r['xchan_network'] === 'activitypub') {
$m = parse_url($r['xchan_hash']);
unset($m['path']);
$h = unparse_url($m);
$s = q("select * from site where site_url = '%s'",
dbesc($h)
);
if (intval($s['site_type']) === SITE_TYPE_ZOT) {
logger('got zot - ignore activitypub entry');
$r = null;
}
}
}
}