X-Git-Url: http://www.git.cypherpunks.ru/?p=goircd.git;a=blobdiff_plain;f=room.go;h=276397fd44f6e823671f94824225289dfafc48ec;hp=6fc2bcaa94b8b072858c7afd59d5d17f22f6b0f8;hb=7770e09e68f8dd0991ecd5a32383a89ac3e50857;hpb=def74ddc09249de9ab72001bb00550863d7f27e6

diff --git a/room.go b/room.go
index 6fc2bca..276397f 100644
--- a/room.go
+++ b/room.go
@@ -1,6 +1,6 @@
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server
-Copyright (C) 2014 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2015 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -15,6 +15,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+
 package main
 
 import (
@@ -26,49 +27,53 @@ import (
 )
 
 var (
-	RE_ROOM = regexp.MustCompile("^#[^\x00\x07\x0a\x0d ,:/]{1,200}$")
+	RERoom = regexp.MustCompile("^#[^\x00\x07\x0a\x0d ,:/]{1,200}$")
+
+	rooms map[string]*Room = make(map[string]*Room)
+
+	roomSinks map[*Room]chan ClientEvent = make(map[*Room]chan ClientEvent)
 )
 
 // Sanitize room's name. It can consist of 1 to 50 ASCII symbols
 // with some exclusions. All room names will have "#" prefix.
 func RoomNameValid(name string) bool {
-	return RE_ROOM.MatchString(name)
+	return RERoom.MatchString(name)
 }
 
 type Room struct {
-	Verbose    bool
-	name       string
-	topic      string
-	key        string
-	members    map[*Client]bool
-	hostname   string
-	log_sink   chan<- LogEvent
-	state_sink chan<- StateEvent
+	name    *string
+	topic   *string
+	key     *string
+	members map[*Client]struct{}
 }
 
-func NewRoom(hostname, name string, log_sink chan<- LogEvent, state_sink chan<- StateEvent) *Room {
-	room := Room{name: name}
-	room.members = make(map[*Client]bool)
-	room.topic = ""
-	room.key = ""
-	room.hostname = hostname
-	room.log_sink = log_sink
-	room.state_sink = state_sink
-	return &room
+func (room Room) String() string {
+	return *room.name
+}
+
+func NewRoom(name string) *Room {
+	topic := ""
+	key := ""
+	return &Room{
+		name:    &name,
+		topic:   &topic,
+		key:     &key,
+		members: make(map[*Client]struct{}),
+	}
 }
 
 func (room *Room) SendTopic(client *Client) {
-	if room.topic == "" {
-		client.ReplyNicknamed("331", room.name, "No topic is set")
+	if *room.topic == "" {
+		client.ReplyNicknamed("331", *room.name, "No topic is set")
 	} else {
-		client.ReplyNicknamed("332", room.name, room.topic)
+		client.ReplyNicknamed("332", *room.name, *room.topic)
 	}
 }
 
-// Send message to all room's subscribers, possibly excluding someone
-func (room *Room) Broadcast(msg string, client_to_ignore ...*Client) {
+// Send message to all room's subscribers, possibly excluding someone.
+func (room *Room) Broadcast(msg string, clientToIgnore ...*Client) {
 	for member := range room.members {
-		if (len(client_to_ignore) > 0) && member == client_to_ignore[0] {
+		if (len(clientToIgnore) > 0) && member == clientToIgnore[0] {
 			continue
 		}
 		member.Msg(msg)
@@ -76,69 +81,91 @@ func (room *Room) Broadcast(msg string, client_to_ignore ...*Client) {
 }
 
 func (room *Room) StateSave() {
-	room.state_sink <- StateEvent{room.name, room.topic, room.key}
+	stateSink <- StateEvent{*room.name, *room.topic, *room.key}
 }
 
 func (room *Room) Processor(events <-chan ClientEvent) {
 	var client *Client
 	for event := range events {
 		client = event.client
-		switch event.event_type {
-		case EVENT_NEW:
-			room.members[client] = true
-			if room.Verbose {
+		switch event.eventType {
+		case EventTerm:
+			roomsGroup.Done()
+			return
+		case EventNew:
+			room.members[client] = struct{}{}
+			if *verbose {
 				log.Println(client, "joined", room.name)
 			}
 			room.SendTopic(client)
-			room.Broadcast(fmt.Sprintf(":%s JOIN %s", client, room.name))
-			room.log_sink <- LogEvent{room.name, client.nickname, "joined", true}
-			nicknames := []string{}
+			room.Broadcast(fmt.Sprintf(":%s JOIN %s", client, *room.name))
+			logSink <- LogEvent{*room.name, *client.nickname, "joined", true}
+			nicknames := make([]string, 0)
 			for member := range room.members {
-				nicknames = append(nicknames, member.nickname)
+				nicknames = append(nicknames, *member.nickname)
 			}
 			sort.Strings(nicknames)
-			client.ReplyNicknamed("353", "=", room.name, strings.Join(nicknames, " "))
-			client.ReplyNicknamed("366", room.name, "End of NAMES list")
-		case EVENT_DEL:
+			client.ReplyNicknamed("353", "=", *room.name, strings.Join(nicknames, " "))
+			client.ReplyNicknamed("366", *room.name, "End of NAMES list")
+		case EventDel:
 			if _, subscribed := room.members[client]; !subscribed {
-				client.ReplyNicknamed("442", room.name, "You are not on that channel")
+				client.ReplyNicknamed("442", *room.name, "You are not on that channel")
 				continue
 			}
 			delete(room.members, client)
-			msg := fmt.Sprintf(":%s PART %s :%s", client, room.name, client.nickname)
+			msg := fmt.Sprintf(":%s PART %s :%s", client, *room.name, *client.nickname)
 			room.Broadcast(msg)
-			room.log_sink <- LogEvent{room.name, client.nickname, "left", true}
-		case EVENT_TOPIC:
+			logSink <- LogEvent{*room.name, *client.nickname, "left", true}
+		case EventTopic:
 			if _, subscribed := room.members[client]; !subscribed {
-				client.ReplyParts("442", room.name, "You are not on that channel")
+				client.ReplyParts("442", *room.name, "You are not on that channel")
 				continue
 			}
 			if event.text == "" {
-				go room.SendTopic(client)
+				room.SendTopic(client)
 				continue
 			}
-			room.topic = strings.TrimLeft(event.text, ":")
-			msg := fmt.Sprintf(":%s TOPIC %s :%s", client, room.name, room.topic)
-			go room.Broadcast(msg)
-			room.log_sink <- LogEvent{room.name, client.nickname, "set topic to " + room.topic, true}
+			topic := strings.TrimLeft(event.text, ":")
+			room.topic = &topic
+			msg := fmt.Sprintf(":%s TOPIC %s :%s", client, *room.name, *room.topic)
+			room.Broadcast(msg)
+			logSink <- LogEvent{
+				*room.name,
+				*client.nickname,
+				"set topic to " + *room.topic,
+				true,
+			}
 			room.StateSave()
-		case EVENT_WHO:
+		case EventWho:
 			for m := range room.members {
-				client.ReplyNicknamed("352", room.name, m.username, m.conn.RemoteAddr().String(), room.hostname, m.nickname, "H", "0 "+m.realname)
+				client.ReplyNicknamed(
+					"352",
+					*room.name,
+					*m.username,
+					m.Host(),
+					*hostname,
+					*m.nickname,
+					"H",
+					"0 "+*m.realname,
+				)
 			}
-			client.ReplyNicknamed("315", room.name, "End of /WHO list")
-		case EVENT_MODE:
+			client.ReplyNicknamed("315", *room.name, "End of /WHO list")
+		case EventMode:
 			if event.text == "" {
 				mode := "+"
-				if room.key != "" {
+				if *room.key != "" {
 					mode = mode + "k"
 				}
-				client.Msg(fmt.Sprintf("324 %s %s %s", client.nickname, room.name, mode))
+				client.Msg(fmt.Sprintf("324 %s %s %s", *client.nickname, *room.name, mode))
+				continue
+			}
+			if strings.HasPrefix(event.text, "b") {
+				client.ReplyNicknamed("368", *room.name, "End of channel ban list")
 				continue
 			}
 			if strings.HasPrefix(event.text, "-k") || strings.HasPrefix(event.text, "+k") {
 				if _, subscribed := room.members[client]; !subscribed {
-					client.ReplyParts("442", room.name, "You are not on that channel")
+					client.ReplyParts("442", *room.name, "You are not on that channel")
 					continue
 				}
 			} else {
@@ -146,28 +173,41 @@ func (room *Room) Processor(events <-chan ClientEvent) {
 				continue
 			}
 			var msg string
-			var msg_log string
+			var msgLog string
 			if strings.HasPrefix(event.text, "+k") {
 				cols := strings.Split(event.text, " ")
 				if len(cols) == 1 {
 					client.ReplyNotEnoughParameters("MODE")
 					continue
 				}
-				room.key = cols[1]
-				msg = fmt.Sprintf(":%s MODE %s +k %s", client, room.name, room.key)
-				msg_log = "set channel key to " + room.key
-			} else if strings.HasPrefix(event.text, "-k") {
-				room.key = ""
-				msg = fmt.Sprintf(":%s MODE %s -k", client, room.name)
-				msg_log = "removed channel key"
+				room.key = &cols[1]
+				msg = fmt.Sprintf(":%s MODE %s +k %s", client, *room.name, *room.key)
+				msgLog = "set channel key to " + *room.key
+			} else {
+				key := ""
+				room.key = &key
+				msg = fmt.Sprintf(":%s MODE %s -k", client, *room.name)
+				msgLog = "removed channel key"
 			}
-			go room.Broadcast(msg)
-			room.log_sink <- LogEvent{room.name, client.nickname, msg_log, true}
+			room.Broadcast(msg)
+			logSink <- LogEvent{*room.name, *client.nickname, msgLog, true}
 			room.StateSave()
-		case EVENT_MSG:
+		case EventMsg:
 			sep := strings.Index(event.text, " ")
-			room.Broadcast(fmt.Sprintf(":%s %s %s :%s", client, event.text[:sep], room.name, event.text[sep+1:]), client)
-			room.log_sink <- LogEvent{room.name, client.nickname, event.text[sep+1:], false}
+			room.Broadcast(fmt.Sprintf(
+				":%s %s %s :%s",
+				client,
+				event.text[:sep],
+				*room.name,
+				event.text[sep+1:]),
+				client,
+			)
+			logSink <- LogEvent{
+				*room.name,
+				*client.nickname,
+				event.text[sep+1:],
+				false,
+			}
 		}
 	}
 }