diff options
| author | ThibG <thib@sitedethib.com> | 2020-05-28 14:53:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-28 14:53:36 +0200 |
| commit | 39aa6301eb874963f214215d27f9ef5874c4d236 (patch) | |
| tree | c3687b1e83926abf052d58333a0047585f2df2cf /app/javascript/flavours/glitch/actions/timelines.js | |
| parent | ead09f5ddc73034fcd573b459868dd1ca13b647a (diff) | |
| parent | 0b01492276f47bc8df8c1679b705ce33b3639fcf (diff) | |
Merge pull request #1337 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/actions/timelines.js')
| -rw-r--r-- | app/javascript/flavours/glitch/actions/timelines.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/actions/timelines.js b/app/javascript/flavours/glitch/actions/timelines.js index b01109134..0993824b3 100644 --- a/app/javascript/flavours/glitch/actions/timelines.js +++ b/app/javascript/flavours/glitch/actions/timelines.js @@ -129,7 +129,7 @@ export const expandAccountFeaturedTimeline = accountId => expandTimeline(`accoun export const expandAccountMediaTimeline = (accountId, { maxId } = {}) => expandTimeline(`account:${accountId}:media`, `/api/v1/accounts/${accountId}/statuses`, { max_id: maxId, only_media: true, limit: 40 }); export const expandListTimeline = (id, { maxId } = {}, done = noOp) => expandTimeline(`list:${id}`, `/api/v1/timelines/list/${id}`, { max_id: maxId }, done); export const expandHashtagTimeline = (hashtag, { maxId, tags, local } = {}, done = noOp) => { - return expandTimeline(`hashtag:${hashtag}`, `/api/v1/timelines/tag/${hashtag}`, { + return expandTimeline(`hashtag:${hashtag}${local ? ':local' : ''}`, `/api/v1/timelines/tag/${hashtag}`, { max_id: maxId, any: parseTags(tags, 'any'), all: parseTags(tags, 'all'), |