Use proper inbox url for remote actor

Signed-off-by: Keshav Priyadarshi <git@keshav.space>

Author: keshav-space

fedcode/models.py

@@ -8,6 +8,7 @@
 #
 
 import uuid
+from urllib.parse import urljoin
 
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.fields import GenericForeignKey
@@ -424,11 +425,13 @@ def absolute_url_ap(self):
     @property
     def inbox_url(self):
         if not self.local:
-            return self.remote_actor.url
+            return urljoin(self.remote_actor.url, "inbox")
         return full_reverse("user-inbox", self.user.username)
 
     @property
     def outbox_url(self):
+        if not self.local:
+            return urljoin(self.remote_actor.url, "outbox")
         return full_reverse("user-outbox", self.user.username)
 
     @property
@@ -444,10 +447,11 @@ def key_id(self):
 
     @property
     def to_ap(self):
+        name = self.user.username if self.local else self.remote_actor.username
         return {
             "id": self.absolute_url_ap,
             "type": "Person",
-            "name": self.user.username,
+            "name": name,
             "summary": self.summary,
             "inbox": self.inbox_url,
             "outbox": self.outbox_url,

fedcode/views.py

@@ -698,22 +698,19 @@ def post(self, request, *args, **kwargs):
         return HttpResponseBadRequest("Invalid message")
 
 
-@method_decorator(has_valid_header, name="dispatch")
 class RemoteUserSubscribe(View):
     def get(self, request, *args, **kwargs):
-        """Endpoint to for existing remote user to subscribe to package."""
+        """Endpoint for existing remote user to subscribe to package."""
         purl = request.GET.get("purl").rstrip("/")
         package = get_object_or_404(Package, purl=purl)
         remote_actor = get_object_or_404(RemoteActor, username=kwargs["username"])
-        host = request.get_host()
-        if urlparse(remote_actor.url).netloc == host:
-            _, created = Follow.objects.get_or_create(package=package, person=remote_actor.person)
-            message = f"Already subscribed package {purl}"
-            if created:
-                message = f"Successfully subscribed package {purl}"
-
-            return JsonResponse({"status": "success", "message": message})
-        return HttpResponseBadRequest()
+
+        _, created = Follow.objects.get_or_create(package=package, person=remote_actor.person)
+        message = f"Already subscribed to package {purl}"
+        if created:
+            message = f"Successfully subscribed to package {purl}"
+
+        return JsonResponse({"status": "success", "message": message})
 
 
 @method_decorator(has_valid_header, name="dispatch")

federatedcode/urls.py

@@ -94,7 +94,7 @@
     path("api/v0/users/@<str:username>/outbox", UserOutbox.as_view(), name="user-outbox"),
     path("api/v0/purls/@<path:purl_string>/inbox", PackageInbox.as_view(), name="purl-inbox"),
     path(
-        "api/v0/users/@<str:username>/subscribe",
+        "api/v0/users/@<str:username>/subscribe/",
         RemoteUserSubscribe.as_view(),
         name="purl-subscribe",
     ),