Merge pull request rafalp#1117 from rafalp/master

Release Misago 0.19.3

dev

@@ -1,5 +1,5 @@
 #!/bin/bash
-# devctl is an utility script for automating some development tasks and actions.
+# "dev" is an utility script speeding up different development tasks and actions.
 # To find out what options are available, run it without any arguments.
 
 # Text styles
@@ -356,7 +356,6 @@ if [[ $1 ]]; then
         makemessages en
         txpush
         txpull
-        compilemessages
     elif [[ $1 = "bash" ]]; then
         run_bash
     elif [[ $1 = "manage.py" ]]; then

frontend/src/components/threads/utils.js

@@ -121,7 +121,7 @@ export function getModerationActions(threads) {
       moderation.can_pin_globally = thread.acl.can_pin_globally;
     }
 
-    if (thread.acl.can_unhide > moderation.can_unhide) {
+    if (thread.is_hidden && thread.acl.can_unhide > moderation.can_unhide) {
       moderation.can_unhide = thread.acl.can_unhide;
     }
 

misago/__init__.py

@@ -1 +1 @@
-__version__ = '0.19.2'
+__version__ = '0.19.3'

misago/core/setup.py

@@ -43,14 +43,14 @@ def start_misago_project():
     if len(args) < 1:
         parser.error("project_name must be specified")
 
-    dir = None
+    directory = None
     if len(args) == 2:
-        dir = args[1]
+        directory = args[1]
 
     project_name = validate_project_name(parser, args[0])
 
     argv = [
-        'start-misago.py', 'startproject', project_name, dir,
+        'misago-start.py', 'startproject', project_name, directory,
         '--template=%s' % get_misago_project_template()
     ]
 

misago/locale/tr/LC_MESSAGES/djangojs.po

@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-19 15:33+0000\n"
+"POT-Creation-Date: 2018-09-15 23:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Bilal Akgül <billakgl@gmail.com>, 2018\n"
+"Last-Translator: gülce abatay <gulceabatay@gmail.com>, 2018\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/misago/teams/65369/tr_TR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,7 +44,7 @@ msgstr ""
 
 #: static/misago/js/misago.js:1
 msgid "the privacy policy"
-msgstr ""
+msgstr "gizlilik ilke"
 
 #: static/misago/js/misago.js:1
 msgid "I have read and accept %(agreement)s."
@@ -58,11 +58,11 @@ msgstr ""
 
 #: static/misago/js/misago.js:1
 msgid "Decline"
-msgstr ""
+msgstr "düşüş"
 
 #: static/misago/js/misago.js:1
 msgid "Accept and continue"
-msgstr ""
+msgstr "kabul et ve devam et"
 
 #: static/misago/js/misago.js:1 static/misago/js/misago.js:2
 #: static/misago/js/misago.js:3 static/misago/js/misago.js:4

misago/locale/zh_Hans/LC_MESSAGES/django.po

@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-15 23:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: 沐子白 <yiveco@qq.com>, 2018\n"
+"Last-Translator: cxgreat2014 <fwy1998@gmail.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/misago/teams/65369/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -266,7 +266,7 @@ msgstr "版块权限不能被拷贝到其自身上。"
 
 #: categories/forms.py:133
 msgid "Category cannot act as archive for itself."
-msgstr "版块别不能作为其自身的存档。"
+msgstr "版块不能作为它自己的存档。"
 
 #: categories/forms.py:153
 msgid "Parent category"

misago/users/activepostersranking.py

@@ -1,12 +1,11 @@
 from datetime import timedelta
 
 from django.contrib.auth import get_user_model
-from django.db.models import Count, Q
+from django.db.models import Count
 from django.utils import timezone
 
 from misago.categories.models import Category
 from misago.conf import settings
-from misago.threads.models import Post
 
 from .models import ActivityRanking
 
@@ -38,12 +37,15 @@ def build_active_posters_ranking():
     for category in Category.objects.all_categories():
         ranked_categories.append(category.pk)
 
-    ranked_posts = Q(posted_on__gte=tracked_since) & Q(category__in=ranked_categories)
-
     queryset = (
         UserModel.objects
-        .annotate(score=Count('post', filter=ranked_posts))
-        .filter(is_active=True, score__gt=0)
+        .filter(
+            is_active=True,
+            post__posted_on__gte=tracked_since,
+            post__category__in=ranked_categories,	
+        )
+        .annotate(score=Count('post'))
+        .filter(score__gt=0)
         .order_by('-score')
     )[:settings.MISAGO_RANKING_SIZE]
 

misago/users/tests/test_activepostersranking.py

@@ -1,4 +1,7 @@
+from datetime import timedelta
+
 from django.contrib.auth import get_user_model
+from django.utils import timezone
 
 from misago.categories.models import Category
 from misago.core import threadstore
@@ -35,9 +38,21 @@ def test_get_active_posters_ranking(self):
         self.assertEqual(empty_ranking['users'], [])
         self.assertEqual(empty_ranking['users_count'], 0)
 
-        # other user
+        # other user that will be posting
         other_user = UserModel.objects.create_user("OtherUser", "[email protected]", "pass123")
 
+        # lurker user that won't post anything
+        UserModel.objects.create_user("Lurker", "[email protected]", "pass123")
+
+        # unranked user that posted something 400 days ago
+        unranked_user = UserModel.objects.create_user(
+            "UnrankedUser", "[email protected]", "pass123"
+        )
+
+        started_on = timezone.now() - timedelta(days=400)
+        post_thread(self.category, poster=unranked_user, started_on=started_on)
+
+        # Start testing scenarios
         post_thread(self.category, poster=other_user)
 
         build_active_posters_ranking()