Changeset 198:dd9c9917b7cc

Timestamp:

04/24/2008 06:56:35 PM (4 years ago)

Author:

Dmitry Nezhevenko <dion@…>

Branch:

default

Message:

!muc nick: show registration date

Location:

src/plugins/muc

Files:

• jid.cpp (modified) (2 diffs)
• jid.h (modified) (3 diffs)
• mucplugin.cpp (modified) (8 diffs)
• nick.h (modified) (2 diffs)

src/plugins/muc/jid.cpp

@@ -40 +40 @@
 {
         QSqlQuery query=DataStorage::instance()
-                ->prepareQuery("SELECT id FROM conference_jids WHERE conference_id = ? AND jid = ?");
+                ->prepareQuery("SELECT id,created FROM conference_jids WHERE conference_id = ? AND jid = ?");
         qDebug() << myParent->conference()->id() << myJid;
         query.addBindValue(myParent->conference()->id());
@@ -52 +52 @@
         {
                 myId=query.value(0).toInt();
+                myCreated=query.value(1).toDateTime();
         }
         else

src/plugins/muc/jid.h

@@ -3 +3 @@
 
 #include <QString>
+#include <QDateTime>
 
 /**
@@ -18 +19 @@
         QString jid() const { return myJid; };
         void setFullJid(const QString& );
+        QDateTime created() const { return myCreated; };
         void commit();
         void remove();
@@ -27 +29 @@
         QString myJid;
         QString myResource;
+        QDateTime myCreated;
         void loadJid();
 };

src/plugins/muc/mucplugin.cpp

@@ -3 +3 @@
 #include "nicklist.h"
 #include "alist.h"
+#include "jid.h"
 
 #include "base/common.h"
@@ -217 +218 @@
 
                 QString confJid=QString::fromStdString(s->from().full());
-                bot()->roles()->insert(confJid, n->jid().section('/', 0, 0));
+                bot()->roles()->insert(confJid, n->jidStr().section('/', 0, 0));
                 bot()->roles()->update(confJid, RoleList::calc(n->role(), n->affiliation()));
                 /*              if (!confJid.isEmpty())
@@ -344 +345 @@
                 if (!n)
                         return true;
-                reply(
-                                s,
-                                QString("Nick \"%1\": Affiliation: %2; Role: %3; Joined: %4; Idle: %5; Status: %6 (%7)")
-                                .arg(n->nick())
-                                .arg(n->affiliation())
-                                .arg(n->role())
-                                .arg(n->joined().toString(Qt::LocaleDate))
-                                .arg(secsToString(n->lastActivity().secsTo(QDateTime::currentDateTime())))
-                                .arg(n->show())
-                                .arg(n->status()) );
+                Jid* jid=n->jid();
+                
+                QString jidCreated;
+                if (jid)
+                {
+                        jidCreated=jid->created().toString(Qt::LocaleDate);
+                } 
+                else
+                {
+                        jidCreated="unknown";
+                }
+                        
+                QString nickInfo=QString("Nick \"%1\": Affiliation: %2; Role: %3; Registered: %4; Joined: %5; Idle: %6; Status: %7 (%8)")
+                .arg(n->nick())
+                .arg(n->affiliation())
+                .arg(n->role())
+                .arg(jidCreated)
+                .arg(n->joined().toString(Qt::LocaleDate))
+                .arg(secsToString(n->lastActivity().secsTo(QDateTime::currentDateTime())))
+                .arg(n->show())
+                .arg(n->status());
+                reply(s, nickInfo);
                 return true;
         }
@@ -431 +444 @@
                 QString affiliation=affiliationByCommand(cmd);
 
-                setAffiliation(conf, nick->jid(), affiliation, reason);
+                setAffiliation(conf, nick->jidStr(), affiliation, reason);
                 return true;
         }
@@ -622 +635 @@
                 const QString& affiliation, const QString& reason)
 {
-        setAffiliation(getConf(s), n->jid(), affiliation, reason);
+        setAffiliation(getConf(s), n->jidStr(), affiliation, reason);
 }
 
@@ -981 +994 @@
                         qDebug() << args;
                         Nick *n=conf->nicks()->byName(args);
-                        if (n && !n->jid().isEmpty())
-                                arg2=n->jid().section('/', 0, 0);
+                        if (n && !n->jidStr().isEmpty())
+                                arg2=n->jidStr().section('/', 0, 0);
                         else
                         {
@@ -1021 +1034 @@
         int cnt=list->count();
         QString line;
-        QString uJid=nick->jid().toUpper().section('/', 0, 0);
+        QString uJid=nick->jidStr().toUpper().section('/', 0, 0);
         QString uNick=nick->nick().toUpper();
 
@@ -1128 +1141 @@
                 Conference *conf=nick->conference();
                 if (!conf)
-                return QString::null;
-
+                        return QString::null;
                 return QString("%1/%2").arg(conf->name()).arg(nick->nick());
         }

src/plugins/muc/nick.h

@@ -13 +13 @@
     ~Nick();
 
-        QString jid() const { return myJidS; };
+        QString jidStr() const { return myJidS; };
         QString nick() const { return myNick; };
         QString affiliation() const { return myAffiliation; };
@@ -22 +22 @@
         QString status() const { return myStatus; };
         Conference* conference() const { return myParent; };
+        Jid* jid() const { return myJid; };
 
         void setJid(const QString& jid);