Merge pull request #67 from vector-im/bwindels/log-roomlist-sorting

Add logging for room list sorting
This commit is contained in:
Bruno Windels 2020-08-27 08:51:56 +00:00 committed by GitHub
commit cae70c42f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 11 deletions

View File

@ -49,34 +49,61 @@ export class RoomTileViewModel extends ViewModel {
} }
compare(other) { compare(other) {
/*
put unread rooms first
then put rooms with a timestamp first, and sort by name
then sort by name for rooms without a timestamp
*/
const myRoom = this._room; const myRoom = this._room;
const theirRoom = other._room; const theirRoom = other._room;
let buf = "";
function log(...args) {
buf = buf + args.map(a => a+"").join(" ") + "\n";
}
function logResult(result) {
if (result === 0) {
log("rooms are equal (should not happen)", result);
} else if (result > 0) {
log(`${theirRoom.name || theirRoom.id} comes first`, result);
} else {
log(`${myRoom.name || myRoom.id} comes first`, result);
}
console.info(buf);
return result;
}
log(`comparing ${myRoom.name || theirRoom.id} and ${theirRoom.name || theirRoom.id} ...`);
log("comparing isUnread...");
if (isSortedAsUnread(this) !== isSortedAsUnread(other)) { if (isSortedAsUnread(this) !== isSortedAsUnread(other)) {
if (isSortedAsUnread(this)) { if (isSortedAsUnread(this)) {
return -1; return logResult(-1);
} }
return 1; return logResult(1);
} }
const myTimestamp = myRoom.lastMessageTimestamp; const myTimestamp = myRoom.lastMessageTimestamp;
const theirTimestamp = theirRoom.lastMessageTimestamp; const theirTimestamp = theirRoom.lastMessageTimestamp;
// rooms with a timestamp come before rooms without one const myTimestampValid = Number.isSafeInteger(myTimestamp);
if ((myTimestamp === null) !== (theirTimestamp === null)) { const theirTimestampValid = Number.isSafeInteger(theirTimestamp);
// if either does not have a timestamp, put the one with a timestamp first
if (myTimestampValid !== theirTimestampValid) {
log("checking if either does not have lastMessageTimestamp ...", myTimestamp, theirTimestamp);
if (theirTimestamp === null) { if (theirTimestamp === null) {
return -1; return logResult(-1);
} }
return 1; return logResult(1);
} }
const timeDiff = theirTimestamp - myTimestamp; const timeDiff = theirTimestamp - myTimestamp;
if (timeDiff === 0) { if (timeDiff === 0 || !theirTimestampValid || !myTimestampValid) {
log("checking name ...", myTimestamp, theirTimestamp);
// sort alphabetically // sort alphabetically
const nameCmp = this.name.localeCompare(other.name); const nameCmp = this.name.localeCompare(other.name);
if (nameCmp === 0) { if (nameCmp === 0) {
return this._room.id.localeCompare(other._room.id); return logResult(this._room.id.localeCompare(other._room.id));
} }
return nameCmp; return logResult(nameCmp);
} }
return timeDiff; log("checking timestamp ...");
return logResult(timeDiff);
} }
get isOpen() { get isOpen() {

View File

@ -92,7 +92,6 @@ export class Heroes {
get roomAvatarUrl() { get roomAvatarUrl() {
if (this._members.size === 1) { if (this._members.size === 1) {
for (const member of this._members.values()) { for (const member of this._members.values()) {
console.log("roomAvatarUrl", member, member.avatarUrl);
return member.avatarUrl; return member.avatarUrl;
} }
} }