mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
pull/2246/head
Claire 2023-06-10 18:42:29 +02:00
parent 34efd1a24c 3a2a15c6ea
commit 42a0898f16
66 changed files with 99 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/accounts_controller.rb
View File

@ -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

2
app/controllers/settings/preferences/base_controller.rb
View File

@ -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

1
app/models/account.rb
View File

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

2
app/models/user.rb
View File

@ -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

2
app/services/app_sign_up_service.rb
View File

@ -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

2
app/views/notification_mailer/_status.html.haml
View File

@ -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}")

2
app/views/notification_mailer/favourite.html.haml
View File

@ -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

2
app/views/notification_mailer/mention.html.haml
View File

@ -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

2
app/views/notification_mailer/reblog.html.haml
View File

@ -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

5
app/views/settings/preferences/appearance/show.html.haml
View File

@ -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')}

2
app/views/user_mailer/appeal_approved.html.haml
View File

@ -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

2
app/views/user_mailer/appeal_approved.text.erb
View File

@ -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 %>

2
app/views/user_mailer/appeal_rejected.html.haml
View File

@ -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

2
app/views/user_mailer/appeal_rejected.text.erb
View File

@ -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 %>

2
app/views/user_mailer/suspicious_sign_in.html.haml
View File

@ -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

2
app/views/user_mailer/suspicious_sign_in.text.erb
View File

@ -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') %>

2
app/views/user_mailer/warning.html.haml
View File

@ -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

1
config/locales/simple_form.en.yml
View File

@ -297,6 +297,7 @@ en:
usable: Allow posts to use this hashtag
user:
role: Role
time_zone: Time zone
user_role:
color: Badge color
highlighted: Display role as badge on user profiles

7
db/migrate/20230605085711_add_time_zone_to_users.rb Normal file
View File

@ -0,0 +1,7 @@
# frozen_string_literal: true
class AddTimeZoneToUsers < ActiveRecord::Migration[6.1]
def change
add_column :users, :time_zone, :string
end
end

3
db/schema.rb
View File

@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2023_06_05_085710) do
ActiveRecord::Schema.define(version: 2023_06_05_085711) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -1091,6 +1091,7 @@ ActiveRecord::Schema.define(version: 2023_06_05_085710) do
t.boolean "skip_sign_in_token"
t.bigint "role_id"
t.text "settings"
t.string "time_zone"
t.index ["account_id"], name: "index_users_on_account_id"
t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
t.index ["created_by_application_id"], name: "index_users_on_created_by_application_id", where: "(created_by_application_id IS NOT NULL)"

2
spec/fabricators/account_domain_block_fabricator.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
Fabricator(:account_domain_block) do
account
account { Fabricate.build(:account) }
domain 'example.com'
end

4
spec/fabricators/account_moderation_note_fabricator.rb
View File

@ -2,6 +2,6 @@
Fabricator(:account_moderation_note) do
content 'MyText'
account
target_account { Fabricate(:account) }
account { Fabricate.build(:account) }
target_account { Fabricate.build(:account) }
end

4
spec/fabricators/account_note_fabricator.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
Fabricator(:account_note) do
account
target_account { Fabricate(:account) }
account { Fabricate.build(:account) }
target_account { Fabricate.build(:account) }
comment 'User note text'
end

2
spec/fabricators/account_stat_fabricator.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
Fabricator(:account_stat) do
account
account { Fabricate.build(:account) }
statuses_count '123'
following_count '456'
followers_count '789'

2
spec/fabricators/account_statuses_cleanup_policy_fabricator.rb
View File

@ -1,5 +1,5 @@
# frozen_string_literal: true
Fabricator(:account_statuses_cleanup_policy) do
account
account { Fabricate.build(:account) }
end

2
spec/fabricators/account_warning_fabricator.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
Fabricator(:account_warning) do
account
account { Fabricate.build(:account) }
target_account(fabricator: :account)
text { Faker::Lorem.paragraph }
action 'suspend'

2
spec/fabricators/admin_action_log_fabricator.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
Fabricator('Admin::ActionLog') do
account
account { Fabricate.build(:account) }
action 'MyString'
target nil
end

2
spec/fabricators/backup_fabricator.rb
View File

@ -1,5 +1,5 @@
# frozen_string_literal: true
Fabricator(:backup) do
user
user { Fabricate.build(:user) }
end

4
spec/fabricators/block_fabricator.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
Fabricator(:block) do
account
target_account { Fabricate(:account) }
account { Fabricate.build(:account) }
target_account { Fabricate.build(:account) }
end

4
spec/fabricators/bookmark_fabricator.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
Fabricator(:bookmark) do
account
status
account { Fabricate.build(:account) }
status { Fabricate.build(:status) }
end

2
spec/fabricators/bulk_import_fabricator.rb
View File

@ -8,5 +8,5 @@ Fabricator(:bulk_import) do
imported_items 1
finished_at '2022-11-18 14:55:07'
overwrite false
account
account { Fabricate.build(:account) }
end

2
spec/fabricators/bulk_import_row_fabricator.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
Fabricator(:bulk_import_row) do
bulk_import
bulk_import { Fabricate.build(:bulk_import) }
data ''
end

2
spec/fabricators/canonical_email_block_fabricator.rb
View File

@ -2,5 +2,5 @@
Fabricator(:canonical_email_block) do
email { sequence(:email) { |i| "#{i}#{Faker::Internet.email}" } }
reference_account { Fabricate(:account) }
reference_account { Fabricate.build(:account) }
end

2
spec/fabricators/custom_filter_fabricator.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
Fabricator(:custom_filter) do
account
account { Fabricate.build(:account) }
expires_at nil
phrase 'discourse'
context %w(home notifications)

2
spec/fabricators/custom_filter_keyword_fabricator.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
Fabricator(:custom_filter_keyword) do
custom_filter
custom_filter { Fabricate.build(:custom_filter) }
keyword 'discourse'
end

4
spec/fabricators/custom_filter_status_fabricator.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
Fabricator(:custom_filter_status) do
custom_filter
status
custom_filter { Fabricate.build(:custom_filter) }
status { Fabricate.build(:status) }
end

4
spec/fabricators/device_fabricator.rb
View File

@ -1,8 +1,8 @@
# frozen_string_literal: true
Fabricator(:device) do
access_token
account
access_token { Fabricate.build(:access_token) }
account { Fabricate.build(:account) }
device_id { Faker::Number.number(digits: 5) }
name { Faker::App.name }
fingerprint_key { Base64.strict_encode64(Ed25519::SigningKey.generate.verify_key.to_bytes) }

4
spec/fabricators/encrypted_message_fabricator.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
Fabricator(:encrypted_message) do
device
from_account { Fabricate(:account) }
device { Fabricate.build(:device) }
from_account { Fabricate.build(:account) }
from_device_id { Faker::Number.number(digits: 5) }
end

4
spec/fabricators/favourite_fabricator.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
Fabricator(:favourite) do
account
status
account { Fabricate.build(:account) }
status { Fabricate.build(:status) }
end

4
spec/fabricators/featured_tag_fabricator.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
Fabricator(:featured_tag) do
account
tag
account { Fabricate.build(:account) }
tag { Fabricate.build(:tag) }
name { sequence(:name) { |i| "Tag#{i}" } }
end

4
spec/fabricators/follow_fabricator.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
Fabricator(:follow) do
account
target_account { Fabricate(:account) }
account { Fabricate.build(:account) }
target_account { Fabricate.build(:account) }
end

4
spec/fabricators/follow_request_fabricator.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
Fabricator(:follow_request) do
account
target_account { Fabricate(:account, locked: true) }
account { Fabricate.build(:account) }
target_account { Fabricate.build(:account, locked: true) }
end

2
spec/fabricators/identity_fabricator.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
Fabricator(:identity) do
user
user { Fabricate.build(:user) }
provider 'MyString'
uid 'MyString'
end

2
spec/fabricators/invite_fabricator.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
Fabricator(:invite) do
user
user { Fabricate.build(:user) }
expires_at nil
max_uses nil
uses 0

2
spec/fabricators/list_fabricator.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
Fabricator(:list) do
account
account { Fabricate.build(:account) }
title 'MyString'
end

2
spec/fabricators/login_activity_fabricator.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
Fabricator(:login_activity) do
user
user { Fabricate.build(:user) }
authentication_method 'password'
success true
failure_reason nil

2
spec/fabricators/marker_fabricator.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
Fabricator(:marker) do
user
user { Fabricate.build(:user) }
timeline 'home'
last_read_id 0
lock_version 0

2
spec/fabricators/media_attachment_fabricator.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
Fabricator(:media_attachment) do
account
account { Fabricate.build(:account) }
file do |attrs|
case attrs[:type]

4
spec/fabricators/mention_fabricator.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
Fabricator(:mention) do
account
status
account { Fabricate.build(:account) }
status { Fabricate.build(:status) }
end

4
spec/fabricators/mute_fabricator.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
Fabricator(:mute) do
account
target_account { Fabricate(:account) }
account { Fabricate.build(:account) }
target_account { Fabricate.build(:account) }
end

2
spec/fabricators/notification_fabricator.rb
View File

@ -2,5 +2,5 @@
Fabricator(:notification) do
activity fabricator: :status
account
account { Fabricate.build(:account) }
end

2
spec/fabricators/one_time_key_fabricator.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
Fabricator(:one_time_key) do
device
device { Fabricate.build(:device) }
key_id { Faker::Alphanumeric.alphanumeric(number: 10) }
key { Base64.strict_encode64(Ed25519::SigningKey.generate.verify_key.to_bytes) }

4
spec/fabricators/poll_fabricator.rb
View File

@ -1,8 +1,8 @@
# frozen_string_literal: true
Fabricator(:poll) do
account
status
account { Fabricate.build(:account) }
status { Fabricate.build(:status) }
expires_at { 7.days.from_now }
options %w(Foo Bar)
multiple false

2
spec/fabricators/poll_vote_fabricator.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
Fabricator(:poll_vote) do
account
account { Fabricate.build(:account) }
poll
choice 0
end

4
spec/fabricators/report_fabricator.rb
View File

@ -1,8 +1,8 @@
# frozen_string_literal: true
Fabricator(:report) do
account
target_account { Fabricate(:account) }
account { Fabricate.build(:account) }
target_account { Fabricate.build(:account) }
comment 'You nasty'
action_taken_at nil
end

4
spec/fabricators/report_note_fabricator.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
Fabricator(:report_note) do
report
account { Fabricate(:account) }
report { Fabricate.build(:report) }
account { Fabricate.build(:account) }
content 'Test Content'
end

2
spec/fabricators/scheduled_status_fabricator.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
Fabricator(:scheduled_status) do
account
account { Fabricate.build(:account) }
scheduled_at { 20.hours.from_now }
end

2
spec/fabricators/session_activation_fabricator.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
Fabricator(:session_activation) do
user
user { Fabricate.build(:user) }
session_id 'MyString'
end

2
spec/fabricators/status_fabricator.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
Fabricator(:status) do
account
account { Fabricate.build(:account) }
text 'Lorem ipsum dolor sit amet'
after_build do |status|

4
spec/fabricators/status_pin_fabricator.rb
View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
Fabricator(:status_pin) do
account
status { |attrs| Fabricate(:status, account: attrs[:account], visibility: :public) }
account { Fabricate.build(:account) }
status { |attrs| Fabricate.build(:status, account: attrs[:account], visibility: :public) }
end

2
spec/fabricators/tag_follow_fabricator.rb
View File

@ -2,5 +2,5 @@
Fabricator(:tag_follow) do
tag
account
account { Fabricate.build(:account) }
end

2
spec/models/media_attachment_spec.rb
View File

@ -2,7 +2,7 @@
require 'rails_helper'
RSpec.describe MediaAttachment do
RSpec.describe MediaAttachment, paperclip_processing: true do
describe 'local?' do
subject { media_attachment.local? }

6
spec/rails_helper.rb
View File

@ -94,6 +94,12 @@ RSpec.configure do |config|
stub_jsonld_contexts!
end
config.before(:each) do |example|
unless example.metadata[:paperclip_processing]
allow_any_instance_of(Paperclip::Attachment).to receive(:post_process).and_return(true) # rubocop:disable RSpec/AnyInstance
end
end
config.after :each do
Rails.cache.clear
redis.del(redis.keys)

2
spec/support/examples/models/concerns/account_avatar.rb
View File

@ -17,7 +17,7 @@ shared_examples 'AccountAvatar' do |fabricator|
end
end
describe 'base64-encoded files' do
describe 'base64-encoded files', paperclip_processing: true do
let(:base64_attachment) { "data:image/jpeg;base64,#{Base64.encode64(attachment_fixture('attachment.jpg').read)}" }
let(:account) { Fabricate(fabricator, avatar: base64_attachment) }

2
spec/support/examples/models/concerns/account_header.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
shared_examples 'AccountHeader' do |fabricator|
describe 'base64-encoded files' do
describe 'base64-encoded files', paperclip_processing: true do
let(:base64_attachment) { "data:image/jpeg;base64,#{Base64.encode64(attachment_fixture('attachment.jpg').read)}" }
let(:account) { Fabricate(fabricator, header: base64_attachment) }

2
streaming/index.js
View File

@ -1230,7 +1230,7 @@ const startServer = async () => {
ws.on('message', (data, isBinary) => {
if (isBinary) {
log.debug('Received binary data, closing connection');
log.warn('socket', 'Received binary data, closing connection');
ws.close(1003, 'The mastodon streaming server does not support binary messages');
return;
}