Subscribe to a multiple of users for notifications

boards/abstracts/settingsmanager.py

@@ -143,6 +143,14 b' class SettingsManager:'
     def thread_is_fav(self, opening_post):
         return str(opening_post.id) in self.get_fav_threads()
 
+    def get_notification_usernames(self):
+        name_list = self.get_setting(SETTING_USERNAME)
+        if name_list is not None and len(name_list) > 0:
+            return name_list.lower().split(',')
+        else:
+            return list()
+
+
 class SessionSettingsManager(SettingsManager):
     """
     Session-based settings manager. All settings are saved to the user's

boards/context_processors.py

@@ -1,10 +1,10 b''
 from boards.abstracts.settingsmanager import get_settings_manager, \
-    SETTING_USERNAME, SETTING_LAST_NOTIFICATION_ID, SETTING_IMAGE_VIEWER
+    SETTING_LAST_NOTIFICATION_ID, SETTING_IMAGE_VIEWER
 from boards.models.user import Notification
 
 __author__ = 'neko259'
 
-from boards import settings, utils
+from boards import settings
 from boards.models import Post, Tag
 
 CONTEXT_SITE_NAME = 'site_name'
@@ -15,7 +15,7 b" CONTEXT_PPD = 'posts_per_day'"
 CONTEXT_TAGS = 'tags'
 CONTEXT_USER = 'user'
 CONTEXT_NEW_NOTIFICATIONS_COUNT = 'new_notifications_count'
-CONTEXT_USERNAME = 'username'
+CONTEXT_USERNAMES = 'usernames'
 CONTEXT_TAGS_STR = 'tags_str'
 CONTEXT_IMAGE_VIEWER = 'image_viewer'
 CONTEXT_HAS_FAV_THREADS = 'has_fav_threads'
@@ -24,16 +24,16 b" CONTEXT_POW_DIFFICULTY = 'pow_difficulty"
 
 def get_notifications(context, request):
     settings_manager = get_settings_manager(request)
-    username = settings_manager.get_setting(SETTING_USERNAME)
+    usernames = settings_manager.get_notification_usernames()
     new_notifications_count = 0
-    if username is not None and len(username) > 0:
+    if usernames is not None:
         last_notification_id = settings_manager.get_setting(
             SETTING_LAST_NOTIFICATION_ID)
 
         new_notifications_count = Notification.objects.get_notification_posts(
-                username=username, last=last_notification_id).count()
+                usernames=usernames, last=last_notification_id).count()
     context[CONTEXT_NEW_NOTIFICATIONS_COUNT] = new_notifications_count
-    context[CONTEXT_USERNAME] = username
+    context[CONTEXT_USERNAMES] = usernames
 
 
 def user_and_ui_processor(request):

boards/forms.py

@@ -26,6 +26,7 b' POW_HASH_LENGTH = 16'
 POW_LIFE_MINUTES = 1
 
 REGEX_TAGS = re.compile(r'^[\w\s\d]+$', re.UNICODE)
+REGEX_USERNAMES = re.compile(r'^[\w\s\d,]+$', re.UNICODE)
 
 VETERAN_POSTING_DELAY = 5
 
@@ -429,7 +430,7 b' class SettingsForm(NeboardForm):'
     def clean_username(self):
         username = self.cleaned_data['username']
 
-        if username and not REGEX_TAGS.match(username):
+        if username and not REGEX_USERNAMES.match(username):
             raise forms.ValidationError(_('Inappropriate characters.'))
 
         return username

boards/models/user.py

@@ -23,10 +23,10 b' class Ban(models.Model):'
 
 
 class NotificationManager(models.Manager):
-    def get_notification_posts(self, username: str, last: int = None):
-        i_username = username.lower()
-
-        posts = boards.models.post.Post.objects.filter(notification__name=i_username)
+    def get_notification_posts(self, usernames: list, last: int = None):
+        lower_names = [username.lower() for username in usernames]
+        posts = boards.models.post.Post.objects.filter(
+                notification__name__in=lower_names).distinct()
         if last is not None:
             posts = posts.filter(id__gt=last)
         posts = posts.order_by('-id')

boards/templates/boards/base.html

@@ -43,8 +43,8 b''
             <a href="#" id="fav-panel-btn">{% trans 'favorites' %} <span id="new-fav-post-count"></span></a>
         {% endif %}
 
-        {% if username %}
-            <a class="right-link link" href="{% url 'notifications' username %}" title="{% trans 'Notifications' %}">
+        {% if usernames %}
+            <a class="right-link link" href="{% url 'notifications' %}" title="{% trans 'Notifications' %}">
                 {% trans 'Notifications' %}
                 {% ifnotequal new_notifications_count 0 %}
                     (<b>{{ new_notifications_count }}</b>)

boards/templates/boards/notifications.html

@@ -5,11 +5,15 b''
 
 {% block head %}
     <meta name="robots" content="noindex">
-    <title>{{ site_name }} - {% trans 'Notifications' %} - {{ notification_username }}</title>
+    <title>{{ site_name }} - {% trans 'Notifications' %} - {{ notification_usernames|join:', ' }}</title>
 {% endblock %}
 
 {% block content %}
-    <div class="tag_info"><a href="{% url 'notifications' notification_username %}" class="user-cast">@{{ notification_username }}</a></div>
+    <div class="tag_info">
+    {% for username in notification_usernames %}
+        <a href="{% url 'notifications' username %}" class="user-cast">@{{ username }}</a>
+    {% endfor %}
+    </div>
 
     {% if page %}
         {% if page.has_previous %}

boards/tests/test_views.py

@@ -40,8 +40,6 b' class ViewTest(TestCase):'
                 except NoReverseMatch:
                     # This view just needs additional arguments
                     pass
-                except Exception as e:
-                    self.fail('Got exception %s at %s view' % (e, view_name))
             except AttributeError:
                 # This is normal, some views do not have names
                 pass

boards/urls.py

@@ -78,7 +78,8 b" urlpatterns = patterns('',"
     url(r'^search/$', BoardSearchView.as_view(), name='search'),
 
     # Notifications
-    url(r'^notifications/(?P<username>\w+)$', NotificationView.as_view(), name='notifications'),
+    url(r'^notifications/(?P<username>\w+)/$', NotificationView.as_view(), name='notifications'),
+    url(r'^notifications/$', NotificationView.as_view(), name='notifications'),
 
     # Post preview
     url(r'^preview/$', PostPreviewView.as_view(), name='preview')

boards/views/notifications.py

@@ -10,37 +10,40 b" DEFAULT_PAGE = '1'"
 
 TEMPLATE = 'boards/notifications.html'
 PARAM_PAGE = 'page'
-PARAM_USERNAME = 'notification_username'
+PARAM_USERNAMES = 'notification_usernames'
 REQUEST_PAGE = 'page'
 RESULTS_PER_PAGE = 10
 
 
 class NotificationView(BaseBoardView):
 
-    def get(self, request, username):
+    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
-        my_username = settings_manager.get_setting(SETTING_USERNAME)
-
-        notification_username = username.lower()
+        if username is None:
+            notification_usernames = settings_manager.get_notification_usernames()
+        else:
+            notification_usernames = [username]
 
         posts = Notification.objects.get_notification_posts(
-            username=notification_username)
-        if notification_username == my_username:
+                usernames=notification_usernames)
+
+        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(REQUEST_PAGE, DEFAULT_PAGE))
 
         params[PARAM_PAGE] = paginator.page(page)
-        params[PARAM_USERNAME] = notification_username
+        params[PARAM_USERNAMES] = notification_usernames
 
         return render(request, TEMPLATE, params)