diff options
| author | Mario <mario@mariovavti.com> | 2023-05-25 08:18:16 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2023-05-25 08:18:16 +0000 |
| commit | af5ae163f39c5cbb1f2cc07b62d654c1e0b71753 (patch) | |
| tree | df01c596c7f968692144c5642e3ec63267d52013 | |
| parent | d00860430f3d90e75a464cee03d3ff79c34715eb (diff) | |
| download | volse-hubzilla-af5ae163f39c5cbb1f2cc07b62d654c1e0b71753.tar.gz volse-hubzilla-af5ae163f39c5cbb1f2cc07b62d654c1e0b71753.tar.bz2 volse-hubzilla-af5ae163f39c5cbb1f2cc07b62d654c1e0b71753.zip | |
more fixes for where keyId = acct:xxx@yyy.zz
| -rw-r--r-- | Zotlabs/Web/HTTPSig.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Zotlabs/Web/HTTPSig.php b/Zotlabs/Web/HTTPSig.php index 0ab315eee..2f04003ab 100644 --- a/Zotlabs/Web/HTTPSig.php +++ b/Zotlabs/Web/HTTPSig.php @@ -303,7 +303,8 @@ class HTTPSig { // $force is used to ignore the local cache and only use the remote data; for instance the cached key might be stale if (!$force) { - $x = q("select * from xchan join hubloc on xchan_hash = hubloc_hash where (hubloc_id_url = '%s' or hubloc_hash = '%s') and hubloc_network in ('zot6', 'activitypub') order by hubloc_id desc", + $x = q("select * from xchan join hubloc on xchan_hash = hubloc_hash where (hubloc_addr = '%s' or hubloc_id_url = '%s' or hubloc_hash = '%s') and hubloc_network in ('zot6', 'activitypub') order by hubloc_id desc", + dbesc(str_replace('acct:', '', $url)), dbesc($url), dbesc($url) ); @@ -378,7 +379,9 @@ class HTTPSig { $best = []; if (!$force) { - $x = q("select * from xchan join hubloc on xchan_hash = hubloc_hash where hubloc_id_url = '%s' and hubloc_network in ('zot6', 'activitypub') order by hubloc_id desc", + $x = q("select * from xchan join hubloc on xchan_hash = hubloc_hash where (hubloc_addr = '%s' or hubloc_id_url = '%s' or hubloc_hash = '%s') and hubloc_network in ('zot6', 'activitypub') order by hubloc_id desc", + dbesc(str_replace('acct:', '', $id)), + dbesc($id), dbesc($id) ); |