Changeset 419:cb5b57b7e390

Timestamp:

06/23/2010 09:41:38 PM (20 months ago)

Author:

Dmitry Nezhevenko <dion@…>

Branch:

default

Parents:

416:919e547ea0c9 (diff), 417:b139596e0b24 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge

Files:

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

src/plugins/muc/mucplugin.cpp

@@ -26 +26 @@
 
 #include <iostream>
+#include <memory>
 
 #include <gloox/stanza.h>
@@ -2650 +2651 @@
 
         bool validJID = false;
-        gloox::Tag *m = new gloox::Tag( "message" );
+        std::auto_ptr<gloox::Tag> m (new gloox::Tag( "message" ));
         m->addAttribute( "to", conf->name().toStdString() );
-        gloox::Tag *x = new gloox::Tag( m, "x" );
+        gloox::Tag *x = new gloox::Tag( m.get(), "x" );
         x->addAttribute( "xmlns", "http://jabber.org/protocol/muc#user" );
 
@@ -2672 +2673 @@
                 new gloox::Tag( x, "password", pass.toStdString() );
 
-        return (new gloox::Stanza(m));
-}
+        return (new gloox::Stanza(m.get()));
+}

src/plugins/muc/mucplugin.cpp

@@ -35 +35 @@
 {
         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";
 
         commands << "REPORT" << "MISSING" << "STAT";
 
-        commands << "POKE" << "REALJID" << "INVITE" << "CLEAN" << "TOPIC";
+        commands << "POKE" << "REALJID" << "INVITE" << "CLEAN" << "TOPIC" << "VISITS";
         pluginId=1;
 
@@ -634 +634 @@
         }
 
-        if (cmd=="TOPIC")
+        if (cmd=="VISITS" || cmd=="VISITSEX")
         {
                 Conference* conf = getConf(s);
@@ -641 +641 @@
                         return true;
                 }
+                QString arg2 = parser.nextToken();
+                QStringList list;
+                QDateTime from = QDateTime::fromString(arg, Qt::ISODate);
+                QDateTime to   = QDateTime::fromString(arg2, Qt::ISODate);
+                if (!to.isValid())
+                        to = QDateTime::currentDateTime();
+                if (!from.isValid())
+                        from = QDateTime(to.date());
+
+                if (from > to)
+                {
+                        QDateTime tmp = from;
+                        from = to;
+                        to   = tmp;
+                }
+                list = conf->visits(from, to, cmd.endsWith("EX"));
+                reply(s, QString("over the past %1 there was %2 user%3: %4")
+                      .arg(secsToString(from.secsTo(to)))
+                      .arg( list.count() )
+                      .arg( list.count() > 1 ?"s":"" )
+                      .arg( list.join(", ")) );
+                return true;
+        }
+
+        if (cmd=="TOPIC")
+        {
+                Conference* conf = getConf(s);
+                if (!conf) {
+                        reply(s, "You are not in conference!");
+                        return true;
+                }
                 if (arg.isEmpty()) {
                         reply(s, "!muc topic <subject>");
+                        return true;
+                }
+                if (!isFromConfModerator(s)) {
+                        reply(s,"You should be moderator to do this");
                         return true;
                 }
@@ -652 +687 @@
                 m->addChild(new gloox::Tag("subject", arg.toStdString()));
                 bot()->client()->send(m);
-                return true;
-        }
-        
+                reply(s, "OK");
+                return true;
+        }
+
         if (cmd=="CLEAN")
         {
@@ -662 +698 @@
                 return true;
         }
-        
+
         if (cmd=="INVITE")
         {
@@ -876 +912 @@
         }
 
-        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;
         }