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

1 files changed, 9 insertions, 2 deletions

diff --git a/src/chat-server/chatchannel.cpp b/src/chat-server/chatchannel.cpp
index 87c2a17..96de733 100644
--- a/src/chat-server/chatchannel.cpp
+++ b/src/chat-server/chatchannel.cpp
@@ -29,11 +29,13 @@
 ChatChannel::ChatChannel(int id,
                          const std::string &name,
                          const std::string &announcement,
-                         const std::string &password):
+                         const std::string &password,
+                         bool joinable):
     mId(id),
     mName(name),
     mAnnouncement(announcement),
-    mPassword(password)
+    mPassword(password),
+    mJoinable(joinable)
 {
 }
 
@@ -69,3 +71,8 @@ void ChatChannel::removeAllUsers()
     }
     mRegisteredUsers.clear();
 }
+
+bool ChatChannel::canJoin() const
+{
+    return mJoinable;
+}