Merge lp:~libqtelegram-team/telegram-app/dev-block-users into lp:telegram-app/dev

[Michał Karnicki]

Support for blocking users.
- ads user ProfileModel class
- ads blocking capability

[Michał Karnicki (karni)]

// TODO replace getBlockedContacts with getFullUser

Intentionally left. I think the lib doesn't yet support getFullUser / FullUser type, and we've sat on this feature long already, so let's get this going, we can revisit this part later.

// TODO: Merge groupmodel into this class.
This (and couple lines commented in the profilemodel are left for when I merge groupmodel into the profilemodel class.

[Giulio Collura (gcollura)]

This is perfect too.
I tested it by:
 - already have a blocked contact
 - install this version
 - see that all the already blocked contacts are correctly showed
 - block/unblock sync with android (block from android, unblock from ubuntu and vice-versa)
Nicely done!

review: Approve

=== modified file 'lib/telegram.h'
--- lib/telegram.h	2015-03-03 21:38:35 +0000
+++ lib/telegram.h	2015-03-27 11:52:28 +0000
@@ -229,6 +229,7 @@
     // Working with blacklist
     void contactsBlockAnswer(qint64 id, bool ok);
     void contactsUnblockAnswer(qint64 id, bool ok);
+    void contactsBlockResult(qint64 id, bool ok);
     void contactsGetBlockedAnswer(qint64 id, qint32 sliceCount, QList<ContactBlocked> blocked, QList<User> users);
 
     // Working with messages

=== modified file 'lib/types/inputpeer.h'
--- lib/types/inputpeer.h	2014-10-03 10:34:51 +0000
+++ lib/types/inputpeer.h	2015-03-27 11:52:28 +0000
@@ -41,6 +41,9 @@
         m_accessHash(0),
         m_classType(classType) {}
 
+    qint32 id() {
+        return (m_classType == typeInputPeerChat) ? m_chatId : m_userId;
+    }
     void setUserId(qint32 userId) {
         m_userId = userId;
     }

=== modified file 'qmlplugin/CMakeLists.txt'
--- qmlplugin/CMakeLists.txt	2015-02-18 17:53:54 +0000
+++ qmlplugin/CMakeLists.txt	2015-03-27 11:52:28 +0000
@@ -40,6 +40,10 @@
     models/dialogmodel.cpp
     models/groupmembersmodel.h
     models/groupmembersmodel.cpp
+    models/profilemodel.h
+    models/profilemodel.cpp
+    models/blockedusersmodel.h
+    models/blockedusersmodel.cpp
     models/messagesmodel.cpp
     models/contactsmodel.cpp
     models/dialogsmodel.cpp

=== modified file 'qmlplugin/data.cpp'
--- qmlplugin/data.cpp	2015-03-17 11:39:18 +0000
+++ qmlplugin/data.cpp	2015-03-27 11:52:28 +0000
@@ -864,6 +864,75 @@
     qCDebug(TG_PLUGIN_PROFILING) << "onContactsGetContactsAnswer - elapsed time:" << time.elapsed() << "ms";
 }
 
+void Data::putBlockedUsers(const QList<qint32> ids, const bool replace) {
+    if (ids.length() == 0) return;
+
+    QSqlQuery query;
+    if (replace) {
+        query.prepare("DELETE FROM blocked_users");
+        query.exec();
+    }
+    mDbManager.beginTransaction();
+    query.prepare("REPLACE INTO blockedUsers VALUES(:id)");
+    foreach (const qint32 &id, ids) {
+        query.bindValue(":id", id);
+        if (!query.exec()) {
+            mDbManager.rollbackTransaction();
+            return;
+        }
+    }
+    mDbManager.finishTransaction();
+}
+
+void Data::blockUser(qint32 id) {
+    QSqlQuery query;
+    query.prepare("REPLACE INTO blockedUsers VALUES(:id)");
+    query.bindValue(":id", id);
+    query.exec();
+    Q_EMIT userBlocked(id);
+}
+
+void Data::unblockUser(qint32 id) {
+    QSqlQuery query;
+    query.prepare("DELETE FROM blockedUsers WHERE uid = :id");
+    query.bindValue(":id", id);
+    query.exec();
+    Q_EMIT userUnblocked(id);
+}
+
+void Data::onGetBlockedContactsAnswer(qint64, qint32, QList<ContactBlocked> blocked, QList<User> users) {
+    qCDebug(TG_PLUGIN_LOGIC) << "onGetBlockedContactsAnswer";
+
+    mDbManager.beginTransaction();
+    Q_FOREACH (const User &user, users) {
+        if (!insertOrUpdateUser(user)) {
+            mDbManager.rollbackTransaction();
+            return;
+        }
+    }
+    QList<qint32> blockedUserIds;
+    Q_FOREACH (const ContactBlocked &contact, blocked) {
+        blockedUserIds.append(contact.userId());
+    }
+    putBlockedUsers(blockedUserIds, true);
+    mDbManager.finishTransaction();
+    Q_EMIT usersBlocked(blockedUserIds);
+}
+
+void Data::onBlockContactAnswer(qint64 requestId, bool ok) {
+    qint32 userId = mBlockRequests.take(requestId);
+    if (userId != 0 && ok) {
+        blockUser(userId);
+    }
+}
+
+void Data::onUnblockContactsAnswer(qint64 requestId, bool ok) {
+    qint32 userId = mBlockRequests.take(requestId);
+    if (userId != 0 && ok) {
+        unblockUser(userId);
+    }
+}
+
 void Data::onMessagesGetHistoryAnswer(qint64, qint32 totalCount, const QList<Message> &messages, const QList<Chat> &chats, const QList<User> &users) {
     QTime time;
     time.start();
@@ -954,7 +1023,9 @@
     qint32 deleteChatId = mChatsToDelete.take(id);
     if (deleteChatId != 0) {
         qCDebug(TG_PLUGIN_LOGIC) << "deleting chat:" << deleteChatId;
-        deleteDialog(deleteChatId);
+        TelegramService *service = static_cast<TelegramService *>(mServiceRef);
+        qint32 id = service->deleteChatUser(deleteChatId, service->ourId());
+        mChatsToDelete.insert(id, service->ourId());
     }
 
     clientState.setPts(pts);
@@ -1469,15 +1540,21 @@
         return;
     }
 
+    mDbManager.finishTransaction();
+
+    Q_FOREACH (const Chat &chat, chats) {
+        Q_EMIT chatUpdated(chat.id());
+    }
+
+    // handle chat deletion - after self has deleted the chat from UI
+    qint32 chatId = mChatsToDelete.take(id);
+    if (chatId != 0) {
+        deleteChat(chatId);
+        Q_EMIT chatDeleted(chatId);
+    }
+
     // send signal with the action related message
     MessageItem messageItem = getMessage(message.id());
-
-    mDbManager.finishTransaction();
-
-    Q_FOREACH (const Chat &chat, chats) {
-        Q_EMIT chatUpdated(chat.id());
-    }
-
     Q_EMIT messageAdded(messageItem);
 
     qCDebug(TG_PLUGIN_PROFILING) << "onMessagesDeleteChatUsersAnswer - end:" << time.elapsed() << "ms";
@@ -2593,6 +2670,14 @@
         break;
     }
 
+    case Update::typeUpdateUserBlocked: {
+        if (update.blocked()) {
+            blockUser(update.userId());
+        } else {
+            unblockUser(update.userId());
+        }
+    }
+
     case Update::typeUpdateNotifySettings: {
         NotifyPeer notifyPeer = update.peer();
         PeerNotifySettings settings = update.notifySettings();
@@ -6319,7 +6404,6 @@
 
 bool Data::muteDialog(qint32 dialogId, bool muted) {
     QSqlQuery query(mDbManager.database());
-
     query.prepare("UPDATE dialogs SET muted=:muted WHERE id=:id");
     query.bindValue(":id", dialogId);
     query.bindValue(":muted", muted);
@@ -6334,7 +6418,6 @@
 
 bool Data::muteDialogs(NotifyPeer::NotifyPeerType peerType, bool muted) {
     QSqlQuery query(mDbManager.database());
-
     QString condition;
     switch (peerType) {
     case NotifyPeer::typeNotifyUsers:
@@ -6350,7 +6433,7 @@
         return false;
     }
 
-    QString sql = QString("UPDATE dialogs SET muted=:muted").arg(condition);
+    QString sql = QString("UPDATE dialogs SET muted=:muted").append(condition);
     query.prepare(sql);
     query.bindValue(":muted", muted);
     if (!query.exec()) {
@@ -6358,7 +6441,6 @@
                 << "for dialogs" << query.lastError() << query.lastQuery();
         return false;
     }
-
     return query.numRowsAffected() > 0;
 }
 

=== modified file 'qmlplugin/data.h'
--- qmlplugin/data.h	2015-03-03 15:30:59 +0000
+++ qmlplugin/data.h	2015-03-27 11:52:28 +0000
@@ -191,7 +191,8 @@
 
     void setMutingInProgress(qint64 requestId, qint32 peerId, bool muting);
     QMap<qint64, qint32> mChatsToClearHistory;
-    QMap<qint32, qint32> mChatsToDelete;
+    QMap<qint64, qint32> mChatsToDelete;
+    QMap<qint64, qint32> mBlockRequests;
 
 public:
 
@@ -201,6 +202,8 @@
 
 public Q_SLOTS:
     void setSecretChatMessageTTL(qint32 chatId, qint32 ttlSeconds);
+    void blockUser(qint32 id);
+    void unblockUser(qint32 id);
 
 protected:
     void updateChats(const QList<Chat> &chats);
@@ -221,6 +224,9 @@
     void dialogThumbnailUpdated(qint32 dialogId, const QString &thumbnail);
     void contactNameUpdated(qint32 userId, const QString &firstName, const QString lastName);
     void dialogTitleUpdated(qint32 dialogId, const QString &title);
+    void usersBlocked(QList<qint32> ids);
+    void userBlocked(qint32 id);
+    void userUnblocked(qint32 id);
     void dialogMuted(qint32 dialogId, bool muted);
     void dialogsMuted(NotifyPeer::NotifyPeerType notifyType, bool muted);
 
@@ -359,6 +365,10 @@
     void onMessagesGetFullChatAnswer(qint64 id, ChatFull chatFull, QList<Chat> chats, QList<User> users);
     void onContactsImportContactsAnswer(qint64 id, QList<ImportedContact> importedContacts, QList<qint64> retryContacts, QList<User> users);
     void onContactsGetContactsAnswer(qint64 requestId, bool modified, const QList<Contact> &contacts, const QList<User> &users);
+    void putBlockedUsers(const QList<qint32> ids, const bool replace);
+    void onGetBlockedContactsAnswer(qint64 requestId, qint32 sliceCount, QList<ContactBlocked> blocked, QList<User> users);
+    void onBlockContactAnswer(qint64 requestId, bool ok);
+    void onUnblockContactsAnswer(qint64 requestId, bool ok);
     void onMessagesGetHistoryAnswer(qint64 requestId, qint32 totalCount, const QList<Message> &messages, const QList<Chat> &chats, const QList<User> &users);
     void onMessagesReadHistoryAnswer(qint64 id, qint32 pts, qint32 seq, qint32 offset);
     void onMessagesDeleteHistoryAnswer(qint64 id, qint32 pts, qint32 seq, qint32 offset);

=== modified file 'qmlplugin/dbmanager.cpp'
--- qmlplugin/dbmanager.cpp	2015-03-23 10:47:25 +0000
+++ qmlplugin/dbmanager.cpp	2015-03-27 11:52:28 +0000
@@ -42,9 +42,10 @@
 const qint32 VERSION_PROFILE_BIG_PHOTO = 11;
 const qint32 VERSION_FORWARD_MESSAGES = 12;
 const qint32 VERSION_MEDIA_DOCUMENTS = 13;
+const qint32 VERSION_BLOCKED_USERS = 14;
 
 // Update this line when creating new upgrade version.
-const qint32 DATABASE_VERSION = VERSION_MEDIA_DOCUMENTS;
+const qint32 DATABASE_VERSION = VERSION_BLOCKED_USERS;
 
 
 DbManager::DbManager(QObject *parent) :
@@ -169,6 +170,7 @@
 
     queries << Schema::CREATE_THUMBNAILS;
     queries << Schema::CREATE_USERS;
+    queries << Schema::CREATE_BLOCKED_USERS;
     queries << UpgradeSecretChats::CREATE_SECRET_CHATS;
     queries << Schema::CREATE_DIALOGS;
     queries << Schema::CREATE_CHATS;
@@ -218,6 +220,7 @@
     queries << Schema::DROP_CHATS;
     queries << Schema::DROP_DIALOGS;
     queries << UpgradeSecretChats::DROP_SECRET_CHATS;
+    queries << Schema::DROP_BLOCKED_USERS;
     queries << Schema::DROP_USERS;
 
     bool result = executeSqlQueries(queries);
@@ -310,6 +313,9 @@
             if (!upgradeMediaDocuments()) break;
         case VERSION_MEDIA_DOCUMENTS:
             version = VERSION_MEDIA_DOCUMENTS;
+            if (!upgradeBlockedUsers()) break;
+        case VERSION_BLOCKED_USERS:
+            version = VERSION_BLOCKED_USERS;
 
         // Upgrade cases go here.
     }
@@ -509,6 +515,14 @@
     return result;
 }
 
+bool DbManager::upgradeBlockedUsers() {
+    qCDebug(LOG_DATABASE) << "Upgrading database: adding blocked users";
+
+    QStringList queries;
+    queries << Schema::CREATE_BLOCKED_USERS;
+    return executeSqlQueries(queries);
+}
+
 bool DbManager::purgeButSecret() {
     qCDebug(LOG_DATABASE) << "Purging database but secret chats data...";
 

=== modified file 'qmlplugin/dbmanager.h'
--- qmlplugin/dbmanager.h	2015-02-25 21:25:07 +0000
+++ qmlplugin/dbmanager.h	2015-03-27 11:52:28 +0000
@@ -67,6 +67,7 @@
     bool upgradeProfilesBigPhotos();
     bool upgradeForwardMessages();
     bool upgradeMediaDocuments();
+    bool upgradeBlockedUsers();
 
 private:
     QString mDatabasePath;

=== modified file 'qmlplugin/dbschema.h'
--- qmlplugin/dbschema.h	2015-03-10 15:32:48 +0000
+++ qmlplugin/dbschema.h	2015-03-27 11:52:28 +0000
@@ -259,6 +259,12 @@
 
 const QString DROP_MESSAGE_ACTIONS("DROP TABLE IF EXISTS messageActions");
 
+const QString CREATE_BLOCKED_USERS("CREATE TABLE blockedUsers(\n"
+"    uid INTEGER PRIMARY KEY\n"
+")");
+
+const QString DROP_BLOCKED_USERS("DROP TABLE IF EXISTS blockedUsers");
+
 }
 
 namespace MessageActionsRemovePhotoId {

=== added file 'qmlplugin/models/blockedusersmodel.cpp'
--- qmlplugin/models/blockedusersmodel.cpp	1970-01-01 00:00:00 +0000
+++ qmlplugin/models/blockedusersmodel.cpp	2015-03-27 11:52:28 +0000
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * 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; version 3.
+ *
+ * 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 "blockedusersmodel.h"
+
+#include "types/tluser.h"
+#include "types/tlinputpeer.h"
+
+BlockedUsersModel::BlockedUsersModel(QObject *parent) :
+    Model(parent), mTelegramClient(NULL) {
+}
+
+BlockedUsersModel::~BlockedUsersModel() {
+    disconnect(mTelegramClient);
+    mTelegramClient = NULL;
+}
+
+void BlockedUsersModel::setup(TelegramClient *telegramClient) {
+    Q_ASSERT(telegramClient != NULL);
+
+    if (mTelegramClient == NULL) {
+        mTelegramClient = telegramClient;
+        connect(mTelegramClient, SIGNAL(usersBlocked(QList<qint32>)),
+                           this, SLOT(refresh(QList<qint32>)));
+        connect(mTelegramClient, SIGNAL(userBlocked(qint32)),
+                           this, SLOT(userBlocked(qint32)));
+        connect(mTelegramClient, SIGNAL(userUnblocked(qint32)),
+                           this, SLOT(userUnblocked(qint32)));
+    }
+    refresh();
+}
+
+void BlockedUsersModel::refresh(QList<qint32> ids) {
+    if (mTelegramClient == NULL) return;
+    mQueryString = QString(
+            "SELECT id, type, "
+            "    (SELECT localPath FROM fileLocations WHERE rowid=thumbnail) AS photo, "
+            "    (firstName || \" \" || lastName) AS name, "
+            "    online, lastSeenOnline "
+            "FROM users JOIN blockedUsers ON users.id = blockedUsers.uid");
+    Model::refresh();
+}
+
+void BlockedUsersModel::userBlocked(qint32 id) {
+    refresh();
+}
+
+void BlockedUsersModel::userUnblocked(qint32 id) {
+    refresh();
+}
+
+QHash<int, QByteArray> BlockedUsersModel::roleNames() const {
+    QHash<int, QByteArray> roles;
+    roles[IdRole] = "id";
+    roles[TypeRole] = "type";
+    roles[PhotoRole] = "photo";
+    roles[NameRole] = "name";
+    roles[OnlineRole] = "online";
+    roles[LastSeenOnlineRole] = "lastSeenOnline";
+    return roles;
+}

=== added file 'qmlplugin/models/blockedusersmodel.h'
--- qmlplugin/models/blockedusersmodel.h	1970-01-01 00:00:00 +0000
+++ qmlplugin/models/blockedusersmodel.h	2015-03-27 11:52:28 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * 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; version 3.
+ *
+ * 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 BLOCKED_USERS_MODEL_H
+#define BLOCKED_USERS_MODEL_H
+
+#include <QLoggingCategory>
+
+#include "model.h"
+#include "telegramclient.h"
+
+class BlockedUsersModel : public Model
+{
+    Q_OBJECT
+    Q_ENUMS(BlockedUsersRoles)
+public:
+
+    enum BlockedUsersRoles {
+        IdRole = Qt::UserRole,
+        TypeRole,
+        PhotoRole,
+        NameRole,
+        OnlineRole,
+        LastSeenOnlineRole
+    };
+
+    explicit BlockedUsersModel(QObject *parent = 0);
+    ~BlockedUsersModel();
+
+    Q_INVOKABLE void setup(TelegramClient *telegramClient);
+
+public Q_SLOTS:
+    void refresh(QList<qint32> ids = QList<qint32>());
+    void userBlocked(qint32 id);
+    void userUnblocked(qint32 id);
+
+private:
+    TelegramClient *mTelegramClient;
+
+    QHash<qint32, QByteArray> roleNames() const;
+};
+
+#endif // BLOCKED_USERS_MODEL_H

=== modified file 'qmlplugin/models/dialogmodel.cpp'
--- qmlplugin/models/dialogmodel.cpp	2015-02-04 22:29:48 +0000
+++ qmlplugin/models/dialogmodel.cpp	2015-03-27 11:52:28 +0000
@@ -25,6 +25,7 @@
         mChatId(0),
         mPeerId(0),
         mPeerType((qint32) InputPeer::typeInputPeerContact),
+        mAccessHash(0),
         mWhoIsTyping(""),
         mIsTyping(false),
         mIsSecret(false),
@@ -44,12 +45,13 @@
     setChatId(0);
     setPeerId(0);
     setPeerType((qint32) InputPeer::typeInputPeerContact);
+    setAccessHash(0);
     setIsChat(false);
     setIsTyping(false);
     setIsSecret(false);
     setState(0);
-    setTitle(QString());
-    setPhone(QString());
+    setTitle("");
+    setPhone("");
     setTtl(0);
 }
 
@@ -76,9 +78,7 @@
         // TODO karni: hook up live state
     }
 
-    if (mTelegramClient != NULL) {
-        setChatId(chatId);
-    }
+    setChatId(chatId);
 }
 
 void DialogModel::onMessageReceived(const MessageItem &message) {
@@ -92,13 +92,10 @@
 }
 
 void DialogModel::setChatId(qint32 chatId) {
-    if (mChatId != chatId) {
-        mChatId = chatId;
-        if (chatId != 0) {
-            refreshDialogDetails(chatId);
-        }
-        Q_EMIT chatIdChanged(chatId);
-    }
+    if (mChatId == chatId) return;
+    mChatId = chatId;
+    refreshDialogDetails(chatId);
+    Q_EMIT chatIdChanged(chatId);
 }
 
 qint32 DialogModel::getPeerId() const {
@@ -106,10 +103,9 @@
 }
 
 void DialogModel::setPeerId(qint32 peerId) {
-    if (mPeerId != peerId) {
-        mPeerId = peerId;
-        Q_EMIT peerIdChanged(peerId);
-    }
+    if (mPeerId == peerId) return;
+    mPeerId = peerId;
+    Q_EMIT peerIdChanged(peerId);
 }
 
 qint32 DialogModel::getPeerType() const {
@@ -117,10 +113,19 @@
 }
 
 void DialogModel::setPeerType(qint32 peerType) {
-    if (mPeerType != peerType) {
-        mPeerType = peerType;
-        Q_EMIT peerTypeChanged(peerType);
-    }
+    if (mPeerType == peerType) return;
+    mPeerType = peerType;
+    Q_EMIT peerTypeChanged(peerType);
+}
+
+qint64 DialogModel::getAccessHash() const {
+    return mAccessHash;
+}
+
+void DialogModel::setAccessHash(qint64 accessHash) {
+    if (mAccessHash == accessHash) return;
+    mAccessHash = accessHash;
+    Q_EMIT accessHashChanged(accessHash);
 }
 
 bool DialogModel::getIsChat() const {
@@ -128,10 +133,9 @@
 }
 
 void DialogModel::setIsChat(bool isChat) {
-    if (mIsChat != isChat) {
-        mIsChat = isChat;
-        Q_EMIT isChatChanged(isChat);
-    }
+    if (mIsChat == isChat) return;
+    mIsChat = isChat;
+    Q_EMIT isChatChanged(isChat);
 }
 
 QString DialogModel::getWhoIsTyping() const {
@@ -139,10 +143,9 @@
 }
 
 void DialogModel::setWhoIsTyping(QString whoIsTyping) {
-    if (mWhoIsTyping != whoIsTyping) {
-        mWhoIsTyping = whoIsTyping;
-        Q_EMIT whoIsTypingChanged(whoIsTyping);
-    }
+    if (mWhoIsTyping == whoIsTyping) return;
+    mWhoIsTyping = whoIsTyping;
+    Q_EMIT whoIsTypingChanged(whoIsTyping);
 }
 
 bool DialogModel::getIsTyping() const {
@@ -160,10 +163,9 @@
 }
 
 void DialogModel::setIsSecret(bool isSecret) {
-    if (mIsSecret != isSecret) {
-        mIsSecret = isSecret;
-        Q_EMIT isSecretChanged(isSecret);
-    }
+    if (mIsSecret == isSecret) return;
+    mIsSecret = isSecret;
+    Q_EMIT isSecretChanged(isSecret);
 }
 
 qint32 DialogModel::getState() const {
@@ -171,10 +173,9 @@
 }
 
 void DialogModel::setState(qint32 state) {
-    if (mState != state) {
-        mState = state;
-        Q_EMIT stateChanged(state);
-    }
+    if (mState == state) return;
+    mState = state;
+    Q_EMIT stateChanged(state);
 }
 
 QString DialogModel::getTitle() const {
@@ -182,10 +183,9 @@
 }
 
 void DialogModel::setTitle(const QString &title) {
-    if (mTitle != title) {
-        mTitle = title;
-        Q_EMIT titleChanged(title);
-    }
+    if (mTitle == title) return;
+    mTitle = title;
+    Q_EMIT titleChanged(title);
 }
 
 QString DialogModel::getPhone() const {
@@ -193,10 +193,9 @@
 }
 
 void DialogModel::setPhone(QString phone) {
-    if (mPhone != phone) {
-        mPhone = phone;
-        Q_EMIT phoneChanged(phone);
-    }
+    if (mPhone == phone) return;
+    mPhone = phone;
+    Q_EMIT phoneChanged(phone);
 }
 
 qint32 DialogModel::getTtl() const {
@@ -204,10 +203,9 @@
 }
 
 void DialogModel::setTtl(qint32 ttl) {
-    if (mTtl != ttl) {
-        mTtl = ttl;
-        Q_EMIT ttlChanged(ttl);
-    }
+    if (mTtl == ttl) return;
+    mTtl = ttl;
+    Q_EMIT ttlChanged(ttl);
 }
 
 void DialogModel::refreshDialogDetails(qint32 chatId) {
@@ -215,9 +213,12 @@
     qCDebug(TG_PLUGIN_LOGIC) << "Querying dialog details" << chatId;
 
     QSqlQuery query;
-    query.prepare(QString("SELECT id, isChat, name, thumbnail, members, userOnline, "
-                  "lastSeenOnline, peerId, peerType, date, isSecret, state, ttl "
-                  "FROM dialogsView WHERE id = %1").arg(QString::number(chatId)));
+    query.prepare(QString("SELECT dialogsView.id, isChat, name, dialogsView.thumbnail, members, userOnline, "
+                  "dialogsView.lastSeenOnline, peerId, peerType, date, isSecret, state, ttl, "
+                  "coalesce(users.type, 0) as type, coalesce(users.accessHash, 0) as accessHash "
+                  "FROM dialogsView "
+                  "    LEFT JOIN users ON dialogsView.id = users.id "
+                  "WHERE dialogsView.id = %1").arg(QString::number(chatId)));
 
     // query.bindValue(":chatId", chatId); // no worky?
 
@@ -243,14 +244,14 @@
         }
 
         setIsChat(false);
-
         setIsSecret(false);
-
         qint32 userType = query.value("type").toInt();
         setPeerType(Tools::toInputPeerType((User::UserType) userType));
-
         setPeerId(chatId);
-
+        qint64 accessHash = query.value("accessHash").toLongLong();
+        if (accessHash != 0) {
+            setAccessHash(accessHash);
+        }
         setState(0);
 
         QString firstName;
@@ -276,24 +277,22 @@
 
         bool isChat = query.value("isChat").toBool();
         setIsChat(isChat);
-
         bool isSecret = query.value("isSecret").toBool();
         setIsSecret(isSecret);
-
         if (isSecret) {
             qint32 ttl = query.value("ttl").toInt();
             setTtl(ttl);
         }
-
         qint32 userType = query.value("peerType").toInt();
         setPeerType(Tools::toInputPeerType((User::UserType) userType));
-
         qint32 peerId = query.value("peerId").toInt();
-        setPeerId(isSecret ? peerId : chatId); // *sigh*
-
+        setPeerId(isSecret ? peerId : chatId);
+        qint64 accessHash = query.value("accessHash").toLongLong();
+        if (accessHash != 0) {
+            setAccessHash(accessHash);
+        }
         qint32 state = query.value("state").toInt();
         setState(state);
-
         QString title = query.value("name").toString();
         setTitle(title);
 

=== modified file 'qmlplugin/models/dialogmodel.h'
--- qmlplugin/models/dialogmodel.h	2015-02-04 19:01:38 +0000
+++ qmlplugin/models/dialogmodel.h	2015-03-27 11:52:28 +0000
@@ -32,6 +32,7 @@
     Q_PROPERTY(qint32 chatId READ getChatId NOTIFY chatIdChanged)
     Q_PROPERTY(qint32 peerId READ getPeerId NOTIFY peerIdChanged)
     Q_PROPERTY(qint32 peerType READ getPeerType NOTIFY peerTypeChanged)
+    Q_PROPERTY(qint64 accessHash READ getAccessHash NOTIFY accessHashChanged)
     Q_PROPERTY(bool isChat READ getIsChat NOTIFY isChatChanged)
     Q_PROPERTY(QString whoIsTyping READ getWhoIsTyping NOTIFY whoIsTypingChanged)
     Q_PROPERTY(bool isTyping READ getIsTyping NOTIFY isTypingChanged)
@@ -57,6 +58,9 @@
     qint32 getPeerType() const;
     void setPeerType(qint32 classType);
 
+    qint64 getAccessHash() const;
+    void setAccessHash(qint64 accessHash);
+
     bool getIsChat() const;
     void setIsChat(bool isChat);
 
@@ -95,6 +99,7 @@
     void chatIdChanged(qint32 chatId);
     void peerIdChanged(qint32 peerId);
     void peerTypeChanged(qint32 peerType);
+    void accessHashChanged(qint64 accessHash);
     void peerChanged(qint32 peerId, qint32 peerType);
     void isChatChanged(bool isChat);
     void whoIsTypingChanged(QString who);
@@ -111,6 +116,7 @@
     qint32 mChatId;
     qint32 mPeerId;
     qint32 mPeerType;
+    qint64 mAccessHash;
     bool mIsChat;
     bool mIsTyping;
     QString mWhoIsTyping;

=== modified file 'qmlplugin/models/groupmodel.cpp'
--- qmlplugin/models/groupmodel.cpp	2015-02-16 18:07:13 +0000
+++ qmlplugin/models/groupmodel.cpp	2015-03-27 11:52:28 +0000
@@ -40,9 +40,7 @@
                 this, SLOT(chatsMuted(NotifyPeer::NotifyPeerType,bool)));
     }
 
-    if (mTelegramClient != NULL) {
-        setChatId(chatId);
-    }
+    setChatId(chatId);
 }
 
 qint32 GroupModel::getChatId() const {

=== modified file 'qmlplugin/models/profilemodel.cpp'
--- qmlplugin/models/profilemodel.cpp	2015-02-18 17:53:54 +0000
+++ qmlplugin/models/profilemodel.cpp	2015-03-27 11:52:28 +0000
@@ -1,220 +1,389 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * 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; version 3.
+ *
+ * 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 "profilemodel.h"
-
-Q_LOGGING_CATEGORY(TG_MODELS_PROFILEMODEL, "tg.models.profilemodel")
-
-ProfileModel::ProfileModel(QObject *parent) :
-    QObject(parent),
-    mTelegramClient(0),
-    mUserId(0),
-    mFirstName(""),
-    mLastName(""),
-    mThumbnail(""),
-    mBigPhoto(""),
-    mLastSeenOnline(0),
-    mOnline(false) {
+#include "tools.h"
+
+ProfileModel::ProfileModel(QObject *parent) : QObject(parent),
+    mTelegramClient(NULL), mDialogId(0), mUserId(0), mChatId(0), mIsSecret(true),
+    mThumbnail(""), mPhoto(""), mTitle(""), mFirstName(""), mLastName(""),
+    mPhone(""), mHasPhone(false), mLastSeen(0), mIsOnline(false),
+    mIsMuted(false), mIsBlocked(false) {
 }
 
 ProfileModel::~ProfileModel() {
+    disconnect(mTelegramClient);
     mTelegramClient = 0;
 }
 
-void ProfileModel::reset() {
-    mTelegramClient = 0,
-    setUserId(0),
-    setFirstName("");
-    setLastName("");
-    setThumbnail("");
-    setBigPhoto("");
-    setLastSeenOnline(0);
-    setOnline(false);
-}
-
-void ProfileModel::setup(TelegramClient *telegramClient, qint32 userId) {
-
-    Q_ASSERT(telegramClient);
-
-    if (!mTelegramClient) {
+void ProfileModel::setup(TelegramClient *telegramClient, qint32 dialogId) {
+    Q_ASSERT(telegramClient != NULL);
+
+    if (mTelegramClient == NULL) {
         mTelegramClient = telegramClient;
-        connect(mTelegramClient, SIGNAL(contactNameUpdated(qint32,QString,QString)), SLOT(onContactNameUpdated(qint32,QString,QString)));
-        connect(mTelegramClient, SIGNAL(contactThumbnailUpdated(qint32,QString)), SLOT(onContactThumbnailUpdated(qint32,QString)));
-        connect(mTelegramClient, SIGNAL(contactBigPhotoUpdated(qint32,QString)), SLOT(onContactBigPhotoUpdated(qint32,QString)));
-        connect(mTelegramClient, SIGNAL(contactStatusUpdated(qint32,bool,qint32)), SLOT(onContactStatusUpdated(qint32,bool,qint32)));
-    }
-
-    if (mTelegramClient) {
-        setUserId(userId);
-    }
-}
-
-void ProfileModel::refresh(qint32 userId) {
-
-    if (userId != mUserId) {
-        return;
-    }
-
-    QSqlQuery query;
-    query.prepare("SELECT firstName, lastName, phone, lastSeenOnline, online, "
-                  "(SELECT localPath FROM fileLocations WHERE rowid=thumbnail) AS thumbnail, "
-                  "(SELECT localPath FROM fileLocations WHERE rowid=bigPhoto) AS bigPhoto "
-                  "FROM users "
-                  "WHERE id=:id");
-    query.bindValue(":id", userId);
-    if (!query.exec()) {
-        qCCritical(TG_MODELS_PROFILEMODEL) << "Could not get profile data for user" << userId
-                                         << query.lastError() << query.lastQuery();
-        return;
-    }
-
-    if (!query.next()) {
-        qCCritical(TG_MODELS_PROFILEMODEL) << "Could not find a register related to user" << userId;
-        return;
-    }
-
-    setFirstName(query.value("firstName").toString());
-    setLastName(query.value("lastName").toString());
-    setPhone(query.value("phone").toString());
-    setThumbnail(query.value("thumbnail").toString());
-    setBigPhoto(query.value("bigPhoto").toString());
-    setLastSeenOnline(query.value("lastSeenOnline").toInt());
-    setOnline(query.value("online").toBool());
-
-    Q_EMIT refreshed();
-}
-
-void ProfileModel::onContactNameUpdated(qint32 userId, const QString &firstName, const QString &lastName) {
-
-    if (mUserId != userId) {
-        return;
-    }
-
-    setFirstName(firstName);
-    setLastName(lastName);
-}
-
-void ProfileModel::onContactThumbnailUpdated(qint32 userId, const QString &thumbnail) {
-
-    if (mUserId != userId) {
-        return;
-    }
-    setThumbnail(thumbnail);
-}
-
-void ProfileModel::onContactBigPhotoUpdated(qint32 userId, const QString &bigPhoto) {
-
-    if (mUserId != userId) {
-        return;
-    }
-
-    setBigPhoto(bigPhoto);
-}
-
-void ProfileModel::onContactStatusUpdated(qint32 userId, bool online, qint32 lastSeenOnline) {
-
-    if (mUserId != userId) {
-        return;
-    }
-
-    setOnline(online);
-    setLastSeenOnline(lastSeenOnline);
-}
-
-qint32 ProfileModel::userId() const {
+
+        connect(mTelegramClient, SIGNAL(contactNameUpdated(qint32,QString,QString)),
+                this, SLOT(contactNameUpdated(qint32,QString,QString)));
+
+        connect(mTelegramClient, SIGNAL(contactThumbnailUpdated(qint32,QString)),
+                this, SLOT(thumbnailChanged(qint32,QString)));
+        connect(mTelegramClient, SIGNAL(contactBigPhotoUpdated(qint32,QString)),
+                this, SLOT(photoChanged(qint32,QString)));
+
+        connect(mTelegramClient, SIGNAL(dialogMuted(qint32,bool)),
+                this, SLOT(dialogMuted(qint32,bool)));
+        connect(mTelegramClient, SIGNAL(dialogsMuted(NotifyPeer::NotifyPeerType,bool)),
+                this, SLOT(dialogsMuted(NotifyPeer::NotifyPeerType,bool)));
+
+        connect(mTelegramClient, SIGNAL(userBlocked(qint32)),
+                this, SLOT(userBlocked(qint32)));
+        connect(mTelegramClient, SIGNAL(userUnblocked(qint32)),
+                this, SLOT(userUnblocked(qint32)));
+        connect(mTelegramClient, SIGNAL(usersBlocked(QList<qint32>)),
+                this, SLOT(usersBlocked(QList<qint32>)));
+    }
+
+    setDialogId(dialogId);
+}
+
+void ProfileModel::downloadPhoto() {
+    qCDebug(TG_PLUGIN_LOGIC) << "downloading profile photo";
+    mTelegramClient->downloadUserBigPhoto(mUserId);
+}
+
+qint32 ProfileModel::getDialogId() const {
+    return mDialogId;
+}
+
+void ProfileModel::setDialogId(qint32 dialogId) {
+    if (mDialogId == dialogId) return;
+    mDialogId = dialogId;
+    refreshProfile(dialogId);
+    Q_EMIT dialogIdChanged(dialogId);
+
+    // TBD We'll probably want to call getFullUser and getFullChat (for chat members) here.
+}
+
+qint32 ProfileModel::getUserId() const {
     return mUserId;
 }
 
 void ProfileModel::setUserId(qint32 userId) {
-    if (mUserId != userId) {
-        mUserId = userId;
-        if (userId) {
-            refresh(userId);
-        }
-        Q_EMIT userIdChanged(userId);
-    }
-}
-
-QString ProfileModel::firstName() const  {
+    if (mUserId == userId) return;
+    mUserId = userId;
+    Q_EMIT userIdChanged(userId);
+}
+
+qint32 ProfileModel::getChatId() const {
+    return mChatId;
+}
+
+void ProfileModel::setChatId(qint32 chatId) {
+    if (mChatId == chatId) return;
+    mChatId = chatId;
+    Q_EMIT chatIdChanged(chatId);
+}
+
+void ProfileModel::setUserType(qint32 userType) {
+    if (mUserType == userType) return;
+    mUserType = userType;
+    Q_EMIT userTypeChanged(userType);
+
+    Q_EMIT existsChanged(getExists());
+}
+
+bool ProfileModel::getIsSecret() const {
+    return mIsSecret;
+}
+
+bool ProfileModel::getExists() const {
+    return ((User::UserType)mUserType) != User::typeUserDeleted;
+}
+
+void ProfileModel::setIsSecret(bool isSecret) {
+    if (mIsSecret == isSecret) return;
+    mIsSecret = isSecret;
+    Q_EMIT isSecretChanged(isSecret);
+}
+
+QString ProfileModel::getThumbnail() const {
+    return mThumbnail;
+}
+
+void ProfileModel::setThumbnail(const QString &thumbnail) {
+    if (mThumbnail == thumbnail) return;
+    mThumbnail = thumbnail;
+    Q_EMIT thumbnailChanged(thumbnail);
+}
+
+QString ProfileModel::getPhoto() const {
+    return mPhoto;
+}
+
+void ProfileModel::setPhoto(const QString &photo) {
+    if (mPhoto == photo) return;
+    mPhoto = photo;
+    Q_EMIT photoChanged(photo);
+}
+
+QString ProfileModel::getTitle() const {
+    return mTitle;
+}
+
+void ProfileModel::setTitle(const QString &title) {
+    if (mTitle == title) return;
+    mTitle = title;
+    Q_EMIT titleChanged(title);
+}
+
+QString ProfileModel::getFirstName() const {
     return mFirstName;
 }
 
-void ProfileModel::setFirstName(const QString &firstName) {
-    if (mFirstName != firstName) {
-        mFirstName = firstName;
-        Q_EMIT firstNameChanged(firstName);
-        Q_EMIT fullNameChanged(fullName());
-    }
-}
-
-QString ProfileModel::lastName() const  {
+QString ProfileModel::getLastName() const {
     return mLastName;
 }
 
-void ProfileModel::setLastName(const QString &lastName) {
-    if (mLastName != lastName) {
-        mLastName = lastName;
-        Q_EMIT lastNameChanged(lastName);
-        Q_EMIT fullNameChanged(fullName());
-    }
-}
-
-QString ProfileModel::fullName() const {
-    QString fullName = mFirstName;
-    if (!mLastName.isEmpty()) {
-        fullName += " " + mLastName;
-    }
-    return fullName;
-}
-
-QString ProfileModel::phone() const  {
+QString ProfileModel::getPhone() const {
     return mPhone;
 }
 
 void ProfileModel::setPhone(const QString &phone) {
-    if (mPhone != phone) {
-        mPhone = phone;
-        Q_EMIT phoneChanged(phone);
-    }
-}
-
-QString ProfileModel::thumbnail() const {
-    return mThumbnail;
-}
-
-void ProfileModel::setThumbnail(const QString &thumbnail) {
-    if (mThumbnail != thumbnail) {
-        mThumbnail = thumbnail;
-        Q_EMIT thumbnailChanged(thumbnail);
-    }
-}
-
-QString ProfileModel::bigPhoto() const {
-    return mBigPhoto;
-}
-
-void ProfileModel::setBigPhoto(const QString &bigPhoto) {
-    if (mBigPhoto != bigPhoto) {
-        mBigPhoto = bigPhoto;
-        Q_EMIT bigPhotoChanged(bigPhoto);
-    }
-}
-
-qint32 ProfileModel::lastSeenOnline() const {
-    return mLastSeenOnline;
-}
-
-void ProfileModel::setLastSeenOnline(qint32 lastSeenOnline) {
-    if (mLastSeenOnline != lastSeenOnline) {
-        mLastSeenOnline = lastSeenOnline;
-        Q_EMIT lastSeenOnlineChanged(lastSeenOnline);
-    }
-}
-
-bool ProfileModel::online() const {
-    return mOnline;
-}
-
-void ProfileModel::setOnline(bool online) {
-    if (mOnline != online) {
-        mOnline = online;
-        Q_EMIT onlineChanged(online);
-    }
+    if (mPhone == phone) return;
+    mPhone = phone;
+    mHasPhone = mPhone.length() > 0;
+    Q_EMIT phoneChanged(phone);
+    Q_EMIT hasPhoneChanged(mHasPhone);
+}
+
+bool ProfileModel::getHasPhone() const {
+    return mHasPhone;
+}
+
+qint32 ProfileModel::getLastSeen() const {
+    return mLastSeen;
+}
+
+void ProfileModel::setLastSeen(qint32 lastSeen) {
+    if (mLastSeen == lastSeen) return;
+    mLastSeen = lastSeen;
+    Q_EMIT lastSeenChanged(lastSeen);
+}
+
+bool ProfileModel::getIsOnline() const {
+    return mIsOnline;
+}
+
+void ProfileModel::setIsOnline(bool isOnline) {
+    if (mIsOnline == isOnline) return;
+    mIsOnline = isOnline;
+    Q_EMIT isOnlineChanged(isOnline);
+}
+
+bool ProfileModel::getIsMuted() const {
+    return mIsMuted;
+}
+
+void ProfileModel::setIsMuted(bool isMuted) {
+    if (mIsMuted == isMuted) return;
+    qCDebug(TG_PLUGIN_LOGIC) << "setIsMuted";
+    mIsMuted = isMuted;
+    Q_EMIT isMutedChanged(isMuted);
+}
+
+void ProfileModel::setIsBlocked(bool isBlocked) {
+    if (mIsBlocked == isBlocked) return;
+    qCDebug(TG_PLUGIN_LOGIC) << "setIsBlocked";
+    mIsBlocked = isBlocked;
+    Q_EMIT isBlockedChanged(isBlocked);
+}
+
+bool ProfileModel::getIsBlocked() const {
+    return mIsBlocked;
+}
+
+void ProfileModel::resetProfile() {
+    mDialogId = 0;
+    setChatId(0);
+    setUserId(0);
+
+    setThumbnail("");
+    setPhoto("");
+    setTitle("");
+    mFirstName = "";
+    mLastName = "";
+
+    setLastSeen(0);
+    setIsOnline(false);
+    setIsMuted(false);
+    setIsBlocked(false);
+}
+
+QString formatFullName(const QString &firstName, const QString &lastName) {
+    QString full(firstName);
+    if (full.length() > 0) {
+        full = full.append(" ");
+    }
+    return full.append(lastName);
+}
+
+void ProfileModel::refreshUserProfile() {
+    QSqlQuery query;
+    query.prepare(QString(
+            "SELECT "
+            "    (SELECT localPath FROM fileLocations WHERE fileLocations.rowid = thumbnail) as thumbnail, "
+            "    (SELECT localPath FROM fileLocations WHERE fileLocations.rowid = bigPhoto) AS photo, "
+            "    users.id, phone, firstName, lastName, lastSeenOnline, online, "
+            "    type, accessHash, "
+            "    coalesce(dialogs.muted, 0) as muted, "
+            "    coalesce(blockedUsers.uid, 0) as blocked "
+            "FROM users "
+            "    LEFT JOIN dialogs ON users.id = dialogs.id "
+            "    LEFT JOIN blockedUsers ON users.id = blockedUsers.uid "
+            "WHERE users.id = :id"));
+    query.bindValue(":id", mUserId);
+
+    if (!query.exec()) {
+        qCCritical(TG_PLUGIN_LOGIC) << "Failed to query user details!"
+                                    << query.lastError() << query.lastQuery();
+        resetProfile();
+        return;
+    } else if (query.next()) {
+        qint32 userType = query.value("type").toInt();
+        setUserType(userType);
+        mAccessHash = query.value("accessHash").toLongLong();
+
+        QString thumbnail = query.value("thumbnail").toString();
+        setThumbnail(thumbnail);
+        QString photo = query.value("photo").toString();
+        setPhoto(photo);
+        mFirstName = query.value("firstName").toString();
+        mLastName = query.value("lastName").toString();
+        QString title = formatFullName(mFirstName, mLastName);
+        setTitle(title);
+        QString phone = query.value("phone").toString();
+        setPhone(phone);
+        qint32 lastSeen = query.value("lastSeenOnline").toInt();
+        setLastSeen(lastSeen);
+        bool isOnline = query.value("online").toBool();
+        setIsOnline(isOnline);
+        bool isMuted = query.value("muted").toBool();
+        setIsMuted(isMuted);
+        bool isBlocked = query.value("blocked").toInt() != 0;
+        setIsBlocked(isBlocked);
+
+        /*
+        // TODO replace getBlockedContacts with getFullUser
+        InputUser::InputUserType inputUserType = Tools::toInputUserType(mUserType);
+        InputUser inputUser(inputUserType);
+        inputUser.setUserId(mUserId);
+        if (mAccessHash != 0) {
+            inputUser.setAccessHash(mAccessHash);
+        }
+        mTelegramClient->getFullUser(inputUser);
+        */
+        mTelegramClient->getBlockedContacts();
+    }
+}
+
+void ProfileModel::refreshGroupProfile() {
+// TODO: Merge groupmodel into this class.
+}
+
+void ProfileModel::refreshProfile(qint32 dialogId) {
+    if (mDialogId != dialogId) return;
+    qCDebug(TG_PLUGIN_LOGIC) << "Refreshing profile for dialog:" << dialogId;
+
+    QSqlQuery query;
+    query.prepare(QString("SELECT isChat, isSecret, peerId FROM dialogsView WHERE id = :id"));
+    query.bindValue(":id", dialogId);
+
+    if (!query.exec()) {
+        qCCritical(TG_PLUGIN_LOGIC) << "Failed to query profile type!"
+                                    << query.lastError() << query.lastQuery();
+        resetProfile();
+        return;
+    }
+
+    bool isChat = false;
+    if (query.next()) {
+        isChat = query.value("isChat").toBool();
+        if (isChat) {
+            setChatId(dialogId);
+        } else {
+            bool isSecret = query.value("isSecret").toBool();
+            setIsSecret(isSecret);
+            setUserId(isSecret ? query.value("peerId").toInt() : dialogId);
+        }
+    } else {
+        setUserId(dialogId);
+    }
+
+    if (isChat) {
+        refreshGroupProfile();
+    } else {
+        refreshUserProfile();
+    }
+}
+
+void ProfileModel::contactNameUpdated(qint32 userId, QString firstName, QString lastName) {
+    if (mUserId != userId) return;
+
+    mFirstName = firstName;
+    mLastName = lastName;
+    if (lastName.length() == 0) {
+        setTitle(firstName);
+    } else {
+        setTitle(firstName.append(" ").append(lastName));
+    }
+}
+
+void ProfileModel::thumbnailChanged(qint32 dialogId, QString thumbnail) {
+    if (mDialogId != dialogId) return;
+    setThumbnail(thumbnail);
+}
+
+void ProfileModel::photoChanged(qint32 dialogId, QString photo) {
+    if (mDialogId != dialogId) return;
+    setPhoto(photo);
+}
+
+void ProfileModel::dialogMuted(qint32 dialogId, bool muted) {
+    if (mDialogId != dialogId) return;
+    setIsMuted(muted);
+}
+
+void ProfileModel::dialogsMuted(NotifyPeer::NotifyPeerType notifyType, bool muted) {
+    if (notifyType == NotifyPeer::typeNotifyAll ||
+            notifyType == NotifyPeer::typeNotifyChats) {
+        setIsMuted(muted);
+    }
+}
+
+void ProfileModel::usersBlocked(QList<qint32> ids) {
+    bool isBlocked = ids.indexOf(mUserId) != -1;
+    setIsBlocked(isBlocked);
+}
+
+void ProfileModel::userBlocked(qint32 uid) {
+    if (mUserId != uid) return;
+    setIsBlocked(true);
+}
+
+void ProfileModel::userUnblocked(qint32 uid) {
+    if (mUserId != uid) return;
+    setIsBlocked(false);
 }

=== modified file 'qmlplugin/models/profilemodel.h'
--- qmlplugin/models/profilemodel.h	2015-02-18 17:53:54 +0000
+++ qmlplugin/models/profilemodel.h	2015-03-27 11:52:28 +0000
@@ -1,84 +1,169 @@
-#ifndef PROFILEMODEL_H
-#define PROFILEMODEL_H
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * 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; version 3.
+ *
+ * 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 PROFILE_MODEL_H
+#define PROFILE_MODEL_H
 
 #include <QObject>
-#include <QLoggingCategory>
+#include <QString>
+
 #include "telegramclient.h"
-
-
-Q_DECLARE_LOGGING_CATEGORY(TG_MODELS_PROFILEMODEL)
+#include "dbmanager.h"
 
 class ProfileModel : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(qint32 userId READ userId NOTIFY userIdChanged)
-    Q_PROPERTY(QString firstName READ firstName NOTIFY firstNameChanged)
-    Q_PROPERTY(QString lastName READ lastName NOTIFY lastNameChanged)
-    Q_PROPERTY(QString fullName READ fullName NOTIFY fullNameChanged)
-    Q_PROPERTY(QString phone READ phone NOTIFY phoneChanged)
-    Q_PROPERTY(QString thumbnail READ thumbnail NOTIFY thumbnailChanged)
-    Q_PROPERTY(QString bigPhoto READ bigPhoto NOTIFY bigPhotoChanged)
-    Q_PROPERTY(qint32 lastSeenOnline READ lastSeenOnline NOTIFY lastSeenOnlineChanged)
-    Q_PROPERTY(bool online READ online NOTIFY onlineChanged)
+    Q_PROPERTY(qint32 dialogId READ getDialogId WRITE setDialogId NOTIFY dialogIdChanged)
+    Q_PROPERTY(qint32 userId READ getUserId NOTIFY userIdChanged)
+    Q_PROPERTY(qint32 chatId READ getChatId NOTIFY chatIdChanged)
+    Q_PROPERTY(bool isSecret READ getIsSecret NOTIFY isSecretChanged)
+    Q_PROPERTY(bool exists READ getExists NOTIFY existsChanged)
+
+    Q_PROPERTY(QString thumbnail READ getThumbnail NOTIFY thumbnailChanged)
+    Q_PROPERTY(QString photo READ getPhoto NOTIFY photoChanged)
+    Q_PROPERTY(QString title READ getTitle NOTIFY titleChanged)
+    Q_PROPERTY(QString firstName READ getFirstName)
+    Q_PROPERTY(QString lastName READ getLastName)
+    Q_PROPERTY(QString phone READ getPhone NOTIFY phoneChanged)
+    Q_PROPERTY(bool hasPhone READ getHasPhone NOTIFY phoneChanged)
+
+//    Q_PROPERTY(QString memberCount READ getMemberCount NOTIFY memberCountChanged)
+//    Q_PROPERTY(qint32 onlineCount READ getOnlineCount NOTIFY onlineCountChanged)
+
+    Q_PROPERTY(qint32 lastSeen READ getLastSeen NOTIFY lastSeenChanged)
+    Q_PROPERTY(bool isOnline READ getIsOnline NOTIFY isOnlineChanged)
+
+    Q_PROPERTY(bool isMuted READ getIsMuted NOTIFY isMutedChanged)
+    Q_PROPERTY(bool isBlocked READ getIsBlocked NOTIFY isBlockedChanged)
 
 public:
     explicit ProfileModel(QObject *parent = 0);
     ~ProfileModel();
 
-    Q_INVOKABLE void setup(TelegramClient *telegramClient, qint32 userId);
-    void reset();
-
-    QString fullName() const;
-
-    virtual qint32 userId() const;
-    virtual void setUserId(qint32 userId);
-    virtual QString firstName() const;
-    virtual void setFirstName(const QString &firstName);
-    virtual QString lastName() const;
-    virtual void setLastName(const QString &lastName);
-    virtual QString phone() const;
-    virtual void setPhone(const QString &phone);
-    virtual QString thumbnail() const;
-    virtual void setThumbnail(const QString &thumbnail);
-    virtual QString bigPhoto() const;
-    virtual void setBigPhoto(const QString &bigPhoto);
-    virtual qint32 lastSeenOnline() const;
-    virtual void setLastSeenOnline(qint32 lastSeenOnline);
-    virtual bool online() const;
-    virtual void setOnline(bool online);
-
-Q_SIGNALS:
-    void refreshed();
-
-    void userIdChanged(qint32);
-    void firstNameChanged(QString);
-    void lastNameChanged(QString);
-    void fullNameChanged(QString);
-    void phoneChanged(QString);
-    void thumbnailChanged(QString);
-    void bigPhotoChanged(QString);
-    void lastSeenOnlineChanged(qint32);
-    void onlineChanged(bool);
-
-protected Q_SLOTS:
-    void refresh(qint32 userId);
-
-    void onContactNameUpdated(qint32 userId, const QString &firstName, const QString &lastName);
-    void onContactThumbnailUpdated(qint32 userId, const QString &thumbnail);
-    void onContactBigPhotoUpdated(qint32 userId, const QString &bigPhoto);
-    void onContactStatusUpdated(qint32 userId, bool online, qint32 lastSeenOnline);
-
-protected:
-    TelegramClient *mTelegramClient;
-
+    Q_INVOKABLE void setup(TelegramClient *telegramClient, qint32 dialogId);
+    Q_INVOKABLE void downloadPhoto();
+    void resetProfile();
+
+    void setDialogId(qint32 dialogId);
+    qint32 getDialogId() const;
+    qint32 getUserId() const;
+    qint32 getChatId() const;
+    bool getIsSecret() const;
+    bool getExists() const;
+
+    QString getThumbnail() const;
+    QString getPhoto() const;
+    QString getTitle() const;
+    QString getFirstName() const;
+    QString getLastName() const;
+    QString getPhone() const;
+    bool getHasPhone() const;
+
+//    qint32 getMemberCount() const;
+//    qint32 getOnlineCount() const;
+
+    qint32 getLastSeen() const;
+    bool getIsOnline() const;
+
+    bool getIsMuted() const;
+    bool getIsBlocked() const;
+
+public Q_SLOTS:
+    void refreshProfile(qint32 dialogId);
+
+    void contactNameUpdated(qint32 userId, QString firstName, QString lastName);
+    void thumbnailChanged(qint32 dialogId, QString thumbnail);
+    void photoChanged(qint32 dialogId, QString photo);
+    void dialogMuted(qint32 dialogId, bool muted);
+    void dialogsMuted(NotifyPeer::NotifyPeerType notifyType, bool muted);
+    void usersBlocked(QList<qint32> ids);
+    void userBlocked(qint32 uid);
+    void userUnblocked(qint32 uid);
+
+Q_SIGNALS:
+    void profileDetailsRefreshed();
+
+private:
+    void setUserId(qint32 userId);
+    void setChatId(qint32 chatId);
+    void setUserType(qint32 type);
+    void setIsSecret(bool isSecret);
+
+    void setThumbnail(const QString &thumbnail);
+    void setPhoto(const QString &photo);
+    void setTitle(const QString &title);
+    void setPhone(const QString &phone);
+
+    void setLastSeen(qint32 lastSeen);
+    void setIsOnline(bool isOnline);
+
+    void setIsMuted(bool isMuted);
+    void setIsBlocked(bool isBlocked);
+
+    void refreshUserProfile();
+    void refreshGroupProfile();
+
+Q_SIGNALS:
+    void profileUpdated(qint32 dialogId);
+
+    void dialogIdChanged(qint32 dialogId);
+    void userIdChanged(qint32 userId);
+    void chatIdChanged(qint32 chatId);
+    void userTypeChanged(qint32 userType);
+    void isSecretChanged(bool isSecret);
+    void existsChanged(bool exists);
+
+    void thumbnailChanged(QString thumbnail);
+    void photoChanged(QString photo);
+    void titleChanged(QString title);
+    void phoneChanged(QString phone);
+    void hasPhoneChanged(bool hasPhone);
+
+    void lastSeenChanged(qint32 lastSeen);
+    void isOnlineChanged(bool isOnline);
+
+    void isMutedChanged(bool isMuted);
+    void isBlockedChanged(bool isBlocked);
+
+private:
+    TelegramClient* mTelegramClient;
+
+    qint32 mDialogId;
     qint32 mUserId;
+    qint32 mChatId;
+    qint32 mUserType;
+    qint64 mAccessHash;
+    bool mIsSecret;
+
+    QString mThumbnail;
+    QString mPhoto;
+    QString mTitle;
     QString mFirstName;
     QString mLastName;
     QString mPhone;
-    QString mThumbnail;
-    QString mBigPhoto;
-    qint32 mLastSeenOnline;
-    bool mOnline;
+    bool mHasPhone;
+
+//    qint32 mMemberCount;
+//    qint32 mOnlineCount;
+
+    qint32 mLastSeen;
+    bool mIsOnline;
+
+    bool mIsMuted;
+    bool mIsBlocked;
 };
 
-#endif // PROFILEMODEL_H
+#endif

=== modified file 'qmlplugin/rawapiclient.cpp'
--- qmlplugin/rawapiclient.cpp	2015-02-26 21:10:13 +0000
+++ qmlplugin/rawapiclient.cpp	2015-03-27 11:52:28 +0000
@@ -250,6 +250,18 @@
                               Q_ARG(QList<InputContact>, contactsList), Q_ARG(bool, replace));
 }
 
+void RawApiClient::getBlockedContacts() {
+    QMetaObject::invokeMethod(mTelegramService, "getBlockedContacts", Qt::QueuedConnection);
+}
+
+void RawApiClient::blockContact(TLInputPeer *peer) {
+    QMetaObject::invokeMethod(mTelegramService, "blockContact", Qt::QueuedConnection, Q_ARG(InputPeer, *peer));
+}
+
+void RawApiClient::unblockContact(TLInputPeer *peer) {
+    QMetaObject::invokeMethod(mTelegramService, "unblockContact", Qt::QueuedConnection, Q_ARG(InputPeer, *peer));
+}
+
 // Working with messages
 void RawApiClient::messagesSendMessage(TLInputPeer *peer, const QString &message) {
     QMetaObject::invokeMethod(mTelegramService, "messagesSendMessage", Qt::QueuedConnection,
@@ -313,7 +325,6 @@
 }
 
 void RawApiClient::messagesCreateChat(const QVariantList &users, const QString &title) {
-
     QList<InputUser> groupUsers = toQList<InputUser>(users);
     QMetaObject::invokeMethod(mTelegramService, "messagesCreateChat", Qt::QueuedConnection,
                               Q_ARG(QList<InputUser>, groupUsers), Q_ARG(QString, title));

=== modified file 'qmlplugin/rawapiclient.h'
--- qmlplugin/rawapiclient.h	2015-02-26 21:10:13 +0000
+++ qmlplugin/rawapiclient.h	2015-03-27 11:52:28 +0000
@@ -98,9 +98,13 @@
     Q_INVOKABLE void accountRegisterDevice(const QString &token, const QString &appVersion = "", bool appSandbox = false);
     Q_INVOKABLE void accountUnregisterDevice(const QString &token);
     Q_INVOKABLE void accountUpdateProfile(const QString &firstName, const QString &lastName);
+
     // Working with contacts
     Q_INVOKABLE void contactsGetContacts();
     Q_INVOKABLE void contactsImportContacts(const QVariantList &contacts, bool replace = false);
+    Q_INVOKABLE void getBlockedContacts();
+    Q_INVOKABLE void blockContact(TLInputPeer *peer);
+    Q_INVOKABLE void unblockContact(TLInputPeer *peer);
 
     // Working with messages
     Q_INVOKABLE void messagesSendMessage(TLInputPeer *peer, const QString &message);
@@ -116,7 +120,6 @@
     Q_INVOKABLE void messagesSetTyping(TLInputPeer *peer);
     Q_INVOKABLE void messagesSetEncryptedTyping(qint32 chatId, bool typing);
 
-
     // Working with chats
     Q_INVOKABLE void messagesCreateChat(const QVariantList &users, const QString &title);
     Q_INVOKABLE void messagesGetFullChat(qint32 chatId);

=== modified file 'qmlplugin/rawapiservice.cpp'
--- qmlplugin/rawapiservice.cpp	2015-03-02 21:17:11 +0000
+++ qmlplugin/rawapiservice.cpp	2015-03-27 11:52:28 +0000
@@ -83,6 +83,8 @@
 
         // Working with contacts
         connect(mTelegramLib, SIGNAL(contactsImportContactsAnswer(qint64,QList<ImportedContact>,QList<qint64>,QList<User>)), this, SIGNAL(contactsImportContactsAnswer(qint64,QList<ImportedContact>,QList<qint64>,QList<User>)));
+        connect(mTelegramLib, SIGNAL(contactsBlockAnswer(qint64,bool)), this, SIGNAL(contactsBlockAnswer(qint64,bool)));
+        connect(mTelegramLib, SIGNAL(contactsUnblockAnswer(qint64,bool)), this, SIGNAL(contactsUnblockAnswer(qint64,bool)));
 
         // Working with updates signal-slot
         connect(mTelegramLib, SIGNAL(updatesGetStateAnswer(qint64,qint32,qint32,qint32,qint32,qint32)), this, SIGNAL(updatesGetStateAnswer(qint64,qint32,qint32,qint32,qint32,qint32)));

=== modified file 'qmlplugin/rawapiservice.h'
--- qmlplugin/rawapiservice.h	2015-03-02 21:17:11 +0000
+++ qmlplugin/rawapiservice.h	2015-03-27 11:52:28 +0000
@@ -150,6 +150,8 @@
     // Working with blacklist
     void contactsBlockAnswer(qint64 id, bool ok);
     void contactsUnblockAnswer(qint64 id, bool ok);
+    void contactsBlockResult(qint64 id, bool ok);
+    void contactsUnblockResult(qint64 id, bool ok);
     void contactsGetBlockedAnswer(qint64 id, qint32 sliceCount, QList<ContactBlocked> blocked, QList<User> users);
 
     // Working with messages

=== modified file 'qmlplugin/telegramclient.cpp'
--- qmlplugin/telegramclient.cpp	2015-03-04 21:24:05 +0000
+++ qmlplugin/telegramclient.cpp	2015-03-27 11:52:28 +0000
@@ -59,6 +59,9 @@
     connect(mTelegramService, SIGNAL(chatBigPhotoUpdated(qint32,QString)), SIGNAL(chatBigPhotoUpdated(qint32,QString)), Qt::QueuedConnection);
     connect(mTelegramService, SIGNAL(dialogThumbnailUpdated(qint32,QString)), SIGNAL(dialogThumbnailUpdated(qint32,QString)), Qt::QueuedConnection);
     connect(mTelegramService, SIGNAL(dialogTitleUpdated(qint32,QString)), SIGNAL(dialogTitleUpdated(qint32,QString)), Qt::QueuedConnection);
+    connect(mTelegramService, SIGNAL(usersBlocked(QList<qint32>)), SIGNAL(usersBlocked(QList<qint32>)));
+    connect(mTelegramService, SIGNAL(userBlocked(qint32)), SIGNAL(userBlocked(qint32)));
+    connect(mTelegramService, SIGNAL(userUnblocked(qint32)), SIGNAL(userUnblocked(qint32)));
     connect(mTelegramService, SIGNAL(dialogMuted(qint32,bool)), SIGNAL(dialogMuted(qint32,bool)), Qt::QueuedConnection);
     connect(mTelegramService, SIGNAL(dialogsMuted(NotifyPeer::NotifyPeerType,bool)), SIGNAL(dialogsMuted(NotifyPeer::NotifyPeerType,bool)), Qt::QueuedConnection);
     connect(mTelegramService, SIGNAL(messageAdded(MessageItem)), SIGNAL(messageAdded(MessageItem)), Qt::QueuedConnection);

=== modified file 'qmlplugin/telegramclient.h'
--- qmlplugin/telegramclient.h	2015-03-04 21:10:13 +0000
+++ qmlplugin/telegramclient.h	2015-03-27 11:52:28 +0000
@@ -128,6 +128,9 @@
     void chatBigPhotoUpdated(qint32 chatId, const QString &bigPhoto);
     void dialogThumbnailUpdated(qint32 dialogId, const QString &thumbnail);
     void dialogTitleUpdated(qint32 dialogId, const QString &title);
+    void usersBlocked(QList<qint32> ids);
+    void userBlocked(qint32 id);
+    void userUnblocked(qint32 id);
     void dialogMuted(qint32 dialogId, bool muted);
     void dialogsMuted(NotifyPeer::NotifyPeerType notifyType, bool muted);
     void messagesAdded(const QList<MessageItem> &messages, qint32 totalCount);

=== modified file 'qmlplugin/telegramplugin.cpp'
--- qmlplugin/telegramplugin.cpp	2015-02-18 17:53:54 +0000
+++ qmlplugin/telegramplugin.cpp	2015-03-27 11:52:28 +0000
@@ -49,8 +49,10 @@
 #include "models/messagesmodel.h"
 #include "models/contactsmodel.h"
 #include "models/contactsproxy.h"
+#include "models/profilemodel.h"
 #include "models/groupmodel.h"
 #include "models/groupmembersmodel.h"
+#include "models/blockedusersmodel.h"
 #include "models/dialogsmodel.h"
 #include "models/dialogsproxy.h"
 #include "models/sortproxymodel.h"
@@ -118,8 +120,10 @@
     qmlRegisterType<ContactsModel>(uri, 0, 1, "ContactsModel");
     qmlRegisterType<ProfileModel>(uri, 0, 1, "ProfileModel");
     qmlRegisterType<ContactsProxy>(uri, 0, 1, "ContactsProxy");
+    qmlRegisterType<ProfileModel>(uri, 0, 1, "ProfileModel");
     qmlRegisterType<GroupModel>(uri, 0, 1, "GroupModel");
     qmlRegisterType<GroupMembersModel>(uri, 0, 1, "GroupMembersModel");
+    qmlRegisterType<BlockedUsersModel>(uri, 0, 1, "BlockedUsersModel");
     qmlRegisterType<DialogItem>(uri, 0, 1, "DialogItem");
     qmlRegisterType<MessageItem>(uri, 0, 1, "MessageItem");
     qmlRegisterType<ContactItem>(uri, 0, 1, "ContactItem");

=== modified file 'qmlplugin/telegramservice.cpp'
--- qmlplugin/telegramservice.cpp	2015-03-04 21:10:13 +0000
+++ qmlplugin/telegramservice.cpp	2015-03-27 11:52:28 +0000
@@ -46,6 +46,9 @@
     connect(&mData, SIGNAL(chatBigPhotoUpdated(qint32,QString)), SIGNAL(chatBigPhotoUpdated(qint32,QString)));
     connect(&mData, SIGNAL(dialogThumbnailUpdated(qint32,QString)), SIGNAL(dialogThumbnailUpdated(qint32,QString)));
     connect(&mData, SIGNAL(dialogTitleUpdated(qint32,QString)), SIGNAL(dialogTitleUpdated(qint32,QString)));
+    connect(&mData, SIGNAL(usersBlocked(QList<qint32>)), SIGNAL(usersBlocked(QList<qint32>)));
+    connect(&mData, SIGNAL(userBlocked(qint32)), SIGNAL(userBlocked(qint32)));
+    connect(&mData, SIGNAL(userUnblocked(qint32)), SIGNAL(userUnblocked(qint32)));
     connect(&mData, SIGNAL(dialogMuted(qint32,bool)), SIGNAL(dialogMuted(qint32,bool)));
     connect(&mData, SIGNAL(dialogsMuted(NotifyPeer::NotifyPeerType,bool)), SIGNAL(dialogsMuted(NotifyPeer::NotifyPeerType,bool)));
     connect(&mData, SIGNAL(messageAdded(MessageItem)), SIGNAL(messageAdded(MessageItem)));
@@ -291,6 +294,18 @@
             &mData,
             SLOT(onContactsImportContactsAnswer(qint64,QList<ImportedContact>,QList<qint64>,QList<User>)));
     connect(mTelegramLib,
+            SIGNAL(contactsGetBlockedAnswer(qint64,qint32,QList<ContactBlocked>,QList<User>)),
+            &mData,
+            SLOT(onGetBlockedContactsAnswer(qint64,qint32,QList<ContactBlocked>,QList<User>)));
+    connect(mTelegramLib,
+            SIGNAL(contactsBlockAnswer(qint64,bool)),
+            &mData,
+            SLOT(onBlockContactAnswer(qint64,bool)));
+    connect(mTelegramLib,
+            SIGNAL(contactsUnblockAnswer(qint64,bool)),
+            &mData,
+            SLOT(onUnblockContactsAnswer(qint64,bool)));
+    connect(mTelegramLib,
             SIGNAL(accountUpdateNotifySettingsAnswer(qint64,bool)),
             &mData,
             SLOT(onAccountUpdateNotifySettingsAnswer(qint64,bool)));
@@ -409,6 +424,26 @@
     return RawApiService::contactsImportContacts(contacts);
 }
 
+void TelegramService::getBlockedContacts() {
+    mTelegramLib->contactsGetBlocked(0, 200);
+}
+
+void TelegramService::blockContact(InputPeer peer) {
+    const ContactItem &contactItem = mData.getUser(peer.userId());
+    InputUser inputUser = Tools::toInputUser(contactItem);
+
+    qint64 requestId = mTelegramLib->contactsBlock(inputUser);
+    mData.mBlockRequests.insert(requestId, peer.userId());
+}
+
+void TelegramService::unblockContact(InputPeer peer) {
+    const ContactItem &contactItem = mData.getUser(peer.userId());
+    InputUser inputUser = Tools::toInputUser(contactItem);
+
+    qint64 requestId = mTelegramLib->contactsUnblock(inputUser);
+    mData.mBlockRequests.insert(requestId, peer.userId());
+}
+
 qint64 TelegramService::messagesReadHistory(InputPeer inputPeer, qint32 maxId, qint32 offset, bool readContents) {
 
     // if peer is foreign, get access hash from db

=== modified file 'qmlplugin/telegramservice.h'
--- qmlplugin/telegramservice.h	2015-03-04 21:24:05 +0000
+++ qmlplugin/telegramservice.h	2015-03-27 11:52:28 +0000
@@ -55,6 +55,11 @@
     qint64 uploadProfilePhoto(const QString &filePath, const QString &caption = "", double geoPointLat = 0, double geoPointLong = 0, double cropLeft = 0, double cropTop = 0, double cropWidth = 0);
     void getUser(qint32 userId);
     qint64 addContact(const QString &firstName, const QString &lastName, const QString &phoneNumber);
+    void getBlockedContacts();
+    void getBlockedContactsAnswer(qint64 id, qint32 sliceCount, QList<ContactBlocked> blocked, QList<User> users);
+    void blockContact(InputPeer peer);
+    void unblockContact(InputPeer peer);
+
     qint64 messagesReadHistory(InputPeer peer, qint32 maxId = 0, qint32 offset = 0, bool readContents = true);
     qint64 deleteChatHistory(InputPeer inputPeer, qint32 offset = 0, bool deleteChat = false);
     qint64 messagesSendMessage(InputPeer peer, const QString &message);
@@ -123,6 +128,9 @@
     void contactThumbnailUpdated(qint32 userId, const QString &thumbnail);
     void contactBigPhotoUpdated(qint32 userId, const QString &bigPhoto);
     void contactStatusUpdated(qint32 userId, bool online, qint32 lastSeenOnline);
+    void usersBlocked(QList<qint32> ids);
+    void userBlocked(qint32 id);
+    void userUnblocked(qint32 id);
     void chatBigPhotoUpdated(qint32 chatId, const QString &bigPhoto);
     void dialogThumbnailUpdated(qint32 dialogId, const QString &thumbnail);
     void dialogTitleUpdated(qint32 dialogId, const QString &title);