jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

swarm: add reaction support

Browse Source 
This is a pretty trivial patch as all the necessary logics are
already supported by the deamon.
A client can use sendMessage with flag = 2 to add a reaction.
This only adds a "react-to" in the body of the message that the
client can interpret.
To remove a reaction, the client can use editMessage (and set the
body to "" for the id of the reaction), also there is no limit
on the content of the reaction and multiple reactions can be added
to the same message.
For non compatible clients, it will be shown as a simple text message
as it's the same type.

Change-Id: I7b13d32771109118b94ed17d0b918e66487e94bb
This commit is contained in:
Sébastien Blin
2022-10-31 10:23:37 -04:00
parent 6855453033
commit fa03e232b7
4 changed files with 64 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
test/unitTest/conversation/conversation.cpp
View File

@ -117,6 +117,7 @@ private:
void testFixContactDetails();
void testRemoveOneToOneNotInDetails();
void testMessageEdition();
void testMessageReaction();
CPPUNIT_TEST_SUITE(ConversationTest);
CPPUNIT_TEST(testCreateConversation);
@ -164,6 +165,7 @@ private:
CPPUNIT_TEST(testFixContactDetails);
CPPUNIT_TEST(testRemoveOneToOneNotInDetails);
CPPUNIT_TEST(testMessageEdition);
CPPUNIT_TEST(testMessageReaction);
CPPUNIT_TEST_SUITE_END();
};
@ -3518,6 +3520,50 @@ ConversationTest::testMessageEdition()
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return errorDetected; }));
}
void
ConversationTest::testMessageReaction()
{
auto aliceAccount = Manager::instance().getAccount<JamiAccount>(aliceId);
auto bobAccount = Manager::instance().getAccount<JamiAccount>(bobId);
auto bobUri = bobAccount->getUsername();
std::mutex mtx;
std::unique_lock<std::mutex> lk {mtx};
std::condition_variable cv;
std::map<std::string, std::shared_ptr<libjami::CallbackWrapperBase>> confHandlers;
std::vector<std::map<std::string, std::string>> messageAliceReceived;
bool conversationReady = false;
confHandlers.insert(libjami::exportable_callback<libjami::ConversationSignal::MessageReceived>(
[&](const std::string& accountId,
const std::string& /* conversationId */,
std::map<std::string, std::string> message) {
if (accountId == aliceId)
messageAliceReceived.emplace_back(message);
cv.notify_one();
}));
confHandlers.insert(libjami::exportable_callback<libjami::ConversationSignal::ConversationReady>(
[&](const std::string& accountId, const std::string& /* conversationId */) {
if (accountId == aliceId)
conversationReady = true;
cv.notify_one();
}));
libjami::registerSignalHandlers(confHandlers);
auto convId = libjami::startConversation(aliceId);
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return conversationReady; }));
auto msgSize = messageAliceReceived.size();
libjami::sendMessage(aliceId, convId, "hi"s, "");
CPPUNIT_ASSERT(
cv.wait_for(lk, 30s, [&]() { return messageAliceReceived.size() == msgSize + 1; }));
msgSize = messageAliceReceived.size();
auto reactId = messageAliceReceived.rbegin()->at("id");
libjami::sendMessage(aliceId, convId, "👋"s, reactId, 2);
CPPUNIT_ASSERT(
cv.wait_for(lk, 10s, [&]() { return messageAliceReceived.size() == msgSize + 1; }));
CPPUNIT_ASSERT(messageAliceReceived.rbegin()->at("react-to") == reactId);
CPPUNIT_ASSERT(messageAliceReceived.rbegin()->at("body") == "👋");
}
} // namespace test
} // namespace jami