diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-12-18 17:56:08 +0100 |
|---|---|---|
| committer | ThibG <thib@sitedethib.com> | 2018-12-21 19:54:54 +0100 |
| commit | 4be73132982fec0a38420811ae28a4ffd2ea09c7 (patch) | |
| tree | be6c8297df67c691010f650001316bf9565dc13a /app/javascript/flavours/glitch/features/standalone | |
| parent | 6073195a7d65261bc4092b771a37b53ee1cb09b3 (diff) | |
[Glitch] Allow joining several hashtags in a single column
Port 4c03e05a4e1a237f8a414a0861c03abe3269dbc8 to glitch-soc This introduces new requirements in the API: `/api/v1/timelines/tag/:tag` now accepts new params: `any`, `all` and `none` It now returns status matching tag :tag or any of the :any, provided that they also include all tags in `all` and none of `none`.
Diffstat (limited to 'app/javascript/flavours/glitch/features/standalone')
| -rw-r--r-- | app/javascript/flavours/glitch/features/standalone/hashtag_timeline/index.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/standalone/hashtag_timeline/index.js b/app/javascript/flavours/glitch/features/standalone/hashtag_timeline/index.js index dc02f1c91..44ba8db92 100644 --- a/app/javascript/flavours/glitch/features/standalone/hashtag_timeline/index.js +++ b/app/javascript/flavours/glitch/features/standalone/hashtag_timeline/index.js @@ -27,7 +27,7 @@ export default class HashtagTimeline extends React.PureComponent { const { dispatch, hashtag } = this.props; dispatch(expandHashtagTimeline(hashtag)); - this.disconnect = dispatch(connectHashtagStream(hashtag)); + this.disconnect = dispatch(connectHashtagStream(hashtag, hashtag)); } componentWillUnmount () { |