Changeset 285:10935f0d6ff7

Timestamp:

06/22/2008 11:47:45 AM (4 years ago)

Author:

Dmitry Nezhevenko <dion@…>

Branch:

default

Message:

Avoid autoleave for some conferences. No interface yet

Files:

• sql/mysql.sql (modified) (1 diff)
• sql/pgsql.sql (modified) (1 diff)
• src/plugins/muc/conference.cpp (modified) (3 diffs)
• src/plugins/muc/conference.h (modified) (1 diff)
• src/plugins/muc/mucplugin.cpp (modified) (4 diffs)
• src/plugins/muc/mucplugin.h (modified) (1 diff)

sql/mysql.sql

@@ -95 +95 @@
   `online` tinyint(1) NOT NULL default '0',
   `joined` datetime default NULL,
+  `autoleave` tinyint(1) NOT NULL default '1',
+  `owner` varchar(200) NULL,
   PRIMARY KEY  (`name`),
   UNIQUE KEY `id` (`id`)

sql/pgsql.sql

@@ -53 +53 @@
   online boolean NOT NULL default false,
   joined timestamp default NULL,
+  autoleave boolean NOT NULL default true,
+  owner varchar(200) NULL,
   PRIMARY KEY (name),
   UNIQUE (id)

src/plugins/muc/conference.cpp

@@ -90 +90 @@
         if (!myLazyLeave)
         {
-                QSqlQuery query=DataStorage::instance()
-                        ->prepareQuery("UPDATE conferences SET online = false WHERE id = ?");
-                query.addBindValue(myId);
-                query.exec();
+                markOffline();
         }
         else
@@ -105 +102 @@
         delete myCommand;
         delete configurator_;
+}
+
+void Conference::markOffline()
+{
+        QSqlQuery query=DataStorage::instance()
+                                ->prepareQuery("UPDATE conferences SET online = false WHERE id = ?");
+        query.addBindValue(myId);
+        query.exec();   
 }
 
@@ -262 +267 @@
                                 " where conference_nicks.conference_id=conferences.id and"
                                 " lastaction > ?) as cnt"
-                                " from conferences where autojoin=true and online=true order by cnt");
+                                " from conferences where autojoin=true and online=true and autoleave=true order by cnt");
         QDateTime currentDate=QDateTime::currentDateTime();
         currentDate=currentDate.addSecs(-deltaTime);

src/plugins/muc/conference.h

@@ -41 +41 @@
         void loadOnlineNicks();
         void cleanNonValidNicks();
+        void markOffline();
 
         MucConfigurator* configurator() const { return configurator_; }

src/plugins/muc/mucplugin.cpp

@@ -374 +374 @@
                         }
                         reply(s, "Ok");
+                        //!!!!!!!!!!!!!!!!!!!!
                         join(arg);
                         return true;
@@ -825 +826 @@
 }
 
-void MucPlugin::join(const QString& name)
+void MucPlugin::join(const QString& name, const QString& joinerBareJid)
 {
         qDebug() << "MucPlugin::join: " << name;
@@ -850 +851 @@
 
         confInProgress.append(confName);
+        if (!joinerBareJid.isEmpty())
+        {
+                
+        }
 
         // Don't create "Conference" object, because it's possible that we can't join it
@@ -886 +891 @@
         Conference*conf=conferences.byName(cname);
         if (conf)
+        {
                 conf->setAutoJoin(FALSE);
+                conf->markOffline();
+        }
+        
 
         /*      Conference *conf=new Conference(cname,cnick);

src/plugins/muc/mucplugin.h

@@ -41 +41 @@
         QStringList confInProgress;
         QString getItem(gloox::Stanza*, const QString& name);
-        void join(const QString& name);
+        void join(const QString& name, const QString& joinerBareJid=QString::null);
         void leave(const QString& name);
         Conference* getConf(gloox::Stanza* s);