Compare commits

..

No commits in common. "3be62814911932066cd2865737a904d29e7c8a7b" and "60973335a5a029b19c14a61abd3e615de6a5efea" have entirely different histories.

4 changed files with 13 additions and 19 deletions

View file

@ -23,7 +23,6 @@ const Timeline = {
'userId', 'userId',
'listId', 'listId',
'tag', 'tag',
'fetchParams',
'embedded', 'embedded',
'count', 'count',
'pinnedStatusIds', 'pinnedStatusIds',
@ -182,8 +181,7 @@ const Timeline = {
showImmediately: true, showImmediately: true,
userId: this.userId, userId: this.userId,
listId: this.listId, listId: this.listId,
tag: this.tag, tag: this.tag
params: this.fetchParams,
}).then(({ statuses }) => { }).then(({ statuses }) => {
if (statuses && statuses.length === 0) { if (statuses && statuses.length === 0) {
this.bottomedOut = true this.bottomedOut = true

View file

@ -93,19 +93,6 @@ const UserProfile = {
hasPinned () { hasPinned () {
return !!(this.user.pinnedStatusIds || []).length return !!(this.user.pinnedStatusIds || []).length
}, },
fetchParams () {
if (this.tab !== 'statuses') {
return []
}
const params = []
if (!this.filterParams.showReplies) {
params.push(['exclude_replies', 1])
}
if (!this.filterParams.showRepeats) {
params.push(['exclude_reblogs', 1])
}
return params
},
favorites () { favorites () {
return this.$store.state.statuses.timelines.favorites return this.$store.state.statuses.timelines.favorites
}, },
@ -149,7 +136,17 @@ const UserProfile = {
if (this.isUs) timelineTabMap['favorites'] = 'favorites' if (this.isUs) timelineTabMap['favorites'] = 'favorites'
const timeline = timelineTabMap[nextTab] const timeline = timelineTabMap[nextTab]
const fetchArgs = { timeline: timeline, userId: this.userId, params: this.fetchParams } const fetchArgs = { timeline: timeline, userId: this.userId }
if (timeline === 'user') {
const params = []
if (!this.filterParams.showReplies) {
params.push(['exclude_replies', 1])
}
if (!this.filterParams.showRepeats) {
params.push(['exclude_reblogs', 1])
}
fetchArgs.params = params
}
if (timeline) { if (timeline) {
this.stopFetching() this.stopFetching()

View file

@ -92,7 +92,6 @@
:user-id="userId" :user-id="userId"
:pinned-status-ids="user.pinnedStatusIds" :pinned-status-ids="user.pinnedStatusIds"
:in-profile="true" :in-profile="true"
:fetch-params="fetchParams"
:footer-slipgate="footerRef" :footer-slipgate="footerRef"
/> />
</div> </div>

View file

@ -87,7 +87,7 @@ const startFetching = ({ timeline = 'friends', credentials, store, userId = fals
timelineData.listId = listId timelineData.listId = listId
fetchAndUpdate({ timeline, credentials, store, showImmediately, userId, listId, tag, params }) fetchAndUpdate({ timeline, credentials, store, showImmediately, userId, listId, tag, params })
const boundFetchAndUpdate = () => const boundFetchAndUpdate = () =>
fetchAndUpdate({ timeline, credentials, store, userId, listId, tag, params }) fetchAndUpdate({ timeline, credentials, store, userId, listId, tag })
return promiseInterval(boundFetchAndUpdate, 20000) return promiseInterval(boundFetchAndUpdate, 20000)
} }
const timelineFetcher = { const timelineFetcher = {