bots/keyrcbot
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed issue with control channel eating all messages

Browse Source
This commit is contained in:
Gregory Rudolph
2020-01-16 09:20:03 -05:00
parent 89e29319a5
commit d63fa3990f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
keyrcbot.go
View File

@ -38,7 +38,6 @@ func main() {
channel.MembersType = keybase.TEAM channel.MembersType = keybase.TEAM
channel.Name = "keyrc" // The team you're linking to IRC channel.Name = "keyrc" // The team you're linking to IRC
channel.TopicName = "general" // The control channel (will be ignored for all except commands) channel.TopicName = "general" // The control channel (will be ignored for all except commands)
sendChat("Link starting", "general")
go setupIRC() go setupIRC()
k.Run(func(api keybase.ChatAPI) { k.Run(func(api keybase.ChatAPI) {
handleMessage(api) handleMessage(api)
@ -108,10 +107,12 @@ func handleMessage(api keybase.ChatAPI) {
return return
} }
if api.Msg.Sender.Username == k.Username { if api.Msg.Sender.Username == k.Username {
log.LogDebug("Ignoring message from me")
return return
} }
if api.Msg.Content.Type != "text" { if api.Msg.Content.Type != "text" {
log.LogDebug("Non-text message ignored.")
return return
} }
msgSender := api.Msg.Sender.Username msgSender := api.Msg.Sender.Username
@ -120,19 +121,18 @@ func handleMessage(api keybase.ChatAPI) {
parts := strings.Split(msgBody, " ") parts := strings.Split(msgBody, " ")
if parts[0] == "#" { if parts[0] == "#" {
log.LogWarn("Comment detected and msg ignored")
return return
} }
if len(parts) == 3 {
if parts[0] == fmt.Sprintf("@%s", k.Username) {
if parts[1] == "join" {
if api.Msg.Channel.TopicName == channel.TopicName && parts[2] != channel.TopicName {
addIrcTrigger(parts[2])
return
}
}
}
}
if api.Msg.Channel.TopicName == channel.TopicName { if api.Msg.Channel.TopicName == channel.TopicName {
log.LogDebug(fmt.Sprintf("Message found in control channel %s == %s", api.Msg.Channel.TopicName, channel.TopicName))
if parts[0] == fmt.Sprintf("@%s", k.Username) {
log.LogDebug("I was tagged in a message in Control Channel")
if len(parts) == 3 && parts[1] == "join" {
log.LogDebug("Join command detected")
addIrcTrigger(parts[2])
}
}
return return
} }
irc.Msg(fmt.Sprintf("#%s", api.Msg.Channel.TopicName), fmt.Sprintf("[%s]: %s", msgSender, msgBody)) irc.Msg(fmt.Sprintf("#%s", api.Msg.Channel.TopicName), fmt.Sprintf("[%s]: %s", msgSender, msgBody))
@ -141,7 +141,7 @@ func handleMessage(api keybase.ChatAPI) {
func sendChat(message string, chann string) { func sendChat(message string, chann string) {
channel.TopicName = chann channel.TopicName = chann
chat := k.NewChat(channel) chat := k.NewChat(channel)
_, err := chat.Send(message) _, err := chat.Send(strings.Replace(message, botNick, "@here", -1))
if err != nil { if err != nil {
log.LogError(fmt.Sprintf("There was an error %+v", err)) log.LogError(fmt.Sprintf("There was an error %+v", err))
} }