Merge lp:~libqtelegram-team/telegram-app/dev-remove-only-some-members into lp:telegram-app/dev

[Michał Karnicki]

Test with UI proposed here:
https://code.launchpad.net/~libqtelegram-team/libqtelegram/app-dev-remove-only-some-members/+merge/244589

Added isRemovable role in group members profile.

[Roberto Mier Escandon (rmescandon)]

inline

review: Needs Fixing

[lp:~libqtelegram-team/telegram-app/dev-remove-only-some-members]

135. By Michał Karnicki on 2014-12-12

Review fixes.

[Roberto Mier Escandon (rmescandon)]

Test1:
- Create a group with 3 people (including the user of our app) from another account (our user is not admin or inviter)
Expected:
- I cannot kick anybody but myself
Result:
- I cannot even leave the chat. I'm catched in the chat forever!!! ;)
----------------------------------------------------------------------
Test2:
- Pressing on participant picture into group chat profile
Expected:
- Shown that user profile
Result:
- Opened dialog 1-1 with that user

review: Needs Fixing

[lp:~libqtelegram-team/telegram-app/dev-remove-only-some-members]

136. By Roberto Mier Escandon on 2014-12-12

modified groupsmembers model to include app user in the authorized users to be removed from a chat

[Roberto Mier Escandon (rmescandon)]

Fixed the Test1 issue.
Included copyright headers in groupmembersmodel files

[Michał Karnicki (karni)]

review: Approve

=== modified file 'lib/core/eventtimer.cpp'
--- lib/core/eventtimer.cpp	2014-12-09 18:32:04 +0000
+++ lib/core/eventtimer.cpp	2014-12-12 15:35:59 +0000
@@ -15,7 +15,6 @@
  */
 
 #include "eventtimer.h"
-#include <QDebug> //remove when not needed
 
 EventTimer::EventTimer(qint64 msgId, qint32 timeout, QObject *parent) :
     QTimer(parent), mMsgId(msgId) {

=== modified file 'qmlplugin/data.cpp'
--- qmlplugin/data.cpp	2014-12-12 08:44:51 +0000
+++ qmlplugin/data.cpp	2014-12-12 15:35:59 +0000
@@ -3920,7 +3920,7 @@
         query.bindValue(":isAdmin", chatParticipants.adminId() == member.userId());
         query.bindValue(":version", chatParticipants.version());
         if (!query.exec()) {
-            throw "Error updating chat participants (on removal)";
+            throw "Error updating chat participants (on insert)";
         }
     }
 }

=== modified file 'qmlplugin/models/groupmembersmodel.cpp'
--- qmlplugin/models/groupmembersmodel.cpp	2014-11-14 12:47:25 +0000
+++ qmlplugin/models/groupmembersmodel.cpp	2014-12-12 15:35:59 +0000
@@ -1,33 +1,68 @@
+/*
+ * 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/>.
+ */
+
 #include "models/groupmembersmodel.h"
 #include "types/tluser.h"
 #include "types/tlinputpeer.h"
-#include <QDebug>
+
 GroupMembersModel::GroupMembersModel(QObject *parent) :
-    Model(parent) {
-}
-
-QHash<int, QByteArray> GroupMembersModel::roleNames() const {
-    QHash<int, QByteArray> roles;
-    roles[IdRole] = "id";
-    roles[NameRole] = "name";
-    roles[PhotoRole] = "photo";
-    roles[LastSeenOnlineRole] = "lastSeenOnline";
-    roles[OnlineRole] = "online";
-    roles[IsAdminRole] = "isAdmin";
-    roles[PeerTypeRole] = "peerType";
-    return roles;
-}
-
-void GroupMembersModel::setup(qint32 chatId) {
+    Model(parent), mTelegramClient(NULL), mChatId(0) {
+}
+
+GroupMembersModel::~GroupMembersModel() {
+    mTelegramClient = NULL;
+}
+
+void GroupMembersModel::setup(TelegramClient *telegramClient, qint32 chatId) {
+    Q_ASSERT(telegramClient != NULL);
+
+    if (mTelegramClient == NULL) {
+        mTelegramClient = telegramClient;
+        connect(mTelegramClient, SIGNAL(chatUpdated(qint32)),
+                           this, SLOT(refresh(qint32)));
+    }
+    mChatId = chatId;
+    refresh(mChatId);
+}
+
+void GroupMembersModel::refresh(qint32 chatId) {
+    if (mChatId != chatId || mTelegramClient == NULL) return;
+    /*
+     * Member is removalbe from chat if one of the conditions is met:
+     *  - we are the chat admin
+     *  - we have invited that member
+     */
     mQueryString = QString("SELECT id, "
                            "    (firstName || \" \" || lastName) AS name, "
                            "    (SELECT localPath FROM fileLocations WHERE rowid=thumbnail) AS photo, "
                            "    lastSeenOnline, online, isAdmin, "
+          /* admin */      "    (SELECT CASE WHEN EXISTS"
+                           "        (SELECT isAdmin FROM participants "
+                           "         WHERE participants.chatId = %1 "
+                           "           AND participants.userId = %2 "
+                           "           AND participants.isAdmin = 1) "
+          /* or inviter */ "     THEN 1 ELSE 0 END) OR inviterId = %2 "
+          /* or me */      "    OR userId = %2 AS isRemovable, "
                            "    (SELECT type FROM users WHERE users.id=participants.userId) AS peerType "
                            "FROM users, participants "
                            "WHERE participants.chatId = %1 AND users.id=participants.userId "
-                           "ORDER BY online DESC, lastSeenOnline DESC").arg(chatId);
-    refresh();
+                           "ORDER BY online DESC, lastSeenOnline DESC")
+            .arg(chatId)
+            .arg(mTelegramClient->ourId());
+    Model::refresh();
 }
 
 qint32 GroupMembersModel::getInputPeerType(qint32 peerType) {
@@ -48,3 +83,16 @@
     }
     return InputPeer::typeInputPeerEmpty;
 }
+
+QHash<int, QByteArray> GroupMembersModel::roleNames() const {
+    QHash<int, QByteArray> roles;
+    roles[IdRole] = "id";
+    roles[NameRole] = "name";
+    roles[PhotoRole] = "photo";
+    roles[LastSeenOnlineRole] = "lastSeenOnline";
+    roles[OnlineRole] = "online";
+    roles[IsAdminRole] = "isAdmin";
+    roles[IsRemovableRole] = "isRemovable";
+    roles[PeerTypeRole] = "peerType";
+    return roles;
+}

=== modified file 'qmlplugin/models/groupmembersmodel.h'
--- qmlplugin/models/groupmembersmodel.h	2014-11-14 12:47:25 +0000
+++ qmlplugin/models/groupmembersmodel.h	2014-12-12 15:35:59 +0000
@@ -1,8 +1,26 @@
+/*
+ * 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 GROUP_MEMBERS_MODEL_H
 #define GROUP_MEMBERS_MODEL_H
 
+#include <QLoggingCategory>
+
 #include "model.h"
-#include <QLoggingCategory>
+#include "telegramclient.h"
 
 class GroupMembersModel : public Model
 {
@@ -17,15 +35,23 @@
         LastSeenOnlineRole,
         OnlineRole,
         IsAdminRole,
+        IsRemovableRole,
         PeerTypeRole
     };
 
     explicit GroupMembersModel(QObject *parent = 0);
+    ~GroupMembersModel();
 
-    Q_INVOKABLE void setup(qint32 chatId);
+    Q_INVOKABLE void setup(TelegramClient *telegramClient, qint32 chatId);
     Q_INVOKABLE qint32 getInputPeerType(qint32 userType);
 
+public Q_SLOTS:
+    void refresh(qint32 chatId);
+
 private:
+    TelegramClient *mTelegramClient;
+    qint32 mChatId;
+
     QHash<qint32, QByteArray> roleNames() const;
 };
 

=== modified file 'qmlplugin/models/groupmodel.cpp'
--- qmlplugin/models/groupmodel.cpp	2014-12-12 09:32:27 +0000
+++ qmlplugin/models/groupmodel.cpp	2014-12-12 15:35:59 +0000
@@ -24,7 +24,7 @@
     mTelegramClient = 0;
 }
 
-void GroupModel::setTelegramClient(TelegramClient *telegramClient) {
+void GroupModel::setup(TelegramClient *telegramClient, qint32 chatId) {
     Q_ASSERT(telegramClient != NULL);
 
     if (mTelegramClient == NULL) {
@@ -39,6 +39,10 @@
         connect(mTelegramClient, SIGNAL(dialogsMuted(NotifyPeer::NotifyPeerType,bool)),
                 this, SLOT(chatsMuted(NotifyPeer::NotifyPeerType,bool)));
     }
+
+    if (mTelegramClient != NULL) {
+        setChatId(chatId);
+    }
 }
 
 qint32 GroupModel::getChatId() const {
@@ -106,7 +110,6 @@
     setMuted(false);
 }
 
-// Currently used by GroupMembersModel to requery.
 void GroupModel::refreshGroupDetails(qint32 chatId) {
     if (mChatId != chatId) return;
     qCDebug(TG_PLUGIN_LOGIC) << "Refreshing group chat profile model for chat:" << chatId;

=== modified file 'qmlplugin/models/groupmodel.h'
--- qmlplugin/models/groupmodel.h	2014-12-04 17:03:45 +0000
+++ qmlplugin/models/groupmodel.h	2014-12-12 15:35:59 +0000
@@ -19,7 +19,6 @@
 
 #include <QObject>
 #include <QString>
-#include <QSqlQueryModel>
 
 #include "telegramclient.h"
 #include "dbmanager.h"
@@ -38,11 +37,11 @@
     explicit GroupModel(QObject *parent = 0);
     ~GroupModel();
 
-    Q_INVOKABLE void setTelegramClient(TelegramClient *telegramClient);
+    Q_INVOKABLE void setup(TelegramClient *telegramClient, qint32 chatId);
     void resetGroupDetails();
 
-    Q_INVOKABLE qint32 getChatId() const;
-    Q_INVOKABLE void setChatId(const qint32 chatId);
+    void setChatId(qint32 chatId);
+    qint32 getChatId() const;
     QString getTitle() const;
     QString getPhoto() const;
     qint32 getCount() const;