shunf4/squawk
2
0
Fork 0
forked from blue/squawk
Code Issues Pull requests Projects Releases Wiki Activity

beautifull messageList, messages now being sent to full jid

Browse source
This commit is contained in:
Blue 2019-04-12 08:51:36 +03:00
parent e48444636a
commit 6e9e100188
12 changed files with 160 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

37
ui/models/contact.cpp
View file

@ -206,16 +206,12 @@ QIcon Models::Contact::getStatusIcon() const
QString Models::Contact::getAccountName() const
{
const Item* p = this;
do {
p = p->parentItemConst();
} while (p != 0 && p->type != Item::account);
if (p == 0) {
const Account* acc = getParentAccount();
if (acc == 0) {
qDebug() << "An attempt to request account name of the contact " << jid << " but the parent account wasn't found, returning empty string";
return "";
}
return p->getName();
return acc->getName();
}
void Models::Contact::addMessage(const Shared::Message& data)
@ -264,16 +260,31 @@ void Models::Contact::getMessages(Models::Contact::Messages& container) const
}
QString Models::Contact::getAccountJid() const
{
const Account* acc = getParentAccount();
if (acc == 0) {
qDebug() << "An attempt to request account jid of the contact " << jid << " but the parent account wasn't found, returning empty string";
return "";
}
return acc->getLogin() + "@" + acc->getServer();
}
QString Models::Contact::getAccountResource() const
{
const Account* acc = getParentAccount();
if (acc == 0) {
qDebug() << "An attempt to request account resource of the contact " << jid << " but the parent account wasn't found, returning empty string";
return "";
}
return acc->getResource();
}
const Models::Account * Models::Contact::getParentAccount() const
{
const Item* p = this;
do {
p = p->parentItemConst();
} while (p != 0 && p->type != Item::account);
if (p == 0) {
qDebug() << "An attempt to request account jid of the contact " << jid << " but the parent account wasn't found, returning empty string";
return "";
}
const Account* acc = static_cast<const Account*>(p);
return acc->getLogin() + "@" + acc->getServer();
return static_cast<const Account*>(p);
}