From d940a97a0fd619d8fc0732078114c2781f05e1ae Mon Sep 17 00:00:00 2001
From: mavolin <48887425+mavolin@users.noreply.github.com>
Date: Sun, 10 Jan 2021 20:07:04 +0100
Subject: [PATCH] Discord: add support for string based OverwriteTypes as used
 in GuildCreate

---
 discord/channel.go | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/discord/channel.go b/discord/channel.go
index 9705d8b..fdc0559 100644
--- a/discord/channel.go
+++ b/discord/channel.go
@@ -1,8 +1,8 @@
 package discord
 
 import (
-	"bytes"
 	"strconv"
+	"strings"
 )
 
 // https://discord.com/developers/docs/resources/channel#channel-object
@@ -133,9 +133,21 @@ const (
 // into OverwriteType. We need to do this because Discord is so bad that they
 // can't even handle 1s and 0s properly.
 func (otype *OverwriteType) UnmarshalJSON(b []byte) error {
-	b = bytes.Trim(b, `"`)
+	s := strings.Trim(string(b), `"`)
 
-	u, err := strconv.ParseUint(string(b), 10, 8)
+	// It has been observed that discord still uses the "legacy" string
+	// overwrite types in at least the guild create event.
+	// Therefore this string check.
+	switch s {
+	case "role":
+		*otype = OverwriteRole
+		return nil
+	case "member":
+		*otype = OverwriteMember
+		return nil
+	}
+
+	u, err := strconv.ParseUint(s, 10, 8)
 	if err != nil {
 		return err
 	}