Join IRC channel before connect

wabarc · Apr 27, 2021 · 91960c7 · 91960c7
1 parent 8eefd28
commit 91960c7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/config/config_test.go b/config/config_test.go
@@ -534,7 +534,7 @@ func TestIRCChannel(t *testing.T) {
 		t.Fatalf(`Parsing environment variables failed: %v`, err)
 	}
 
-	expected := "foo"
+	expected := "#foo"
 	got := opts.IRCChannel()
 
 	if got != expected {

diff --git a/config/options.go b/config/options.go
@@ -362,7 +362,10 @@ func (o *Options) IRCPassword() string {
 
 // IRCChannel returns channel of IRC
 func (o *Options) IRCChannel() string {
-	return o.irc.channel
+	if strings.HasPrefix(o.irc.channel, "#") {
+		return o.irc.channel
+	}
+	return "#" + o.irc.channel
 }
 
 // IRCServer returns server of IRC

diff --git a/publish/relaychat.go b/publish/relaychat.go
@@ -49,8 +49,10 @@ func (i *IRC) ToChannel(ctx context.Context, text string) bool {
 		return false
 	}
 
-	i.conn.Join(config.Opts.IRCChannel())
-	i.conn.Privmsg(config.Opts.IRCChannel(), text)
+	go func() {
+		// i.conn.Join(config.Opts.IRCChannel())
+		i.conn.Privmsg(config.Opts.IRCChannel(), text)
+	}()
 
 	return true
 }

diff --git a/service/relaychat/relaychat.go b/service/relaychat/relaychat.go
@@ -54,6 +54,9 @@ func (i *IRC) Serve(ctx context.Context) error {
 	}
 	logger.Debug("[irc] Serving IRC instance: %s", config.Opts.IRCServer())
 
+	if config.Opts.IRCChannel() != "" {
+		i.conn.AddCallback("001", func(ev *irc.Event) { i.conn.Join(config.Opts.IRCChannel()) })
+	}
 	i.conn.AddCallback("PRIVMSG", func(ev *irc.Event) {
 		go func(ev *irc.Event) {
 			if err := i.process(context.Background(), ev); err != nil {