Changeset 414:873cd91b02be

Timestamp:

06/21/2010 01:08:00 PM (20 months ago)

Author:

Sidgyck <sidgyck@…>

Branch:

default

Children:

415:c17256e1dc79, 418:db5fa97c4e4c

Message:

[NEW]: !muc seenjid[ex] <jid>

Location:

src/plugins/muc

Files:

• conference.cpp (modified) (3 diffs)
• conference.h (modified) (1 diff)
• mucplugin.cpp (modified) (2 diffs)
• nicklist.cpp (modified) (3 diffs)
• nicklist.h (modified) (2 diffs)

src/plugins/muc/conference.cpp

@@ -158 +158 @@
 }
 
-QString Conference::seen(const QString&n, bool ext)
-{
-        Nick* nick=myNicks.byName(n);
-//      int cnt=0;
+QString Conference::seen(const QString& n, bool ext, bool byjid)
+{
+        Nick *nick = (byjid) ? myNicks.byJid(n): myNicks.byName(n);
         if (nick)
         {
-                return QString("\"%1\" is already in room (Joined %2 ago)").arg(n)
+                return QString("\"%1\" is already in room (Joined %2 ago)").arg(nick->nick())
                         .arg(secsToString(nick->joined().secsTo(QDateTime::currentDateTime())));
         }
-        QSqlQuery query=DataStorage::instance()
-                ->prepareQuery("SELECT jid FROM conference_nicks WHERE conference_id=? AND nick=? ORDER BY lastaction DESC LIMIT 1");
-        query.addBindValue(myId);
-        query.addBindValue(n);
+
+        QSqlQuery query;
+        if (byjid)
+        {
+                query=DataStorage::instance()
+                        ->prepareQuery("SELECT id from conference_jids WHERE conference_id=? AND jid=?");
+                query.addBindValue(myId);
+                query.addBindValue(n);
+        }
+        else
+        {
+                query=DataStorage::instance()
+                        ->prepareQuery("SELECT jid FROM conference_nicks WHERE conference_id=? AND nick=? ORDER BY lastaction DESC LIMIT 1");
+                query.addBindValue(myId);
+                query.addBindValue(n);
+        }
+
         if (query.exec() && query.next())
         {
@@ -224 +236 @@
                         }
                         QString reply;
-                        if (newNick == n)
+                        if (!byjid && newNick == n)
                                 reply = QString("%1 %2 %3 ago").arg(n, token, secs);
                         else
@@ -230 +242 @@
                         if (!reason.isEmpty())
                                 reply += QString(" (%1)").arg(reason);
-                        if (!version.isEmpty())
+                        if (!version.isEmpty() && ext)
                                 reply += QString(", Client: %1").arg(version);
                         return reply;

src/plugins/muc/conference.h

@@ -41 +41 @@
         AList* acommand() { return myCommand; };
         QStringList* alistTraceList() { return alistTraceList_; }
-
-        QString seen(const QString& nick, bool ext = false);
+        
+        QString seen(const QString& nick, bool ext = false, bool byjid = false);
         QString clientStat();
         void setNick(const QString& name);

src/plugins/muc/mucplugin.cpp

@@ -34 +34 @@
 {
         commands << "WHEREAMI" << "NICK" << "IDLE" << "KNOWN" << "JOIN" << "LEAVE"
-                        << "KICK" << "VISITOR" << "PARTICIPANT" << "MODERATOR" << "BAN"
-                        << "BANJID" << "UNBAN" << "NONE" << "MEMBER" << "ADMIN" << "OWNER";
+                 << "KICK" << "VISITOR" << "PARTICIPANT" << "MODERATOR" << "BAN"
+                 << "BANJID" << "UNBAN" << "NONE" << "MEMBER" << "ADMIN" << "OWNER";
         commands << "ABAN" << "AKICK" << "AVISITOR" << "ACMD" << "AMODERATOR" << "APARTICIPANT" << "AFIND"
-                        << "ATRACE"  << "SEEN" << "SEENEX" << "CLIENTS" << "SETNICK" << "CHECKVCARD" << "ROLE" << "VERSION";
+                 << "ATRACE"  << "SEEN" << "SEENEX" << "SEENJID" << "CLIENTS" << "SETNICK" << "CHECKVCARD" << "ROLE" << "VERSION";
         commands << "HERE" << "STATUS" << "AGE" << "AGESTAT";
 
@@ -880 +880 @@
         }
 
-        if (cmd=="SEEN" || cmd=="SEENEX")
-        {
-          if( arg.isEmpty() ) {
-            Nick *n = getNick(s);
-            if(!n) return true;
-            reply(s, conf->seen(n->nick(), "SEENEX" == cmd));
-            return true;
-          }
-                reply(s, conf->seen(arg, "SEENEX" == cmd));
+        if (cmd=="SEEN" || cmd=="SEENEX" || cmd=="SEENJID" || cmd=="SEENJIDEX")
+        {
+                if (arg.isEmpty())
+                {
+                        if (cmd.startsWith("SEENJID"))
+                        {
+                                reply(s, "!muc seenjid[ex] <jid>");
+                                return true;
+                        }
+                        Nick *n = getNick(s);
+                        if (!n)
+                                return true;
+                        reply(s, conf->seen(n->nick(), cmd.endsWith("EX"), false));
+                        return true;
+                }
+                reply(s, conf->seen(arg, cmd.endsWith("EX"), cmd.startsWith("SEENJID")));
                 return true;
         }

src/plugins/muc/nicklist.cpp

@@ -11 +11 @@
 //
 #include "nicklist.h"
-
 #include <QtDebug>
 
@@ -17 +16 @@
 {
 }
-
 
 NickList::~NickList()
@@ -58 +56 @@
 }
 
+Nick* NickList::byJid(const QString& j) const
+{
+        int cnt=count();
+        Jid* jid;
+        for (int i = 0; i < cnt; i++)
+        {
+          jid = value(i)->jid();
+          if (j.toLower() == jid->jid().toLower())
+                return value(i);
+        }
+        return 0;
+}
+
 void NickList::remove(Nick* nick)
 {

src/plugins/muc/nicklist.h

@@ -3 +3 @@
 
 #include "nick.h"
-
+#include "jid.h"
 #include <QList>
-
 /**
         @author Dmitry Nezhevenko <dion@inhex.net>
 */
+class Jid;
+
 class NickList: public QList<Nick*>
 {
@@ -19 +20 @@
         void remove(Nick* nick);
         Nick *byName(const QString&) const;
+        Nick *byJid(const QString&) const;
 };