Changeset 286:f89643c5ff59

Timestamp:

06/22/2008 06:53:57 PM (4 years ago)

Author:

Dmitry Nezhevenko <dion@…>

Branch:

default

Message:

ALists: version matchers

Location:

src/plugins/muc

Files:

• alistitem.cpp (modified) (1 diff)
• alistitem.h (modified) (2 diffs)
• mucplugin.cpp (modified) (16 diffs)
• mucplugin.h (modified) (2 diffs)
• nick.cpp (modified) (2 diffs)
• nick.h (modified) (3 diffs)

src/plugins/muc/alistitem.cpp

@@ -64 +64 @@
         {
         case AListItem::MatcherUnknown:
-                flags+="?";
+                flags+="? ";
                 break;
         case AListItem::MatcherNick:
-                flags+="N";
+                flags+="N ";
                 break;
         case AListItem::MatcherJid:
-                flags+="J";
+                flags+="J ";
                 break;
         case AListItem::MatcherBody:
-                flags+="B";
+                flags+="B ";
                 break;
         case AListItem::MatcherResource:
-                flags+="R";
+                flags+="R ";
+                break;
+        case AListItem::MatcherVersion:
+                flags+="V ";
+                break;
+        case AListItem::MatcherVersionName:
+                flags+="Vn";
+                break;
+        case AListItem::MatcherVersionClient:
+                flags+="Vn";
+                break;
+        case AListItem::MatcherVersionOs:
+                flags+="Vo";
                 break;
         };

src/plugins/muc/alistitem.h

@@ -29 +29 @@
         enum MatcherType
         {
+                MatcherAll=-1,
                 MatcherUnknown=0,
                 MatcherNick=1,
                 MatcherJid=2,
                 MatcherBody=3,
-                MatcherResource=4
+                MatcherResource=4,
+                MatcherVersion=5,
+                MatcherVersionName=6,
+                MatcherVersionClient=7,
+                MatcherVersionOs=8
         };
         
@@ -41 +46 @@
                 TestExact=1,
                 TestRegExp=2,
-                TestSubstring=3         
+                TestSubstring=3
         };
         

src/plugins/muc/mucplugin.cpp

@@ -993 +993 @@
         delete req;
         bot()->asyncRequests()->removeAll(req);
+        nick->setVersionStored(true);
+        checkMember(0L, conf, nick, AListItem::MatcherVersion);
         return true;
 }
@@ -1033 +1035 @@
 
                 AListItem* item=0;
-                if (item=aFind(conf->aban(), n, 0L))
+                if (item=aFind(conf->aban(), n, 0L, AListItem::MatcherAll))
                         answer+=QString("\"%1\" is in aban list: %2\n").arg(arg2.toLower()).arg(item->toString());
-                if (item=aFind(conf->akick(), n, 0L))
+                if (item=aFind(conf->akick(), n, 0L, AListItem::MatcherAll))
                         answer+=QString("\"%1\" is in akick list: %2\n").arg(arg2.toLower()).arg(item->toString());
-                if (item=aFind(conf->avisitor(), n, 0L))
+                if (item=aFind(conf->avisitor(), n, 0L, AListItem::MatcherAll))
                         answer+=QString("\"%1\" is in avisitor list: %2\n").arg(arg2.toLower()).arg(item->toString());
-                if (item=aFind(conf->amoderator(), n, 0L))
+                if (item=aFind(conf->amoderator(), n, 0L, AListItem::MatcherAll))
                         answer+=QString("\"%1\" is in amoderator list: %2\n").arg(arg2.toLower()).arg(item->toString());
-                if (item=aFind(conf->acommand(), n, 0L))
+                if (item=aFind(conf->acommand(), n, 0L, AListItem::MatcherAll))
                         answer+=QString("\"%1\" is in acmd list: %2\n").arg(arg2.toLower()).arg(item->toString());
                 if (answer.endsWith("\n"))
@@ -1167 +1169 @@
         qDebug() << "1: " << arg2;
         
-        if (arg2=="NICK" || arg2=="BODY" || arg2=="RES")
+        if (arg2=="NICK" || arg2=="BODY" || arg2=="RES" 
+                || arg2=="VERSION" || arg2=="VERSION.NAME" 
+                || arg2=="VERSION.CLIENT" || arg2=="VERSION.OS")
         {
                 if (arg2=="NICK")
@@ -1175 +1179 @@
                 else if (arg2=="RES")
                         item.setMatcherType(AListItem::MatcherResource);
+                else if (arg2=="VERSION")
+                        item.setMatcherType(AListItem::MatcherVersion);
+                else if (arg2=="VERSION.NAME")
+                        item.setMatcherType(AListItem::MatcherVersionName);
+                else if (arg2=="VERSION.CLIENT")
+                        item.setMatcherType(AListItem::MatcherVersionClient);
+                else if (arg2=="VERSION.OS")
+                        item.setMatcherType(AListItem::MatcherVersionOs);
 
                 arg2=parser.nextToken().toUpper();
@@ -1275 +1287 @@
 
 // Stanza can be null here
-AListItem* MucPlugin::aFind(AList* list, Nick* nick, gloox::Stanza* s)
+AListItem* MucPlugin::aFind(AList* list, Nick* nick, gloox::Stanza* s, AListItem::MatcherType matcher)
 {
         int cnt=list->count();
@@ -1285 +1297 @@
         if (s)
                 lBody=QString::fromStdString(s->body()).toLower();
+        QString version;
+        if (nick->isVersionStored())
+                version=nick->versionName()+" "+nick->versionClient()+" // "+nick->versionOs();
         
         bool isPresence=!s || (s->type()==gloox::StanzaPresence);
@@ -1291 +1306 @@
         {
                 AListItem* item=list->at(i);
+                
+                if (matcher!=AListItem::MatcherUnknown && matcher!=AListItem::MatcherAll && 
+                                !item->matcherType()!=matcher)
+                {
+                        if (matcher=AListItem::MatcherVersion)
+                        {
+                                if (!(item->matcherType()==AListItem::MatcherVersionName
+                                                                || item->matcherType()==AListItem::MatcherVersionClient
+                                                                || item->matcherType()==AListItem::MatcherVersionOs))
+                                        continue;
+                        }
+                        else
+                                continue;
+                }
         
                 QString testValue;
@@ -1297 +1326 @@
                         continue;
                 
+                if (item->matcherType() == AListItem::MatcherVersion 
+                        || item->matcherType()==AListItem::MatcherVersionName
+                        || item->matcherType()==AListItem::MatcherVersionClient
+                        || item->matcherType()==AListItem::MatcherVersionOs)
+                {
+                        if (matcher!=AListItem::MatcherVersion && matcher!=AListItem::MatcherAll)
+                                continue;
+                        if (!nick || !nick->isVersionStored())
+                                continue;
+                }
+                
                 switch (item->matcherType())
                 {
@@ -1304 +1344 @@
                         case AListItem::MatcherResource: testValue=lResource; break;
                         case AListItem::MatcherBody: testValue=lBody; break;
-                }
+                        case AListItem::MatcherVersion: testValue=version; break;
+                        case AListItem::MatcherVersionName: testValue=nick->versionName(); break;
+                        case AListItem::MatcherVersionClient: testValue=nick->versionClient(); break;
+                        case AListItem::MatcherVersionOs: testValue=nick->versionOs(); break;
+                        default: continue;
+                }
+                
                 if (testValue.isEmpty())
                         continue;
@@ -1328 +1374 @@
                         case AListItem::TestSubstring:
                         {
-                                if (item->isInvert() ^ (testValue.indexOf(item->value())>=0))
+                                if (item->isInvert() ^ (testValue.toLower().indexOf(item->value().toLower())>=0))
                                         return item;
                                 break;
@@ -1337 +1383 @@
 }
 
-void MucPlugin::checkMember(gloox::Stanza* s, Conference*c, Nick* n)
+void MucPlugin::checkMember(gloox::Stanza* s, Conference*c, Nick* n, AListItem::MatcherType matcher)
 {
         if (!n || !c)
@@ -1354 +1400 @@
         if (((aff!="OWNER") && !aff.startsWith("ADMIN") && aff!="MEMBER")|| c->configurator()->isApplyAlistsToMembers())
         {
-                if (item=aFind(c->aban(), n, s))
+                if (item=aFind(c->aban(), n, s, matcher))
                 {
                         if (s && warnImOwner(s))
@@ -1365 +1411 @@
                 }
 
-                if (item=aFind(c->akick(), n, s))
+                if (item=aFind(c->akick(), n, s, matcher))
                 {
                         QString reason=item->reason();
@@ -1373 +1419 @@
                         return;
                 }
-                if (item=aFind(c->avisitor(), n, s))
+                if (item=aFind(c->avisitor(), n, s, matcher))
                 {
                         QString reason=item->reason();
@@ -1382 +1428 @@
                 }
         }
-        if (item=aFind(c->amoderator(), n, s))
+        if (item=aFind(c->amoderator(), n, s, matcher))
         {
                 QString reason=item->reason();
@@ -1391 +1437 @@
         }
         
-        if (item=aFind(c->acommand(), n, s))
+        if (item=aFind(c->acommand(), n, s, matcher))
         {
                 QString action=item->reason();

src/plugins/muc/mucplugin.h

@@ -4 +4 @@
 #include "base/baseplugin.h"
 #include "conferencelist.h"
+#include "alistitem.h"
 
 class MessageParser;
@@ -54 +55 @@
         void setAffiliation(Conference* conf, const QString& jid, const QString& affiliation, const QString& reason=QString::null);
         QString getIqError(gloox::Stanza* s);
-        AListItem* aFind(AList* list, Nick *n, gloox::Stanza* s);
+        AListItem* aFind(AList* list, Nick *n, gloox::Stanza* s, AListItem::MatcherType matcher=AListItem::MatcherUnknown);
         // Advanced commands
         bool autoLists(gloox::Stanza* s, MessageParser& parser);
-        void checkMember(gloox::Stanza* s, Conference* c, Nick*);
+        void checkMember(gloox::Stanza* s, Conference* c, Nick*, AListItem::MatcherType matcher=AListItem::MatcherUnknown);
         void recheckJIDs(Conference* c);
         void sendMessage(Conference* conf, const QString&msg);

src/plugins/muc/nick.cpp

@@ -18 +18 @@
         myLazyLeave=false;
         myJoined=QDateTime::currentDateTime();
+        versionStored_=false;
         qDebug() << "[NICK] created: " << myNick;
 
@@ -83 +84 @@
         myId=id;
         myValidateRequired=false;
-                
+        versionStored_=false;
         
         QSqlQuery query=DataStorage::instance()

src/plugins/muc/nick.h

@@ -25 +25 @@
         Jid* jid() const { return myJid; };
         bool validateRequired() const { return myValidateRequired; };
+        bool isVersionStored() const { return versionStored_; }
         QString versionName() const { return versionName_; }
         QString versionOs() const { return versionOs_; }
@@ -43 +44 @@
         static void setAllOffline (Conference* conf);
         bool isDevoicedNoVCard() const {return devoicedNoVCard_; }
+        bool setVersionStored(bool v) { versionStored_=v; }
         void setDevoicedNoVCard(bool v) { devoicedNoVCard_ = v; }
         void setVersionName(const QString& name) { versionName_=name; };
@@ -63 +65 @@
         QString myStatus;
         bool devoicedNoVCard_;
+        bool versionStored_;
         QString versionName_;
         QString versionOs_;