X-Git-Url: http://www.git.cypherpunks.ru/?p=goircd.git;a=blobdiff_plain;f=room.go;h=4bdb4b2f18427c728c762d74b85e6149bc7215f2;hp=87b35f60b18a69e1f785b4ace86cb693335a252e;hb=ad68cf29f652c5bfa7822a10000e9da658fbf1d5;hpb=216a9dc05efb227bf793e18ec10fcc978f782d21 diff --git a/room.go b/room.go index 87b35f6..4bdb4b2 100644 --- a/room.go +++ b/room.go @@ -1,6 +1,6 @@ /* goircd -- minimalistic simple Internet Relay Chat (IRC) server -Copyright (C) 2014 Sergey Matveev +Copyright (C) 2014-2015 Sergey Matveev 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 . */ + package main import ( @@ -26,33 +27,38 @@ import ( ) var ( - RE_ROOM = regexp.MustCompile("^#[^\x00\x07\x0a\x0d ,:/]{1,200}$") + RERoom = regexp.MustCompile("^#[^\x00\x07\x0a\x0d ,:/]{1,200}$") ) // 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 { - name string - topic string - key string - members map[*Client]bool - hostname string - log_sink chan LogEvent - state_sink chan StateEvent + Verbose bool + name string + topic string + key string + members map[*Client]bool + hostname *string + logSink chan<- LogEvent + stateSink chan<- StateEvent +} + +func (room Room) String() string { + return room.name } -func NewRoom(hostname, name string, log_sink chan LogEvent, state_sink chan StateEvent) *Room { +func NewRoom(hostname *string, name string, logSink chan<- LogEvent, stateSink 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 + room.logSink = logSink + room.stateSink = stateSink return &room } @@ -65,9 +71,9 @@ func (room *Room) SendTopic(client *Client) { } // Send message to all room's subscribers, possibly excluding someone -func (room *Room) Broadcast(msg string, client_to_ignore ...*Client) { +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) @@ -75,20 +81,22 @@ func (room *Room) Broadcast(msg string, client_to_ignore ...*Client) { } func (room *Room) StateSave() { - room.state_sink <- StateEvent{room.name, room.topic, room.key} + room.stateSink <- StateEvent{room.name, room.topic, room.key} } -func (room *Room) Processor(events chan ClientEvent) { +func (room *Room) Processor(events <-chan ClientEvent) { var client *Client for event := range events { client = event.client - switch event.event_type { - case EVENT_NEW: + switch event.eventType { + case EventNew: room.members[client] = true - log.Println(client, "joined", room.name) + if room.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} + room.logSink <- LogEvent{room.name, client.nickname, "joined", true} nicknames := []string{} for member := range room.members { nicknames = append(nicknames, member.nickname) @@ -96,16 +104,16 @@ func (room *Room) Processor(events chan ClientEvent) { sort.Strings(nicknames) client.ReplyNicknamed("353", "=", room.name, strings.Join(nicknames, " ")) client.ReplyNicknamed("366", room.name, "End of NAMES list") - case EVENT_DEL: + case EventDel: if _, subscribed := room.members[client]; !subscribed { 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) - go room.Broadcast(msg) - room.log_sink <- LogEvent{room.name, client.nickname, "left", true} - case EVENT_TOPIC: + room.Broadcast(msg) + room.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") continue @@ -117,14 +125,28 @@ func (room *Room) Processor(events chan ClientEvent) { 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} + room.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.conn.RemoteAddr().String(), + *room.hostname, + m.nickname, + "H", + "0 "+m.realname, + ) } client.ReplyNicknamed("315", room.name, "End of /WHO list") - case EVENT_MODE: + case EventMode: if event.text == "" { mode := "+" if room.key != "" { @@ -133,6 +155,10 @@ func (room *Room) Processor(events chan ClientEvent) { 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") @@ -143,7 +169,7 @@ 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 { @@ -152,19 +178,31 @@ func (room *Room) Processor(events chan ClientEvent) { } 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 + msgLog = "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" + msgLog = "removed channel key" } go room.Broadcast(msg) - room.log_sink <- LogEvent{room.name, client.nickname, msg_log, true} + room.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, + ) + room.logSink <- LogEvent{ + room.name, + client.nickname, + event.text[sep+1:], + false, + } } } }