From 239722068e7ce0092a3a0cca7dd8f66c5a49353a Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Tue, 14 Jul 2020 18:34:39 -0400 Subject: [PATCH 1/2] Ignoring right-click when highlighting. --- media/js/newsblur/views/story_detail_view.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/media/js/newsblur/views/story_detail_view.js b/media/js/newsblur/views/story_detail_view.js index 443eeadcc..7ed93b6b7 100644 --- a/media/js/newsblur/views/story_detail_view.js +++ b/media/js/newsblur/views/story_detail_view.js @@ -719,7 +719,11 @@ NEWSBLUR.Views.StoryDetailView = Backbone.View.extend({ mouseup_check_selection: function(e) { var $doc = this.$(".NB-feed-story-content"); - // console.log(['mouseup_check_selection', e, $(e.target)]); + // console.log(['mouseup_check_selection', e, e.which, $(e.target)]); + if (e.which == 3) { + // Right click + return; + } if ($(e.target).hasClass("NB-highlight")) { this.show_unhighlight_tooltip($(e.target)); return; From 25a5568f30b94c40c8fbf3ca494aab7c3d6c1613 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Tue, 14 Jul 2020 18:39:42 -0400 Subject: [PATCH 2/2] Fixing typo on highlights check in starred stories. --- apps/reader/views.py | 2 +- apps/social/views.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/reader/views.py b/apps/reader/views.py index 204f90350..05a0ab565 100644 --- a/apps/reader/views.py +++ b/apps/reader/views.py @@ -1060,7 +1060,7 @@ def starred_stories_rss_feed(request, user_id, secret_token, tag_slug): starred_stories = MStarredStory.objects( user_id=user.pk ).order_by('-starred_date').limit(25) - elif tag_counts.highlights: + elif tag_counts.is_highlights: starred_stories = MStarredStory.objects( user_id=user.pk, highlights__exists=True, diff --git a/apps/social/views.py b/apps/social/views.py index c6d92f2bf..63501e0e6 100644 --- a/apps/social/views.py +++ b/apps/social/views.py @@ -1305,6 +1305,7 @@ def shared_stories_rss_feed_noid(request): return index +@ratelimit(minutes=1, requests=5) def shared_stories_rss_feed(request, user_id, username): try: user = User.objects.get(pk=user_id)