rename user to liker on PostLike moder

misago/threads/api/postendpoints/likes.py

@@ -5,7 +5,7 @@ from ...serializers import PostLikeSerializer
 
 def likes_list_endpoint(request, post):
     queryset = post.postlike_set.values(
-        'id', 'user_id', 'user_name', 'user_slug', 'liked_on'
+        'id', 'liker_id', 'liker_name', 'liker_slug', 'liked_on'
     )
 
     likes = []

misago/threads/api/postendpoints/patch_post.py

@@ -28,7 +28,7 @@ def patch_is_liked(request, post, value):
 
     # grab like state for this post and user
     try:
-        user_like = post.postlike_set.get(user=request.user)
+        user_like = post.postlike_set.get(liker=request.user)
     except PostLike.DoesNotExist:
         user_like = None
 
@@ -45,10 +45,10 @@ def patch_is_liked(request, post, value):
         post.postlike_set.create(
             category=post.category,
             thread=post.thread,
-            user=request.user,
-            user_name=request.user.username,
-            user_slug=request.user.slug,
-            user_ip=request.user_ip
+            liker=request.user,
+            liker_name=request.user.username,
+            liker_slug=request.user.slug,
+            liker_ip=request.user_ip
         )
         post.likes += 1
 
@@ -60,8 +60,8 @@ def patch_is_liked(request, post, value):
     post.last_likes = []
     for like in post.postlike_set.all()[:4]:
         post.last_likes.append({
-            'id': like.user_id,
-            'username': like.user_name
+            'id': like.liker_id,
+            'username': like.liker_name
         })
 
     post.save(update_fields=['likes', 'last_likes'])

misago/threads/migrations/0001_initial.py

@@ -332,9 +332,9 @@ class Migration(migrations.Migration):
             name='PostLike',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('user_name', models.CharField(max_length=255, db_index=True)),
-                ('user_slug', models.CharField(max_length=255)),
-                ('user_ip', models.GenericIPAddressField()),
+                ('liker_name', models.CharField(max_length=255, db_index=True)),
+                ('liker_slug', models.CharField(max_length=255)),
+                ('liker_ip', models.GenericIPAddressField()),
                 ('liked_on', models.DateTimeField(default=django.utils.timezone.now)),
                 ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='misago_categories.Category')),
             ],
@@ -354,7 +354,7 @@ class Migration(migrations.Migration):
         ),
         migrations.AddField(
             model_name='postlike',
-            name='user',
+            name='liker',
             field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL),
         ),
         migrations.AddField(

misago/threads/models/postlike.py

@@ -8,15 +8,15 @@ class PostLike(models.Model):
     thread = models.ForeignKey('misago_threads.Thread')
     post = models.ForeignKey('misago_threads.Post')
 
-    user = models.ForeignKey(
+    liker = models.ForeignKey(
         settings.AUTH_USER_MODEL,
         blank=True,
         null=True,
         on_delete=models.SET_NULL,
     )
-    user_name = models.CharField(max_length=255, db_index=True)
-    user_slug = models.CharField(max_length=255)
-    user_ip = models.GenericIPAddressField()
+    liker_name = models.CharField(max_length=255, db_index=True)
+    liker_slug = models.CharField(max_length=255)
+    liker_ip = models.GenericIPAddressField()
 
     liked_on = models.DateTimeField(default=timezone.now)
 

misago/threads/serializers/postlike.py

@@ -11,7 +11,7 @@ __all__ = [
 
 
 class PostLikeSerializer(serializers.ModelSerializer):
-    user_id = serializers.SerializerMethodField()
+    liker_id = serializers.SerializerMethodField()
     username = serializers.SerializerMethodField()
 
     url = serializers.SerializerMethodField()
@@ -22,23 +22,23 @@ class PostLikeSerializer(serializers.ModelSerializer):
             'id',
             'liked_on',
 
-            'user_id',
+            'liker_id',
             'username',
 
             'url',
         )
 
-    def get_user_id(self, obj):
-        return obj['user_id']
+    def get_liker_id(self, obj):
+        return obj['liker_id']
 
     def get_username(self, obj):
-        return obj['user_name']
+        return obj['liker_name']
 
     def get_url(self, obj):
-        if obj['user_id']:
+        if obj['liker_id']:
             return reverse('misago:user', kwargs={
-                'slug': obj['user_slug'],
-                'pk': obj['user_id'],
+                'slug': obj['liker_slug'],
+                'pk': obj['liker_id'],
             })
         else:
             return None

misago/threads/signals.py

@@ -118,9 +118,9 @@ def update_usernames(sender, **kwargs):
         editor_slug=sender.slug
     )
 
-    PostLike.objects.filter(user=sender).update(
-        user_name=sender.username,
-        user_slug=sender.slug
+    PostLike.objects.filter(liker=sender).update(
+        liker_name=sender.username,
+        liker_slug=sender.slug
     )
 
     Attachment.objects.filter(uploader=sender).update(

misago/threads/tests/test_thread_postlikes_api.py

@@ -45,7 +45,7 @@ class ThreadPostLikesApiTestCase(ThreadsApiTestCase):
         like = testutils.like_post(self.post, self.user)
         other_like = testutils.like_post(self.post, self.user)
 
-        other_like.user = None
+        other_like.liker = None
         other_like.save()
 
         response = self.client.get(self.api_link)

misago/threads/testutils.py

@@ -183,33 +183,33 @@ def post_poll(thread, poster):
     return poll
 
 
-def like_post(post, user=None, username=None):
+def like_post(post, liker=None, username=None):
     if not post.last_likes:
         post.last_likes = []
 
-    if user:
+    if liker:
         like = post.postlike_set.create(
             category=post.category,
             thread=post.thread,
-            user=user,
-            user_name=user.username,
-            user_slug=user.slug,
-            user_ip='127.0.0.1'
+            liker=liker,
+            liker_name=liker.username,
+            liker_slug=liker.slug,
+            liker_ip='127.0.0.1'
         )
 
         post.last_likes = [
             {
-                'id': user.id,
-                'username': user.username
+                'id': liker.id,
+                'username': liker.username
             }
         ] + post.last_likes
     else:
         like = post.postlike_set.create(
             category=post.category,
             thread=post.thread,
-            user_name=username,
-            user_slug=slugify(username),
-            user_ip='127.0.0.1'
+            liker_name=username,
+            liker_slug=slugify(username),
+            liker_ip='127.0.0.1'
         )
 
         post.last_likes = [

misago/threads/utils.py

@@ -49,7 +49,7 @@ def add_likes_to_posts(user, posts):
         post.is_liked = False
 
     queryset = PostLike.objects.filter(
-        user=user, post_id__in=posts_map.keys())
+        liker=user, post_id__in=posts_map.keys())
 
     for like in queryset.values('post_id'):
         posts_map[like['post_id']].is_liked = True