Support multiple possible fields that indicate user ownership

This commit is contained in:
Mouse Reeve 2021-08-28 12:08:24 -07:00
parent 9c4fd1e602
commit a5dcc0e5e4
2 changed files with 3 additions and 1 deletions

View file

@ -226,7 +226,8 @@ class PrivacyField(ActivitypubFieldMixin, models.CharField):
cc = data.cc
# we need to figure out who this is to get their followers link
user = activitypub.resolve_remote_id(data.attributedTo, model="User")
user_field = "attributedTo" if hasattr(data, "attributedTo") else "owner"
user = activitypub.resolve_remote_id(getattr(data, user_field), model="User")
if to == [self.public]:
setattr(instance, self.name, "public")

View file

@ -11,6 +11,7 @@ from bookwyrm.settings import USE_HTTPS, DOMAIN
# pylint: disable=missing-function-docstring
class User(TestCase):
protocol = "https://" if USE_HTTPS else "http://"
def setUp(self):
with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"):
self.user = models.User.objects.create_user(