diff --git a/boards/abstracts/settingsmanager.py b/boards/abstracts/settingsmanager.py --- a/boards/abstracts/settingsmanager.py +++ b/boards/abstracts/settingsmanager.py @@ -26,7 +26,7 @@ class SettingsManager: def __init__(self): pass - def get_theme(self): + def get_theme(self) -> str: theme = self.get_setting(SETTING_THEME) if not theme: theme = DEFAULT_THEME @@ -66,7 +66,7 @@ class SettingsManager: permissions.remove(permission) self.set_setting(SETTING_PERMISSIONS, permissions) - def get_fav_tags(self): + def get_fav_tags(self) -> list: tag_names = self.get_setting(SETTING_FAVORITE_TAGS) tags = [] if tag_names: @@ -90,7 +90,7 @@ class SettingsManager: tags.remove(tag.name) self.set_setting(SETTING_FAVORITE_TAGS, tags) - def get_hidden_tags(self): + def get_hidden_tags(self) -> list: tag_names = self.get_setting(SETTING_HIDDEN_TAGS) tags = [] if tag_names: diff --git a/boards/templates/boards/thread_normal.html b/boards/templates/boards/thread_normal.html --- a/boards/templates/boards/thread_normal.html +++ b/boards/templates/boards/thread_normal.html @@ -43,7 +43,6 @@
- (ctrl-enter)
diff --git a/boards/views/tag_threads.py b/boards/views/tag_threads.py --- a/boards/views/tag_threads.py +++ b/boards/views/tag_threads.py @@ -2,7 +2,7 @@ from django.shortcuts import get_object_ from boards.abstracts.settingsmanager import get_settings_manager, \ SETTING_FAVORITE_TAGS, SETTING_HIDDEN_TAGS -from boards.models import Tag, Thread +from boards.models import Tag from boards.views.all_threads import AllThreadsView, DEFAULT_PAGE from boards.views.mixins import DispatcherMixin, RedirectNextMixin from boards.forms import ThreadForm, PlainErrorList @@ -22,8 +22,15 @@ class TagView(AllThreadsView, Dispatcher 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=self.settings_manager.get_hidden_tags()) + tags__in=hidden_tags) def get_context_data(self, **kwargs): params = super(TagView, self).get_context_data(**kwargs)