goop: Add support for webhook avatars

Author: nielsAD

cmd/goop/bnet.go

@@ -22,6 +22,7 @@ type bnetConfig struct {
 	ReconnectDelay time.Duration
 	FirstChannel   string
 	CommandTrigger string
+	AvatarURL      string
 
 	RankWhisper    Rank
 	RankTalk       Rank
@@ -158,7 +159,7 @@ func (b *BNetRealm) user(u *bnet.User) User {
 		res.Rank = b.RankOperator
 	}
 
-	var prod, _, lvl, tag = u.Stat()
+	var prod, icon, lvl, tag = u.Stat()
 	if prod != 0 {
 		switch prod {
 		case w3gs.ProductDemo, w3gs.ProductROC, w3gs.ProductTFT:
@@ -168,15 +169,17 @@ func (b *BNetRealm) user(u *bnet.User) User {
 			return res
 		}
 
+		res.AvatarURL = strings.Replace(b.AvatarURL, "${ICON}", icon.String(), -1)
+
 		if lvl > 0 && b.RankLevel != nil {
 			for l, r := range b.RankLevel {
 				if lvl >= l && r > res.Rank {
 					res.Rank = r
 				}
 			}
 		}
-		if tag != "" && b.RankClanTag != nil {
-			var rank = b.RankClanTag[tag]
+		if tag != 0 && b.RankClanTag != nil {
+			var rank = b.RankClanTag[tag.String()]
 			if rank > res.Rank {
 				res.Rank = rank
 			}
@@ -215,7 +218,7 @@ func (b *BNetRealm) onUserLeft(ev *network.Event) {
 		return
 	}
 
-	b.Fire(&Join{
+	b.Fire(&Leave{
 		User:    b.user(&user.User),
 		Channel: b.channel(),
 	})

cmd/goop/discord.go

@@ -155,9 +155,10 @@ func (d *DiscordRealm) onMessageCreate(s *discordgo.Session, msg *discordgo.Mess
 
 	var chat = Chat{
 		User: User{
-			ID:   msg.Author.ID,
-			Name: msg.Author.Username,
-			Rank: d.RankNoChannel,
+			ID:        msg.Author.ID,
+			Name:      msg.Author.Username,
+			Rank:      d.RankNoChannel,
+			AvatarURL: msg.Author.AvatarURL(""),
 		},
 		Channel: Channel{
 			ID:   msg.ChannelID,
@@ -282,13 +283,15 @@ func (c *DiscordChannel) Relay(ev *network.Event, sender string) {
 		err = c.Say(fmt.Sprintf("⬅️ **%s@%s** has left the channel", msg.User.Name, sender))
 	case *Chat:
 		err = c.WebhookOrSay(&discordgo.WebhookParams{
-			Content:  c.filter(msg.Content, msg.User.Rank),
-			Username: fmt.Sprintf("%s@%s", msg.User.Name, sender),
+			Content:   c.filter(msg.Content, msg.User.Rank),
+			Username:  fmt.Sprintf("%s@%s", msg.User.Name, sender),
+			AvatarURL: msg.User.AvatarURL,
 		})
 	case *PrivateChat:
 		err = c.WebhookOrSay(&discordgo.WebhookParams{
-			Content:  c.filter(msg.Content, msg.User.Rank),
-			Username: fmt.Sprintf("%s@%s", msg.User.Name, sender),
+			Content:   c.filter(msg.Content, msg.User.Rank),
+			Username:  fmt.Sprintf("[DM] %s@%s", msg.User.Name, sender),
+			AvatarURL: msg.User.AvatarURL,
 		})
 	default:
 		err = ErrUnknownEvent

cmd/goop/realm.go

@@ -53,9 +53,10 @@ type SystemMessage struct {
 
 // User event
 type User struct {
-	ID   string
-	Name string
-	Rank Rank
+	ID        string
+	Name      string
+	Rank      Rank
+	AvatarURL string
 }
 
 // Channel event

cmd/goop/stdio.go

@@ -26,6 +26,7 @@ type StdIOConfig struct {
 	Read           bool
 	Rank           Rank
 	CommandTrigger string
+	AvatarURL      string
 }
 
 // StdIO relays between stdin/stdout
@@ -47,9 +48,10 @@ func (o *StdIO) read() error {
 
 		o.Fire(&Chat{
 			User: User{
-				ID:   "STDIO",
-				Name: "stdin",
-				Rank: o.Rank,
+				ID:        "STDIO",
+				Name:      "stdin",
+				Rank:      o.Rank,
+				AvatarURL: o.AvatarURL,
 			},
 			Channel: Channel{
 				ID:   "STDIO",

network/bnet/user.go

@@ -39,7 +39,7 @@ func reverse(s string) string {
 }
 
 // Stat split into (icon, level, clan)
-func (u User) Stat() (product protocol.DWordString, icon string, lvl int, tag string) {
+func (u User) Stat() (product protocol.DWordString, icon protocol.DWordString, lvl int, tag protocol.DWordString) {
 	lvl = -1
 
 	var s = strings.Split(u.StatString, " ")
@@ -50,7 +50,7 @@ func (u User) Stat() (product protocol.DWordString, icon string, lvl int, tag st
 	product = protocol.DString(reverse(s[0]))
 
 	if len(s) >= 2 {
-		icon = s[1]
+		icon = protocol.DString(reverse(s[1]))
 	}
 
 	if len(s) >= 3 {
@@ -59,7 +59,7 @@ func (u User) Stat() (product protocol.DWordString, icon string, lvl int, tag st
 		}
 	}
 	if len(s) >= 4 {
-		tag = strings.ToUpper(s[3])
+		tag = protocol.DString(reverse(s[3]))
 	}
 
 	return