Changeset 375:96bb8d64e6ad

Timestamp:

05/18/2009 09:54:18 PM (3 years ago)

Author:

Dmitry Nezhevenko <dion@…>

Branch:

default

Message:

Intiail Nick statistic

Files:

• sql/update/pgsql/00374.sql (added)
• src/plugins/muc/CMakeLists.txt (modified) (2 diffs)
• src/plugins/muc/jid.cpp (modified) (1 diff)
• src/plugins/muc/jid.h (modified) (1 diff)
• src/plugins/muc/jidstat.cpp (added)
• src/plugins/muc/jidstat.h (added)
• src/plugins/muc/mucplugin.cpp (modified) (11 diffs)
• src/plugins/muc/mucplugin.h (modified) (1 diff)
• src/plugins/muc/nick.cpp (modified) (6 diffs)
• src/plugins/muc/nick.h (modified) (3 diffs)

src/plugins/muc/CMakeLists.txt

@@ -12 +12 @@
         conferencelist.h
         jid.h
+        jidstat.h
         nick.h
         nicklist.h
@@ -23 +24 @@
         conferencelist.cpp
         jid.cpp
+        jidstat.cpp
         mucplugin.cpp
         nick.cpp

src/plugins/muc/jid.cpp

@@ -56 +56 @@
 void Jid::loadJid()
 {
+        myId == 0;
         QSqlQuery query=DataStorage::instance()
                 ->prepareQuery("SELECT id,created FROM conference_jids WHERE conference_id = ? AND jid = ?");

src/plugins/muc/jid.h

@@ -23 +23 @@
         void commit();
         void remove();
+        bool isTemporary() const { return myTemporary; }
         static void removeTemporary(Conference *conf=0);
 private:

src/plugins/muc/mucplugin.cpp

@@ -5 +5 @@
 #include "alistitem.h"
 #include "jid.h"
+#include "jidstat.h"
 #include "config/mucconfigurator.h"
 #include "nickasyncrequest.h"
@@ -36 +37 @@
                         << "ATRACE"  << "SEEN" << "CLIENTS" << "SETNICK" << "CHECKVCARD" << "ROLE" << "VERSION";
         commands << "HERE" << "STATUS" << "AGE" << "AGESTAT";
-        
+
         commands << "POKE";
         pluginId=1;
@@ -258 +259 @@
                         n=0;
                 }
-
         }
 
@@ -272 +272 @@
                 conf->nicks()->append(n);
 
+                JidStat *stat = n->jidStat();
+                if (stat)
+                {
+                        // Just presence?
+                        QString show = getPresence(s->presence());
+                        QString status = QString::fromStdString(s->status());
+                        if (!status.isEmpty())
+                                show += QString(" (%1)").arg(status);
+                        stat->setLastAction(JidStat::ActionJoin, show);
+                }
+
                 if (nick==conf->nick())
                 {
@@ -283 +294 @@
                         newNick=true;
         }
+
         if (role=="none" || type=="unavailable")
         {
@@ -308 +320 @@
                 {
                         qDebug() << "!!!!!! Removing nick";
+                        JidStat *stat = n->jidStat();
+                        if (stat)
+                        {
+                                int statusCode = getStatus(s);
+                                if (statusCode == 307 || statusCode == 301)
+                                {
+                                        JidStat::ActionType actType = statusCode == 307
+                                                ? JidStat::ActionKick : JidStat::ActionBan;
+                                        QString reason = getReason(s);
+                                        stat->setLastAction(actType, reason);
+                                }
+                                else
+                                {
+                                        // Just presence?
+                                        QString show = QString::fromStdString(s->status());
+                                        stat->setLastAction(JidStat::ActionLeave, show);
+                                }
+                        }
                         conf->nicks()->remove(n);
                         conf->alistTraceList()->removeAll(QString::fromStdString(s->from().full()));
@@ -315 +345 @@
         else
         {
+                JidStat *stat = n->jidStat();
+                if (stat && !newNick)
+                {
+                        if (n->role() != role)
+                        {
+                                JidStat::ActionType actType = JidStat::ActionNone;
+                                if (role == "moderator")
+                                        actType = JidStat::ActionModerator;
+                                else if (role == "participant")
+                                        actType = JidStat::ActionParticipant;
+                                else if (role == "visitor")
+                                        actType = JidStat::ActionVisitor;
+                                QString reason = getReason(s);
+                                stat->setLastAction(actType, reason);
+                        }
+                        else if (n->affiliation() != getItem(s, "affiliation"))
+                        {
+                                QString aff = getItem(s, "affiliation");
+                                JidStat::ActionType actType = JidStat::ActionNone;
+                                if (aff == "none")
+                                        actType = JidStat::ActionNoAffiliation;
+                                else if (aff == "member")
+                                        actType = JidStat::ActionMember;
+                                else if (aff == "administrator")
+                                        actType = JidStat::ActionAdministrator;
+                                else if (role == "owner")
+                                        actType = JidStat::ActionOwner;
+                                QString reason = getReason(s);
+                                stat->setLastAction(actType, reason);
+                        }
+                        else
+                        {
+                                // Just presence?
+                                QString show = getPresence(s->presence());
+                                QString status = QString::fromStdString(s->status());
+                                if (!status.isEmpty())
+                                        show += QString(" (%1)").arg(status);
+                                stat->setLastAction(JidStat::ActionPresence, show);
+                        }
+                }
+
                 n->setAffiliation(getItem(s, "affiliation"));
                 n->setJid(getItem(s, "jid"));
@@ -499 +570 @@
                 << "тресёт %1 за плечО"
                 << "кОМул МПж в стПрПМу %1";
-                
+
                 srand ( time(NULL) );
                 int r = rand() % replys.count();
                 QString msg = replys[r];
-                
+
                 if( arg.isEmpty() )
                 {
@@ -525 +596 @@
                         return true;
                 }
-                if ( arg.compare(nickName, Qt::CaseInsensitive) == 0 ) 
+                if ( arg.compare(nickName, Qt::CaseInsensitive) == 0 )
                 {
                         reply(s, "ЌазПÑ
@@ -534 +605 @@
                 for (int i=0; i<cnt; i++)
                 {
-                        if( arg.compare( conf->nicks()->at(i)->nick(), Qt::CaseInsensitive ) == 0 ) 
+                        if( arg.compare( conf->nicks()->at(i)->nick(), Qt::CaseInsensitive ) == 0 )
                         {
                                 reply(s, QString("/me " + msg)
@@ -1076 +1147 @@
         }
         return QString::fromStdString(res).toInt();
+}
+
+
+QString MucPlugin::getReason(gloox::Stanza* s)
+{
+        std::string res;
+        if (s->hasChild("x", "xmlns", "http://jabber.org/protocol/muc#user"))
+        {
+                gloox::Tag *tg1=s->findChild("x", "xmlns",
+                                "http://jabber.org/protocol/muc#user");
+                if (!tg1)
+                        return "";
+                if (tg1->hasChild("item"))
+                {
+                        gloox::Tag *tg2=tg1->findChild("item");
+                        if (!tg2)
+                                return "";
+                        tg2 = tg2->findChild("reason");
+                        if (!tg2)
+                                return "";
+                        res = tg2->cdata();
+                }
+        }
+        return QString::fromStdString(res);
 }
 

src/plugins/muc/mucplugin.h

@@ -68 +68 @@
         QString affiliationByCommand(const QString& cmd);
         int getStatus(gloox::Stanza* s);
+        QString getReason(gloox::Stanza *s);
         bool warnImOwner(gloox::Stanza* s);
         int getRoleForNick(Conference* conf, Nick* nick);

src/plugins/muc/nick.cpp

@@ -2 +2 @@
 #include "conference.h"
 #include "jid.h"
+#include "jidstat.h"
 #include "base/datastorage.h"
 
@@ -15 +16 @@
         myValidateRequired=false;
         myParent=parent;
+        myJidStat = NULL;
         myNick=nick;
         myLazyLeave=false;
@@ -23 +25 @@
 
         myJid=new Jid(this, jid);
+
+        if (myJid->id() >= 0 )
+                myJidStat = new JidStat(myJid->id());
 
         QSqlQuery query=DataStorage::instance()
@@ -82 +87 @@
         devoicedNoVCard_=false;
         myParent=parent;
+        myJidStat = NULL;
         myLazyLeave=false;
         myId=id;
@@ -105 +111 @@
         myJid=new Jid(this, query.value(1).toInt());
         myJidS=myJid->jid();
+
+        if (myJid->id() >= 0 )
+                        myJidStat = new JidStat(myJid->id());
+
         myJoined=query.value(2).toDateTime();
         myLastActivity=query.value(3).toDateTime();
@@ -124 +134 @@
                 delete myJid;
         }
+        delete myJidStat;
 }
 

src/plugins/muc/nick.h

@@ -7 +7 @@
 class Conference;
 class Jid;
+class JidStat;
 
-class Nick{
+class Nick
+{
 public:
     Nick(Conference* parent, const QString& nick, const QString& jid=QString::null);
@@ -24 +26 @@
         Conference* conference() const { return myParent; };
         Jid* jid() const { return myJid; };
+        JidStat *jidStat() const { return myJidStat; }
         bool validateRequired() const { return myValidateRequired; };
         bool isVersionStored() const { return versionStored_; }
@@ -57 +60 @@
         Conference *myParent;
         Jid *myJid;
+        JidStat *myJidStat;
         QString myJidS;
         QString myNick;