/*
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
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 (
)
const (
- PingTimeout = time.Second * 180 // Max time deadline for client's unresponsiveness
- PingThreshold = time.Second * 90 // Max idle client's time before PING are sent
- AlivenessCheck = time.Second * 10 // Client's aliveness check period
+ // Max time deadline for client's unresponsiveness
+ PingTimeout = time.Second * 180
+ // Max idle client's time before PING are sent
+ PingThreshold = time.Second * 90
+ // Client's aliveness check period
+ AlivenessCheck = time.Second * 10
)
var (
- RENickname = regexp.MustCompile("^[a-zA-Z0-9-]{1,9}$")
+ RENickname = regexp.MustCompile("^[a-zA-Z0-9-]{1,24}$")
)
type Daemon struct {
hostname *string
motd *string
passwords *string
- clients map[*Client]bool
+ clients map[*Client]struct{}
clientAliveness map[*Client]*ClientAlivenessState
rooms map[string]*Room
roomSinks map[*Room]chan ClientEvent
}
func NewDaemon(version string, hostname, motd, passwords *string, logSink chan<- LogEvent, stateSink chan<- StateEvent) *Daemon {
- daemon := Daemon{version: version, hostname: hostname, motd: motd, passwords: passwords}
- daemon.clients = make(map[*Client]bool)
+ daemon := Daemon{
+ version: version,
+ hostname: hostname,
+ motd: motd,
+ passwords: passwords,
+ }
+ daemon.clients = make(map[*Client]struct{})
daemon.clientAliveness = make(map[*Client]*ClientAlivenessState)
daemon.rooms = make(map[string]*Room)
daemon.roomSinks = make(map[*Room]chan ClientEvent)
}
client.ReplyNicknamed("311", c.nickname, c.username, h, "*", c.realname)
client.ReplyNicknamed("312", c.nickname, *daemon.hostname, *daemon.hostname)
+ if c.away != nil {
+ client.ReplyNicknamed("301", c.nickname, *c.away)
+ }
subscriptions := []string{}
for _, room := range daemon.rooms {
for subscriber := range room.members {
return
}
nickname := cols[1]
+ // Compatibility with some clients prepending colons to nickname
+ nickname = strings.TrimPrefix(nickname, ":")
for existingClient := range daemon.clients {
if existingClient.nickname == nickname {
client.ReplyParts("433", "*", nickname, "Nickname is already in use")
}
func (daemon *Daemon) Processor(events <-chan ClientEvent) {
+ var now time.Time
for event := range events {
- now := time.Now()
+ now = time.Now()
client := event.client
// Check for clients aliveness
switch event.eventType {
case EventNew:
- daemon.clients[client] = true
- daemon.clientAliveness[client] = &ClientAlivenessState{pingSent: false, timestamp: now}
+ daemon.clients[client] = struct{}{}
+ daemon.clientAliveness[client] = &ClientAlivenessState{
+ pingSent: false,
+ timestamp: now,
+ }
case EventDel:
delete(daemon.clients, client)
delete(daemon.clientAliveness, client)
}
switch command {
case "AWAY":
- continue
+ if len(cols) == 1 {
+ client.away = nil
+ client.ReplyNicknamed("305", "You are no longer marked as being away")
+ continue
+ }
+ msg := strings.TrimLeft(cols[1], ":")
+ client.away = &msg
+ client.ReplyNicknamed("306", "You have been marked as being away")
case "JOIN":
if len(cols) == 1 || len(cols[1]) < 1 {
client.ReplyNotEnoughParameters("JOIN")
client.ReplyNotEnoughParameters("PART")
continue
}
- for _, room := range strings.Split(cols[1], ",") {
+ rooms := strings.Split(cols[1], " ")[0]
+ for _, room := range strings.Split(rooms, ",") {
r, found := daemon.rooms[room]
if !found {
client.ReplyNoChannel(room)
if c.nickname == target {
msg = fmt.Sprintf(":%s %s %s %s", client, command, c.nickname, cols[1])
c.Msg(msg)
+ if c.away != nil {
+ client.ReplyNicknamed("301", c.nickname, *c.away)
+ }
break
}
}
r, found := daemon.rooms[target]
if !found {
client.ReplyNoNickChan(target)
+ continue
+ }
+ daemon.roomSinks[r] <- ClientEvent{
+ client,
+ EventMsg,
+ command + " " + strings.TrimLeft(cols[1], ":"),
}
- daemon.roomSinks[r] <- ClientEvent{client, EventMsg, command + " " + strings.TrimLeft(cols[1], ":")}
case "TOPIC":
if len(cols) == 1 {
client.ReplyNotEnoughParameters("TOPIC")