Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream

Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict because glitch-soc does not have a theme selector here.

app/controllers/api/v1/accounts_controller.rb

@@ -90,7 +90,7 @@ class Api::V1::AccountsController < Api::BaseController
   end
 
   def account_params
-    params.permit(:username, :email, :password, :agreement, :locale, :reason)
+    params.permit(:username, :email, :password, :agreement, :locale, :reason, :time_zone)
   end
 
   def check_enabled_registrations

app/controllers/settings/preferences/base_controller.rb

@@ -19,6 +19,6 @@ class Settings::Preferences::BaseController < Settings::BaseController
   end
 
   def user_params
-    params.require(:user).permit(:locale, chosen_languages: [], settings_attributes: UserSettings.keys)
+    params.require(:user).permit(:locale, :time_zone, chosen_languages: [], settings_attributes: UserSettings.keys)
   end
 end

app/models/account.rb

@@ -144,6 +144,7 @@ class Account < ApplicationRecord
            :locale,
            :shows_application?,
            :prefers_noindex?,
+           :time_zone,
            to: :user,
            prefix: true,
            allow_nil: true

app/models/user.rb

@@ -40,6 +40,7 @@
 #  sign_up_ip                :inet
 #  role_id                   :bigint(8)
 #  settings                  :text
+#  time_zone                 :string
 #
 
 class User < ApplicationRecord
@@ -99,6 +100,7 @@ class User < ApplicationRecord
   validates_with BlacklistedEmailValidator, if: -> { ENV['EMAIL_DOMAIN_LISTS_APPLY_AFTER_CONFIRMATION'] == 'true' || !confirmed? }
   validates_with EmailMxValidator, if: :validate_email_dns?
   validates :agreement, acceptance: { allow_nil: false, accept: [true, 'true', '1'] }, on: :create
+  validates :time_zone, inclusion: { in: ActiveSupport::TimeZone.all.map { |tz| tz.tzinfo.name } }, allow_blank: true
 
   # Honeypot/anti-spam fields
   attr_accessor :registration_form_time, :website, :confirm_password

app/services/app_sign_up_service.rb

@@ -35,7 +35,7 @@ class AppSignUpService < BaseService
   end
 
   def user_params
-    @params.slice(:email, :password, :agreement, :locale)
+    @params.slice(:email, :password, :agreement, :locale, :time_zone)
   end
 
   def account_params

app/views/notification_mailer/_status.html.haml

@@ -42,4 +42,4 @@
                                         = link_to a.remote_url, a.remote_url
 
                               %p.status-footer
-                                = link_to l(status.created_at), web_url("@#{status.account.pretty_acct}/#{status.id}")
+                                = link_to l(status.created_at.in_time_zone(time_zone)), web_url("@#{status.account.pretty_acct}/#{status.id}")

app/views/notification_mailer/favourite.html.haml

@@ -22,7 +22,7 @@
                               %h1= t 'notification_mailer.favourite.title'
                               %p.lead= t('notification_mailer.favourite.body', name: @account.pretty_acct)
 
-= render 'status', status: @status
+= render 'status', status: @status, time_zone: @me.user_time_zone
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }
   %tbody

app/views/notification_mailer/mention.html.haml

@@ -22,7 +22,7 @@
                               %h1= t 'notification_mailer.mention.title'
                               %p.lead= t('notification_mailer.mention.body', name: @status.account.pretty_acct)
 
-= render 'status', status: @status
+= render 'status', status: @status, time_zone: @me.user_time_zone
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }
   %tbody

app/views/notification_mailer/reblog.html.haml

@@ -22,7 +22,7 @@
                               %h1= t 'notification_mailer.reblog.title'
                               %p.lead= t('notification_mailer.reblog.body', name: @account.pretty_acct)
 
-= render 'status', status: @status
+= render 'status', status: @status, time_zone: @me.user_time_zone
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }
   %tbody

app/views/settings/preferences/appearance/show.html.haml

@@ -6,9 +6,12 @@
 
 = simple_form_for current_user, url: settings_preferences_appearance_path, html: { method: :put, id: 'edit_user' } do |f|
   .fields-row
-    .fields-group
+    .fields-group.fields-row__column.fields-row__column-6
       = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| native_locale_name(locale) }, selected: I18n.locale, hint: false
 
+    .fields-group.fields-row__column.fields-row__column-6
+      = f.input :time_zone, wrapper: :with_label, collection: ActiveSupport::TimeZone.all.map { |tz| ["(GMT#{tz.formatted_offset}) #{tz.name}", tz.tzinfo.name] }, hint: false
+
   - unless I18n.locale == :en
     .flash-message.translation-prompt
       #{t 'appearance.localization.body'} #{content_tag(:a, t('appearance.localization.guide_link_text'), href: t('appearance.localization.guide_link'), target: '_blank', rel: 'noopener')}

app/views/user_mailer/appeal_approved.html.haml

@@ -36,7 +36,7 @@
                         %tbody
                           %tr
                             %td.column-cell.text-center
-                              %p= t 'user_mailer.appeal_approved.explanation', appeal_date: l(@appeal.created_at), strike_date: l(@appeal.strike.created_at)
+                              %p= t 'user_mailer.appeal_approved.explanation', appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone)), strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone))
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }
   %tbody

app/views/user_mailer/appeal_approved.text.erb

@@ -2,6 +2,6 @@
 
 ===
 
-<%= t 'user_mailer.appeal_approved.explanation', appeal_date: l(@appeal.created_at), strike_date: l(@appeal.strike.created_at) %>
+<%= t 'user_mailer.appeal_approved.explanation', appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone)), strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone)) %>
 
 => <%= root_url %>

app/views/user_mailer/appeal_rejected.html.haml

@@ -36,7 +36,7 @@
                         %tbody
                           %tr
                             %td.column-cell.text-center
-                              %p= t 'user_mailer.appeal_rejected.explanation', appeal_date: l(@appeal.created_at), strike_date: l(@appeal.strike.created_at)
+                              %p= t 'user_mailer.appeal_rejected.explanation', appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone)), strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone))
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }
   %tbody

app/views/user_mailer/appeal_rejected.text.erb

@@ -2,6 +2,6 @@
 
 ===
 
-<%= t 'user_mailer.appeal_rejected.explanation', appeal_date: l(@appeal.created_at), strike_date: l(@appeal.strike.created_at) %>
+<%= t 'user_mailer.appeal_rejected.explanation', appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone)), strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone)) %>
 
 => <%= root_url %>

app/views/user_mailer/suspicious_sign_in.html.haml

@@ -47,7 +47,7 @@
                                 %strong= "#{t('sessions.browser')}:"
                                 %span{ title: @user_agent }= t 'sessions.description', browser: t("sessions.browsers.#{@detection.id}", default: @detection.id.to_s), platform: t("sessions.platforms.#{@detection.platform.id}", default: @detection.platform.id.to_s)
                                 %br/
-                                = l(@timestamp)
+                                = l(@timestamp.in_time_zone(@resource.time_zone))
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }
   %tbody

app/views/user_mailer/suspicious_sign_in.text.erb

@@ -8,7 +8,7 @@
 
 <%= t('sessions.ip') %>: <%= @remote_ip %>
 <%= t('sessions.browser') %>: <%= t('sessions.description', browser: t("sessions.browsers.#{@detection.id}", default: "#{@detection.id}"), platform: t("sessions.platforms.#{@detection.platform.id}", default: "#{@detection.platform.id}")) %>
-<%= l(@timestamp) %>
+<%= l(@timestamp.in_time_zone(@resource.time_zone)) %>
 
 <%= t 'user_mailer.suspicious_sign_in.further_actions_html', action: t('user_mailer.suspicious_sign_in.change_password') %>
 

app/views/user_mailer/warning.html.haml

@@ -58,7 +58,7 @@
 
 - unless @statuses.empty?
   - @statuses.each_with_index do |status, i|
-    = render 'notification_mailer/status', status: status, i: i + 1, highlighted: true
+    = render 'notification_mailer/status', status: status, i: i + 1, highlighted: true, time_zone: @resource.time_zone
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }
   %tbody