From 95261065bf9ae662bba6e7c700c52ecc76fe5feb Mon Sep 17 00:00:00 2001 From: Mike Macgirvin Date: Fri, 6 Sep 2024 08:02:09 +1000 Subject: [PATCH 1/4] issue #185 --- src/Module/Communities.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Module/Communities.php b/src/Module/Communities.php index 34c9ddddd..b08dfca28 100644 --- a/src/Module/Communities.php +++ b/src/Module/Communities.php @@ -43,7 +43,8 @@ class Communities extends Controller $r = q( "select count(site_url) as total from site - where site_flags != 256 and site_dead = 0 $sql_extra + where site_flags != 256 and site_dead = 0 $sql_extra + group by site_update order by site_update desc" ); if ($r) { From 59320ff34d057aaa747e72c345fd862bae333161 Mon Sep 17 00:00:00 2001 From: Mike Macgirvin Date: Fri, 6 Sep 2024 08:13:15 +1000 Subject: [PATCH 2/4] sql issue --- src/Lib/Activity.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Lib/Activity.php b/src/Lib/Activity.php index 7a6942fc8..10077f04d 100644 --- a/src/Lib/Activity.php +++ b/src/Lib/Activity.php @@ -5190,7 +5190,7 @@ class Activity $actorId = new ActorId($url); if ($actorId->getType() === ActorId::ACTORID_TYPE_DIDKEY) { $ekey = str_replace('did:key:', '', $actorId->getId()); - $query = q("select * from xchan where epubkey = '%s'", + $query = q("select * from xchan where xchan_epubkey = '%s'", dbesc($ekey) ); if ($query) { From 1076c7edcb99459e1d9b41433ea0247939dcaad3 Mon Sep 17 00:00:00 2001 From: Mike Macgirvin Date: Sat, 7 Sep 2024 06:45:18 +1000 Subject: [PATCH 3/4] only fix site signature issues in hublocs for zot6/nomad entities --- include/hubloc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/hubloc.php b/include/hubloc.php index da17f41d0..bebbd041c 100644 --- a/include/hubloc.php +++ b/include/hubloc.php @@ -129,12 +129,12 @@ function check_hublocs() $interval = Config::Get('system', 'delivery_interval', 2); $wrong_urls = q( - "select hubloc_id from hubloc where hubloc_sitekey = '%s' and hubloc_url != '%s'", + "select hubloc_id from hubloc where hubloc_sitekey = '%s' and hubloc_url != '%s' and hubloc_network in ('zot6', 'nomad')", dbesc($sitekey), dbesc(z_root()) ); $wrong_keys = q( - "select hubloc_id from hubloc where hubloc_sitekey != '%s' and hubloc_url = '%s'", + "select hubloc_id from hubloc where hubloc_sitekey != '%s' and hubloc_url = '%s' and hubloc_network in ('zot6', 'nomad')", dbesc($sitekey), dbesc(z_root()) ); From f7f2dd52a5198236b80aa84eaac162ca1c86a099 Mon Sep 17 00:00:00 2001 From: Mike Macgirvin Date: Sat, 7 Sep 2024 06:48:14 +1000 Subject: [PATCH 4/4] version --- version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.php b/version.php index e2f4fd87c..1e7a6bd96 100644 --- a/version.php +++ b/version.php @@ -1,2 +1,2 @@