Skip to content

[FIX] Merge subscription and room logic using unparsed data #3859

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
diegolmello merged 1 commit into from
Mar 8, 2022
Merged

[FIX] Merge subscription and room logic using unparsed data #3859

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
8 changes: 4 additions & 4 deletions app/lib/methods/helpers/mergeSubscriptionsRooms.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@ export const merge = (subscription: ISubscription | IServerSubscription, room?:
if (compareServerVersion(serverVersion, 'lowerThan', '3.7.0')) {
const updatedAt = room?._updatedAt ? new Date(room._updatedAt) : null;
// @ts-ignore
const lastMessageTs = subscription?.lastMessage?.ts ? new Date(subscription.lastMessage.ts) : null;
const lastMessageTs = mergedSubscription?.lastMessage?.ts ? new Date(mergedSubscription.lastMessage.ts) : null;
// @ts-ignore
// If all parameters are null it will return zero, if only one is null it will return its timestamp only.
// "It works", but it's not the best solution. It does not accept "Date" as a parameter, but it works.
mergedSubscription.roomUpdatedAt = Math.max(updatedAt, lastMessageTs);
} else {
// https://github.com/RocketChat/Rocket.Chat/blob/develop/app/ui-sidenav/client/roomList.js#L180
const lastRoomUpdate = room?.lm || subscription.ts || subscription._updatedAt;
const lastRoomUpdate = room?.lm || mergedSubscription.ts || mergedSubscription._updatedAt;
// @ts-ignore Same as above scenario
mergedSubscription.roomUpdatedAt = subscription.lr
mergedSubscription.roomUpdatedAt = mergedSubscription.lr
? // @ts-ignore Same as above scenario
Math.max(new Date(subscription.lr), new Date(lastRoomUpdate))
Math.max(new Date(mergedSubscription.lr), new Date(lastRoomUpdate))
: lastRoomUpdate;
}
mergedSubscription.ro = room?.ro ?? false;
Expand Down