HasPrefix is not necessary before TrimPrefix

[goircd.git] / room.go

diff --git a/room.go b/room.go
index ccfdb077b24b638d3a83adf1bbaa692fc4ab49a7..99ec208e573ff97be207abeb8fd6f475807a8ec6 100644 (file)
--- 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 = ""
@@ -128,7 +129,7 @@ func (room *Room) Processor(events <-chan ClientEvent) {
                        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: