Small changes to the tag popularity code

boards/models/tag.py

@@ -5,11 +5,11 b' from django.db.models import Count'
 __author__ = 'neko259'
 
 TAG_FONT_MULTIPLIER = 0.1
-MAX_TAG_FONT = 10
+MAX_TAG_FONT = 5
 
 OPENING_POST_POPULARITY = 0.5
-ARCHIVE_POPULARITY = 0.01
 REPLY_POPULARITY = 0.1
+ARCHIVE_POPULARITY_MODIFIER = 0.1
 
 
 class TagManager(models.Manager):
@@ -52,11 +52,12 b' class Tag(models.Model):'
         for thread in self.threads.all():
             reply_count = thread.get_reply_count()
 
+            thread_popularity = 0.0
+            thread_popularity += REPLY_POPULARITY * reply_count
+            thread_popularity += OPENING_POST_POPULARITY
             if thread.archived:
-                popularity += ARCHIVE_POPULARITY * reply_count
-            else:
-                popularity += REPLY_POPULARITY * reply_count
-            popularity += OPENING_POST_POPULARITY
+                thread_popularity *= ARCHIVE_POPULARITY_MODIFIER
+            popularity += thread_popularity
 
         return popularity
 
@@ -83,9 +84,8 b' class Tag(models.Model):'
         """Get tag font value to differ most popular tags in the list"""
 
         popularity = self.get_popularity()
-        if popularity > MAX_TAG_FONT:
-            popularity = MAX_TAG_FONT
 
-        font_value = str(1 + (popularity - 1) * TAG_FONT_MULTIPLIER)
+        font_value = 1 + (popularity - 1) * TAG_FONT_MULTIPLIER
+        font_value = min(font_value, MAX_TAG_FONT)
 
-        return font_value
+        return str(font_value)