1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-15 07:09:03 +09:00
Commit Graph

12869 Commits

Author SHA1 Message Date
Eugen Rochko
6c7ac1b48f [Glitch] Add ability to choose media thumbnail in web UI
Port 06fc6a9cd4 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-07 15:58:49 +02:00
ThibG
8b17d47e12 [Glitch] Fix hashtag column options styling
Port a783bdf4ad to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-07 15:58:49 +02:00
Thibaut Girka
e9ad99bc93 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Not really a conflict, just some glitch-soc-specific dependency
  too close to an upstream-updated one.
2020-07-07 15:58:45 +02:00
Eugen Rochko
6e25574ce5
Fix media attachments enumeration (#14254)
* Fix media attachment enumeration

* Switch media_attachments id to snowflake ids

Co-authored-by: Thibaut Girka <thib@sitedethib.com>
2020-07-07 15:26:51 +02:00
Eugen Rochko
81a3db1564
Change rate limits for various paths (#14253)
- Rate limit login attempts by target account
- Rate limit password resets and e-mail re-confirmations by target account
- Rate limit sign-up/login attempts, password resets, and e-mail re-confirmations by IP like before
2020-07-07 15:26:39 +02:00
Eugen Rochko
844870273f
Fix other sessions not being logged out on password change (#14252)
While OAuth tokens were immediately revoked, accessing the home
controller immediately generated new OAuth tokens and "revived"
the session due to a combination of using remember_me tokens and
overwriting the `authenticate_user!` method
2020-07-07 15:26:31 +02:00
Sasha Sorokin
1c903c7ad6
Fix account note border radius (#14251) 2020-07-07 13:46:21 +02:00
Eugen Rochko
06fc6a9cd4
Add ability to choose media thumbnail in web UI (#14244) 2020-07-07 12:14:19 +02:00
Eugen Rochko
ed04697510
Change User-Agent of link preview fetching service to include "Bot" (#14248)
This forces Twitter to render OpenGraph tags in the response
2020-07-07 10:55:18 +02:00
dependabot[bot]
c7c07abe44
Bump babel-jest from 25.2.4 to 26.1.0 (#14216)
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 25.2.4 to 26.1.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v26.1.0/packages/babel-jest)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-07 09:23:29 +09:00
ThibG
e96e9cae62
Add test for removing endorsed accounts on account deletion/suspension (#14241) 2020-07-07 02:01:13 +02:00
ThibG
a783bdf4ad
Fix hashtag column options styling (#14247)
* Enable nonces for stylesheets

* Pass nonce to react-select
2020-07-07 01:33:38 +02:00
Eugen Rochko
c3187411c2
Change design of account notes in web UI (#14208)
* Change design of account notes in web UI

* Fix `for` -> `htmlFor`
2020-07-07 01:24:03 +02:00
Alex Dunn
83fd046107
helm: fix default storage values for PVCs (#14245) 2020-07-06 23:08:29 +02:00
dependabot[bot]
4e0357c7f5
Bump jest-cli from 26.0.1 to 26.1.0 (#14240)
Bumps [jest-cli](https://github.com/facebook/jest/tree/HEAD/packages/jest-cli) from 26.0.1 to 26.1.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v26.1.0/packages/jest-cli)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-07 05:51:22 +09:00
dependabot[bot]
309578101c
Bump @babel/preset-react from 7.10.1 to 7.10.4 (#14228)
Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) from 7.10.1 to 7.10.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.10.4/packages/babel-preset-react)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-07 05:50:42 +09:00
dependabot[bot]
aa363c4377
Bump @babel/plugin-transform-runtime from 7.10.3 to 7.10.4 (#14217)
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.10.3 to 7.10.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.10.4/packages/babel-plugin-transform-runtime)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-07 05:49:58 +09:00
Thibaut Girka
13db302f6e Fix vanilla flavour too 2020-07-06 21:13:04 +02:00
Thibaut Girka
d973e11061 Add UI option to show local-only toots in public timeline 2020-07-06 21:12:06 +02:00
dependabot[bot]
e3ca2b0641
Bump jest-watcher from 26.0.1 to 26.1.0 (#14231)
Bumps [jest-watcher](https://github.com/facebook/jest/tree/HEAD/packages/jest-watcher) from 26.0.1 to 26.1.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v26.1.0/packages/jest-watcher)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:57:56 +09:00
dependabot[bot]
0f16f2af8c
Bump @babel/plugin-transform-react-inline-elements from 7.10.1 to 7.10.4 (#14236)
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-react-inline-elements) from 7.10.1 to 7.10.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.10.4/packages/babel-plugin-transform-react-inline-elements)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:56:59 +09:00
dependabot[bot]
37bb2d815e
Bump jest-leak-detector from 26.0.1 to 26.1.0 (#14233)
Bumps [jest-leak-detector](https://github.com/facebook/jest/tree/HEAD/packages/jest-leak-detector) from 26.0.1 to 26.1.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v26.1.0/packages/jest-leak-detector)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:56:19 +09:00
dependabot[bot]
93eb192aa0
Bump expect from 26.0.1 to 26.1.0 (#14235)
Bumps [expect](https://github.com/facebook/jest/tree/HEAD/packages/expect) from 26.0.1 to 26.1.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v26.1.0/packages/expect)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:56:04 +09:00
dependabot[bot]
d48a1289e4
Bump arrow-key-navigation from 1.1.0 to 1.2.0 (#14222)
Bumps [arrow-key-navigation](https://github.com/nolanlawson/arrow-key-navigation) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/nolanlawson/arrow-key-navigation/releases)
- [Commits](https://github.com/nolanlawson/arrow-key-navigation/compare/v1.1.0...v1.2.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:24:00 +09:00
dependabot[bot]
9db1388a8e
Bump diff-lcs from 1.4.3 to 1.4.4 (#14220)
Bumps [diff-lcs](https://github.com/halostatue/diff-lcs) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/halostatue/diff-lcs/releases)
- [Changelog](https://github.com/halostatue/diff-lcs/blob/master/History.md)
- [Commits](https://github.com/halostatue/diff-lcs/compare/v1.4.3...v1.4.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:19:04 +09:00
dependabot[bot]
8620f54884
Bump rdf from 3.1.3 to 3.1.4 (#14225)
Bumps [rdf](https://github.com/ruby-rdf/rdf) from 3.1.3 to 3.1.4.
- [Release notes](https://github.com/ruby-rdf/rdf/releases)
- [Changelog](https://github.com/ruby-rdf/rdf/blob/develop/CHANGES.md)
- [Commits](https://github.com/ruby-rdf/rdf/compare/3.1.3...3.1.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:18:25 +09:00
dependabot[bot]
769f74034c
Bump omniauth-saml from 1.10.1 to 1.10.2 (#14226)
Bumps [omniauth-saml](https://github.com/omniauth/omniauth-saml) from 1.10.1 to 1.10.2.
- [Release notes](https://github.com/omniauth/omniauth-saml/releases)
- [Changelog](https://github.com/omniauth/omniauth-saml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/omniauth/omniauth-saml/compare/v1.10.1...v1.10.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:18:06 +09:00
dependabot[bot]
2c7c9707b3
Bump json from 2.3.0 to 2.3.1 (#14227)
Bumps [json](https://github.com/flori/json) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/flori/json/releases)
- [Changelog](https://github.com/flori/json/blob/master/CHANGES.md)
- [Commits](https://github.com/flori/json/compare/v2.3.0...v2.3.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:17:51 +09:00
dependabot[bot]
927a452780
Bump yargs from 15.3.1 to 15.4.0 (#14234)
Bumps [yargs](https://github.com/yargs/yargs) from 15.3.1 to 15.4.0.
- [Release notes](https://github.com/yargs/yargs/releases)
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/yargs/compare/v15.3.1...v15.4.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:06:29 +09:00
dependabot[bot]
0f926969cd
Bump caniuse-lite from 1.0.30001084 to 1.0.30001094 (#14229)
Bumps [caniuse-lite](https://github.com/ben-eb/caniuse-lite) from 1.0.30001084 to 1.0.30001094.
- [Release notes](https://github.com/ben-eb/caniuse-lite/releases)
- [Changelog](https://github.com/ben-eb/caniuse-lite/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ben-eb/caniuse-lite/compare/v1.0.30001084...v1.0.30001094)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:01:08 +09:00
dependabot[bot]
8eb384277b
Bump terser-webpack-plugin from 3.0.3 to 3.0.6 (#14238)
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 3.0.3 to 3.0.6.
- [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v3.0.3...v3.0.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:00:02 +09:00
dependabot[bot]
a630f77278
Bump electron-to-chromium from 1.3.475 to 1.3.488 (#14239)
Bumps [electron-to-chromium](https://github.com/kilian/electron-to-chromium) from 1.3.475 to 1.3.488.
- [Release notes](https://github.com/kilian/electron-to-chromium/releases)
- [Changelog](https://github.com/Kilian/electron-to-chromium/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kilian/electron-to-chromium/compare/v1.3.475...v1.3.488)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 22:30:08 +09:00
dependabot[bot]
082b8d05a1
Bump js-base64 from 2.5.2 to 2.6.2 (#14237)
Bumps [js-base64](https://github.com/dankogai/js-base64) from 2.5.2 to 2.6.2.
- [Release notes](https://github.com/dankogai/js-base64/releases)
- [Commits](https://github.com/dankogai/js-base64/compare/2.5.2...2.6.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 22:28:44 +09:00
dependabot[bot]
180761409b
Bump @babel/preset-env from 7.10.2 to 7.10.4 (#14218)
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.10.2 to 7.10.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.10.4/packages/babel-preset-env)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 22:27:12 +09:00
dependabot[bot]
3a530b7296
Bump aws-sdk-s3 from 1.72.0 to 1.73.0 (#14219)
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.72.0 to 1.73.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 22:07:46 +09:00
Sasha Sorokin
cb2adaaf9d
Replace shortNumberFormat with <ShortNumber> (#14061)
This commit introduces new utility component - ShortNumber. It should
work almost the same way as original shortNumberFormat function,
though it also localizes units and accepts one more prop - renderer.

Renderer is a function that takes rendered short formatted number
and also ready-to-pluralize number to format display result accordingly.
Ready-to-pluralize number allows to correctly select plural for
compactly notated numbers, respecting thousands and other units.

Issue #12451 accurately describes the issue with using raw numbers
when replacing counter with short version. In short, it doesn't work
with languages such as Russian, that require different plurals,
according to the unit number was compacted to.

All previous usages of shortNumberFormat were replaced with new
function, and as it became unused, it was removed to avoid misleading.
2020-07-06 14:27:32 +02:00
mayaeh
c4f47f59cf
Fix restored words from "toot" to "status" (#14242) 2020-07-06 12:17:33 +02:00
ThibG
94e09d309c
Merge pull request #1371 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2020-07-05 22:55:09 +02:00
Eugen Rochko
69cddc3909 [Glitch] Add color extraction for audio thumbnails
Port 99f3a55540 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-05 20:18:51 +02:00
Eugen Rochko
ad73e05f46 [Glitch] Fix audio modals not using blurhash and poster
Port 162adf61f2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-05 20:18:51 +02:00
Thibaut Girka
2d8be0a6e1 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Upstream changed it completely.
  Changed ours to merge upstream's new structure, but
  keeping most of the information.
2020-07-05 19:35:56 +02:00
Eugen Rochko
99f3a55540
Add color extraction for audio thumbnails (#14209) 2020-07-05 18:28:25 +02:00
Eugen Rochko
2f2ab48b75
Add back a cleaner and leaner .env.production.sample (#14206) 2020-07-03 21:01:39 +02:00
Yamagishi Kazutoshi
231802725c
Run bundle exec i18n-tasks normalize (#14205) 2020-07-03 13:27:02 +02:00
mayaeh
6e399b9df9
Fix-up #13749 (#14204) 2020-07-03 13:26:35 +02:00
ThibG
a80fd8c79b
Change the about.instance_actor_flash to be single-line (#14200)
Some translations of that string are single-line, which somehow seems to make
Crowdin issue a blank newline at the end of those translations.

This, in turns, leads to different results when running “i18n-tasks normalize”
depending on the version of libyaml installed, making the CI fail if it
runs a different version than whoever ran “i18n-tasks normalize”.

Since there is no real reason for that source string to be multi-line (it is
only displayed in HTML, without replacing newlines by <br/> tags),
attempt to fix Crowdin export by making the source string single-line.
2020-07-03 03:06:08 +02:00
Eugen Rochko
534da9ba23
Fix audio uploads without embedded image (#14203) 2020-07-03 03:05:32 +02:00
Eugen Rochko
9b3677d509 [Glitch] Add customizable thumbnails for audio and video attachments
Port 64aac30733 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-02 17:31:09 +02:00
Eugen Rochko
8999eea707 [Glitch] Fix various issues around OpenGraph representation of media
Port audio player changes from 662a49dc3f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-07-02 17:31:09 +02:00
Thibaut Girka
e6dc2fd8eb Revert "Revert "Remove unused dependency on wavesurfer.js (#14136)""
This reverts commit dc99608bcf.
2020-07-02 17:31:09 +02:00