Skip to content

fix(pinned): Fix the flaky sorting finally #16384

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
nickvergessen merged 1 commit into from
Nov 20, 2025
Merged

fix(pinned): Fix the flaky sorting finally #16384

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
4 changes: 2 additions & 2 deletions lib/Controller/ChatController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1649,7 +1649,7 @@ public function getObjectsSharedInRoomOverview(int $limit = 7): DataResponse {

if ($objectType === Attachment::TYPE_PINNED) {
// Enforce sort order of pinned messages again after loading them from the comments table instead of attachments
uasort($messagesByType[$objectType], static fn (array $m1, array $m2): int => ($m2['metaData'][Message::METADATA_PINNED_AT] ?? 0) <=> ($m1['metaData'][Message::METADATA_PINNED_AT] ?? 0));
uasort($messagesByType[$objectType], static fn (array $m1, array $m2): int => ($m2['metaData']['pinnedAt'] ?? 0) <=> ($m1['metaData']['pinnedAt'] ?? 0));
}
}

Expand Down Expand Up @@ -1708,7 +1708,7 @@ public function getObjectsSharedInRoom(string $objectType, int $lastKnownMessage
$messages = $this->getMessagesForRoom($messageIds);
if ($objectType === Attachment::TYPE_PINNED) {
// Enforce sort order of pinned messages again after loading them from the comments table instead of attachments
uasort($messages, static fn (array $m1, array $m2): int => ($m2['metaData'][Message::METADATA_PINNED_AT] ?? 0) <=> ($m1['metaData'][Message::METADATA_PINNED_AT] ?? 0));
uasort($messages, static fn (array $m1, array $m2): int => ($m2['metaData']['pinnedAt'] ?? 0) <=> ($m1['metaData']['pinnedAt'] ?? 0));
}

$headers = [];
Expand Down
Loading