twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-02-02 09:54:29 +00:00
Code Issues Projects Releases Wiki Activity

new DM format (bencoded) now required

Browse Source
This commit is contained in:
Miguel Freitas 2015-04-24 17:01:21 -03:00
parent 1341bfcfe9
commit 07d5b5ffb6
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/twister.cpp
View File

@ -2197,36 +2197,28 @@ Value newdirectmsg(const Array& params, bool fHelp)
bencode(std::back_inserter(payloadbuf), payloadNewFormat); bencode(std::back_inserter(payloadbuf), payloadNewFormat);
std::string strMsgData = std::string(payloadbuf.data(),payloadbuf.size()); std::string strMsgData = std::string(payloadbuf.data(),payloadbuf.size());
if( copySelf ) { entry dmRcpt;
// add padding to strMsg so both DMs will have exactly the same size. if( !createDirectMessage(dmRcpt, strTo, strMsgData) )
// should be removed in future when all clients move to new format.
while( strMsg.length() < strMsgData.length() ) {
strMsg.push_back(' ');
}
}
entry dmOldFormat;
if( !createDirectMessage(dmOldFormat, strTo, strMsg) )
throw JSONRPCError(RPC_INTERNAL_ERROR, throw JSONRPCError(RPC_INTERNAL_ERROR,
"error encrypting to pubkey of destination user"); "error encrypting to pubkey of destination user");
entry dmNewFormat; entry dmSelf;
if( copySelf ) { if( copySelf ) {
// use new format to send a copy to ourselves. in future, message // use new format to send a copy to ourselves. in future, message
// to others might use the new format as well. // to others might use the new format as well.
if( !createDirectMessage(dmNewFormat, strFrom, strMsgData) ) if( !createDirectMessage(dmSelf, strFrom, strMsgData) )
throw JSONRPCError(RPC_INTERNAL_ERROR, throw JSONRPCError(RPC_INTERNAL_ERROR,
"error encrypting to pubkey of destination user"); "error encrypting to pubkey to ourselve");
if( rand() < (RAND_MAX/2) ) { if( rand() < (RAND_MAX/2) ) {
dmsToSend.push_back(&dmOldFormat); dmsToSend.push_back(&dmRcpt);
dmsToSend.push_back(&dmNewFormat); dmsToSend.push_back(&dmSelf);
} else { } else {
dmsToSend.push_back(&dmNewFormat); dmsToSend.push_back(&dmSelf);
dmsToSend.push_back(&dmOldFormat); dmsToSend.push_back(&dmRcpt);
} }
} else { } else {
dmsToSend.push_back(&dmOldFormat); dmsToSend.push_back(&dmRcpt);
} }
Value ret; Value ret;
@ -2249,6 +2241,7 @@ Value newdirectmsg(const Array& params, bool fHelp)
// do not send a copy to self, so just store it locally. // do not send a copy to self, so just store it locally.
StoredDirectMsg stoDM; StoredDirectMsg stoDM;
stoDM.m_fromMe = true; stoDM.m_fromMe = true;
stoDM.m_from = strFrom;
stoDM.m_text = strMsg; stoDM.m_text = strMsg;
stoDM.m_utcTime = v["userpost"]["time"].integer(); stoDM.m_utcTime = v["userpost"]["time"].integer();