Changeset 287:5bf6d7375f4c

Timestamp:

06/30/2008 05:05:45 PM (4 years ago)

Author:

Dmitry Nezhevenko <dion@…>

Branch:

default

Message:

Fix version matcher

Files:

• src/plugins/muc/mucplugin.cpp (modified) (35 diffs)

src/plugins/muc/mucplugin.cpp

@@ -37 +37 @@
         pluginId=1;
         lazyOffline=DataStorage::instance()->getInt("muc/lazyoffline");
-        
+
         int leaveCheckInterval=DataStorage::instance()->getInt("muc/leave_checkinterval");
         if (leaveCheckInterval>0)
@@ -46 +46 @@
                 timer->start(leaveCheckInterval);
         }
-        
+
 }
 
@@ -178 +178 @@
         {
                 qDebug()
-                                << "[MUC] Got type='error' in onPresence. Looks like we can't join conference: " << confFull << "Nick: " << nick; 
+                                << "[MUC] Got type='error' in onPresence. Looks like we can't join conference: " << confFull << "Nick: " << nick;
                 int idx=confInProgress.indexOf(getConfExp(confFull));
                 if (idx>=0)
@@ -236 +236 @@
 
         }
-        
+
         bool newNick=false;
         if (!n)
@@ -247 +247 @@
                 n=new Nick(conf, nick,getItem(s,"jid"));
                 conf->nicks()->append(n);
-                
+
                 if (nick==conf->nick())
                 {
                         // Got own presence after renaming
 
-                }               
+                }
         }
         else
@@ -310 +310 @@
                 if (newNick || conf->configurator()->isCheckAlistsEveryPresence())
                         checkMember(s, conf, n);
-                
+
                 if (newNick)
                 {
@@ -487 +487 @@
                 return true;
         }
-        
+
         if (cmd=="IDLE")
         {
@@ -505 +505 @@
                 return true;
         }
-        
+
         if (cmd=="VERSION")
         {
@@ -522 +522 @@
                 return true;
         }
-        
+
         if (cmd=="CHECKVCARD")
         {
@@ -532 +532 @@
                 return true;
         }
-        
+
         if (cmd=="SEEN")
         {
@@ -562 +562 @@
                 QString target=arg;
                 QString reason=parser.nextToken();
-                
+
                 Nick *n=getNickVerbose(s, target);
                 if (!n)
@@ -631 +631 @@
         }
 
-        if (cmd=="ABAN" || cmd=="AKICK" || cmd=="AVISITOR" || cmd=="AMODERATOR" 
+        if (cmd=="ABAN" || cmd=="AKICK" || cmd=="AVISITOR" || cmd=="AMODERATOR"
                 || cmd=="ACMD" || cmd=="AEDIT" || cmd=="AFIND")
         {
@@ -853 +853 @@
         if (!joinerBareJid.isEmpty())
         {
-                
+
         }
 
@@ -895 +895 @@
                 conf->markOffline();
         }
-        
+
 
         /*      Conference *conf=new Conference(cname,cnick);
@@ -979 +979 @@
         nick->setVersionOs(QString::null);
         if (query)
-        { 
+        {
                 gloox::Tag* t;
                 t=query->findChild("name");
@@ -1063 +1063 @@
         if (arg=="ACMD")
                 alist=conf->acommand();
-        
+
         if (!alist)
         {
@@ -1124 +1124 @@
                         arg2=parser.nextToken().toUpper();
                         isRemoving=true;
-                }               
+                }
         }
 
@@ -1166 +1166 @@
                 arg2=parser.nextToken().toUpper();
         }
-        
+
         qDebug() << "1: " << arg2;
-        
-        if (arg2=="NICK" || arg2=="BODY" || arg2=="RES" 
-                || arg2=="VERSION" || arg2=="VERSION.NAME" 
+
+        if (arg2=="NICK" || arg2=="BODY" || arg2=="RES"
+                || arg2=="VERSION" || arg2=="VERSION.NAME"
                 || arg2=="VERSION.CLIENT" || arg2=="VERSION.OS")
         {
@@ -1189 +1189 @@
 
                 arg2=parser.nextToken().toUpper();
-        } 
+        }
         else if (arg2=="JID")
         {
@@ -1197 +1197 @@
 
         qDebug() << "2: " << arg2;
-        
+
         if (arg2=="EXP")
         {
@@ -1245 +1245 @@
 
         qDebug() << "3: " << arg2;
-        
+
         arg2=arg2.toLower();
         item.setValue(arg2);
@@ -1273 +1273 @@
                 }
         }
-        
+
         qDebug() << "4: " << arg2;
         QString reason=parser.joinBody().trimmed();
@@ -1299 +1299 @@
         QString version;
         if (nick->isVersionStored())
-                version=nick->versionName()+" "+nick->versionClient()+" // "+nick->versionOs();
-        
+        {
+                version=nick->versionName();
+                if (!nick->versionClient().isEmpty())
+                        version+=" "+nick->versionClient();
+                if (!nick->versionOs().isEmpty())
+                        version+=" // "+nick->versionOs();
+                version=version.trimmed();
+        }
+
         bool isPresence=!s || (s->type()==gloox::StanzaPresence);
-        
+
         for (int i=0; i<cnt; i++)
         {
                 AListItem* item=list->at(i);
-                
-                if (matcher!=AListItem::MatcherUnknown && matcher!=AListItem::MatcherAll && 
+
+                if (matcher!=AListItem::MatcherUnknown && matcher!=AListItem::MatcherAll &&
                                 !item->matcherType()!=matcher)
                 {
@@ -1320 +1327 @@
                                 continue;
                 }
-        
+
                 QString testValue;
-                if (!isPresence && (item->matcherType() == AListItem::MatcherNick 
+                if (!isPresence && (item->matcherType() == AListItem::MatcherNick
                                 || item->matcherType()==AListItem::MatcherJid || item->matcherType()==AListItem::MatcherResource))
                         continue;
-                
-                if (item->matcherType() == AListItem::MatcherVersion 
+
+                if (item->matcherType() == AListItem::MatcherVersion
                         || item->matcherType()==AListItem::MatcherVersionName
                         || item->matcherType()==AListItem::MatcherVersionClient
@@ -1336 +1343 @@
                                 continue;
                 }
-                
+
                 switch (item->matcherType())
                 {
@@ -1350 +1357 @@
                         default: continue;
                 }
-                
+
                 if (testValue.isEmpty())
                         continue;
-                
+
                 switch (item->testType())
                 {
@@ -1387 +1394 @@
         if (!n || !c)
                 return;
-        
+
         // Don't process our own presences
         if (c && n->nick()==c->nick())
                 return;
-        
-        // We should not parse own messages, since this can create loop 
+
+        // We should not parse own messages, since this can create loop
         if (s && (s->from() == s->to() || isMyMessage(s)))
                 s=0l;
@@ -1436 +1443 @@
                 return;
         }
-        
+
         if (item=aFind(c->acommand(), n, s, matcher))
         {
@@ -1459 +1466 @@
                 bot()->client()->handleMessage(st, 0);
                 delete st;
-                
+
                 return;
         }
@@ -1482 +1489 @@
         if (!conf)
                 return StorageKey();
-        
+
         return StorageKey(pluginId, conf->id());
 }
@@ -1493 +1500 @@
         if (getRole(s)<ROLE_ADMIN)
                 return 0;
-        
+
         return conf->configurator();
 }
@@ -1601 +1608 @@
                 QString body=QString::fromStdString(s->body());
                 msg.replace("${BODY}", body);
-                
+
                 if (item)
                 {
                         QString value=item->value();
-                        
+
                         if (!value.isEmpty() && msg.indexOf("${BODYARG}")>=0)
                         {
@@ -1632 +1639 @@
         if (nick->jidStr().isEmpty())
                 return;
-        
+
         QString jid=conf->name()+"/"+nick->nick();
         QString vcardId=bot()->client()->fetchVCard(jid);
@@ -1656 +1663 @@
                 return false;
         }
-        
+
         gloox::Stanza* src=req->stanza();
         Conference* conf=getConf(src);
         Nick* nick=getNick(src);
         QString stored_jid=QString::fromStdString(src->findAttribute("gluxi_jid"));
-        
+
         if (conf && nick && stored_jid==nick->jidStr())
         {
@@ -1690 +1697 @@
 {
         qDebug() << "Checking for died conferences";
-        
+
         QStringList conferencesToLeave=Conference::autoLeaveList();
         if (conferencesToLeave.isEmpty())