aboutsummaryrefslogtreecommitdiff
path: root/src/Channel.cpp
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2018-05-02 07:43:20 +0200
committerdec05eba <dec05eba@protonmail.com>2018-05-02 07:43:23 +0200
commitc3ab4d08bacaf5439a1d31b15f90b9445214eacc (patch)
treea996c6480d92dd8bccd72c8b346584f91d88decd /src/Channel.cpp
parent1e822e1ef0c6184ae02dc804c1ce5c866fad4c7c (diff)
Update odhtdb with join channel fix, remove duplicate user in list
Diffstat (limited to 'src/Channel.cpp')
-rw-r--r--src/Channel.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/Channel.cpp b/src/Channel.cpp
index 0db6e5f..b43e75c 100644
--- a/src/Channel.cpp
+++ b/src/Channel.cpp
@@ -1,6 +1,7 @@
#include "../include/Channel.hpp"
#include <odhtdb/User.hpp>
#include <odhtdb/Database.hpp>
+#include <odhtdb/bin2hex.hpp>
#include <cstring>
using namespace std;
@@ -154,14 +155,10 @@ namespace dchat
auto groupToAddUserTo = database->getStorage().getGroupById(*databaseNodeInfo.getRequestHash(), groupIdRaw);
if(!groupToAddUserTo)
{
- fprintf(stderr, "Group with id %s does not exist in channel %s\n", groupId.c_str(), databaseNodeInfo.getRequestHash()->toString().c_str());
+ fprintf(stderr, "Group with id %s does not exist in channel %s\n", odhtdb::bin2hex(groupId.c_str(), groupId.size()).c_str(), databaseNodeInfo.getRequestHash()->toString().c_str());
return false;
}
database->addUser(databaseNodeInfo, static_cast<const odhtdb::LocalUser*>(localOnlineUser->databaseUser), "noname", userId, groupToAddUserTo);
-
- auto addedUser = database->getStorage().getUserByPublicKey(*databaseNodeInfo.getRequestHash(), userId);
- assert(addedUser);
- addUserLocally(new OnlineUser(addedUser));
return true;
}