Changeset 284:02a62328b524

Timestamp:

06/20/2008 08:44:31 PM (4 years ago)

Author:

Dmitry Nezhevenko <dion@…>

Branch:

default

Message:

Automatic version request on join

Files:

• sql/config.sql (modified) (1 diff)
• src/base/gluxibot.cpp (modified) (1 diff)
• src/plugins/muc/config/mucconfigurator.cpp (modified) (1 diff)
• src/plugins/muc/config/mucconfigurator.h (modified) (2 diffs)
• src/plugins/muc/mucplugin.cpp (modified) (8 diffs)
• src/plugins/muc/mucplugin.h (modified) (1 diff)
• src/plugins/muc/nick.h (modified) (3 diffs)

sql/config.sql

@@ -1 @@
-insert into configuration_fields (plugin, name, field_type, description, default_value) VALUES (1, 'alists_every_presence', 2, 'Apply ALists to every presence', true);
-insert into configuration_fields (plugin, name, field_type, description, default_value) VALUES (1, 'alists_members', 2, 'Apply ALists to members', false);
-insert into configuration_fields (plugin, name, priority, field_type, description, default_value) values (1, 'devoice_no_vcard', 1, 2, 'Devoice participants without VCard', 'false');
+insert into configuration_fields (plugin, name, field_type, description, default_value) VALUES (1, 'alists_every_presence', 2, 'Apply ALists to every presence', '1');
+insert into configuration_fields (plugin, name, field_type, description, default_value) VALUES (1, 'alists_members', 2, 'Apply ALists to members', '0');
+insert into configuration_fields (plugin, name, priority, field_type, description, default_value) values (1, 'devoice_no_vcard', 1, 2, 'Devoice participants without VCard', '0');
 insert into configuration_fields (plugin, name, priority, field_type, description, default_value) values (1, 'devoice_no_vcard_reason', 2, 1, 'No VCard devoice reason', 'Please fill your VCard and then say me !muc checkvcard');
+insert into configuration_fields (plugin, name, priority, field_type, description, default_value) values (1, 'query_version_on_join', 3, 2, 'Query version on join', '0');

src/base/gluxibot.cpp

@@ -193 +193 @@
         if (plugin)
         {
-                plugin->onIq(s);
-                return;
+                if (plugin->onIq(s))
+                        return;
         }
 

src/plugins/muc/config/mucconfigurator.cpp

@@ -50 +50 @@
                 if (field.name()=="devoice_no_vcard_reason")
                         devoiceNoVCardReason_=field.value();
+                if (field.name()=="query_version_on_join")
+                        queryVersionOnJoin_=field.boolValue();
         }
 }

src/plugins/muc/config/mucconfigurator.h

@@ -34 +34 @@
         bool isDevoiceNoVCard() const { return devoiceNoVCard_; }
         QString devoiceNoVCardReason() const { return devoiceNoVCardReason_; }
+        bool isQueryVersionOnJoin() const { return queryVersionOnJoin_; }
 private:
         bool applyAlistsToMembers_;
@@ -39 +40 @@
         bool devoiceNoVCard_;
         QString devoiceNoVCardReason_;
+        bool queryVersionOnJoin_;
         void parse();
         

src/plugins/muc/mucplugin.cpp

@@ -33 +33 @@
                         << "BANJID" << "UNBAN" << "NONE" << "MEMBER" << "ADMIN" << "OWNER";
         commands << "ABAN" << "AKICK" << "AVISITOR" << "ACMD" << "AMODERATOR" << "AFIND"
-                        << "SEEN" << "CLIENTS" << "SETNICK" << "CHECKVCARD";
+                        << "SEEN" << "CLIENTS" << "SETNICK" << "CHECKVCARD" << "ROLE" << "VERSION";
         commands << "HERE";
         pluginId=1;
@@ -253 +253 @@
 
                 }               
+        }
+        else
+        {
+                if (n->validateRequired())
+                        newNick=true;
         }
         if (role=="none" || type=="unavailable")
@@ -306 +311 @@
                         checkMember(s, conf, n);
                 
-                if (newNick && conf->configurator()->isDevoiceNoVCard())
-                        requestVCard(s, conf, n);
+                if (newNick)
+                {
+                        if (conf->configurator()->isDevoiceNoVCard())
+                                requestVCard(s, conf, n);
+                        if (conf->configurator()->isQueryVersionOnJoin())
+                        {
+                                requestVersion(s, conf, n);
+                        }
+                }
         }
 }
@@ -461 +473 @@
                 QString
                                 nickInfo=
-                                                QString("Nick \"%1\": Affiliation: %2; Role: %3; Registered: %4; Joined: %5; Idle: %6; Status: %7 (%8)")
+                                                QString("Nick \"%1\": Affiliation: %2; Role: %3; Registered: %4; Joined: %5; Idle: %6; Role: %7; Status: %8 (%9)")
                                                 .arg(n->nick())
                                                 .arg(n->affiliation())
@@ -468 +480 @@
                                                 .arg(n->joined().toString(Qt::LocaleDate))
                                                 .arg(secsToString(n->lastActivity().secsTo(QDateTime::currentDateTime())))
+                                                .arg(getRoleForNick(conf, n))
                                                 .arg(n->show())
                                                 .arg(n->status());
@@ -483 +496 @@
         }
 
+        if (cmd=="ROLE")
+        {
+                Nick *n=getNickVerbose(s, arg);
+                if (!n)
+                        return true;
+                reply(s,QString("Role for \"%1\" is %2").arg(n->nick()).arg(getRoleForNick(conf, n)));
+                return true;
+        }
+        
+        if (cmd=="VERSION")
+        {
+                Nick *n=getNickVerbose(s, arg);
+                if (!n)
+                        return true;
+                QString res=n->versionName();
+                if (!n->versionClient().isEmpty())
+                        res+=QString(" %1").arg(n->versionClient());
+                if (!n->versionOs().isEmpty())
+                        res+=QString(" // %1").arg(n->versionOs());
+                if (res.isEmpty())
+                        reply(s, QString("No version stored for \"%1\"").arg(n->nick()));
+                else
+                        reply(s, QString("%1 uses %2").arg(n->nick()).arg(res));
+                return true;
+        }
+        
         if (cmd=="CHECKVCARD")
         {
@@ -914 +953 @@
         if (!conf)
                 return false;
-        QString reason=getIqError(s);
-
+        Nick *nick=getNick(s);
+        if (!nick)
+                return false;
+
+        AsyncRequest* req=bot()->asyncRequests()->byStanza(s);
+        if (!req)
+                return false;
+
+        QString xmlns=QString::fromStdString(s->xmlns());
+        if (s->subtype()!=gloox::StanzaIqResult || xmlns!="jabber:iq:version")
+        return false;
+
+        gloox::Tag* query=s->findChild("query", "xmlns", xmlns.toStdString());
+        nick->setVersionName(QString::null);
+        nick->setVersionClient(QString::null);
+        nick->setVersionOs(QString::null);
+        if (query)
+        { 
+                gloox::Tag* t;
+                t=query->findChild("name");
+                if (t)
+                        nick->setVersionName(QString::fromStdString(t->cdata()));
+                t=query->findChild("version");
+                if (t)
+                        nick->setVersionClient(QString::fromStdString(t->cdata()));
+                t=query->findChild("os");
+                if (t)
+                        nick->setVersionOs(QString::fromStdString(t->cdata()));
+        }
+        delete req;
+        bot()->asyncRequests()->removeAll(req);
         return true;
 }
@@ -1585 +1653 @@
         bot()->client()->send(outgoing);
 }
+
+void MucPlugin::requestVersion(gloox::Stanza* s, Conference* conf, Nick* nick)
+{
+        QString jid=conf->name()+"/"+nick->nick();
+        std::string id=bot()->client()->getID();
+
+        gloox::Stanza *st=gloox::Stanza::createIqStanza(
+                        gloox::JID(jid.toStdString()), id, gloox::StanzaIqGet,
+                        "jabber:iq:version");
+
+        gloox::Stanza *sf=new gloox::Stanza(s);
+        sf->addAttribute("id", id);
+
+        AsyncRequest *req=new AsyncRequest(-1, this, sf, 3600);
+        req->setName("muc::version");
+        bot()->asyncRequests()->append(req);
+        bot()->client()->send(st);
+        return;
+}
+
+int MucPlugin::getRoleForNick(Conference* conf, Nick* nick)
+{
+        if (!conf || !nick)
+                return 0;
+        QString jid1=nick->jidStr();
+        QString jid2=conf->name()+"/"+nick->nick();
+        int role1=bot()->roles()->get(jid1);
+        int role2=bot()->roles()->get(jid2);
+        return (role1>role2) ? role1: role2;
+}

src/plugins/muc/mucplugin.h

@@ -64 +64 @@
         int getStatus(gloox::Stanza* s);
         bool warnImOwner(gloox::Stanza* s);
+        int getRoleForNick(Conference* conf, Nick* nick);
         QString expandMacro(gloox::Stanza* s, Conference*c, Nick* n, const QString& str, const AListItem* item=0);
         void requestVCard(gloox::Stanza* s, Conference* conf, Nick* nick);
+        void requestVersion(gloox::Stanza* s, Conference* conf, Nick* nick);
 private slots:
         void sltAutoLeaveTimerTimeout();

src/plugins/muc/nick.h

@@ -25 +25 @@
         Jid* jid() const { return myJid; };
         bool validateRequired() const { return myValidateRequired; };
+        QString versionName() const { return versionName_; }
+        QString versionOs() const { return versionOs_; }
+        QString versionClient() const { return versionClient_; }
 
         QStringList similarNicks();
@@ -40 +43 @@
         static void setAllOffline (Conference* conf);
         bool isDevoicedNoVCard() const {return devoicedNoVCard_; }
-        void setDevoicedNoVCard(bool v) { devoicedNoVCard_ = v; } 
+        void setDevoicedNoVCard(bool v) { devoicedNoVCard_ = v; }
+        void setVersionName(const QString& name) { versionName_=name; };
+        void setVersionOs(const QString& os) { versionOs_=os; };
+        void setVersionClient(const QString& client) { versionClient_=client; };
+        
 private:
         int myId;
@@ -56 +63 @@
         QString myStatus;
         bool devoicedNoVCard_;
+        QString versionName_;
+        QString versionOs_;
+        QString versionClient_;
 };