aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2018-05-21 23:58:36 +0200
committerdec05eba <dec05eba@protonmail.com>2018-05-21 23:58:39 +0200
commit7edd041e80897dafd583860e75e9443171997e5e (patch)
treed2976e215c3564544d2dd438dbf5aeee9007c861
parentc47ec545d87e622aa950e653e4f91721d79bb049 (diff)
Set channel name when creating it, fetch new data from newest to oldest
-rw-r--r--src/Channel.cpp2
-rw-r--r--src/main.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/Channel.cpp b/src/Channel.cpp
index 5015975..adcb9be 100644
--- a/src/Channel.cpp
+++ b/src/Channel.cpp
@@ -26,7 +26,7 @@ namespace dchat
if(database)
{
- database->seed(databaseNodeInfo);
+ database->seed(databaseNodeInfo, odhtdb::DatabaseFetchOrder::NEWEST_FIRST);
pingKey = odhtdb::DhtKey(*databaseNodeInfo.getRequestHash()).getPingKey();
// TODO: Ban peers that spam this key (take in account that creator of packets can be forged)
diff --git a/src/main.cpp b/src/main.cpp
index ecfd058..ed3bfd6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -431,6 +431,7 @@ int main(int argc, char **argv)
ChannelSidePanel::addChannel(channel);
channels.push_back(channel);
Channel::setCurrent(channel);
+ channel->setName(args[0]);
lastFocusedTimer.restart();
localNodeUsers[*createResponse->getRequestHash()] = { createResponse->getNodeEncryptionKey(), createResponse->getNodeAdminKeyPair() };
@@ -612,7 +613,7 @@ int main(int argc, char **argv)
printf("Got a response from a person in the channel, we might get added...\n");
waitingToJoinChannels.push_back(databaseNode);
lock_guard<recursive_mutex> lock(channelMessageMutex);
- database->seed(databaseNode);
+ database->seed(databaseNode, odhtdb::DatabaseFetchOrder::NEWEST_FIRST);
return false;
}
catch(std::exception &e)