Fix relay handling

diff --git a/src/Console/Relay.php b/src/Console/Relay.php
index 206726f6bca6862dd261fc8a8b843d5faf778b68..f417b51924fa8330ce9c040641a16d869161529b 100644 (file)
--- a/src/Console/Relay.php
+++ b/src/Console/Relay.php
@@ -91,8 +91,8 @@ HELP;
 
                if ((count($this->args) == 1) && ($this->getArgument(0) == 'list')) {
                        $contacts = $this->dba->select('apcontact', ['url'],
-                       ["`type` = ? AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` IN (?, ?))",
-                               'Application', 0, Contact::FOLLOWER, Contact::FRIEND]);
+                       ["`type` = ? AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` = ?)",
+                               'Application', 0, Contact::FRIEND]);
                        while ($contact = $this->dba->fetch($contacts)) {
                                $this->out($contact['url']);
                        }

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index 29a3b0ada9d44371f38648d01a600b3c6e2edf0d..68bac70000afed6a02656156c617c7a6f52ff896 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -68,8 +68,8 @@ class Transmitter
        public static function addRelayServerInboxes(array $inboxes = [])
        {
                $contacts = DBA::select('apcontact', ['inbox'],
-                       ["`type` = ? AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` IN (?, ?))",
-                               'Application', 0, Contact::FOLLOWER, Contact::FRIEND]);
+                       ["`type` = ? AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` = ?)",
+                               'Application', 0, Contact::FRIEND]);
                while ($contact = DBA::fetch($contacts)) {
                        $inboxes[$contact['inbox']] = $contact['inbox'];
                }
@@ -119,8 +119,7 @@ class Transmitter
                $activity_id = ActivityPub\Transmitter::activityIDFromContact($contact['id']);
                $success = ActivityPub\Transmitter::sendActivity('Follow', $url, 0, $activity_id);
                if ($success) {
-                       $rel = $contact['rel'] == Contact::SHARING ? Contact::FRIEND : Contact::FOLLOWER;
-                       DBA::update('contact', ['rel' => $rel], ['id' => $contact['id']]);
+                       DBA::update('contact', ['rel' => Contact::FRIEND], ['id' => $contact['id']]);
                }
 
                return $success;
@@ -142,8 +141,7 @@ class Transmitter
 
                $success = self::sendContactUndo($url, $contact['id'], 0);
                if ($success || $force) {
-                       $rel = $contact['rel'] == Contact::FRIEND ? Contact::SHARING : Contact::NOTHING;
-                       DBA::update('contact', ['rel' => $rel], ['id' => $contact['id']]);
+                       DBA::update('contact', ['rel' => Contact::NOTHING], ['id' => $contact['id']]);
                }
 
                return $success;