115 Commits (44fd66f0c6bff9cd94ba55345640c913cd733948)

Author	SHA1	Message	Date
Claire	3622110778	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `streaming/index.js`: Filtering code for streaming notifications has been refactored upstream, but glitch-soc had similar code for local-only toots in the same places. Ported upstream changes, but did not refactor local-only filtering.	3 years ago
Eugen Rochko	a0d4129893	Refactor notifications to go through a separate stream in streaming API (#16765) ... Eliminate need to have custom notifications filtering logic in the streaming API code by publishing notifications into a separate stream and then simply using the multi-stream capability to subscribe to that stream when necessary	3 years ago
Claire	50b430d9a2	Merge branch 'main' into glitch-soc/merge-upstream ... - `app/views/statuses/_simple_status.html.haml`: Small markup change in glitch-soc, on a line that has been modified by upstream. Ported upstream changes.	4 years ago
Eugen Rochko	c5c46dd6ee	Fix "cb is not a function" error in streaming API server (#16134) ... Third argument of `ping` is the callback Regression from #15932	4 years ago
Eugen Rochko	aafe65a142	Change log level of worker start/end to warn in streaming API (#16110)	4 years ago
Claire	f60c99a8fb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Claire	49814d5799	Switch from deprecated ClusterWS/cws to ws package (#15932) ... * Switch from deprecated ClusterWS/cws to ws package Fixes #15184 Co-authored-by: Edho Arief <me@nanaya.pro> * Make bufferutil and utf-8-validate optional dependencies Co-authored-by: Edho Arief <me@nanaya.pro>	4 years ago
Thibaut Girka	e71b16ae2b	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: glitch-soc-only dependency textually too close to updated upstream dependencies. Updated to upsteam dependencies.	4 years ago
abcang	a2da02626e	Fixed ESLint error (#15214) ... * eslint --fix * fix consistent-return * fix promise/catch-or-return * ignore import rule	4 years ago
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.	4 years ago
Eugen Rochko	aa10200e58	Fix streaming API allowing connections to persist after access token invalidation (#15111) ... Fix #14816	4 years ago
Thibaut Girka	a7aedebc31	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file.	5 years ago
fuyu	e39d97f700	Fix crash streaming process when receive invalid json (#14859)	5 years ago
Thibaut Girka	da62e350e0	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Eugen Rochko	01647b8acb	Fix destructuring error when unsubscribing without subscribing (#14566)	5 years ago
Thibaut Girka	78fa15d08f	Merge branch 'master' into glitch-soc/master ... Conflicts: - `streaming/index.js`: Upstream entirely refactored it. Ported our changes to upstream's refactor. Hopefuly.	5 years ago
Eugen Rochko	ef057584fd	Add support for managing multiple stream subscriptions in a single connection (#14524)	5 years ago
Thibaut Girka	c41da2e962	Fix streaming server only working for streams allowing local-only toots	5 years ago
Thibaut Girka	d973e11061	Add UI option to show local-only toots in public timeline	5 years ago
Thibaut Girka	a01674fb2b	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
ThibG	ddcdddd6fc	Change streaming server to treat blank redis password as password-less auth (#14135) ... Fixes #14131 Our `mastodon:setup` task defaults to a blank password rather than the absence of password, but some versions of Redis reject blank password authentication when authentication is possible without a password. The Ruby code only uses the Redis password when it's not blank, so do the same for the node.js part.	5 years ago
Thibaut Girka	12c8ac9e14	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.	5 years ago
Eugen Rochko	5d8398c8b8	Add E2EE API (#13820)	5 years ago
Thibaut Girka	4a70792b4a	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well.	5 years ago
Takeshi Umeda	26b08a3c54	Add remote only to public timeline (#13504) ... * Add remote only to public timeline * Fix code style	5 years ago
Thibaut Girka	61f699c0e9	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Ben Lubar	0dfba0884e	minor server-sent events fixes (#12945) ... * Send output on the server-sent events stream immediately so the client sees that it was successfully opened even if it doesn't have any messages. Fix transparent SSE streaming for the public:local and hashtag:local stream types. * Tell caches to never store server-sent events.	5 years ago
Thibaut Girka	24968d20a0	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - package.json - yarn.lock	6 years ago
Eugen Rochko	24552b5160	Add whitelist mode (#11291)	6 years ago
Eugen Rochko	be053560e9	Change default interface of web and streaming from 0.0.0.0 to 127.0.0.1 (#11302)	6 years ago
Eugen Rochko	e7353c47db	Change default interface of web and streaming from 0.0.0.0 to 127.0.0.1 (#11302)	6 years ago
Thibaut Girka	48ec6abaca	Fix streaming server crashing when updating filters	6 years ago
Thibaut Girka	652147a3f4	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - streaming/index.js	6 years ago
ThibG	d63c3c0cef	Improve streaming server security (#10818) ... * Check OAuth token scopes in the streaming API * Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token Inspired by https://github.com/kubevirt/kubevirt/issues/1242	6 years ago
Thibaut Girka	c0dc247bce	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`.	6 years ago
abcang	ca6c93a2f5	Migrate from uws to cws (#10805)	6 years ago
Thibaut Girka	89bee860cd	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/services/post_status_service.rb Small conflict due to handling of instance-local toots. A subsequent change is required to ensure instance-local polls are not leaked through Update.	6 years ago
Eugen Rochko	13a7f05030	Fix streaming API always attempting to use SSL with Postgres (#10231) ... Fix #10223	6 years ago
Thibaut Girka	dfe7322922	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	dbeab5a036	Fix SSL configuration regression in streaming API (#10225) ... * Fix SSL configuration regression in streaming API Fix #10223 * Fix code style issues and integrate #10219 * Fix dumb thing	6 years ago
Thibaut Girka	674fe32f97	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Sascha	42e733681a	config: add DB_SSLMODE for managed/remote PG (#10210) ... * config: add DB_SSLMODE for managed/remote PG * streaming: set PG sslmode, defaults to prefer	6 years ago
Thibaut Girka	a100f05687	Only stream local-only toots to logged-in users	6 years ago
Gomasy	8d70d3de38	Fix crash when using UNIX socket (#9036)	6 years ago
Eugen Rochko	369cc5f555	Check if port/socket is available before forking in Streaming API (#9023) ... Previously, the server would attempt taking port/socket in worker process, and if it was taken, fail, which made the master process create a new worker. This led to really high CPU usage if the streaming API was started when the port or socket were not available. Now, before clustering (forking) into worker processes, a test server is created and then removed to check if it can be done.	6 years ago
Eugen Rochko	18e7ef6eda	Add check for missing tag param in streaming API (#8955) ... * Add check for missing tag param in streaming API Fixes error: ``` TypeError: Cannot read property 'toLowerCase' of undefined at app.get (.../streaming/index.js:493:50) ``` * Fix code style issues	7 years ago
Eugen Rochko	774ac47373	Add conversations API (#8832) ... * Add conversations API * Add web UI for conversations * Add test for conversations API * Add tests for ConversationAccount * Improve web UI * Rename ConversationAccount to AccountConversation * Remove conversations on block and mute * Change last_status_id to be a denormalization of status_ids * Add optimistic locking	7 years ago
Eugen Rochko	f37fafe30b	Add health endpoint to streaming API (#8441) ... GET /api/v1/streaming/health Answers with OK. Fix #8337	7 years ago
MIYAGI Hikaru	a083604d1d	Support UNIX domain socket for streaming service without using PORT (#8217) ... * Support UNIX domain socket for streaming service without using PORT The use of UNIX domain socket for streaming service was not officially supported, but it was made unofficial to use by setting a path to PORT. From now on, SOCKET will be used just like setting for puma. * Hundle relative path	7 years ago
Eugen Rochko	0180037dfb	Fix streaming API still using filtered instead of chosen languages (#8009)	7 years ago