Rename anonymize_content to anonymize_data

misago/categories/signals.py

@@ -1,6 +1,6 @@
 from django.dispatch import Signal, receiver
 
-from misago.users.signals import anonymize_user_content, username_changed
+from misago.users.signals import anonymize_user_data, username_changed
 
 from .models import Category
 
@@ -9,7 +9,7 @@ delete_category_content = Signal()
 move_category_content = Signal(providing_args=["new_category"])
 
 
-@receiver([anonymize_user_content, username_changed])
+@receiver([anonymize_user_data, username_changed])
 def update_usernames(sender, **kwargs):
     Category.objects.filter(last_poster=sender).update(
         last_poster_name=sender.username,

misago/threads/signals.py

@@ -10,7 +10,7 @@ from misago.categories.models import Category
 from misago.categories.signals import delete_category_content, move_category_content
 from misago.core.pgutils import chunk_queryset
 from misago.users.signals import (
-    anonymize_user_content, archive_user_data, delete_user_content, username_changed)
+    anonymize_user_data, archive_user_data, delete_user_content, username_changed)
 
 from .anonymize import ANONYMIZABLE_EVENTS, anonymize_event, anonymize_post_last_likes
 from .models import Attachment, Poll, PollVote, Post, PostEdit, PostLike, Thread
@@ -181,7 +181,7 @@ def archive_user_polls(sender, archive=None, **kwargs):
         )
 
 
-@receiver(anonymize_user_content)
+@receiver(anonymize_user_data)
 def anonymize_user_in_events(sender, **kwargs):
     queryset = Post.objects.filter(
         is_event=True,
@@ -193,13 +193,13 @@ def anonymize_user_in_events(sender, **kwargs):
         anonymize_event(sender, event)
 
 
-@receiver([anonymize_user_content])
+@receiver([anonymize_user_data])
 def anonymize_user_in_likes(sender, **kwargs):
     for post in chunk_queryset(sender.liked_post_set):
         anonymize_post_last_likes(sender, post)
 
 
-@receiver([anonymize_user_content, username_changed])
+@receiver([anonymize_user_data, username_changed])
 def update_usernames(sender, **kwargs):
     Thread.objects.filter(starter=sender).update(
         starter_name=sender.username,

misago/threads/tests/test_anonymize_data.py

@@ -39,7 +39,7 @@ class AnonymizeEventsTests(AuthenticatedUserTestCase):
         return request
 
     def test_anonymize_changed_owner_event(self):
-        """changed owner event is anonymized by user.anonymize_content"""
+        """changed owner event is anonymized by user.anonymize_data"""
         user = get_mock_user()
         request = self.get_request()
 
@@ -47,7 +47,7 @@ class AnonymizeEventsTests(AuthenticatedUserTestCase):
         make_participants_aware(self.user, self.thread)
         change_owner(request, self.thread, user)
 
-        user.anonymize_content()
+        user.anonymize_data()
 
         event = Post.objects.get(event_type='changed_owner')
         self.assertEqual(event.event_context, {
@@ -59,7 +59,7 @@ class AnonymizeEventsTests(AuthenticatedUserTestCase):
         })
 
     def test_anonymize_added_participant_event(self):
-        """added participant event is anonymized by user.anonymize_content"""
+        """added participant event is anonymized by user.anonymize_data"""
         user = get_mock_user()
         request = self.get_request()
 
@@ -67,7 +67,7 @@ class AnonymizeEventsTests(AuthenticatedUserTestCase):
         make_participants_aware(self.user, self.thread)
         add_participant(request, self.thread, user)
 
-        user.anonymize_content()
+        user.anonymize_data()
 
         event = Post.objects.get(event_type='added_participant')
         self.assertEqual(event.event_context, {
@@ -79,7 +79,7 @@ class AnonymizeEventsTests(AuthenticatedUserTestCase):
         })
 
     def test_anonymize_owner_left_event(self):
-        """owner left event is anonymized by user.anonymize_content"""
+        """owner left event is anonymized by user.anonymize_data"""
         user = get_mock_user()
         request = self.get_request(user)
 
@@ -90,7 +90,7 @@ class AnonymizeEventsTests(AuthenticatedUserTestCase):
         make_participants_aware(user, self.thread)
         remove_participant(request, self.thread, user)
 
-        user.anonymize_content()
+        user.anonymize_data()
 
         event = Post.objects.get(event_type='owner_left')
         self.assertEqual(event.event_context, {
@@ -102,7 +102,7 @@ class AnonymizeEventsTests(AuthenticatedUserTestCase):
         })
 
     def test_anonymize_removed_owner_event(self):
-        """removed owner event is anonymized by user.anonymize_content"""
+        """removed owner event is anonymized by user.anonymize_data"""
         user = get_mock_user()
         request = self.get_request()
 
@@ -113,7 +113,7 @@ class AnonymizeEventsTests(AuthenticatedUserTestCase):
         make_participants_aware(user, self.thread)
         remove_participant(request, self.thread, user)
 
-        user.anonymize_content()
+        user.anonymize_data()
 
         event = Post.objects.get(event_type='removed_owner')
         self.assertEqual(event.event_context, {
@@ -125,7 +125,7 @@ class AnonymizeEventsTests(AuthenticatedUserTestCase):
         })
 
     def test_anonymize_participant_left_event(self):
-        """participant left event is anonymized by user.anonymize_content"""
+        """participant left event is anonymized by user.anonymize_data"""
         user = get_mock_user()
         request = self.get_request(user)
 
@@ -136,7 +136,7 @@ class AnonymizeEventsTests(AuthenticatedUserTestCase):
         make_participants_aware(user, self.thread)
         remove_participant(request, self.thread, user)
 
-        user.anonymize_content()
+        user.anonymize_data()
 
         event = Post.objects.get(event_type='participant_left')
         self.assertEqual(event.event_context, {
@@ -148,7 +148,7 @@ class AnonymizeEventsTests(AuthenticatedUserTestCase):
         })
         
     def test_anonymize_removed_participant_event(self):
-        """removed participant event is anonymized by user.anonymize_content"""
+        """removed participant event is anonymized by user.anonymize_data"""
         user = get_mock_user()
         request = self.get_request()
 
@@ -159,7 +159,7 @@ class AnonymizeEventsTests(AuthenticatedUserTestCase):
         make_participants_aware(self.user, self.thread)
         remove_participant(request, self.thread, user)
 
-        user.anonymize_content()
+        user.anonymize_data()
 
         event = Post.objects.get(event_type='removed_participant')
         self.assertEqual(event.event_context, {
@@ -184,7 +184,7 @@ class AnonymizeLikesTests(AuthenticatedUserTestCase):
         return request
 
     def test_anonymize_user_likes(self):
-        """post's last like is anonymized by user.anonymize_content"""
+        """post's last like is anonymized by user.anonymize_data"""
         category = Category.objects.get(slug='first-category')
         thread = testutils.post_thread(category)
         post = testutils.reply_thread(thread)
@@ -195,7 +195,7 @@ class AnonymizeLikesTests(AuthenticatedUserTestCase):
         patch_is_liked(self.get_request(self.user), post, 1)
         patch_is_liked(self.get_request(user), post, 1)
 
-        user.anonymize_content()
+        user.anonymize_data()
 
         last_likes = Post.objects.get(pk=post.pk).last_likes
         self.assertEqual(last_likes, [
@@ -223,13 +223,13 @@ class AnonymizePostsTests(AuthenticatedUserTestCase):
         return request
 
     def test_anonymize_user_posts(self):
-        """post is anonymized by user.anonymize_content"""
+        """post is anonymized by user.anonymize_data"""
         category = Category.objects.get(slug='first-category')
         thread = testutils.post_thread(category)
 
         user = get_mock_user()
         post = testutils.reply_thread(thread, poster=user)
-        user.anonymize_content()
+        user.anonymize_data()
 
         anonymized_post = Post.objects.get(pk=post.pk)
         self.assertTrue(anonymized_post.is_valid)

misago/threads/tests/test_delete_user_likes.py

@@ -30,7 +30,7 @@ class DeleteUserLikesTests(AuthenticatedUserTestCase):
         return request
 
     def test_anonymize_user_likes(self):
-        """post's last like is anonymized by user.anonymize_content"""
+        """post's last like is anonymized by user.anonymize_data"""
         category = Category.objects.get(slug='first-category')
         thread = testutils.post_thread(category)
         post = testutils.reply_thread(thread)

misago/users/models/user.py

@@ -304,7 +304,7 @@ class User(AbstractBaseUser, PermissionsMixin):
         if kwargs.pop('delete_content', False):
             self.delete_content()
 
-        self.anonymize_content()
+        self.anonymize_data()
 
         avatars.delete_avatar(self)
 
@@ -319,7 +319,7 @@ class User(AbstractBaseUser, PermissionsMixin):
         self.is_deleting_account = True
         self.save(update_fields=['is_active', 'is_deleting_account'])
 
-    def anonymize_content(self):
+    def anonymize_data(self):
         """Replaces username with anonymized one, then send anonymization signal.
 
         Items associated with this user then anonymize their user-specific data
@@ -328,8 +328,8 @@ class User(AbstractBaseUser, PermissionsMixin):
         self.username = settings.MISAGO_ANONYMOUS_USERNAME
         self.slug = slugify(self.username)
         
-        from misago.users.signals import anonymize_user_content
-        anonymize_user_content.send(sender=self)
+        from misago.users.signals import anonymize_user_data
+        anonymize_user_data.send(sender=self)
 
     @property
     def acl_cache(self):

misago/users/signals.py

@@ -16,7 +16,7 @@ from .profilefields import profilefields
 
 UserModel = get_user_model()
 
-anonymize_user_content = Signal()
+anonymize_user_data = Signal()
 archive_user_data = Signal()
 delete_user_content = Signal()
 remove_old_ips = Signal()

misago/users/tests/test_user_model.py

@@ -74,11 +74,11 @@ class UserManagerTests(TestCase):
 
 
 class UserModelTests(TestCase):
-    def test_anonymize_content(self):
-        """anonymize_content sets username and slug to one defined in settings"""
+    def test_anonymize_data(self):
+        """anonymize_data sets username and slug to one defined in settings"""
         user = User.objects.create_user('Bob', 'bob@example.com', 'Pass.123')
 
-        user.anonymize_content()
+        user.anonymize_data()
         self.assertEqual(user.username, settings.MISAGO_ANONYMOUS_USERNAME)
         self.assertEqual(user.slug, slugify(settings.MISAGO_ANONYMOUS_USERNAME))