goop: Use time.After instead of time.Sleep to break earlier

nielsAD · Jul 19, 2018 · ecb941c · ecb941c
1 parent 52b9389
commit ecb941c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/cmd/goop/bnet.go b/cmd/goop/bnet.go
@@ -20,7 +20,7 @@ import (
 
 type bnetConfig struct {
 	ReconnectDelay time.Duration
-	FirstChannel   string
+	HomeChannel    string
 	CommandTrigger string
 	AvatarURL      string
 
@@ -113,7 +113,12 @@ func (b *BNetRealm) Run(ctx context.Context) error {
 
 			if reconnect && ctx.Err() == nil {
 				b.Fire(&network.AsyncError{Src: "Run[Logon]", Err: err})
-				time.Sleep(backoff)
+
+				select {
+				case <-time.After(backoff):
+				case <-ctx.Done():
+				}
+
 				backoff = time.Duration(float64(backoff) * 1.5)
 				continue
 			}
@@ -125,7 +130,7 @@ func (b *BNetRealm) Run(ctx context.Context) error {
 
 		var channel = b.Channel()
 		if channel == "" {
-			channel = b.FirstChannel
+			channel = b.HomeChannel
 		}
 		if channel != "" {
 			b.Say("/join " + channel)

diff --git a/cmd/goop/discord.go b/cmd/goop/discord.go
@@ -104,7 +104,11 @@ func (d *DiscordRealm) Run(ctx context.Context) error {
 		}
 
 		d.Fire(&network.AsyncError{Src: "Run[Open]", Err: err})
-		time.Sleep(2 * time.Minute)
+
+		select {
+		case <-time.After(2 * time.Minute):
+		case <-ctx.Done():
+		}
 	}
 
 	if err != nil {
@@ -121,7 +125,6 @@ func (d *DiscordRealm) Run(ctx context.Context) error {
 func (d *DiscordRealm) InitDefaultHandlers() {
 	d.AddHandler(d.onConnect)
 	d.AddHandler(d.onDisconnect)
-	d.AddHandler(d.onPresenceUpdate)
 	d.AddHandler(d.onMessageCreate)
 }
 
@@ -141,13 +144,6 @@ func (d *DiscordRealm) onDisconnect(s *discordgo.Session, msg *discordgo.Disconn
 	d.Fire(Disconnected{})
 }
 
-func (d *DiscordRealm) onPresenceUpdate(s *discordgo.Session, msg *discordgo.PresenceUpdate) {
-	old, _ := d.Session.State.Presence(msg.GuildID, msg.User.ID)
-	if old == nil || msg.Presence.Status != old.Status {
-		fmt.Println(msg)
-	}
-}
-
 func (d *DiscordRealm) onMessageCreate(s *discordgo.Session, msg *discordgo.MessageCreate) {
 	if msg.Author.Bot {
 		return
@@ -290,7 +286,7 @@ func (c *DiscordChannel) Relay(ev *network.Event, sender string) {
 	case *PrivateChat:
 		err = c.WebhookOrSay(&discordgo.WebhookParams{
 			Content:   c.filter(msg.Content, msg.User.Rank),
-			Username:  fmt.Sprintf("[DM] %s@%s", msg.User.Name, sender),
+			Username:  fmt.Sprintf("%s@%s (Direct Message)", msg.User.Name, sender),
 			AvatarURL: msg.User.AvatarURL,
 		})
 	default:

diff --git a/cmd/goop/main.go b/cmd/goop/main.go
@@ -81,7 +81,7 @@ func main() {
 
 	if *makeconf {
 		if err := toml.NewEncoder(os.Stdout).Encode(conf); err != nil {
-			logErr.Fatal(err)
+			logErr.Fatal("Configuration encoding error: ", err)
 		}
 		return
 	}