Merge branch 'main' into readthrough-dates

bookwyrm/models/fields.py

@@ -224,8 +224,20 @@ class PrivacyField(ActivitypubFieldMixin, models.CharField):
         original = getattr(instance, self.name)
         to = data.to
         cc = data.cc
+
+        # we need to figure out who this is to get their followers link
+        for field in ["attributedTo", "owner", "actor"]:
+            if hasattr(data, field):
+                user_field = field
+                break
+        if not user_field:
+            raise ValidationError("No user field found for privacy", data)
+        user = activitypub.resolve_remote_id(getattr(data, user_field), model="User")
+
         if to == [self.public]:
             setattr(instance, self.name, "public")
+        elif to == [user.followers_url]:
+            setattr(instance, self.name, "followers")
         elif cc == []:
             setattr(instance, self.name, "direct")
         elif self.public in cc:
@@ -241,9 +253,7 @@ class PrivacyField(ActivitypubFieldMixin, models.CharField):
             mentions = [u.remote_id for u in instance.mention_users.all()]
         # this is a link to the followers list
         # pylint: disable=protected-access
-        followers = instance.user.__class__._meta.get_field(
-            "followers"
-        ).field_to_activity(instance.user.followers)
+        followers = instance.user.followers_url
         if instance.privacy == "public":
             activity["to"] = [self.public]
             activity["cc"] = [followers] + mentions

bookwyrm/models/user.py

@@ -82,9 +82,9 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     preview_image = models.ImageField(
         upload_to="previews/avatars/", blank=True, null=True
     )
-    followers = fields.ManyToManyField(
+    followers_url = fields.CharField(max_length=255, activitypub_field="followers")
+    followers = models.ManyToManyField(
         "self",
-        link_only=True,
         symmetrical=False,
         through="UserFollows",
         through_fields=("user_object", "user_subject"),
@@ -228,7 +228,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
 
     def to_followers_activity(self, **kwargs):
         """activitypub followers list"""
-        remote_id = "%s/followers" % self.remote_id
+        remote_id = self.followers_url
         return self.to_ordered_collection(
             self.followers.order_by("-updated_date").all(),
             remote_id=remote_id,
@@ -275,10 +275,12 @@ class User(OrderedCollectionPageMixin, AbstractUser):
             return
 
         # populate fields for local users
-        self.remote_id = "%s/user/%s" % (site_link(), self.localname)
-        self.inbox = "%s/inbox" % self.remote_id
-        self.shared_inbox = "%s/inbox" % site_link()
-        self.outbox = "%s/outbox" % self.remote_id
+        link = site_link()
+        self.remote_id = f"{link}/user/{self.localname}"
+        self.followers_url = f"{self.remote_id}/followers"
+        self.inbox = f"{self.remote_id}/inbox"
+        self.shared_inbox = f"{link}/inbox"
+        self.outbox = f"{self.remote_id}/outbox"
 
         # an id needs to be set before we can proceed with related models
         super().save(*args, **kwargs)