Merge pull request #49 from Quaver/clan-chat-channels

Fix & add clan tag/name to channel description

chat/chat.go

@@ -41,7 +41,7 @@ func Initialize() {
 	}
 
 	for _, clan := range clans {
-		AddClanChannel(clan.Id)
+		AddClanChannel(clan)
 	}
 
 	_ = sessions.AddUser(Bot)
@@ -257,10 +257,10 @@ func addChannel(channel *Channel) {
 }
 
 // AddClanChannel Adds a new clan channel
-func AddClanChannel(clanId int) *Channel {
-	name := fmt.Sprintf("#clan_%v", clanId)
+func AddClanChannel(clan *db.Clan) *Channel {
+	name := fmt.Sprintf("#clan_%v", clan.Id)
 
-	channel := NewChannel(ChannelTypeClan, name, "Communicate with your fellow clan members",
+	channel := NewChannel(ChannelTypeClan, name, fmt.Sprintf("[%v] %v - Private Clan Chat", clan.Tag, clan.Name),
 		false, false, false, "")
 
 	addChannel(channel)

db/clans.go

@@ -10,7 +10,7 @@ type Clan struct {
 	Customizable bool   `db:"customizable"`
 }
 
-// GetAllClans Retrieves all of the clans in the db
+// GetAllClans Retrieves all the clans in the db
 func GetAllClans() ([]*Clan, error) {
 	result := make([]*Clan, 0)
 
@@ -22,3 +22,15 @@ func GetAllClans() ([]*Clan, error) {
 
 	return result, nil
 }
+
+func GetClanById(id int) (*Clan, error) {
+	var clan Clan
+
+	err := SQL.Select(&clan, "SELECT id, owner_id, name, tag, customizable FROM clans")
+
+	if err != nil && err != sql.ErrNoRows {
+		return nil, err
+	}
+
+	return &clan, nil
+}

handlers/login.go

@@ -429,12 +429,18 @@ func joinChatChannels(user *sessions.User) {
 
 		channel := chat.GetChannelByName(name)
 
-		if channel != nil {
-			channel.AddUser(user)
-			return
+		if channel == nil {
+			clan, err := db.GetClanById(int(user.Info.ClanId.Int32))
+
+			if err != nil {
+				log.Println("Error retrieving clan by id: ", err)
+				return
+			}
+
+			channel = chat.AddClanChannel(clan)
 		}
 
-		channel = chat.AddClanChannel(int(user.Info.ClanId.Int32))
+		sessions.SendPacketToUser(packets.NewServerAvailableChatChannel(channel.Name, channel.Description), user)
 		channel.AddUser(user)
 	}
 }