chinwag/chinwagsocial
chinwag/chinwagsocial
2
0
Fork 0
Code Issues Pull requests Releases 4 Wiki Activity

Fix onboarding prompt flashing while home feed is loading in web UI (#25579)

Browse source
This commit is contained in:
Eugen Rochko 2023-06-26 05:26:54 +02:00 committed by GitHub
parent 2b78c07ef1
commit 65aa04647a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/javascript/mastodon/features/home_timeline/index.jsx
View file

@ -33,9 +33,11 @@ const messages = defineMessages({
const getHomeFeedSpeed = createSelector([ const getHomeFeedSpeed = createSelector([
state => state.getIn(['timelines', 'home', 'items'], ImmutableList()), state => state.getIn(['timelines', 'home', 'items'], ImmutableList()),
state => state.getIn(['timelines', 'home', 'pendingItems'], ImmutableList()),
state => state.get('statuses'), state => state.get('statuses'),
], (statusIds, statusMap) => { ], (statusIds, pendingStatusIds, statusMap) => {
const statuses = statusIds.map(id => statusMap.get(id)).filter(status => status.get('account') !== me).take(20); const recentStatusIds = pendingStatusIds.size > 0 ? pendingStatusIds : statusIds;
const statuses = recentStatusIds.map(id => statusMap.get(id)).filter(status => status?.get('account') !== me).take(20);
const oldest = new Date(statuses.getIn([statuses.size - 1, 'created_at'], 0)); const oldest = new Date(statuses.getIn([statuses.size - 1, 'created_at'], 0));
const newest = new Date(statuses.getIn([0, 'created_at'], 0)); const newest = new Date(statuses.getIn([0, 'created_at'], 0));
const averageGap = (newest - oldest) / (1000 * (statuses.size + 1)); // Average gap between posts on first page in seconds const averageGap = (newest - oldest) / (1000 * (statuses.size + 1)); // Average gap between posts on first page in seconds
@ -46,9 +48,14 @@ const getHomeFeedSpeed = createSelector([
}; };
}); });
const homeTooSlow = createSelector(getHomeFeedSpeed, speed => const homeTooSlow = createSelector([
speed.gap > (30 * 60) // If the average gap between posts is more than 20 minutes state => state.getIn(['timelines', 'home', 'isLoading']),
|| (Date.now() - speed.newest) > (1000 * 3600) // If the most recent post is from over an hour ago state => state.getIn(['timelines', 'home', 'isPartial']),
getHomeFeedSpeed,
], (isLoading, isPartial, speed) =>
!isLoading && !isPartial // Only if the home feed has finished loading
&& (speed.gap > (30 * 60) // If the average gap between posts is more than 20 minutes
|| (Date.now() - speed.newest) > (1000 * 3600)) // If the most recent post is from over an hour ago
); );
const mapStateToProps = state => ({ const mapStateToProps = state => ({