Changeset 420:dd73848a3c6c

Timestamp:

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

Author:

Dmitry Nezhevenko <dion@…>

Branch:

default

Parents:

419:cb5b57b7e390 (diff), 418:db5fa97c4e4c (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.

Tags:

tip

Message:

merge

Files:

• src/plugins/muc/conference.cpp (modified) (1 diff)
• src/plugins/muc/conference.cpp (modified) (1 diff)

src/plugins/muc/conference.cpp

@@ -156 +156 @@
         myVisitor->removeExpired();
         myModerator->removeExpired();
+}
+
+QStringList 
+Conference::visits(const QDateTime& from, const QDateTime& to, bool ext, int limit)
+{
+        QSqlQuery query=DataStorage::instance()
+                ->prepareQuery("SELECT nick, lastaction FROM conference_nicks WHERE conference_id=? "
+                                "AND lastaction BETWEEN ? AND ? ORDER BY lastaction LIMIT ?");
+        query.addBindValue(id());
+        query.addBindValue(from);
+        query.addBindValue(to);
+        query.addBindValue(limit);
+
+        QStringList list;
+        if (!query.exec())
+                return list;
+
+        while (query.next())
+        {
+                list.append((ext) ? query.value(0).toString()+" ("
+                            + query.value(1).toDateTime().toString("dd.MM.yyyy HH:mm")
+                            + ")" : query.value(0).toString());
+        }
+        return list;
 }
 

src/plugins/muc/conference.cpp

@@ -195 +195 @@
         {
                 query=DataStorage::instance()
-                        ->prepareQuery("SELECT id from conference_jids WHERE conference_id=? AND jid=?");
+                        ->prepareQuery("SELECT id from conference_jids WHERE conference_id=? AND jid=? LIMIT 1");
                 query.addBindValue(myId);
                 query.addBindValue(n);