mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-12-17 21:56:36 +00:00
Code Issues Projects Releases Wiki Activity

Support multiple possible fields that indicate user ownership

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bookwyrm/models/fields.py
View file

@ -226,7 +226,8 @@ class PrivacyField(ActivitypubFieldMixin, models.CharField):
cc = data.cc cc = data.cc
# we need to figure out who this is to get their followers link # 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]: if to == [self.public]:
setattr(instance, self.name, "public") setattr(instance, self.name, "public")

1
bookwyrm/tests/models/test_user_model.py
View file

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