diff options
| -rw-r--r-- | app/controllers/settings/profiles_controller.rb | 2 | ||||
| -rw-r--r-- | app/services/fan_out_on_write_service.rb | 4 | ||||
| -rw-r--r-- | app/views/layouts/application.html.haml | 1 | ||||
| -rw-r--r-- | app/views/settings/profiles/show.html.haml | 1 | ||||
| -rw-r--r-- | config/environments/production.rb | 1 | ||||
| -rw-r--r-- | config/locales/simple_form.de.yml | 1 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/simple_form.es.yml | 1 |
8 files changed, 9 insertions, 3 deletions
diff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rb index deff8fc7e..4b2b5a131 100644 --- a/app/controllers/settings/profiles_controller.rb +++ b/app/controllers/settings/profiles_controller.rb @@ -20,7 +20,7 @@ class Settings::ProfilesController < ApplicationController private def account_params - params.require(:account).permit(:display_name, :note, :avatar, :header) + params.require(:account).permit(:display_name, :note, :avatar, :header, :silenced) end def set_account diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb index 70cf06e02..78cb0b13f 100644 --- a/app/services/fan_out_on_write_service.rb +++ b/app/services/fan_out_on_write_service.rb @@ -24,8 +24,8 @@ class FanOutOnWriteService < BaseService def deliver_to_followers(status) Rails.logger.debug "Delivering status #{status.id} to followers" - status.account.followers.find_each do |follower| - next if !follower.local? || FeedManager.instance.filter?(:home, status, follower) + status.account.followers.where(domain: nil).find_each do |follower| + next if FeedManager.instance.filter?(:home, status, follower) FeedManager.instance.push(:home, follower, status) end end diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 7e28d27ec..87f98198c 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -9,6 +9,7 @@ %link{:rel => "manifest", :href => "/manifest.json"}/ %meta{:name => "msapplication-config", :content => "/browserconfig.xml"}/ %meta{:name => "theme-color", :content => "#2b90d9"}/ + %meta{:name => "apple-mobile-web-app-capable", :content => "yes"}/ %title = "#{yield(:page_title)} - " if content_for?(:page_title) diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index c2f1adb12..e5f8a46c4 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -8,6 +8,7 @@ = f.input :note, placeholder: t('simple_form.labels.defaults.note') = f.input :avatar, wrapper: :with_label = f.input :header, wrapper: :with_label + = f.input :silenced, as: :boolean, wrapper: :with_label .actions = f.button :button, t('generic.save_changes'), type: :submit diff --git a/config/environments/production.rb b/config/environments/production.rb index 27238e3d8..7f13fcf6b 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -13,6 +13,7 @@ Rails.application.configure do # Full error reports are disabled and caching is turned on. config.consider_all_requests_local = false config.action_controller.perform_caching = true + config.action_controller.asset_host = ENV['CDN_HOST'] # Disable serving static files from the `/public` folder by default since # Apache or NGINX already handles this. diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml index 6e6758df2..65714dbd5 100644 --- a/config/locales/simple_form.de.yml +++ b/config/locales/simple_form.de.yml @@ -15,6 +15,7 @@ de: note: Über mich password: Passwort username: Nutzername + silenced: Öffentliche Beiträge nicht auflisten notification_emails: favourite: E-mail senden, wenn jemand meinen Beitrag favorisiert follow: E-mail senden, wenn mir jemand folgt diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index b8a69a075..5b66fccd5 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -15,6 +15,7 @@ en: note: Bio password: Password username: Username + silenced: Unlisted mode notification_emails: favourite: Send e-mail when someone favourites your status follow: Send e-mail when someone follows you diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml index 1ac863b67..1909474a1 100644 --- a/config/locales/simple_form.es.yml +++ b/config/locales/simple_form.es.yml @@ -15,6 +15,7 @@ es: note: Biografía password: Contraseña username: Nombre de usuario + silenced: No listado notification_emails: favourite: Enviar correo electrónico cuando alguien de a favorito en su publicación follow: Enviar correo electrónico cuando alguien le siga |