Enable !users command and add a table formatter

* Listen to wildcarded events, currently handle RPL_NAMREPLY.
* Add a formatter to present nick lists from IRC as a table.
This commit is contained in:
Fredrik de Vibe 2016-03-18 15:12:58 -04:00
parent 4759ee6132
commit e0379ca5af
4 changed files with 55 additions and 2 deletions

View File

@ -58,6 +58,10 @@ channel="#matterbridge"
UseSlackCircumfix=false UseSlackCircumfix=false
#whether to prefix messages from IRC to mattermost with the sender's nick. Useful if username overrides for incoming webhooks isn't enabled on the mattermost server #whether to prefix messages from IRC to mattermost with the sender's nick. Useful if username overrides for incoming webhooks isn't enabled on the mattermost server
PrefixMessagesWithNick=false PrefixMessagesWithNick=false
#how to format the list of IRC nicks when displayed in mattermost. Possible options are "table" and "plain"
NickFormatter=plain
#how many nicks to list per row for formatters that support this
NicksPerRow=4
[mattermost] [mattermost]
#url is your incoming webhook url (account settings - integrations - incoming webhooks) #url is your incoming webhook url (account settings - integrations - incoming webhooks)

View File

@ -17,6 +17,8 @@ type Config struct {
Channel string Channel string
UseSlackCircumfix bool UseSlackCircumfix bool
PrefixMessagesWithNick bool PrefixMessagesWithNick bool
NicksPerRow int
NickFormatter string
} }
Mattermost struct { Mattermost struct {
URL string URL string

View File

@ -7,6 +7,8 @@ nick="matterbot"
channel="#matterbridge" channel="#matterbridge"
UseSlackCircumfix=false UseSlackCircumfix=false
PrefixMessagesWithNick=false PrefixMessagesWithNick=false
NickFormatter=plain
NicksPerRow=4
[mattermost] [mattermost]
url="http://yourdomain/hooks/yourhookkey" url="http://yourdomain/hooks/yourhookkey"

View File

@ -58,7 +58,7 @@ func (b *Bridge) createIRC(name string) *irc.Connection {
i.AddCallback("JOIN", b.handleJoinPart) i.AddCallback("JOIN", b.handleJoinPart)
i.AddCallback("PART", b.handleJoinPart) i.AddCallback("PART", b.handleJoinPart)
} }
//i.AddCallback("353", b.handleOther) i.AddCallback("*", b.handleOther)
return i return i
} }
@ -76,11 +76,54 @@ func (b *Bridge) handleJoinPart(event *irc.Event) {
//b.SendType(b.Config.IRC.Nick, "irc-"+event.Nick+" "+strings.ToLower(event.Code)+"s "+event.Message(), b.getMMChannel(event.Arguments[0]), "join_leave") //b.SendType(b.Config.IRC.Nick, "irc-"+event.Nick+" "+strings.ToLower(event.Code)+"s "+event.Message(), b.getMMChannel(event.Arguments[0]), "join_leave")
} }
func tableformatter (nicks_s string, nicksPerRow int) string {
nicks := strings.Split(nicks_s, " ")
result := "|IRC users"
if nicksPerRow < 1 {
nicksPerRow = 4
}
for i := 0; i < 2; i++ {
for j := 1; j <= nicksPerRow; j++ {
if i == 0 {
result += "|"
} else {
result += ":-|"
}
}
result += "\r\n|"
}
result += nicks[0] + "|"
for i := 1; i < len(nicks); i++ {
if i % nicksPerRow == 0 {
result += "\r\n|" + nicks[i] + "|"
} else {
result += nicks[i] + "|"
}
}
return result
}
func plainformatter (nicks string, nicksPerRow int) string {
return nicks + " currently on IRC"
}
func (b *Bridge) formatnicks (nicks string) string {
switch (b.Config.IRC.NickFormatter) {
case "table":
return tableformatter(nicks, b.Config.IRC.NicksPerRow)
default:
return plainformatter(nicks, b.Config.IRC.NicksPerRow)
}
}
func (b *Bridge) handleOther(event *irc.Event) { func (b *Bridge) handleOther(event *irc.Event) {
switch event.Code { switch event.Code {
case "353": case "353":
log.Println("handleOther", b.getMMChannel(event.Arguments[0])) log.Println("handleOther", b.getMMChannel(event.Arguments[0]))
b.Send(b.Config.IRC.Nick, event.Message()+" currently on IRC", b.getMMChannel(event.Arguments[0])) b.Send(b.Config.IRC.Nick, b.formatnicks(event.Message()), b.getMMChannel(event.Arguments[0]))
break
default:
log.Printf("got unknown event: %+v\n", event);
} }
} }
@ -119,9 +162,11 @@ func (b *Bridge) handleMatter() {
case "!users": case "!users":
log.Println("received !users from", message.UserName) log.Println("received !users from", message.UserName)
b.i.SendRaw("NAMES " + b.getIRCChannel(message.Token)) b.i.SendRaw("NAMES " + b.getIRCChannel(message.Token))
return
case "!gif": case "!gif":
message.Text = b.giphyRandom(strings.Fields(strings.Replace(message.Text, "!gif ", "", 1))) message.Text = b.giphyRandom(strings.Fields(strings.Replace(message.Text, "!gif ", "", 1)))
b.Send(b.Config.IRC.Nick, message.Text, b.getIRCChannel(message.Token)) b.Send(b.Config.IRC.Nick, message.Text, b.getIRCChannel(message.Token))
return
} }
texts := strings.Split(message.Text, "\n") texts := strings.Split(message.Text, "\n")
for _, text := range texts { for _, text := range texts {