86 Commits (b75a1ce326908392ad833ac71709263f0d0a12d5)

Author	SHA1	Message	Date
David Yip	95c270f5b1	Merge remote-tracking branch 'origin/master' into gs-master	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
beatrix	dec960c828	Merge pull request #208 from yipdw/keyword-mute ... Run keyword mutes on hashtags	7 years ago
David Yip	1ab12ba38e	Merge remote-tracking branch 'origin/master' into merge-upstream	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
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
David Yip	431503bae2	Also run the keyword matcher on a status' tags. #208.	8 years ago
aschmitz	9a42f7cbed	Actually filter blocked reblogs from feed ... And even a relevant test. Whoops.	8 years ago
David Yip	d03b48cea0	Also filter notifications containing muted keywords.	8 years ago
David Yip	19826774f0	keyword mutes: also check spoiler (CW) text and reblogged statuses.	8 years ago
David Yip	ad86c86fa8	Apply keyword mutes to reblogs.	8 years ago
David Yip	670e6a33f8	Move KeywordMute into Glitch namespace. ... There are two motivations for this: 1. It looks like we're going to add other features that require server-side storage (e.g. user notes). 2. Namespacing glitchsoc modifications is a good idea anyway: even if we do not end up doing (1), if upstream introduces a keyword-mute feature that also uses a "KeywordMute" model, we can avoid some merge conflicts this way and work on the more interesting task of choosing which implementation to use.	8 years ago
David Yip	603cf02b70	Rework KeywordMute interface to use a matcher object; spec out matcher. #164. ... A matcher object that builds a match from KeywordMute data and runs it over text is, in my view, one of the easier ways to write examples for this sort of thing.	8 years ago
David Yip	4745d6eeca	Spec out KeywordMute interface. #164.	8 years ago
beatrix	a7be86e875	hide mentions of muted accounts (in home col) (#190) ... * hide mentions of muted accounts (in home col) also cleans up some old crap * add test	8 years ago
David Yip	42e8c8eb0e	Merge tag 'v2.0.0' into gs-master	8 years ago
aschmitz	554c2fd8af	Clean up reblog tracking keys, related improvements (#5428) ... * Clean up reblog-tracking sets from FeedManager Builds on #5419, with a few minor optimizations and cleanup of sets after they are no longer needed. * Update tests, fix multiply-reblogged case Previously, we would have lost the fact that a given status was reblogged if the displayed reblog of it was removed, now we don't. Also added tests to make sure FeedManager#trim cleans up our reblog tracking keys, fixed up FeedCleanupScheduler to use the right loop, and fixed the test for it.	8 years ago
Ondřej Hruška	8b9ee5f16b	Merge remote-tracking branch 'upstream/master' into upstream-merge-again	8 years ago
Eugen Rochko	34118169ac	Keep references to all reblogs of a status on home feed (#5419) ... * Keep references to all reblogs of a status on home feed When inserting reblog: Add to set of reblogs of this status on the feed, if original status was present in the feed, add it to that set as well. When removing a reblog: Remove it from that set. Take random remaining item from the set. If one exists, re-insert it into feed, otherwise do not re-insert anything. Fix #4210 * When original is removed, toss out reblog references	8 years ago
David Yip	7e9d93472c	Merge remote-tracking branch 'upstream/master' into gs-master	8 years ago
David Yip	dbb1fce94d	Merge remote-tracking branch 'upstream/master' into gs-master	8 years ago
Eugen Rochko	7cc71748ce	Ensure that feed renegeration restores non-zero items (#5409) ... Fix #5398 Ordering the home timeline query by account_id meant that the first 100 items belonged to a single account. There was also no reason to reverse-iterate over the statuses. Assuming the user accesses the feed halfway-through, it's better to have recent statuses already available at the top. Therefore working from newer->older is ideal. If the algorithm ends up filtering all items out during last-mile filtering, repeat again a page further. The algorithm terminates when either at least one item has been added, or if the database query returns nothing (end of data reached)	8 years ago
unarist	6f490b4bfe	Fix un-reblogged status being at wrong position in the home timeline (#5418) ... We've changed un-reblogging behavior when we implement Snowflake, to insert un-reblogged status at the position reblogging status existed. However, our API expects home timeline is ordered by status ids, and max_id/since_id filters by zset score. Due to this, un-reblogged status appears as a last item of result set, and timeline expansion may skips many statuses. So this reverts that change...reblogged status inserted at corresponding position to its id.	8 years ago
David Yip	6cd5b3bbe5	Merge remote-tracking branch 'origin/master' into gs-master	8 years ago
Eugen Rochko	b8db386e05	Fix UserTrackingConcern firing on every request, optimize some queries (#5368) ... - For some reason, :if option on before_action did not work. It got executed every time, returned false, and the action run anyway, which led to the current_sign_in_at and sign_in_count being updated on every request - Return "do not filter" early in FeedManager#filter_from_home? if the status is authored by receiver. Usually this method is not called for own statuses at all, but it is called when Feed#get uses the database - Return early if #reload_stale_associations! has nothing to load to save a database query with WHERE 1=0	8 years ago
Eugen Rochko	388d093beb	When unfollowing, remove from home in web UI immediately (#5369) ... Do NOT send "delete" through streaming API when unmerging from home timeline. "delete" implies that the original status was deleted, which is not true!	8 years ago
kibigo!	8d6b9ba494	Merge upstream 2.0ish #165	8 years ago
Eugen Rochko	cfa68907ae	Fix #5271 - Fix missing attribute in remove_from_feed (#5277) ... Regression from #4801	8 years ago
aschmitz	468523f4ad	Non-Serial ("Snowflake") IDs (#4801) ... * Use non-serial IDs This change makes a number of nontrivial tweaks to the data model in Mastodon: * All IDs are now 8 byte integers (rather than mixed 4- and 8-byte) * IDs are now assigned as: * Top 6 bytes: millisecond-resolution time from epoch * Bottom 2 bytes: serial (within the millisecond) sequence number * See /lib/tasks/db.rake's `define_timestamp_id` for details, but note that the purpose of these changes is to make it difficult to determine the number of objects in a table from the ID of any object. * The Redis sorted set used for the feed will have values used to look up toots, rather than scores. This is almost always the same as the existing behavior, except in the case of boosted toots. This change was made because Redis stores scores as double-precision floats, which cannot store the new ID format exactly. Note that this doesn't cause problems with sorting/pagination, because ZREVRANGEBYSCORE sorts lexicographically when scores are tied. (This will still cause sorting issues when the ID gains a new significant digit, but that's extraordinarily uncommon.) Note a couple of tradeoffs have been made in this commit: * lib/tasks/db.rake is used to enforce many/most column constraints, because this commit seems likely to take a while to bring upstream. Enforcing a post-migrate hook is an easier way to maintain the code in the interim. * Boosted toots will appear in the timeline as many times as they have been boosted. This is a tradeoff due to the way the feed is saved in Redis at the moment, but will be handled by a future commit. This would effectively close Mastodon's #1059, as it is a snowflake-like system of generating IDs. However, given how involved the changes were simply within Mastodon, it may have unexpected interactions with some clients, if they store IDs as doubles (or as 4-byte integers). This was a problem that Twitter ran into with their "snowflake" transition, particularly in JavaScript clients that treated IDs as JS integers, rather than strings. It therefore would be useful to test these changes at least in the web interface and popular clients before pushing them to all users. * 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 * Restructure feed pushes/unpushes This was necessary because the previous behavior used Redis zset scores to identify statuses, but those are IEEE double-precision floats, so we can't actually use them to identify all 64-bit IDs. However, it leaves the code in a much better state for refactoring reblog handling / coalescing. Feed-management code has been consolidated in FeedManager, including: * BatchedRemoveStatusService no longer directly manipulates feed zsets * RemoveStatusService no longer directly manipulates feed zsets * PrecomputeFeedService has moved its logic to FeedManager#populate_feed (PrecomputeFeedService largely made lots of calls to FeedManager, but didn't follow the normal adding-to-feed process.) This has the effect of unifying all of the feed push/unpush logic in FeedManager, making it much more tractable to update it in the future. Due to some additional checks that must be made during, for example, batch status removals, some Redis pipelining has been removed. It does not appear that this should cause significantly increased load, but if necessary, some optimizations are possible in batch cases. These were omitted in the pursuit of simplicity, but a batch_push and batch_unpush would be possible in the future. Tests were added to verify that pushes happen under expected conditions, and to verify reblog behavior (both on pushing and unpushing). In the case of unpushing, this includes testing behavior that currently leads to confusion such as Mastodon's #2817, but this codifies that the behavior is currently expected. * Rubocop fixes I could swear I made these changes already, but I must have lost them somewhere along the line. * Address review comments This addresses the first two comments from review of this feature: https://github.com/tootsuite/mastodon/pull/4801#discussion_r139336735 https://github.com/tootsuite/mastodon/pull/4801#discussion_r139336931 This adds an optional argument to FeedManager#key, the subtype of feed key to generate. It also tests to ensure that FeedManager's settings are such that reblogs won't be tracked forever. * Hardcode IdToBigints migration columns This addresses a comment during review: https://github.com/tootsuite/mastodon/pull/4801#discussion_r139337452 This means we'll need to make sure that all _id columns going forward are bigints, but that should happen automatically in most cases. * 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. * Only implement timestamp IDs for Status IDs Per discussion in #4801, this is only being merged in for Status IDs at this point. We do this in a migration, as there is no longer use for a post-migration hook. We keep the initialization of the timestamp_id function as a Rake task, as it is also needed after db:schema:load (as db/schema.rb doesn't store Postgres functions). * Change internal streaming payloads to stringified IDs as well This is equivalent to 591a9af356 from #5019, with an extra change for the addition to FeedManager#unpush. * Ensure we have a status_id_seq sequence Apparently this is not a given when specifying a custom ID function, so now we ensure it gets created. This uses the generic version of this function to more easily support adding additional tables with timestamp IDs in the future, although it would be possible to cut this down to a less generic version if necessary. It is only run during db:schema:load or the relevant migration, so the overhead is extraordinarily minimal. * Transition reblogs to new Redis format This provides a one-way migration to transition old Redis reblog entries into the new format, with a separate tracking entry for reblogs. It is not invertible because doing so could (if timestamp IDs are used) require a database query for each status in each users' feed, which is likely to be a significant toll on major instances. * Address review comments from @akihikodaki No functional changes. * Additional review changes * Heredoc cleanup * Run db:schema:load hooks for test in development This matches the behavior in Rails' ActiveRecord::Tasks::DatabaseTasks.each_current_configuration, which would otherwise break `rake db:setup` in development. It also moves some functionality out to a library, which will be a good place to put additional related functionality in the near future.	8 years ago
kibigo!	09cfc079b0	Merge upstream (#81)	8 years ago
Eugen Rochko	de397f3bc1	Fix subsequent replies to unresolved status not being filtered from home (#4190) ... Resolves #4177 - smaller changeset	8 years ago
kibigo!	79d898ae0a	Merge upstream!! #64 <3 <3	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	60b2b56d38	Reduce number of commands in FeedManager#trim (#3989)	8 years ago
beatrix-bitrot	93fc8aa14c	keyword muting and local only tooting WIP	8 years ago
Yamagishi Kazutoshi	0a0b9a271a	Improve RuboCop rules (compatibility to Code Climate) (#3636) ... 08f8de84eb/Gemfile.lock (L38) Code Climate is using RuboCop v0.46.0. Change several rules to maintain compatibility.	8 years ago
Clworld	dab8fc4584	Execute PushUpdateWorker only for accounts who uses StreamingAPI just now. (#3278) ... * Add redis key "subscribed:timeline:#{account.id}" to indicate active streaming API listeners exists. * Add endpoint for notification only stream. * Run PushUpdateWorker only for users uses Streaming API now. * Move close hander streamTo(Http/Ws) -> stream(Http/Ws)End (Deal with #3370) * Add stream type for stream start log message.	8 years ago
Eugen Rochko	620d0d8029	Account domain blocks (#2381) ... * Add <ostatus:conversation /> tag to Atom input/output Only uses ref attribute (not href) because href would be the alternate link that's always included also. Creates new conversation for every non-reply status. Carries over conversation for every reply. Keeps remote URIs verbatim, generates local URIs on the fly like the rest of them. * Conversation muting - prevents notifications that reference a conversation (including replies, favourites, reblogs) from being created. API endpoints /api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute Currently no way to tell when a status/conversation is muted, so the web UI only has a "disable notifications" button, doesn't work as a toggle * Display "Dismiss notifications" on all statuses in notifications column, not just own * Add "muted" as a boolean attribute on statuses JSON For now always false on contained reblogs, since it's only relevant for statuses returned from the notifications endpoint, which are not nested Remove "Disable notifications" from detailed status view, since it's only relevant in the notifications column * Up max class length * Remove pending test for conversation mute * Add tests, clean up * Rename to "mute conversation" and "unmute conversation" * Raise validation error when trying to mute/unmute status without conversation * Adding account domain blocks that filter notifications and public timelines * Add tests for domain blocks in notifications, public timelines Filter reblogs of blocked domains from home * Add API for listing and creating account domain blocks * API for creating/deleting domain blocks, tests for Status#ancestors and Status#descendants, filter domain blocks from them * Filter domains in streaming API * Update account_domain_block_spec.rb	8 years ago
alpaca-tc	59804abc3d	Optimize MuteService and AfterBlockService (#2836)	8 years ago
Matt Jankowski	b57eed4584	Remove order prior to .find_in_batches (#1470) ... The `Status` class has a default order on it, so when this query gets built and gets all the way to `find_in_batches` there is an order already there. When `find_in_batches` is run it discards any existing order on the query, and emits a warning to the logs if there is one there. This change removes the order prior calling `find_in_batches`, which will stop the logged warning from occurring as well.	8 years ago
Eugen Rochko	5b95be1c42	Replace calls to FeedManager#inline_render and #broadcast	8 years ago
Kurtis Rainbolt-Greene	7bed4e51db	Moved to the worker	8 years ago
Kurtis Rainbolt-Greene	dc5704b0b0	This method isn't used anymore	8 years ago
Kurtis Rainbolt-Greene	1e96ce378e	By pushing this into a worker we can reduce the amount of time the feed manager using workers eat up a connection	8 years ago
Eugen	2edeb3fe1c	Merge pull request #858 from krainboltgreene/patch-6 ... Use active record shorthand	8 years ago
Eugen Rochko	6fd865c000	Spawn FeedInsertWorker to deliver status into personal feed	8 years ago
Kurtis Rainbolt-Greene	731e650681	Use active record shorthand	8 years ago
Eugen Rochko	82aaedec46	Reduce number of items in feeds, optimize regeneration worker slightly, ... make regeneration worker unique, (only schedule/execute once at a time)	8 years ago
Eugen Rochko	b1f3499c38	Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge	8 years ago
Eugen Rochko	ce9df2fa82	Optimize filter methods in FeedManager a bit, use redis pipelining on merge/unmerge feed methods, ... do not re-create a dynamic class on each feed push call, make sure redis-rb uses hiredis	8 years ago