Allow joining several hashtags in a single column #8904

gdpelican · 2018-10-07T02:00:59Z

Watch this video for more details on intended functionality :)

shleeable · 2018-10-07T06:56:12Z

Excellent video explainer... does this limit to hashtags filtered from the home feed and/or local feed and/or federated feed?

this feature is worth it on it's own, but I'd like to see hashtags being pulled from the fediverse to get access to toots in and out of my social circle. if possible, I'd be nice to be able to filter in or out either locally or from the firehose.

gdpelican · 2018-10-07T07:12:18Z

I have to admit to still be wrapping my head around the federation features of Mastodon, but this PR always respects 'local' variable that's passed through on the backend.

So I believe the answer is 'If your normal hashtag column displays remote tweets, then the modified AND/OR/NOT column will as well', but there's nothing in here at the moment around going and fetching statuses from other instances, which would likely be out of scope for this particular PR.

shleeable · 2018-10-07T08:15:01Z

Totally understandable... thanks :)

Gargron · 2018-10-20T16:14:44Z

Wait, how does the streaming part work?

Gargron

Sorry, reviewed it again and found some issues. Most importantly, the streaming API is untouched, so even with all the column params, new statuses will only appear from the main hashtag.

Changing the streaming API to support such filtering is not straightforward and I don't have advice ready. Each streaming API consumer subscribes to one redis pubsub channel (well, the channels are multiplexed actually). But the the thing is, you can't really subscribe to a union of two channels. They aren't published in the same server tick either, there might be any delay.

Perhaps your only option is to subscribe to all individual streaming API channels in the web UI, and then filter on ingress based on the tags included in the JSON.

Gargron · 2018-10-20T16:22:09Z

app/javascript/mastodon/reducers/timelines.js

@@ -86,6 +87,10 @@ const deleteStatus = (state, id, accountId, references) => {
  return state;
 };

+const clearTimeline = (state, timeline) => {
+  return state.updateIn([timeline, 'items'], list => list.filter(() => false));


list => list.clear()

Gargron · 2018-10-20T16:23:00Z

app/models/status.rb

@@ -79,6 +79,17 @@ class Status < ApplicationRecord
  scope :including_silenced_accounts, -> { left_outer_joins(:account).where(accounts: { silenced: true }) }
  scope :not_excluded_by_account, ->(account) { where.not(account_id: account.excluded_from_timeline_account_ids) }
  scope :not_domain_blocked_by_account, ->(account) { account.excluded_from_timeline_domains.blank? ? left_outer_joins(:account) : left_outer_joins(:account).where('accounts.domain IS NULL OR accounts.domain NOT IN (?)', account.excluded_from_timeline_domains) }
+  scope :tagged_with_all, ->(tags) {


I guess stylistically if you need a multiline lambda for a scope, the scope is better off being a class method

There's a subtle difference here in that in a class method, self refers to the class itself (ie, Status, which would map to Status.all), whereas within a scope self refers to the existing relation that the scope's being called on.

So a straight port to a class method doesn't quite work because instead of reducing the existing relation, we start reducing from all statuses

Gargron · 2018-10-20T16:24:26Z

app/controllers/tags_controller.rb

@@ -16,14 +16,16 @@ def show
      end

      format.rss do
-        @statuses = Status.as_tag_timeline(@tag).limit(PAGE_SIZE)
+        @statuses = HashtagQueryService.new.call(@tag, params.slice(:any, :all, :none)).distinct.limit(PAGE_SIZE)


If distinct is called on all uses of the service, why not put it inside the service?

Ah, it was because rails 5's or method is verrrry picky about what kinds of clauses you can join via or (and distinct was blowing it up), but I believe we can pull it into the service by calling distinct on both the original query and the 'or' one.

gdpelican · 2018-10-20T21:59:12Z

Okay great, I've patched up a couple little things you mentioned and will have a poke into the streaming stuff over the next while.

An initial glance makes me think there are two possible solutions:

Define a specific stream which includes the additional arguments... right now it's hashtag?tag=cats and maybe it could be hashtag?tag=cats&any[]=dogs. The streamFrom method on the streaming server is still a bit opaque to me, but I'd think this approach would be better if we can get it. EDIT: Oh right redis streams, heh. Hmmm...
Have the column also subscribe to everything in the 'any' field, and then discard clientside anything that comes through which violates the 'and' or 'not' fields

trwnh · 2018-10-20T23:05:10Z

The screenshot you posted looks better, but I'm still wondering what would happen if you wanted to remove the "cats" hashtag while keeping all the other tags. Would you have to make an entirely new column? This would be inconvenient if you had many "additional" tags but only wanted to change the "primary".

gdpelican · 2018-10-20T23:44:53Z

@trwnh Hm, I'm not really sure I'm following you here; there's not currently a function that I'm aware of to update the hashtag of a column (I suppose the workflow is 'make a new column, pin it, and unpin the old one'?), and I'm not sure it's within the scope of this PR to add it, since this is simply trying to add options to an existing column.

You could actually do some odd stuff with these settings like 'cats OR dogs WITHOUT cats', which would end up being a slightly-less-performant 'dogs' column, but I wouldn't really want to encourage that behaviour.

Gargron · 2018-10-20T23:57:58Z

I mean, tagId is just a prop passed from column settings in the settings reducer, so it could be changed on the fly, I think

gdpelican · 2018-10-21T01:42:12Z

Alright, I've updated this to do the second option here, which is

When subscribing a hashtag column, subscribe to the 'main' tag, as well as all of the tags in the 'any' field
When a status comes through one of those subscriptions, run it through an 'accept' function which will ignore it if it doesn't meet the criterion of either the 'all' or 'none' fields.

Addresed

justinmayer · 2018-10-23T08:11:25Z

Great work on this feature, James. In addition, I like the inclusion of the video to help introduce the use case and initial implementation. Bravo! 🚀

gdpelican · 2018-11-02T04:03:17Z

Hey @Gargron , is there anything else I can do here to shore this one up?

gdpelican · 2018-11-06T11:36:19Z

Thanks for the support on this @Gargron; I had a great first PR experience with Mastodon. Feel free to ping me if there are any issues or enhancements that come up around this and I'll be happy to take a look.

Gargron · 2018-11-13T21:21:57Z

It takes more than 4 seconds to load "fediplay OR np" so something about these queries isn't quite right.

Gargron · 2018-11-13T21:22:39Z

Oh and it seems to reload the column every time you navigate anywhere. I should open an issue for this.

for mastodon#8904

gdpelican added 25 commits September 15, 2018 15:01

Nascent tag menu on frontend

dc6db9e

Hook up frontend to search

6a63ed6

Tag intersection backend first pass

fdf958d

Merge branch 'master' into multi-tag-columns

e9802c5

Update yarnlock

07556e9

WIP

86c2b38

Fix for tags not searching correctly

97487ca

Make radio buttons function

b7de301

Simplify radio buttons with modeOption

d77c04c

Better naming

18f9812

Rearrange options

dc3a35f

Add all/any/none functionality on backend

0f6dbd3

Merge branch 'master' into multi-tag-columns

c9f7f0c

Small PR cleanup

69c0643

Merge branch 'master' into multi-tag-columns

c4a482b

Move to service from scope

80bebed

Small cleanup, add proper service tests

dbc679b

Don't use send with user input :D

e47f144

Set appropriate column header

cf65a12

Handle auto updating timeline

e832499

Fix up toggle function

30d526d

Use tag value correctly

735583b

A bit more correct to use 'self' rather than 'all' in status scope

6b51309

Fix some style issues

c5ae0fd

Fix more code style issues

8b2bdcf

gdpelican force-pushed the multi-tag-columns branch from c8d5ace to 8b2bdcf Compare October 7, 2018 02:34

gdpelican mentioned this pull request Oct 9, 2018

Join several hashtags in a search/column #6359

Closed

2 tasks

Gargron previously requested changes Oct 20, 2018

View reviewed changes

Implement initial PR feedback

8319654

gdpelican added 2 commits October 21, 2018 14:28

Handle additional tag streaming

29c990d

CodeClimate tweak

5556b35

Gargron added the ui Front-end, design label Oct 23, 2018

Gargron approved these changes Nov 2, 2018

View reviewed changes

Gargron merged commit 4c03e05 into mastodon:master Nov 5, 2018

mayaeh mentioned this pull request Nov 11, 2018

i18n: Add ja translations #9261

Merged

This was referenced Nov 13, 2018

Hashtag joining is slow #9279

Open

Joined hashtag column reloads on every URL change #9280

Closed

mayaeh mentioned this pull request Nov 30, 2018

Fix translation isn't applied to the Joining hashtags #9397

Merged

mayaeh mentioned this pull request Jan 21, 2019

Hashtag columns are not streaming #9895

Closed

lnanase mentioned this pull request Jan 22, 2019

本家v2.7.0追従へのハッシュタグタイムラインの改修方法 imas/mastodon#213

Closed

lnanase added a commit to lnanase/mastodon that referenced this pull request Jan 31, 2019

update hashtags timeline to only imastodon

b84262f

for mastodon#8904

lnanase mentioned this pull request Jan 31, 2019

Merge v2.7.0 imastodon imas/mastodon#214

Closed

This was referenced Nov 20, 2020

Pinned hashtag search has hidden limit of 4 search terms #15194

Closed

Support pinned hashtag searches on mobile #15197

Open

Cassolotl mentioned this pull request Nov 9, 2022

Columns based on filters #5010

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow joining several hashtags in a single column #8904

Allow joining several hashtags in a single column #8904

gdpelican commented Oct 7, 2018

shleeable commented Oct 7, 2018

gdpelican commented Oct 7, 2018

shleeable commented Oct 7, 2018

Gargron commented Oct 20, 2018

Gargron left a comment

Gargron Oct 20, 2018

Gargron Oct 20, 2018

gdpelican Oct 20, 2018

Gargron Oct 20, 2018

gdpelican Oct 20, 2018

gdpelican commented Oct 20, 2018 •

edited

Loading

trwnh commented Oct 20, 2018

gdpelican commented Oct 20, 2018

Gargron commented Oct 20, 2018

gdpelican commented Oct 21, 2018

justinmayer commented Oct 23, 2018

gdpelican commented Nov 2, 2018

gdpelican commented Nov 6, 2018

Gargron commented Nov 13, 2018

Gargron commented Nov 13, 2018

Allow joining several hashtags in a single column #8904

Allow joining several hashtags in a single column #8904

Conversation

gdpelican commented Oct 7, 2018

shleeable commented Oct 7, 2018

gdpelican commented Oct 7, 2018

shleeable commented Oct 7, 2018

Gargron commented Oct 20, 2018

Gargron left a comment

Choose a reason for hiding this comment

Gargron Oct 20, 2018

Choose a reason for hiding this comment

Gargron Oct 20, 2018

Choose a reason for hiding this comment

gdpelican Oct 20, 2018

Choose a reason for hiding this comment

Gargron Oct 20, 2018

Choose a reason for hiding this comment

gdpelican Oct 20, 2018

Choose a reason for hiding this comment

gdpelican commented Oct 20, 2018 • edited Loading

trwnh commented Oct 20, 2018

gdpelican commented Oct 20, 2018

Gargron commented Oct 20, 2018

gdpelican commented Oct 21, 2018

justinmayer commented Oct 23, 2018

gdpelican commented Nov 2, 2018

gdpelican commented Nov 6, 2018

Gargron commented Nov 13, 2018

Gargron commented Nov 13, 2018

gdpelican commented Oct 20, 2018 •

edited

Loading