mastodon

Commit Graph

Author	SHA1	Message	Date
David Yip	395e64e858	Thank you, Officer Murphy	7 years ago
David Yip	3ce1385b25	Add examples based on errors seen in #317	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	c2e1bfd9ae	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Yamagishi Kazutoshi	1d92b90be9	Fix force_ssl conditional (#6201 )	7 years ago
Jenkins	c69a23ae46	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	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
Jenkins	fc884d015a	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	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
David Yip	a057ed5cfe	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	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
Jenkins	8ca91cef45	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	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
David Yip	1ab12ba38e	Merge remote-tracking branch 'origin/master' into merge-upstream	8 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	8 years ago
David Yip	b28b405b97	Merge remote-tracking branch 'origin/master' into gs-master	8 years ago
ysksn	9dd5e329ab	Remove empty strings (#5732 )	8 years ago
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at `3023725936`	8 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	8 years ago
aschmitz	b95c48748c	Per-user reblog hiding implementation/fixes/tests Note that this will only hide/show future reblogs by a user, and does nothing to remove/add reblogs that are already in the timeline. I don't think that's a particularly confusing behavior, and it's a lot easier to implement (similar to mutes, I believe).	8 years ago
Nanamachi	d200e041fe	Rewrite account_controller_spec (#5633 ) * make accounts_controller_spec DRY * Add blocked user spec	8 years ago
David Yip	4fa2f7e82d	Set up /settings/keyword_mutes. #164 . This should eventually be accessible via the API and the web frontend, but I find it easier to set up an editing interface using Rails templates and the like. We can always take it out if it turns out we don't need it.	8 years ago
David Yip	6cd5b3bbe5	Merge remote-tracking branch 'origin/master' into gs-master	8 years ago
Eugen Rochko	3283868e28	Improve spec of Feed and UserTrackingConcern (#5367 )	8 years ago
kibigo!	8d6b9ba494	Merge upstream 2.0ish #165	8 years ago
Akihiko Odaki	cc796298c9	Fix pagination in Api::V1::BlocksController (#5285 )	8 years ago
nullkal	633426b261	Add moderation note (#5240 ) * Add moderation note * Add frozen_string_literal * Make rspec pass	8 years ago
Eugen Rochko	f486ef2666	Redesign public hashtag pages (#5237 )	8 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	8 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	8 years ago
ThibG	dfaa219f88	Fix HTTP responses for salmon and ActivityPub inbox processing (#5200 ) * Return sensible HTTP status for ActivityPub inbox processing * Return sensible HTTP status for salmon slap processing * Return additional information to debug signature verification failures	8 years ago
Eugen Rochko	47ecd652d3	Make Chrome splash screen same color as web UI's background color (#5169 )	8 years ago
Akihiko Odaki	cdacac8c6c	Fix order of paginated accounts in FollowerDomainsController and spec (#3357 ) * Fix order of paginated accounts in FollowerDomainsController Unordered pagination could result in unexpected behavior. * Cover Settings::FollowerDomainsController more	8 years ago
Eugen Rochko	eb605141ff	Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112 )	8 years ago
Eugen Rochko	4ec1771165	Add ability to specify alternative text for media attachments (#5123 ) * Fix #117 - Add ability to specify alternative text for media attachments - POST /api/v1/media accepts `description` straight away - PUT /api/v1/media/:id to update `description` (only for unattached ones) - Serialized as `name` of Document object in ActivityPub - Uploads form adjusted for better performance and description input * Add tests * Change undo button blend mode to difference	8 years ago
Ondřej Hruška	83bda6c1a8	Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream	8 years ago
Ondřej Hruška	9330ea1f4d	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	8 years ago
Eugen Rochko	293972f716	New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051 )	8 years ago
aschmitz	669fe9ee06	Change IDs to strings rather than numbers in API JSON output (#5019 ) * Fix JavaScript interface with long IDs Somewhat predictably, the JS interface handled IDs as numbers, which in JS are IEEE double-precision floats. This loses some precision when working with numbers as large as those generated by the new ID scheme, so we instead handle them here as strings. This is relatively simple, and doesn't appear to have caused any problems, but should definitely be tested more thoroughly than the built-in tests. Several days of use appear to support this working properly. BREAKING CHANGE: The major(!) change here is that IDs are now returned as strings by the REST endpoints, rather than as integers. In practice, relatively few changes were required to make the existing JS UI work with this change, but it will likely hit API clients pretty hard: it's an entirely different type to consume. (The one API client I tested, Tusky, handles this with no problems, however.) Twitter ran into this issue when introducing Snowflake IDs, and decided to instead introduce an `id_str` field in JSON responses. I have opted to not do that, and instead force all IDs to 64-bit integers represented by strings in one go. (I believe Twitter exacerbated their problem by rolling out the changes three times: once for statuses, once for DMs, and once for user IDs, as well as by leaving an integer ID value in JSON. As they said, "If you’re using the `id` field with JSON in a Javascript-related language, there is a very high likelihood that the integers will be silently munged by Javascript interpreters. In most cases, this will result in behavior such as being unable to load or delete a specific direct message, because the ID you're sending to the API is different than the actual identifier associated with the message." [1]) However, given that this is a significant change for API users, alternatives or a transition time may be appropriate. 1: https://blog.twitter.com/developer/en_us/a/2011/direct-messages-going-snowflake-on-sep-30-2011.html * Additional fixes for stringified IDs in JSON These should be the last two. These were identified using eslint to try to identify any plain casts to JavaScript numbers. (Some such casts are legitimate, but these were not.) Adding the following to .eslintrc.yml will identify casts to numbers: ~~~ no-restricted-syntax: - warn - selector: UnaryExpression[operator='+'] > :not(Literal) message: Avoid the use of unary + - selector: CallExpression[callee.name='Number'] message: Casting with Number() may coerce string IDs to numbers ~~~ The remaining three casts appear legitimate: two casts to array indices, one in a server to turn an environment variable into a number. * Back out RelationshipsController Change This was made to make a test a bit less flakey, but has nothing to do with this branch. * Change internal streaming payloads to stringified IDs as well Per https://github.com/tootsuite/mastodon/pull/5019#issuecomment-330736452 we need these changes to send deleted status IDs as strings, not integers.	8 years ago
Eugen Rochko	ad8e856a5b	Fix error when following locked accounts (#4896 ) (cherry picked from commit `0ef9d45d05`)	8 years ago
Eugen Rochko	472df24579	When web UI URL used while logged out, redirect to static page (#4954 )	8 years ago
Surinna Curtis	83b3a0389c	Add more specs for the /api/v1/mutes/details endpoint	8 years ago
Surinna Curtis	70592cdaba	Add a /api/v1/mutes/details route that just returns the array of mutes.	8 years ago
Surinna Curtis	eaaf2170fe	API support for muting notifications (and specs)	8 years ago
Eugen Rochko	0ef9d45d05	Fix error when following locked accounts (#4896 )	8 years ago
Surinna Curtis	3cac5bc2c3	Fix a spuriously failing spec that assumed we required short bios like upstream	8 years ago

1 2 3 4 5 ...

299 Commits (aa2bf07281ba1e41c9e32a760684c15081524a7c)