[Glitch] Fetch all replies: Only display "More replies found" prompt when there really are new replies

Port 474fbb2770 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
diondiondion
2025-10-06 16:13:24 +02:00
committed by Claire
parent d34b4f3fd0
commit da99ec0eea
3 changed files with 155 additions and 88 deletions

View File

@@ -13,7 +13,12 @@ import type {
import type { Status } from 'flavours/glitch/models/status';
import { blockAccountSuccess, muteAccountSuccess } from '../actions/accounts';
import { fetchContext, completeContextRefresh } from '../actions/statuses';
import {
fetchContext,
completeContextRefresh,
showPendingReplies,
clearPendingReplies,
} from '../actions/statuses';
import { TIMELINE_UPDATE } from '../actions/timelines';
import { compareId } from '../compare_id';
@@ -26,52 +31,84 @@ interface TimelineUpdateAction extends UnknownAction {
interface State {
inReplyTos: Record<string, string>;
replies: Record<string, string[]>;
pendingReplies: Record<
string,
Pick<ApiStatusJSON, 'id' | 'in_reply_to_id'>[]
>;
refreshing: Record<string, AsyncRefreshHeader>;
}
const initialState: State = {
inReplyTos: {},
replies: {},
pendingReplies: {},
refreshing: {},
};
const addReply = (
state: Draft<State>,
{ id, in_reply_to_id }: Pick<ApiStatusJSON, 'id' | 'in_reply_to_id'>,
) => {
if (!in_reply_to_id) {
return;
}
if (!state.inReplyTos[id]) {
const siblings = (state.replies[in_reply_to_id] ??= []);
const index = siblings.findIndex((sibling) => compareId(sibling, id) < 0);
siblings.splice(index + 1, 0, id);
state.inReplyTos[id] = in_reply_to_id;
}
};
const normalizeContext = (
state: Draft<State>,
id: string,
{ ancestors, descendants }: ApiContextJSON,
): void => {
const addReply = ({
id,
in_reply_to_id,
}: {
id: string;
in_reply_to_id?: string;
}) => {
if (!in_reply_to_id) {
return;
}
if (!state.inReplyTos[id]) {
const siblings = (state.replies[in_reply_to_id] ??= []);
const index = siblings.findIndex((sibling) => compareId(sibling, id) < 0);
siblings.splice(index + 1, 0, id);
state.inReplyTos[id] = in_reply_to_id;
}
};
ancestors.forEach((item) => {
addReply(state, item);
});
// We know in_reply_to_id of statuses but `id` itself.
// So we assume that the status of the id replies to last ancestors.
ancestors.forEach(addReply);
if (ancestors[0]) {
addReply({
addReply(state, {
id,
in_reply_to_id: ancestors[ancestors.length - 1]?.id,
});
}
descendants.forEach(addReply);
descendants.forEach((item) => {
addReply(state, item);
});
};
const applyPrefetchedReplies = (state: Draft<State>, statusId: string) => {
const pendingReplies = state.pendingReplies[statusId];
if (pendingReplies?.length) {
pendingReplies.forEach((item) => {
addReply(state, item);
});
delete state.pendingReplies[statusId];
}
};
const storePrefetchedReplies = (
state: Draft<State>,
statusId: string,
{ descendants }: ApiContextJSON,
): void => {
descendants.forEach(({ id, in_reply_to_id }) => {
if (!in_reply_to_id) {
return;
}
const isNewReply = !state.replies[in_reply_to_id]?.includes(id);
if (isNewReply) {
const pendingReplies = (state.pendingReplies[statusId] ??= []);
pendingReplies.push({ id, in_reply_to_id });
}
});
};
const deleteFromContexts = (state: Draft<State>, ids: string[]): void => {
@@ -129,12 +166,30 @@ const updateContext = (state: Draft<State>, status: ApiStatusJSON): void => {
export const contextsReducer = createReducer(initialState, (builder) => {
builder
.addCase(fetchContext.fulfilled, (state, action) => {
normalizeContext(state, action.meta.arg.statusId, action.payload.context);
if (action.payload.prefetchOnly) {
storePrefetchedReplies(
state,
action.meta.arg.statusId,
action.payload.context,
);
} else {
normalizeContext(
state,
action.meta.arg.statusId,
action.payload.context,
);
if (action.payload.refresh) {
state.refreshing[action.meta.arg.statusId] = action.payload.refresh;
if (action.payload.refresh) {
state.refreshing[action.meta.arg.statusId] = action.payload.refresh;
}
}
})
.addCase(showPendingReplies, (state, action) => {
applyPrefetchedReplies(state, action.payload.statusId);
})
.addCase(clearPendingReplies, (state, action) => {
delete state.pendingReplies[action.payload.statusId];
})
.addCase(completeContextRefresh, (state, action) => {
delete state.refreshing[action.payload.statusId];
})