fix go generate for activity types and add func AllEvents

andersfylling · Oct 26, 2019 · 6f89ac5 · 6f89ac5
1 parent 66aee69
commit 6f89ac5
Show file tree

Hide file tree

Showing 6 changed files with 118 additions and 2 deletions.
diff --git a/events_gen.go b/events_gen.go
diff --git a/generate/events/events.gotpl → generate/events/events.gohtml b/generate/events/events.gotpl → generate/events/events.gohtml
@@ -9,6 +9,26 @@ import (
 	"github.com/andersfylling/disgord/internal/event"
 )
 
+func AllEvents(except ...string) []string {
+    evtsMap := map[string]int8{
+    {{- range .}}
+        {{if .IsDiscordEvent }}
+            Evt{{.}}: 0,
+        {{ end}}
+    {{- end}}
+    }
+
+    for i := range except {
+        delete(evtsMap, except[i])
+    }
+
+    evts := make([]string, 0, len(evtsMap))
+    for k := range evtsMap {
+        evts = append(evts, k)
+    }
+    return evts
+}
+
 // ---------------------------
 
 {{range .}}

diff --git a/generate/events/main.go b/generate/events/main.go
@@ -87,7 +87,7 @@ func main() {
 	}
 
 	// And finally pass the event information to different templates to generate some files
-	makeFile(events, "generate/events/events.gotpl", "events_gen.go")
+	makeFile(events, "generate/events/events.gohtml", "events_gen.go")
 	makeFile(events, "generate/events/reactor.gotpl", "reactor_gen.go")
 }
 

diff --git a/generate/interfaces/main.go b/generate/interfaces/main.go
@@ -289,7 +289,7 @@ func getZeroVal(s string) (result string, success bool) {
 	case "nil":
 		result = s
 		// TODO: find out what the original data type is
-	case "VerificationLvl", "DefaultMessageNotificationLvl", "ExplicitContentFilterLvl", "MFALvl", "Discriminator", "PremiumType", "PermissionBits", "PermissionBit":
+	case "VerificationLvl", "DefaultMessageNotificationLvl", "ExplicitContentFilterLvl", "MFALvl", "Discriminator", "PremiumType", "PermissionBits", "PermissionBit", "activityFlag", "acitivityType":
 		result = "0"
 	}
 

diff --git a/iface_reseter_gen.go b/iface_reseter_gen.go
diff --git a/sort_gen.go b/sort_gen.go
@@ -321,6 +321,8 @@ func derefSliceP(v interface{}) (s interface{}) {
 		s = *t
 	case *[]*ActivityAssets:
 		s = *t
+	case *[]*ActivityEmoji:
+		s = *t
 	case *[]*ActivityParty:
 		s = *t
 	case *[]*ActivitySecrets:
@@ -505,6 +507,12 @@ func sortByID(v interface{}, flags Flag) {
 		} else {
 			less = func(i, j int) bool { return s[i].ID < s[j].ID }
 		}
+	case []*ActivityEmoji:
+		if descending {
+			less = func(i, j int) bool { return s[i].ID > s[j].ID }
+		} else {
+			less = func(i, j int) bool { return s[i].ID < s[j].ID }
+		}
 	case []*ActivityParty:
 		if descending {
 			less = func(i, j int) bool { return s[i].ID > s[j].ID }
@@ -913,6 +921,12 @@ func sortByName(v interface{}, flags Flag) {
 		} else {
 			less = func(i, j int) bool { return strings.ToLower(s[i].Name) < strings.ToLower(s[j].Name) }
 		}
+	case []*ActivityEmoji:
+		if descending {
+			less = func(i, j int) bool { return strings.ToLower(s[i].Name) > strings.ToLower(s[j].Name) }
+		} else {
+			less = func(i, j int) bool { return strings.ToLower(s[i].Name) < strings.ToLower(s[j].Name) }
+		}
 	case []*UserConnection:
 		if descending {
 			less = func(i, j int) bool { return strings.ToLower(s[i].Name) > strings.ToLower(s[j].Name) }