266 Commits (befe8c72ddd3b427ccf1489a6de6bcc23b6a55f5)

Author	SHA1	Message	Date
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
Ben Lubar	ead09f5ddc	Fix exception when trying to serialize posts with <a> tags in them without hrefs (#1334) ... * fix exception when trying to serialize posts with <a> tags in them without hrefs * Add tests Co-authored-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Thibaut Girka	27b5143dc4	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
ThibG	a319c1e60f	Add support for `summary` field for media description (#13763)	5 years ago
ThibG	71fce71c94	Fix webfinger returning wrong status code on malformed or missing param (#13759) ... Fixes #13757	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
ThibG	a4240fd027	Improve RSS entries for statuses (#13592) ... * Improve RSS entries for statuses - Render polls in both accounts and tags serializers - Refactor RSS serializers - Change title preview to include ellipsis when truncated - Change title preview to show CW instead of toot text - Add tests * Remove title from OEmbed serialization Twitter doesn't serialize title either, and tihs allows us to move the title formatting code to the RSS serializers.	5 years ago
Thibaut Girka	81e49ba5c6	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Eugen Rochko	5edff32733	Change delivery failure tracking to work with hostnames instead of URLs (#13437)	5 years ago
Thibaut Girka	02f1c04fab	Make sanitizer *not* add no-referrer etc. in local markdown toots if the link is “safe”	5 years ago
Thibaut Girka	2c510ee00a	Fix glitch-soc marking every link in toots as a tag ... Fixes #1281	5 years ago
Thibaut Girka	432033743c	Fix tests ... Well, kinda, it's actually a bug from glitch-soc, but we will have to address it separately.	5 years ago
Thibaut Girka	dae5e446fe	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `Gemfile.lock`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `app/lib/sanitize_config.rb`: Upstream added better unsupported link stripping, while we had different sanitizing configs. Took only upstream's link stripping code. - `config/locales/simple_form.pl.yml`: Strings unused in glitch-soc had been removed from glitch-soc, reintroduced them even if they are not useful, to reduce the risk of later merge conflicts.	5 years ago
Eugen Rochko	b1349342d2	Fix rendering `<a>` without `href` when scheme unsupported (#13040) ... - Disallow links with relative paths - Disallow iframes with non-http protocols and relative paths Close #13037	5 years ago
Thibaut Girka	9adeaf2bfc	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system	5 years ago
ThibG	a8e46cf7a1	Add support for magnet: URIs (#12905)	5 years ago
Thibaut Girka	980c004f06	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one	5 years ago
ThibG	ea436b355b	Add support for linking XMPP URIs in toots (#12709) ... * Fix wrong grouping in Twitter valid_url regex * Add support for xmpp URIs Fixes #9776 The difficult part is autolinking, because Twitter-text's extractor does some pretty ad-hoc stuff to find things that “look like” URLs, and XMPP URIs do not really match the assumptions of that lib, so it doesn't sound wise to try to shoehorn it into the existing regex. This is why I used a specific regex (very close, although slightly more permissive than the RFC), and a specific scan function (a simplified version of the generalized one from Twitter). * Remove leading “xmpp:” from auto-linked text	5 years ago
Thibaut Girka	ab5ff638f2	Merge branch 'master' into glitch-soc/master ... Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc	6 years ago
ThibG	da2143b308	Fixes featured hashtag setting page erroring out instead of rejecting invalid tags (#12436) ... * Revert "Fix ignoring whole status because of one invalid hashtag (#11621)" This reverts commit dff46b260b. * Fix statuses being rejected because of invalid hashtag names * Add spec for invalid hashtag names in statuses * Add test for featured tags controller	6 years ago
Thibaut Girka	0ae7d84273	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `package.json`	6 years ago
ThibG	650820d62d	Fix remote media descriptions being cut off at 420 chars (#12262) ... * Fix remote media descriptions being cut off at 420 chars Fixes #12258 * Fix tests	6 years ago
BSKY	fccf83e1f2	Add noopener and/or noreferrer (#12202)	6 years ago
Thibaut Girka	61631f4751	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline	6 years ago
Eugen Rochko	b5f7e12817	Remove auto-silence behaviour from spam check (#12117) ... Fix #12113	6 years ago
Thibaut Girka	16ff7c5627	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb	6 years ago
ThibG	18b451c0e6	Change silences to always require approval on follow (#11975) ... * Change silenced accounts to require approval on follow * Also require approval for follows by people explicitly muted by target accounts * Do not auto-accept silenced or muted accounts when switching from locked to unlocked * Add `follow_requests_count` to verify_credentials * Show “Follow requests” menu item if needed even if account is locked * Add tests * Correctly reflect that follow requests weren't auto-accepted when local account is silenced * Accept follow requests from user-muted accounts to avoid leaking mutes	6 years ago
Thibaut Girka	5cadb47238	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code	6 years ago
Eugen Rochko	4f6af87906	Change spam check to apply to local accounts and add a threshold (#11806) ... Instead of detecting spam on first duplicate message, add a threshold of 5 such messages to reduce false positives	6 years ago
Thibaut Girka	5088eb8388	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	692c5b439a	Fix ActivityPub context not being dynamically computed (#11746) ... * Fix contexts not being dynamically included Fixes #11649 * Refactor Note context in serializer * Refactor Actor serializer	6 years ago
Thibaut Girka	e50554391a	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	ff789a751a	Fix boosting & unboosting preventing a boost from appearing in the TL (#11405) ... * Fix boosting & unboosting preventing a boost from appearing in the TL * Add tests * Avoids side effects when aggregate_reblogs isn't true	6 years ago
Thibaut Girka	bca3825c17	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ysksn	d6ada2eb30	Implement pending tests (#11415)	6 years ago
Thibaut Girka	444796b69b	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb	6 years ago
ThibG	7de8c51873	Play animated custom emoji on hover (#11348) ... * Play animated custom emoji on hover in status * Play animated custom emoji on hover in display names * Play animated custom emoji on hover in bios/bio fields * Add support for animation on hover on public pages emojis too * Fix tests * Code style cleanup	6 years ago
Thibaut Girka	3407ae8683	Fix sanitizer text case for glitch-soc, which preserves lists	6 years ago
Thibaut Girka	249991c498	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml	6 years ago
ThibG	fda437a020	Fix sanitizing lists contents (#11354) ... * Add test * Fix code for sanitizing nested lists stripping all tags	6 years ago
Eugen Rochko	5bfe1e1f05	Change language detection to include hashtags as words (#11341)	6 years ago
Eugen Rochko	6ff67be0f6	Add a spam check (#11217) ... * Add a spam check * Use Nilsimsa to generate locality-sensitive hashes and compare using Levenshtein distance * Add more tests * Add exemption when the message is a reply to something that mentions the sender * Use Nilsimsa Compare Value instead of Levenshtein distance * Use MD5 for messages shorter than 10 characters * Add message to automated report, do not add non-public statuses to automated report, add trust level to accounts and make unsilencing raise the trust level to prevent repeated spam checks on that account * Expire spam check data after 3 months * Add support for local statuses, reduce expiration to 1 week, always create a report * Add content warnings to the spam check and exempt empty statuses * Change Nilsimsa threshold to 95 and make sure removed statuses are removed from the spam check * Add all matched statuses into automatic report	6 years ago
Eugen Rochko	b851456139	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	6 years ago
Eugen Rochko	23aeef52cc	Remove Salmon and PubSubHubbub (#11205) ... * Remove Salmon and PubSubHubbub endpoints * Add error when trying to follow OStatus accounts * Fix new accounts not being created in ResolveAccountService	6 years ago
Thibaut Girka	6ab84c12a7	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	0d9ffe56fb	Add request pool to improve delivery performance (#10353) ... * Add request pool to improve delivery performance Fix #7909 * Ensure connection is closed when exception interrupts execution * Remove Timeout#timeout from socket connection * Fix infinite retrial loop on HTTP::ConnectionError * Close sockets on failure, reduce idle time to 90 seconds * Add MAX_REQUEST_POOL_SIZE option to limit concurrent connections to the same server * Use a shared pool size, 512 by default, to stay below open file limit * Add some tests * Add more tests * Reduce MAX_IDLE_TIME from 90 to 30 seconds, reap every 30 seconds * Use a shared pool that returns preferred connection but re-purposes other ones when needed * Fix wrong connection being returned on subsequent calls within the same thread * Reduce mutex calls on flushes from 2 to 1 and add test for reaping	6 years ago
Thibaut Girka	aaec64a500	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb - config/locales/simple_form.en.yml	6 years ago
ThibG	47ef4a6c7a	Apply filters to poll options (#11174) ... * Apply filters to poll options in WebUI Fixes #11128 * Apply filters to poll options server-side * Add poll options to searchable text	6 years ago
Thibaut Girka	356e9150df	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/lib/sanitize_config.rb Keep our version, we support the tags upstream transforms. - package.json - yarn.lock	6 years ago