Merge remote-tracking branch 'tootsuite/master'

This commit is contained in:
David Yip 2017-11-27 22:33:26 -06:00
commit 7463d80ff4
No known key found for this signature in database
GPG key ID: 7DA0036508FCC0CC
11 changed files with 195 additions and 1 deletions

View file

@ -0,0 +1,32 @@
# frozen_string_literal: true
class Settings::MigrationsController < ApplicationController
layout 'admin'
before_action :authenticate_user!
def show
@migration = Form::Migration.new(account: current_account.moved_to_account)
end
def update
@migration = Form::Migration.new(resource_params)
if @migration.valid?
if current_account.moved_to_account_id != @migration.account&.id
current_account.update!(moved_to_account: @migration.account)
ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
end
redirect_to settings_migration_path
else
render :show
end
end
private
def resource_params
params.require(:migration).permit(:acct)
end
end

View file

@ -0,0 +1,68 @@
import React from 'react';
import Column from '../ui/components/column';
import { defineMessages, injectIntl } from 'react-intl';
import PropTypes from 'prop-types';
import ImmutablePureComponent from 'react-immutable-pure-component';
const messages = defineMessages({
heading: { id: 'keyboard_shortcuts.heading', defaultMessage: 'Keyboard Shortcuts' },
hotkey: { id: 'keyboard_shortcuts.hotkey', defaultMessage: 'Hotkey' },
description: { id: 'keyboard_shortcuts.description', defaultMessage: 'Description' },
reply: { id: 'keyboard_shortcuts.reply', defaultMessage: 'to reply' },
mention: { id: 'keyboard_shortcuts.mention', defaultMessage: 'to mention author' },
favourite: { id: 'keyboard_shortcuts.favourite', defaultMessage: 'to favourite' },
boost: { id: 'keyboard_shortcuts.boost', defaultMessage: 'to boost' },
enter: { id: 'keyboard_shortcuts.enter', defaultMessage: 'to open status' },
profile: { id: 'keyboard_shortcuts.profile', defaultMessage: 'to open author\'s profile' },
up: { id: 'keyboard_shortcuts.up', defaultMessage: 'to move up in the list' },
down: { id: 'keyboard_shortcuts.down', defaultMessage: 'to move down in the list' },
column: { id: 'keyboard_shortcuts.column', defaultMessage: 'to focus a status in one of the columns' },
compose: { id: 'keyboard_shortcuts.compose', defaultMessage: 'to focus the compose textarea' },
toot: { id: 'keyboard_shortcuts.toot', defaultMessage: 'to start a brand new toot' },
back: { id: 'keyboard_shortcuts.back', defaultMessage: 'to navigate back' },
search: { id: 'keyboard_shortcuts.search', defaultMessage: 'to focus search' },
unfocus: { id: 'keyboard_shortcuts.unfocus', defaultMessage: 'to un-focus compose textarea/search' },
legend: { id: 'keyboard_shortcuts.legend', defaultMessage: 'to display this legend' },
});
@injectIntl
export default class KeyboardShortcuts extends ImmutablePureComponent {
static propTypes = {
intl: PropTypes.object.isRequired,
multiColumn: PropTypes.bool,
};
render () {
const { intl } = this.props;
return (
<Column icon='question' heading={intl.formatMessage(messages.heading)} hideHeadingOnMobile>
<div className='keyboard-shortcuts scrollable optionally-scrollable'>
<table>
<thead>
<tr><th>{intl.formatMessage(messages.hotkey)}</th><th>{intl.formatMessage(messages.description)}</th></tr>
</thead>
<tbody>
<tr><td><code>r</code></td><td>{intl.formatMessage(messages.reply)}</td></tr>
<tr><td><code>m</code></td><td>{intl.formatMessage(messages.mention)}</td></tr>
<tr><td><code>f</code></td><td>{intl.formatMessage(messages.favourite)}</td></tr>
<tr><td><code>b</code></td><td>{intl.formatMessage(messages.boost)}</td></tr>
<tr><td><code>enter</code></td><td>{intl.formatMessage(messages.enter)}</td></tr>
<tr><td><code>up</code></td><td>{intl.formatMessage(messages.up)}</td></tr>
<tr><td><code>down</code></td><td>{intl.formatMessage(messages.down)}</td></tr>
<tr><td><code>1</code>-<code>9</code></td><td>{intl.formatMessage(messages.column)}</td></tr>
<tr><td><code>n</code></td><td>{intl.formatMessage(messages.compose)}</td></tr>
<tr><td><code>alt</code>+<code>n</code></td><td>{intl.formatMessage(messages.toot)}</td></tr>
<tr><td><code>backspace</code></td><td>{intl.formatMessage(messages.back)}</td></tr>
<tr><td><code>s</code></td><td>{intl.formatMessage(messages.search)}</td></tr>
<tr><td><code>esc</code></td><td>{intl.formatMessage(messages.unfocus)}</td></tr>
<tr><td><code>?</code></td><td>{intl.formatMessage(messages.legend)}</td></tr>
</tbody>
</table>
</div>
</Column>
);
}
}

View file

@ -19,6 +19,7 @@ import {
Compose, Compose,
Status, Status,
GettingStarted, GettingStarted,
KeyboardShortcuts,
PublicTimeline, PublicTimeline,
CommunityTimeline, CommunityTimeline,
AccountTimeline, AccountTimeline,
@ -56,6 +57,7 @@ const mapStateToProps = state => ({
}); });
const keyMap = { const keyMap = {
help: '?',
new: 'n', new: 'n',
search: 's', search: 's',
forceNew: 'option+n', forceNew: 'option+n',
@ -298,6 +300,14 @@ export default class UI extends React.Component {
this.hotkeys = c; this.hotkeys = c;
} }
handleHotkeyToggleHelp = () => {
if (this.props.location.pathname === '/keyboard-shortcuts') {
this.context.router.history.goBack();
} else {
this.context.router.history.push('/keyboard-shortcuts');
}
}
handleHotkeyGoToHome = () => { handleHotkeyGoToHome = () => {
this.context.router.history.push('/timelines/home'); this.context.router.history.push('/timelines/home');
} }
@ -343,6 +353,7 @@ export default class UI extends React.Component {
const { children } = this.props; const { children } = this.props;
const handlers = { const handlers = {
help: this.handleHotkeyToggleHelp,
new: this.handleHotkeyNew, new: this.handleHotkeyNew,
search: this.handleHotkeySearch, search: this.handleHotkeySearch,
forceNew: this.handleHotkeyForceNew, forceNew: this.handleHotkeyForceNew,
@ -369,6 +380,7 @@ export default class UI extends React.Component {
<WrappedSwitch> <WrappedSwitch>
<Redirect from='/' to='/getting-started' exact /> <Redirect from='/' to='/getting-started' exact />
<WrappedRoute path='/getting-started' component={GettingStarted} content={children} /> <WrappedRoute path='/getting-started' component={GettingStarted} content={children} />
<WrappedRoute path='/keyboard-shortcuts' component={KeyboardShortcuts} content={children} />
<WrappedRoute path='/timelines/home' component={HomeTimeline} content={children} /> <WrappedRoute path='/timelines/home' component={HomeTimeline} content={children} />
<WrappedRoute path='/timelines/public' exact component={PublicTimeline} content={children} /> <WrappedRoute path='/timelines/public' exact component={PublicTimeline} content={children} />
<WrappedRoute path='/timelines/public/local' component={CommunityTimeline} content={children} /> <WrappedRoute path='/timelines/public/local' component={CommunityTimeline} content={children} />

View file

@ -38,6 +38,10 @@ export function GettingStarted () {
return import(/* webpackChunkName: "features/getting_started" */'../../getting_started'); return import(/* webpackChunkName: "features/getting_started" */'../../getting_started');
} }
export function KeyboardShortcuts () {
return import(/* webpackChunkName: "features/keyboard_shortcuts" */'../../keyboard_shortcuts');
}
export function PinnedStatuses () { export function PinnedStatuses () {
return import(/* webpackChunkName: "features/pinned_statuses" */'../../pinned_statuses'); return import(/* webpackChunkName: "features/pinned_statuses" */'../../pinned_statuses');
} }

View file

@ -2099,6 +2099,27 @@
} }
} }
.keyboard-shortcuts {
padding: 8px 0 0;
overflow: hidden;
thead {
position: absolute;
left: -9999px;
}
td {
padding: 0 10px 8px;
}
code {
display: inline-block;
padding: 3px 5px;
background-color: lighten($ui-base-color, 8%);
border: 1px solid darken($ui-base-color, 4%);
}
}
.setting-text { .setting-text {
color: $ui-primary-color; color: $ui-primary-color;
background: transparent; background: transparent;

View file

@ -0,0 +1,27 @@
# frozen_string_literal: true
class Form::Migration
include ActiveModel::Validations
attr_accessor :acct, :account
validates :acct, presence: true
def initialize(attrs = {})
@account = attrs[:account]
@acct = attrs[:account].acct unless @account.nil?
@acct = attrs[:acct].gsub(/\A@/, '').strip unless attrs[:acct].nil?
end
def valid?
return false unless super
set_account
errors.empty?
end
private
def set_account
self.account = ResolveRemoteAccountService.new.call(acct) if account.nil? && acct.present?
end
end

View file

@ -0,0 +1,17 @@
- content_for :page_title do
= t('settings.migrate')
= simple_form_for @migration, as: :migration, url: settings_migration_path, html: { method: :put } do |f|
- if @migration.account
%p.hint= t('migrations.currently_redirecting')
.fields-group
= render partial: 'authorize_follows/card', locals: { account: @migration.account }
= render 'shared/error_messages', object: @migration
.fields-group
= f.input :acct, placeholder: t('migrations.acct')
.actions
= f.button :button, t('migrations.proceed'), type: :submit, class: 'negative'

View file

@ -21,3 +21,8 @@
.actions .actions
= f.button :button, t('generic.save_changes'), type: :submit = f.button :button, t('generic.save_changes'), type: :submit
%hr/
%h6= t('auth.migrate_account')
%p.muted-hint= t('auth.migrate_account_html', path: settings_migration_path)

View file

@ -347,6 +347,8 @@ en:
invalid_reset_password_token: Password reset token is invalid or expired. Please request a new one. invalid_reset_password_token: Password reset token is invalid or expired. Please request a new one.
login: Log in login: Log in
logout: Logout logout: Logout
migrate_account: Move to a different account
migrate_account_html: If you wish to redirect this account to a different one, you can <a href="%{path}">configure it here</a>.
register: Sign up register: Sign up
resend_confirmation: Resend confirmation instructions resend_confirmation: Resend confirmation instructions
reset_password: Reset password reset_password: Reset password
@ -462,6 +464,10 @@ en:
validations: validations:
images_and_video: Cannot attach a video to a status that already contains images images_and_video: Cannot attach a video to a status that already contains images
too_many: Cannot attach more than 4 files too_many: Cannot attach more than 4 files
migrations:
acct: username@domain of the new account
currently_redirecting: 'Your profile is set to redirect to:'
proceed: Save
moderation: moderation:
title: Moderation title: Moderation
notification_mailer: notification_mailer:
@ -577,6 +583,7 @@ en:
followers: Authorized followers followers: Authorized followers
import: Import import: Import
keyword_mutes: Muted keywords keyword_mutes: Muted keywords
migrate: Account migration
notifications: Notifications notifications: Notifications
preferences: Preferences preferences: Preferences
settings: Settings settings: Settings

View file

@ -5,7 +5,7 @@ SimpleNavigation::Configuration.run do |navigation|
primary.item :web, safe_join([fa_icon('chevron-left fw'), t('settings.back')]), root_url primary.item :web, safe_join([fa_icon('chevron-left fw'), t('settings.back')]), root_url
primary.item :settings, safe_join([fa_icon('cog fw'), t('settings.settings')]), settings_profile_url do |settings| primary.item :settings, safe_join([fa_icon('cog fw'), t('settings.settings')]), settings_profile_url do |settings|
settings.item :profile, safe_join([fa_icon('user fw'), t('settings.edit_profile')]), settings_profile_url settings.item :profile, safe_join([fa_icon('user fw'), t('settings.edit_profile')]), settings_profile_url, highlights_on: %r{/settings/profile|/settings/migration}
settings.item :preferences, safe_join([fa_icon('sliders fw'), t('settings.preferences')]), settings_preferences_url settings.item :preferences, safe_join([fa_icon('sliders fw'), t('settings.preferences')]), settings_preferences_url
settings.item :keyword_mutes, safe_join([fa_icon('volume-off fw'), t('settings.keyword_mutes')]), settings_keyword_mutes_url settings.item :keyword_mutes, safe_join([fa_icon('volume-off fw'), t('settings.keyword_mutes')]), settings_keyword_mutes_url
settings.item :notifications, safe_join([fa_icon('bell fw'), t('settings.notifications')]), settings_notifications_url settings.item :notifications, safe_join([fa_icon('bell fw'), t('settings.notifications')]), settings_notifications_url

View file

@ -103,6 +103,7 @@ Rails.application.routes.draw do
end end
resource :delete, only: [:show, :destroy] resource :delete, only: [:show, :destroy]
resource :migration, only: [:show, :update]
resources :sessions, only: [:destroy] resources :sessions, only: [:destroy]
end end