Further comments

quotient-im · Dec 2, 2024 · 80d145c · 80d145c
1 parent d4bb172
commit 80d145c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 43 deletions.
diff --git a/Quotient/room.cpp b/Quotient/room.cpp
@@ -293,25 +293,6 @@ class Q_DECL_HIDDEN Room::Private {
 
     const PendingEventItem& sendEvent(RoomEventPtr&& event);
 
-    // template<MessageEventType msgType>
-    template<MessageEventType type>
-    QString postAllText(const QString& plainText,
-                           std::optional<const QString> html,
-                           std::optional<EventRelation> relatesTo)
-    {
-        static_assert(type == MessageEventType::Text ||
-                      type == MessageEventType::Emote ||
-                      type == MessageEventType::Notice ,
-                      "MessageEvent type is not a text message"
-        );
-
-        std::unique_ptr<EventContent::TextContent> content = nullptr;
-        if (html) {
-            content = std::make_unique<EventContent::TextContent>(*html, u"text/html"_s);
-        }
-        return q->post<RoomMessageEvent>(plainText, type, std::move(content), relatesTo)->transactionId();
-    }
-
     QString doPostFile(event_ptr_tt<RoomMessageEvent> fileEvent, const QUrl& localUrl);
 
     PendingEvents::iterator addAsPending(RoomEventPtr&& event);
@@ -2140,21 +2121,6 @@ void Room::discardMessage(const QString& txnId)
     emit pendingEventDiscarded();
 }
 
-QString Room::postText(const QString& plainText, std::optional<const QString> html, std::optional<EventRelation> relatesTo)
-{
-    return d->postAllText<MessageEventType::Text>(plainText, html, relatesTo);
-}
-
-QString Room::postEmote(const QString& plainText, std::optional<const QString> html, std::optional<EventRelation> relatesTo)
-{
-    return d->postAllText<MessageEventType::Emote>(plainText, html, relatesTo);
-}
-
-QString Room::postNotice(const QString& plainText, std::optional<const QString> html, std::optional<EventRelation> relatesTo)
-{
-    return d->postAllText<MessageEventType::Notice>(plainText, html, relatesTo);
-}
-
 QString Room::postReaction(const QString& eventId, const QString& key)
 {
     return post<ReactionEvent>(eventId, key)->transactionId();

diff --git a/Quotient/room.h b/Quotient/room.h
@@ -721,14 +721,26 @@ class QUOTIENT_API Room : public QObject {
         return post(makeEvent<EvT>(std::forward<ArgTs>(args)...));
     }
 
-    //! Send a text message
-    QString postText(const QString& plainText, std::optional<const QString> html = std::nullopt, std::optional<EventRelation> relatesTo = std::nullopt);
-
-    //! Send a m.emote message
-    QString postEmote(const QString& plainText, std::optional<const QString> html = std::nullopt, std::optional<EventRelation> relatesTo = std::nullopt);
-
-    //! Send an m.notice message
-    QString postNotice(const QString& plainText, std::optional<const QString> html = std::nullopt, std::optional<EventRelation> relatesTo = std::nullopt);
+    //! \brief Send a text type message
+    //!
+    //! This means MessageEventType Text, Emote or Notice.
+    template<MessageEventType type = MessageEventType::Text>
+    QString postText(const QString& plainText,
+                     const std::optional<QString>& html = std::nullopt,
+                     const std::optional<EventRelation>& relatesTo = std::nullopt)
+    {
+        static_assert(type == MessageEventType::Text ||
+                      type == MessageEventType::Emote ||
+                      type == MessageEventType::Notice ,
+                      "MessageEvent type is not a text message"
+        );
+
+        std::unique_ptr<EventContent::TextContent> content = nullptr;
+        if (html) {
+            content = std::make_unique<EventContent::TextContent>(*html, u"text/html"_s);
+        }
+        return post<RoomMessageEvent>(plainText, type, std::move(content), relatesTo)->transactionId();
+    }
 
     //! Send a file with the given content
     QString postFile(const QString& plainText,

diff --git a/quotest/quotest.cpp b/quotest/quotest.cpp
@@ -12,6 +12,7 @@
 #include <Quotient/csapi/leaving.h>
 #include <Quotient/csapi/room_send.h>
 
+#include "events/roommessageevent.h"
 #include <Quotient/events/reactionevent.h>
 #include <Quotient/events/redactionevent.h>
 #include <Quotient/events/simplestateevents.h>
@@ -169,7 +170,7 @@ void TestSuite::finishTest(const TestToken& token, bool condition,
     if (condition) {
         clog << item << " successful" << endl;
         if (targetRoom)
-            targetRoom->postNotice(origin % ": "_L1 % QString::fromUtf8(item) % " successful"_L1);
+            targetRoom->postText<MessageEventType::Notice>(origin % ": "_L1 % QString::fromUtf8(item) % " successful"_L1);
     } else {
         clog << item << " FAILED at " << file << ":" << line << endl;
         if (targetRoom)