Add up to 5 random related tags instead of all related list

boards/models/tag.py

@@ -1,106 +1,109 b''
 from django.template.loader import render_to_string
 from django.db import models
 from django.db.models import Count
 from django.core.urlresolvers import reverse
 
 from boards.models.base import Viewable
 from boards.utils import cached_result
 import boards
 
 __author__ = 'neko259'
 
 
+RELATED_TAGS_COUNT = 5
+
+
 class TagManager(models.Manager):
 
     def get_not_empty_tags(self):
         """
         Gets tags that have non-archived threads.
         """
 
         return self.annotate(num_threads=Count('thread_tags')).filter(num_threads__gt=0)\
             .order_by('-required', 'name')
 
     def get_tag_url_list(self, tags: list) -> str:
         """
         Gets a comma-separated list of tag links.
         """
 
         return ', '.join([tag.get_view() for tag in tags])
 
 
 class Tag(models.Model, Viewable):
     """
     A tag is a text node assigned to the thread. The tag serves as a board
     section. There can be multiple tags for each thread
     """
 
     objects = TagManager()
 
     class Meta:
         app_label = 'boards'
         ordering = ('name',)
 
     name = models.CharField(max_length=100, db_index=True, unique=True)
     required = models.BooleanField(default=False, db_index=True)
     description = models.TextField(blank=True)
 
     def __str__(self):
         return self.name
 
     def is_empty(self) -> bool:
         """
         Checks if the tag has some threads.
         """
 
         return self.get_thread_count() == 0
 
     def get_thread_count(self, archived=None) -> int:
         threads = self.get_threads()
         if archived is not None:
             threads = threads.filter(archived=archived)
         return threads.count()
 
     def get_active_thread_count(self) -> int:
         return self.get_thread_count(archived=False)
 
     def get_absolute_url(self):
         return reverse('tag', kwargs={'tag_name': self.name})
 
     def get_threads(self):
         return self.thread_tags.order_by('-bump_time')
 
     def is_required(self):
         return self.required
 
     def get_view(self):
         link = '<a class="tag" href="{}">{}</a>'.format(
             self.get_absolute_url(), self.name)
         if self.is_required():
             link = '<b>{}</b>'.format(link)
         return link
 
     def get_search_view(self, *args, **kwargs):
         return render_to_string('boards/tag.html', {
             'tag': self,
         })
 
     @cached_result()
     def get_post_count(self):
         return self.get_threads().aggregate(num_posts=Count('post'))['num_posts']
 
     def get_description(self):
         return self.description
 
     def get_random_image_post(self, archived=False):
         posts = boards.models.Post.objects.annotate(images_count=Count(
             'images')).filter(images_count__gt=0, threads__tags__in=[self])
         if archived is not None:
             posts = posts.filter(thread__archived=archived)
         return posts.order_by('?').first()
 
     def get_first_letter(self):
         return self.name and self.name[0] or ''
 
     def get_related_tags(self):
-        return Tag.objects.filter(thread_tags__in=self.get_threads()).exclude(
-                id=self.id).distinct()
+        return set(Tag.objects.filter(thread_tags__in=self.get_threads()).exclude(
+                id=self.id).order_by('?')[:RELATED_TAGS_COUNT])

boards/views/tag_threads.py

@@ -1,126 +1,126 b''
 from django.shortcuts import get_object_or_404, redirect
 from django.core.urlresolvers import reverse
 
 from boards.abstracts.settingsmanager import get_settings_manager, \
         SETTING_FAVORITE_TAGS, SETTING_HIDDEN_TAGS
 from boards.models import Tag, PostImage
 from boards.views.all_threads import AllThreadsView, DEFAULT_PAGE
 from boards.views.mixins import DispatcherMixin
 from boards.forms import ThreadForm, PlainErrorList
 
 PARAM_HIDDEN_TAGS = 'hidden_tags'
 PARAM_TAG = 'tag'
 PARAM_IS_FAVORITE = 'is_favorite'
 PARAM_IS_HIDDEN = 'is_hidden'
 PARAM_RANDOM_IMAGE_POST = 'random_image_post'
 PARAM_RELATED_TAGS = 'related_tags'
 
 
 __author__ = 'neko259'
 
 
 class TagView(AllThreadsView, DispatcherMixin):
 
     tag_name = None
 
     def get_threads(self):
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         hidden_tags = self.settings_manager.get_hidden_tags()
 
         try:
             hidden_tags.remove(tag)
         except ValueError:
             pass
 
         return tag.get_threads().exclude(
             tags__in=hidden_tags)
 
     def get_context_data(self, **kwargs):
         params = super(TagView, self).get_context_data(**kwargs)
 
         settings_manager = get_settings_manager(kwargs['request'])
 
         tag = get_object_or_404(Tag, name=self.tag_name)
         params[PARAM_TAG] = tag
 
         fav_tag_names = settings_manager.get_setting(SETTING_FAVORITE_TAGS)
         hidden_tag_names = settings_manager.get_setting(SETTING_HIDDEN_TAGS)
 
         params[PARAM_IS_FAVORITE] = fav_tag_names is not None and tag.name in fav_tag_names
         params[PARAM_IS_HIDDEN] = hidden_tag_names is not None and tag.name in hidden_tag_names
 
         params[PARAM_RANDOM_IMAGE_POST] = tag.get_random_image_post()
-        params[PARAM_RELATED_TAGS] = tag.get_related_tags().all()
+        params[PARAM_RELATED_TAGS] = tag.get_related_tags()
 
         return params
 
     def get_previous_page_link(self, current_page):
         return reverse('tag', kwargs={
             'tag_name': self.tag_name,
         }) + '?page=' + str(current_page.previous_page_number())
 
     def get_next_page_link(self, current_page):
         return reverse('tag', kwargs={
             'tag_name': self.tag_name,
         }) + '?page=' + str(current_page.next_page_number())
 
     def get(self, request, tag_name, form=None):
         self.tag_name = tag_name
 
         return super(TagView, self).get(request, form)
 
 
     def post(self, request, tag_name):
         self.tag_name = tag_name
 
         if 'method' in request.POST:
             self.dispatch_method(request)
             form = None
 
             return redirect('tag', tag_name)
         else:
             form = ThreadForm(request.POST, request.FILES,
                               error_class=PlainErrorList)
             form.session = request.session
 
             if form.is_valid():
                 return self.create_thread(request, form)
             if form.need_to_ban:
                 # Ban user because he is suspected to be a bot
                 self._ban_current_user(request)
 
             return self.get(request, tag_name, page, form)
 
     def subscribe(self, request):
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         settings_manager = get_settings_manager(request)
         settings_manager.add_fav_tag(tag)
 
     def unsubscribe(self, request):
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         settings_manager = get_settings_manager(request)
         settings_manager.del_fav_tag(tag)
 
     def hide(self, request):
         """
         Adds tag to user's hidden tags. Threads with this tag will not be
         shown.
         """
 
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         settings_manager = get_settings_manager(request)
         settings_manager.add_hidden_tag(tag)
 
     def unhide(self, request):
         """
         Removed tag from user's hidden tags.
         """
 
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         settings_manager = get_settings_manager(request)
         settings_manager.del_hidden_tag(tag)