Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add option to block direct messages from people you don't follow (#5669)

Browse source 
* Add option to block direct messages from people you don't follow

Fix #5326

* If the DM responds to a toot by recipient, allow it through

* i18n: Update Polish translation (for #5669) (#5673)
This commit is contained in:
Eugen Rochko 2017-11-14 21:12:57 +01:00 • committed by GitHub
parent c3ec1e87b8
commit fbef909c2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 89 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/views/settings/notifications/show.html.haml
View file

@ -11,7 +11,7 @@
= ff.input :reblog, as: :boolean, wrapper: :with_label
= ff.input :favourite, as: :boolean, wrapper: :with_label
= ff.input :mention, as: :boolean, wrapper: :with_label
.fields-group
= f.simple_fields_for :notification_emails, hash_to_object(current_user.settings.notification_emails) do |ff|
= ff.input :digest, as: :boolean, wrapper: :with_label
@ -20,6 +20,7 @@
= f.simple_fields_for :interactions, hash_to_object(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
= ff.input :must_be_following_dm, as: :boolean, wrapper: :with_label
.actions
= f.button :button, t('generic.save_changes'), type: :submit