From 4cfcaa82c0bc75784c93c9510eee0cce111c5341 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 9 Jan 2021 19:19:20 +0000
Subject: [PATCH] Fix relay handling

---
 src/Console/Relay.php                    |  4 ++--
 src/Protocol/ActivityPub/Transmitter.php | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Console/Relay.php b/src/Console/Relay.php
index 206726f6bc..f417b51924 100644
--- 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 29a3b0ada9..68bac70000 100644
--- 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;