diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index 5985d62829..c5e6fe4e50 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -13,6 +13,7 @@ module Admin closed_registrations_message open_deletion timeline_preview + bootstrap_timeline_accounts ).freeze BOOLEAN_SETTINGS = %w( diff --git a/app/controllers/api/v1/follows_controller.rb b/app/controllers/api/v1/follows_controller.rb index e01ae5c01c..5a2b2f32f3 100644 --- a/app/controllers/api/v1/follows_controller.rb +++ b/app/controllers/api/v1/follows_controller.rb @@ -10,6 +10,12 @@ class Api::V1::FollowsController < Api::BaseController raise ActiveRecord::RecordNotFound if follow_params[:uri].blank? @account = FollowService.new.call(current_user.account, target_uri).try(:target_account) + + if @account.nil? + username, domain = target_uri.split('@') + @account = Account.find_remote!(username, domain) + end + render json: @account, serializer: REST::AccountSerializer end diff --git a/app/controllers/auth/confirmations_controller.rb b/app/controllers/auth/confirmations_controller.rb index 2fdb281f40..d5e8e58ede 100644 --- a/app/controllers/auth/confirmations_controller.rb +++ b/app/controllers/auth/confirmations_controller.rb @@ -2,4 +2,10 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController layout 'auth' + + def show + super do |user| + BootstrapTimelineWorker.perform_async(user.account_id) if user.errors.empty? + end + end end diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js index 7d84bece73..539af8ce33 100644 --- a/app/javascript/mastodon/features/ui/components/columns_area.js +++ b/app/javascript/mastodon/features/ui/components/columns_area.js @@ -9,6 +9,7 @@ import { links, getIndex, getLink } from './tabs_bar'; import BundleContainer from '../containers/bundle_container'; import ColumnLoading from './column_loading'; +import DrawerLoading from './drawer_loading'; import BundleColumnError from './bundle_column_error'; import { Compose, Notifications, HomeTimeline, CommunityTimeline, PublicTimeline, HashtagTimeline, FavouritedStatuses } from '../../ui/util/async-components'; @@ -129,8 +130,8 @@ export default class ColumnsArea extends ImmutablePureComponent { ); } - renderLoading = () => { - return ; + renderLoading = columnId => () => { + return columnId === 'COMPOSE' ? : ; } renderError = (props) => { @@ -158,7 +159,7 @@ export default class ColumnsArea extends ImmutablePureComponent { const params = column.get('params', null) === null ? null : column.get('params').toJS(); return ( - + {SpecificComponent => } ); diff --git a/app/javascript/mastodon/features/ui/components/drawer_loading.js b/app/javascript/mastodon/features/ui/components/drawer_loading.js new file mode 100644 index 0000000000..08b0d23476 --- /dev/null +++ b/app/javascript/mastodon/features/ui/components/drawer_loading.js @@ -0,0 +1,11 @@ +import React from 'react'; + +const DrawerLoading = () => ( +
+
+
+
+
+); + +export default DrawerLoading; diff --git a/app/javascript/mastodon/features/ui/components/modal_root.js b/app/javascript/mastodon/features/ui/components/modal_root.js index cd605d7b2d..4588cd5fda 100644 --- a/app/javascript/mastodon/features/ui/components/modal_root.js +++ b/app/javascript/mastodon/features/ui/components/modal_root.js @@ -5,24 +5,24 @@ import spring from 'react-motion/lib/spring'; import BundleContainer from '../containers/bundle_container'; import BundleModalError from './bundle_modal_error'; import ModalLoading from './modal_loading'; -import ActionsModal from '../components/actions_modal'; +import ActionsModal from './actions_modal'; +import MediaModal from './media_modal'; +import VideoModal from './video_modal'; +import BoostModal from './boost_modal'; +import ConfirmationModal from './confirmation_modal'; import { - MediaModal, OnboardingModal, - VideoModal, - BoostModal, - ConfirmationModal, ReportModal, SettingsModal, EmbedModal, } from '../../../features/ui/util/async-components'; const MODAL_COMPONENTS = { - 'MEDIA': MediaModal, + 'MEDIA': () => Promise.resolve({ default: MediaModal }), 'ONBOARDING': OnboardingModal, - 'VIDEO': VideoModal, - 'BOOST': BoostModal, - 'CONFIRM': ConfirmationModal, + 'VIDEO': () => Promise.resolve({ default: VideoModal }), + 'BOOST': () => Promise.resolve({ default: BoostModal }), + 'CONFIRM': () => Promise.resolve({ default: ConfirmationModal }), 'REPORT': ReportModal, 'SETTINGS': SettingsModal, 'ACTIONS': () => Promise.resolve({ default: ActionsModal }), @@ -84,8 +84,8 @@ export default class ModalRoot extends React.PureComponent { return { opacity: spring(0), scale: spring(0.98) }; } - renderLoading = () => { - return ; + renderLoading = modalId => () => { + return ['MEDIA', 'VIDEO', 'BOOST', 'CONFIRM', 'ACTIONS'].indexOf(modalId) === -1 ? : null; } renderError = (props) => { @@ -119,7 +119,7 @@ export default class ModalRoot extends React.PureComponent {
- + {(SpecificComponent) => }
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js index 3f335c4f84..219b8192b4 100644 --- a/app/javascript/mastodon/features/ui/util/async-components.js +++ b/app/javascript/mastodon/features/ui/util/async-components.js @@ -82,26 +82,10 @@ export function Mutes () { return import(/* webpackChunkName: "features/mutes" */'../../mutes'); } -export function MediaModal () { - return import(/* webpackChunkName: "modals/media_modal" */'../components/media_modal'); -} - export function OnboardingModal () { return import(/* webpackChunkName: "modals/onboarding_modal" */'../components/onboarding_modal'); } -export function VideoModal () { - return import(/* webpackChunkName: "modals/video_modal" */'../components/video_modal'); -} - -export function BoostModal () { - return import(/* webpackChunkName: "modals/boost_modal" */'../components/boost_modal'); -} - -export function ConfirmationModal () { - return import(/* webpackChunkName: "modals/confirmation_modal" */'../components/confirmation_modal'); -} - export function ReportModal () { return import(/* webpackChunkName: "modals/report_modal" */'../components/report_modal'); } diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index c3a04ba652..2b148c82b8 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -24,6 +24,8 @@ class Form::AdminSettings :open_deletion=, :timeline_preview, :timeline_preview=, + :bootstrap_timeline_accounts, + :bootstrap_timeline_accounts=, to: Setting ) end diff --git a/app/services/bootstrap_timeline_service.rb b/app/services/bootstrap_timeline_service.rb new file mode 100644 index 0000000000..c01e25824f --- /dev/null +++ b/app/services/bootstrap_timeline_service.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +class BootstrapTimelineService < BaseService + def call(source_account) + bootstrap_timeline_accounts.each do |target_account| + FollowService.new.call(source_account, target_account) + end + end + + private + + def bootstrap_timeline_accounts + return @bootstrap_timeline_accounts if defined?(@bootstrap_timeline_accounts) + + @bootstrap_timeline_accounts = bootstrap_timeline_accounts_usernames.empty? ? admin_accounts : local_unlocked_accounts(bootstrap_timeline_accounts_usernames) + end + + def bootstrap_timeline_accounts_usernames + @bootstrap_timeline_accounts_usernames ||= (Setting.bootstrap_timeline_accounts || '').split(',').map { |str| str.strip.gsub(/\A@/, '') }.reject(&:blank?) + end + + def admin_accounts + User.admins + .includes(:account) + .where(accounts: { locked: false }) + .map(&:account) + end + + def local_unlocked_accounts(usernames) + Account.local + .where(username: usernames) + .where(locked: false) + end +end diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index 941556b604..791773f250 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -5,9 +5,9 @@ class FollowService < BaseService # Follow a remote user, notify remote user about the follow # @param [Account] source_account From which to follow - # @param [String] uri User URI to follow in the form of username@domain + # @param [String, Account] uri User URI to follow in the form of username@domain (or account record) def call(source_account, uri) - target_account = ResolveRemoteAccountService.new.call(uri) + target_account = uri.is_a?(Account) ? uri : ResolveRemoteAccountService.new.call(uri) raise ActiveRecord::RecordNotFound if target_account.nil? || target_account.id == source_account.id || target_account.suspended? raise Mastodon::NotPermittedError if target_account.blocking?(source_account) || source_account.blocking?(target_account) diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml index 9f8a6640b2..50d019ec42 100644 --- a/app/views/admin/settings/edit.html.haml +++ b/app/views/admin/settings/edit.html.haml @@ -28,5 +28,10 @@ = f.input :site_extended_description, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_description_extended.title'), hint: t('admin.settings.site_description_extended.desc_html'), input_html: { rows: 8 } = f.input :site_terms, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_terms.title'), hint: t('admin.settings.site_terms.desc_html'), input_html: { rows: 8 } + %hr/ + + .fields-group + = f.input :bootstrap_timeline_accounts, wrapper: :with_block_label, label: t('admin.settings.bootstrap_timeline_accounts.title'), hint: t('admin.settings.bootstrap_timeline_accounts.desc_html') + .actions = f.button :button, t('generic.save_changes'), type: :submit diff --git a/app/views/user_mailer/confirmation_instructions.oc.html.erb b/app/views/user_mailer/confirmation_instructions.oc.html.erb index ed1428a55c..7a16db67a1 100644 --- a/app/views/user_mailer/confirmation_instructions.oc.html.erb +++ b/app/views/user_mailer/confirmation_instructions.oc.html.erb @@ -1,13 +1,13 @@ -

Bonjorn <%= @resource.email %> ! 

+

Bonjorn <%= @resource.email %> !

Venètz de vos crear un compte sus <%= @instance %> e vos mercegem :)

-

Per confirmar vòstre inscripcion, mercés de clicar sul ligam seguent : 
+

Per confirmar vòstra inscripcion, mercés de clicar sul ligam seguent : 
<%= link_to 'Confirmar mon compte', confirmation_url(@resource, confirmation_token: @token) %>

Aprèp vòstra primièra connexion, poiretz accedir a la documentacion de l’aisina.

-

Pensatz tanben a gaitar nòstras <%= link_to 'conditions d\'utilisation', terms_url %>.

+

Pensatz tanben de gaitar nòstras <%= link_to 'conditions d\'utilisation', terms_url %>.

Amistosament,

diff --git a/app/views/user_mailer/confirmation_instructions.oc.text.erb b/app/views/user_mailer/confirmation_instructions.oc.text.erb index 444d296ce6..bf2acfec16 100644 --- a/app/views/user_mailer/confirmation_instructions.oc.text.erb +++ b/app/views/user_mailer/confirmation_instructions.oc.text.erb @@ -1,13 +1,13 @@ -Bonjorn <%= @resource.email %> !  +Bonjorn <%= @resource.email %> ! Venètz de vos crear un compte sus <%= @instance %> e vos mercegem :) -er confirmar vòstre inscripcion, mercés de clicar sul ligam seguent :  +er confirmar vòstra inscripcion, mercés de clicar sul ligam seguent :  <%= link_to 'Confirmar mon compte', confirmation_url(@resource, confirmation_token: @token) %> Aprèp vòstra primièra connexion, poiretz accedir a la documentacion de l’aisina. -Pensatz tanben a gaitar nòstras <%= link_to 'conditions d\'utilisation', terms_url %>. +Pensatz tanben de gaitar nòstras <%= link_to 'conditions d\'utilisation', terms_url %>. Amistosament, diff --git a/app/views/user_mailer/password_change.oc.html.erb b/app/views/user_mailer/password_change.oc.html.erb index 476db95366..094c221a8a 100644 --- a/app/views/user_mailer/password_change.oc.html.erb +++ b/app/views/user_mailer/password_change.oc.html.erb @@ -1,3 +1,3 @@ -

Bonjorn <%= @resource.email %> ! 

+

Bonjorn <%= @resource.email %> !

Vos contactem per vos avisar qu’avèm ben cambiat vòstre senhal Mastodon.

diff --git a/app/views/user_mailer/password_change.oc.text.erb b/app/views/user_mailer/password_change.oc.text.erb index e6caa045cd..9fe9116d95 100644 --- a/app/views/user_mailer/password_change.oc.text.erb +++ b/app/views/user_mailer/password_change.oc.text.erb @@ -1,3 +1,3 @@ -Bonjorn <%= @resource.email %> !  +Bonjorn <%= @resource.email %> ! Vos contactem per vos avisar qu’avèm ben cambiat vòstre senhal Mastodon. diff --git a/app/views/user_mailer/reset_password_instructions.oc.html.erb b/app/views/user_mailer/reset_password_instructions.oc.html.erb index 7363ee4b6a..6c775b3a16 100644 --- a/app/views/user_mailer/reset_password_instructions.oc.html.erb +++ b/app/views/user_mailer/reset_password_instructions.oc.html.erb @@ -1,8 +1,8 @@ -

Bonjorn <%= @resource.email %> ! 

+

Bonjorn <%= @resource.email %> !

-

Qualqu’un a demandat una reĩnicializacion de vòstre senhal per Mastodon. Podètz realizar la reĩnicializacion en clicant sul ligam çai-jos.

+

Qualqu’un a demandat la reĩnicializacion de vòstre senhal per Mastodon. Podètz realizar la reĩnicializacion en clicant sul ligam çai-jos.

<%= link_to 'Modificar mon senhal', edit_password_url(@resource, reset_password_token: @token) %>

S’avètz pas res demandat, fasquètz pas cas a aqueste corrièl.

-

Vòstre senhal cambiarà pas se clicatz pas sul ligam e que ne causissètz pas un nòu.

+

Vòstre senhal cambiarà pas se clicatz pas sul ligam e que ne causissètz pas un novèl.

diff --git a/app/views/user_mailer/reset_password_instructions.oc.text.erb b/app/views/user_mailer/reset_password_instructions.oc.text.erb index a95a1ae8cd..26432d2df5 100644 --- a/app/views/user_mailer/reset_password_instructions.oc.text.erb +++ b/app/views/user_mailer/reset_password_instructions.oc.text.erb @@ -1,8 +1,8 @@ -Bonjorn <%= @resource.email %> !  +Bonjorn <%= @resource.email %> ! -Qualqu’un a demandat una reĩnicializacion de vòstre senhal per Mastodon. Podètz realizar la reĩnicializacion en clicant sul ligam çai-jos.

+Qualqu’un a demandat la reĩnicializacion de vòstre senhal per Mastodon. Podètz realizar la reĩnicializacion en clicant sul ligam çai-jos.

<%= link_to 'Modificar mon senhal', edit_password_url(@resource, reset_password_token: @token) %> S’avètz pas res demandat, fasquètz pas cas a aqueste corrièl. -Vòstre senhal cambiarà pas se clicatz pas sul ligam e que ne causissètz pas un nòu. +Vòstre senhal cambiarà pas se clicatz pas sul ligam e que ne causissètz pas un novèl. diff --git a/app/workers/bootstrap_timeline_worker.rb b/app/workers/bootstrap_timeline_worker.rb new file mode 100644 index 0000000000..89cfb4c3ae --- /dev/null +++ b/app/workers/bootstrap_timeline_worker.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class BootstrapTimelineWorker + include Sidekiq::Worker + + def perform(account_id) + BootstrapTimelineService.new.call(Account.find(account_id)) + end +end diff --git a/config/environments/production.rb b/config/environments/production.rb index 928fd13e50..dc1ce5ed66 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -73,7 +73,7 @@ Rails.application.configure do config.action_mailer.perform_caching = false # E-mails - config.action_mailer.default_options = { from: ENV.fetch('SMTP_FROM_ADDRESS') } + config.action_mailer.default_options = { from: ENV.fetch('SMTP_FROM_ADDRESS', 'notifications@localhost') } config.action_mailer.smtp_settings = { :port => ENV['SMTP_PORT'], diff --git a/config/locales/en.yml b/config/locales/en.yml index 4160745f85..64fc556f3d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -167,6 +167,9 @@ en: unresolved: Unresolved view: View settings: + bootstrap_timeline_accounts: + desc_html: Separate multiple usernames by comma. Only local and unlocked accounts will work. Default when empty is all local admins. + title: Default follows for new users contact_information: email: Business e-mail username: Contact username diff --git a/config/locales/ja.yml b/config/locales/ja.yml index fa9e1d1126..fcaa64dab4 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -167,6 +167,9 @@ ja: unresolved: 未解決 view: 表示 settings: + bootstrap_timeline_accounts: + desc_html: 複数のユーザー名はコンマで区切ります。ローカルの公開アカウントのみ有効です。指定しない場合は管理者がデフォルトで指定されます。 + title: 新規ユーザーが自動フォローするアカウント contact_information: email: ビジネスメールアドレス username: 連絡先のユーザー名 diff --git a/config/settings.yml b/config/settings.yml index acaab31667..39dfb8f552 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -41,6 +41,7 @@ defaults: &defaults - root - webmaster - administrator + bootstrap_timeline_accounts: '' development: <<: *defaults diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 3ab705e260..b6fdb10c67 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -21,7 +21,7 @@ module Mastodon end def flags - 'rc4' + '' end def to_a diff --git a/spec/controllers/api/v1/follows_controller_spec.rb b/spec/controllers/api/v1/follows_controller_spec.rb index b5e1d16dd7..ea9e76d686 100644 --- a/spec/controllers/api/v1/follows_controller_spec.rb +++ b/spec/controllers/api/v1/follows_controller_spec.rb @@ -42,5 +42,10 @@ RSpec.describe Api::V1::FollowsController, type: :controller do it 'subscribes to remote hub' do expect(a_request(:post, "https://quitter.no/main/push/hub")).to have_been_made end + + it 'returns http success if already following, too' do + post :create, params: { uri: 'gargron@quitter.no' } + expect(response).to have_http_status(:success) + end end end diff --git a/spec/controllers/auth/confirmations_controller_spec.rb b/spec/controllers/auth/confirmations_controller_spec.rb index cf7f91e528..2ec36c060b 100644 --- a/spec/controllers/auth/confirmations_controller_spec.rb +++ b/spec/controllers/auth/confirmations_controller_spec.rb @@ -10,4 +10,22 @@ describe Auth::ConfirmationsController, type: :controller do expect(response).to have_http_status(:success) end end + + describe 'GET #show' do + let!(:user) { Fabricate(:user, confirmation_token: 'foobar', confirmed_at: nil) } + + before do + allow(BootstrapTimelineWorker).to receive(:perform_async) + @request.env['devise.mapping'] = Devise.mappings[:user] + get :show, params: { confirmation_token: 'foobar' } + end + + it 'redirects to login' do + expect(response).to redirect_to(new_user_session_path) + end + + it 'queues up bootstrapping of home timeline' do + expect(BootstrapTimelineWorker).to have_received(:perform_async).with(user.account_id) + end + end end diff --git a/spec/services/bootstrap_timeline_service_spec.rb b/spec/services/bootstrap_timeline_service_spec.rb new file mode 100644 index 0000000000..5189b1de84 --- /dev/null +++ b/spec/services/bootstrap_timeline_service_spec.rb @@ -0,0 +1,37 @@ +require 'rails_helper' + +RSpec.describe BootstrapTimelineService do + subject { described_class.new } + + describe '#call' do + let(:source_account) { Fabricate(:account) } + + context 'when setting is empty' do + let!(:admin) { Fabricate(:user, admin: true) } + + before do + Setting.bootstrap_timeline_accounts = nil + subject.call(source_account) + end + + it 'follows admin accounts from account' do + expect(source_account.following?(admin.account)).to be true + end + end + + context 'when setting is set' do + let!(:alice) { Fabricate(:account, username: 'alice') } + let!(:bob) { Fabricate(:account, username: 'bob') } + + before do + Setting.bootstrap_timeline_accounts = 'alice, bob' + subject.call(source_account) + end + + it 'follows found accounts from account' do + expect(source_account.following?(alice)).to be true + expect(source_account.following?(bob)).to be true + end + end + end +end