From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Thu, 12 Nov 2020 13:43:09 +0000 (+0000)
Subject: Merge branch 'follows' into 'master'
X-Git-Tag: 0.1.0~8
X-Git-Url: https://reisub.nsupdate.info/git/?a=commitdiff_plain;h=a15d7342181d9a9f2cec641be57a2ba447b7ce54;hp=6e10db1aa092d7098edf121b6842a8f1e9440aef;p=relay.git%2F.git

Merge branch 'follows' into 'master'

remove unnecessary actor checking for (un)follows

See merge request pleroma/relay!22
---

diff --git a/relay/actor.py b/relay/actor.py
index 6afd003..24d39dd 100644
--- a/relay/actor.py
+++ b/relay/actor.py
@@ -242,8 +242,7 @@ async def handle_follow(actor, data, request):
         following += [inbox]
         DATABASE['relay-list'] = following
 
-        if data['object'].endswith('/actor'):
-            asyncio.ensure_future(follow_remote_actor(actor['id']))
+        asyncio.ensure_future(follow_remote_actor(actor['id']))
 
     message = {
         "@context": "https://www.w3.org/ns/activitystreams",
@@ -253,10 +252,10 @@ async def handle_follow(actor, data, request):
 
         # this is wrong per litepub, but mastodon < 2.4 is not compliant with that profile.
         "object": {
-             "type": "Follow",
-             "id": data["id"],
-             "object": "https://{}/actor".format(request.host),
-             "actor": actor["id"]
+            "type": "Follow",
+            "id": data["id"],
+            "object": "https://{}/actor".format(request.host),
+            "actor": actor["id"]
         },
 
         "id": "https://{}/activities/{}".format(request.host, uuid.uuid4()),
@@ -278,8 +277,7 @@ async def handle_undo(actor, data, request):
             following.remove(inbox)
             DATABASE['relay-list'] = following
 
-        if child['object'].endswith('/actor'):
-            await unfollow_remote_actor(actor['id'])
+        await unfollow_remote_actor(actor['id'])
 
 
 processors = {