diff options
author | David Athay <ko2fan@gmail.com> | 2008-04-01 17:10:01 +0000 |
---|---|---|
committer | David Athay <ko2fan@gmail.com> | 2008-04-01 17:10:01 +0000 |
commit | 7d05004c8264eeee8aa1e9a5f0bc6a1126bc793a (patch) | |
tree | 15c075dd93f7099ad5e1e791f68f38aad758082d /src/account-server | |
parent | 7e9bb1451b05480f30be2edfd0b19e7b1e487932 (diff) | |
download | manaserv-7d05004c8264eeee8aa1e9a5f0bc6a1126bc793a.tar.gz manaserv-7d05004c8264eeee8aa1e9a5f0bc6a1126bc793a.tar.bz2 manaserv-7d05004c8264eeee8aa1e9a5f0bc6a1126bc793a.tar.xz manaserv-7d05004c8264eeee8aa1e9a5f0bc6a1126bc793a.zip |
Consolidated public and private channels into one,
which also includes guild channels. Channels now have a joinable
field, which is true for channels that are created by users, and
false for guild channels. Chatting in guild channels now works, and
non-guild members can no longer join guild channels
Diffstat (limited to 'src/account-server')
-rw-r--r-- | src/account-server/dalstorage.cpp | 4 | ||||
-rw-r--r-- | src/account-server/dalstoragesql.hpp | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/account-server/dalstorage.cpp b/src/account-server/dalstorage.cpp index 785e8943..c97aa487 100644 --- a/src/account-server/dalstorage.cpp +++ b/src/account-server/dalstorage.cpp @@ -697,13 +697,13 @@ DALStorage::updateChannels(std::map<unsigned short, ChatChannel>& channelList) sql.str(""); sql << "insert into " << CHANNELS_TBL_NAME - << " (id, name, announcement, password, privacy)" + << " (id, name, announcement, password, joinable)" << " values (" << i->first << ", \"" << i->second.getName() << "\", \"" << i->second.getAnnouncement() << "\", \"" << i->second.getPassword() << "\", \"" - << i->second.isPrivate() << "\");"; + << i->second.canJoin() << "\");"; LOG_DEBUG("Channel (" << i->first << ") saved: " << i->second.getName() diff --git a/src/account-server/dalstoragesql.hpp b/src/account-server/dalstoragesql.hpp index 16d0067e..ea7f620e 100644 --- a/src/account-server/dalstoragesql.hpp +++ b/src/account-server/dalstoragesql.hpp @@ -263,17 +263,20 @@ static char const *SQL_CHANNELS_TABLE = "id INTEGER PRIMARY KEY," "name VARCHAR(32) NOT NULL UNIQUE," "announcement VARCHAR(256) NOT NULL," - "password VARCHAR(32) NOT NULL" + "password VARCHAR(32) NOT NULL," + "joinable INTEGER NOT NULL" #elif defined (SQLITE_SUPPORT) "id INTEGER PRIMARY KEY," "name TEXT NOT NULL UNIQUE," "announcement TEXT NOT NULL," - "password TEXT NOT NULL" + "password TEXT NOT NULL," + "joinable INTEGER NOT NULL" #elif defined (POSTGRESQL_SUPPORT) "id SERIAL PRIMARY KEY," "name TEXT NOT NULL UNIQUE," "announcement TEXT NOT NULL," - "password TEXT NOT NULL" + "password TEXT NOT NULL," + "joinable INTEGER NOT NULL" #endif ");"; |