158 Commits (d8fbd74c47de3148d6693b5cb15e7e868f72448e)

Author	SHA1	Message	Date
Thibaut Girka	c24491a8df	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
sundevour	4bfd786550	formatter spec fixes & clarification (#8481) ... updates some "context" and "it" lines to have clearer explanations updates "context" lines to properly describe function input, and "it" lines to describe results	7 years ago
Thibaut Girka	43d132039b	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	5e1767173f	Display pending message on admin relays UI (#8494) ... * Add missing specs for relay accept/reject * Display pending message on admin relays UI	7 years ago
Thibaut Girka	280d7b1df8	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).	7 years ago
ThibG	59f7f4c923	Implement Undo { Accept { Follow } } (fixes #8234) (#8245) ... * Add Follow#revoke_request! * Implement Undo { Accept { Follow } } (fixes #8234)	7 years ago
Thibaut Girka	f26f1145ac	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x	7 years ago
Eugen Rochko	38e9662d78	Disable language detection for texts shorter than 140 characters (#8010) ... If the input text is blank after preparation (only mention, or only URL, or empty as in a media post), then use nil as language, since it's OK to show to everyone. Otherwise, always fall back to the server's default locale	7 years ago
Thibaut Girka	402da8065c	Migrate glitch-soc keyword mutes to Mastodon's ... Completely remove glitch-soc's Keyword Mutes, migrate existing database records to CustomFilters. Handling of client-side filters is still not implemented in the glitch-soc front-end.	7 years ago
Thibaut Girka	d392020da6	Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.	7 years ago
ThibG	1ca4e51eb3	Add option to not consider word boundaries when processing keyword filtering (#7975) ... * Add option to not consider word boundaries when filtering phrases * Add a few tests for keyword/phrase filtering	7 years ago
Eugen Rochko	cdb101340a	Keyword/phrase filtering (#7905) ... * Add keyword filtering GET|POST /api/v1/filters GET|PUT|DELETE /api/v1/filters/:id - Irreversible filters can drop toots from home or notifications - Other filters can hide toots through the client app - Filters use a phrase valid in particular contexts, expiration * Make sure expired filters don't get applied client-side * Add missing API methods * Remove "regex filter" from column settings * Add tests * Add test for FeedManager * Add CustomFilter test * Add UI for managing filters * Add streaming API event to allow syncing filters * Fix tests	7 years ago
David Yip	908a770d2b	keyword mute: use mentions scope in home feed filtering (#454) ... If a status shows up in mentions because all keyword mutes that might apply to it are marked as "don't apply to mentions", then it ought to show up in the home feed also.	7 years ago
David Yip	e931cf656d	Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions ... Conflicts: app/models/glitch/keyword_mute.rb	7 years ago
David Yip	8142bd2553	Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/models/status.rb The conflict in the Status model was due to 5bf5003384. It was resolved by accepting tootsuite's changes.	7 years ago
David Yip	cf28049f0a	Add a FeedManager example demonstrating non-mention keywords. #454.	7 years ago
David Yip	a40e322f4b	Fix spacing in some FeedManager examples.	7 years ago
Shuhei Kitagawa	22caa32ba2	Add tests for embeds controller (#7719) ... * Small refactoring of status_finder_spec * Add tests for embeds_controller	7 years ago
David Yip	e0eebba461	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml	7 years ago
Eugen Rochko	57b503d4ef	Resolve unknown status from Add activity, skip Remove if unknown (#7526) ... Fix #7518	7 years ago
David Yip	c816701550	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml	7 years ago
Eugen Rochko	cb5b5cb5f7	Slightly reduce RAM usage (#7301) ... * No need to re-require sidekiq plugins, they are required via Gemfile * Add derailed_benchmarks tool, no need to require TTY gems in Gemfile * Replace ruby-oembed with FetchOEmbedService Reduce startup by 45382 allocated objects * Remove preloaded JSON-LD in favour of caching HTTP responses Reduce boot RAM by about 6 MiB * Fix tests * Fix test suite by stubbing out JSON-LD contexts	7 years ago
MIYAGI Hikaru	eb593a5a0c	Append '.test' to hostname in stub data (#7260)	7 years ago
Eugen Rochko	75c4ab9d12	Remove "nsfw" category for sensitive statuses in OStatus serializer (#7048) ... Fix #7011	7 years ago
David Yip	67e77f230e	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load.	7 years ago
Levi Bard	cd0eaa349c	Enable updating additional account information from user preferences via rest api (#6789) ... * Enable updating additional account information from user preferences via rest api Resolves #6553 * Pacify rubocop * Decoerce incoming settings in UserSettingsDecorator * Create user preferences hash directly from incoming credentials instead of going through ActionController::Parameters * Clean up user preferences update * Use ActiveModel::Type::Boolean instead of manually checking stringified number equivalence	7 years ago
David Yip	eb39db7f93	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml	7 years ago
David Underwood	123a343d11	[WIP] Enable custom emoji on account pages and in the sidebar (#6124) ... Federate custom emojis with accounts	7 years ago
David Yip	f61aa8e0f7	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/styles/mastodon/components.scss app/models/media_attachment.rb	7 years ago
Akihiko Odaki	40e5d2303b	Validate HTTP response length while receiving (#6891) ... to_s method of HTTP::Response keeps blocking while it receives the whole content, no matter how it is big. This means it may waste time to receive unacceptably large files. It may also consume memory and disk in the process. This solves the inefficency by checking response length while receiving.	7 years ago
Jenkins	837b3804bf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	54b273bf99	Close http connection in perform method of Request class (#6889) ... HTTP connections must be explicitly closed in many cases, and letting perform method close connections makes its callers less redundant and prevent them from forgetting to close connections.	7 years ago
Jenkins	e8aeec4fea	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Rey Tucker	36b5703796	request: in the event of failure, try other IPs (#6761) (#6813) ... * request: in the event of failure, try other IPs (#6761) In the case where a name has multiple A/AAAA records, we should try subsequent records instead of immediately failing when we have a failure on the first IP address. This significantly improves delivery success when there are network connectivity problems affecting only IPv4 or IPv6. * fix method call style * request_spec: adjust test case to use Addrinfo * request: Request/open: move private addr check to within begin/rescue * request_spec: add case to test failover, fix exception check * Double Addrinfo.foreach so that it correctly yields instances	7 years ago
Jenkins	447d7e6127	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	e6520c0270	Fix #6657 - Use target instead of origin in Remove activity (#6664)	7 years ago
Eugen Rochko	9110db41c5	Federate pinned statuses over ActivityPub (#6610) ... * Federate pinned statuses over ActivityPub * Display pinned toots in web UI Fix #6117 * Fix migration * Fix tests * Update outbox_serializer.rb * Update remove_serializer.rb * Update add_serializer.rb * Update fetch_featured_collection_service.rb	7 years ago
Eugen Rochko	44829d8216	Fix missing focalPoint in ActivityPub JSON (#6609)	7 years ago
David Yip	1b8fcd4df5	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml	7 years ago
Eugen Rochko	41a01bec23	Federated reports (#6570) ... * Fix #2176: Federated reports * UI for federated reports * Add spec for ActivityPub Flag handler * Add spec for ReportService	7 years ago
Akihiko Odaki	2e8a492e88	Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)	7 years ago
Jenkins	2edf7128f2	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	f8f0572ee0	Do not push status to feed if its reblog is already inserted (#6488) ... A complemental change for precompute_feed_service_spec.rb also fixes its random failure which is caused by the Snowlake randomization of the order of an original status and its reblog.	7 years ago
Jenkins	544543e40a	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
abcang	7124881273	Improve performance of feed_manager_spec (#6517)	7 years ago
Jenkins	f839ac694c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	dbda87c31f	Revert #5772 (#6221)	7 years ago
Jenkins	722b3f567f	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	e4a241abef	Fix bad URL schemes being accepted (#6219) ... * Fix actors accepting invalid URI schemes or different host between URI and URL * Fix statuses accepting invalid URI scheme or different host to actor * Adjust tests to new requirements * Improve readability of mismatching_origin?/invalid_origin? methods	7 years ago
Jenkins	fc884d015a	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago