From eb11ad9e5a71b9a297a35e2ab97e3f2fec300046 Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Wed, 6 May 2020 19:26:59 +0200 Subject: [PATCH] Clean up --- lib/i18n/i18n.dart | 2 +- lib/i18n/intl_de.arb | 20 ++- lib/i18n/intl_messages.arb | 27 +++- lib/i18n/messages_de.dart | 164 +++++++++++----------- lib/i18n/messages_messages.dart | 165 ++++++++++++----------- lib/utils/client_presence_extension.dart | 1 + lib/utils/presence_extension.dart | 4 - 7 files changed, 213 insertions(+), 170 deletions(-) diff --git a/lib/i18n/i18n.dart b/lib/i18n/i18n.dart index afa8360..3e9f274 100644 --- a/lib/i18n/i18n.dart +++ b/lib/i18n/i18n.dart @@ -424,7 +424,7 @@ class I18n extends MatrixLocalizations { ); String lastActiveAgo(String localizedTimeShort) => Intl.message( - "Last active: localizedTimeShort", + "Last active: $localizedTimeShort", name: "lastActiveAgo", args: [localizedTimeShort], ); diff --git a/lib/i18n/intl_de.arb b/lib/i18n/intl_de.arb index 72d26d1..d9d5c2f 100644 --- a/lib/i18n/intl_de.arb +++ b/lib/i18n/intl_de.arb @@ -303,10 +303,12 @@ "type": "text", "placeholders": {} }, - "Could not decrypt message": "Nachricht konnte nicht entschlüsselt werden", - "@Could not decrypt message": { + "couldNotDecryptMessage": "Nachricht konnte nicht entschlüsselt werden: {error}", + "@couldNotDecryptMessage": { "type": "text", - "placeholders": {} + "placeholders": { + "error": {} + } }, "Could not set avatar": "Profilbild konnte nicht gesetzt werden", "@Could not set avatar": { @@ -655,6 +657,13 @@ "username": {} } }, + "lastActiveAgo": "Zuletzt aktiv: {localizedTimeShort}", + "@lastActiveAgo": { + "type": "text", + "placeholders": { + "localizedTimeShort": {} + } + }, "Last seen IP": "Zuletzt bekannte IP", "@Last seen IP": { "type": "text", @@ -1029,6 +1038,11 @@ "type": "text", "placeholders": {} }, + "Set status": "Status ändern", + "@Set status": { + "type": "text", + "placeholders": {} + }, "Change your style": "Ändere Deinen Style", "@Change your style": { "type": "text", diff --git a/lib/i18n/intl_messages.arb b/lib/i18n/intl_messages.arb index ce83a93..d16f3a8 100644 --- a/lib/i18n/intl_messages.arb +++ b/lib/i18n/intl_messages.arb @@ -1,5 +1,5 @@ { - "@@last_modified": "2020-04-12T11:11:56.595233", + "@@last_modified": "2020-05-06T19:24:19.377156", "About": "About", "@About": { "type": "text", @@ -303,10 +303,12 @@ "type": "text", "placeholders": {} }, - "Could not decrypt message": "Could not decrypt message", - "@Could not decrypt message": { + "couldNotDecryptMessage": "Could not decrypt message: {error}", + "@couldNotDecryptMessage": { "type": "text", - "placeholders": {} + "placeholders": { + "error": {} + } }, "Could not set avatar": "Could not set avatar", "@Could not set avatar": { @@ -655,6 +657,13 @@ "username": {} } }, + "lastActiveAgo": "Last active: {localizedTimeShort}", + "@lastActiveAgo": { + "type": "text", + "placeholders": { + "localizedTimeShort": {} + } + }, "Last seen IP": "Last seen IP", "@Last seen IP": { "type": "text", @@ -1019,6 +1028,11 @@ "type": "text", "placeholders": {} }, + "Set status": "Set status", + "@Set status": { + "type": "text", + "placeholders": {} + }, "Settings": "Settings", "@Settings": { "type": "text", @@ -1039,6 +1053,11 @@ "type": "text", "placeholders": {} }, + "How are you today?": "How are you today?", + "@How are you today?": { + "type": "text", + "placeholders": {} + }, "Light": "Light", "@Light": { "type": "text", diff --git a/lib/i18n/messages_de.dart b/lib/i18n/messages_de.dart index 3ffd747..836d1d8 100644 --- a/lib/i18n/messages_de.dart +++ b/lib/i18n/messages_de.dart @@ -55,83 +55,87 @@ class MessageLookup extends MessageLookupByLibrary { static m17(username) => "${username} hat den Einladungslink geändert"; - static m18(count) => "${count} Teilnehmer"; + static m18(error) => "Nachricht konnte nicht entschlüsselt werden: ${error}"; - static m19(username) => "${username} hat den Chat erstellt"; + static m19(count) => "${count} Teilnehmer"; - static m20(date, timeOfDay) => "${date}, ${timeOfDay}"; + static m20(username) => "${username} hat den Chat erstellt"; - static m21(year, month, day) => "${day}.${month}.${year}"; + static m21(date, timeOfDay) => "${date}, ${timeOfDay}"; - static m22(month, day) => "${day}.${month}"; + static m22(year, month, day) => "${day}.${month}.${year}"; - static m23(displayname) => "Gruppe mit ${displayname}"; + static m23(month, day) => "${day}.${month}"; - static m24(username, targetName) => "${username} hat die Einladung für ${targetName} zurückgezogen"; + static m24(displayname) => "Gruppe mit ${displayname}"; - static m25(groupName) => "Kontakt zu ${groupName} einladen"; + static m25(username, targetName) => "${username} hat die Einladung für ${targetName} zurückgezogen"; - static m26(username, link) => "${username} hat Dich zu FluffyChat eingeladen. \n1. Installiere FluffyChat: http://fluffy.chat \n2. Melde Dich in der App an \n3. Öffne den Einladungslink: ${link}"; + static m26(groupName) => "Kontakt zu ${groupName} einladen"; - static m27(username, targetName) => "${username} hat ${targetName} eingeladen"; + static m27(username, link) => "${username} hat Dich zu FluffyChat eingeladen. \n1. Installiere FluffyChat: http://fluffy.chat \n2. Melde Dich in der App an \n3. Öffne den Einladungslink: ${link}"; - static m28(username) => "${username} ist dem Chat beigetreten"; + static m28(username, targetName) => "${username} hat ${targetName} eingeladen"; - static m29(username, targetName) => "${username} hat ${targetName} hinausgeworfen"; + static m29(username) => "${username} ist dem Chat beigetreten"; - static m30(username, targetName) => "${username} hat ${targetName} hinausgeworfen und verbannt"; + static m30(username, targetName) => "${username} hat ${targetName} hinausgeworfen"; - static m31(count) => "${count} weitere Teilnehmer laden"; + static m31(username, targetName) => "${username} hat ${targetName} hinausgeworfen und verbannt"; - static m32(homeserver) => "Bei ${homeserver} anmelden"; + static m32(localizedTimeShort) => "Zuletzt aktiv: ${localizedTimeShort}"; - static m33(number) => "${number} ausgewählt"; + static m33(count) => "${count} weitere Teilnehmer laden"; - static m34(fileName) => "Play ${fileName}"; + static m34(homeserver) => "Bei ${homeserver} anmelden"; - static m35(username) => "${username} hat ein Event enternt"; + static m35(number) => "${number} ausgewählt"; - static m36(username) => "${username} hat die Einladung abgelehnt"; + static m36(fileName) => "Play ${fileName}"; - static m37(username) => "Entfernt von ${username}"; + static m37(username) => "${username} hat ein Event enternt"; - static m38(username) => "Gelesen von ${username}"; + static m38(username) => "${username} hat die Einladung abgelehnt"; - static m39(username, count) => "Gelesen von ${username} und ${count} anderen"; + static m39(username) => "Entfernt von ${username}"; - static m40(username, username2) => "Gelesen von ${username} und ${username2}"; + static m40(username) => "Gelesen von ${username}"; - static m41(username) => "${username} hat eine Datei gesendet"; + static m41(username, count) => "Gelesen von ${username} und ${count} anderen"; - static m42(username) => "${username} hat ein Bild gesendet"; + static m42(username, username2) => "Gelesen von ${username} und ${username2}"; - static m43(username) => "${username} hat einen Sticker gesendet"; + static m43(username) => "${username} hat eine Datei gesendet"; - static m44(username) => "${username} hat ein Video gesendet"; + static m44(username) => "${username} hat ein Bild gesendet"; - static m45(username) => "${username} hat eine Audio-Datei gesendet"; + static m45(username) => "${username} hat einen Sticker gesendet"; - static m46(username) => "${username} hat den Standort geteilt"; + static m46(username) => "${username} hat ein Video gesendet"; - static m47(hours12, hours24, minutes, suffix) => "${hours24}:${minutes}"; + static m47(username) => "${username} hat eine Audio-Datei gesendet"; - static m48(username, targetName) => "${username} hat die Verbannung von ${targetName} aufgehoben"; + static m48(username) => "${username} hat den Standort geteilt"; - static m49(type) => "Unbekanntes Event \'${type}\'"; + static m49(hours12, hours24, minutes, suffix) => "${hours24}:${minutes}"; - static m50(unreadEvents) => "${unreadEvents} ungelesene Nachrichten"; + static m50(username, targetName) => "${username} hat die Verbannung von ${targetName} aufgehoben"; - static m51(unreadEvents, unreadChats) => "${unreadEvents} ungelesene Nachrichten in ${unreadChats} Chats"; + static m51(type) => "Unbekanntes Event \'${type}\'"; - static m52(username, count) => "${username} und ${count} andere schreiben ..."; + static m52(unreadEvents) => "${unreadEvents} ungelesene Nachrichten"; - static m53(username, username2) => "${username} und ${username2} schreiben ..."; + static m53(unreadEvents, unreadChats) => "${unreadEvents} ungelesene Nachrichten in ${unreadChats} Chats"; - static m54(username) => "${username} schreibt ..."; + static m54(username, count) => "${username} und ${count} andere schreiben ..."; - static m55(username) => "${username} hat den Chat verlassen"; + static m55(username, username2) => "${username} und ${username2} schreiben ..."; - static m56(username, type) => "${username} hat ${type} Event gesendet"; + static m56(username) => "${username} schreibt ..."; + + static m57(username) => "${username} hat den Chat verlassen"; + + static m58(username, type) => "${username} hat ${type} Event gesendet"; final messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { @@ -169,7 +173,6 @@ class MessageLookup extends MessageLookupByLibrary { "Content viewer" : MessageLookupByLibrary.simpleMessage("Content Viewer"), "Copied to clipboard" : MessageLookupByLibrary.simpleMessage("Wurde in die Zwischenablage kopiert"), "Copy" : MessageLookupByLibrary.simpleMessage("Kopieren"), - "Could not decrypt message" : MessageLookupByLibrary.simpleMessage("Nachricht konnte nicht entschlüsselt werden"), "Could not set avatar" : MessageLookupByLibrary.simpleMessage("Profilbild konnte nicht gesetzt werden"), "Could not set displayname" : MessageLookupByLibrary.simpleMessage("Anzeigename konnte nicht gesetzt werden"), "Create" : MessageLookupByLibrary.simpleMessage("Create"), @@ -268,6 +271,7 @@ class MessageLookup extends MessageLookupByLibrary { "Set a profile picture" : MessageLookupByLibrary.simpleMessage("Ein Profilbild festlegen"), "Set group description" : MessageLookupByLibrary.simpleMessage("Gruppenbeschreibung festlegen"), "Set invitation link" : MessageLookupByLibrary.simpleMessage("Einladungslink festlegen"), + "Set status" : MessageLookupByLibrary.simpleMessage("Status ändern"), "Settings" : MessageLookupByLibrary.simpleMessage("Einstellungen"), "Share" : MessageLookupByLibrary.simpleMessage("Teilen"), "Sign up" : MessageLookupByLibrary.simpleMessage("Registrieren"), @@ -324,46 +328,48 @@ class MessageLookup extends MessageLookupByLibrary { "changedTheProfileAvatar" : m15, "changedTheRoomAliases" : m16, "changedTheRoomInvitationLink" : m17, - "countParticipants" : m18, - "createdTheChat" : m19, - "dateAndTimeOfDay" : m20, - "dateWithYear" : m21, - "dateWithoutYear" : m22, - "groupWith" : m23, - "hasWithdrawnTheInvitationFor" : m24, - "inviteContactToGroup" : m25, - "inviteText" : m26, - "invitedUser" : m27, + "couldNotDecryptMessage" : m18, + "countParticipants" : m19, + "createdTheChat" : m20, + "dateAndTimeOfDay" : m21, + "dateWithYear" : m22, + "dateWithoutYear" : m23, + "groupWith" : m24, + "hasWithdrawnTheInvitationFor" : m25, + "inviteContactToGroup" : m26, + "inviteText" : m27, + "invitedUser" : m28, "is typing..." : MessageLookupByLibrary.simpleMessage("schreibt..."), - "joinedTheChat" : m28, - "kicked" : m29, - "kickedAndBanned" : m30, - "loadCountMoreParticipants" : m31, - "logInTo" : m32, - "numberSelected" : m33, - "play" : m34, - "redactedAnEvent" : m35, - "rejectedTheInvitation" : m36, - "removedBy" : m37, - "seenByUser" : m38, - "seenByUserAndCountOthers" : m39, - "seenByUserAndUser" : m40, - "sentAFile" : m41, - "sentAPicture" : m42, - "sentASticker" : m43, - "sentAVideo" : m44, - "sentAnAudio" : m45, - "sharedTheLocation" : m46, - "timeOfDay" : m47, + "joinedTheChat" : m29, + "kicked" : m30, + "kickedAndBanned" : m31, + "lastActiveAgo" : m32, + "loadCountMoreParticipants" : m33, + "logInTo" : m34, + "numberSelected" : m35, + "play" : m36, + "redactedAnEvent" : m37, + "rejectedTheInvitation" : m38, + "removedBy" : m39, + "seenByUser" : m40, + "seenByUserAndCountOthers" : m41, + "seenByUserAndUser" : m42, + "sentAFile" : m43, + "sentAPicture" : m44, + "sentASticker" : m45, + "sentAVideo" : m46, + "sentAnAudio" : m47, + "sharedTheLocation" : m48, + "timeOfDay" : m49, "title" : MessageLookupByLibrary.simpleMessage("FluffyChat"), - "unbannedUser" : m48, - "unknownEvent" : m49, - "unreadMessages" : m50, - "unreadMessagesInChats" : m51, - "userAndOthersAreTyping" : m52, - "userAndUserAreTyping" : m53, - "userIsTyping" : m54, - "userLeftTheChat" : m55, - "userSentUnknownEvent" : m56 + "unbannedUser" : m50, + "unknownEvent" : m51, + "unreadMessages" : m52, + "unreadMessagesInChats" : m53, + "userAndOthersAreTyping" : m54, + "userAndUserAreTyping" : m55, + "userIsTyping" : m56, + "userLeftTheChat" : m57, + "userSentUnknownEvent" : m58 }; } diff --git a/lib/i18n/messages_messages.dart b/lib/i18n/messages_messages.dart index 29665f3..06196e9 100644 --- a/lib/i18n/messages_messages.dart +++ b/lib/i18n/messages_messages.dart @@ -55,83 +55,87 @@ class MessageLookup extends MessageLookupByLibrary { static m17(username) => "${username} changed the invitation link"; - static m18(count) => "${count} participants"; + static m18(error) => "Could not decrypt message: ${error}"; - static m19(username) => "${username} created the chat"; + static m19(count) => "${count} participants"; - static m20(date, timeOfDay) => "${date}, ${timeOfDay}"; + static m20(username) => "${username} created the chat"; - static m21(year, month, day) => "${year}-${month}-${day}"; + static m21(date, timeOfDay) => "${date}, ${timeOfDay}"; - static m22(month, day) => "${month}-${day}"; + static m22(year, month, day) => "${year}-${month}-${day}"; - static m23(displayname) => "Group with ${displayname}"; + static m23(month, day) => "${month}-${day}"; - static m24(username, targetName) => "${username} has withdrawn the invitation for ${targetName}"; + static m24(displayname) => "Group with ${displayname}"; - static m25(groupName) => "Invite contact to ${groupName}"; + static m25(username, targetName) => "${username} has withdrawn the invitation for ${targetName}"; - static m26(username, link) => "${username} invited you to FluffyChat. \n1. Install FluffyChat: http://fluffy.chat \n2. Sign up or sign in \n3. Open the invite link: ${link}"; + static m26(groupName) => "Invite contact to ${groupName}"; - static m27(username, targetName) => "${username} invited ${targetName}"; + static m27(username, link) => "${username} invited you to FluffyChat. \n1. Install FluffyChat: http://fluffy.chat \n2. Sign up or sign in \n3. Open the invite link: ${link}"; - static m28(username) => "${username} joined the chat"; + static m28(username, targetName) => "${username} invited ${targetName}"; - static m29(username, targetName) => "${username} kicked ${targetName}"; + static m29(username) => "${username} joined the chat"; - static m30(username, targetName) => "${username} kicked and banned ${targetName}"; + static m30(username, targetName) => "${username} kicked ${targetName}"; - static m31(count) => "Load ${count} more participants"; + static m31(username, targetName) => "${username} kicked and banned ${targetName}"; - static m32(homeserver) => "Log in to ${homeserver}"; + static m32(localizedTimeShort) => "Last active: ${localizedTimeShort}"; - static m33(number) => "${number} selected"; + static m33(count) => "Load ${count} more participants"; - static m34(fileName) => "Play ${fileName}"; + static m34(homeserver) => "Log in to ${homeserver}"; - static m35(username) => "${username} redacted an event"; + static m35(number) => "${number} selected"; - static m36(username) => "${username} rejected the invitation"; + static m36(fileName) => "Play ${fileName}"; - static m37(username) => "Removed by ${username}"; + static m37(username) => "${username} redacted an event"; - static m38(username) => "Seen by ${username}"; + static m38(username) => "${username} rejected the invitation"; - static m39(username, count) => "Seen by ${username} and ${count} others"; + static m39(username) => "Removed by ${username}"; - static m40(username, username2) => "Seen by ${username} and ${username2}"; + static m40(username) => "Seen by ${username}"; - static m41(username) => "${username} sent a file"; + static m41(username, count) => "Seen by ${username} and ${count} others"; - static m42(username) => "${username} sent a picture"; + static m42(username, username2) => "Seen by ${username} and ${username2}"; - static m43(username) => "${username} sent a sticker"; + static m43(username) => "${username} sent a file"; - static m44(username) => "${username} sent a video"; + static m44(username) => "${username} sent a picture"; - static m45(username) => "${username} sent an audio"; + static m45(username) => "${username} sent a sticker"; - static m46(username) => "${username} shared the location"; + static m46(username) => "${username} sent a video"; - static m47(hours12, hours24, minutes, suffix) => "${hours12}:${minutes} ${suffix}"; + static m47(username) => "${username} sent an audio"; - static m48(username, targetName) => "${username} unbanned ${targetName}"; + static m48(username) => "${username} shared the location"; - static m49(type) => "Unknown event \'${type}\'"; + static m49(hours12, hours24, minutes, suffix) => "${hours12}:${minutes} ${suffix}"; - static m50(unreadEvents) => "${unreadEvents} unread messages"; + static m50(username, targetName) => "${username} unbanned ${targetName}"; - static m51(unreadEvents, unreadChats) => "${unreadEvents} unread messages in ${unreadChats} chats"; + static m51(type) => "Unknown event \'${type}\'"; - static m52(username, count) => "${username} and ${count} others are typing..."; + static m52(unreadEvents) => "${unreadEvents} unread messages"; - static m53(username, username2) => "${username} and ${username2} are typing..."; + static m53(unreadEvents, unreadChats) => "${unreadEvents} unread messages in ${unreadChats} chats"; - static m54(username) => "${username} is typing..."; + static m54(username, count) => "${username} and ${count} others are typing..."; - static m55(username) => "${username} left the chat"; + static m55(username, username2) => "${username} and ${username2} are typing..."; - static m56(username, type) => "${username} sent a ${type} event"; + static m56(username) => "${username} is typing..."; + + static m57(username) => "${username} left the chat"; + + static m58(username, type) => "${username} sent a ${type} event"; final messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { @@ -169,7 +173,6 @@ class MessageLookup extends MessageLookupByLibrary { "Content viewer" : MessageLookupByLibrary.simpleMessage("Content viewer"), "Copied to clipboard" : MessageLookupByLibrary.simpleMessage("Copied to clipboard"), "Copy" : MessageLookupByLibrary.simpleMessage("Copy"), - "Could not decrypt message" : MessageLookupByLibrary.simpleMessage("Could not decrypt message"), "Could not set avatar" : MessageLookupByLibrary.simpleMessage("Could not set avatar"), "Could not set displayname" : MessageLookupByLibrary.simpleMessage("Could not set displayname"), "Create" : MessageLookupByLibrary.simpleMessage("Create"), @@ -210,6 +213,7 @@ class MessageLookup extends MessageLookupByLibrary { "Guests can join" : MessageLookupByLibrary.simpleMessage("Guests can join"), "Help" : MessageLookupByLibrary.simpleMessage("Help"), "Homeserver is not compatible" : MessageLookupByLibrary.simpleMessage("Homeserver is not compatible"), + "How are you today?" : MessageLookupByLibrary.simpleMessage("How are you today?"), "ID" : MessageLookupByLibrary.simpleMessage("ID"), "Identity" : MessageLookupByLibrary.simpleMessage("Identity"), "Invite contact" : MessageLookupByLibrary.simpleMessage("Invite contact"), @@ -268,6 +272,7 @@ class MessageLookup extends MessageLookupByLibrary { "Set a profile picture" : MessageLookupByLibrary.simpleMessage("Set a profile picture"), "Set group description" : MessageLookupByLibrary.simpleMessage("Set group description"), "Set invitation link" : MessageLookupByLibrary.simpleMessage("Set invitation link"), + "Set status" : MessageLookupByLibrary.simpleMessage("Set status"), "Settings" : MessageLookupByLibrary.simpleMessage("Settings"), "Share" : MessageLookupByLibrary.simpleMessage("Share"), "Sign up" : MessageLookupByLibrary.simpleMessage("Sign up"), @@ -324,46 +329,48 @@ class MessageLookup extends MessageLookupByLibrary { "changedTheProfileAvatar" : m15, "changedTheRoomAliases" : m16, "changedTheRoomInvitationLink" : m17, - "countParticipants" : m18, - "createdTheChat" : m19, - "dateAndTimeOfDay" : m20, - "dateWithYear" : m21, - "dateWithoutYear" : m22, - "groupWith" : m23, - "hasWithdrawnTheInvitationFor" : m24, - "inviteContactToGroup" : m25, - "inviteText" : m26, - "invitedUser" : m27, + "couldNotDecryptMessage" : m18, + "countParticipants" : m19, + "createdTheChat" : m20, + "dateAndTimeOfDay" : m21, + "dateWithYear" : m22, + "dateWithoutYear" : m23, + "groupWith" : m24, + "hasWithdrawnTheInvitationFor" : m25, + "inviteContactToGroup" : m26, + "inviteText" : m27, + "invitedUser" : m28, "is typing..." : MessageLookupByLibrary.simpleMessage("is typing..."), - "joinedTheChat" : m28, - "kicked" : m29, - "kickedAndBanned" : m30, - "loadCountMoreParticipants" : m31, - "logInTo" : m32, - "numberSelected" : m33, - "play" : m34, - "redactedAnEvent" : m35, - "rejectedTheInvitation" : m36, - "removedBy" : m37, - "seenByUser" : m38, - "seenByUserAndCountOthers" : m39, - "seenByUserAndUser" : m40, - "sentAFile" : m41, - "sentAPicture" : m42, - "sentASticker" : m43, - "sentAVideo" : m44, - "sentAnAudio" : m45, - "sharedTheLocation" : m46, - "timeOfDay" : m47, + "joinedTheChat" : m29, + "kicked" : m30, + "kickedAndBanned" : m31, + "lastActiveAgo" : m32, + "loadCountMoreParticipants" : m33, + "logInTo" : m34, + "numberSelected" : m35, + "play" : m36, + "redactedAnEvent" : m37, + "rejectedTheInvitation" : m38, + "removedBy" : m39, + "seenByUser" : m40, + "seenByUserAndCountOthers" : m41, + "seenByUserAndUser" : m42, + "sentAFile" : m43, + "sentAPicture" : m44, + "sentASticker" : m45, + "sentAVideo" : m46, + "sentAnAudio" : m47, + "sharedTheLocation" : m48, + "timeOfDay" : m49, "title" : MessageLookupByLibrary.simpleMessage("FluffyChat"), - "unbannedUser" : m48, - "unknownEvent" : m49, - "unreadMessages" : m50, - "unreadMessagesInChats" : m51, - "userAndOthersAreTyping" : m52, - "userAndUserAreTyping" : m53, - "userIsTyping" : m54, - "userLeftTheChat" : m55, - "userSentUnknownEvent" : m56 + "unbannedUser" : m50, + "unknownEvent" : m51, + "unreadMessages" : m52, + "unreadMessagesInChats" : m53, + "userAndOthersAreTyping" : m54, + "userAndUserAreTyping" : m55, + "userIsTyping" : m56, + "userLeftTheChat" : m57, + "userSentUnknownEvent" : m58 }; } diff --git a/lib/utils/client_presence_extension.dart b/lib/utils/client_presence_extension.dart index 22cae66..9f6deee 100644 --- a/lib/utils/client_presence_extension.dart +++ b/lib/utils/client_presence_extension.dart @@ -3,6 +3,7 @@ import 'package:famedlysdk/famedlysdk.dart'; extension ClientPresenceExtension on Client { List get statusList { final statusList = presences.values.toList(); + statusList.removeWhere((p) => p.statusMsg?.isEmpty ?? true); statusList.sort((a, b) => b.time.compareTo(a.time)); return statusList; } diff --git a/lib/utils/presence_extension.dart b/lib/utils/presence_extension.dart index c6b8f3f..465e7cd 100644 --- a/lib/utils/presence_extension.dart +++ b/lib/utils/presence_extension.dart @@ -8,10 +8,6 @@ extension PresenceExtension on Presence { if (statusMsg?.isNotEmpty ?? false) { return statusMsg; } - if (displayname != null) { - return I18n.of(context) - .changedTheDisplaynameTo(sender.localpart, displayname); - } return I18n.of(context).lastActiveAgo(time.localizedTimeShort(context)); } }