From 71401659b812b8768fe70aa27221e3319ee1c434 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 25 Nov 2016 13:13:16 +0100 Subject: [PATCH] Fix #65 - Options to block notifications from people you don't follow/who don't follow you --- app/controllers/settings/preferences_controller.rb | 7 +++++-- app/lib/feed_manager.rb | 4 ++-- app/models/user.rb | 1 + app/services/notify_service.rb | 2 ++ app/views/settings/preferences/show.html.haml | 4 ++++ config/i18n-tasks.yml | 3 --- config/locales/simple_form.de.yml | 3 +++ config/locales/simple_form.en.yml | 3 +++ 8 files changed, 20 insertions(+), 7 deletions(-) diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index 5be8719aef9..cacc03b65f0 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -14,7 +14,10 @@ class Settings::PreferencesController < ApplicationController current_user.settings(:notification_emails).favourite = user_params[:notification_emails][:favourite] == '1' current_user.settings(:notification_emails).mention = user_params[:notification_emails][:mention] == '1' - if current_user.update(user_params.except(:notification_emails)) + current_user.settings(:interactions).must_be_follower = user_params[:interactions][:must_be_follower] == '1' + current_user.settings(:interactions).must_be_following = user_params[:interactions][:must_be_following] == '1' + + if current_user.update(user_params.except(:notification_emails, :interactions)) redirect_to settings_preferences_path, notice: I18n.t('generic.changes_saved_msg') else render action: :show @@ -24,6 +27,6 @@ class Settings::PreferencesController < ApplicationController private def user_params - params.require(:user).permit(:locale, notification_emails: [:follow, :reblog, :favourite, :mention]) + params.require(:user).permit(:locale, notification_emails: [:follow, :reblog, :favourite, :mention], interactions: [:must_be_follower, :must_be_following]) end end diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 81489365e91..b812ad1f4e1 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -84,7 +84,7 @@ class FeedManager def filter_from_mentions?(status, receiver) should_filter = receiver.id == status.account_id # Filter if I'm mentioning myself should_filter ||= receiver.blocking?(status.account) # or it's from someone I blocked - should_filter ||= receiver.blocking?(status.mentions.map(&:account_id)) # or if it mentions someone I blocked + should_filter ||= receiver.blocking?(status.mentions.includes(:account).map(&:account)) # or if it mentions someone I blocked if status.reply? && !status.thread.account.nil? # or it's a reply should_filter ||= receiver.blocking?(status.thread.account) # to a user I blocked @@ -95,7 +95,7 @@ class FeedManager def filter_from_public?(status, receiver) should_filter = receiver.blocking?(status.account) - should_filter ||= receiver.blocking?(status.mentions.map(&:account_id)) + should_filter ||= receiver.blocking?(status.mentions.includes(:account).map(&:account)) if status.reply? && !status.thread.account.nil? should_filter ||= receiver.blocking?(status.thread.account) diff --git a/app/models/user.rb b/app/models/user.rb index 366172e9a09..423833d471c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -15,6 +15,7 @@ class User < ApplicationRecord has_settings do |s| s.key :notification_emails, defaults: { follow: false, reblog: false, favourite: false, mention: false } + s.key :interactions, defaults: { must_be_follower: false, must_be_following: false } end def send_devise_notification(notification, *args) diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb index 772adfb90be..1efd326b090 100644 --- a/app/services/notify_service.rb +++ b/app/services/notify_service.rb @@ -36,6 +36,8 @@ class NotifyService < BaseService blocked = false blocked ||= @recipient.id == @notification.from_account.id blocked ||= @recipient.blocking?(@notification.from_account) + blocked ||= (@recipient.user.settings(:interactions).must_be_follower && !@notification.from_account.following?(@recipient)) + blocked ||= (@recipient.user.settings(:interactions).must_be_following && !@recipient.following?(@notification.from_account)) blocked ||= send("blocked_#{@notification.type}?") blocked end diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index 693702ff73d..db5b9fb48f4 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -12,6 +12,10 @@ = ff.input :favourite, as: :boolean, wrapper: :with_label = ff.input :mention, as: :boolean, wrapper: :with_label + = f.simple_fields_for :interactions, current_user.settings(:interactions) do |ff| + = ff.input :must_be_follower, as: :boolean, wrapper: :with_label + = ff.input :must_be_following, as: :boolean, wrapper: :with_label + .actions = f.button :button, t('generic.save_changes'), type: :submit diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index d345ce6c06b..4dc6985b75e 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -30,9 +30,6 @@ search: - app/assets/fonts - app/assets/videos -ignore_missing: - - '{devise,simple_form}.*' - ignore_unused: - 'activerecord.attributes.*' - '{devise,will_paginate,doorkeeper}.*' diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml index 36c5141a2c5..90aeb1e5cde 100644 --- a/config/locales/simple_form.de.yml +++ b/config/locales/simple_form.de.yml @@ -21,6 +21,9 @@ de: follow: E-mail senden, wenn mir jemand folgt mention: E-mail senden, wenn mich jemand erwähnt reblog: E-mail senden, wenn jemand meinen Beitrag teilt + interactions: + must_be_follower: Benachrichtigungen von nicht-Folgern blockieren + must_be_following: Benachrichtigungen von Nutzern blockieren, denen ich nicht folge 'no': Nein required: mark: "*" diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index a7d958c06d7..1ba7c91e2b2 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -21,6 +21,9 @@ en: follow: Send e-mail when someone follows you mention: Send e-mail when someone mentions you reblog: Send e-mail when someone reblogs your status + interactions: + must_be_follower: Block notifications from non-followers + must_be_following: Block notifications from people you don't follow 'no': 'No' required: mark: "*"