pepepper/fluxer
1
0 Fork 0
mirror of https://github.com/fluxerapp/fluxer synced 2026-10-18 05:25:40 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix(app): keep unsent messages and stop the unread jump on reconnect (#1861)

Browse Source
This commit is contained in:
Hampus authored and GitHub committed 2026-08-24 12:33:17 +02:00
1 parent 2af0405317
commit b7f75e25ad
16 files changed
+295 -312
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

fluxer_app/src/features/channel/components/ChannelMessageStream.tsx
+4 -4
View File
@@ -34,7 +34,7 @@ interface RenderChannelStreamProps {
highlightedMessageId: string | null;
messageDisplayCompact: boolean;
messageGroupSpacing: number;
revealedMessageId: string | null;
unblurredMessageId: string | null;
onMessageEdit?: (target: HTMLElement) => void;
onReveal?: (messageId: string | null) => void;
messageRowClassName?: string;
@@ -54,7 +54,7 @@ export function renderChannelStream(props: RenderChannelStreamProps): Array<Reac
highlightedMessageId,
messageDisplayCompact,
messageGroupSpacing,
revealedMessageId,
unblurredMessageId,
onMessageEdit,
onReveal,
messageRowClassName,
@@ -182,14 +182,14 @@ export function renderChannelStream(props: RenderChannelStreamProps): Array<Reac
registerKey(item.key, 'BlockedMessageGroups', i, {
groupId: item.key ?? null,
itemCount: Array.isArray(item.content) ? item.content.length : 0,
revealed: item.key === revealedMessageId,
revealed: item.key === unblurredMessageId,
variant,
});
pushSpacerIfNeeded('regular', item.key ?? `${variant}-${i}`);
nodes.push(
<BlockedMessageGroups
key={item.key}
revealed={item.key === revealedMessageId}
revealed={item.key === unblurredMessageId}
messageGroups={item.content as Array<ChannelStreamItem>}
onReveal={onReveal ?? (() => {})}
compact={messageDisplayCompact}
fluxer_app/src/features/channel/components/ChannelMessages.tsx
+14 -14
View File
@@ -94,7 +94,7 @@ interface MessagesStateSnapshot {
lastReadStateMessageId: string | null;
messages: ChannelMessages;
messageVersion: number;
revealedMessageId: string | null;
unblurredMessageId: string | null;
permissionVersion: number;
messageGroupSpacing: number;
fontSize: number;
@@ -124,7 +124,7 @@ const readFromState = (channelId: string): MessagesStateSnapshot => {
lastReadStateMessageId: ReadStates.lastMessageId(channelId),
messages,
messageVersion: messages.version,
revealedMessageId: messages.revealedMessageId,
unblurredMessageId: messages.unblurredMessageId,
permissionVersion: Permission.version,
messageGroupSpacing: Accessibility.getMessageGroupSpacingValue(messageDisplayCompact),
fontSize: Accessibility.fontSize,
@@ -191,8 +191,8 @@ export const Messages = observer(function Messages({
const jumpHighlightTimeoutRef = useRef<number | null>(null);
const lastJumpSequenceKeyRef = useRef<string | null>(null);
const handleJumpHighlight = useCallback(
(targetMessageId: string | null, jumpSequenceId: number) => {
const jumpSequenceKey = `${channel.id}:${jumpSequenceId}`;
(targetMessageId: string | null, jumpTicket: number) => {
const jumpSequenceKey = `${channel.id}:${jumpTicket}`;
if (jumpSequenceKey === lastJumpSequenceKeyRef.current) return;
lastJumpSequenceKeyRef.current = jumpSequenceKey;
if (jumpHighlightTimeoutRef.current != null) {
@@ -290,7 +290,7 @@ export const Messages = observer(function Messages({
);
const onScrollToPresent = useCallback(() => {
if (state.messages?.hasMoreAfter) {
MessageCommands.jumpToPresent(channel.id, MAX_MESSAGES_PER_CHANNEL);
MessageCommands.jumpToLiveEdge(channel.id, MAX_MESSAGES_PER_CHANNEL);
} else {
scrollManager.scrollSetToBottom(false);
}
@@ -316,7 +316,7 @@ export const Messages = observer(function Messages({
}, [channel.id, state.ackMessageId, state.oldestUnreadMessageId]);
const onScrollToPresentAndAck = useCallback(() => {
if (state.messages?.hasMoreAfter) {
MessageCommands.jumpToPresent(channel.id, MAX_MESSAGES_PER_CHANNEL);
MessageCommands.jumpToLiveEdge(channel.id, MAX_MESSAGES_PER_CHANNEL);
} else {
scrollManager.scrollSetToBottom(false);
}
@@ -357,7 +357,7 @@ export const Messages = observer(function Messages({
MessageEdit.subscribe(updateFromState),
];
const onForceJumpToPresent = () => {
MessageCommands.jumpToPresent(channel.id, MAX_MESSAGES_PER_CHANNEL);
MessageCommands.jumpToLiveEdge(channel.id, MAX_MESSAGES_PER_CHANNEL);
};
const onScrollPageUp = () => scrollManager.scrollPageUp(true);
const onScrollPageDown = () => scrollManager.scrollPageDown(true);
@@ -523,16 +523,16 @@ export const Messages = observer(function Messages({
}, [channel.id, state.messages?.ready, state.messageVersion]);
const immediateHighlightedMessageId = (() => {
const messages = state.messages;
if (!messages?.ready || !messages.jumped || !messages.jumpFlash || !messages.jumpTargetId) {
if (!messages?.ready || !messages.hasJumped || !messages.jumpHighlight || !messages.jumpDestinationId) {
return null;
}
return messages.jumpTargetId !== channel.id ? messages.jumpTargetId : null;
return messages.jumpDestinationId !== channel.id ? messages.jumpDestinationId : null;
})();
const highlightedMessageId = immediateHighlightedMessageId ?? state.highlightedMessageId;
const collapsedMessageVisibility = useMemo(
() => ({
isMessageRevealed: (message: Message) => {
if (!state.revealedMessageId || !state.messages || message.channelId !== channel.id) {
if (!state.unblurredMessageId || !state.messages || message.channelId !== channel.id) {
return false;
}
return (
@@ -541,11 +541,11 @@ export const Messages = observer(function Messages({
messages: state.messages,
messageId: message.id,
treatSpam: true,
}) === state.revealedMessageId
}) === state.unblurredMessageId
);
},
}),
[channel, state.messages, state.revealedMessageId, state.messageVersion, spammerOverrideVersion],
[channel, state.messages, state.unblurredMessageId, state.messageVersion, spammerOverrideVersion],
);
const {canChat, canAttachFiles} = useMemo(
() => checkPermissions(channel),
@@ -560,7 +560,7 @@ export const Messages = observer(function Messages({
highlightedMessageId,
messageDisplayCompact: state.messageDisplayCompact,
messageGroupSpacing: state.messageGroupSpacing,
revealedMessageId: state.revealedMessageId,
unblurredMessageId: state.unblurredMessageId,
onMessageEdit,
onReveal,
});
@@ -571,7 +571,7 @@ export const Messages = observer(function Messages({
highlightedMessageId,
state.messageDisplayCompact,
state.messageGroupSpacing,
state.revealedMessageId,
state.unblurredMessageId,
onMessageEdit,
onReveal,
]);
fluxer_app/src/features/channel/components/MessageAttachments.tsx
+1 -1
View File
@@ -120,7 +120,7 @@ const ForwardedFromSource = observer(({message}: {message: Message}) => {
const handleJumpToOriginal = useCallback(() => {
if (message.messageReference && sourceChannel) {
goToMessage(message.messageReference.channel_id, message.messageReference.message_id, {
returnTargetId: message.id,
returnToMessageId: message.id,
returnChannelId: message.channelId,
});
}
fluxer_app/src/features/channel/components/PinSystemMessage.tsx
+1 -1
View File
@@ -23,7 +23,7 @@ export const PinSystemMessage = observer(({message}: PinSystemMessageProps) => {
const jumpToMessage = useCallback(() => {
if (message.messageReference?.message_id) {
goToMessage(message.channelId, message.messageReference.message_id, {
returnTargetId: message.id,
returnToMessageId: message.id,
returnChannelId: message.channelId,
});
}
fluxer_app/src/features/channel/components/ReplyPreview.tsx
+1 -1
View File
@@ -66,7 +66,7 @@ export const ReplyPreview = observer(
const jumpToRepliedMessage = useCallback(() => {
if (message.messageReference?.message_id) {
goToMessage(message.channelId, message.messageReference.message_id, {
returnTargetId: message.id,
returnToMessageId: message.id,
returnChannelId: message.channelId,
});
}