a81bb14abe
Add option to hide notification markers
2020-10-27 11:20:11 +01:00
c762ca49dc
Merge pull request #1443 from ThibG/glitch-soc/features/upstream-pop-in
...
Port upstream's pop-in player to glitch-soc
2020-10-26 22:54:50 +01:00
49ee69f75f
Add local setting for pop-in player position
2020-10-26 20:51:28 +01:00
ea5298ab9b
Add setting to disable the pop-in player
2020-10-26 20:31:54 +01:00
5ee2b860f9
Respect glitch-soc's reply counter setting in the pop-in player
2020-10-26 20:31:54 +01:00
47edac871c
[Glitch] Fix regressions in icon buttons in web UI
...
Port a549415868
2020-10-26 19:51:09 +01:00
8f950e540b
[Glitch] Add pop-out player for audio/video in web UI
...
port d88a79b456
2020-10-26 19:51:09 +01:00
9c88792f0a
Merge pull request #1442 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-10-26 16:11:58 +01:00
ddbb9f0ec4
[Glitch] Fix follow request notifications
...
Port 3678b10823
2020-10-26 15:50:48 +01:00
9c34090db8
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/process_mentions_service.rb`:
glitch-soc local-only handling, ported upstream changes
2020-10-26 15:48:16 +01:00
3678b10823
Fix follow request notifications ( #15048 )
2020-10-26 15:41:28 +01:00
1f945e7390
Fix followers synchronization mechanism not being triggered on mentions ( #15026 )
...
e.g. if someone on an instance that previously had followers gets mentioned
in a private toot, before this PR, they would not receive a
Collection-Synchronization header and may show the toot to the former followers
in addition to the mentioned person.
2020-10-23 14:22:16 +02:00
fb586584f2
Fix account processing failing because of large collections ( #15027 )
...
Fixes #15025
2020-10-23 14:21:31 +02:00
36e5c9d45b
Merge pull request #1441 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-10-22 22:38:11 +02:00
57b9115c4e
Bump @babel/plugin-transform-runtime from 7.11.5 to 7.12.1 ( #14995 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.11.5 to 7.12.1.
- [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.12.1/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-10-22 17:51:57 +09:00
8984c871fe
Bump @babel/preset-env from 7.11.5 to 7.12.1 ( #15001 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.11.5 to 7.12.1.
- [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.12.1/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-10-22 17:26:02 +09:00
d9b6efd1e8
Bump react from 16.13.1 to 16.14.0 ( #15005 )
...
Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react ) from 16.13.1 to 16.14.0.
- [Release notes](https://github.com/facebook/react/releases )
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/react/commits/v16.14.0/packages/react )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-22 15:35:48 +09:00
cab4a71248
Bump @babel/preset-react from 7.10.4 to 7.12.1 ( #15006 )
...
Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react ) from 7.10.4 to 7.12.1.
- [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.12.1/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-10-22 14:27:10 +09:00
3b4ecf40f7
Bump @babel/plugin-proposal-decorators from 7.10.5 to 7.12.1 ( #15008 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.10.5 to 7.12.1.
- [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.12.1/packages/babel-plugin-proposal-decorators )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-22 14:11:56 +09:00
4d6716ed0b
Bump @github/webauthn-json from 0.5.6 to 0.5.7 ( #14997 )
...
Bumps [@github/webauthn-json](https://github.com/github/webauthn-json ) from 0.5.6 to 0.5.7.
- [Release notes](https://github.com/github/webauthn-json/releases )
- [Commits](https://github.com/github/webauthn-json/compare/v0.5.6...v0.5.7 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-22 13:14:50 +09:00
39d7562f89
Bump omniauth-saml from 1.10.2 to 1.10.3 ( #15007 )
...
Bumps [omniauth-saml](https://github.com/omniauth/omniauth-saml ) from 1.10.2 to 1.10.3.
- [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.2...v1.10.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-22 12:46:54 +09:00
90611276ed
Bump rubocop from 0.93.0 to 0.93.1 ( #15004 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.93.0 to 0.93.1.
- [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.0...v0.93.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-22 12:46:25 +09:00
cf5f8a7657
Bump tzinfo-data from 1.2020.2 to 1.2020.3 ( #15002 )
...
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data ) from 1.2020.2 to 1.2020.3.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases )
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2020.2...v1.2020.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-22 12:41:42 +09:00
5598c670fc
Bump oj from 3.10.14 to 3.10.15 ( #15009 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.14 to 3.10.15.
- [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.14...v3.10.15 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-22 12:28:25 +09:00
ac90b06a6e
Bump yargs from 16.0.3 to 16.1.0 ( #15010 )
...
Bumps [yargs](https://github.com/yargs/yargs ) from 16.0.3 to 16.1.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/v16.0.3...v16.1.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-22 12:27:37 +09:00
5567a50a25
Bump active_record_query_trace from 1.7 to 1.8 ( #14999 )
...
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace ) from 1.7 to 1.8.
- [Release notes](https://github.com/brunofacca/active-record-query-trace/releases )
- [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/master/HISTORY.md )
- [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.7...v1.8 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-22 12:11:20 +09:00
5bdcc2c5a0
Bump @babel/plugin-transform-react-inline-elements from 7.10.4 to 7.12.1 ( #14998 )
...
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-react-inline-elements ) from 7.10.4 to 7.12.1.
- [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.12.1/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-10-22 11:57:30 +09:00
0e37e2682c
Bump webmock from 3.9.1 to 3.9.3 ( #14996 )
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.9.1 to 3.9.3.
- [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.1...v3.9.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-22 11:50:01 +09:00
e07ea2f2b4
Bump @babel/runtime from 7.11.2 to 7.12.1 ( #14994 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.11.2 to 7.12.1.
- [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.12.1/packages/babel-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-22 11:45:56 +09:00
a8eea8ecf4
Bump @babel/core from 7.11.6 to 7.12.3 ( #14993 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.11.6 to 7.12.3.
- [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.12.3/packages/babel-core )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-22 11:45:03 +09:00
bfc4226be5
Bump @testing-library/react from 11.0.4 to 11.1.0 ( #14992 )
...
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library ) from 11.0.4 to 11.1.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.0.4...v11.1.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-22 11:41:48 +09:00
b37c9e5660
helm: bump version to 3.2.1 ( #15019 )
2020-10-22 01:36:07 +02:00
5c60f7eaed
[Glitch] Fix strings that could not be translated
...
Port fb5f3be18f
2020-10-21 21:49:46 +02:00
4ae4b03974
[Glitch] Change how missing desktop notifications permission is displayed
...
Port a69ca29473
2020-10-21 21:49:46 +02:00
dca05c79a9
Move columns-related CSS rules into the appropriate files
2020-10-21 21:28:47 +02:00
b5927301cf
[Glitch] Fix browser notification permission request logic
...
Port f54ca3d08e
2020-10-21 21:28:47 +02:00
2eb054c07f
Remove glitch-soc specific and obsolete /api/v1/mutes/details
2020-10-21 21:28:47 +02:00
78ad04420c
[Glitch] Add duration parameter to muting.
...
Port 96761752ec
2020-10-21 21:28:47 +02:00
813c84cd6c
[Glitch] Change how CDN_HOST is passed down to make assets build reproducible
...
Port 4c45b43cb8
2020-10-21 21:28:47 +02:00
842c048c6b
[Glitch] Fix unread notification marker not updating when mounting column
...
Port dac3e362fd
2020-10-21 19:36:41 +02:00
f7306c7b7c
[Glitch] Ignore alt-key hotkeys in text fields
...
Port 63770d3aac
2020-10-21 19:34:44 +02:00
8071613dd7
[Glitch] Fix mark as read in notifications to be saved immediately
...
Port bec8b12bb5
2020-10-21 19:33:20 +02:00
c3d82027cf
[Glitch] Fix bell button causing a brief “Cancel follow request” on locked accounts
...
Port 82951920f7
2020-10-21 19:24:32 +02:00
ec49aa8175
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, we deleted it to not be flooded by Depandabot.
Kept deleted.
- `Gemfile.lock`:
Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
Upstream updated the serializer to support timed mutes, while
glitch-soc added a custom API ages ago to get information that
is already available elsewhere.
Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
🤷
- `app/models/user.rb`:
New user setting added upstream while we have glitch-soc-specific
user settings. Added upstream's user setting.
- `config/settings.yml`:
Upstream added a new user setting close to a user setting we had
changed the defaults for. Added the new upstream setting.
- `package.json`:
Upstream dependency updated “too close” to a glitch-soc-specific
dependency. No real conflict. Updated the dependency.
2020-10-21 19:10:50 +02:00
ca56527140
Add follower synchronization mechanism ( #14510 )
...
* Add support for followers synchronization on the receiving end
Check the `collectionSynchronization` attribute on `Create` and `Announce`
activities and synchronize followers from provided collection if possible.
* Add tests for followers synchronization on the receiving end
* Add support for follower synchronization on the sender's end
* Add tests for the sending end
* Switch from AS attributes to HTTP header
Replace the custom `collectionSynchronization` ActivityStreams attribute by
an HTTP header (`X-AS-Collection-Synchronization`) with the same syntax as
the `Signature` header and the following fields:
- `collectionId` to specify which collection to synchronize
- `digest` for the SHA256 hex-digest of the list of followers known on the
receiving instance (where “receiving instance” is determined by accounts
sharing the same host name for their ActivityPub actor `id`)
- `url` of a collection that should be fetched by the instance actor
Internally, move away from the webfinger-based `domain` attribute and use
account `uri` prefix to group accounts.
* Add environment variable to disable followers synchronization
Since the whole mechanism relies on some new preconditions that, in some
extremely rare cases, might not be met, add an environment variable
(DISABLE_FOLLOWERS_SYNCHRONIZATION) to disable the mechanism altogether and
avoid followers being incorrectly removed.
The current conditions are:
1. all managed accounts' actor `id` and inbox URL have the same URI scheme and
netloc.
2. all accounts whose actor `id` or inbox URL share the same URI scheme and
netloc as a managed account must be managed by the same Mastodon instance
as well.
As far as Mastodon is concerned, breaking those preconditions require extensive
configuration changes in the reverse proxy and might also cause other issues.
Therefore, this environment variable provides a way out for people with highly
unusual configurations, and can be safely ignored for the overwhelming majority
of Mastodon administrators.
* Only set follower synchronization header on non-public statuses
This is to avoid unnecessary computations and allow Follow-related
activities to be handled by the usual codepath instead of going through
the synchronization mechanism (otherwise, any Follow/Undo/Accept activity
would trigger the synchronization mechanism even if processing the activity
itself would be enough to re-introduce synchronization)
* Change how ActivityPub::SynchronizeFollowersService handles follow requests
If the remote lists a local follower which we only know has sent a follow
request, consider the follow request as accepted instead of sending an Undo.
* Integrate review feeback
- rename X-AS-Collection-Synchronization to Collection-Synchronization
- various minor refactoring and code style changes
* Only select required fields when computing followers_hash
* Use actor URI rather than webfinger domain in synchronization endpoint
* Change hash computation to be a XOR of individual hashes
Makes it much easier to be memory-efficient, and avoid sorting discrepancy issues.
* Marginally improve followers_hash computation speed
* Further improve hash computation performances by using pluck_each
2020-10-21 18:04:09 +02:00
9649ca0fbe
Removed disabling comments for Style/MethodMissingSuper ( #15014 )
...
* Removed disabling comments for Style/MethodMissingSuper
* Update rubocop for codeclimate
2020-10-20 09:13:39 +02:00
29870d2be6
Glitchsoc translation to 'es' language ( #1439 )
...
glitch-soc-specific translation to 'es' language
2020-10-19 22:17:29 +02:00
0c24f4dce2
Add support for Gemini urls ( #15013 )
...
This PR updates the `valid_url` regex and sanitizer allowlist to provide
support for Gemini urls.
Closes #14991
2020-10-19 17:02:13 +02:00
4130aef29c
Fix translation string ( #14986 )
2020-10-16 21:41:43 +02:00
fb5f3be18f
Fix strings that could not be translated ( #14980 )
2020-10-15 21:24:58 +02:00
Thibaut Girka
Eugen Rochko
dependabot[bot]
Alex Dunn
mayaeh
OSAMU SATO
Takeshi Umeda
abcang
otrapersona
Josh Leeb-du Toit