EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-4470 chat: Fix beeps not appearing anymore

main
Dani Palou 2024-06-11 14:50:28 +02:00
parent ad08fcf4b9
commit 186164ac4e
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/addons/mod/chat/pages/chat/chat.ts
View File

@ -166,7 +166,7 @@ export class AddonModChatChatPage implements OnInit, OnDestroy, CanLeave {
const message = this.messages[index]; const message = this.messages[index];
if (message.beep && message.beep != String(this.currentUserId)) { if (message.beep && message.beep !== this.currentUserId) {
this.loadMessageBeepWho(message); this.loadMessageBeepWho(message);
} }
} }
@ -212,11 +212,11 @@ export class AddonModChatChatPage implements OnInit, OnDestroy, CanLeave {
* @param id User Id before parsing. * @param id User Id before parsing.
* @returns User fullname. * @returns User fullname.
*/ */
protected async getUserFullname(id: string): Promise<string> { protected async getUserFullname(id: string | number): Promise<string> {
const idNumber = parseInt(id, 10); const idNumber = Number(id);
if (isNaN(idNumber)) { if (isNaN(idNumber)) {
return id; return String(id);
} }
const user = this.users.find((user) => user.id == idNumber); const user = this.users.find((user) => user.id == idNumber);
@ -235,10 +235,10 @@ export class AddonModChatChatPage implements OnInit, OnDestroy, CanLeave {
return user.fullname; return user.fullname;
} }
return id; return String(id);
} catch { } catch {
// Ignore errors. // Ignore errors.
return id; return String(id);
} }
} }

10
src/addons/mod/chat/pages/session-messages/session-messages.ts
View File

@ -112,7 +112,7 @@ export class AddonModChatSessionMessagesPage implements OnInit {
const message = this.messages[index]; const message = this.messages[index];
if (message.beep && message.beep != String(this.currentUserId)) { if (message.beep && message.beep !== this.currentUserId) {
this.loadMessageBeepWho(message); this.loadMessageBeepWho(message);
} }
} }
@ -135,11 +135,11 @@ export class AddonModChatSessionMessagesPage implements OnInit {
* @param id User Id before parsing. * @param id User Id before parsing.
* @returns User fullname. * @returns User fullname.
*/ */
protected async getUserFullname(id: string): Promise<string> { protected async getUserFullname(id: string | number): Promise<string> {
const idNumber = parseInt(id, 10); const idNumber = Number(id);
if (isNaN(idNumber)) { if (isNaN(idNumber)) {
return id; return String(id);
} }
try { try {
@ -148,7 +148,7 @@ export class AddonModChatSessionMessagesPage implements OnInit {
return user.fullname; return user.fullname;
} catch { } catch {
// Error getting profile. // Error getting profile.
return id; return String(id);
} }
} }

5
src/addons/mod/chat/services/chat-helper.ts
View File

@ -54,6 +54,9 @@ export class AddonModChatHelperProvider {
formattedMessage.showDate = this.showDate(message, prevMessage); formattedMessage.showDate = this.showDate(message, prevMessage);
formattedMessage.beep = (message.message.substring(0, 5) == 'beep ' && message.message.substring(5).trim()) || undefined; formattedMessage.beep = (message.message.substring(0, 5) == 'beep ' && message.message.substring(5).trim()) || undefined;
if (formattedMessage.beep && !isNaN(Number(formattedMessage.beep))) {
formattedMessage.beep = Number(formattedMessage.beep);
}
formattedMessage.special = !!formattedMessage.beep || (<AddonModChatSessionMessage> message).issystem || formattedMessage.special = !!formattedMessage.beep || (<AddonModChatSessionMessage> message).issystem ||
(<AddonModChatMessage> message).system; (<AddonModChatMessage> message).system;
@ -133,7 +136,7 @@ export const AddonModChatHelper = makeSingleton(AddonModChatHelperProvider);
*/ */
type AddonModChatInfoForView = { type AddonModChatInfoForView = {
showDate?: boolean; // If date should be displayed before the message. showDate?: boolean; // If date should be displayed before the message.
beep?: string; // User id of the beeped user or 'all'. beep?: string | number; // User id of the beeped user or 'all'.
special?: boolean; // True if is an special message (system, beep or command). special?: boolean; // True if is an special message (system, beep or command).
showUserData?: boolean; // If user data should be displayed. showUserData?: boolean; // If user data should be displayed.
showTail?: boolean; // If tail should be displayed (decoration). showTail?: boolean; // If tail should be displayed (decoration).