diff options
author | Starfall <admin@plural.cafe> | 2020-05-31 12:56:29 -0500 |
---|---|---|
committer | Starfall <admin@plural.cafe> | 2020-05-31 12:56:29 -0500 |
commit | 76f79dd29909d39f1d36ef48e6892223d59e29d7 (patch) | |
tree | 8a5ace5fea5cf8a4c6f1c55e01db99a289c4b1e3 /app/javascript/flavours/glitch/actions/streaming.js | |
parent | 0167552bed46508efeed266853a1ee4437e12998 (diff) | |
parent | ddcd9fe9f0e85b1db12ae584749e680146611f9a (diff) |
Merge branch 'glitch'
Diffstat (limited to 'app/javascript/flavours/glitch/actions/streaming.js')
-rw-r--r-- | app/javascript/flavours/glitch/actions/streaming.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/actions/streaming.js b/app/javascript/flavours/glitch/actions/streaming.js index 875013efc..e7e57f5f5 100644 --- a/app/javascript/flavours/glitch/actions/streaming.js +++ b/app/javascript/flavours/glitch/actions/streaming.js @@ -74,6 +74,6 @@ const refreshHomeTimelineAndNotification = (dispatch, done) => { export const connectUserStream = () => connectTimelineStream('home', 'user', refreshHomeTimelineAndNotification); export const connectCommunityStream = ({ onlyMedia } = {}) => connectTimelineStream(`community${onlyMedia ? ':media' : ''}`, `public:local${onlyMedia ? ':media' : ''}`); export const connectPublicStream = ({ onlyMedia, onlyRemote } = {}) => connectTimelineStream(`public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`, `public${onlyRemote ? ':remote' : ''}${onlyMedia ? ':media' : ''}`); -export const connectHashtagStream = (id, tag, accept) => connectTimelineStream(`hashtag:${id}`, `hashtag&tag=${tag}`, null, accept); +export const connectHashtagStream = (id, tag, local, accept) => connectTimelineStream(`hashtag:${id}${local ? ':local' : ''}`, `hashtag${local ? ':local' : ''}&tag=${tag}`, null, accept); export const connectDirectStream = () => connectTimelineStream('direct', 'direct'); export const connectListStream = id => connectTimelineStream(`list:${id}`, `list&list=${id}`); |