External/ergo
1
0
Fork 1
mirror of https://github.com/ergochat/ergo.git synced 2025-12-22 02:52:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Update a bunch of messages and fix reply struct embedding.

Browse source
This commit is contained in:
Jeremy Latt 2013-05-11 18:28:18 -07:00
parent 8e5ff51257
commit c42cd92f91
9 changed files with 292 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/irc/channel.go
View file

@ -4,6 +4,10 @@ import (
"log"
)
const (
DEBUG_CHANNEL = true
)
type Channel struct {
server *Server
commands chan<- ChannelCommand
@ -51,6 +55,9 @@ func NewChannel(s *Server, name string) *Channel {
// Forward `Reply`s to all `User`s of the `Channel`.
func (ch *Channel) receiveReplies(replies <-chan Reply) {
for reply := range replies {
if DEBUG_CHANNEL {
log.Printf("%s → %s", ch, reply)
}
for user := range ch.members {
if user != reply.Source() {
user.replies <- reply
@ -61,7 +68,9 @@ func (ch *Channel) receiveReplies(replies <-chan Reply) {
func (ch *Channel) receiveCommands(commands <-chan ChannelCommand) {
for command := range commands {
log.Printf("%s %T %+v", ch.Id(), command, command)
if DEBUG_CHANNEL {
log.Printf("%s ← %s %s", ch, command.Source(), command)
}
command.HandleChannel(ch)
}
}
@ -89,18 +98,26 @@ func (channel *Channel) GetTopic(replier Replier) {
replier.Replies() <- RplTopic(channel)
}
func (channel Channel) Id() string {
func (channel *Channel) Id() string {
return channel.name
}
func (channel Channel) PublicId() string {
func (channel *Channel) PublicId() string {
return channel.name
}
func (channel Channel) Commands() chan<- ChannelCommand {
func (channel *Channel) Commands() chan<- ChannelCommand {
return channel.commands
}
func (channel *Channel) Replies() chan<- Reply {
return channel.replies
}
func (channel *Channel) String() string {
return channel.Id()
}
//
// commands
//
@ -170,5 +187,5 @@ func (m *TopicCommand) HandleChannel(channel *Channel) {
}
func (m *PrivMsgCommand) HandleChannel(channel *Channel) {
channel.replies <- RplPrivMsgChannel(channel, m.Client().user, m.message)
channel.Replies() <- RplPrivMsgChannel(channel, m.Client().user, m.message)
}