Handle message short texts properly in backend

2020-10-03 22:58:45 +02:00 · 2020-10-03 22:58:45 +02:00 · ec9e4b2f0b
commit ec9e4b2f0b
parent 79c77c426b
11 changed files with 749 additions and 309 deletions
--- a/harbour-fernschreiber.pro
+++ b/harbour-fernschreiber.pro
@ -23,6 +23,7 @@ SOURCES += src/harbour-fernschreiber.cpp \
    src/chatmodel.cpp \
    src/dbusadaptor.cpp \
    src/dbusinterface.cpp \
+    src/fernschreiberutils.cpp \
    src/notificationmanager.cpp \
    src/processlauncher.cpp \
    src/tdlibreceiver.cpp \
@ -100,6 +101,7 @@ HEADERS += \
    src/chatmodel.h \
    src/dbusadaptor.h \
    src/dbusinterface.h \
+    src/fernschreiberutils.h \
    src/notificationmanager.h \
    src/processlauncher.h \
    src/tdlibreceiver.h \
--- a/src/chatlistmodel.cpp
+++ b/src/chatlistmodel.cpp
@ -18,6 +18,7 @@
 */

 #include "chatlistmodel.h"
+#include "fernschreiberutils.h"
 #include <QDebug>

 #define LOG(x) qDebug() << "[ChatListModel]" << x
@ -61,7 +62,7 @@ public:
        RoleIsChannel
    };

-    ChatData(const QVariantMap &data);
+    ChatData(const QVariantMap &data, const QVariantMap &userInformation);

    int compareTo(const ChatData *chat) const;
    bool setOrder(const QString &order);
@ -82,13 +83,15 @@ public:
    QVariantMap chatData;
    QString chatId;
    qlonglong order;
+    QVariantMap userInformation;
 };

-ChatListModel::ChatData::ChatData(const QVariantMap &data) :
+ChatListModel::ChatData::ChatData(const QVariantMap &data, const QVariantMap &userInformation) :
    chatData(data),
    chatId(data.value(ID).toString()),
    order(data.value(ORDER).toLongLong())
 {
+    this->userInformation = userInformation;
 }

 int ChatListModel::ChatData::compareTo(const ChatData *other) const
@ -148,8 +151,7 @@ qlonglong ChatListModel::ChatData::senderMessageDate() const

 QString ChatListModel::ChatData::senderMessageText() const
 {
-    const QVariantMap content(lastMessage(CONTENT).toMap());
-    return (content.value(TYPE).toString() == TYPE_MESSAGE_TEXT) ? content.value(TEXT).toMap().value(TEXT).toString() : QString();
+    return FernschreiberUtils::getMessageShortText(lastMessage(CONTENT).toMap(), this->userInformation.value(ID).toLongLong() == senderUserId());
 }

 bool ChatListModel::ChatData::isChannel() const
@ -307,7 +309,7 @@ int ChatListModel::updateChatOrder(int chatIndex)

 void ChatListModel::handleChatDiscovered(const QString &chatId, const QVariantMap &chatToBeAdded)
 {
-    ChatData *chat = new ChatData(chatToBeAdded);
+    ChatData *chat = new ChatData(chatToBeAdded, tdLibWrapper->getUserInformation());
    const int n = chatList.size();
    int chatIndex;
    for (chatIndex = 0; chatIndex < n && chat->compareTo(chatList.at(chatIndex)) >= 0; chatIndex++);
--- a/src/fernschreiberutils.cpp
+++ b/src/fernschreiberutils.cpp
@ -0,0 +1,55 @@
+#include "fernschreiberutils.h"
+
+#include <QMap>
+#include <QVariant>
+
+FernschreiberUtils::FernschreiberUtils(QObject *parent) : QObject(parent)
+{
+
+}
+
+QString FernschreiberUtils::getMessageShortText(const QVariantMap &messageContent, const bool &myself)
+{
+    QString contentType = messageContent.value("@type").toString();
+
+    if (contentType == "messageText") {
+        return messageContent.value("text").toMap().value("text").toString();
+    }
+    if (contentType == "messageSticker") {
+        return tr("Sticker: %1").arg(messageContent.value("sticker").toMap().value("emoji").toString());
+    }
+    if (contentType == "messagePhoto") {
+        return myself ? tr("sent a picture", "myself") : tr("sent a picture");
+    }
+    if (contentType == "messageVideo") {
+        return myself ? tr("sent a video", "myself") : tr("sent a video");
+    }
+    if (contentType == "messageAnimation") {
+        return myself ? tr("sent an animation", "myself") : tr("sent an animation");
+    }
+    if (contentType == "messageVoiceNote") {
+        return myself ? tr("sent a voice note", "myself") : tr("sent a voice note");
+    }
+    if (contentType == "messageDocument") {
+        return myself ? tr("sent a document", "myself") : tr("sent a document");
+    }
+    if (contentType == "messageLocation") {
+        return myself ? tr("sent a location", "myself") : tr("sent a location");
+    }
+    if (contentType == "messageVenue") {
+        return myself ? tr("sent a venue", "myself") : tr("sent a venue");
+    }
+    if (contentType == "messageContactRegistered") {
+        return myself ? tr("have registered with Telegram", "myself") : tr("has registered with Telegram");
+    }
+    if (contentType == "messageChatJoinByLink") {
+        return myself ? tr("joined this chat", "myself") : tr("joined this chat");
+    }
+    if (contentType == "messageChatAddMembers") {
+        return myself ? tr("were added to this chat", "myself") : tr("was added to this chat");
+    }
+    if (contentType == "messageChatDeleteMember") {
+        return myself ? tr("left this chat", "myself") : tr("left this chat");
+    }
+    return tr("Unsupported message: %1").arg(contentType.mid(7));
+}
--- a/src/fernschreiberutils.h
+++ b/src/fernschreiberutils.h
@ -0,0 +1,19 @@
+#ifndef FERNSCHREIBERUTILS_H
+#define FERNSCHREIBERUTILS_H
+
+#include <QObject>
+
+class FernschreiberUtils : public QObject
+{
+    Q_OBJECT
+public:
+    explicit FernschreiberUtils(QObject *parent = nullptr);
+
+    static QString getMessageShortText(const QVariantMap &messageContent, const bool &myself);
+
+signals:
+
+public slots:
+};
+
+#endif // FERNSCHREIBERUTILS_H
--- a/src/notificationmanager.cpp
+++ b/src/notificationmanager.cpp
@ -18,6 +18,7 @@
 */

 #include "notificationmanager.h"
+#include "fernschreiberutils.h"
 #include <nemonotifications-qt5/notification.h>
 #include <sailfishapp.h>
 #include <QDebug>
@ -219,42 +220,7 @@ QString NotificationManager::getNotificationText(const QVariantMap &notification
 {
    qDebug() << "[NotificationManager] Getting notification text from content" << notificationContent;

-    QString contentType = notificationContent.value("@type").toString();
-
-    if (contentType == "messageText") {
-        return notificationContent.value("text").toMap().value("text").toString();
-    }
-    if (contentType == "messagePhoto") {
-        return tr("sent a picture");
-    }
-    if (contentType == "messageVideo") {
-        return tr("sent a video");
-    }
-    if (contentType == "messageAnimation") {
-        return tr("sent an animation");
-    }
-    if (contentType == "messageVoiceNote") {
-        return tr("sent a voice note");
-    }
-    if (contentType == "messageDocument") {
-        return tr("sent a document");
-    }
-    if (contentType == "messageLocation") {
-        return tr("sent a location");
-    }
-    if (contentType == "messageContactRegistered") {
-        return tr("has registered with Telegram");
-    }
-    if (contentType == "messageChatJoinByLink") {
-        return tr("joined this chat");
-    }
-    if (contentType == "messageChatAddMembers") {
-        return tr("was added to this chat");
-    }
-    if (contentType == "messageChatDeleteMember") {
-        return tr("left this chat");
-    }
-    return tr("Unsupported message: %1").arg(contentType.mid(7));
+    return FernschreiberUtils::getMessageShortText(notificationContent, false);
 }

 void NotificationManager::controlLedNotification(const bool &enabled)
--- a/translations/harbour-fernschreiber-de.ts
+++ b/translations/harbour-fernschreiber-de.ts
@ -228,6 +228,116 @@
        <translation>Dokument öffnen</translation>
    </message>
 </context>
+<context>
+    <name>FernschreiberUtils</name>
+    <message>
+        <source>sent a picture</source>
+        <comment>myself</comment>
+        <translation>haben ein Bild geschickt</translation>
+    </message>
+    <message>
+        <source>sent a picture</source>
+        <translation>hat ein Bild geschickt</translation>
+    </message>
+    <message>
+        <source>sent a video</source>
+        <comment>myself</comment>
+        <translation>haben ein Video geschickt</translation>
+    </message>
+    <message>
+        <source>sent a video</source>
+        <translation>hat ein Video geschickt</translation>
+    </message>
+    <message>
+        <source>sent an animation</source>
+        <comment>myself</comment>
+        <translation>haben eine Animation geschickt</translation>
+    </message>
+    <message>
+        <source>sent an animation</source>
+        <translation>hat eine Animation geschickt</translation>
+    </message>
+    <message>
+        <source>sent a voice note</source>
+        <translation>hat eine Sprachnachricht geschickt</translation>
+    </message>
+    <message>
+        <source>sent a document</source>
+        <comment>myself</comment>
+        <translation>haben ein Dokument geschickt</translation>
+    </message>
+    <message>
+        <source>sent a document</source>
+        <translation>hat ein Dokument geschickt</translation>
+    </message>
+    <message>
+        <source>sent a location</source>
+        <comment>myself</comment>
+        <translation>haben einen Standort geschickt</translation>
+    </message>
+    <message>
+        <source>sent a location</source>
+        <translation>hat einen Standort geschickt</translation>
+    </message>
+    <message>
+        <source>have registered with Telegram</source>
+        <comment>myself</comment>
+        <translation>haben sich bei Telegram angemeldet</translation>
+    </message>
+    <message>
+        <source>has registered with Telegram</source>
+        <translation>hat sich bei Telegram angemeldet</translation>
+    </message>
+    <message>
+        <source>joined this chat</source>
+        <comment>myself</comment>
+        <translation>sind diesem Chat beigetreten</translation>
+    </message>
+    <message>
+        <source>joined this chat</source>
+        <translation>ist diesem Chat beigetreten</translation>
+    </message>
+    <message>
+        <source>were added to this chat</source>
+        <comment>myself</comment>
+        <translation>wurden diesem Chat hinzugefügt</translation>
+    </message>
+    <message>
+        <source>was added to this chat</source>
+        <translation>wurde diesem Chat hinzugefügt</translation>
+    </message>
+    <message>
+        <source>left this chat</source>
+        <comment>myself</comment>
+        <translation>haben diesen Chat verlassen</translation>
+    </message>
+    <message>
+        <source>left this chat</source>
+        <translation>hat diesen Chat verlassen</translation>
+    </message>
+    <message>
+        <source>Unsupported message: %1</source>
+        <translation>Nicht unterstützte Nachricht: %1</translation>
+    </message>
+    <message>
+        <source>Sticker: %1</source>
+        <translation>Sticker: %1</translation>
+    </message>
+    <message>
+        <source>sent a voice note</source>
+        <comment>myself</comment>
+        <translation>haben eine Sprachnachricht geschickt</translation>
+    </message>
+    <message>
+        <source>sent a venue</source>
+        <comment>myself</comment>
+        <translation>haben einen Ort geschickt</translation>
+    </message>
+    <message>
+        <source>sent a venue</source>
+        <translation>hat einen Ort geschickt</translation>
+    </message>
+</context>
 <context>
    <name>ImagePage</name>
    <message>
@ -297,7 +407,7 @@
    <name>LocationPreview</name>
    <message>
        <source>Install Pure Maps to inspect this location.</source>
-        <translation>Installieren Sie Pure Maps, um diesen Ort zu erkunden</translation>
+        <translation>Installieren Sie Pure Maps, um diesen Ort zu erkunden.</translation>
    </message>
 </context>
 <context>
@ -306,50 +416,6 @@
        <source>%1 unread messages</source>
        <translation>%1 ungelesene Nachrichten</translation>
    </message>
-    <message>
-        <source>sent a picture</source>
-        <translation>hat ein Bild geschickt</translation>
-    </message>
-    <message>
-        <source>sent a video</source>
-        <translation>hat ein Video geschickt</translation>
-    </message>
-    <message>
-        <source>sent an animation</source>
-        <translation>hat eine Animation geschickt</translation>
-    </message>
-    <message>
-        <source>sent a voice note</source>
-        <translation>hat eine Sprachnachricht geschickt</translation>
-    </message>
-    <message>
-        <source>sent a document</source>
-        <translation>hat ein Dokument geschickt</translation>
-    </message>
-    <message>
-        <source>sent a location</source>
-        <translation>hat einen Ort geschickt</translation>
-    </message>
-    <message>
-        <source>has registered with Telegram</source>
-        <translation>hat sich bei Telegram angemeldet</translation>
-    </message>
-    <message>
-        <source>joined this chat</source>
-        <translation>ist diesem Chat beigetreten</translation>
-    </message>
-    <message>
-        <source>was added to this chat</source>
-        <translation>wurde diesem Chat hinzugefügt</translation>
-    </message>
-    <message>
-        <source>left this chat</source>
-        <translation>hat diesen Chat verlassen</translation>
-    </message>
-    <message>
-        <source>Unsupported message: %1</source>
-        <translation>Nicht unterstützte Nachricht: %1</translation>
-    </message>
 </context>
 <context>
    <name>OverviewPage</name>
--- a/translations/harbour-fernschreiber-es.ts
+++ b/translations/harbour-fernschreiber-es.ts
@ -228,6 +228,116 @@
        <translation>Abrir Documento</translation>
    </message>
 </context>
+<context>
+    <name>FernschreiberUtils</name>
+    <message>
+        <source>sent a picture</source>
+        <comment>myself</comment>
+        <translation type="unfinished">envió una imagen</translation>
+    </message>
+    <message>
+        <source>sent a picture</source>
+        <translation type="unfinished">envió una imagen</translation>
+    </message>
+    <message>
+        <source>sent a video</source>
+        <comment>myself</comment>
+        <translation type="unfinished">envió un video</translation>
+    </message>
+    <message>
+        <source>sent a video</source>
+        <translation type="unfinished">envió un video</translation>
+    </message>
+    <message>
+        <source>sent an animation</source>
+        <comment>myself</comment>
+        <translation type="unfinished">envió una animación</translation>
+    </message>
+    <message>
+        <source>sent an animation</source>
+        <translation type="unfinished">envió una animación</translation>
+    </message>
+    <message>
+        <source>sent a voice note</source>
+        <translation type="unfinished">envió una nota de voz</translation>
+    </message>
+    <message>
+        <source>sent a document</source>
+        <comment>myself</comment>
+        <translation type="unfinished">envió un documento</translation>
+    </message>
+    <message>
+        <source>sent a document</source>
+        <translation type="unfinished">envió un documento</translation>
+    </message>
+    <message>
+        <source>sent a location</source>
+        <comment>myself</comment>
+        <translation type="unfinished">envió una ubicación</translation>
+    </message>
+    <message>
+        <source>sent a location</source>
+        <translation type="unfinished">envió una ubicación</translation>
+    </message>
+    <message>
+        <source>have registered with Telegram</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>has registered with Telegram</source>
+        <translation type="unfinished">te has registrado en Telegram</translation>
+    </message>
+    <message>
+        <source>joined this chat</source>
+        <comment>myself</comment>
+        <translation type="unfinished">se unió a esta charla</translation>
+    </message>
+    <message>
+        <source>joined this chat</source>
+        <translation type="unfinished">se unió a esta charla</translation>
+    </message>
+    <message>
+        <source>were added to this chat</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>was added to this chat</source>
+        <translation type="unfinished">se añadió a esta charla</translation>
+    </message>
+    <message>
+        <source>left this chat</source>
+        <comment>myself</comment>
+        <translation type="unfinished">dejó esta charla</translation>
+    </message>
+    <message>
+        <source>left this chat</source>
+        <translation type="unfinished">dejó esta charla</translation>
+    </message>
+    <message>
+        <source>Unsupported message: %1</source>
+        <translation type="unfinished">Mensaje no soportado: %1</translation>
+    </message>
+    <message>
+        <source>Sticker: %1</source>
+        <translation type="unfinished">Pegatina: %1</translation>
+    </message>
+    <message>
+        <source>sent a voice note</source>
+        <comment>myself</comment>
+        <translation type="unfinished">envió una nota de voz</translation>
+    </message>
+    <message>
+        <source>sent a venue</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sent a venue</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>ImagePage</name>
    <message>
@ -306,50 +416,6 @@
        <source>%1 unread messages</source>
        <translation>%1 mensajes no leídos</translation>
    </message>
-    <message>
-        <source>sent a picture</source>
-        <translation>envió una imagen</translation>
-    </message>
-    <message>
-        <source>sent a video</source>
-        <translation>envió un video</translation>
-    </message>
-    <message>
-        <source>sent an animation</source>
-        <translation>envió una animación</translation>
-    </message>
-    <message>
-        <source>sent a voice note</source>
-        <translation>envió una nota de voz</translation>
-    </message>
-    <message>
-        <source>sent a document</source>
-        <translation>envió un documento</translation>
-    </message>
-    <message>
-        <source>sent a location</source>
-        <translation>envió una ubicación</translation>
-    </message>
-    <message>
-        <source>has registered with Telegram</source>
-        <translation>te has registrado en Telegram</translation>
-    </message>
-    <message>
-        <source>joined this chat</source>
-        <translation>se unió a esta charla</translation>
-    </message>
-    <message>
-        <source>was added to this chat</source>
-        <translation>se añadió a esta charla</translation>
-    </message>
-    <message>
-        <source>left this chat</source>
-        <translation>dejó esta charla</translation>
-    </message>
-    <message>
-        <source>Unsupported message: %1</source>
-        <translation>Mensaje no soportado: %1</translation>
-    </message>
 </context>
 <context>
    <name>OverviewPage</name>
--- a/translations/harbour-fernschreiber-hu.ts
+++ b/translations/harbour-fernschreiber-hu.ts
@ -228,6 +228,116 @@
        <translation>Dokumentum megyitása</translation>
    </message>
 </context>
+<context>
+    <name>FernschreiberUtils</name>
+    <message>
+        <source>sent a picture</source>
+        <comment>myself</comment>
+        <translation type="unfinished">képet küldött</translation>
+    </message>
+    <message>
+        <source>sent a picture</source>
+        <translation type="unfinished">képet küldött</translation>
+    </message>
+    <message>
+        <source>sent a video</source>
+        <comment>myself</comment>
+        <translation type="unfinished">videót küldött</translation>
+    </message>
+    <message>
+        <source>sent a video</source>
+        <translation type="unfinished">videót küldött</translation>
+    </message>
+    <message>
+        <source>sent an animation</source>
+        <comment>myself</comment>
+        <translation type="unfinished">animációt küldött</translation>
+    </message>
+    <message>
+        <source>sent an animation</source>
+        <translation type="unfinished">animációt küldött</translation>
+    </message>
+    <message>
+        <source>sent a voice note</source>
+        <translation type="unfinished">hangüzenetet küldött</translation>
+    </message>
+    <message>
+        <source>sent a document</source>
+        <comment>myself</comment>
+        <translation type="unfinished">dokumentumot küldött</translation>
+    </message>
+    <message>
+        <source>sent a document</source>
+        <translation type="unfinished">dokumentumot küldött</translation>
+    </message>
+    <message>
+        <source>sent a location</source>
+        <comment>myself</comment>
+        <translation type="unfinished">helyzetmeghatározó információt küldött</translation>
+    </message>
+    <message>
+        <source>sent a location</source>
+        <translation type="unfinished">helyzetmeghatározó információt küldött</translation>
+    </message>
+    <message>
+        <source>have registered with Telegram</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>has registered with Telegram</source>
+        <translation type="unfinished">regisztrált a Telegram-al</translation>
+    </message>
+    <message>
+        <source>joined this chat</source>
+        <comment>myself</comment>
+        <translation type="unfinished">csatlakozott a csevegéshez</translation>
+    </message>
+    <message>
+        <source>joined this chat</source>
+        <translation type="unfinished">csatlakozott a csevegéshez</translation>
+    </message>
+    <message>
+        <source>were added to this chat</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>was added to this chat</source>
+        <translation type="unfinished">hozzáadva a csevegéshez</translation>
+    </message>
+    <message>
+        <source>left this chat</source>
+        <comment>myself</comment>
+        <translation type="unfinished">kilépett a csevegésből</translation>
+    </message>
+    <message>
+        <source>left this chat</source>
+        <translation type="unfinished">kilépett a csevegésből</translation>
+    </message>
+    <message>
+        <source>Unsupported message: %1</source>
+        <translation type="unfinished">Nem támogatott üzenet: %1</translation>
+    </message>
+    <message>
+        <source>Sticker: %1</source>
+        <translation type="unfinished">Matrica: %1</translation>
+    </message>
+    <message>
+        <source>sent a voice note</source>
+        <comment>myself</comment>
+        <translation type="unfinished">hangüzenetet küldött</translation>
+    </message>
+    <message>
+        <source>sent a venue</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sent a venue</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>ImagePage</name>
    <message>
@ -306,50 +416,6 @@
        <source>%1 unread messages</source>
        <translation>%1 olvasatlan üzenet</translation>
    </message>
-    <message>
-        <source>sent a picture</source>
-        <translation>képet küldött</translation>
-    </message>
-    <message>
-        <source>sent a video</source>
-        <translation>videót küldött</translation>
-    </message>
-    <message>
-        <source>sent an animation</source>
-        <translation>animációt küldött</translation>
-    </message>
-    <message>
-        <source>sent a voice note</source>
-        <translation>hangüzenetet küldött</translation>
-    </message>
-    <message>
-        <source>sent a document</source>
-        <translation>dokumentumok küldött</translation>
-    </message>
-    <message>
-        <source>sent a location</source>
-        <translation>helyzetmeghatározó információt küldött</translation>
-    </message>
-    <message>
-        <source>has registered with Telegram</source>
-        <translation>regisztrált a Telegram-al</translation>
-    </message>
-    <message>
-        <source>joined this chat</source>
-        <translation>csatlakozott a csevegéshez</translation>
-    </message>
-    <message>
-        <source>was added to this chat</source>
-        <translation>hozzáadva a csevegéshez</translation>
-    </message>
-    <message>
-        <source>left this chat</source>
-        <translation>kilépett a csevegésből</translation>
-    </message>
-    <message>
-        <source>Unsupported message: %1</source>
-        <translation>Nem támogatott üzenet: %1</translation>
-    </message>
 </context>
 <context>
    <name>OverviewPage</name>
@ -554,7 +620,7 @@
    <message>
        <source>sent a document</source>
        <comment>myself</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">dokumentumot küldött</translation>
    </message>
    <message>
        <source>sent a location</source>
--- a/translations/harbour-fernschreiber-pl.ts
+++ b/translations/harbour-fernschreiber-pl.ts
@ -228,6 +228,116 @@
        <translation>Otwórz dokument</translation>
    </message>
 </context>
+<context>
+    <name>FernschreiberUtils</name>
+    <message>
+        <source>sent a picture</source>
+        <comment>myself</comment>
+        <translation type="unfinished">wyślij obraz</translation>
+    </message>
+    <message>
+        <source>sent a picture</source>
+        <translation type="unfinished">wyślij obraz</translation>
+    </message>
+    <message>
+        <source>sent a video</source>
+        <comment>myself</comment>
+        <translation type="unfinished">wyślij film</translation>
+    </message>
+    <message>
+        <source>sent a video</source>
+        <translation type="unfinished">wyślij film</translation>
+    </message>
+    <message>
+        <source>sent an animation</source>
+        <comment>myself</comment>
+        <translation type="unfinished">wyślij animację</translation>
+    </message>
+    <message>
+        <source>sent an animation</source>
+        <translation type="unfinished">wyślij animację</translation>
+    </message>
+    <message>
+        <source>sent a voice note</source>
+        <translation type="unfinished">wyślij notatke głosową</translation>
+    </message>
+    <message>
+        <source>sent a document</source>
+        <comment>myself</comment>
+        <translation type="unfinished">wyślij dokument</translation>
+    </message>
+    <message>
+        <source>sent a document</source>
+        <translation type="unfinished">wyślij dokument</translation>
+    </message>
+    <message>
+        <source>sent a location</source>
+        <comment>myself</comment>
+        <translation type="unfinished">wyślij lokalizację</translation>
+    </message>
+    <message>
+        <source>sent a location</source>
+        <translation type="unfinished">wyślij lokalizację</translation>
+    </message>
+    <message>
+        <source>have registered with Telegram</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>has registered with Telegram</source>
+        <translation type="unfinished">zarejestrował się w Telegramie</translation>
+    </message>
+    <message>
+        <source>joined this chat</source>
+        <comment>myself</comment>
+        <translation type="unfinished">dołaczył do tego czatu</translation>
+    </message>
+    <message>
+        <source>joined this chat</source>
+        <translation type="unfinished">dołaczył do tego czatu</translation>
+    </message>
+    <message>
+        <source>were added to this chat</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>was added to this chat</source>
+        <translation type="unfinished">został dodany do tego czatu</translation>
+    </message>
+    <message>
+        <source>left this chat</source>
+        <comment>myself</comment>
+        <translation type="unfinished">opuścił ten czat</translation>
+    </message>
+    <message>
+        <source>left this chat</source>
+        <translation type="unfinished">opuścił ten czat</translation>
+    </message>
+    <message>
+        <source>Unsupported message: %1</source>
+        <translation type="unfinished">Nieobsługiwana wiadomość: %1</translation>
+    </message>
+    <message>
+        <source>Sticker: %1</source>
+        <translation type="unfinished">Naklejka: %1</translation>
+    </message>
+    <message>
+        <source>sent a voice note</source>
+        <comment>myself</comment>
+        <translation type="unfinished">wyślij notatke głosową</translation>
+    </message>
+    <message>
+        <source>sent a venue</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sent a venue</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>ImagePage</name>
    <message>
@ -306,50 +416,6 @@
        <source>%1 unread messages</source>
        <translation>%1 nieprzeczytanych wiadomości</translation>
    </message>
-    <message>
-        <source>sent a picture</source>
-        <translation>wyślij obraz</translation>
-    </message>
-    <message>
-        <source>sent a video</source>
-        <translation>wyślij film</translation>
-    </message>
-    <message>
-        <source>sent an animation</source>
-        <translation>wyślij animację</translation>
-    </message>
-    <message>
-        <source>sent a voice note</source>
-        <translation>wyślij notatke głosową</translation>
-    </message>
-    <message>
-        <source>sent a document</source>
-        <translation>wyślij dokument</translation>
-    </message>
-    <message>
-        <source>sent a location</source>
-        <translation>wyślij lokalizację</translation>
-    </message>
-    <message>
-        <source>has registered with Telegram</source>
-        <translation>zarejestrował się w Telegramie</translation>
-    </message>
-    <message>
-        <source>joined this chat</source>
-        <translation>dołączył do tego czatu</translation>
-    </message>
-    <message>
-        <source>was added to this chat</source>
-        <translation>został dodany do tego czatu</translation>
-    </message>
-    <message>
-        <source>left this chat</source>
-        <translation>opuścil ten czat</translation>
-    </message>
-    <message>
-        <source>Unsupported message: %1</source>
-        <translation>Nieobsługiwana wiadomość: %1</translation>
-    </message>
 </context>
 <context>
    <name>OverviewPage</name>
@ -573,7 +639,7 @@
    <message>
        <source>joined this chat</source>
        <comment>myself</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">dołaczył do tego czatu</translation>
    </message>
    <message>
        <source>were added to this chat</source>
@ -583,7 +649,7 @@
    <message>
        <source>left this chat</source>
        <comment>myself</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">opuścił ten czat</translation>
    </message>
 </context>
 </TS>
--- a/translations/harbour-fernschreiber-zh_CN.ts
+++ b/translations/harbour-fernschreiber-zh_CN.ts
@ -228,6 +228,116 @@
        <translation>打开文档</translation>
    </message>
 </context>
+<context>
+    <name>FernschreiberUtils</name>
+    <message>
+        <source>sent a picture</source>
+        <comment>myself</comment>
+        <translation type="unfinished">发送照片</translation>
+    </message>
+    <message>
+        <source>sent a picture</source>
+        <translation type="unfinished">发送照片</translation>
+    </message>
+    <message>
+        <source>sent a video</source>
+        <comment>myself</comment>
+        <translation type="unfinished">发送视频</translation>
+    </message>
+    <message>
+        <source>sent a video</source>
+        <translation type="unfinished">发送视频</translation>
+    </message>
+    <message>
+        <source>sent an animation</source>
+        <comment>myself</comment>
+        <translation type="unfinished">发送动画</translation>
+    </message>
+    <message>
+        <source>sent an animation</source>
+        <translation type="unfinished">发送动画</translation>
+    </message>
+    <message>
+        <source>sent a voice note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sent a document</source>
+        <comment>myself</comment>
+        <translation type="unfinished">发送文档</translation>
+    </message>
+    <message>
+        <source>sent a document</source>
+        <translation type="unfinished">发送文档</translation>
+    </message>
+    <message>
+        <source>sent a location</source>
+        <comment>myself</comment>
+        <translation type="unfinished">发送位置</translation>
+    </message>
+    <message>
+        <source>sent a location</source>
+        <translation type="unfinished">发送位置</translation>
+    </message>
+    <message>
+        <source>have registered with Telegram</source>
+        <comment>myself</comment>
+        <translation type="unfinished">已注册到 Telegram</translation>
+    </message>
+    <message>
+        <source>has registered with Telegram</source>
+        <translation type="unfinished">已注册到 Telegram </translation>
+    </message>
+    <message>
+        <source>joined this chat</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>joined this chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>were added to this chat</source>
+        <comment>myself</comment>
+        <translation type="unfinished">已经加入到此对话之中</translation>
+    </message>
+    <message>
+        <source>was added to this chat</source>
+        <translation type="unfinished">已加入到此对话</translation>
+    </message>
+    <message>
+        <source>left this chat</source>
+        <comment>myself</comment>
+        <translation type="unfinished">离开此对话</translation>
+    </message>
+    <message>
+        <source>left this chat</source>
+        <translation type="unfinished">离开此对话</translation>
+    </message>
+    <message>
+        <source>Unsupported message: %1</source>
+        <translation type="unfinished">未读消息: %1</translation>
+    </message>
+    <message>
+        <source>Sticker: %1</source>
+        <translation type="unfinished">贴纸: %1</translation>
+    </message>
+    <message>
+        <source>sent a voice note</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sent a venue</source>
+        <comment>myself</comment>
+        <translation type="unfinished">发送地点</translation>
+    </message>
+    <message>
+        <source>sent a venue</source>
+        <translation type="unfinished">发送地点</translation>
+    </message>
+</context>
 <context>
    <name>ImagePage</name>
    <message>
@ -306,50 +416,6 @@
        <source>%1 unread messages</source>
        <translation>%1 则未读消息</translation>
    </message>
-    <message>
-        <source>sent a picture</source>
-        <translation>发送照片</translation>
-    </message>
-    <message>
-        <source>sent a video</source>
-        <translation>发送视频</translation>
-    </message>
-    <message>
-        <source>sent an animation</source>
-        <translation>发送动画</translation>
-    </message>
-    <message>
-        <source>sent a voice note</source>
-        <translation>发送语音</translation>
-    </message>
-    <message>
-        <source>sent a document</source>
-        <translation>发送文档</translation>
-    </message>
-    <message>
-        <source>sent a location</source>
-        <translation>发送位置</translation>
-    </message>
-    <message>
-        <source>has registered with Telegram</source>
-        <translation>已注册到 Telegram </translation>
-    </message>
-    <message>
-        <source>joined this chat</source>
-        <translation>加入此对话</translation>
-    </message>
-    <message>
-        <source>was added to this chat</source>
-        <translation>已加入此对话</translation>
-    </message>
-    <message>
-        <source>left this chat</source>
-        <translation>离开此对话</translation>
-    </message>
-    <message>
-        <source>Unsupported message: %1</source>
-        <translation>不受支持的消息： %1</translation>
-    </message>
 </context>
 <context>
    <name>OverviewPage</name>
--- a/translations/harbour-fernschreiber.ts
+++ b/translations/harbour-fernschreiber.ts
@ -228,6 +228,116 @@
        <translation type="unfinished"></translation>
    </message>
 </context>
+<context>
+    <name>FernschreiberUtils</name>
+    <message>
+        <source>sent a picture</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sent a picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sent a video</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sent a video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sent an animation</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sent an animation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sent a voice note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sent a document</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sent a document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sent a location</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sent a location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>have registered with Telegram</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>has registered with Telegram</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>joined this chat</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>joined this chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>were added to this chat</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>was added to this chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>left this chat</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>left this chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported message: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sticker: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sent a voice note</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sent a venue</source>
+        <comment>myself</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sent a venue</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>ImagePage</name>
    <message>
@ -306,50 +416,6 @@
        <source>%1 unread messages</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>sent a picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>sent a video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>sent an animation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>sent a voice note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>sent a document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>sent a location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>has registered with Telegram</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>joined this chat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>was added to this chat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>left this chat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unsupported message: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
    <name>OverviewPage</name>