212 Commits (5f35b39f6f7b591fd67cafe159fb65312b033b54)

Author	SHA1	Message	Date
Jenkins	f839ac694c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	dbda87c31f	Revert #5772 (#6221)	7 years ago
Jenkins	c69a23ae46	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 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.	8 years ago
Jenkins	fc884d015a	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 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	8 years ago
David Yip	6abb0950c6	Examples for Status.as_public_timeline. ... Also adjust the examples for Status.as_tag_timeline to match the nomenclature used in .as_public_timeline (e.g. "account" -> "viewer").	8 years ago
David Yip	e35a350119	Examples for Status#set_locality and .as_tag_timeline. ... This commit also: - exposes the local-only emoji so that it can be used in examples - allows local_only to be set explicitly, i.e. for timeline filtering specs	8 years ago
David Yip	95c270f5b1	Merge remote-tracking branch 'origin/master' into gs-master	8 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.	8 years ago
David Yip	e77c3996a5	Merge remote-tracking branch 'origin/master' into gs-master	8 years ago
Eugen Rochko	740f8a95a9	Add consumable invites (#5814) ... * Add consumable invites * Add UI for generating invite codes * Add tests * Display max uses and expiration in invites table, delete invite * Remove unused column and redundant validator - Default follows not used, probably bad idea - InviteCodeValidator is redundant because RegistrationsController checks invite code validity * Add admin setting to disable invites * Add admin UI for invites, configurable role for invite creation - Admin UI that lists everyone's invites, always available - Admin setting min_invite_role to control who can invite people - Non-admin invite UI only visible if users are allowed to * Do not remove invites from database, expire them instantly	8 years ago
Jenkins	86f4f8e158	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
ysksn	1104ac35d3	Add tests for Streamable (#5771)	8 years ago
Jenkins	167fe2ab08	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	e84fecb7e9	Add logging of admin actions (#5757) ... * Add logging of admin actions * Update brakeman whitelist * Log creates, updates and destroys with history of changes * i18n: Update Polish translation (#5782) Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Split admin navigation into moderation and administration * Redesign audit log page * 🇵🇱 (#5795) * Add color coding to audit log * Change dismiss->resolve, log all outcomes of report as resolve * Update terminology (e-mail blacklist) (#5796) * Update terminology (e-mail blacklist) imho looks better * Update en.yml * Fix code style issues * i18n-tasks normalize	8 years ago
Jenkins	8f3e5f6128	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
ysksn	6f609dc4b4	Add tests for Remotable (#5768)	8 years ago
Jenkins	a36a2c1796	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
abcang	53e95c4efc	Fix N+1 at notification (#5752)	8 years ago
David Yip	e45cb0837b	Update .following_map examples with show-reblogs information.	8 years ago
David Yip	d083f7741a	Merge remote-tracking branch 'tootsuite/master'	8 years ago
ysksn	2590aac863	Add tests for AccountInteractions (#5751) ... * Add tests for class methods of AccountInteractions * Add tests for instance methods of AccountInteractions	8 years ago
ysksn	9d9b1aff1e	Add tests for Status#title (#5718)	8 years ago
beatrix	dec960c828	Merge pull request #208 from yipdw/keyword-mute ... Run keyword mutes on hashtags	8 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
ysksn	556c07df1f	Add tests for Status#verb (#5717)	8 years ago
David Yip	c2a92dffc9	Add some examples for Glitch::KeywordMute::TagMatcher. #208.	8 years ago
ysksn	3023725936	Add tests for Status#hidden? (#5719)	8 years ago
David Yip	08652baab0	Replace =~ with #matches?. #208. ... =~ made sense when we were passing it through to a regex, but we're no longer doing that: TagMatcher looks at individual tags and returns a value that *looks* like what you get out of #=~ but really isn't that meaningful. Probably a good idea to not subvert convention like this and instead use a name with guessable intent.	8 years ago
David Yip	cb4ef24ac9	Match keyword mute filter on hashtags. #208. ... It is reasonable to expect someone to enter #foo to mute hashtag #foo. However, tags are recorded on statuses without the preceding #. To adjust for this, we build a separate tag matcher and use Tag::HASHTAG_RE to extract a hashtag from the hashtag syntax.	8 years ago
beatrix	04508868b0	Merge pull request #212 from aschmitz/feat/mute-reblogs ... Allow hiding reblogs on a per-follow basis	8 years ago
ysksn	19e8b861a2	Delegate some methods of User to @settings (#5706) ... * Move some tests of User into Settings::ScopedSettings * Add a test for User@settings	8 years ago
ysksn	7d7df877ef	Add a test for Tag#to_param (#5705)	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
ysksn	6d7e05ec1f	Add tests for StreamEntry (#5687) ... * Add tests for StreamEntry - `#object_type` - `#verb` - `#mentions` * Fix to test results instead of implementations	8 years ago
ysksn	48e27c47a7	Add a test for SiteUpload#cache_key (#5685)	8 years ago
Yamagishi Kazutoshi	1f1838420f	Refactor remote_follow_spec.rb (#5690)	8 years ago
Yamagishi Kazutoshi	20150659e6	Add uniqueness to block email domains (#5692)	8 years ago
ysksn	4112a0631f	Add tests for Setting (#5683)	8 years ago
David Yip	656d54e945	Maintain case-insensitivity when merging multiple matchers (#213) ... When given two regexps, Regexp.union preserves the options set (or not set) on each regex; this meant that none of the multiline (m), case-insensitivity (i), or extended syntax (x) options were set. Our regexps are written expecting the m, i, and x options were set on all of them, so we need to make sure that we preserve that behavior.	8 years ago
ysksn	60f247c2e7	Add tests for SessionActivation (#5668) ... * Fabricate SessionActivation not only user_id but user association. * Add tests for SessionActivation	8 years ago
ysksn	2fb722397d	Add tests for RemoteProfile (#5665)	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
ysksn	56720ba590	Add tests for RemoteFollow (#5651) ... * Add tests for RemoteFollow.initialize * Add tests for RemoteFollow#valid? * Add tests for RemoteFollow#subscribe_address_for	8 years ago
ysksn	07cca6e364	Add tests for Notification (#5640) ... * Add tests for Notification#target_status * Add tests for Notification#browserable? * Add tests for Notification.reload_stale_associations!	8 years ago