Browse Source
Merge pull request #885 from ThibG/glitch-soc/merge-upstream
Merge upstream changesclosed-social-glitch-2
ThibG
5 years ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
254 changed files with 3402 additions and 1438 deletions
Unified View
Diff Options
-
+13 -30.eslintignore
-
+199 -0.eslintrc.js
-
+0 -176.eslintrc.yml
-
+53 -36AUTHORS.md
-
+105 -0CHANGELOG.md
-
+3 -3Gemfile
-
+13 -13Gemfile.lock
-
+3 -8app/controllers/admin/domain_blocks_controller.rb
-
+1 -5app/controllers/admin/followers_controller.rb
-
+14 -13app/controllers/admin/instances_controller.rb
-
+1 -1app/controllers/admin/statuses_controller.rb
-
+1 -1app/controllers/api/v1/accounts_controller.rb
-
+3 -1app/controllers/api/v1/custom_emojis_controller.rb
-
+77 -0app/controllers/api/v1/scheduled_statuses_controller.rb
-
+5 -4app/controllers/api/v1/statuses_controller.rb
-
+31 -14app/controllers/concerns/signature_verification.rb
-
+5 -0app/controllers/remote_interaction_controller.rb
-
+2 -1app/helpers/admin/filter_helper.rb
-
+2 -2app/javascript/flavours/glitch/components/account.js
-
+4 -0app/javascript/flavours/glitch/components/media_gallery.js
-
+6 -0app/javascript/flavours/glitch/features/status/components/card.js
-
+18 -10app/javascript/flavours/glitch/packs/public.js
-
+14 -0app/javascript/flavours/glitch/styles/admin.scss
-
+9 -0app/javascript/flavours/glitch/styles/components/status.scss
-
+1 -0app/javascript/flavours/glitch/styles/dashboard.scss
-
+2 -2app/javascript/mastodon/components/account.js
-
+4 -0app/javascript/mastodon/components/media_gallery.js
-
+8 -1app/javascript/mastodon/components/status_action_bar.js
-
+7 -1app/javascript/mastodon/features/account/components/action_bar.js
-
+21 -2app/javascript/mastodon/features/getting_started/index.js
-
+8 -1app/javascript/mastodon/features/status/components/action_bar.js
-
+6 -0app/javascript/mastodon/features/status/components/card.js
-
+1 -0app/javascript/mastodon/initial_state.js
-
+2 -0app/javascript/mastodon/locales/ar.json
-
+2 -0app/javascript/mastodon/locales/ast.json
-
+2 -0app/javascript/mastodon/locales/bg.json
-
+25 -23app/javascript/mastodon/locales/ca.json
-
+4 -2app/javascript/mastodon/locales/co.json
-
+5 -3app/javascript/mastodon/locales/cs.json
-
+2 -0app/javascript/mastodon/locales/cy.json
-
+6 -4app/javascript/mastodon/locales/da.json
-
+4 -2app/javascript/mastodon/locales/de.json
-
+20 -0app/javascript/mastodon/locales/defaultMessages.json
-
+4 -2app/javascript/mastodon/locales/el.json
-
+2 -0app/javascript/mastodon/locales/en.json
-
+2 -0app/javascript/mastodon/locales/eo.json
-
+2 -0app/javascript/mastodon/locales/es.json
-
+26 -24app/javascript/mastodon/locales/eu.json
-
+2 -0app/javascript/mastodon/locales/fa.json
-
+2 -0app/javascript/mastodon/locales/fi.json
-
+3 -1app/javascript/mastodon/locales/fr.json
-
+3 -1app/javascript/mastodon/locales/gl.json
-
+2 -0app/javascript/mastodon/locales/he.json
-
+2 -0app/javascript/mastodon/locales/hr.json
-
+2 -0app/javascript/mastodon/locales/hu.json
-
+2 -0app/javascript/mastodon/locales/hy.json
-
+2 -0app/javascript/mastodon/locales/id.json
-
+2 -0app/javascript/mastodon/locales/io.json
-
+26 -24app/javascript/mastodon/locales/it.json
-
+2 -0app/javascript/mastodon/locales/ja.json
-
+2 -0app/javascript/mastodon/locales/ka.json
-
+4 -2app/javascript/mastodon/locales/ko.json
-
+358 -0app/javascript/mastodon/locales/lv.json
-
+2 -0app/javascript/mastodon/locales/ms.json
-
+4 -2app/javascript/mastodon/locales/nl.json
-
+2 -0app/javascript/mastodon/locales/no.json
-
+6 -4app/javascript/mastodon/locales/oc.json
-
+3 -1app/javascript/mastodon/locales/pl.json
-
+25 -23app/javascript/mastodon/locales/pt-BR.json
-
+2 -0app/javascript/mastodon/locales/pt.json
-
+87 -85app/javascript/mastodon/locales/ro.json
-
+2 -0app/javascript/mastodon/locales/ru.json
-
+10 -8app/javascript/mastodon/locales/sk.json
-
+2 -0app/javascript/mastodon/locales/sl.json
-
+2 -0app/javascript/mastodon/locales/sr-Latn.json
-
+2 -0app/javascript/mastodon/locales/sr.json
-
+2 -0app/javascript/mastodon/locales/sv.json
-
+2 -0app/javascript/mastodon/locales/ta.json
-
+36 -34app/javascript/mastodon/locales/te.json
-
+2 -0app/javascript/mastodon/locales/th.json
-
+2 -0app/javascript/mastodon/locales/tr.json
-
+2 -0app/javascript/mastodon/locales/uk.json
-
+2 -0app/javascript/mastodon/locales/whitelist_lv.json
-
+2 -0app/javascript/mastodon/locales/zh-CN.json
-
+2 -0app/javascript/mastodon/locales/zh-HK.json
-
+2 -0app/javascript/mastodon/locales/zh-TW.json
-
+18 -10app/javascript/packs/public.js
-
+14 -0app/javascript/styles/mastodon/admin.scss
-
+10 -0app/javascript/styles/mastodon/components.scss
-
+1 -0app/javascript/styles/mastodon/dashboard.scss
-
+2 -0app/lib/activitypub/activity.rb
-
+1 -1app/lib/activitypub/activity/follow.rb
-
+43 -0app/lib/activitypub/activity/move.rb
-
+1 -0app/lib/activitypub/adapter.rb
-
+6 -17app/models/account.rb
-
+1 -0app/models/concerns/account_associations.rb
-
+4 -0app/models/concerns/account_finder_concern.rb
-
+17 -4app/models/instance.rb
-
+3 -14app/models/instance_filter.rb
-
+20 -18app/models/media_attachment.rb
+ 13
- 30
.eslintignore
View File
| @ -1,30 +1,13 @@ | |||||
| # See https://help.github.com/articles/ignoring-files for more about ignoring files. | |||||
| # | |||||
| # If you find yourself ignoring temporary files generated by your text editor | |||||
| # or operating system, you probably want to add a global ignore instead: | |||||
| # git config --global core.excludesfile '~/.gitignore_global' | |||||
| # Ignore bundler config. | |||||
| /.bundle | |||||
| # Ignore the default SQLite database. | |||||
| /db/*.sqlite3 | |||||
| /db/*.sqlite3-journal | |||||
| # Ignore all logfiles and tempfiles. | |||||
| /log/* | |||||
| !/log/.keep | |||||
| /tmp | |||||
| coverage | |||||
| public/system | |||||
| public/assets | |||||
| .env | |||||
| .env.production | |||||
| node_modules/ | |||||
| neo4j/ | |||||
| # Ignore Vagrant files | |||||
| .vagrant/ | |||||
| # Ignore Capistrano customizations | |||||
| config/deploy/* | |||||
| /build/** | |||||
| /coverage/** | |||||
| /db/** | |||||
| /lib/** | |||||
| /log/** | |||||
| /node_modules/** | |||||
| /nonobox/** | |||||
| /public/** | |||||
| !/public/embed.js | |||||
| /spec/** | |||||
| /tmp/** | |||||
| /vendor/** | |||||
| !.eslintrc.js | |||||
+ 199
- 0
.eslintrc.js
View File
| @ -0,0 +1,199 @@ | |||||
| module.exports = { | |||||
| root: true, | |||||
| env: { | |||||
| browser: true, | |||||
| node: true, | |||||
| es6: true, | |||||
| jest: true, | |||||
| }, | |||||
| globals: { | |||||
| ATTACHMENT_HOST: false, | |||||
| }, | |||||
| parser: 'babel-eslint', | |||||
| plugins: [ | |||||
| 'react', | |||||
| 'jsx-a11y', | |||||
| 'import', | |||||
| 'promise', | |||||
| ], | |||||
| parserOptions: { | |||||
| sourceType: 'module', | |||||
| ecmaFeatures: { | |||||
| experimentalObjectRestSpread: true, | |||||
| jsx: true, | |||||
| }, | |||||
| ecmaVersion: 2018, | |||||
| }, | |||||
| settings: { | |||||
| react: { | |||||
| version: 'detect', | |||||
| }, | |||||
| 'import/extensions': [ | |||||
| '.js', | |||||
| ], | |||||
| 'import/ignore': [ | |||||
| 'node_modules', | |||||
| '\\.(css|scss|json)$', | |||||
| ], | |||||
| }, | |||||
| rules: { | |||||
| 'brace-style': 'warn', | |||||
| 'comma-dangle': ['error', 'always-multiline'], | |||||
| 'comma-spacing': [ | |||||
| 'warn', | |||||
| { | |||||
| before: false, | |||||
| after: true, | |||||
| }, | |||||
| ], | |||||
| 'comma-style': ['warn', 'last'], | |||||
| 'consistent-return': 'error', | |||||
| 'dot-notation': 'error', | |||||
| eqeqeq: 'error', | |||||
| indent: ['warn', 2], | |||||
| 'jsx-quotes': ['error', 'prefer-single'], | |||||
| 'no-catch-shadow': 'error', | |||||
| 'no-cond-assign': 'error', | |||||
| 'no-console': [ | |||||
| 'warn', | |||||
| { | |||||
| allow: [ | |||||
| 'error', | |||||
| 'warn', | |||||
| ], | |||||
| }, | |||||
| ], | |||||
| 'no-fallthrough': 'error', | |||||
| 'no-irregular-whitespace': 'error', | |||||
| 'no-mixed-spaces-and-tabs': 'warn', | |||||
| 'no-nested-ternary': 'warn', | |||||
| 'no-trailing-spaces': 'warn', | |||||
| 'no-undef': 'error', | |||||
| 'no-unreachable': 'error', | |||||
| 'no-unused-expressions': 'error', | |||||
| 'no-unused-vars': [ | |||||
| 'error', | |||||
| { | |||||
| vars: 'all', | |||||
| args: 'after-used', | |||||
| ignoreRestSiblings: true, | |||||
| }, | |||||
| ], | |||||
| 'object-curly-spacing': ['error', 'always'], | |||||
| 'padded-blocks': [ | |||||
| 'error', | |||||
| { | |||||
| classes: 'always', | |||||
| }, | |||||
| ], | |||||
| quotes: ['error', 'single'], | |||||
| semi: 'error', | |||||
| strict: 'off', | |||||
| 'valid-typeof': 'error', | |||||
| 'react/jsx-boolean-value': 'error', | |||||
| 'react/jsx-closing-bracket-location': ['error', 'line-aligned'], | |||||
| 'react/jsx-curly-spacing': 'error', | |||||
| 'react/jsx-equals-spacing': 'error', | |||||
| 'react/jsx-first-prop-new-line': ['error', 'multiline-multiprop'], | |||||
| 'react/jsx-indent': ['error', 2], | |||||
| 'react/jsx-no-bind': 'error', | |||||
| 'react/jsx-no-duplicate-props': 'error', | |||||
| 'react/jsx-no-undef': 'error', | |||||
| 'react/jsx-tag-spacing': 'error', | |||||
| 'react/jsx-uses-react': 'error', | |||||
| 'react/jsx-uses-vars': 'error', | |||||
| 'react/jsx-wrap-multilines': 'error', | |||||
| 'react/no-multi-comp': 'off', | |||||
| 'react/no-string-refs': 'error', | |||||
| 'react/prop-types': 'error', | |||||
| 'react/self-closing-comp': 'error', | |||||
| 'jsx-a11y/accessible-emoji': 'warn', | |||||
| 'jsx-a11y/alt-text': 'warn', | |||||
| 'jsx-a11y/anchor-has-content': 'warn', | |||||
| 'jsx-a11y/anchor-is-valid': [ | |||||
| 'warn', | |||||
| { | |||||
| components: [ | |||||
| 'Link', | |||||
| 'NavLink', | |||||
| ], | |||||
| specialLink: [ | |||||
| 'to', | |||||
| ], | |||||
| aspect: [ | |||||
| 'noHref', | |||||
| 'invalidHref', | |||||
| 'preferButton', | |||||
| ], | |||||
| }, | |||||
| ], | |||||
| 'jsx-a11y/aria-activedescendant-has-tabindex': 'warn', | |||||
| 'jsx-a11y/aria-props': 'warn', | |||||
| 'jsx-a11y/aria-proptypes': 'warn', | |||||
| 'jsx-a11y/aria-role': 'warn', | |||||
| 'jsx-a11y/aria-unsupported-elements': 'warn', | |||||
| 'jsx-a11y/heading-has-content': 'warn', | |||||
| 'jsx-a11y/html-has-lang': 'warn', | |||||
| 'jsx-a11y/iframe-has-title': 'warn', | |||||
| 'jsx-a11y/img-redundant-alt': 'warn', | |||||
| 'jsx-a11y/interactive-supports-focus': 'warn', | |||||
| 'jsx-a11y/label-has-for': 'off', | |||||
| 'jsx-a11y/mouse-events-have-key-events': 'warn', | |||||
| 'jsx-a11y/no-access-key': 'warn', | |||||
| 'jsx-a11y/no-distracting-elements': 'warn', | |||||
| 'jsx-a11y/no-noninteractive-element-interactions': [ | |||||
| 'warn', | |||||
| { | |||||
| handlers: [ | |||||
| 'onClick', | |||||
| ], | |||||
| }, | |||||
| ], | |||||
| 'jsx-a11y/no-onchange': 'warn', | |||||
| 'jsx-a11y/no-redundant-roles': 'warn', | |||||
| 'jsx-a11y/no-static-element-interactions': [ | |||||
| 'warn', | |||||
| { | |||||
| handlers: [ | |||||
| 'onClick', | |||||
| ], | |||||
| }, | |||||
| ], | |||||
| 'jsx-a11y/role-has-required-aria-props': 'warn', | |||||
| 'jsx-a11y/role-supports-aria-props': 'off', | |||||
| 'jsx-a11y/scope': 'warn', | |||||
| 'jsx-a11y/tabindex-no-positive': 'warn', | |||||
| 'import/extensions': [ | |||||
| 'error', | |||||
| 'always', | |||||
| { | |||||
| js: 'never', | |||||
| }, | |||||
| ], | |||||
| 'import/newline-after-import': 'error', | |||||
| 'import/no-extraneous-dependencies': [ | |||||
| 'error', | |||||
| { | |||||
| devDependencies: [ | |||||
| 'config/webpack/**', | |||||
| 'app/javascript/mastodon/test_setup.js', | |||||
| 'app/javascript/**/__tests__/**', | |||||
| ], | |||||
| }, | |||||
| ], | |||||
| 'import/no-unresolved': 'error', | |||||
| 'import/no-webpack-loader-syntax': 'error', | |||||
| 'promise/catch-or-return': 'error', | |||||
| }, | |||||
| }; | |||||
+ 0
- 176
.eslintrc.yml
View File
| @ -1,177 +0,0 @@ | |||||
| root: true | |||||
| env: | |||||
| browser: true | |||||
| node: true | |||||
| es6: true | |||||
| jest: true | |||||
| globals: | |||||
| ATTACHMENT_HOST: false | |||||
| parser: babel-eslint | |||||
| plugins: | |||||
| - react | |||||
| - jsx-a11y | |||||
| - import | |||||
| - promise | |||||
| parserOptions: | |||||
| sourceType: module | |||||
| ecmaFeatures: | |||||
| experimentalObjectRestSpread: true | |||||
| jsx: true | |||||
| ecmaVersion: 2018 | |||||
| settings: | |||||
| react: | |||||
| version: detect | |||||
| import/extensions: | |||||
| - .js | |||||
| import/ignore: | |||||
| - node_modules | |||||
| - \\.(css|scss|json)$ | |||||
| import/resolver: | |||||
| node: | |||||
| moduleDirectory: | |||||
| - node_modules | |||||
| - app/javascript | |||||
| rules: | |||||
| brace-style: warn | |||||
| comma-dangle: | |||||
| - error | |||||
| - always-multiline | |||||
| comma-spacing: | |||||
| - warn | |||||
| - before: false | |||||
| after: true | |||||
| comma-style: | |||||
| - warn | |||||
| - last | |||||
| consistent-return: error | |||||
| dot-notation: error | |||||
| eqeqeq: error | |||||
| indent: | |||||
| - warn | |||||
| - 2 | |||||
| jsx-quotes: | |||||
| - error | |||||
| - prefer-single | |||||
| no-catch-shadow: error | |||||
| no-cond-assign: error | |||||
| no-console: | |||||
| - warn | |||||
| - allow: | |||||
| - error | |||||
| - warn | |||||
| no-fallthrough: error | |||||
| no-irregular-whitespace: error | |||||
| no-mixed-spaces-and-tabs: warn | |||||
| no-nested-ternary: warn | |||||
| no-trailing-spaces: warn | |||||
| no-undef: error | |||||
| no-unreachable: error | |||||
| no-unused-expressions: error | |||||
| no-unused-vars: | |||||
| - error | |||||
| - vars: all | |||||
| args: after-used | |||||
| ignoreRestSiblings: true | |||||
| object-curly-spacing: | |||||
| - error | |||||
| - always | |||||
| padded-blocks: | |||||
| - error | |||||
| - classes: always | |||||
| quotes: | |||||
| - error | |||||
| - single | |||||
| semi: error | |||||
| strict: off | |||||
| valid-typeof: error | |||||
| react/jsx-boolean-value: error | |||||
| react/jsx-closing-bracket-location: | |||||
| - error | |||||
| - line-aligned | |||||
| react/jsx-curly-spacing: error | |||||
| react/jsx-equals-spacing: error | |||||
| react/jsx-first-prop-new-line: | |||||
| - error | |||||
| - multiline-multiprop | |||||
| react/jsx-indent: | |||||
| - error | |||||
| - 2 | |||||
| react/jsx-no-bind: error | |||||
| react/jsx-no-duplicate-props: error | |||||
| react/jsx-no-undef: error | |||||
| react/jsx-tag-spacing: error | |||||
| react/jsx-uses-react: error | |||||
| react/jsx-uses-vars: error | |||||
| react/jsx-wrap-multilines: error | |||||
| react/no-multi-comp: off | |||||
| react/no-string-refs: error | |||||
| react/prop-types: error | |||||
| react/self-closing-comp: error | |||||
| jsx-a11y/accessible-emoji: warn | |||||
| jsx-a11y/alt-text: warn | |||||
| jsx-a11y/anchor-has-content: warn | |||||
| jsx-a11y/anchor-is-valid: | |||||
| - warn | |||||
| - components: | |||||
| - Link | |||||
| - NavLink | |||||
| specialLink: | |||||
| - to | |||||
| aspect: | |||||
| - noHref | |||||
| - invalidHref | |||||
| - preferButton | |||||
| jsx-a11y/aria-activedescendant-has-tabindex: warn | |||||
| jsx-a11y/aria-props: warn | |||||
| jsx-a11y/aria-proptypes: warn | |||||
| jsx-a11y/aria-role: warn | |||||
| jsx-a11y/aria-unsupported-elements: warn | |||||
| jsx-a11y/heading-has-content: warn | |||||
| jsx-a11y/html-has-lang: warn | |||||
| jsx-a11y/iframe-has-title: warn | |||||
| jsx-a11y/img-redundant-alt: warn | |||||
| jsx-a11y/interactive-supports-focus: warn | |||||
| jsx-a11y/label-has-for: off | |||||
| jsx-a11y/mouse-events-have-key-events: warn | |||||
| jsx-a11y/no-access-key: warn | |||||
| jsx-a11y/no-distracting-elements: warn | |||||
| jsx-a11y/no-noninteractive-element-interactions: | |||||
| - warn | |||||
| - handlers: | |||||
| - onClick | |||||
| jsx-a11y/no-onchange: warn | |||||
| jsx-a11y/no-redundant-roles: warn | |||||
| jsx-a11y/no-static-element-interactions: | |||||
| - warn | |||||
| - handlers: | |||||
| - onClick | |||||
| jsx-a11y/role-has-required-aria-props: warn | |||||
| jsx-a11y/role-supports-aria-props: off | |||||
| jsx-a11y/scope: warn | |||||
| jsx-a11y/tabindex-no-positive: warn | |||||
| import/extensions: | |||||
| - error | |||||
| - always | |||||
| - js: never | |||||
| import/newline-after-import: error | |||||
| import/no-extraneous-dependencies: | |||||
| - error | |||||
| - devDependencies: | |||||
| - "config/webpack/**" | |||||
| - "app/javascript/mastodon/test_setup.js" | |||||
| - "app/javascript/**/__tests__/**" | |||||
| import/no-unresolved: error | |||||
| import/no-webpack-loader-syntax: error | |||||
| promise/catch-or-return: error | |||||
+ 53
- 36
AUTHORS.md
View File
+ 105
- 0
CHANGELOG.md
View File
+ 3
- 3
Gemfile
View File
+ 13
- 13
Gemfile.lock
View File
+ 3
- 8
app/controllers/admin/domain_blocks_controller.rb
View File
+ 1
- 5
app/controllers/admin/followers_controller.rb
View File
+ 14
- 13
app/controllers/admin/instances_controller.rb
View File
+ 1
- 1
app/controllers/admin/statuses_controller.rb
View File
+ 1
- 1
app/controllers/api/v1/accounts_controller.rb
View File
+ 3
- 1
app/controllers/api/v1/custom_emojis_controller.rb
View File
+ 77
- 0
app/controllers/api/v1/scheduled_statuses_controller.rb
View File
| @ -0,0 +1,77 @@ | |||||
| # frozen_string_literal: true | |||||
| class Api::V1::ScheduledStatusesController < Api::BaseController | |||||
| include Authorization | |||||
| before_action -> { doorkeeper_authorize! :read, :'read:statuses' }, except: [:update, :destroy] | |||||
| before_action -> { doorkeeper_authorize! :write, :'write:statuses' }, only: [:update, :destroy] | |||||
| before_action :set_statuses, only: :index | |||||
| before_action :set_status, except: :index | |||||
| after_action :insert_pagination_headers, only: :index | |||||
| def index | |||||
| render json: @statuses, each_serializer: REST::ScheduledStatusSerializer | |||||
| end | |||||
| def show | |||||
| render json: @status, serializer: REST::ScheduledStatusSerializer | |||||
| end | |||||
| def update | |||||
| @status.update!(scheduled_status_params) | |||||
| render json: @status, serializer: REST::ScheduledStatusSerializer | |||||
| end | |||||
| def destroy | |||||
| @status.destroy! | |||||
| render_empty | |||||
| end | |||||
| private | |||||
| def set_statuses | |||||
| @statuses = current_account.scheduled_statuses.paginate_by_id(limit_param(DEFAULT_STATUSES_LIMIT), params_slice(:max_id, :since_id, :min_id)) | |||||
| end | |||||
| def set_status | |||||
| @status = current_account.scheduled_statuses.find(params[:id]) | |||||
| end | |||||
| def scheduled_status_params | |||||
| params.permit(:scheduled_at) | |||||
| end | |||||
| def pagination_params(core_params) | |||||
| params.slice(:limit).permit(:limit).merge(core_params) | |||||
| end | |||||
| def insert_pagination_headers | |||||
| set_pagination_headers(next_path, prev_path) | |||||
| end | |||||
| def next_path | |||||
| if records_continue? | |||||
| api_v1_scheduled_statuses_url pagination_params(max_id: pagination_max_id) | |||||
| end | |||||
| end | |||||
| def prev_path | |||||
| unless @statuses.empty? | |||||
| api_v1_scheduled_statuses_url pagination_params(min_id: pagination_since_id) | |||||
| end | |||||
| end | |||||
| def records_continue? | |||||
| @statuses.size == limit_param(DEFAULT_STATUSES_LIMIT) | |||||
| end | |||||
| def pagination_max_id | |||||
| @statuses.last.id | |||||
| end | |||||
| def pagination_since_id | |||||
| @statuses.first.id | |||||
| end | |||||
| end | |||||
+ 5
- 4
app/controllers/api/v1/statuses_controller.rb
View File
+ 31
- 14
app/controllers/concerns/signature_verification.rb
View File
+ 5
- 0
app/controllers/remote_interaction_controller.rb
View File
+ 2
- 1
app/helpers/admin/filter_helper.rb
View File
+ 2
- 2
app/javascript/flavours/glitch/components/account.js
View File
+ 4
- 0
app/javascript/flavours/glitch/components/media_gallery.js
View File
+ 6
- 0
app/javascript/flavours/glitch/features/status/components/card.js
View File
+ 18
- 10
app/javascript/flavours/glitch/packs/public.js
View File
+ 14
- 0
app/javascript/flavours/glitch/styles/admin.scss
View File
+ 9
- 0
app/javascript/flavours/glitch/styles/components/status.scss
View File
+ 1
- 0
app/javascript/flavours/glitch/styles/dashboard.scss
View File
+ 2
- 2
app/javascript/mastodon/components/account.js
View File
+ 4
- 0
app/javascript/mastodon/components/media_gallery.js
View File
+ 8
- 1
app/javascript/mastodon/components/status_action_bar.js
View File
+ 7
- 1
app/javascript/mastodon/features/account/components/action_bar.js
View File
+ 21
- 2
app/javascript/mastodon/features/getting_started/index.js
View File
+ 8
- 1
app/javascript/mastodon/features/status/components/action_bar.js
View File
+ 6
- 0
app/javascript/mastodon/features/status/components/card.js
View File
+ 1
- 0
app/javascript/mastodon/initial_state.js
View File
+ 2
- 0
app/javascript/mastodon/locales/ar.json
View File
+ 2
- 0
app/javascript/mastodon/locales/ast.json
View File
+ 2
- 0
app/javascript/mastodon/locales/bg.json
View File
+ 25
- 23
app/javascript/mastodon/locales/ca.json
View File
+ 4
- 2
app/javascript/mastodon/locales/co.json
View File
+ 5
- 3
app/javascript/mastodon/locales/cs.json
View File
+ 2
- 0
app/javascript/mastodon/locales/cy.json
View File
+ 6
- 4
app/javascript/mastodon/locales/da.json
View File
+ 4
- 2
app/javascript/mastodon/locales/de.json
View File
+ 20
- 0
app/javascript/mastodon/locales/defaultMessages.json
View File
+ 4
- 2
app/javascript/mastodon/locales/el.json
View File
+ 2
- 0
app/javascript/mastodon/locales/en.json
View File
+ 2
- 0
app/javascript/mastodon/locales/eo.json
View File
+ 2
- 0
app/javascript/mastodon/locales/es.json
View File
+ 26
- 24
app/javascript/mastodon/locales/eu.json
View File
+ 2
- 0
app/javascript/mastodon/locales/fa.json
View File
+ 2
- 0
app/javascript/mastodon/locales/fi.json
View File
+ 3
- 1
app/javascript/mastodon/locales/fr.json
View File
+ 3
- 1
app/javascript/mastodon/locales/gl.json
View File
+ 2
- 0
app/javascript/mastodon/locales/he.json
View File
+ 2
- 0
app/javascript/mastodon/locales/hr.json
View File
+ 2
- 0
app/javascript/mastodon/locales/hu.json
View File
+ 2
- 0
app/javascript/mastodon/locales/hy.json
View File
+ 2
- 0
app/javascript/mastodon/locales/id.json
View File
+ 2
- 0
app/javascript/mastodon/locales/io.json
View File
+ 26
- 24
app/javascript/mastodon/locales/it.json
View File
+ 2
- 0
app/javascript/mastodon/locales/ja.json
View File
+ 2
- 0
app/javascript/mastodon/locales/ka.json
View File
+ 4
- 2
app/javascript/mastodon/locales/ko.json
View File
+ 358
- 0
app/javascript/mastodon/locales/lv.json
View File
| @ -0,0 +1,358 @@ | |||||
| { | |||||
| "account.add_or_remove_from_list": "Add or Remove from lists", | |||||
| "account.badges.bot": "Bot", | |||||
| "account.block": "Block @{name}", | |||||
| "account.block_domain": "Hide everything from {domain}", | |||||
| "account.blocked": "Blocked", | |||||
| "account.direct": "Direct message @{name}", | |||||
| "account.disclaimer_full": "Information below may reflect the user's profile incompletely.", | |||||
| "account.domain_blocked": "Domain hidden", | |||||
| "account.edit_profile": "Edit profile", | |||||
| "account.endorse": "Feature on profile", | |||||
| "account.follow": "Follow", | |||||
| "account.followers": "Followers", | |||||
| "account.followers.empty": "No one follows this user yet.", | |||||
| "account.follows": "Follows", | |||||
| "account.follows.empty": "This user doesn't follow anyone yet.", | |||||
| "account.follows_you": "Follows you", | |||||
| "account.hide_reblogs": "Hide boosts from @{name}", | |||||
| "account.link_verified_on": "Ownership of this link was checked on {date}", | |||||
| "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.", | |||||
| "account.media": "Media", | |||||
| "account.mention": "Mention @{name}", | |||||
| "account.moved_to": "{name} has moved to:", | |||||
| "account.mute": "Mute @{name}", | |||||
| "account.mute_notifications": "Mute notifications from @{name}", | |||||
| "account.muted": "Muted", | |||||
| "account.posts": "Toots", | |||||
| "account.posts_with_replies": "Toots and replies", | |||||
| "account.report": "Report @{name}", | |||||
| "account.requested": "Awaiting approval. Click to cancel follow request", | |||||
| "account.share": "Share @{name}'s profile", | |||||
| "account.show_reblogs": "Show boosts from @{name}", | |||||
| "account.unblock": "Unblock @{name}", | |||||
| "account.unblock_domain": "Unhide {domain}", | |||||
| "account.unendorse": "Don't feature on profile", | |||||
| "account.unfollow": "Unfollow", | |||||
| "account.unmute": "Unmute @{name}", | |||||
| "account.unmute_notifications": "Unmute notifications from @{name}", | |||||
| "account.view_full_profile": "View full profile", | |||||
| "alert.unexpected.message": "An unexpected error occurred.", | |||||
| "alert.unexpected.title": "Oops!", | |||||
| "boost_modal.combo": "You can press {combo} to skip this next time", | |||||
| "bundle_column_error.body": "Something went wrong while loading this component.", | |||||
| "bundle_column_error.retry": "Try again", | |||||
| "bundle_column_error.title": "Network error", | |||||
| "bundle_modal_error.close": "Close", | |||||
| "bundle_modal_error.message": "Something went wrong while loading this component.", | |||||
| "bundle_modal_error.retry": "Try again", | |||||
| "column.blocks": "Blocked users", | |||||
| "column.community": "Local timeline", | |||||
| "column.direct": "Direct messages", | |||||
| "column.domain_blocks": "Hidden domains", | |||||
| "column.favourites": "Favourites", | |||||
| "column.follow_requests": "Follow requests", | |||||
| "column.home": "Home", | |||||
| "column.lists": "Lists", | |||||
| "column.mutes": "Muted users", | |||||
| "column.notifications": "Notifications", | |||||
| "column.pins": "Pinned toot", | |||||
| "column.public": "Federated timeline", | |||||
| "column_back_button.label": "Back", | |||||
| "column_header.hide_settings": "Hide settings", | |||||
| "column_header.moveLeft_settings": "Move column to the left", | |||||
| "column_header.moveRight_settings": "Move column to the right", | |||||
| "column_header.pin": "Pin", | |||||
| "column_header.show_settings": "Show settings", | |||||
| "column_header.unpin": "Unpin", | |||||
| "column_subheading.settings": "Settings", | |||||
| "community.column_settings.media_only": "Media Only", | |||||
| "compose_form.direct_message_warning": "This toot will only be sent to all the mentioned users.", | |||||
| "compose_form.direct_message_warning_learn_more": "Learn more", | |||||
| "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.", | |||||
| "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.", | |||||
| "compose_form.lock_disclaimer.lock": "locked", | |||||
| "compose_form.placeholder": "What is on your mind?", | |||||
| "compose_form.publish": "Toot", | |||||
| "compose_form.publish_loud": "{publish}!", | |||||
| "compose_form.sensitive.marked": "Media is marked as sensitive", | |||||
| "compose_form.sensitive.unmarked": "Media is not marked as sensitive", | |||||
| "compose_form.spoiler.marked": "Text is hidden behind warning", | |||||
| "compose_form.spoiler.unmarked": "Text is not hidden", | |||||
| "compose_form.spoiler_placeholder": "Write your warning here", | |||||
| "confirmation_modal.cancel": "Cancel", | |||||
| "confirmations.block.confirm": "Block", | |||||
| "confirmations.block.message": "Are you sure you want to block {name}?", | |||||
| "confirmations.delete.confirm": "Delete", | |||||
| "confirmations.delete.message": "Are you sure you want to delete this status?", | |||||
| "confirmations.delete_list.confirm": "Delete", | |||||
| "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?", | |||||
| "confirmations.domain_block.confirm": "Hide entire domain", | |||||
| "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.", | |||||
| "confirmations.mute.confirm": "Mute", | |||||
| "confirmations.mute.message": "Are you sure you want to mute {name}?", | |||||
| "confirmations.redraft.confirm": "Delete & redraft", | |||||
| "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.", | |||||
| "confirmations.reply.confirm": "Reply", | |||||
| "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?", | |||||
| "confirmations.unfollow.confirm": "Unfollow", | |||||
| "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?", | |||||
| "embed.instructions": "Embed this status on your website by copying the code below.", | |||||
| "embed.preview": "Here is what it will look like:", | |||||
| "emoji_button.activity": "Activity", | |||||
| "emoji_button.custom": "Custom", | |||||
| "emoji_button.flags": "Flags", | |||||
| "emoji_button.food": "Food & Drink", | |||||
| "emoji_button.label": "Insert emoji", | |||||
| "emoji_button.nature": "Nature", | |||||
| "emoji_button.not_found": "No emojos!! (╯°□°）╯︵ ┻━┻", | |||||
| "emoji_button.objects": "Objects", | |||||
| "emoji_button.people": "People", | |||||
| "emoji_button.recent": "Frequently used", | |||||
| "emoji_button.search": "Search...", | |||||
| "emoji_button.search_results": "Search results", | |||||
| "emoji_button.symbols": "Symbols", | |||||
| "emoji_button.travel": "Travel & Places", | |||||
| "empty_column.account_timeline": "No toots here!", | |||||
| "empty_column.blocks": "You haven't blocked any users yet.", | |||||
| "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!", | |||||
| "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.", | |||||
| "empty_column.domain_blocks": "There are no hidden domains yet.", | |||||
| "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.", | |||||
| "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.", | |||||
| "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.", | |||||
| "empty_column.hashtag": "There is nothing in this hashtag yet.", | |||||
| "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.", | |||||
| "empty_column.home.public_timeline": "the public timeline", | |||||
| "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.", | |||||
| "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.", | |||||
| "empty_column.mutes": "You haven't muted any users yet.", | |||||
| "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.", | |||||
| "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other instances to fill it up", | |||||
| "follow_request.authorize": "Authorize", | |||||
| "follow_request.reject": "Reject", | |||||
| "getting_started.developers": "Developers", | |||||
| "getting_started.directory": "Profile directory", | |||||
| "getting_started.documentation": "Documentation", | |||||
| "getting_started.heading": "Getting started", | |||||
| "getting_started.invite": "Invite people", | |||||
| "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.", | |||||
| "getting_started.security": "Security", | |||||
| "getting_started.terms": "Terms of service", | |||||
| "hashtag.column_header.tag_mode.all": "and {additional}", | |||||
| "hashtag.column_header.tag_mode.any": "or {additional}", | |||||
| "hashtag.column_header.tag_mode.none": "without {additional}", | |||||
| "hashtag.column_settings.tag_mode.all": "All of these", | |||||
| "hashtag.column_settings.tag_mode.any": "Any of these", | |||||
| "hashtag.column_settings.tag_mode.none": "None of these", | |||||
| "hashtag.column_settings.tag_toggle": "Include additional tags in this column", | |||||
| "home.column_settings.basic": "Basic", | |||||
| "home.column_settings.show_reblogs": "Show boosts", | |||||
| "home.column_settings.show_replies": "Show replies", | |||||
| "introduction.federation.action": "Next", | |||||
| "introduction.federation.federated.headline": "Federated", | |||||
| "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.", | |||||
| "introduction.federation.home.headline": "Home", | |||||
| "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!", | |||||
| "introduction.federation.local.headline": "Local", | |||||
| "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.", | |||||
| "introduction.interactions.action": "Finish tutorial!", | |||||
| "introduction.interactions.favourite.headline": "Favourite", | |||||
| "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.", | |||||
| "introduction.interactions.reblog.headline": "Boost", | |||||
| "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.", | |||||
| "introduction.interactions.reply.headline": "Reply", | |||||
| "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.", | |||||
| "introduction.welcome.action": "Let's go!", | |||||
| "introduction.welcome.headline": "First steps", | |||||
| "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name.", | |||||
| "keyboard_shortcuts.back": "to navigate back", | |||||
| "keyboard_shortcuts.blocked": "to open blocked users list", | |||||
| "keyboard_shortcuts.boost": "to boost", | |||||
| "keyboard_shortcuts.column": "to focus a status in one of the columns", | |||||
| "keyboard_shortcuts.compose": "to focus the compose textarea", | |||||
| "keyboard_shortcuts.description": "Description", | |||||
| "keyboard_shortcuts.direct": "to open direct messages column", | |||||
| "keyboard_shortcuts.down": "to move down in the list", | |||||
| "keyboard_shortcuts.enter": "to open status", | |||||
| "keyboard_shortcuts.favourite": "to favourite", | |||||
| "keyboard_shortcuts.favourites": "to open favourites list", | |||||
| "keyboard_shortcuts.federated": "to open federated timeline", | |||||
| "keyboard_shortcuts.heading": "Keyboard Shortcuts", | |||||
| "keyboard_shortcuts.home": "to open home timeline", | |||||
| "keyboard_shortcuts.hotkey": "Hotkey", | |||||
| "keyboard_shortcuts.legend": "to display this legend", | |||||
| "keyboard_shortcuts.local": "to open local timeline", | |||||
| "keyboard_shortcuts.mention": "to mention author", | |||||
| "keyboard_shortcuts.muted": "to open muted users list", | |||||
| "keyboard_shortcuts.my_profile": "to open your profile", | |||||
| "keyboard_shortcuts.notifications": "to open notifications column", | |||||
| "keyboard_shortcuts.pinned": "to open pinned toots list", | |||||
| "keyboard_shortcuts.profile": "to open author's profile", | |||||
| "keyboard_shortcuts.reply": "to reply", | |||||
| "keyboard_shortcuts.requests": "to open follow requests list", | |||||
| "keyboard_shortcuts.search": "to focus search", | |||||
| "keyboard_shortcuts.start": "to open \"get started\" column", | |||||
| "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW", | |||||
| "keyboard_shortcuts.toot": "to start a brand new toot", | |||||
| "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search", | |||||
| "keyboard_shortcuts.up": "to move up in the list", | |||||
| "lightbox.close": "Close", | |||||
| "lightbox.next": "Next", | |||||
| "lightbox.previous": "Previous", | |||||
| "lists.account.add": "Add to list", | |||||
| "lists.account.remove": "Remove from list", | |||||
| "lists.delete": "Delete list", | |||||
| "lists.edit": "Edit list", | |||||
| "lists.new.create": "Add list", | |||||
| "lists.new.title_placeholder": "New list title", | |||||
| "lists.search": "Search among people you follow", | |||||
| "lists.subheading": "Your lists", | |||||
| "loading_indicator.label": "Loading...", | |||||
| "media_gallery.toggle_visible": "Toggle visibility", | |||||
| "missing_indicator.label": "Not found", | |||||
| "missing_indicator.sublabel": "This resource could not be found", | |||||
| "mute_modal.hide_notifications": "Hide notifications from this user?", | |||||
| "navigation_bar.apps": "Mobile apps", | |||||
| "navigation_bar.blocks": "Blocked users", | |||||
| "navigation_bar.community_timeline": "Local timeline", | |||||
| "navigation_bar.compose": "Compose new toot", | |||||
| "navigation_bar.direct": "Direct messages", | |||||
| "navigation_bar.discover": "Discover", | |||||
| "navigation_bar.domain_blocks": "Hidden domains", | |||||
| "navigation_bar.edit_profile": "Edit profile", | |||||
| "navigation_bar.favourites": "Favourites", | |||||
| "navigation_bar.filters": "Muted words", | |||||
| "navigation_bar.follow_requests": "Follow requests", | |||||
| "navigation_bar.info": "About this instance", | |||||
| "navigation_bar.keyboard_shortcuts": "Hotkeys", | |||||
| "navigation_bar.lists": "Lists", | |||||
| "navigation_bar.logout": "Logout", | |||||
| "navigation_bar.mutes": "Muted users", | |||||
| "navigation_bar.personal": "Personal", | |||||
| "navigation_bar.pins": "Pinned toots", | |||||
| "navigation_bar.preferences": "Preferences", | |||||
| "navigation_bar.public_timeline": "Federated timeline", | |||||
| "navigation_bar.security": "Security", | |||||
| "notification.favourite": "{name} favourited your status", | |||||
| "notification.follow": "{name} followed you", | |||||
| "notification.mention": "{name} mentioned you", | |||||
| "notification.reblog": "{name} boosted your status", | |||||
| "notifications.clear": "Clear notifications", | |||||
| "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?", | |||||
| "notifications.column_settings.alert": "Desktop notifications", | |||||
| "notifications.column_settings.favourite": "Favourites:", | |||||
| "notifications.column_settings.filter_bar.advanced": "Display all categories", | |||||
| "notifications.column_settings.filter_bar.category": "Quick filter bar", | |||||
| "notifications.column_settings.filter_bar.show": "Show", | |||||
| "notifications.column_settings.follow": "New followers:", | |||||
| "notifications.column_settings.mention": "Mentions:", | |||||
| "notifications.column_settings.push": "Push notifications", | |||||
| "notifications.column_settings.reblog": "Boosts:", | |||||
| "notifications.column_settings.show": "Show in column", | |||||
| "notifications.column_settings.sound": "Play sound", | |||||
| "notifications.filter.all": "All", | |||||
| "notifications.filter.boosts": "Boosts", | |||||
| "notifications.filter.favourites": "Favourites", | |||||
| "notifications.filter.follows": "Follows", | |||||
| "notifications.filter.mentions": "Mentions", | |||||
| "notifications.group": "{count} notifications", | |||||
| "privacy.change": "Adjust status privacy", | |||||
| "privacy.direct.long": "Post to mentioned users only", | |||||
| "privacy.direct.short": "Direct", | |||||
| "privacy.private.long": "Post to followers only", | |||||
| "privacy.private.short": "Followers-only", | |||||
| "privacy.public.long": "Post to public timelines", | |||||
| "privacy.public.short": "Public", | |||||
| "privacy.unlisted.long": "Do not show in public timelines", | |||||
| "privacy.unlisted.short": "Unlisted", | |||||
| "regeneration_indicator.label": "Loading…", | |||||
| "regeneration_indicator.sublabel": "Your home feed is being prepared!", | |||||
| "relative_time.days": "{number}d", | |||||
| "relative_time.hours": "{number}h", | |||||
| "relative_time.just_now": "now", | |||||
| "relative_time.minutes": "{number}m", | |||||
| "relative_time.seconds": "{number}s", | |||||
| "reply_indicator.cancel": "Cancel", | |||||
| "report.forward": "Forward to {target}", | |||||
| "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?", | |||||
| "report.hint": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:", | |||||
| "report.placeholder": "Additional comments", | |||||
| "report.submit": "Submit", | |||||
| "report.target": "Report {target}", | |||||
| "search.placeholder": "Search", | |||||
| "search_popout.search_format": "Advanced search format", | |||||
| "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.", | |||||
| "search_popout.tips.hashtag": "hashtag", | |||||
| "search_popout.tips.status": "status", | |||||
| "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags", | |||||
| "search_popout.tips.user": "user", | |||||
| "search_results.accounts": "People", | |||||
| "search_results.hashtags": "Hashtags", | |||||
| "search_results.statuses": "Toots", | |||||
| "search_results.total": "{count, number} {count, plural, one {result} other {results}}", | |||||
| "standalone.public_title": "A look inside...", | |||||
| "status.admin_account": "Open moderation interface for @{name}", | |||||
| "status.admin_status": "Open this status in the moderation interface", | |||||
| "status.block": "Block @{name}", | |||||
| "status.cancel_reblog_private": "Unboost", | |||||
| "status.cannot_reblog": "This post cannot be boosted", | |||||
| "status.delete": "Delete", | |||||
| "status.detailed_status": "Detailed conversation view", | |||||
| "status.direct": "Direct message @{name}", | |||||
| "status.embed": "Embed", | |||||
| "status.favourite": "Favourite", | |||||
| "status.filtered": "Filtered", | |||||
| "status.load_more": "Load more", | |||||
| "status.media_hidden": "Media hidden", | |||||
| "status.mention": "Mention @{name}", | |||||
| "status.more": "More", | |||||
| "status.mute": "Mute @{name}", | |||||
| "status.mute_conversation": "Mute conversation", | |||||
| "status.open": "Expand this status", | |||||
| "status.pin": "Pin on profile", | |||||
| "status.pinned": "Pinned toot", | |||||
| "status.read_more": "Read more", | |||||
| "status.reblog": "Boost", | |||||
| "status.reblog_private": "Boost to original audience", | |||||
| "status.reblogged_by": "{name} boosted", | |||||
| "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.", | |||||
| "status.redraft": "Delete & re-draft", | |||||
| "status.reply": "Reply", | |||||
| "status.replyAll": "Reply to thread", | |||||
| "status.report": "Report @{name}", | |||||
| "status.sensitive_toggle": "Click to view", | |||||
| "status.sensitive_warning": "Sensitive content", | |||||
| "status.share": "Share", | |||||
| "status.show_less": "Show less", | |||||
| "status.show_less_all": "Show less for all", | |||||
| "status.show_more": "Show more", | |||||
| "status.show_more_all": "Show more for all", | |||||
| "status.show_thread": "Show thread", | |||||
| "status.unmute_conversation": "Unmute conversation", | |||||
| "status.unpin": "Unpin from profile", | |||||
| "suggestions.dismiss": "Dismiss suggestion", | |||||
| "suggestions.header": "You might be interested in…", | |||||
| "tabs_bar.federated_timeline": "Federated", | |||||
| "tabs_bar.home": "Home", | |||||
| "tabs_bar.local_timeline": "Local", | |||||
| "tabs_bar.notifications": "Notifications", | |||||
| "tabs_bar.search": "Search", | |||||
| "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", | |||||
| "ui.beforeunload": "Your draft will be lost if you leave Mastodon.", | |||||
| "upload_area.title": "Drag & drop to upload", | |||||
| "upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)", | |||||
| "upload_form.description": "Describe for the visually impaired", | |||||
| "upload_form.focus": "Crop", | |||||
| "upload_form.undo": "Delete", | |||||
| "upload_progress.label": "Uploading...", | |||||
| "video.close": "Close video", | |||||
| "video.exit_fullscreen": "Exit full screen", | |||||
| "video.expand": "Expand video", | |||||
| "video.fullscreen": "Full screen", | |||||
| "video.hide": "Hide video", | |||||
| "video.mute": "Mute sound", | |||||
| "video.pause": "Pause", | |||||
| "video.play": "Play", | |||||
| "video.unmute": "Unmute sound" | |||||
| } | |||||
+ 2
- 0
app/javascript/mastodon/locales/ms.json
View File
+ 4
- 2
app/javascript/mastodon/locales/nl.json
View File
+ 2
- 0
app/javascript/mastodon/locales/no.json
View File
+ 6
- 4
app/javascript/mastodon/locales/oc.json
View File
+ 3
- 1
app/javascript/mastodon/locales/pl.json
View File
+ 25
- 23
app/javascript/mastodon/locales/pt-BR.json
View File
+ 2
- 0
app/javascript/mastodon/locales/pt.json
View File
+ 87
- 85
app/javascript/mastodon/locales/ro.json
View File
+ 2
- 0
app/javascript/mastodon/locales/ru.json
View File
+ 10
- 8
app/javascript/mastodon/locales/sk.json
View File
+ 2
- 0
app/javascript/mastodon/locales/sl.json
View File
+ 2
- 0
app/javascript/mastodon/locales/sr-Latn.json
View File
+ 2
- 0
app/javascript/mastodon/locales/sr.json
View File
+ 2
- 0
app/javascript/mastodon/locales/sv.json
View File
+ 2
- 0
app/javascript/mastodon/locales/ta.json
View File
+ 36
- 34
app/javascript/mastodon/locales/te.json
View File
+ 2
- 0
app/javascript/mastodon/locales/th.json
View File
+ 2
- 0
app/javascript/mastodon/locales/tr.json
View File
+ 2
- 0
app/javascript/mastodon/locales/uk.json
View File
+ 2
- 0
app/javascript/mastodon/locales/whitelist_lv.json
View File
| @ -0,0 +1,2 @@ | |||||
| [ | |||||
| ] | |||||
+ 2
- 0
app/javascript/mastodon/locales/zh-CN.json
View File
+ 2
- 0
app/javascript/mastodon/locales/zh-HK.json
View File
+ 2
- 0
app/javascript/mastodon/locales/zh-TW.json
View File
+ 18
- 10
app/javascript/packs/public.js
View File
+ 14
- 0
app/javascript/styles/mastodon/admin.scss
View File
+ 10
- 0
app/javascript/styles/mastodon/components.scss
View File
+ 1
- 0
app/javascript/styles/mastodon/dashboard.scss
View File
+ 2
- 0
app/lib/activitypub/activity.rb
View File
+ 1
- 1
app/lib/activitypub/activity/follow.rb
View File
+ 43
- 0
app/lib/activitypub/activity/move.rb
View File
| @ -0,0 +1,43 @@ | |||||
| # frozen_string_literal: true | |||||
| class ActivityPub::Activity::Move < ActivityPub::Activity | |||||
| PROCESSING_COOLDOWN = 7.days.seconds | |||||
| def perform | |||||
| return if origin_account.uri != object_uri || processed? | |||||
| mark_as_processing! | |||||
| target_account = ActivityPub::FetchRemoteAccountService.new.call(target_uri) | |||||
| return if target_account.nil? || !target_account.also_known_as.include?(origin_account.uri) | |||||
| # In case for some reason we didn't have a redirect for the profile already, set it | |||||
| origin_account.update(moved_to_account: target_account) if origin_account.moved_to_account_id.nil? | |||||
| # Initiate a re-follow for each follower | |||||
| origin_account.followers.local.select(:id).find_in_batches do |follower_accounts| | |||||
| UnfollowFollowWorker.push_bulk(follower_accounts.map(&:id)) do |follower_account_id| | |||||
| [follower_account_id, origin_account.id, target_account.id] | |||||
| end | |||||
| end | |||||
| end | |||||
| private | |||||
| def origin_account | |||||
| @account | |||||
| end | |||||
| def target_uri | |||||
| value_or_id(@json['target']) | |||||
| end | |||||
| def processed? | |||||
| redis.exists("move_in_progress:#{@account.id}") | |||||
| end | |||||
| def mark_as_processing! | |||||
| redis.setex("move_in_progress:#{@account.id}", PROCESSING_COOLDOWN, true) | |||||
| end | |||||
| end | |||||