From 4153a93390658f31ccf9fdcced31a1ac7172b182 Mon Sep 17 00:00:00 2001
From: susdiv <susanna.divita.2@gmail.com>
Date: Fri, 5 Jun 2020 17:48:21 +0000
Subject: [PATCH] [ActivityPub] Fix Postgres incompatible query in Following
 and Followed collection

---
 plugins/ActivityPub/classes/Activitypub_profile.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/ActivityPub/classes/Activitypub_profile.php b/plugins/ActivityPub/classes/Activitypub_profile.php
index 1cb1a6f390..b688b34e12 100644
--- a/plugins/ActivityPub/classes/Activitypub_profile.php
+++ b/plugins/ActivityPub/classes/Activitypub_profile.php
@@ -554,10 +554,11 @@ class Activitypub_profile extends Managed_DataObject
             return $cnt;
         }
 
+        $user_table = common_database_tablename('user');
         $sub = new Subscription();
         $sub->subscribed = $profile->id;
         $sub->whereAdd('subscriber != subscribed');
-        $sub->whereAdd('subscriber IN (SELECT id FROM user UNION SELECT profile_id FROM activitypub_profile)');
+        $sub->whereAdd("subscriber IN (SELECT id FROM {$user_table} UNION SELECT profile_id AS id FROM activitypub_profile)");
         $cnt = $sub->count('distinct subscriber');
 
         self::cacheSet(sprintf('activitypub_profile:subscriberCount:%d', $profile->id), $cnt);
@@ -581,10 +582,11 @@ class Activitypub_profile extends Managed_DataObject
             return $cnt;
         }
 
+        $user_table = common_database_tablename('user');
         $sub = new Subscription();
         $sub->subscriber = $profile->id;
         $sub->whereAdd('subscriber != subscribed');
-        $sub->whereAdd('subscribed IN (SELECT id FROM user UNION SELECT profile_id FROM activitypub_profile)');
+        $sub->whereAdd("subscribed IN (SELECT id FROM {$user_table} UNION SELECT profile_id AS id FROM activitypub_profile)");
         $cnt = $sub->count('distinct subscribed');
 
         self::cacheSet(sprintf('activitypub_profile:subscriptionCount:%d', $profile->id), $cnt);