X-Git-Url: http://www.git.cypherpunks.ru/?p=goircd.git;a=blobdiff_plain;f=room.go;h=4bdb4b2f18427c728c762d74b85e6149bc7215f2;hp=eeff4d06cb8580aced5945694a74bbdf8de5cb61;hb=ad68cf29f652c5bfa7822a10000e9da658fbf1d5;hpb=a939b027fdb6ce1d0822e76ec50814678ff0050a

diff --git a/room.go b/room.go
index eeff4d0..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 <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 (
@@ -41,16 +42,16 @@ type Room struct {
 	topic     string
 	key       string
 	members   map[*Client]bool
-	hostname  string
+	hostname  *string
 	logSink   chan<- LogEvent
 	stateSink chan<- StateEvent
 }
 
-func (r Room) String() string {
-	return r.name
+func (room Room) String() string {
+	return room.name
 }
 
-func NewRoom(hostname, name string, logSink chan<- LogEvent, stateSink 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 = ""
@@ -124,11 +125,25 @@ 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.logSink <- 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 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 EventMode:
@@ -140,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")
@@ -170,8 +189,20 @@ func (room *Room) Processor(events <-chan ClientEvent) {
 			room.StateSave()
 		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.logSink <- 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,
+			}
 		}
 	}
 }