Add notifications for threads created in favorite tags

boards/context_processors.py

@@ -1,83 +1,84 b''
 from boards.abstracts.settingsmanager import get_settings_manager, \
     SETTING_LAST_NOTIFICATION_ID, SETTING_IMAGE_VIEWER, SETTING_ONLY_FAVORITES
 from boards.models import Banner
 from boards.models.user import Notification
 from boards import settings
 from boards.models import Post, Tag, Thread
 from boards.settings import SECTION_FORMS, SECTION_VIEW, SECTION_VERSION
 
 THEME_CSS = 'css/{}/base_page.css'
 
 CONTEXT_SITE_NAME = 'site_name'
 CONTEXT_VERSION = 'version'
 CONTEXT_THEME_CSS = 'theme_css'
 CONTEXT_THEME = 'theme'
 CONTEXT_PPD = 'posts_per_day'
 CONTEXT_USER = 'user'
 CONTEXT_NEW_NOTIFICATIONS_COUNT = 'new_notifications_count'
 CONTEXT_USERNAMES = 'usernames'
 CONTEXT_TAGS_STR = 'tags_str'
 CONTEXT_IMAGE_VIEWER = 'image_viewer'
 CONTEXT_HAS_FAV_THREADS = 'has_fav_threads'
 CONTEXT_POW_DIFFICULTY = 'pow_difficulty'
 CONTEXT_NEW_POST_COUNT = 'new_post_count'
 CONTEXT_BANNERS = 'banners'
 CONTEXT_ONLY_FAVORITES = 'only_favorites'
 
 
 def get_notifications(context, settings_manager):
     usernames = settings_manager.get_notification_usernames()
+    fav_tags = settings_manager.get_fav_tags()
     new_notifications_count = 0
-    if usernames:
+    if usernames or fav_tags:
         last_notification_id = settings_manager.get_setting(
             SETTING_LAST_NOTIFICATION_ID)
 
         new_notifications_count = Notification.objects.get_notification_posts(
-                usernames=usernames, last=last_notification_id).only('id').count()
+                usernames=usernames, last=last_notification_id, fav_tags=fav_tags).only('id').count()
     context[CONTEXT_NEW_NOTIFICATIONS_COUNT] = new_notifications_count
     context[CONTEXT_USERNAMES] = usernames
 
 
 def get_new_post_count(context, settings_manager):
     last_posts = settings_manager.get_last_posts()
     count = Thread.objects.get_new_post_count(last_posts)
     if count > 0:
         context[CONTEXT_NEW_POST_COUNT] = '(+{})'.format(count)
 
 
 def user_and_ui_processor(request):
     context = dict()
 
     context[CONTEXT_PPD] = float(Post.objects.get_posts_per_day())
 
     settings_manager = get_settings_manager(request)
     fav_tags = settings_manager.get_fav_tags()
 
     context[CONTEXT_TAGS_STR] = Tag.objects.get_tag_url_list(fav_tags)
     theme = settings_manager.get_theme()
     context[CONTEXT_THEME] = theme
 
     # TODO Use static here
     context[CONTEXT_THEME_CSS] = THEME_CSS.format(theme)
 
     context[CONTEXT_VERSION] = settings.get(SECTION_VERSION, 'Version')
     context[CONTEXT_SITE_NAME] = settings.get(SECTION_VERSION, 'SiteName')
 
     if settings.get_bool(SECTION_FORMS, 'LimitFirstPosting'):
         context[CONTEXT_POW_DIFFICULTY] = settings.get_int(SECTION_FORMS, 'PowDifficulty')
 
     context[CONTEXT_IMAGE_VIEWER] = settings_manager.get_setting(
         SETTING_IMAGE_VIEWER,
         default=settings.get(SECTION_VIEW, 'DefaultImageViewer'))
 
     context[CONTEXT_HAS_FAV_THREADS] =\
         len(settings_manager.get_last_posts()) > 0
 
     context[CONTEXT_BANNERS] = Banner.objects.order_by('-id')
     context[CONTEXT_ONLY_FAVORITES] = settings_manager.get_setting(
             SETTING_ONLY_FAVORITES, default=False)
 
     get_notifications(context, settings_manager)
     get_new_post_count(context, settings_manager)
 
     return context

boards/models/user.py

@@ -1,55 +1,56 b''
 from django.db import models
+from django.db.models import Q
 import boards
 
 __author__ = 'neko259'
 
 BAN_REASON_AUTO = 'Auto'
 BAN_REASON_MAX_LENGTH = 200
 
 SESSION_KEY_MAX_LENGTH = 100
 
 
 class Ban(models.Model):
 
     class Meta:
         app_label = 'boards'
 
     ip = models.GenericIPAddressField()
     reason = models.CharField(default=BAN_REASON_AUTO,
                               max_length=BAN_REASON_MAX_LENGTH)
     can_read = models.BooleanField(default=True)
 
     def __str__(self):
         return self.ip
 
 
 class NotificationManager(models.Manager):
-    def get_notification_posts(self, usernames: list, last: int = None):
+    def get_notification_posts(self, usernames: list, last: int = None, fav_tags=None):
         lower_names = [username.lower() for username in usernames]
         posts = boards.models.post.Post.objects.filter(
-                notification__name__in=lower_names).distinct()
+                Q(notification__name__in=lower_names) | Q(thread__tags__in=fav_tags)).distinct()
         if last is not None:
             posts = posts.filter(id__gt=last)
         posts = posts.order_by('-id')
 
         return posts
 
 
 class Notification(models.Model):
 
     class Meta:
         app_label = 'boards'
 
     objects = NotificationManager()
 
     post = models.ForeignKey('Post', on_delete=models.CASCADE)
     name = models.TextField()
 
 
 class UserSettings(models.Model):
     class Meta:
         app_label = 'boards'
 
     session_key = models.CharField(max_length=SESSION_KEY_MAX_LENGTH, unique=True)
     fav_tags = models.ManyToManyField('Tag', related_name='settings_as_fav')
     hidden_tags = models.ManyToManyField('Tag', related_name='settings_as_hidden')

boards/templates/boards/base.html

@@ -1,104 +1,104 b''
 {% load staticfiles %}
 {% load i18n %}
 {% load l10n %}
 {% load static from staticfiles %}
 
 <!DOCTYPE html>
 <html>
 <head>
     <link rel="stylesheet" type="text/css" href="{% static 'css/base.css' %}" media="all"/>
     <link rel="stylesheet" type="text/css" href="{% static 'css/3party/highlight.css' %}" media="all"/>
     <link rel="stylesheet" type="text/css" href="{% static 'css/3party/jquery-ui.min.css' %}" media="all"/>
     <link rel="stylesheet" type="text/css" href="{% static 'css/3party/jquery.contextMenu.min.css' %}" media="all"/>
     <link rel="stylesheet" type="text/css" href="{% static theme_css %}" media="all"/>
 
     {% if rss_url %}
         <link rel="alternate" type="application/rss+xml" href="{{ rss_url|safe }}" title="{% trans 'Feed' %}"/>
     {% endif %}
 
     <link rel="icon" type="image/png"
         href="{% static 'favicon.png' %}">
 
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <meta charset="utf-8"/>
 
     {% block head %}{% endblock %}
 </head>
 <body data-image-viewer="{{ image_viewer|safe }}"
       data-pow-difficulty="{{ pow_difficulty|safe }}"
       data-update-script="{% static 'js/updates.js' %}">
     <script src="{% static 'js/jquery-2.2.0.min.js' %}"></script>
     <script>
         var PERMS = {
             'change_post': '{{ perms.boards.change_post }}' === 'True',
             'delete_post': '{{ perms.boards.delete_post }}' === 'True',
             'change_thread': '{{ perms.boards.change_thread }}' === 'True',
             'delete_thread': '{{ perms.boards.delete_thread }}' === 'True'
         }
     </script>
 
     <header class="navigation_panel">
         <a class="link" href="{% url 'landing' %}">{{ site_name|safe }}</a>
         <a href="{% url 'index' %}" title="{% trans "All threads" %}">~~~</a>,
         {% if tags_str %}
             <form action="{% url 'index' %}" method="post" class="post-button-form">{% csrf_token %}
             {% if only_favorites %}
                 <button name="method" value="toggle_fav" class="fav">★</button>,
             {% else %}
                 <button name="method" value="toggle_fav" class="not_fav">★</button>,
             {% endif %}
             </form>
             {{ tags_str|safe }},
         {% endif %}
         <a href="{% url 'search' %}" title="{% trans 'Search' %}">{% trans 'search' %}</a>,
         <a href="{% url 'feed' %}" title="{% trans 'Feed' %}">{% trans 'feed' %}</a>,
         <a href="{% url 'random' %}" title="{% trans 'Random images' %}">{% trans 'images' %}</a>{% if has_fav_threads %},
 
         <a href="{% url 'feed' %}?favorites" id="fav-panel-btn">{% trans 'favorites' %} <span id="new-fav-post-count" {% if not new_post_count %}style="display: none" {% endif %}>{{ new_post_count|safe }}</span></a>
         {% endif %}
 
-        {% if usernames %}
+        {% if usernames or tags_str %}
             <a class="right-link link" href="{% url 'notifications' %}" title="{% trans 'Notifications' %}">
                 {% trans 'Notifications' %}
                 {% ifnotequal new_notifications_count 0 %}
                     (<b>{{ new_notifications_count|safe }}</b>)
                 {% endifnotequal %}
             </a>
         {% endif %}
 
         <a class="right-link link" href="{% url 'settings' %}">{% trans 'Settings' %}</a>
     </header>
 
     <div id="fav-panel"><div class="post">{% trans "Loading..." %}</div></div>
 
     <script src="{% static 'js/3party/jquery-ui.min.js' %}"></script>
     <script src="{% static 'js/3party/jquery.contextMenu.min.js' %}"></script>
 
     {% block content %}{% endblock %}
 
     <script src="{% static 'js/jquery.mousewheel.js' %}"></script>
     <script src="{% static 'js/3party/highlight.min.js' %}"></script>
 
     <script src="{% url 'js_info_dict' %}"></script>
 
     <script src="{% static 'js/popup.js' %}"></script>
     <script src="{% static 'js/image.js' %}"></script>
     <script src="{% static 'js/refpopup.js' %}"></script>
     <script src="{% static 'js/main.js' %}"></script>
 
     <footer class="navigation_panel">
         <b><a href="{% url "authors" %}">{{ site_name|safe }}</a> {{ version|safe }}</b>
         {% block metapanel %}{% endblock %}
         {% if rss_url %}
             [<a href="{{ rss_url|safe }}">RSS</a>]
         {% endif %}
         [<a href="{% url 'admin:index' %}">{% trans 'Admin' %}</a>]
         [<a href="{% url 'index' %}?order=pub">{% trans 'New threads' %}</a>]
         {% with ppd=posts_per_day|floatformat:2 %}
             {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %}
         {% endwith %}
         <a class="link" href="#top" id="up">{% trans 'Up' %}</a>
     </footer>
 
 </body>
 </html>

boards/views/notifications.py

@@ -1,48 +1,50 b''
 from django.shortcuts import render
 
 from boards.abstracts.constants import PARAM_PAGE
 from boards.abstracts.paginator import get_paginator
 from boards.abstracts.settingsmanager import get_settings_manager, \
     SETTING_LAST_NOTIFICATION_ID
 from boards.models.user import Notification
 from boards.views.base import BaseBoardView
 
 DEFAULT_PAGE = '1'
 
 TEMPLATE = 'boards/notifications.html'
 PARAM_USERNAMES = 'notification_usernames'
 RESULTS_PER_PAGE = 10
 
 
 class NotificationView(BaseBoardView):
 
     def get(self, request, username=None):
         params = self.get_context_data()
 
         settings_manager = get_settings_manager(request)
 
         # If we open our notifications, reset the "new" count
         if username is None:
             notification_usernames = settings_manager.get_notification_usernames()
         else:
             notification_usernames = [username]
 
+        fav_tags = settings_manager.get_fav_tags()
+
         posts = Notification.objects.get_notification_posts(
-                usernames=notification_usernames)
+                usernames=notification_usernames, fav_tags=fav_tags)
 
         if username is None:
             last = posts.first()
             if last is not None:
                 last_id = last.id
                 settings_manager.set_setting(SETTING_LAST_NOTIFICATION_ID,
                                              last_id)
 
 
         paginator = get_paginator(posts, RESULTS_PER_PAGE)
 
         page = int(request.GET.get(PARAM_PAGE, DEFAULT_PAGE))
 
         params[PARAM_PAGE] = paginator.page(page)
         params[PARAM_USERNAMES] = notification_usernames
 
         return render(request, TEMPLATE, params)