2017-10-04 17:22:52 +09:00
|
|
|
- content_for :page_title do
|
|
|
|
|
= t('settings.notifications')
|
|
|
|
|
|
2020-03-09 00:04:03 +09:00
|
|
|
- content_for :heading_actions do
|
|
|
|
|
= button_tag t('generic.save_changes'), class: 'button', form: 'edit_notification'
|
|
|
|
|
|
|
|
|
|
= simple_form_for current_user, url: settings_preferences_notifications_path, html: { method: :put, id: 'edit_notification' } do |f|
|
2017-10-04 17:22:52 +09:00
|
|
|
= render 'shared/error_messages', object: current_user
|
|
|
|
|
|
2019-12-02 21:39:53 +09:00
|
|
|
%h4= t 'notifications.email_events'
|
2019-11-30 01:03:06 +09:00
|
|
|
|
2019-12-02 21:39:53 +09:00
|
|
|
%p.hint= t 'notifications.email_events_hint'
|
2019-11-30 01:03:06 +09:00
|
|
|
|
2023-03-30 21:44:00 +09:00
|
|
|
= f.simple_fields_for :settings, current_user.settings do |ff|
|
|
|
|
|
.fields-group
|
|
|
|
|
= ff.input :'notification_emails.follow', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.follow')
|
|
|
|
|
= ff.input :'notification_emails.follow_request', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.follow_request')
|
|
|
|
|
= ff.input :'notification_emails.reblog', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.reblog')
|
|
|
|
|
= ff.input :'notification_emails.favourite', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.favourite')
|
|
|
|
|
= ff.input :'notification_emails.mention', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.mention')
|
|
|
|
|
= ff.input :'notification_emails.report', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.report') if current_user.can?(:manage_reports)
|
|
|
|
|
= ff.input :'notification_emails.appeal', as: :boolean, wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.appeal') if current_user.can?(:manage_appeals)
|
|
|
|
|
= ff.input :'notification_emails.pending_account', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.pending_account') if current_user.can?(:manage_users)
|
|
|
|
|
= ff.input :'notification_emails.trends', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.trending_tag') if current_user.can?(:manage_taxonomies)
|
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
Upstream added a link to the roadmap, but we have a completely different README.
Kept ours.
- `app/models/media_attachment.rb`:
Upstream upped media attachment limits.
Updated the default according to upstream's.
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream changed the migration compatibility level.
Did so too.
- `config/initializers/content_security_policy.rb`:
Upstream refactored this file but we have a different version.
Kept our version.
- `app/controllers/settings/preferences_controller.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file does not directly references individual settings anymore.
Applied upstream changes.
- `app/lib/user_settings_decorator.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file got removed entirely.
Removed it as well.
- `app/models/user.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
References to individual settings have been removed from the file.
Removed them as well.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/other/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `config/settings.yml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
In particular, upstream removed user-specific and unused settings.
Did the same in glitch-soc.
- `spec/controllers/application_controller_spec.rb`:
Conflicts due to glitch-soc's theming system.
Mostly kept our version, as upstream messed up the tests.
2023-04-01 04:30:27 +09:00
|
|
|
= ff.input :'notification_emails.link_trends', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.trending_link') if current_user.can?(:manage_taxonomies)
|
|
|
|
|
= ff.input :'notification_emails.status_trends', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.trending_status') if current_user.can?(:manage_taxonomies)
|
2023-03-30 21:44:00 +09:00
|
|
|
|
|
|
|
|
.fields-group
|
|
|
|
|
= ff.input :always_send_emails, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_always_send_emails'), hint: I18n.t('simple_form.hints.defaults.setting_always_send_emails')
|
2022-04-09 01:03:31 +09:00
|
|
|
|
2019-12-02 21:39:53 +09:00
|
|
|
%h4= t 'notifications.other_settings'
|
2019-11-30 01:03:06 +09:00
|
|
|
|
2017-10-04 17:22:52 +09:00
|
|
|
.fields-group
|
2023-03-30 21:44:00 +09:00
|
|
|
= f.simple_fields_for :settings, current_user.settings do |ff|
|
|
|
|
|
= ff.input :'interactions.must_be_follower', wrapper: :with_label, label: I18n.t('simple_form.labels.interactions.must_be_follower')
|
|
|
|
|
= ff.input :'interactions.must_be_following', wrapper: :with_label, label: I18n.t('simple_form.labels.interactions.must_be_following')
|
|
|
|
|
= ff.input :'interactions.must_be_following_dm', wrapper: :with_label, label: I18n.t('simple_form.labels.interactions.must_be_following_dm')
|
