From c7c975d695183f55dfdea9e5d3743fa7e8fbb76f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 6 Feb 2021 12:00:47 -0800 Subject: [PATCH] Use save method override instead of a signal and gets the new test file working --- bookwyrm/models/activitypub_mixin.py | 300 +++++++++--------- bookwyrm/models/base_model.py | 2 +- bookwyrm/models/favorite.py | 2 +- bookwyrm/models/readthrough.py | 2 +- bookwyrm/models/status.py | 2 +- bookwyrm/models/user.py | 4 +- .../tests/models/test_activitypub_mixin.py | 182 +++++++++++ bookwyrm/tests/models/test_base_model.py | 175 ---------- bookwyrm/tests/models/test_fields.py | 3 +- bookwyrm/tests/test_broadcast.py | 2 +- bookwyrm/views/authentication.py | 1 + 11 files changed, 347 insertions(+), 328 deletions(-) create mode 100644 bookwyrm/tests/models/test_activitypub_mixin.py diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py index 4efb08d7..55e4971e 100644 --- a/bookwyrm/models/activitypub_mixin.py +++ b/bookwyrm/models/activitypub_mixin.py @@ -11,9 +11,7 @@ from Crypto.Signature import pkcs1_15 from Crypto.Hash import SHA256 from django.apps import apps from django.core.paginator import Paginator -from django.db import models from django.db.models import Q -from django.dispatch import receiver from django.utils.http import http_date from bookwyrm import activitypub @@ -22,7 +20,8 @@ from bookwyrm.signatures import make_signature, make_digest from bookwyrm.tasks import app from bookwyrm.models.fields import ImageField, ManyToManyField - +# I tried to separate these classes into mutliple files but I kept getting +# circular import errors so I gave up. I'm sure it could be done though! class ActivitypubMixin: ''' add this mixin for models that are AP serializable ''' activity_serializer = lambda: {} @@ -33,6 +32,7 @@ class ActivitypubMixin: self.image_fields = [] self.many_to_many_fields = [] self.simple_fields = [] # "simple" + # sort model fields by type for field in self._meta.get_fields(): if not hasattr(field, 'field_to_activity'): continue @@ -44,9 +44,11 @@ class ActivitypubMixin: else: self.simple_fields.append(field) + # a list of allll the serializable fields self.activity_fields = self.image_fields + \ self.many_to_many_fields + self.simple_fields + # these are separate to avoid infinite recursion issues self.deserialize_reverse_fields = self.deserialize_reverse_fields \ if hasattr(self, 'deserialize_reverse_fields') else [] self.serialize_reverse_fields = self.serialize_reverse_fields \ @@ -66,6 +68,7 @@ class ActivitypubMixin: This always includes remote_id, but can also be unique identifiers like an isbn for an edition ''' filters = [] + # grabs all the data from the model to create django queryset filters for field in cls._meta.get_fields(): if not hasattr(field, 'deduplication_field') or \ not field.deduplication_field: @@ -89,11 +92,9 @@ class ActivitypubMixin: if hasattr(objects, 'select_subclasses'): objects = objects.select_subclasses() - # an OR operation on all the match fields + # an OR operation on all the match fields, sorry for the dense syntax match = objects.filter( - reduce( - operator.or_, (Q(**f) for f in filters) - ) + reduce(operator.or_, (Q(**f) for f in filters)) ) # there OUGHT to be only one match return match.first() @@ -115,18 +116,18 @@ class ActivitypubMixin: # is this activity owned by a user (statuses, lists, shelves), or is it # general to the instance (like books) user = self.user if hasattr(self, 'user') else None - if not user and self.__model__ == 'user': + user_model = apps.get_model('bookwyrm.User', require_ready=True) + if not user and isinstance(self, user_model): # or maybe the thing itself is a user user = self # find anyone who's tagged in a status, for example mentions = self.mention_users if hasattr(self, 'mention_users') else [] # we always send activities to explicitly mentioned users' inboxes - recipients = [u.inbox for u in mentions or []] + recipients = [u.inbox for u in mentions.all() or []] # unless it's a dm, all the followers should receive the activity if privacy != 'direct': - user_model = apps.get_model('bookwyrm.User', require_ready=True) # filter users first by whether they're using the desired software # this lets us send book updates only to other bw servers queryset = user_model.objects.filter( @@ -142,7 +143,7 @@ class ActivitypubMixin: ).values_list('shared_inbox', flat=True).distinct() # but not everyone has a shared inbox inboxes = queryset.filter( - shared_inboxes__isnull=True + shared_inbox__isnull=True ).values_list('inbox', flat=True) recipients += list(shared_inboxes) + list(inboxes) return recipients @@ -154,120 +155,33 @@ class ActivitypubMixin: return self.activity_serializer(**activity).serialize() -def generate_activity(obj): - ''' go through the fields on an object ''' - activity = {} - for field in obj.activity_fields: - field.set_activity_from_field(activity, obj) - - if hasattr(obj, 'serialize_reverse_fields'): - # for example, editions of a work - for model_field_name, activity_field_name, sort_field in \ - obj.serialize_reverse_fields: - related_field = getattr(obj, model_field_name) - activity[activity_field_name] = \ - unfurl_related_field(related_field, sort_field) - - if not activity.get('id'): - activity['id'] = obj.get_remote_id() - return activity - - -def unfurl_related_field(related_field, sort_field=None): - ''' load reverse lookups (like public key owner or Status attachment ''' - if hasattr(related_field, 'all'): - return [unfurl_related_field(i) for i in related_field.order_by( - sort_field).all()] - if related_field.reverse_unfurl: - return related_field.field_to_activity() - return related_field.remote_id - - -@app.task -def broadcast_task(sender_id, activity, recipients): - ''' the celery task for broadcast ''' - user_model = apps.get_model('bookwyrm.User', require_ready=True) - sender = user_model.objects.get(id=sender_id) - errors = [] - for recipient in recipients: - try: - sign_and_send(sender, activity, recipient) - except requests.exceptions.HTTPError as e: - errors.append({ - 'error': str(e), - 'recipient': recipient, - 'activity': activity, - }) - return errors - - -def sign_and_send(sender, data, destination): - ''' crpyto whatever and http junk ''' - now = http_date() - - if not sender.key_pair.private_key: - # this shouldn't happen. it would be bad if it happened. - raise ValueError('No private key found for sender') - - digest = make_digest(data) - - response = requests.post( - destination, - data=data, - headers={ - 'Date': now, - 'Digest': digest, - 'Signature': make_signature(sender, destination, now, digest), - 'Content-Type': 'application/activity+json; charset=utf-8', - 'User-Agent': USER_AGENT, - }, - ) - if not response.ok: - response.raise_for_status() - return response - - -@receiver(models.signals.post_save) -#pylint: disable=unused-argument -def execute_after_save(sender, instance, created, *args, **kwargs): - ''' broadcast when a model instance is created or updated ''' - # user content like statuses, lists, and shelves, have a "user" field - user = instance.user if hasattr(instance, 'user') else None - - # we don't want to broadcast when we save remote activities - if user and not user.local: - return - - if created: - # book data and users don't need to broadcast on creation - if not user: - return - - # ordered collection items get "Add"ed - if hasattr(instance, 'to_add_activity'): - activity = instance.to_add_activity() - else: - # everything else gets "Create"d - activity = instance.to_create_activity(user) - - if activity and user and user.local: - instance.broadcast(activity, user) - - class ObjectMixin(ActivitypubMixin): ''' add this mixin for object models that are AP serializable ''' - def save(self, *args, **kwargs): - ''' broadcast updated ''' + ''' broadcast created/updated/deleted objects as appropriate ''' + broadcast = kwargs.get('broadcast', True) + # this bonus kwarg woul cause an error in the base save method + if 'broadcast' in kwargs: + del kwargs['broadcast'] + + created = not bool(self.id) # first off, we want to save normally no matter what super().save(*args, **kwargs) - - # we only want to handle updates, not newly created objects - if not self.id: + if not broadcast: return - # this will work for lists, shelves + # this will work for objects owned by a user (lists, shelves) user = self.user if hasattr(self, 'user') else None + + if created: + # broadcast Create activities for objects owned by a local user + if not user or not user.local: + return + activity = self.to_create_activity(user) + self.broadcast(activity, user) + return + + # --- updating an existing object if not user: # users don't have associated users, they ARE users user_model = apps.get_model('bookwyrm.User', require_ready=True) @@ -281,7 +195,7 @@ class ObjectMixin(ActivitypubMixin): return # is this a deletion? - if self.deleted: + if hasattr(self, 'deleted') and self.deleted: activity = self.to_delete_activity(user) else: activity = self.to_update_activity(user) @@ -377,33 +291,6 @@ class OrderedCollectionPageMixin(ObjectMixin): return serializer(**activity).serialize() -# pylint: disable=unused-argument -def to_ordered_collection_page( - queryset, remote_id, id_only=False, page=1, **kwargs): - ''' serialize and pagiante a queryset ''' - paginated = Paginator(queryset, PAGE_LENGTH) - - activity_page = paginated.page(page) - if id_only: - items = [s.remote_id for s in activity_page.object_list] - else: - items = [s.to_activity() for s in activity_page.object_list] - - prev_page = next_page = None - if activity_page.has_next(): - next_page = '%s?page=%d' % (remote_id, activity_page.next_page_number()) - if activity_page.has_previous(): - prev_page = '%s?page=%d' % \ - (remote_id, activity_page.previous_page_number()) - return activitypub.OrderedCollectionPage( - id='%s?page=%s' % (remote_id, page), - partOf=remote_id, - orderedItems=items, - next=next_page, - prev=prev_page - ).serialize() - - class OrderedCollectionMixin(OrderedCollectionPageMixin): ''' extends activitypub models to work as ordered collections ''' @property @@ -423,6 +310,28 @@ class CollectionItemMixin(ActivitypubMixin): activity_serializer = activitypub.Add object_field = collection_field = None + def save(self, *args, **kwargs): + ''' broadcast updated ''' + created = not bool(self.id) + # first off, we want to save normally no matter what + super().save(*args, **kwargs) + + # these shouldn't be edited, only created and deleted + if not created or not self.user.local: + return + + # adding an obj to the collection + activity = self.to_add_activity() + self.broadcast(activity, self.user) + + + def delete(self, *args, **kwargs): + ''' broadcast a remove activity ''' + activity = self.to_remove_activity() + super().delete(*args, **kwargs) + self.broadcast(activity, self.user) + + def to_add_activity(self): ''' AP for shelving a book''' object_field = getattr(self, self.object_field) @@ -453,6 +362,7 @@ class ActivityMixin(ActivitypubMixin): super().save(*args, **kwargs) self.broadcast(self.to_activity(), self.user) + def delete(self, *args, **kwargs): ''' nevermind, undo that activity ''' self.broadcast(self.to_undo_activity(), self.user) @@ -466,3 +376,103 @@ class ActivityMixin(ActivitypubMixin): actor=self.user.remote_id, object=self.to_activity() ).serialize() + + +def generate_activity(obj): + ''' go through the fields on an object ''' + activity = {} + for field in obj.activity_fields: + field.set_activity_from_field(activity, obj) + + if hasattr(obj, 'serialize_reverse_fields'): + # for example, editions of a work + for model_field_name, activity_field_name, sort_field in \ + obj.serialize_reverse_fields: + related_field = getattr(obj, model_field_name) + activity[activity_field_name] = \ + unfurl_related_field(related_field, sort_field) + + if not activity.get('id'): + activity['id'] = obj.get_remote_id() + return activity + + +def unfurl_related_field(related_field, sort_field=None): + ''' load reverse lookups (like public key owner or Status attachment ''' + if hasattr(related_field, 'all'): + return [unfurl_related_field(i) for i in related_field.order_by( + sort_field).all()] + if related_field.reverse_unfurl: + return related_field.field_to_activity() + return related_field.remote_id + + +@app.task +def broadcast_task(sender_id, activity, recipients): + ''' the celery task for broadcast ''' + user_model = apps.get_model('bookwyrm.User', require_ready=True) + sender = user_model.objects.get(id=sender_id) + errors = [] + for recipient in recipients: + try: + sign_and_send(sender, activity, recipient) + except requests.exceptions.HTTPError as e: + errors.append({ + 'error': str(e), + 'recipient': recipient, + 'activity': activity, + }) + return errors + + +def sign_and_send(sender, data, destination): + ''' crpyto whatever and http junk ''' + now = http_date() + + if not sender.key_pair.private_key: + # this shouldn't happen. it would be bad if it happened. + raise ValueError('No private key found for sender') + + digest = make_digest(data) + + response = requests.post( + destination, + data=data, + headers={ + 'Date': now, + 'Digest': digest, + 'Signature': make_signature(sender, destination, now, digest), + 'Content-Type': 'application/activity+json; charset=utf-8', + 'User-Agent': USER_AGENT, + }, + ) + if not response.ok: + response.raise_for_status() + return response + + +# pylint: disable=unused-argument +def to_ordered_collection_page( + queryset, remote_id, id_only=False, page=1, **kwargs): + ''' serialize and pagiante a queryset ''' + paginated = Paginator(queryset, PAGE_LENGTH) + + activity_page = paginated.page(page) + if id_only: + items = [s.remote_id for s in activity_page.object_list] + else: + items = [s.to_activity() for s in activity_page.object_list] + + prev_page = next_page = None + if activity_page.has_next(): + next_page = '%s?page=%d' % (remote_id, activity_page.next_page_number()) + if activity_page.has_previous(): + prev_page = '%s?page=%d' % \ + (remote_id, activity_page.previous_page_number()) + return activitypub.OrderedCollectionPage( + id='%s?page=%s' % (remote_id, page), + partOf=remote_id, + orderedItems=items, + next=next_page, + prev=prev_page + ).serialize() diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py index 003325a7..9c0865df 100644 --- a/bookwyrm/models/base_model.py +++ b/bookwyrm/models/base_model.py @@ -38,4 +38,4 @@ def execute_after_save(sender, instance, created, *args, **kwargs): return if not instance.remote_id: instance.remote_id = instance.get_remote_id() - instance.save() + instance.save(broadcast=False) diff --git a/bookwyrm/models/favorite.py b/bookwyrm/models/favorite.py index 4c66bfd5..7d630cf5 100644 --- a/bookwyrm/models/favorite.py +++ b/bookwyrm/models/favorite.py @@ -19,7 +19,7 @@ class Favorite(ActivityMixin, BookWyrmModel): def save(self, *args, **kwargs): ''' update user active time ''' self.user.last_active_date = timezone.now() - self.user.save() + self.user.save(broadcast=False) super().save(*args, **kwargs) class Meta: diff --git a/bookwyrm/models/readthrough.py b/bookwyrm/models/readthrough.py index 7daafaaf..2a3dd9f4 100644 --- a/bookwyrm/models/readthrough.py +++ b/bookwyrm/models/readthrough.py @@ -31,7 +31,7 @@ class ReadThrough(BookWyrmModel): def save(self, *args, **kwargs): ''' update user active time ''' self.user.last_active_date = timezone.now() - self.user.save() + self.user.save(broadcast=False) super().save(*args, **kwargs) def create_update(self): diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index 74ede26c..d15afbfc 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -131,7 +131,7 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel): ''' update user active time ''' if self.user.local: self.user.last_active_date = timezone.now() - self.user.save() + self.user.save(broadcast=False) return super().save(*args, **kwargs) diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index 133c0721..ee00980e 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -291,7 +291,7 @@ def execute_after_save(sender, instance, created, *args, **kwargs): instance.key_pair = KeyPair.objects.create( remote_id='%s/#main-key' % instance.remote_id) - instance.save() + instance.save(broadcast=False) shelves = [{ 'name': 'To Read', @@ -310,7 +310,7 @@ def execute_after_save(sender, instance, created, *args, **kwargs): identifier=shelf['identifier'], user=instance, editable=False - ).save() + ).save(broadcast=False) @app.task diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py new file mode 100644 index 00000000..36e1fcad --- /dev/null +++ b/bookwyrm/tests/models/test_activitypub_mixin.py @@ -0,0 +1,182 @@ +''' testing model activitypub utilities ''' +from unittest.mock import patch +from collections import namedtuple +from dataclasses import dataclass +import re +from django.test import TestCase + +from bookwyrm.activitypub.base_activity import ActivityObject +from bookwyrm import models +from bookwyrm.models import base_model +from bookwyrm.models.activitypub_mixin import ActivitypubMixin +from bookwyrm.models.activitypub_mixin import ActivityMixin, ObjectMixin + +class ActivitypubMixins(TestCase): + ''' functionality shared across models ''' + def setUp(self): + ''' shared data ''' + self.local_user = models.User.objects.create_user( + 'mouse', 'mouse@mouse.com', 'mouseword', + local=True, localname='mouse') + self.local_user.remote_id = 'http://example.com/a/b' + self.local_user.save(broadcast=False) + + + # ActivitypubMixin + def test_to_activity(self): + ''' model to ActivityPub json ''' + @dataclass(init=False) + class TestActivity(ActivityObject): + ''' real simple mock ''' + type: str = 'Test' + + class TestModel(ActivitypubMixin, base_model.BookWyrmModel): + ''' real simple mock model because BookWyrmModel is abstract ''' + + instance = TestModel() + instance.remote_id = 'https://www.example.com/test' + instance.activity_serializer = TestActivity + + activity = instance.to_activity() + self.assertIsInstance(activity, dict) + self.assertEqual(activity['id'], 'https://www.example.com/test') + self.assertEqual(activity['type'], 'Test') + + + def test_find_existing_by_remote_id(self): + ''' attempt to match a remote id to an object in the db ''' + # uses a different remote id scheme + # this isn't really part of this test directly but it's helpful to state + book = models.Edition.objects.create( + title='Test Edition', remote_id='http://book.com/book') + + self.assertEqual(book.origin_id, 'http://book.com/book') + self.assertNotEqual(book.remote_id, 'http://book.com/book') + + # uses subclasses + with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'): + models.Comment.objects.create( + user=self.local_user, content='test status', book=book, \ + remote_id='https://comment.net') + + result = models.User.find_existing_by_remote_id('hi') + self.assertIsNone(result) + + result = models.User.find_existing_by_remote_id( + 'http://example.com/a/b') + self.assertEqual(result, self.local_user) + + # test using origin id + result = models.Edition.find_existing_by_remote_id( + 'http://book.com/book') + self.assertEqual(result, book) + + # test subclass match + result = models.Status.find_existing_by_remote_id( + 'https://comment.net') + + + def test_find_existing(self): + ''' match a blob of data to a model ''' + book = models.Edition.objects.create( + title='Test edition', + openlibrary_key='OL1234', + ) + + result = models.Edition.find_existing( + {'openlibraryKey': 'OL1234'}) + self.assertEqual(result, book) + + + # ObjectMixin + def test_to_create_activity(self): + ''' wrapper for ActivityPub "create" action ''' + object_activity = { + 'to': 'to field', 'cc': 'cc field', + 'content': 'hi', + 'published': '2020-12-04T17:52:22.623807+00:00', + } + MockSelf = namedtuple('Self', ('remote_id', 'to_activity')) + mock_self = MockSelf( + 'https://example.com/status/1', + lambda *args: object_activity + ) + activity = ObjectMixin.to_create_activity( + mock_self, self.local_user) + self.assertEqual( + activity['id'], + 'https://example.com/status/1/activity' + ) + self.assertEqual(activity['actor'], self.local_user.remote_id) + self.assertEqual(activity['type'], 'Create') + self.assertEqual(activity['to'], 'to field') + self.assertEqual(activity['cc'], 'cc field') + self.assertEqual(activity['object'], object_activity) + self.assertEqual( + activity['signature'].creator, + '%s#main-key' % self.local_user.remote_id + ) + + def test_to_delete_activity(self): + ''' wrapper for Delete activity ''' + MockSelf = namedtuple('Self', ('remote_id', 'to_activity')) + mock_self = MockSelf( + 'https://example.com/status/1', + lambda *args: {} + ) + activity = ObjectMixin.to_delete_activity( + mock_self, self.local_user) + self.assertEqual( + activity['id'], + 'https://example.com/status/1/activity' + ) + self.assertEqual(activity['actor'], self.local_user.remote_id) + self.assertEqual(activity['type'], 'Delete') + self.assertEqual( + activity['to'], + ['%s/followers' % self.local_user.remote_id]) + self.assertEqual( + activity['cc'], + ['https://www.w3.org/ns/activitystreams#Public']) + + + def test_to_update_activity(self): + ''' ditto above but for Update ''' + MockSelf = namedtuple('Self', ('remote_id', 'to_activity')) + mock_self = MockSelf( + 'https://example.com/status/1', + lambda *args: {} + ) + activity = ObjectMixin.to_update_activity( + mock_self, self.local_user) + self.assertIsNotNone( + re.match( + r'^https:\/\/example\.com\/status\/1#update\/.*', + activity['id'] + ) + ) + self.assertEqual(activity['actor'], self.local_user.remote_id) + self.assertEqual(activity['type'], 'Update') + self.assertEqual( + activity['to'], + ['https://www.w3.org/ns/activitystreams#Public']) + self.assertEqual(activity['object'], {}) + + + # Activity mixin + def test_to_undo_activity(self): + ''' and again, for Undo ''' + MockSelf = namedtuple('Self', ('remote_id', 'to_activity', 'user')) + mock_self = MockSelf( + 'https://example.com/status/1', + lambda *args: {}, + self.local_user, + ) + activity = ActivityMixin.to_undo_activity(mock_self) + self.assertEqual( + activity['id'], + 'https://example.com/status/1#undo' + ) + self.assertEqual(activity['actor'], self.local_user.remote_id) + self.assertEqual(activity['type'], 'Undo') + self.assertEqual(activity['object'], {}) diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py index a18257f5..ab388efe 100644 --- a/bookwyrm/tests/models/test_base_model.py +++ b/bookwyrm/tests/models/test_base_model.py @@ -1,13 +1,8 @@ ''' testing models ''' -from collections import namedtuple -from dataclasses import dataclass -import re from django.test import TestCase -from bookwyrm.activitypub.base_activity import ActivityObject from bookwyrm import models from bookwyrm.models import base_model -from bookwyrm.models.base_model import ActivitypubMixin from bookwyrm.settings import DOMAIN class BaseModel(TestCase): @@ -48,173 +43,3 @@ class BaseModel(TestCase): instance.remote_id = None base_model.execute_after_save(None, instance, False) self.assertIsNone(instance.remote_id) - - def test_to_create_activity(self): - ''' wrapper for ActivityPub "create" action ''' - user = models.User.objects.create_user( - 'mouse', 'mouse@mouse.com', 'mouseword', - local=True, localname='mouse') - - object_activity = { - 'to': 'to field', 'cc': 'cc field', - 'content': 'hi', - 'published': '2020-12-04T17:52:22.623807+00:00', - } - MockSelf = namedtuple('Self', ('remote_id', 'to_activity')) - mock_self = MockSelf( - 'https://example.com/status/1', - lambda *args: object_activity - ) - activity = ActivitypubMixin.to_create_activity(mock_self, user) - self.assertEqual( - activity['id'], - 'https://example.com/status/1/activity' - ) - self.assertEqual(activity['actor'], user.remote_id) - self.assertEqual(activity['type'], 'Create') - self.assertEqual(activity['to'], 'to field') - self.assertEqual(activity['cc'], 'cc field') - self.assertEqual(activity['object'], object_activity) - self.assertEqual( - activity['signature'].creator, - '%s#main-key' % user.remote_id - ) - - def test_to_delete_activity(self): - ''' wrapper for Delete activity ''' - user = models.User.objects.create_user( - 'mouse', 'mouse@mouse.com', 'mouseword', - local=True, localname='mouse') - - MockSelf = namedtuple('Self', ('remote_id', 'to_activity')) - mock_self = MockSelf( - 'https://example.com/status/1', - lambda *args: {} - ) - activity = ActivitypubMixin.to_delete_activity(mock_self, user) - self.assertEqual( - activity['id'], - 'https://example.com/status/1/activity' - ) - self.assertEqual(activity['actor'], user.remote_id) - self.assertEqual(activity['type'], 'Delete') - self.assertEqual( - activity['to'], - ['%s/followers' % user.remote_id]) - self.assertEqual( - activity['cc'], - ['https://www.w3.org/ns/activitystreams#Public']) - - def test_to_update_activity(self): - ''' ditto above but for Update ''' - user = models.User.objects.create_user( - 'mouse', 'mouse@mouse.com', 'mouseword', - local=True, localname='mouse') - - MockSelf = namedtuple('Self', ('remote_id', 'to_activity')) - mock_self = MockSelf( - 'https://example.com/status/1', - lambda *args: {} - ) - activity = ActivitypubMixin.to_update_activity(mock_self, user) - self.assertIsNotNone( - re.match( - r'^https:\/\/example\.com\/status\/1#update\/.*', - activity['id'] - ) - ) - self.assertEqual(activity['actor'], user.remote_id) - self.assertEqual(activity['type'], 'Update') - self.assertEqual( - activity['to'], - ['https://www.w3.org/ns/activitystreams#Public']) - self.assertEqual(activity['object'], {}) - - def test_to_undo_activity(self): - ''' and again, for Undo ''' - user = models.User.objects.create_user( - 'mouse', 'mouse@mouse.com', 'mouseword', - local=True, localname='mouse') - - MockSelf = namedtuple('Self', ('remote_id', 'to_activity')) - mock_self = MockSelf( - 'https://example.com/status/1', - lambda *args: {} - ) - activity = ActivitypubMixin.to_undo_activity(mock_self, user) - self.assertEqual( - activity['id'], - 'https://example.com/status/1#undo' - ) - self.assertEqual(activity['actor'], user.remote_id) - self.assertEqual(activity['type'], 'Undo') - self.assertEqual(activity['object'], {}) - - - def test_to_activity(self): - ''' model to ActivityPub json ''' - @dataclass(init=False) - class TestActivity(ActivityObject): - ''' real simple mock ''' - type: str = 'Test' - - class TestModel(ActivitypubMixin, base_model.BookWyrmModel): - ''' real simple mock model because BookWyrmModel is abstract ''' - - instance = TestModel() - instance.remote_id = 'https://www.example.com/test' - instance.activity_serializer = TestActivity - - activity = instance.to_activity() - self.assertIsInstance(activity, dict) - self.assertEqual(activity['id'], 'https://www.example.com/test') - self.assertEqual(activity['type'], 'Test') - - - def test_find_existing_by_remote_id(self): - ''' attempt to match a remote id to an object in the db ''' - # uses a different remote id scheme - # this isn't really part of this test directly but it's helpful to state - book = models.Edition.objects.create( - title='Test Edition', remote_id='http://book.com/book') - user = models.User.objects.create_user( - 'mouse', 'mouse@mouse.mouse', 'mouseword', - local=True, localname='mouse') - user.remote_id = 'http://example.com/a/b' - user.save() - - self.assertEqual(book.origin_id, 'http://book.com/book') - self.assertNotEqual(book.remote_id, 'http://book.com/book') - - # uses subclasses - models.Comment.objects.create( - user=user, content='test status', book=book, \ - remote_id='https://comment.net') - - result = models.User.find_existing_by_remote_id('hi') - self.assertIsNone(result) - - result = models.User.find_existing_by_remote_id( - 'http://example.com/a/b') - self.assertEqual(result, user) - - # test using origin id - result = models.Edition.find_existing_by_remote_id( - 'http://book.com/book') - self.assertEqual(result, book) - - # test subclass match - result = models.Status.find_existing_by_remote_id( - 'https://comment.net') - - - def test_find_existing(self): - ''' match a blob of data to a model ''' - book = models.Edition.objects.create( - title='Test edition', - openlibrary_key='OL1234', - ) - - result = models.Edition.find_existing( - {'openlibraryKey': 'OL1234'}) - self.assertEqual(result, book) diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py index e87855f6..ff8c800a 100644 --- a/bookwyrm/tests/models/test_fields.py +++ b/bookwyrm/tests/models/test_fields.py @@ -19,7 +19,8 @@ from django.utils import timezone from bookwyrm.activitypub.base_activity import ActivityObject from bookwyrm.models import fields, User, Status -from bookwyrm.models.base_model import ActivitypubMixin, BookWyrmModel +from bookwyrm.models.base_model import BookWyrmModel +from bookwyrm.models.activitypub_mixin import ActivitypubMixin #pylint: disable=too-many-public-methods class ActivitypubFields(TestCase): diff --git a/bookwyrm/tests/test_broadcast.py b/bookwyrm/tests/test_broadcast.py index eea7abd8..6344a9f0 100644 --- a/bookwyrm/tests/test_broadcast.py +++ b/bookwyrm/tests/test_broadcast.py @@ -4,7 +4,7 @@ from django.test import TestCase from bookwyrm import models, broadcast -class Book(TestCase): +class Broadcast(TestCase): def setUp(self): self.user = models.User.objects.create_user( 'mouse', 'mouse@mouse.mouse', 'mouseword', diff --git a/bookwyrm/views/authentication.py b/bookwyrm/views/authentication.py index 0fdee798..a74febca 100644 --- a/bookwyrm/views/authentication.py +++ b/bookwyrm/views/authentication.py @@ -46,6 +46,7 @@ class Login(View): # successful login login(request, user) user.last_active_date = timezone.now() + user.save(broadcast=False) return redirect(request.GET.get('next', '/')) # login errors