113 Commits (ebb4de7d3e01f59d0eeb55d9d398875ff3266211)

Author	SHA1	Message	Date
Claire	d1c87be8cf	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Claire	211d5c3c30	Fix inefficiencies in auto-linking code (#16506) ... The auto-linking code basically rewrote the whole string escaping non-ascii characters in an inefficient way, and building a full character offset map between the unescaped and escaped texts before sending the contents to TwitterText's extractor. Instead of doing that, this commit changes the TwitterText regexps to include valid IRI characters in addition to valid URI characters.	4 years ago
Claire	e2a2bc9021	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header.	4 years ago
Takeshi Umeda	c968d22ee9	Fix an error with 'multiple mentions with same username' (#16038)	4 years ago
Eugen Rochko	7183d9a113	Change multiple mentions with same username to render with domain (#15718) ... Fix #15506	4 years ago
Claire	3ad6ef72cb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Claire	a4dcaef53b	Prepare Mastodon for zeitwerk autoloader (#15917) ... * Prepare Mastodon for zeitwerk autoloader (Rails 6) Add inflections and rename/move a few classes. In particular, app/lib/exceptions.rb and app/lib/sanitize_config.rb were manually loaded while still in autoload paths. * Add inflection for Url → URL	4 years ago
Claire	43eff898a0	Prepare Mastodon for Rails 6 (#15911) ... * Fix misuse of foreign_type * Fix use of removed "add_template_helper" * Use response.media_type instead of response.content_type in tests * Fix CSV export controller test on Rails 6 Rails 6 sets a "filename*" field in the Content-Disposition header to explicitly encode the filename as UTF-8. This changes checks the first part of the Content-Disposition header so it matches in both Rails 5 and Rails 6. * Fix emoji formatting with Rails 6 * Make emoji output more idiomatic and robust * Switch from redis-rails gem to built-in Rails redis cache storage	4 years ago
Claire	d8fdbb054e	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.	4 years ago
Claire	65db262550	Update twitter-text from 1.14 to 3.1.0 and fix toot character counting (#15382) ... * Update twitter-text from 1.14 to 3.1.0 * Disable emoji parsing * Properly depend on twitter-text for url detection * Fix some URLs being wrongly detected client-side * Add test for server-side validation of non-autolinkable URLs * Fix server-side status length counting	4 years ago
Claire	b81710c02c	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `CONTRIBUTING.md`: Not a real conflict, glitch-soc quotes the upstream file, which has been changed. Update the quote.	4 years ago
luigi	eb51e43fb4	Optimize some regex matching (#15528) ... * Use Regex#match? * Replace =~ too * Avoid to call match? from Nil * Keep value of Regexp.last_match	4 years ago
Thibaut Girka	311f457430	Fix crash when autolinking an invalid URI in Markdown	5 years ago
Thibaut Girka	3fefb7909b	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/shared.js`: Upstream has changed how Tesseract.js gets included and dropped a dependency. The conflict is caused by glitch-soc having different code due to its theming system. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream refactor/code style change in a place we replaced upstream's repo URL with ours. Ported upstram changes, keeping our repo URL. - `yarn.lock`: Upstream dropped dependencies, one of which was textually too close to a glitch-soc-specific dependency. Not a real conflict.	5 years ago
dependabot[bot]	8972e5f7f6	Bump rubocop from 0.86.0 to 0.88.0 (#14412) ... * Bump rubocop from 0.86.0 to 0.88.0 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.86.0 to 0.88.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.86.0...v0.88.0) Signed-off-by: dependabot[bot] <support@github.com> * Fix for latest RuboCop Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	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	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	a64973aecf	Fix malformed HTML causing uncaught error (#13042) ... Fix OEmbed preview API leaking existence of private statuses (see #12930)	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	41a98b6543	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb	6 years ago
BSKY	fccf83e1f2	Add noopener and/or noreferrer (#12202)	6 years ago
Thibaut Girka	74c5b2bd08	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)	6 years ago
ThibG	ec2a439a22	Add account bio to account admin view (#11473) ... * Add account bio to account admin view * Change styling to make bio fields / content more readable	6 years ago
Thibaut Girka	04534604c6	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/views/admin/dashboard/index.html.haml - config/locales/simple_form.en.yml	6 years ago
Eugen Rochko	5e35aa8280	Fix non-lowercase hashtags not being picked up by the streaming API (#11508) ... Regression from f371b32 Fix hashtag links always being lowercase	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	86d4461948	Fix HTML entities being encoded as hashtag links…	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
Eugen Rochko	b851456139	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	6 years ago
Thibaut Girka	5ea45351a0	Fix rendering of emoji in public pages	6 years ago
Thibaut Girka	d6a7d62dc6	Do not share a single Redcarpet::Markdown object across threads ... There are apparently thread-safety issues: https://github.com/vmg/redcarpet/pull/672	6 years ago
Thibaut Girka	2332b3f146	Fix local text/html toots not being sanitized	6 years ago
Thibaut Girka	9ca21e93cc	Minor optimization	6 years ago
Thibaut Girka	dd5bf40b97	Properly escape HTML in code blocks	6 years ago
Thibaut Girka	0be93820f3	Fix autolinking, and newlines in code blocks ... Autolinking is now performed *after* the Markdown pass, by replacing HTML tags with zero-width spaces and running the twitter-text extractor as usual, except it does not auto-link URLs to avoid links in links…	6 years ago
Thibaut Girka	d7520f8175	Add support for HTML-formatted toots	6 years ago
Thibaut Girka	94aef563b9	Add support for markdown-formatted toots	6 years ago
ThibG	c1c8c7b2c8	Minor performance improvements and cleanup in formatter (#10765)	6 years ago
Eugen Rochko	f1bc90ab50	Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401) ... Also, fix some n+1 queries Resolve #10365	6 years ago
ThibG	80f0910e21	Add support for custom emojis in poll options (#10322) ... * Backend changes for custom emoji support in poll options * Serialize poll emojis in REST API * Render custom emojis in poll options * Render custom emoji in poll options on public pages	6 years ago
ThibG	efd0fb8088	Fix newlines in OStatus and RSS serializations (#10183)	6 years ago
ThibG	636db1f54f	When serializing polls over OStatus, serialize poll options to text (#10160) ... * When serializing polls over OStatus, serialize poll options to text * Do the same for RSS feeds * Use “[ ] ” as a prefix for poll options instead of “- ”	6 years ago
Eugen Rochko	016ad37bc8	Fix URL linkifier grabbing full-width spaces and quotations (#9997) ... Fix #9993 Fix #5654	6 years ago
Hinaloe	157d3af46c	Only URLs extract with pre-escaped text (#9991) ... * [test] add japanese hashtag testcase * Only URLs extract with pre-escaped text ( https://github.com/tootsuite/mastodon/issues/9989 )	6 years ago
Jakub Mendyk	6a5e3da6b0	Allow most kinds of characters in URL query (fixes #8408) (#8447) ... * Allow unicode characters in URL query strings Fixes #8408 * Alternative approach to unicode support in urls Adds PoC/idea to approch this problem.	6 years ago