DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

first implementation of automated contact request detection - work in progress

Browse Source
This commit is contained in:
DenioD
2020-05-06 15:41:40 +02:00
parent 6a3b644a0a
commit 5ff2d1ba47
14 changed files with 599 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/controller.cpp
View File

@@ -1,3 +1,6 @@
// Copyright 2019-2020 The Hush developers
// GPLv3
#include "controller.h"
#include "mainwindow.h"
#include "addressbook.h"
@@ -6,6 +9,7 @@
#include "camount.h"
#include "websockets.h"
#include "DataStore.h"
template<>
DataStore<QString>* DataStore<QString>::instance = nullptr;
template<>
@@ -860,7 +864,8 @@ void Controller::refreshTransactions() {
QString memo;
if (!o["memo"].is_null()) {
memo = QString::fromStdString(o["memo"]);
}
}
QString cid;
QString contact;
@@ -876,6 +881,8 @@ void Controller::refreshTransactions() {
address,
contact,
memo,
QString(""),
QString(""),
cid, // we have to set the cid here, its included in our Addressbook for this contact
txid,
true // is an outgoing message
@@ -930,37 +937,40 @@ void Controller::refreshTransactions() {
QString type;
QString cid;
QString requestZaddr1;
QString requestZaddr;
if (memo.startsWith("{")) {
type = memo.mid(75,4);
cid = memo.mid(14,36);
requestZaddr1 = memo.right(82);
requestZaddr = requestZaddr1.left(78);
qDebug()<<type;
qDebug()<<cid;
chatModel->addCid(txid, cid);
chatModel->addrequestZaddr(txid, requestZaddr);
}
if (type == "cont")
{
qDebug()<< "Als Request erkannt";
}
if (chatModel->getCidByTx(txid) != QString("0xdeadbeef")){
cid = chatModel->getCidByTx(txid);
}
else{
cid = "";
}
if (chatModel->getrequestZaddrByTx(txid) != QString("0xdeadbeef")){
requestZaddr = chatModel->getrequestZaddrByTx(txid);
}
else{
requestZaddr = "";
}
QString contact;
for(auto &c : AddressBook::getInstance()->getAllAddressLabels())
@@ -968,23 +978,23 @@ void Controller::refreshTransactions() {
if (address == c.getMyAddress()){
contact = c.getName();
qDebug()<< "Addressbuch Addresse: " << c.getMyAddress();
qDebug()<< "Addresse: " << address;
}else{ contact = "";}
}
ChatItem item = ChatItem(
datetime,
address,
contact,
memo,
requestZaddr,
type,
cid, // we have to set the cid here, its included in the headermemo
txid,
false
);
chatModel->addMessage(item);
}
}
}