408 Commits (3a3b40e0c36902b66526303af8d5fdecb8bab5c2)

Author	SHA1	Message	Date
ysksn	0c80715235	Add spec for Api::V1::Timelines::DirectController (#9547)	6 years ago
ysksn	351938520d	Add specs for Api::V1::Instances::PeersController (#9546)	6 years ago
ysksn	2d871feb10	Add spec for Api::V1::EndorsementsController (#9543)	6 years ago
ysksn	3fa9615cb3	Add spec for Api::V1::Instances::ActivityController (#9545)	6 years ago
ysksn	a3dcbfddd6	Add specs for Accounts::PinsController (#9542)	6 years ago
ysksn	3c31c28605	Add spec for Admin::ActionLogsController#index (#9522)	6 years ago
ysksn	458e2b0c5b	Add specs for RemoteInteractionController (#9524)	6 years ago
ysksn	c1600a0f69	Add spec for Admin::DashboardController#index (#9523)	6 years ago
Sumit Khanna	769c2d2680	Error message for avatar image that's too large. #9204 (#9518) ... * Error message for avatar image that's too large. #9204 * Code climate/formatting * Removed avatar error message * Moved valid image dimentions check to update service * removed unnescessary begin block * code climate formatting * code climate indent fix	6 years ago
ysksn	795bac44fd	Add spec for Settings::ExportsController#create (#9512)	6 years ago
ysksn	ed24bb2c3e	Add specs for activitypub collections controller (#9484) ... * Add specs for ActivityPub::CollectionsController#show * Raise ActiveRecord::RecordNotFound Raising ActiveRecord::NotFound raises NameError: uninitialized constant ActiveRecord::NotFound.	6 years ago
ysksn	6eae8f77af	Add spec for Admin::SuspentionsController#new (#9483)	6 years ago
ysksn	361818e931	Fix Admin::TagsController#unhide (#9481)	6 years ago
ysksn	ae3d2f446a	Add specs for Admin::InvitesController (#9471)	6 years ago
ysksn	d3547fa005	Add specs for ActivityPub::InboxesController (#9456)	6 years ago
ThibG	e88c6a5c3c	Fix thread depth computation in statuses_controller (#9426) ... * Add test that should currently fail * Fix depth computation (will still fail if statuses have been filtered out) * Fix handling of broken threads	6 years ago
Eugen Rochko	73faadad28	Redesign admin accounts index (#9340) ... * Improve overview of accounts in admin UI - Display suspended status, role, last activity and IP prominently - Default to showing local accounts - Default to not showing suspended accounts * Remove unused strings * Fix tests * Allow filtering accounts by IP mask	6 years ago
Eugen Rochko	6d59dfa15d	Optimize the process of following someone (#9220) ... * Eliminate extra accounts select query from FollowService * Optimistically update follow state in web UI and hide loading bar Fix #6205 * Asynchronize NotifyService in FollowService And fix failing test * Skip Webfinger resolve routine when called from FollowService if possible If an account is ActivityPub, then webfinger re-resolving is not necessary when called from FollowService. Improve options of ResolveAccountService	6 years ago
takayamaki	33976c8ecc	fix: Execute PAM authentication tests on CircleCI (#9029) ... and use 'if' option of context block	6 years ago
Eugen Rochko	d5bfba3262	Do not test PAM authentication by default (#9027) ... * Do not test PAM authentication by default * Disable PAM tests if PAM is not enabled	6 years ago
Eugen Rochko	21ad21cb50	Improve signature verification safeguards (#8959) ... * Downcase signed_headers string before building the signed string The HTTP Signatures draft does not mandate the “headers” field to be downcased, but mandates the header field names to be downcased in the signed string, which means that prior to this patch, Mastodon could fail to process signatures from some compliant clients. It also means that it would not actually check the Digest of non-compliant clients that wouldn't use a lowercased Digest field name. Thankfully, I don't know of any such client. * Revert "Remove dead code (#8919)" This reverts commit a00ce8c92c. * Restore time window checking, change it to 12 hours By checking the Date header, we can prevent replaying old vulnerable signatures. The focus is to prevent replaying old vulnerable requests from software that has been fixed in the meantime, so a somewhat long window should be fine and accounts for timezone misconfiguration. * Escape users' URLs when formatting them Fixes possible HTML injection * Escape all string interpolations in Formatter class Slightly improve performance by reducing class allocations from repeated Formatter#encode calls * Fix code style issues	6 years ago
ashleyhull-versent	f194857ac9	rubocop issues - Cleaning up (#8912) ... * cleanup pass * undo mistakes * fixed. * revert	6 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	6 years ago
aus-social	0a4739c732	lint pass 2 (#8878) ... * Code quality pass * Typofix * Update applications_controller_spec.rb * Update applications_controller_spec.rb	6 years ago
Eugen Rochko	e645ae9561	Change admin accounts default sort to most recent (#8813)	6 years ago
aus-social	1f98eae1cf	Lint pass (#8876)	6 years ago
Eugen Rochko	f0fff3eb10	Support min_id-based pagination in REST API (#8736) ... * Allow min_id pagination in Feed#get * Add min_id pagination to home and list timeline APIs * Add min_id pagination to account statuses, public and tag APIs * Remove unused stub in reports API * Use min_id pagination in notifications, favourites, and fix order * Fix HomeFeed#from_database not using paginate_by_id	6 years ago
luzpaz	40dd19be37	Misc. typos (#8694) ... Found via `codespell -q 3 --skip="./app/javascript/mastodon/locales,./config/locales"`	6 years ago
Eugen Rochko	2288d50a7b	Add force_login option to OAuth authorize page (#8655) ... * Add force_login option to OAuth authorize page For when a user needs to sign into an app from multiple accounts on the same server * When logging out from modal header, redirect back after re-login	7 years ago
Jakub Mendyk	f3a12ddfd0	Make Api::V1::MutesController paginate properly (#8472) ... Fixes #8463	7 years ago
Jakub Mendyk	6cb3514d64	Add ability to change an instance default theme from the administration panel (#7092) (#8381) ... * Add default_settings class method to ScopedSettings ScopedSettings was extended to use value of unscoped setting instead of only using defaults set in config/settings.yml for selected settings. This adds possibility for admins to set default values of users' settings, for example default theme (as requested in #7092). * Add ability to change an instance default theme Closes #7092	7 years ago
Eugen Rochko	2374a00c10	Add confirmation step to account suspensions (#8353) ... * Add confirmation page for suspensions * Suspension confirmation closes reports, linked from report UI * Fix tests	7 years ago
Eugen Rochko	78fa926ed5	Add remote interaction dialog for toots (#8202) ... * Add remote interaction dialog for toots * Change AuthorizeFollow into AuthorizeInteraction, support statuses * Update brakeman.ignore * Adjust how interaction buttons are display on public pages * Fix tests	7 years ago
S.H	2aeeffc3ec	Update Rails (#8141) ... * Update Rails * fix Update Rails	7 years ago
Eugen Rochko	60df87f6f0	Compensate for scrollbar disappearing when media modal visible (#8100) ... * Compensate for scrollbar disappearing when media modal visible Make auth pages backgrounds lighter * Fix typo	7 years ago
Eugen Rochko	1f6ed4f86a	Add more granular OAuth scopes (#7929) ... * Add more granular OAuth scopes * Add human-readable descriptions of the new scopes * Ensure new scopes look good on the app UI * Add tests * Group scopes in screen and color-code dangerous ones * Fix wrong extra scope	7 years ago
Eugen Rochko	da8fe8079e	Re-add follow recommendations API (#7918) ... * Re-add follow recommendations API GET /api/v1/suggestions Removed in 8efa081f21 due to Neo4J dependency. The algorithm uses triadic closures, takes into account suspensions, blocks, mutes, domain blocks, excludes locked and moved accounts, and prefers more recently updated accounts. * Track interactions with people you don't follow Replying to, favouriting and reblogging someone you're not following will make them show up in follow recommendations. The interactions have different weights: - Replying is 1 - Favouriting is 10 (decidedly positive interaction, but private) - Reblogging is 20 Following them, muting or blocking will remove them from the list, obviously. * Remove triadic closures, ensure potential friendships are trimmed	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
Shuhei Kitagawa	23955d956e	Add tests for remote_unfollows_controller (#7879)	7 years ago
Shuhei Kitagawa	459394a020	Add missing tests for confirmations controller (#7866)	7 years ago
Shuhei Kitagawa	63b05096c7	Add tests for shares_controller (#7835)	7 years ago
Eugen Rochko	7eec279c7f	Change language opt-out to language opt-in (#7823) ... * Switch filtered_languages to chosen_languages * Adjust interface * Remove unused translations	7 years ago
Shuhei Kitagawa	ad8814232f	Add tests for following accounts controller (#7800)	7 years ago
Shuhei Kitagawa	5b47774ab8	Add tests for followers_accounts_controller (#7794)	7 years ago
Shuhei Kitagawa	6151308c47	Add missing tests for admin/accounts_controller (#7791)	7 years ago
Shuhei Kitagawa	7086aa598b	Add tests for intents_controller (#7763)	7 years ago
Shuhei Kitagawa	12fa2500c4	Add missing tests for sessions controller (#7744)	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
Shuhei Kitagawa	00512ecf87	Add tests for migrations_controller (#7707)	7 years ago
Shuhei Kitagawa	b0b34a5e38	Add a test for emojis_controller (#7652)	7 years ago
Yamagishi Kazutoshi	6d99a0b652	Fix tests for invites controller (regression from 4d81809f36) (#7597)	7 years ago
Shuhei Kitagawa	12e590edd7	Add tests for report notes controller (#7589)	7 years ago
Eugen Rochko	8378b72eba	Ensure push subscription is immediately removed when application is revoked (#7548) ... * Ensure push subscription is immediately removed when application is revoked * When token is revoked from app, unsubscribe too	7 years ago
Shuhei Kitagawa	b48a166c82	Add tests for account_moderation_notes_controller (#7524)	7 years ago
Shuhei Kitagawa	50491e0d92	Add tests for invites controller (#7441) ... * Add tests for invites controller * Small refactoring and fix for invites controller	7 years ago
Eugen Rochko	b4fb766b23	Add REST API for Web Push Notifications subscriptions (#7445) ... - POST /api/v1/push/subscription - PUT /api/v1/push/subscription - DELETE /api/v1/push/subscription - New OAuth scope: "push" (required for the above methods)	7 years ago
Shuhei Kitagawa	ce35d81db7	Add tests for admin/roles_controller (#7421)	7 years ago
Shuhei Kitagawa	35eff337d5	Add tests for admin/invites_controller (#7412)	7 years ago
Shuhei Kitagawa	bd10a7e480	Add resend confirmation for admin (#7378) ... * Add confirmations_controller#resend * Add tests for confirmations_controller#resend * Add translations	7 years ago
Eugen Rochko	c7d1a2e400	Improve admin UI for accounts (#7360) ... * Improve design of account statuses admin UI (consistent with reports) * Make account moderation notes look consistent with report notes * i18n-tasks remove-unused * Fix code style issues * Fix tests	7 years ago
Shuhei Kitagawa	661f7e6d9d	Add tests for admin/custom_emojis_controller (#7350)	7 years ago
Eugen Rochko	28bd4b9800	Serialize webfinger XML with Ox instead of Nokogiri (#7319) ... 25ms -> 0.5ms	7 years ago
Akihiko Odaki	1258efa882	Paginate descendant statuses in public page (#7148)	7 years ago
Yamagishi Kazutoshi	648d645c2f	Fix randomly fail (similar #7219) (#7225)	7 years ago
Yamagishi Kazutoshi	3f6893c641	Reset locale on registration tests (#7219)	7 years ago
Yamagishi Kazutoshi	d10447c3a8	Use raw status code on have_http_status (#7214)	7 years ago
Eugen Rochko	a9c440637c	Improve report layout (#7188) ... * Use table for statuses in report * Display reported account and reporter in the same table * Split accounts and general report info into two tables again * Redesign report statuses table, notes, merge notes and action log * Remove unused translations * Fix code style issue * Fix code style issue * Fix code style issue	7 years ago
Akihiko Odaki	a1049e9380	Redirect to account status page for page of status stream entry (#7104) ... Commit 519119f657 missed a change for stream entry page. Instead of duplicating the change, redirect to account status page. It would also help crawlers (of search engines, for example) to understand a stream entry URL and its corresponding status URL points to the same page.	7 years ago
Alexander	8e88a18316	update gem, test pam authentication (#7028) ... * update gem, test pam authentication * add description for test parameters * fix inclusion of optional group	7 years ago
Emelia Smith	219a4423d8	Feature: Allow staff to change user emails (#7074) ... * Admin: Show unconfirmed email address on account page * Admin: Allow staff to change user email addresses * ActionLog: On change_email, log current email address and new unconfirmed email address	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
Emelia Smith	2e59751823	Improve require_admin! and require_staff! filters (#7018) ... Previously these returns 302 redirects instead of 403s, which meant posting links to admin pages in slack caused them to unfurl, rather than stay as a link. Additionally, require_admin! doesn't appear to be actively used, on require_staff!	7 years ago
Emelia Smith	e85cffb236	Feature: Report improvements (#6967) (#7000) ... * Implement Assignment of Reports (#6967) * Change translation of admin.report.comment.label to "Report Comment" for clarity As we'll soon add the ability for reports to have comments on them, this clarification makes sense. * Implement notes for Reports This enables moderators to leave comments about a report whilst they work on it * Fix display of report moderation notes * Allow reports to be reopened / marked as unresolved * Redirect to reports listing upon resolution of report * Implement "resolve with note" functionality * Add inverse relationship for report notes * Remove additional database querying when loading report notes * Fix tests for reports * Fix localisations for report notes / reports	7 years ago
Akihiko Odaki	a38dbd9c8a	Redirect from Web tag timeline to public tag timeline if not signed in (#6633) ... This is also implemented in Pawoo: ceafdbd1bb	7 years ago
Akihiko Odaki	51d760960c	Set the default locale in config (#6580) ... Previously the default locale was set by Localized concern for controllers, but it was not enforced for mailers. config is enforced throughout the application and an appropriate place to set the default locale.	7 years ago
Eugen Rochko	4bc625166e	Fix bug in relationships API introduced by #6482 (#6527) ... It was merge when it needed to be deep_merge. And added some tests	7 years ago
abcang	cf32f7da5c	Fix response of signature_verification_failure_reason (#6441)	7 years ago
Akihiko Odaki	613e7c7521	Rename ResolveRemoteAccountService to ResolveAccountService (#6327) ... The service used to be named ResolveRemoteAccountService resolves local accounts as well.	7 years ago
Aboobacker MK	112b1fa265	Redirect to 2FA creation page when otp_secret is not available (#6314)	7 years ago
Eugen Rochko	9b3b40df66	Fix regeneration marker not expiring (#6290) ... * Fix regeneration key not getting expired * Add rake task to remove old regeneration markers	7 years ago
Eugen Rochko	7badad7797	Fix home regeneration (#6251) ... * Fix regeneration marker not being removed after completion * Return HTTP 206 from /api/v1/timelines/home if regeneration in progress Prioritize RegenerationWorker by putting it into default queue * Display loading indicator and poll home timeline while it regenerates * Add graphic to regeneration message * Make "not found" indicator consistent with home regeneration	7 years ago
Eugen Rochko	dbda87c31f	Revert #5772 (#6221)	7 years ago
Yamagishi Kazutoshi	1d92b90be9	Fix force_ssl conditional (#6201)	7 years ago
Patrick Figel	5ec25ff3e1	Fix email confirmation link not updating email (#6187) ... A change introduced in #6125 prevents `Devise::Models::Confirmable#confirm` from being called for existing users, which in turn leads to `email` not being set to `unconfirmed_email`, breaking email updates. This also adds a test that would've caught this issue.	7 years ago
Akihiko Odaki	161c72d66d	Allow to dereference Follow object for ActivityPub (#5772) ... * Allow to dereference Follow object for ActivityPub * Accept IRI as object representation for Accept activity	7 years ago
Eugen Rochko	1356ed72cd	Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)	7 years ago
Eugen Rochko	a865b62efc	Rate limit by user instead of IP when API user is authenticated (#5923) ... * Fix #668 - Rate limit by user instead of IP when API user is authenticated * Fix code style issue * Use request decorator provided by Doorkeeper	7 years ago
abcang	99242b92bc	Keep WebPush settings (#5879)	7 years ago
aschmitz	4de211b80a	Break out nested relationship API keys (#5887) ... * Break out nested relationship API keys This closes #5856 by restoring the existing behavior of the `muting` and `following` keys (returning booleans rather than truthy or false). It adds `showing_reblogs` and `muting_notifications` keys: * `showing_reblogs` returns true if: 1. You've requested to follow the user, with reblogs shown, or 2. You are following the user, with reblogs shown. * `muting_notifications` returns true if you have muted the user and their notifications as well. * Rubocop fix * Fix pulling reblog/mute status from relationships I could swear this had passed tests before, but apparently not. Works now. * More test fixes Really, you'd expect this to be more straightforward.	7 years ago
aschmitz	eeaec39888	Allow hiding of reblogs from followed users (#5762) ... * Allow hiding of reblogs from followed users This adds a new entry to the account menu to allow users to hide future reblogs from a user (and then if they've done that, to show future reblogs instead). This does not remove or add historical reblogs from/to the user's timeline; it only affects new statuses. The API for this operates by sending a "reblogs" key to the follow endpoint. If this is sent when starting a new follow, it will be respected from the beginning of the follow relationship (even if the follow request must be approved by the followee). If this is sent when a follow relationship already exists, it will simply update the existing follow relationship. As with the notification muting, this will now return an object ({reblogs: [true|false]}) or false for each follow relationship when requesting relationship information for an account. This should cause few issues due to an object being truthy in many languages, but some modifications may need to be made in pickier languages. Database changes: adds a show_reblogs column (default true, non-nullable) to the follows and follow_requests tables. Because these are non-nullable, we use the existing MigrationHelpers to perform this change without locking those tables, although the tables are likely to be small anyway. Tests included. See also <https://github.com/glitch-soc/mastodon/pull/212>. * Rubocop fixes * Code review changes * Test fixes This patchset closes #648 and resolves #3271. * Rubocop fix * Revert reblogs defaulting in argument, fix tests It turns out we needed this for the same reason we needed it in muting: if nil gets passed in somehow (most usually by an API client not passing any value), we need to detect and handle it. We could specify a default in the parameter and then also catch nil, but there's no great reason to duplicate the default value.	7 years ago
Eugen Rochko	24cafd73a2	Lists (#5703) ... * Add structure for lists * Add list timeline streaming API * Add list APIs, bind list-account relation to follow relation * Add API for adding/removing accounts from lists * Add pagination to lists API * Add pagination to list accounts API * Adjust scopes for new APIs - Creating and modifying lists merely requires "write" scope - Fetching information about lists merely requires "read" scope * Add test for wrong user context on list timeline * Clean up tests	7 years ago
ysksn	9dd5e329ab	Remove empty strings (#5732)	7 years ago
Surinna Curtis	031a5a8f92	Optional notification muting (#5087) ... * Add a hide_notifications column to mutes * Add muting_notifications? and a notifications argument to mute! * block notifications in notify_service from hard muted accounts * Add specs for how mute! interacts with muting_notifications? * specs testing that hide_notifications in mutes actually hides notifications * Add support for muting notifications in MuteService * API support for muting notifications (and specs) * Less gross passing of notifications flag * Break out a separate mute modal with a hide-notifications checkbox. * Convert profile header mute to use mute modal * Satisfy eslint. * specs for MuteService notifications params * add trailing newlines to files for Pork :) * Put the label for the hide notifications checkbox in a label element. * Add a /api/v1/mutes/details route that just returns the array of mutes. * Define a serializer for /api/v1/mutes/details * Add more specs for the /api/v1/mutes/details endpoint * Expose whether a mute hides notifications in the api/v1/relationships endpoint * Show whether muted users' notifications are muted in account lists * Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:id/mute endpoint * make the hide/unhide notifications buttons work * satisfy eslint * In probably dead code, replace a dispatch of muteAccount that was skipping the modal with launching the mute modal. * fix a missing import * add an explanatory comment to AccountInteractions * Refactor handling of default params for muting to make code cleaner * minor code style fixes oops * Fixed a typo that was breaking the account mute API endpoint * Apply white-space: nowrap to account relationships icons * Fix code style issues * Remove superfluous blank line * Rename /api/v1/mutes/details -> /api/v2/mutes * Don't serialize "account" in MuteSerializer Doing so is somewhat unnecessary since it's always the current user's account. * Fix wrong variable name in api/v2/mutes * Use Toggle in place of checkbox in the mute modal. * Make the Toggle in the mute modal look better * Code style changes in specs and removed an extra space * Code review suggestions from akihikodaki Also fixed a syntax error in tests for AccountInteractions. * Make AddHideNotificationsToMute Concurrent It's not clear how much this will benefit instances in practice, as the number of mutes tends to be pretty small, but this should prevent any blocking migrations nonetheless. * Fix up migration things * Remove /api/v2/mutes	7 years ago
Nanamachi	d200e041fe	Rewrite account_controller_spec (#5633) ... * make accounts_controller_spec DRY * Add blocked user spec	7 years ago
Eugen Rochko	3283868e28	Improve spec of Feed and UserTrackingConcern (#5367)	7 years ago
Akihiko Odaki	cc796298c9	Fix pagination in Api::V1::BlocksController (#5285)	7 years ago
nullkal	633426b261	Add moderation note (#5240) ... * Add moderation note * Add frozen_string_literal * Make rspec pass	7 years ago
Eugen Rochko	f486ef2666	Redesign public hashtag pages (#5237)	7 years ago
utam0k	b3af3f9f8c	Implement EmailBlackList (#5109) ... * Implement BlacklistedEmailDomain * Use Faker::Internet.domain_name * Remove note column * Add frozen_string_literal comment * Delete unnecessary codes * Sort alphabetically * Change of wording * Rename BlacklistedEmailDomain to EmailDomainBlock	7 years ago
Yamagishi Kazutoshi	178f718a9b	Separate notifications preferences from general preferences (#4447) ... * Separate notifications preferences from general preferences * Refine settings/notifications/show * remove preferences.notifications	7 years ago