Fix #5451 - add_message inconsistencies

[mediagoblin.git] / mediagoblin / notifications / views.py

diff --git a/mediagoblin/notifications/views.py b/mediagoblin/notifications/views.py
index cda7f0afc5829358cde06bcc9701fffce211dcde..30ecec7776436583f1acfad9c920eebbee8ccf5f 100644 (file)
--- a/mediagoblin/notifications/views.py
+++ b/mediagoblin/notifications/views.py
@@ -14,19 +14,15 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from mediagoblin.tools.response import render_to_response, render_404, redirect
+from mediagoblin.tools.response import redirect
 from mediagoblin.tools.translate import pass_to_ugettext as _
-from mediagoblin.decorators import (uses_pagination, get_user_media_entry,
-    get_media_entry_by_id,
-    require_active_login, user_may_delete_media, user_may_alter_collection,
-    get_user_collection, get_user_collection_item, active_user_from_url)
-
+from mediagoblin.decorators import get_user_media_entry, require_active_login
 from mediagoblin import messages
 
-from mediagoblin.notifications import add_comment_subscription, \
-        silence_comment_subscription, mark_comment_notification_seen
+from mediagoblin.notifications import (add_comment_subscription,
+    silence_comment_subscription, mark_comment_notification_seen,
+    get_notifications)
 
-from werkzeug.exceptions import BadRequest
 
 @get_user_media_entry
 @require_active_login
@@ -34,22 +30,24 @@ def subscribe_comments(request, media):
 
     add_comment_subscription(request.user, media)
 
-    messages.add_message(request,
-                         messages.SUCCESS,
-                         _('Subscribed to comments on %s!')
-                         % media.title)
+    messages.add_message(
+        request,
+        messages.SUCCESS,
+        _('Subscribed to comments on %s!') % media.title)
 
     return redirect(request, location=media.url_for_self(request.urlgen))
 
+
 @get_user_media_entry
 @require_active_login
 def silence_comments(request, media):
     silence_comment_subscription(request.user, media)
 
-    messages.add_message(request,
-                         messages.SUCCESS,
-                         _('You will not receive notifications for comments on'
-                           ' %s.') % media.title)
+    messages.add_message(
+        request,
+        messages.SUCCESS,
+        _('You will not receive notifications for comments on %s.') %
+            media.title)
 
     return redirect(request, location=media.url_for_self(request.urlgen))
 
@@ -59,8 +57,11 @@ def mark_all_comment_notifications_seen(request):
     """
     Marks all comment notifications seen.
     """
-    for comment in request.notifications.get_notifications(request.user.id):
-        mark_comment_notification_seen(comment.subject_id, request.user)
+    for comment in get_notifications(request.user.id):
+        mark_comment_notification_seen(
+            comment.id,
+            request.user
+        )
 
     if request.GET.get('next'):
         return redirect(request, location=request.GET.get('next'))