Merge branch 'fix-timelines' into shigusegubu-themes3
This commit is contained in:
commit
4afbeda21c
1 changed files with 5 additions and 5 deletions
|
|
@ -49,8 +49,8 @@ const emptyTl = (userId = 0) => ({
|
||||||
visibleStatuses: [],
|
visibleStatuses: [],
|
||||||
visibleStatusesObject: {},
|
visibleStatusesObject: {},
|
||||||
newStatusCount: 0,
|
newStatusCount: 0,
|
||||||
maxId: '0',
|
maxId: '',
|
||||||
minId: '0',
|
minId: '',
|
||||||
minVisibleId: 0,
|
minVisibleId: 0,
|
||||||
loading: false,
|
loading: false,
|
||||||
followers: [],
|
followers: [],
|
||||||
|
|
@ -64,7 +64,7 @@ export const defaultState = () => ({
|
||||||
scrobblesNextFetch: {},
|
scrobblesNextFetch: {},
|
||||||
allStatusesObject: {},
|
allStatusesObject: {},
|
||||||
conversationsObject: {},
|
conversationsObject: {},
|
||||||
maxId: '0',
|
maxId: '',
|
||||||
favorites: new Set(),
|
favorites: new Set(),
|
||||||
timelines: {
|
timelines: {
|
||||||
mentions: emptyTl(),
|
mentions: emptyTl(),
|
||||||
|
|
@ -222,11 +222,11 @@ const addNewStatuses = (
|
||||||
|
|
||||||
const newer =
|
const newer =
|
||||||
timeline &&
|
timeline &&
|
||||||
(maxNew > timelineObject.maxId || timelineObject.maxId === 0) &&
|
(maxNew > timelineObject.maxId || timelineObject.maxId === '') &&
|
||||||
statuses.length > 0
|
statuses.length > 0
|
||||||
const older =
|
const older =
|
||||||
timeline &&
|
timeline &&
|
||||||
(minNew < timelineObject.minId || timelineObject.minId === 0) &&
|
(minNew < timelineObject.minId || timelineObject.minId === '') &&
|
||||||
statuses.length > 0
|
statuses.length > 0
|
||||||
|
|
||||||
if (!noIdUpdate && newer) {
|
if (!noIdUpdate && newer) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue