fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 14:56:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
12986 commits 135 branches 266 tags 983 MiB
Commit graph

12986 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibaut Girka 3281c9b4c0 Fix video not taking focus on interaction 
Revert part of #737 to restore hotkey functionality
 2020-11-20 14:20:17 +01:00
ThibG 15be0bde8a [Glitch] Fix image uploads being random data when canvas read access is blocked 
Port d8d43a427a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-11-20 13:41:07 +01:00
Eugen Rochko b82aa33dea [Glitch] Add hotkeys for audio/video control 
Port 04a079e723 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-11-20 13:40:05 +01:00
Thibaut Girka 48f0f3ffee Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
  Upstream added the `bug` label to bug reports.
  Did the same.
- `app/services/fan_out_on_write_service.rb`:
  Upstream put DMs back into timelines, glitch-soc was already doing it.
  Ignored upstream changes.
 2020-11-20 13:27:48 +01:00
ThibG 8b8004a962
Fix webfinger redirect handling in ResolveAccountService (#15187) 
* Fix webfinger redirect handling in ResolveAccountService

ResolveAccountService#process_webfinger! handled a one-step webfinger
redirection, but only accepting the result if it matched the exact URI passed
as input, defeating the point of a redirection check.

Instead, use the same logic as in `ActivityPub::FetchRemoteAccountService`,
updating the resulting `acct:` URI with the result of the first webfinger
query.

* Add tests
 2020-11-19 19:52:06 +01:00
ThibG 96c1e71329
Add import/export feature for bookmarks (#14956) 
* Add ability to export bookmarks

* Add support for importing bookmarks

* Add bookmark import tests

* Add bookmarks export test
 2020-11-19 17:48:13 +01:00
dependabot[bot] 022d2353a7
Bump webpack-cli from 3.3.12 to 4.2.0 (#15123) 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.12 to 4.2.0.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.12...webpack-cli@4.2.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-19 17:47:20 +01:00
Daigo 3 Dango 541b9f8c1c
Use Ruby 2.7.2 (#15150) 
thwait and e2mmap are no longer needed in Gemfile.
Gems properly require those.
 2020-11-19 17:46:46 +01:00
dependabot[bot] 67ace1d890
Bump omniauth-cas from 1.1.1 to 2.0.0 (#15165) 
Bumps [omniauth-cas](https://github.com/dlindahl/omniauth-cas) from 1.1.1 to 2.0.0.
- [Release notes](https://github.com/dlindahl/omniauth-cas/releases)
- [Changelog](https://github.com/dlindahl/omniauth-cas/blob/master/CHANGELOG.md)
- [Commits](https://github.com/dlindahl/omniauth-cas/compare/v1.1.1...v2.0.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-19 17:43:58 +01:00
dependabot[bot] 1a9099ca7c
Bump rubocop from 0.93.1 to 1.3.0 (#15170) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.93.1 to 1.3.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.93.1...v1.3.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-19 17:43:35 +01:00
dependabot[bot] dbe5a96121
Bump @testing-library/react from 11.1.1 to 11.2.0 (#15186) 
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 11.1.1 to 11.2.0.
- [Release notes](https://github.com/testing-library/react-testing-library/releases)
- [Changelog](https://github.com/testing-library/react-testing-library/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testing-library/react-testing-library/compare/v11.1.1...v11.2.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-19 17:42:47 +01:00
Darius Kazemi 8e2530ea16
Mark correctly as read reverse-order announcements (#15070) 
This fixes a bug in #15065 where the "read" indicator was not getting correctly set. The ID of a dismissed announcement is now correct.
 2020-11-19 17:40:18 +01:00
ThibG 2f6831f318
Fix sending spurious Rejects when processing remote account deletion (#15104) 
* Fix sending spurious Rejects when processing remote account deletion

* Make skip_side_effects imply skip_activitypub
 2020-11-19 17:39:47 +01:00
Eugen Rochko df1653174b
Add cache buster feature for media files (#15155) 
Nginx can be configured to bypass proxy cache when a special header
is in the request. If the response is cacheable, it will replace
the cache for that request. Proxy caching of media files is
desirable when using object storage as a way of minimizing bandwidth
costs, but has the drawback of leaving deleted media files for
a configured amount of cache time. A cache buster can make those
media files immediately unavailable. This especially makes sense
when suspending and unsuspending an account.
 2020-11-19 17:38:06 +01:00
ThibG 1242e57c27
Deal with collation-related index corruption (#14860) 
* Add tootctl maintenance fix-duplicates

This tool goes through the database to detect and fix duplicates.
This operation is very slow and may cause data loss (of data that would be
inaccessible without intervention because of the existing index corruptions).
It tries its best to make sensible decisions, and asks the user in some cases.

* Add warning message in db:migrate hook

* Clear Rails cache after being done with database deduplication

Avoids followers hash cache being incorrect, among other things
 2020-11-19 17:37:49 +01:00
dependabot[bot] 29e76f994e
Bump babel-loader from 8.1.0 to 8.2.1 (#15167) 
Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.1.0 to 8.2.1.
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel-loader/compare/v8.1.0...v8.2.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-19 11:08:20 +09:00
dependabot[bot] 60cc3a96d8
Bump webpack-merge from 5.3.0 to 5.4.0 (#15166) 
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.3.0 to 5.4.0.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v5.3.0...v5.4.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-19 11:07:57 +09:00
dependabot[bot] 8d520d4427
Bump sass-loader from 10.0.5 to 10.1.0 (#15164) 
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 10.0.5 to 10.1.0.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v10.0.5...v10.1.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-19 11:03:07 +09:00
dependabot[bot] e77bd9fc8a
Bump mini-css-extract-plugin from 1.3.0 to 1.3.1 (#15168) 
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v1.3.0...v1.3.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-19 10:56:04 +09:00
dependabot[bot] a3f3a9113d
Bump bootsnap from 1.5.0 to 1.5.1 (#15171) 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.5.0 to 1.5.1.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.5.0...v1.5.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-19 10:45:57 +09:00
dependabot[bot] 34ced3da9f
Bump yargs from 16.1.0 to 16.1.1 (#15163) 
Bumps [yargs](https://github.com/yargs/yargs) from 16.1.0 to 16.1.1.
- [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/v16.1.0...v16.1.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-19 10:44:38 +09:00
dependabot[bot] 9b188a65be
Bump webmock from 3.9.5 to 3.10.0 (#15172) 
Bumps [webmock](https://github.com/bblimke/webmock) from 3.9.5 to 3.10.0.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.9.5...v3.10.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-19 10:42:05 +09:00
dependabot[bot] 3d98741639
Bump @testing-library/jest-dom from 5.11.5 to 5.11.6 (#15162) 
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.11.5 to 5.11.6.
- [Release notes](https://github.com/testing-library/jest-dom/releases)
- [Changelog](https://github.com/testing-library/jest-dom/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.11.5...v5.11.6)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-19 10:34:31 +09:00
dependabot[bot] d942eb23fe
Bump compression-webpack-plugin from 6.1.0 to 6.1.1 (#15161) 
Bumps [compression-webpack-plugin](https://github.com/webpack-contrib/compression-webpack-plugin) from 6.1.0 to 6.1.1.
- [Release notes](https://github.com/webpack-contrib/compression-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/compression-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/compression-webpack-plugin/compare/v6.1.0...v6.1.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-19 10:32:00 +09:00
dependabot[bot] 78a3956729
Bump aws-sdk-s3 from 1.84.0 to 1.84.1 (#15173) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.84.0 to 1.84.1.
- [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-11-19 10:28:31 +09:00
dependabot[bot] beddf821d7
Bump json-ld from 3.1.4 to 3.1.5 (#15174) 
Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 3.1.4 to 3.1.5.
- [Release notes](https://github.com/ruby-rdf/json-ld/releases)
- [Commits](https://github.com/ruby-rdf/json-ld/compare/3.1.4...3.1.5)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-19 10:25:12 +09:00
dependabot[bot] feeaa6f50d
Bump oj from 3.10.15 to 3.10.16 (#15175) 
Bumps [oj](https://github.com/ohler55/oj) from 3.10.15 to 3.10.16.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.15...v3.10.16)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-19 10:22:24 +09:00
ThibG 966593393e
Fix DMs not appearing into timelines (#15182) 
Fixes #15179
 2020-11-19 00:23:46 +01:00
ThibG d8d43a427a
Fix image uploads being random data when canvas read access is blocked (#15180) 
Fixes #15178

PR #11499 introduced a way to deal with all-white canvas, but newer
Firefox versions set random data instead.

This PR detects whether canvas operations are reliable by comparing
the results on a hardcoded 2×2 pixels image, and memoizing the result.

This should be both more reliable and faster than the previous check.
 2020-11-18 18:01:58 +01:00
Eugen Rochko 18ca4e0e9a
Fix pop-out player appearing on mobile screens in web UI (#15157) 
Fix #15092
 2020-11-16 05:16:39 +01:00
Eugen Rochko 04a079e723
Add hotkeys for audio/video control (#15158) 
Fix #14515
 2020-11-15 14:24:54 +01:00
Yamagishi Kazutoshi 8eb97e8ca2
Apply label automatically when issue creation from template (#15154) 2020-11-14 19:19:23 +01:00
ThibG db01f8b942
Merge pull request #1465 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-11-14 00:50:43 +01:00
Thibaut Girka de5cc20dd8 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Conflict caused because of glitch-soc's theming system.
  Took upstream's new code and applied the theming system changes on top
  of it.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
  Conflict caused because of glitch-soc's theming system.
  Took upstream's new code and applied the theming system changes on top
  of it.
 2020-11-14 00:30:36 +01:00
ThibG 0a4d0e8320
Fix AccountDeletionWorker not accepting keyword arguments (#15152) 2020-11-13 22:17:04 +01:00
Thibaut Girka 8ffae82fa6 Fix minor design issues with fav confirmation modal 2020-11-13 01:14:52 +01:00
Thibaut Girka 339f78fb63 Fix media not being marked sensitive when outgoing CW is set 
Fixes #1461

Fixes a regression from a recent merge
 2020-11-13 01:05:55 +01:00
Thibaut Girka 265b26489a Fix “Show boosts/replies in public timelines” only affecting streaming 
Fixes #1456
 2020-11-12 23:44:53 +01:00
Thibaut Girka 6c05db70fa Add tests 2020-11-12 23:44:30 +01:00
Thibaut Girka 10bd6f415d Improve searching for private toots from URL 
Most of the time, when sharing toots, people use the toot URL rather than
the toot URI, which makes sense since it is the user-facing URL.

In Mastodon's case, the URL and URI are different, and Mastodon does not
have an index on URL, which means searching a private toot by URL is done
with a slow query that will only succeed for very recent toots.

This change gets rid of the slow query, and attempts to guess the URI from
URL instead, as Mastodon's are predictable.
 2020-11-12 23:44:30 +01:00
Eugen Rochko aa10200e58
Fix streaming API allowing connections to persist after access token invalidation (#15111) 
Fix #14816
 2020-11-12 23:05:24 +01:00
Eugen Rochko 8532429af7
Fix 2FA/sign-in token sessions being valid after password change (#14802) 
If someone tries logging in to an account and is prompted for a 2FA
code or sign-in token, even if the account's password or e-mail is
updated in the meantime, the session will show the prompt and allow
the login process to complete with a valid 2FA code or sign-in token
 2020-11-12 23:05:01 +01:00
ThibG 3b6e27978d
Merge pull request #1457 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-11-12 22:57:57 +01:00
Thibaut Girka 3f09d4ca03 Add missing locales to glitch flavor 2020-11-12 22:27:44 +01:00
Takeshi Umeda 412fe2ebb0 [Glitch] Add interrelationship icon 
Port SCSS changes from 148ce97e21 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-11-12 22:24:24 +01:00
Eugen Rochko 0aeb833317 [Glitch] Add button to dismiss desktop notifications permissions banner 
Port 4790a126be to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-11-12 22:23:06 +01:00
Thibaut Girka c077cdaba7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/relationships_controller.rb`:
  Upstream changed a line too close to a glitch-soc only line related to
  glitch-soc's theming system.
  Applied upstream changes accordingly.
 2020-11-12 22:13:57 +01:00
ThibG 9870b175b4
Fix possible inconsistencies in tag search (#14906) 
Do not downcase the queried tag before passing it to postgres when searching:
- tags are not downcased on creation
- `arel_table[:name].lower.matches(pattern)` generates an ILIKE anyway
- if Postgres and Rails happen to use different case-folding rules,
  downcasing before query but not before insertion may mean that some
  tags with some casings are not searchable
 2020-11-12 18:35:23 +01:00
Takeshi Umeda 148ce97e21
Add interrelationship icon (#15149) 
* Add interrelationship icon

* Fix arrow for rtl

* Fix to predefined color
 2020-11-12 17:43:12 +01:00
Takeshi Umeda 2b1a6e734f
Add follow selected followers button (#15148) 
* Add follow selected followers button

* Fix unused variable

* Fix i18n normalize
 2020-11-12 16:58:00 +01:00