From: Daniel Albers <daniel@lbers.com>
Date: Sun, 8 Nov 2009 23:21:09 +0000 (+0100)
Subject: Fix Quassel not rejoining newly joined channels
X-Git-Tag: 0.5.1~11
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=412b5319d090f122ae8c99be6578bc25023c8f24;ds=sidebyside

Fix Quassel not rejoining newly joined channels

Since this is the only current rejoin issue I'm aware off this should
fix #214
---

diff --git a/src/core/SQL/PostgreSQL/14/insert_buffer.sql b/src/core/SQL/PostgreSQL/14/insert_buffer.sql
index e3dd6aa0..9116f6e5 100644
--- a/src/core/SQL/PostgreSQL/14/insert_buffer.sql
+++ b/src/core/SQL/PostgreSQL/14/insert_buffer.sql
@@ -1,3 +1,3 @@
-INSERT INTO buffer (userid, networkid, buffername, buffercname, buffertype)
-VALUES (:userid, :networkid, :buffername, :buffercname, :buffertype)
+INSERT INTO buffer (userid, networkid, buffername, buffercname, buffertype, joined)
+VALUES (:userid, :networkid, :buffername, :buffercname, :buffertype, :joined)
 RETURNING bufferid
diff --git a/src/core/SQL/SQLite/15/insert_buffer.sql b/src/core/SQL/SQLite/15/insert_buffer.sql
index 51202ba5..9b86cfd2 100644
--- a/src/core/SQL/SQLite/15/insert_buffer.sql
+++ b/src/core/SQL/SQLite/15/insert_buffer.sql
@@ -1,2 +1,2 @@
-INSERT INTO buffer (userid, networkid, buffername, buffercname, buffertype)
-VALUES (:userid, :networkid, :buffername, :buffercname, :buffertype)
+INSERT INTO buffer (userid, networkid, buffername, buffercname, buffertype, joined)
+VALUES (:userid, :networkid, :buffername, :buffercname, :buffertype, :joined)
diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp
index d8a62846..8d8198f8 100644
--- a/src/core/postgresqlstorage.cpp
+++ b/src/core/postgresqlstorage.cpp
@@ -906,6 +906,8 @@ BufferInfo PostgreSqlStorage::bufferInfo(UserId user, const NetworkId &networkId
   createQuery.bindValue(":buffertype", (int)type);
   createQuery.bindValue(":buffername", buffer);
   createQuery.bindValue(":buffercname", buffer.toLower());
+  createQuery.bindValue(":joined", type & BufferInfo::ChannelBuffer ? 1 : 0);
+
   safeExec(createQuery);
 
   if(createQuery.lastError().isValid()) {
diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index ad610a03..1a9a7f6c 100644
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -1037,6 +1037,7 @@ BufferInfo SqliteStorage::bufferInfo(UserId user, const NetworkId &networkId, Bu
       createQuery.bindValue(":buffertype", (int)type);
       createQuery.bindValue(":buffername", buffer);
       createQuery.bindValue(":buffercname", buffer.toLower());
+      createQuery.bindValue(":joined", type & BufferInfo::ChannelBuffer ? 1 : 0);
 
       unlock();
       lockForWrite();