Completely update gdl with correct and new types and new endpoints

cache/boltcache.go

@@ -380,9 +380,13 @@ func (c *BoltCache) StoreChannels(channels []channel.Channel) {
 			b := tx.Bucket([]byte("channels"))
 
 			for _, ch := range channels {
+				var guildId uint64
+				if ch.GuildId != nil {
+					guildId = *ch.GuildId
+				}
 				cwg := channelWithGuild{
 					CachedChannel: ch.ToCachedChannel(),
-					guildId:       ch.GuildId,
+					guildId:       guildId,
 				}
 
 				if encoded, err := json.Marshal(cwg); err == nil {
@@ -732,7 +736,11 @@ func (c *BoltCache) StoreVoiceStates(states []guild.VoiceState) {
 
 		for _, state := range states {
 			if encoded, err := json.Marshal(state.ToCachedVoiceState()); err == nil {
-				if err := b.Put(memberToBytes(state.UserId, state.GuildId), encoded); err != nil {
+				guildId := uint64(0)
+				if state.GuildId != nil {
+					guildId = *state.GuildId
+				}
+				if err := b.Put(memberToBytes(state.UserId, guildId), encoded); err != nil {
 					return err
 				}
 			} else {
@@ -766,7 +774,7 @@ func (c *BoltCache) GetVoiceState(userId, guildId uint64) (guild.VoiceState, boo
 			u = user.User{Id: userId}
 		}
 
-		m = member.Member{User: u}
+		m = member.Member{User: &u}
 	}
 
 	state := cached.ToVoiceState(guildId, m)
@@ -805,7 +813,7 @@ func (c *BoltCache) GetGuildVoiceStates(guildId uint64) []guild.VoiceState {
 						u = user.User{Id: stateUserId}
 					}
 
-					m = member.Member{User: u}
+					m = member.Member{User: &u}
 				}
 
 				states = append(states, cached.ToVoiceState(guildId, m))

cache/memorycache.go

@@ -300,19 +300,21 @@ func (c *MemoryCache) StoreChannels(ctx context.Context, channels []channel.Chan
 
 			// Add to guild object
 			c.guildLock.Lock()
-			if guild, found := c.guilds[channel.GuildId]; found {
-				// Check to see if channel already exists
-				var channelExists bool
-				for _, userId := range guild.Channels {
-					if userId == channel.Id {
-						channelExists = true
-						break
+			if channel.GuildId != nil {
+				if guild, found := c.guilds[*channel.GuildId]; found {
+					// Check to see if channel already exists
+					var channelExists bool
+					for _, userId := range guild.Channels {
+						if userId == channel.Id {
+							channelExists = true
+							break
+						}
 					}
-				}
 
-				if !channelExists {
-					guild.Channels = append(guild.Channels, channel.Id)
-					c.guilds[channel.GuildId] = guild
+					if !channelExists {
+						guild.Channels = append(guild.Channels, channel.Id)
+						c.guilds[*channel.GuildId] = guild
+					}
 				}
 			}
 			c.guildLock.Unlock()
@@ -677,11 +679,15 @@ func (c *MemoryCache) StoreVoiceStates(ctx context.Context, states []guild.Voice
 		defer c.voiceStateLock.Unlock()
 
 		for _, state := range states {
-			if c.voiceStates[state.GuildId] == nil {
-				c.voiceStates[state.GuildId] = make(map[uint64]guild.CachedVoiceState)
+			if state.GuildId == nil {
+				continue
+			}
+			guildId := *state.GuildId
+			if c.voiceStates[guildId] == nil {
+				c.voiceStates[guildId] = make(map[uint64]guild.CachedVoiceState)
 			}
 
-			c.voiceStates[state.GuildId][state.UserId] = state.ToCachedVoiceState()
+			c.voiceStates[guildId][state.UserId] = state.ToCachedVoiceState()
 		}
 	}
 
@@ -702,11 +708,8 @@ func (c *MemoryCache) GetVoiceState(ctx context.Context, userId, guildId uint64)
 		// get member
 		m, err := c.GetMember(ctx, guildId, userId)
 		if err == ErrNotFound {
-			m = member.Member{
-				User: user.User{
-					Id: userId,
-				},
-			}
+			u := user.User{Id: userId}
+			m = member.Member{User: &u}
 		} else if err != nil {
 			return guild.VoiceState{}, err
 		}
@@ -730,11 +733,8 @@ func (c *MemoryCache) GetGuildVoiceStates(ctx context.Context, guildId uint64) (
 		// get member
 		m, err := c.GetMember(ctx, guildId, userId)
 		if err == ErrNotFound {
-			m = member.Member{
-				User: user.User{
-					Id: userId,
-				},
-			}
+			u := user.User{Id: userId}
+			m = member.Member{User: &u}
 		} else if err != nil {
 			return nil, err
 		}

cache/pgcache.go

@@ -255,7 +255,11 @@ func (c *PgCache) StoreGuilds(ctx context.Context, guilds []guild.Guild) error {
 					return err
 				}
 
-				batch.Queue(`INSERT INTO channels("channel_id", "guild_id", "data") VALUES($1, $2, $3) ON CONFLICT("channel_id") DO UPDATE SET "data" = $3;`, channel.Id, channel.GuildId, string(encoded))
+				var chGuildId uint64
+				if channel.GuildId != nil {
+					chGuildId = *channel.GuildId
+				}
+				batch.Queue(`INSERT INTO channels("channel_id", "guild_id", "data") VALUES($1, $2, $3) ON CONFLICT("channel_id") DO UPDATE SET "data" = $3;`, channel.Id, chGuildId, string(encoded))
 			}
 		}
 
@@ -316,7 +320,8 @@ func (c *PgCache) StoreGuild(ctx context.Context, g guild.Guild) error {
 	}
 
 	for i, channel := range g.Channels {
-		channel.GuildId = g.Id
+		gId := g.Id
+		channel.GuildId = &gId
 		g.Channels[i] = channel
 	}
 
@@ -362,10 +367,10 @@ func (c *PgCache) GetGuildChannels(ctx context.Context, guildId uint64) ([]chann
 	}
 
 	rows, err := c.Query(ctx, queryGetGuildChannels, guildId)
-	defer rows.Close()
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 
 	var channels []channel.Channel
 	for rows.Next() {
@@ -615,7 +620,11 @@ func (c *PgCache) StoreChannel(ctx context.Context, ch channel.Channel) error {
 		return err
 	}
 
-	_, err = c.Exec(ctx, queryInsertChannel, ch.Id, ch.GuildId, string(encoded))
+	var guildId uint64
+	if ch.GuildId != nil {
+		guildId = *ch.GuildId
+	}
+	_, err = c.Exec(ctx, queryInsertChannel, ch.Id, guildId, string(encoded))
 	return err
 }
 
@@ -632,7 +641,11 @@ func (c *PgCache) StoreChannels(ctx context.Context, channels []channel.Channel)
 			return err
 		}
 
-		batch.Queue(queryInsertChannel, ch.Id, ch.GuildId, string(encoded))
+		var chGuildId uint64
+		if ch.GuildId != nil {
+			chGuildId = *ch.GuildId
+		}
+		batch.Queue(queryInsertChannel, ch.Id, chGuildId, string(encoded))
 	}
 
 	br := c.SendBatch(ctx, batch)
@@ -664,7 +677,11 @@ func (c *PgCache) ReplaceChannels(ctx context.Context, guildId uint64, channels
 			return err
 		}
 
-		if _, err := tx.Exec(ctx, queryInsertChannel, ch.Id, ch.GuildId, string(encoded)); err != nil {
+		var txGuildId uint64
+		if ch.GuildId != nil {
+			txGuildId = *ch.GuildId
+		}
+		if _, err := tx.Exec(ctx, queryInsertChannel, ch.Id, txGuildId, string(encoded)); err != nil {
 			return err
 		}
 	}

command/commandhandler.go

@@ -59,12 +59,12 @@ func (h *CommandHandler) commandListener(s *gateway.Shard, e *events.MessageCrea
 	}
 
 	for _, cmd := range h.commands {
-		match := strings.ToLower(cmd.Name) == strings.ToLower(root)
+		match := strings.EqualFold(cmd.Name, root)
 
 		// check aliases
 		if !match {
 			for _, alias := range cmd.Aliases {
-				if strings.ToLower(cmd.Name) == strings.ToLower(alias) {
+				if strings.EqualFold(cmd.Name, alias) {
 					match = true
 					break
 				}
@@ -76,12 +76,12 @@ func (h *CommandHandler) commandListener(s *gateway.Shard, e *events.MessageCrea
 		argloop:
 			for i, arg := range args {
 				for _, sub := range cmd.SubCommands {
-					subMatch := strings.ToLower(arg) == strings.ToLower(sub.Name)
+					subMatch := strings.EqualFold(arg, sub.Name)
 
 					// check aliases
 					if !subMatch {
 						for _, alias := range sub.Aliases {
-							if strings.ToLower(arg) == strings.ToLower(alias) {
+							if strings.EqualFold(arg, alias) {
 								subMatch = true
 								break
 							}

examples/avatar/avatar.go

@@ -1,25 +1,19 @@
 package main
 
 import (
+	"context"
 	"fmt"
-	"net/http"
 
 	"github.com/TicketsBot-cloud/gdl/cache"
 	"github.com/TicketsBot-cloud/gdl/command"
 	"github.com/TicketsBot-cloud/gdl/gateway"
-	"github.com/TicketsBot-cloud/gdl/rest"
 	"github.com/TicketsBot-cloud/gdl/rest/ratelimit"
 	"github.com/sirupsen/logrus"
 )
 
 func main() {
-	cacheFactory := cache.BoltCacheFactory(cache.CacheOptions{
+	cacheFactory := cache.MemoryCacheFactory(cache.CacheOptions{
 		Users: true,
-	}, cache.BoltOptions{
-		ClearOnRestart: false,
-		Path:           "bolt.db",
-		FileMode:       600,
-		Options:        nil,
 	})
 
 	shardOptions := gateway.ShardOptions{
@@ -55,27 +49,14 @@ func registerCommands(sm *gateway.ShardManager) {
 
 func onCommand(ctx command.CommandContext) {
 	if len(ctx.Mentions) == 0 {
-		_, _ = ctx.Shard.CreateMessage(ctx.ChannelId, "You need to mention a user")
+		_, _ = ctx.Shard.CreateMessage(context.Background(), ctx.ChannelId, "You need to mention a user")
 		return
 	}
 
 	for _, mention := range ctx.Mentions {
-		res, err := http.Get(mention.AvatarUrl(2048))
+		_, err := ctx.Shard.CreateMessage(context.Background(), ctx.ChannelId, fmt.Sprintf("%s's avatar is: %s", mention.Username, mention.AvatarUrl(2048)))
 		if err != nil {
 			logrus.Warn(err.Error())
-			continue
 		}
-		defer res.Body.Close()
-
-		data := rest.CreateMessageData{
-			Content: fmt.Sprintf("%s's avatar is:", mention.Username),
-			File: &rest.File{
-				Name:        "avatar.png",
-				ContentType: res.Header.Get("Content-Type"),
-				Reader:      res.Body,
-			},
-		}
-
-		ctx.Shard.CreateMessageComplex(ctx.ChannelId, data)
 	}
 }

examples/starboard/starboard.go

@@ -1,6 +1,8 @@
 package main
 
 import (
+	"context"
+
 	"github.com/TicketsBot-cloud/gdl/cache"
 	"github.com/TicketsBot-cloud/gdl/gateway"
 	"github.com/TicketsBot-cloud/gdl/gateway/payloads/events"
@@ -16,14 +18,9 @@ const (
 )
 
 func main() {
-	cacheFactory := cache.BoltCacheFactory(cache.CacheOptions{
+	cacheFactory := cache.MemoryCacheFactory(cache.CacheOptions{
 		Guilds: true,
 		Users:  true,
-	}, cache.BoltOptions{
-		ClearOnRestart: false,
-		Path:           "bolt.db",
-		FileMode:       600,
-		Options:        nil,
 	})
 
 	shardOptions := gateway.ShardOptions{
@@ -47,20 +44,20 @@ func main() {
 
 func reactListener(s *gateway.Shard, e *events.MessageReactionAdd) {
 	// check the new reaction is a star
-	if e.Emoji.Name != "⭐" {
+	if *e.Emoji.Name != "⭐" {
 		return
 	}
 
 	// get people who have reacted with a star so we can check if we've met the threshold
-	reactors, err := s.GetReactions(e.ChannelId, e.MessageId, "⭐", rest.GetReactionsData{})
+	reactors, err := s.GetReactions(context.Background(), e.ChannelId, e.MessageId, "⭐", rest.GetReactionsData{})
 	if err != nil {
 		logrus.Warn(err)
 		return
 	}
 
 	if len(reactors) >= StarThreshold {
 		// get the message object so we can get the content & sender
-		msg, err := s.GetChannelMessage(e.ChannelId, e.MessageId)
+		msg, err := s.GetChannelMessage(context.Background(), e.ChannelId, e.MessageId)
 		if err != nil {
 			logrus.Warn(err)
 			return
@@ -72,7 +69,7 @@ func reactListener(s *gateway.Shard, e *events.MessageReactionAdd) {
 			SetAuthor(msg.Author.Username, "", msg.Author.AvatarUrl(256)).
 			SetDescription(msg.Content)
 
-		if _, err := s.CreateMessageEmbed(StarboardChannelId, embed); err != nil {
+		if _, err := s.CreateMessageEmbed(context.Background(), StarboardChannelId, embed); err != nil {
 			logrus.Warn(err)
 			return
 		}

gateway/cachelisteners.go

@@ -78,7 +78,7 @@ func guildMemberRemoveListener(s *Shard, e *events.GuildMemberRemove) {
 
 func guildMemberUpdateListener(s *Shard, e *events.GuildMemberUpdate) {
 	s.Cache.StoreMember(context.Background(), member.Member{
-		User:         e.User,
+		User:         &e.User,
 		Nick:         e.Nick,
 		Roles:        e.Roles,
 		PremiumSince: e.PremiumSince,

gateway/payloads/events/eventbus.go → gateway/eventbus.go

@@ -1,12 +1,11 @@
-package events
+package gateway
 
 type EventBus struct {
 	Listeners []interface{}
 }
 
 func NewEventBus() *EventBus {
-	return &EventBus{
-	}
+	return &EventBus{}
 }
 
 func (e *EventBus) RegisterListener(fn interface{}) {

gateway/payloads/events/applicationcommandpermissionsupdate.go

@@ -0,0 +1,7 @@
+package events
+
+import "github.com/TicketsBot-cloud/gdl/objects/interaction"
+
+type ApplicationCommandPermissionsUpdate struct {
+	interaction.GuildApplicationCommandPermissions
+}