Skip to content

fixed syncing of chat rooms and small improvement to new message indi… #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johdac merged 1 commit into from
Mar 19, 2026
Merged

fixed syncing of chat rooms and small improvement to new message indi… #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions apps/backend/src/user/user.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,8 @@ export class UserService {
async userPatch(userId: number, data: ReqUserPatchDto) {
// Wrap everything in a transaction (if one call fails, then they all roll back - making every
// call to the DB dependent on each other)
return await this.prisma.$transaction(async (tx) => {

const res = await this.prisma.$transaction(async (tx) => {
const newData: Prisma.UserUpdateInput = {};

if (data.name !== undefined) {
Expand Down Expand Up @@ -551,9 +552,6 @@ export class UserService {
},
});

// After updating the user we need to resync the chat rooms he is in
await this.chatGateway.resyncUserRooms(userId);

return {
...user_raw,
createdAt: user_raw.createdAt.toISOString(),
Expand All @@ -568,6 +566,10 @@ export class UserService {
})),
};
});

// After updating the user we need to resync the chat rooms he is in
await this.chatGateway.resyncUserRooms(userId);
return res;
}

/**
Expand Down
11 changes: 3 additions & 8 deletions apps/frontend/src/features/chat/ChatBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,10 @@ export const ChatBox = ({ conversationId }: { conversationId: string }) => {
if (
viewport.scrollTop < 100 &&
hasMore &&
messages.length > 0 &&
messages.length >= 10 && // initial load value
!isLoadingMoreHistory.current
) {
isLoadingMoreHistory.current = true;
isLoadingMoreHistory.current = true;

const currentMessages = messagesRef.current;
if (!currentMessages.length) return;
Expand Down Expand Up @@ -192,7 +191,7 @@ export const ChatBox = ({ conversationId }: { conversationId: string }) => {
hasMore &&
!isInitialLoad.current &&
!isLoadingMoreHistory.current &&
messages.length > 0
messages.length >= 10 // initial load value
) {
isLoadingMoreHistory.current = true;
const oldest = messages[0];
Expand Down Expand Up @@ -230,11 +229,7 @@ export const ChatBox = ({ conversationId }: { conversationId: string }) => {
<AlertTitle>Error</AlertTitle>
<AlertDescription>{errorMessage}</AlertDescription>
</Alert>
<BackButton
className="w-"
label="Back to all Chats"
onClick={() => void navigate('/chat')}
/>
<BackButton label="Back to all Chats" onClick={() => void navigate('/chat')} />
</>
);
}
Expand Down
Loading