D123.1732450282.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D123.1732450282.diff
View Options

	diff --git a/src/matrix-room-list.cpp b/src/matrix-room-list.cpp
	--- a/src/matrix-room-list.cpp
	+++ b/src/matrix-room-list.cpp
	@@ -113,11 +113,9 @@
	const auto &roomB = allRooms[idB];
	auto aIsInvite = roomA.membership == Invite;
	auto bIsInvite = roomB.membership == Invite;
	- auto aIsFavourite = roomA.tags().find("m.favourite") != nullptr;
	- auto bIsFavourite = roomB.tags().find("m.favourite") != nullptr;
	- if (aIsFavourite != bIsFavourite) {
	- return aIsFavourite;
	- } else if (aIsInvite != bIsInvite) {
	+ auto aIsFavourite = roomA.tags().count("m.favourite") == 1;
	+ auto bIsFavourite = roomB.tags().count("m.favourite") == 1;
	+ if (aIsInvite != bIsInvite) {
	/**
	* if my membership in A is invite,
	* then the membership in B is not invite,
	@@ -125,6 +123,8 @@
	* otherwise B should come first
	**/
	return aIsInvite;
	+ } else if (aIsFavourite != bIsFavourite) {
	+ return aIsFavourite;
	} else {
	return latestEventTimestamp(roomA)
	> latestEventTimestamp(roomB);