Store user settings apart from session in the database

boards/migrations/0069_usersettings.py

@@ -0,0 +1,22 b''
+# Generated by Django 2.0 on 2017-12-17 09:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boards', '0068_auto_20171214_0833'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='UserSettings',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('session_key', models.CharField(max_length=100, unique=True)),
+                ('fav_tags', models.ManyToManyField(related_name='settings_as_fav', to='boards.Tag')),
+                ('hidden_tags', models.ManyToManyField(related_name='settings_as_hidden', to='boards.Tag')),
+            ],
+        ),
+    ]

boards/abstracts/settingsmanager.py

@@ -2,7 +2,7 b' from boards import settings'
 from boards.models import Tag, TagAlias, Attachment
 from boards.models.attachment import AttachmentSticker
 from boards.models.thread import FAV_THREAD_NO_UPDATES
-from boards.models.tag import DEFAULT_LOCALE
+from boards.models.user import UserSettings
 from boards.settings import SECTION_VIEW
 
 MAX_TRIPCODE_COLLISIONS = 50
@@ -11,18 +11,13 b' MAX_TRIPCODE_COLLISIONS = 50'
 
 SESSION_SETTING = 'setting'
 
-# Remove this, it is not used any more cause there is a user's permission
-PERMISSION_MODERATE = 'moderator'
-
 SETTING_THEME = 'theme'
 SETTING_FAVORITE_TAGS = 'favorite_tags'
 SETTING_FAVORITE_THREADS = 'favorite_threads'
 SETTING_HIDDEN_TAGS = 'hidden_tags'
-SETTING_PERMISSIONS = 'permissions'
 SETTING_USERNAME = 'username'
 SETTING_LAST_NOTIFICATION_ID = 'last_notification'
 SETTING_IMAGE_VIEWER = 'image_viewer'
-SETTING_TRIPCODE = 'tripcode'
 SETTING_IMAGES = 'images_aliases'
 SETTING_ONLY_FAVORITES = 'only_favorites'
 
@@ -48,35 +43,12 b' class SettingsManager:'
     def set_theme(self, theme):
         self.set_setting(SETTING_THEME, theme)
 
-    def has_permission(self, permission):
-        permissions = self.get_setting(SETTING_PERMISSIONS)
-        if permissions:
-            return permission in permissions
-        else:
-            return False
-
     def get_setting(self, setting, default=None):
         pass
 
     def set_setting(self, setting, value):
         pass
 
-    def add_permission(self, permission):
-        permissions = self.get_setting(SETTING_PERMISSIONS)
-        if not permissions:
-            permissions = [permission]
-        else:
-            permissions.append(permission)
-        self.set_setting(SETTING_PERMISSIONS, permissions)
-
-    def del_permission(self, permission):
-        permissions = self.get_setting(SETTING_PERMISSIONS)
-        if not permissions:
-            permissions = []
-        else:
-            permissions.remove(permission)
-        self.set_setting(SETTING_PERMISSIONS, permissions)
-
     def get_fav_tags(self) -> list:
         tag_names = self.get_setting(SETTING_FAVORITE_TAGS)
         tags = []
@@ -198,6 +170,14 b' class SettingsManager:'
                     self.remove_attachment_alias(key)
         return stickers
 
+    def tag_is_fav(self, tag):
+        fav_tag_names = self.get_setting(SETTING_FAVORITE_TAGS)
+        return fav_tag_names is not None and tag.get_name() in fav_tag_names
+
+    def tag_is_hidden(self, tag):
+        hidden_tag_names = self.get_setting(SETTING_HIDDEN_TAGS)
+        return hidden_tag_names is not None and tag.get_name() in hidden_tag_names
+
 
 class SessionSettingsManager(SettingsManager):
     """
@@ -219,10 +199,42 b' class SessionSettingsManager(SettingsMan'
         self.session[setting] = value
 
 
+class DatabaseSettingsManager(SessionSettingsManager):
+    def __init__(self, session):
+        super().__init__(session)
+        self.settings, created = UserSettings.objects.get_or_create(session_key=session.session_key)
+
+    def add_fav_tag(self, tag):
+        self.settings.fav_tags.add(tag)
+
+    def del_fav_tag(self, tag):
+        self.settings.fav_tags.remove(tag)
+
+    def get_fav_tags(self) -> list:
+        return self.settings.fav_tags.filter(
+            aliases__in=TagAlias.objects.filter_localized())\
+            .order_by('aliases__name')
+
+    def get_hidden_tags(self) -> list:
+        return self.settings.hidden_tags.all()
+
+    def add_hidden_tag(self, tag):
+        self.settings.hidden_tags.add(tag)
+        
+    def del_hidden_tag(self, tag):
+        self.settings.hidden_tags.remove(tag)
+
+    def tag_is_fav(self, tag):
+        return self.settings.fav_tags.filter(id=tag.id).exists()
+
+    def tag_is_hidden(self, tag):
+        return self.settings.hidden_tags.filter(id=tag.id).exists()
+
+
 def get_settings_manager(request) -> SettingsManager:
     """
     Get settings manager based on the request object. Currently only
     session-based manager is supported. In the future, cookie-based or
     database-based managers could be implemented.
     """
-    return SessionSettingsManager(request.session)
+    return DatabaseSettingsManager(request.session)

boards/models/user.py

@@ -6,6 +6,8 b' import boards'
 BAN_REASON_AUTO = 'Auto'
 BAN_REASON_MAX_LENGTH = 200
 
+SESSION_KEY_MAX_LENGTH = 100
+
 
 class Ban(models.Model):
 
@@ -43,3 +45,11 b' class Notification(models.Model):'
     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/views/tag_threads.py

@@ -27,7 +27,7 b' class TagView(AllThreadsView, Dispatcher'
         tag_alias = get_object_or_404(TagAlias, name=self.tag_name)
         tag = tag_alias.parent
 
-        hidden_tags = self.settings_manager.get_hidden_tags()
+        hidden_tags = list(self.settings_manager.get_hidden_tags())
 
         try:
             hidden_tags.remove(tag)
@@ -46,11 +46,8 b' class TagView(AllThreadsView, Dispatcher'
         tag = tag_alias.parent
         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.get_name() in fav_tag_names
-        params[PARAM_IS_HIDDEN] = hidden_tag_names is not None and tag.get_name() in hidden_tag_names
+        params[PARAM_IS_FAVORITE] = settings_manager.tag_is_fav(tag)
+        params[PARAM_IS_HIDDEN] = settings_manager.tag_is_hidden(tag)
 
         params[PARAM_RANDOM_IMAGE_POST] = tag.get_random_image_post()
         params[PARAM_RELATED_TAGS] = tag.get_related_tags()