bmckwm/squawk
1
0
Fork 0
forked from blue/squawk
Code Pull Requests Activity

mucs initial, just display; archive fixes

Browse Source
This commit is contained in:
Blue 2019-07-11 11:51:52 +03:00
parent 30c59fbb91
commit eda96e138d
19 changed files with 626 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
core/account.cpp
View File

@ -16,11 +16,14 @@ Account::Account(const QString& p_login, const QString& p_server, const QString&
groups(),
cm(new QXmppCarbonManager()),
am(new QXmppMamManager()),
mm(new QXmppMucManager()),
bm(new QXmppBookmarkManager()),
contacts(),
maxReconnectTimes(0),
reconnectTimes(0),
queuedContacts(),
outOfRosterContacts()
outOfRosterContacts(),
mucInfo()
{
config.setUser(p_login);
config.setDomain(p_server);
@ -52,6 +55,12 @@ Account::Account(const QString& p_login, const QString& p_server, const QString&
QObject::connect(am, SIGNAL(archivedMessageReceived(const QString&, const QXmppMessage&)), this, SLOT(onMamMessageReceived(const QString&, const QXmppMessage&)));
QObject::connect(am, SIGNAL(resultsRecieved(const QString&, const QXmppResultSetReply&, bool)),
this, SLOT(onMamResultsReceived(const QString&, const QXmppResultSetReply&, bool)));
client.addExtension(mm);
QObject::connect(mm, SIGNAL(roomAdded(QXmppMucRoom*)), this, SLOT(onMucRoomAdded(QXmppMucRoom*)));
client.addExtension(bm);
QObject::connect(bm, SIGNAL(bookmarksReceived(const QXmppBookmarkSet&)), this, SLOT(bookmarksReceived(const QXmppBookmarkSet&)));
}
Account::~Account()
@ -59,6 +68,11 @@ Account::~Account()
for (std::map<QString, Contact*>::const_iterator itr = contacts.begin(), end = contacts.end(); itr != end; ++itr) {
delete itr->second;
}
delete bm;
delete mm;
delete am;
delete cm;
}
Shared::ConnectionState Core::Account::getState() const
@ -433,6 +447,7 @@ void Core::Account::sendMessage(const Shared::Message& data)
msg.setType(static_cast<QXmppMessage::Type>(data.getType())); //it is safe here, my type is compatible
std::map<QString, Contact*>::const_iterator itr = contacts.find(data.getPenPalJid());
itr->second->appendMessageToArchive(data);
client.sendPacket(msg);
@ -846,3 +861,114 @@ void Core::Account::addContactRequest(const QString& jid, const QString& name, c
qDebug() << "An attempt to add contact " << jid << " to account " << name << " but the account is not in the connected state, skipping";
}
}
void Core::Account::onMucRoomAdded(QXmppMucRoom* room)
{
qDebug() << "room" << room->jid() << "added with name" << room->name() << ", account" << getName() << "joined:" << room->isJoined();
}
void Core::Account::bookmarksReceived(const QXmppBookmarkSet& bookmarks)
{
QList<QXmppBookmarkConference> conferences = bookmarks.conferences();
for (QList<QXmppBookmarkConference>::const_iterator itr = conferences.begin(), end = conferences.end(); itr != end; ++itr) {
const QXmppBookmarkConference& c = *itr;
QString jid = c.jid();
std::pair<std::map<QString, MucInfo>::iterator, bool> mi = mucInfo.insert(std::make_pair(jid, MucInfo(c.autoJoin(), false, jid, c.name(), c.nickName())));
if (mi.second) {
const MucInfo& info = mi.first->second;
QXmppMucRoom* room = mm->addRoom(jid);
QObject::connect(room, SIGNAL(joined()), this, SLOT(onMucJoined()));
QObject::connect(room, SIGNAL(left()), this, SLOT(onMucLeft()));
QObject::connect(room, SIGNAL(nameChanged(const QString&)), this, SLOT(onMucNameChanged(const QString&)));
QObject::connect(room, SIGNAL(nickNameChanged(const QString&)), this, SLOT(onMucNickNameChanged(const QString&)));
QObject::connect(room, SIGNAL(error(const QXmppStanza::Error&)), this, SLOT(onMucError(const QXmppStanza::Error&)));
QObject::connect(room, SIGNAL(messageReceived(const QXmppMessage&)), this, SLOT(onMucMessage(const QXmppMessage&)));
emit addRoom(jid, {
{"autoJoin", info.autoJoin},
{"joined", false},
{"nick", info.nick},
{"name", info.name}
});
room->setNickName(info.nick == "" ? getName() : info.nick);
if (info.autoJoin) {
room->join();
}
} else {
qDebug() << "Received a bookmark to a MUC " << jid << " which is already booked by another bookmark, skipping";
}
}
}
void Core::Account::onMucJoined()
{
QXmppMucRoom* room = static_cast<QXmppMucRoom*>(sender());
QString jid = room->jid();
std::map<QString, MucInfo>::iterator itr = mucInfo.find(jid);
if (itr != mucInfo.end()) {
itr->second.joined = true;
emit changeRoom(jid, {
{"joined", true}
});
} else {
qDebug() << "Seems like account" << getName() << "joined room" << jid << ", but the info about that room wasn't found, skipping";
}
}
void Core::Account::onMucLeft()
{
QXmppMucRoom* room = static_cast<QXmppMucRoom*>(sender());
QString jid = room->jid();
std::map<QString, MucInfo>::iterator itr = mucInfo.find(jid);
if (itr != mucInfo.end()) {
itr->second.joined = false;
emit changeRoom(jid, {
{"joined", false}
});
} else {
qDebug() << "Seems like account" << getName() << "left room" << jid << ", but the info about that room wasn't found, skipping";
}
}
void Core::Account::onMucNameChanged(const QString& roomName)
{
QXmppMucRoom* room = static_cast<QXmppMucRoom*>(sender());
QString jid = room->jid();
std::map<QString, MucInfo>::iterator itr = mucInfo.find(jid);
if (itr != mucInfo.end()) {
itr->second.name = roomName;
emit changeRoom(jid, {
{"name", roomName}
});
} else {
qDebug() << "Account" << getName() << "received an event about room" << jid << "name change, but the info about that room wasn't found, skipping";
}
}
void Core::Account::onMucNickNameChanged(const QString& nickName)
{
QXmppMucRoom* room = static_cast<QXmppMucRoom*>(sender());
QString jid = room->jid();
std::map<QString, MucInfo>::iterator itr = mucInfo.find(jid);
if (itr != mucInfo.end()) {
itr->second.nick = nickName;
emit changeRoom(jid, {
{"nick", nickName}
});
} else {
qDebug() << "Account" << getName() << "received an event about his nick name change in room" << jid << ", but the info about that room wasn't found, skipping";
}
}
void Core::Account::onMucError(const QXmppStanza::Error& error)
{
qDebug() << "MUC error";
}
void Core::Account::onMucMessage(const QXmppMessage& message)
{
qDebug() << "Muc message";
}

40
core/account.h
View File

@ -8,7 +8,10 @@
#include <QXmppRosterManager.h>
#include <QXmppCarbonManager.h>
#include <QXmppMamManager.h>
#include <QXmppMucManager.h>
#include <QXmppClient.h>
#include <QXmppBookmarkManager.h>
#include <QXmppBookmarkSet.h>
#include "../global.h"
#include "contact.h"
@ -18,6 +21,7 @@ namespace Core
class Account : public QObject
{
Q_OBJECT
class MucInfo;
public:
Account(const QString& p_login, const QString& p_server, const QString& p_password, const QString& p_name, QObject* parent = 0);
~Account();
@ -54,6 +58,9 @@ signals:
void availabilityChanged(int);
void addGroup(const QString& name);
void removeGroup(const QString& name);
void addRoom(const QString& jid, const QMap<QString, QVariant>& data);
void changeRoom(const QString& jid, const QMap<QString, QVariant>& data);
void removeRoom(const QString& jid);
void addContact(const QString& jid, const QString& group, const QMap<QString, QVariant>& data);
void removeContact(const QString& jid);
void removeContact(const QString& jid, const QString& group);
@ -74,12 +81,15 @@ private:
std::map<QString, std::set<QString>> groups;
QXmppCarbonManager* cm;
QXmppMamManager* am;
QXmppMucManager* mm;
QXmppBookmarkManager* bm;
std::map<QString, Contact*> contacts;
unsigned int maxReconnectTimes;
unsigned int reconnectTimes;
std::map<QString, QString> queuedContacts;
std::set<QString> outOfRosterContacts;
std::map<QString, MucInfo> mucInfo;
private slots:
void onClientConnected();
@ -101,6 +111,16 @@ private slots:
void onMamMessageReceived(const QString& bareJid, const QXmppMessage& message);
void onMamResultsReceived(const QString &queryId, const QXmppResultSetReply &resultSetReply, bool complete);
void onMucRoomAdded(QXmppMucRoom* room);
void onMucJoined();
void onMucLeft();
void onMucNameChanged(const QString& roomName);
void onMucNickNameChanged(const QString& nickName);
void onMucError(const QXmppStanza::Error& error);
void onMucMessage(const QXmppMessage& message);
void bookmarksReceived(const QXmppBookmarkSet& bookmarks);
void onContactGroupAdded(const QString& group);
void onContactGroupRemoved(const QString& group);
void onContactNameChanged(const QString& name);
@ -119,8 +139,28 @@ private:
void initializeMessage(Shared::Message& target, const QXmppMessage& source, bool outgoing = false, bool forwarded = false, bool guessing = false) const;
Shared::SubscriptionState castSubscriptionState(QXmppRosterIq::Item::SubscriptionType qs) const;
void logMessage(const QXmppMessage& msg, const QString& reason = "Message wasn't handled: ");
class MucInfo {
public:
MucInfo(bool p_al, bool p_jo, const QString& p_jid, const QString& p_name, const QString& p_nick):
autoJoin(p_al),
joined(p_jo),
jid(p_jid),
name(p_name),
nick(p_nick),
removed(false) {}
bool autoJoin;
bool joined;
QString jid;
QString name;
QString nick;
bool removed;
};
};
}
#endif // CORE_ACCOUNT_H

63
core/archive.cpp
View File

@ -31,7 +31,8 @@ Core::Archive::Archive(const QString& p_jid, QObject* parent):
fromTheBeginning(false),
environment(),
main(),
order()
order(),
stats()
{
}
@ -55,14 +56,14 @@ void Core::Archive::open(const QString& account)
}
}
mdb_env_set_maxdbs(environment, 3);
mdb_env_set_maxdbs(environment, 4);
mdb_env_open(environment, path.toStdString().c_str(), 0, 0664);
MDB_txn *txn;
mdb_txn_begin(environment, NULL, 0, &txn);
mdb_dbi_open(txn, "main", MDB_CREATE, &main);
mdb_dbi_open(txn, "order", MDB_CREATE | MDB_INTEGERKEY, &order);
mdb_dbi_open(txn, "order", MDB_CREATE, &stats);
mdb_dbi_open(txn, "stats", MDB_CREATE, &stats);
mdb_txn_commit(txn);
fromTheBeginning = _isFromTheBeginning();
opened = true;
@ -135,6 +136,7 @@ void Core::Archive::clear()
mdb_txn_begin(environment, NULL, 0, &txn);
mdb_drop(txn, main, 0);
mdb_drop(txn, order, 0);
mdb_drop(txn, stats, 0);
mdb_txn_commit(txn);
}
@ -201,6 +203,32 @@ QString Core::Archive::newestId()
}
}
QString Core::Archive::oldestId()
{
if (!opened) {
throw Closed("oldestId", jid.toStdString());
}
MDB_txn *txn;
int rc;
rc = mdb_txn_begin(environment, NULL, MDB_RDONLY, &txn);
MDB_cursor* cursor;
rc = mdb_cursor_open(txn, order, &cursor);
MDB_val lmdbKey, lmdbData;
rc = mdb_cursor_get(cursor, &lmdbKey, &lmdbData, MDB_FIRST);
if (rc) {
qDebug() << "Error geting oldestId " << mdb_strerror(rc);
mdb_cursor_close(cursor);
mdb_txn_abort(txn);
throw Empty(jid.toStdString());
} else {
std::string sId((char*)lmdbData.mv_data, lmdbData.mv_size);
mdb_cursor_close(cursor);
mdb_txn_abort(txn);
return sId.c_str();
}
}
Shared::Message Core::Archive::oldest()
{
return getElement(oldestId());
@ -264,33 +292,6 @@ unsigned int Core::Archive::addElements(const std::list<Shared::Message>& messag
return success;
}
QString Core::Archive::oldestId()
{
if (!opened) {
throw Closed("oldestId", jid.toStdString());
}
MDB_txn *txn;
int rc;
rc = mdb_txn_begin(environment, NULL, MDB_RDONLY, &txn);
MDB_cursor* cursor;
rc = mdb_cursor_open(txn, order, &cursor);
MDB_val lmdbKey, lmdbData;
rc = mdb_cursor_get(cursor, &lmdbKey, &lmdbData, MDB_FIRST);
if (rc) {
qDebug() << "Error geting oldestId " << mdb_strerror(rc);
mdb_cursor_close(cursor);
mdb_txn_abort(txn);
throw Empty(jid.toStdString());
} else {
std::string sId((char*)lmdbData.mv_data, lmdbData.mv_size);
mdb_cursor_close(cursor);
mdb_txn_abort(txn);
return sId.c_str();
}
}
long unsigned int Core::Archive::size() const
{
if (!opened) {
@ -422,6 +423,7 @@ bool Core::Archive::_isFromTheBeginning()
} else {
qDebug() <<"isFromTheBeginning error: stored value doesn't match any magic number, the answer is most probably wrong";
}
mdb_txn_abort(txn);
return is;
}
}
@ -460,6 +462,7 @@ void Core::Archive::setFromTheBeginning(bool is)
qDebug() << "Couldn't store beginning key into stat database:" << mdb_strerror(rc);
mdb_txn_abort(txn);
}
mdb_txn_commit(txn);
}
}

4
core/contact.cpp
View File

@ -266,6 +266,7 @@ void Core::Contact::flushMessagesToArchive(bool finished, const QString& firstId
hisoryCache.clear();
}
bool wasEmpty = false;
switch (archiveState) {
case beginning:
if (finished) {
@ -288,9 +289,10 @@ void Core::Contact::flushMessagesToArchive(bool finished, const QString& firstId
}
break;
case empty:
wasEmpty = true;
archiveState = end;
case end:
if (finished) {
if (finished && (added > 0 || !wasEmpty)) {
archiveState = complete;
archive->setFromTheBeginning(true);
}

25
core/squawk.cpp
View File

@ -102,6 +102,13 @@ void Core::Squawk::addAccount(const QString& login, const QString& server, const
connect(acc, SIGNAL(responseArchive(const QString&, const std::list<Shared::Message>&)),
this, SLOT(onAccountResponseArchive(const QString&, const std::list<Shared::Message>&)));
connect(acc, SIGNAL(addRoom(const QString&, const QMap<QString, QVariant>&)),
this, SLOT(onAccountAddRoom(const QString&, const QMap<QString, QVariant>&)));
connect(acc, SIGNAL(changeRoom(const QString&, const QMap<QString, QVariant>&)),
this, SLOT(onAccountChangeRoom(const QString&, const QMap<QString, QVariant>&)));
connect(acc, SIGNAL(removeRoom(const QString&)), this, SLOT(onAccountRemoveRoom(const QString&)));
QMap<QString, QVariant> map = {
{"login", login},
{"server", server},
@ -376,3 +383,21 @@ void Core::Squawk::addContactRequest(const QString& account, const QString& jid,
itr->second->addContactRequest(jid, name, groups);
}
void Core::Squawk::onAccountAddRoom(const QString jid, const QMap<QString, QVariant>& data)
{
Account* acc = static_cast<Account*>(sender());
emit addRoom(acc->getName(), jid, data);
}
void Core::Squawk::onAccountChangeRoom(const QString jid, const QMap<QString, QVariant>& data)
{
Account* acc = static_cast<Account*>(sender());
emit changeRoom(acc->getName(), jid, data);
}
void Core::Squawk::onAccountRemoveRoom(const QString jid)
{
Account* acc = static_cast<Account*>(sender());
emit removeRoom(acc->getName(), jid);
}

6
core/squawk.h
View File

@ -37,6 +37,9 @@ signals:
void stateChanged(int state);
void accountMessage(const QString& account, const Shared::Message& data);
void responseArchive(const QString& account, const QString& jid, const std::list<Shared::Message>& list);
void addRoom(const QString& account, const QString jid, const QMap<QString, QVariant>& data);
void changeRoom(const QString& account, const QString jid, const QMap<QString, QVariant>& data);
void removeRoom(const QString& account, const QString jid);
public slots:
void start();
@ -79,6 +82,9 @@ private slots:
void onAccountRemovePresence(const QString& jid, const QString& name);
void onAccountMessage(const Shared::Message& data);
void onAccountResponseArchive(const QString& jid, const std::list<Shared::Message>& list);
void onAccountAddRoom(const QString jid, const QMap<QString, QVariant>& data);
void onAccountChangeRoom(const QString jid, const QMap<QString, QVariant>& data);
void onAccountRemoveRoom(const QString jid);
};
}

6
main.cpp
View File

@ -83,6 +83,12 @@ int main(int argc, char *argv[])
QObject::connect(squawk, SIGNAL(responseArchive(const QString&, const QString&, const std::list<Shared::Message>&)),
&w, SLOT(responseArchive(const QString&, const QString&, const std::list<Shared::Message>&)));
QObject::connect(squawk, SIGNAL(addRoom(const QString&, const QString&, const QMap<QString, QVariant>&)),
&w, SLOT(addRoom(const QString&, const QString&, const QMap<QString, QVariant>&)));
QObject::connect(squawk, SIGNAL(changeRoom(const QString&, const QString&, const QMap<QString, QVariant>&)),
&w, SLOT(changeRoom(const QString&, const QString&, const QMap<QString, QVariant>&)));
QObject::connect(squawk, SIGNAL(removeRoom(const QString&, const QString&)), &w, SLOT(removeRoom(const QString&, const QString&)));
//qDebug() << QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
coreThread->start();

1
ui/CMakeLists.txt
View File

@ -21,6 +21,7 @@ set(squawkUI_SRC
models/contact.cpp
models/presence.cpp
models/group.cpp
models/room.cpp
conversation.cpp
messageline.cpp
newcontact.cpp

2
ui/conversation.cpp
View File

@ -51,6 +51,7 @@ Conversation::Conversation(Models::Contact* p_contact, QWidget* parent):
//connect(m_ui->attachButton, SIGNAL(clicked(bool)), this, SLOT(onAttach()));
m_ui->messageEditor->installEventFilter(&ker);
line->setMyName(p_contact->getAccountName());
Models::Contact::Messages deque;
contact->getMessages(deque);
@ -59,7 +60,6 @@ Conversation::Conversation(Models::Contact* p_contact, QWidget* parent):
addMessage(*itr);
}
line->setMyName(p_contact->getAccountName());
connect(line, SIGNAL(resize(int)), this, SLOT(onMessagesResize(int)));
QScrollBar* vs = m_ui->scrollArea->verticalScrollBar();

2
ui/models/contact.cpp
View File

@ -152,8 +152,8 @@ void Models::Contact::removePresence(const QString& name)
qDebug() << "an attempt to remove non existing presence " << name << " from the contact " << jid << " of account " << getAccountName() << ", skipping";
} else {
Presence* pr = itr.value();
removeChild(pr->row());
presences.erase(itr);
removeChild(pr->row());
pr->deleteLater();
}
}

2
ui/models/contact.h
View File

@ -16,7 +16,7 @@ class Contact : public Item
Q_OBJECT
public:
typedef std::deque<Shared::Message> Messages;
Contact(const QString& p_jid ,const QMap<QString, QVariant> &data, Item *parentItem = 0);
Contact(const QString& p_jid, const QMap<QString, QVariant> &data, Item *parentItem = 0);
~Contact();
QString getJid() const;

9
ui/models/item.cpp
View File

@ -3,10 +3,15 @@
Models::Item::Item(Type p_type, const QMap<QString, QVariant> &p_data, Item *p_parent):
QObject(),
type(p_type),
name(p_data.value("name").toString()),
name(""),
childItems(),
parent(p_parent)
{}
{
QMap<QString, QVariant>::const_iterator itr = p_data.find("name");
if (itr != p_data.end()) {
setName(itr.value().toString());
}
}
Models::Item::~Item()
{

2
ui/models/item.h
View File

@ -16,7 +16,7 @@ class Item : public QObject{
account,
group,
contact,
conversation,
room,
presence,
root
};

186
ui/models/room.cpp Normal file
View File

@ -0,0 +1,186 @@
/*
* <one line to give the program's name and a brief idea of what it does.>
* Copyright (C) 2019 Юрий Губич <y.gubich@initi.ru>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "room.h"
#include <QIcon>
Models::Room::Room(const QString& p_jid, const QMap<QString, QVariant>& data, Models::Item* parentItem):
Item(room, data, parentItem),
autoJoin(false),
joined(false),
jid(p_jid),
nick(""),
messages()
{
QMap<QString, QVariant>::const_iterator itr = data.find("autoJoin");
if (itr != data.end()) {
setAutoJoin(itr.value().toBool());
}
itr = data.find("joined");
if (itr != data.end()) {
setJoined(itr.value().toBool());
}
itr = data.find("nick");
if (itr != data.end()) {
setNick(itr.value().toString());
}
}
Models::Room::~Room()
{
}
unsigned int Models::Room::getUnreadMessagesCount() const
{
return messages.size();
}
int Models::Room::columnCount() const
{
return 5;
}
QString Models::Room::getJid() const
{
return jid;
}
bool Models::Room::getAutoJoin() const
{
return autoJoin;
}
bool Models::Room::getJoined() const
{
return joined;
}
QString Models::Room::getNick() const
{
return nick;
}
QString Models::Room::getRoomName() const
{
if (name.size() == 0) {
return jid;
} else {
return name;
}
}
QVariant Models::Room::data(int column) const
{
switch (column) {
case 0:
return getRoomName();
case 1:
return jid;
case 2:
return getJoined();
case 3:
return getAutoJoin();
case 4:
return getNick();
default:
return QVariant();
}
}
void Models::Room::setAutoJoin(bool p_autoJoin)
{
if (autoJoin != p_autoJoin) {
autoJoin = p_autoJoin;
changed(3);
}
}
void Models::Room::setJid(const QString& p_jid)
{
if (jid != p_jid) {
jid = p_jid;
changed(1);
}
}
void Models::Room::setJoined(bool p_joined)
{
if (joined != p_joined) {
joined = p_joined;
changed(2);
}
}
void Models::Room::setNick(const QString& p_nick)
{
if (nick != p_nick) {
nick = p_nick;
changed(4);
}
}
void Models::Room::update(const QString& field, const QVariant& value)
{
if (field == "name") {
setName(value.toString());
} else if (field == "jid") {
setJid(value.toString());
} else if (field == "joined") {
setJoined(value.toBool());
} else if (field == "autoJoin") {
setAutoJoin(value.toBool());
} else if (field == "nick") {
setNick(value.toString());
}
}
QIcon Models::Room::getStatusIcon(bool big) const
{
if (autoJoin) {
if (joined) {
return Shared::connectionStateIcon(Shared::connected, big);
} else {
return Shared::connectionStateIcon(Shared::disconnected, big);
}
} else {
if (joined) {
return Shared::connectionStateIcon(Shared::connecting, big);
} else {
return Shared::connectionStateIcon(Shared::error, big);
}
}
}
QString Models::Room::getStatusText() const
{
if (autoJoin) {
if (joined) {
return "Subscribed";
} else {
return "Temporarily unsubscribed";
}
} else {
if (joined) {
return "Temporarily subscribed";
} else {
return "Unsubscribed";
}
}
}

70
ui/models/room.h Normal file
View File

@ -0,0 +1,70 @@
/*
* <one line to give the program's name and a brief idea of what it does.>
* Copyright (C) 2019 Юрий Губич <y.gubich@initi.ru>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MODELS_ROOM_H
#define MODELS_ROOM_H
#include "item.h"
#include "../global.h"
namespace Models {
/**
* @todo write docs
*/
class Room : public Models::Item
{
Q_OBJECT
public:
Room(const QString& p_jid, const QMap<QString, QVariant> &data, Item *parentItem = 0);
~Room();
int columnCount() const override;
QVariant data(int column) const override;
unsigned int getUnreadMessagesCount() const;
bool getJoined() const;
bool getAutoJoin() const;
QString getJid() const;
QString getNick() const;
QString getRoomName() const;
QIcon getStatusIcon(bool big = false) const;
QString getStatusText() const;
void setJoined(bool p_joined);
void setAutoJoin(bool p_autoJoin);
void setJid(const QString& p_jid);
void setNick(const QString& p_nick);
void update(const QString& field, const QVariant& value);
protected:
private:
bool autoJoin;
bool joined;
QString jid;
QString nick;
std::deque<Shared::Message> messages;
};
}
#endif // MODELS_ROOM_H

100
ui/models/roster.cpp
View File

@ -74,21 +74,26 @@ QVariant Models::Roster::data (const QModelIndex& index, int role) const
break;
case Qt::DecorationRole:
switch (item->type) {
case Item::account:{
case Item::account: {
Account* acc = static_cast<Account*>(item);
result = acc->getStatusIcon(false);
}
break;
case Item::contact:{
case Item::contact: {
Contact* contact = static_cast<Contact*>(item);
result = contact->getStatusIcon(false);
}
break;
case Item::presence:{
case Item::presence: {
Presence* presence = static_cast<Presence*>(item);
result = presence->getStatusIcon(false);
}
break;
case Item::room: {
Room* room = static_cast<Room*>(item);
result = room->getStatusIcon(false);
}
break;
default:
break;
}
@ -172,6 +177,17 @@ QVariant Models::Roster::data (const QModelIndex& index, int role) const
result = str;
}
break;
case Item::room: {
Room* rm = static_cast<Room*>(item);
unsigned int count = rm->getUnreadMessagesCount();
QString str("");
if (count > 0) {
str += QString("New messages: ") + std::to_string(count).c_str() + "\n";
}
str += QString("Subscription: ") + rm->getStatusText() + "\n";
result = str;
}
break;
default:
result = "";
break;
@ -313,8 +329,8 @@ void Models::Roster::addGroup(const QString& account, const QString& name)
if (itr != accounts.end()) {
Account* acc = itr->second;
Group* group = new Group({{"name", name}});
acc->appendChild(group);
groups.insert(std::make_pair(id, group));
acc->appendChild(group);
} else {
qDebug() << "An attempt to add group " << name << " to non existing account " << account << ", skipping";
}
@ -382,8 +398,8 @@ void Models::Roster::addContact(const QString& account, const QString& jid, cons
}
contact = new Contact(jid, data);
parent->appendChild(contact);
contacts.insert(std::make_pair(id, contact));
parent->appendChild(contact);
}
void Models::Roster::removeGroup(const QString& account, const QString& name)
@ -638,6 +654,17 @@ void Models::Roster::removeAccount(const QString& account)
}
}
std::map<ElId, Room*>::const_iterator rItr = rooms.begin();
while (rItr != rooms.end()) {
if (rItr->first.account == account) {
std::map<ElId, Room*>::const_iterator lItr = rItr;
++rItr;
rooms.erase(lItr);
} else {
++rItr;
}
}
acc->deleteLater();
}
@ -650,3 +677,66 @@ QString Models::Roster::getContactName(const QString& account, const QString& ji
}
return cItr->second->getContactName();
}
void Models::Roster::addRoom(const QString& account, const QString jid, const QMap<QString, QVariant>& data)
{
Account* acc;
{
std::map<QString, Account*>::iterator itr = accounts.find(account);
if (itr == accounts.end()) {
qDebug() << "An attempt to add a room " << jid << " to non existing account " << account << ", skipping";
return;
}
acc = itr->second;
}
ElId id = {account, jid};
std::map<ElId, Room*>::const_iterator itr = rooms.find(id);
if (itr != rooms.end()) {
qDebug() << "An attempt to add already existing room" << jid << ", skipping";
return;
}
Room* room = new Room(jid, data);
rooms.insert(std::make_pair(id, room));
acc->appendChild(room);
}
void Models::Roster::changeRoom(const QString& account, const QString jid, const QMap<QString, QVariant>& data)
{
ElId id = {account, jid};
std::map<ElId, Room*>::const_iterator itr = rooms.find(id);
if (itr == rooms.end()) {
qDebug() << "An attempt to change non existing room" << jid << ", skipping";
return;
}
Room* room = itr->second;
for (QMap<QString, QVariant>::const_iterator dItr = data.begin(), dEnd = data.end(); dItr != dEnd; ++dItr) {
room->update(dItr.key(), dItr.value());
}
}
void Models::Roster::removeRoom(const QString& account, const QString jid)
{
Account* acc;
{
std::map<QString, Account*>::iterator itr = accounts.find(account);
if (itr == accounts.end()) {
qDebug() << "An attempt to remove a room " << jid << " from non existing account " << account << ", skipping";
return;
}
acc = itr->second;
}
ElId id = {account, jid};
std::map<ElId, Room*>::const_iterator itr = rooms.find(id);
if (itr == rooms.end()) {
qDebug() << "An attempt to remove non existing room" << jid << ", skipping";
return;
}
Room* room = itr->second;
acc->removeChild(room->row());
room->deleteLater();
rooms.erase(itr);
}

5
ui/models/roster.h
View File

@ -11,6 +11,7 @@
#include "account.h"
#include "contact.h"
#include "group.h"
#include "room.h"
namespace Models
{
@ -36,6 +37,9 @@ public:
void removePresence(const QString& account, const QString& jid, const QString& name);
void addMessage(const QString& account, const Shared::Message& data);
void dropMessages(const QString& account, const QString& jid);
void addRoom(const QString& account, const QString jid, const QMap<QString, QVariant>& data);
void changeRoom(const QString& account, const QString jid, const QMap<QString, QVariant>& data);
void removeRoom(const QString& account, const QString jid);
QString getContactName(const QString& account, const QString& jid);
QVariant data ( const QModelIndex& index, int role ) const override;
@ -53,6 +57,7 @@ private:
std::map<QString, Account*> accounts;
std::map<ElId, Group*> groups;
std::multimap<ElId, Contact*> contacts;
std::map<ElId, Room*> rooms;
private slots:
void onAccountDataChanged(const QModelIndex& tl, const QModelIndex& br, const QVector<int>& roles);

15
ui/squawk.cpp
View File

@ -418,3 +418,18 @@ void Squawk::onRosterContextMenu(const QPoint& point)
}
}
}
void Squawk::addRoom(const QString& account, const QString jid, const QMap<QString, QVariant>& data)
{
rosterModel.addRoom(account, jid, data);
}
void Squawk::changeRoom(const QString& account, const QString jid, const QMap<QString, QVariant>& data)
{
rosterModel.changeRoom(account, jid, data);
}
void Squawk::removeRoom(const QString& account, const QString jid)
{
rosterModel.removeRoom(account, jid);
}

3
ui/squawk.h
View File

@ -57,6 +57,9 @@ public slots:
void stateChanged(int state);
void accountMessage(const QString& account, const Shared::Message& data);
void responseArchive(const QString& account, const QString& jid, const std::list<Shared::Message>& list);
void addRoom(const QString& account, const QString jid, const QMap<QString, QVariant>& data);
void changeRoom(const QString& account, const QString jid, const QMap<QString, QVariant>& data);
void removeRoom(const QString& account, const QString jid);
private:
typedef std::map<Models::Roster::ElId, Conversation*> Conversations;