Mastodon/Whalebird-desktop-client-mac-linux-windows
1
0
Fork 0
mirror of https://github.com/h3poteto/whalebird-desktop synced 2025-02-01 18:06:45 +01:00
Code Issues Releases Wiki Activity

Merge pull request #384 from h3poteto/iss-375

Browse Source 
closes #375 Encode tag for non ascii tags
This commit is contained in:
AkiraFukushima 2018-06-10 17:16:47 +09:00 committed by GitHub
commit 0b4b80cf47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/renderer/store/TimelineSpace/Contents/Hashtag/Tag.js
View File

@ -72,7 +72,7 @@ const Tag = {
rootState.TimelineSpace.account.accessToken, rootState.TimelineSpace.account.accessToken,
rootState.TimelineSpace.account.baseURL + '/api/v1' rootState.TimelineSpace.account.baseURL + '/api/v1'
) )
return client.get(`/timelines/tag/${tag}`, { limit: 40 }) return client.get(`/timelines/tag/${encodeURIComponent(tag)}`, { limit: 40 })
.then(data => { .then(data => {
commit('updateTimeline', data) commit('updateTimeline', data)
}) })
@ -86,7 +86,7 @@ const Tag = {
}) })
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
ipcRenderer.send('start-tag-streaming', { ipcRenderer.send('start-tag-streaming', {
tag: tag, tag: encodeURIComponent(tag),
account: rootState.TimelineSpace.account account: rootState.TimelineSpace.account
}) })
ipcRenderer.once('error-start-tag-streaming', (event, err) => { ipcRenderer.once('error-start-tag-streaming', (event, err) => {
@ -106,6 +106,9 @@ const Tag = {
if (state.lazyLoading) { if (state.lazyLoading) {
return Promise.resolve(null) return Promise.resolve(null)
} }
if (obj.last === undefined || obj.last === null) {
return Promise.resolve(null)
}
commit('changeLazyLoading', true) commit('changeLazyLoading', true)
const client = new Mastodon( const client = new Mastodon(
rootState.TimelineSpace.account.accessToken, rootState.TimelineSpace.account.accessToken,