From 1132bbe0008e44f3a96c523bc8c957a60faca423 Mon Sep 17 00:00:00 2001 From: denverquane Date: Wed, 16 Dec 2020 22:43:08 -0700 Subject: [PATCH 01/50] Removed broker code (wingman) --- README.md | 1 - broker/broker.go | 331 ----------------------------------------------- main.go | 9 -- 3 files changed, 341 deletions(-) delete mode 100644 broker/broker.go diff --git a/README.md b/README.md index 307f3ce..8e77575 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,6 @@ storage of temporary tokens, and, crucially, communication between the Capture c ### Optional: * `GALACTUS_PORT`: The port on which Galactus will run and receive requests from AutoMuteUs. Defaults to 5858. -* `BROKER_PORT`: The port on which the broker will listen for socket connections from capture clients. Defaults to 8123. * `REDIS_USER`: Username to authenticate with Redis, if applicable. * `REDIS_PASS`: Password to authenticate with Redis, if applicable. diff --git a/broker/broker.go b/broker/broker.go deleted file mode 100644 index 50b8c30..0000000 --- a/broker/broker.go +++ /dev/null @@ -1,331 +0,0 @@ -package broker - -import ( - "context" - "encoding/json" - "errors" - "github.com/automuteus/utils/pkg/game" - "github.com/automuteus/utils/pkg/rediskey" - "github.com/automuteus/utils/pkg/task" - "github.com/go-redis/redis/v8" - socketio "github.com/googollee/go-socket.io" - "github.com/gorilla/mux" - "log" - "net/http" - "strconv" - "sync" - "time" -) - -const ConnectCodeLength = 8 - -type Broker struct { - client *redis.Client - - // map of socket IDs to connection codes - connections map[string]string - - ackKillChannels map[string]chan bool - connectionsLock sync.RWMutex -} - -func NewBroker(redisAddr, redisUser, redisPass string) *Broker { - rdb := redis.NewClient(&redis.Options{ - Addr: redisAddr, - Username: redisUser, - Password: redisPass, - DB: 0, // use default DB - }) - return &Broker{ - client: rdb, - connections: map[string]string{}, - ackKillChannels: map[string]chan bool{}, - connectionsLock: sync.RWMutex{}, - } -} - -func (broker *Broker) TasksListener(server *socketio.Server, connectCode string, killchan <-chan bool) { - pubsub := broker.client.Subscribe(context.Background(), rediskey.TasksSubscribe(connectCode)) - log.Println("Task listener OPEN for " + connectCode) - defer log.Println("Task listener CLOSE for " + connectCode) - channel := pubsub.Channel() - for { - select { - case t := <-channel: - taskObj := task.ModifyTask{} - - err := json.Unmarshal([]byte(t.Payload), &taskObj) - if err != nil { - log.Println(err) - break - } - - log.Println("Broadcasting " + t.Payload + " to room " + connectCode) - server.BroadcastToRoom("/", connectCode, "modify", t.Payload) - break - case <-killchan: - pubsub.Close() - return - } - } -} - -func (broker *Broker) Start(port string) { - server, err := socketio.NewServer(nil) - if err != nil { - log.Fatal(err) - } - - server.OnConnect("/", func(s socketio.Conn) error { - s.SetContext("") - log.Println("connected:", s.ID()) - return nil - }) - server.OnEvent("/", "connectCode", func(s socketio.Conn, msg string) { - log.Printf("Received connection code: \"%s\"", msg) - - if len(msg) != ConnectCodeLength { - s.Close() - } else { - killChannel := make(chan bool) - - broker.connectionsLock.Lock() - broker.connections[s.ID()] = msg - broker.ackKillChannels[s.ID()] = killChannel - broker.connectionsLock.Unlock() - - err := task.PushJob(context.Background(), broker.client, msg, task.ConnectionJob, "true") - if err != nil { - log.Println(err) - } - go broker.AckWorker(context.Background(), msg, killChannel) - } - }) - - // only join the room for the connect code once we ensure that the bot actually connects with a valid discord session - server.OnEvent("/", "botID", func(s socketio.Conn, msg int64) { - log.Printf("Received bot ID: \"%d\"", msg) - - broker.connectionsLock.RLock() - if code, ok := broker.connections[s.ID()]; ok { - // this socket is now listening for mutes that can be applied via that connect code - s.Join(code) - killChan := broker.ackKillChannels[s.ID()] - if killChan != nil { - go broker.TasksListener(server, code, killChan) - } else { - log.Println("Null killchannel for conncode: " + code + ". This means we got a Bot ID before a connect code!") - } - } - broker.connectionsLock.RUnlock() - }) - - server.OnEvent("/", "taskFailed", func(s socketio.Conn, msg string) { - log.Printf("Received failure for task ID: \"%s\"", msg) - - broker.client.Publish(context.Background(), rediskey.CompleteTask(msg), "false") - }) - - server.OnEvent("/", "taskComplete", func(s socketio.Conn, msg string) { - log.Printf("Received success for task ID: \"%s\"", msg) - - broker.client.Publish(context.Background(), rediskey.CompleteTask(msg), "true") - }) - - server.OnEvent("/", "lobby", func(s socketio.Conn, msg string) { - log.Println("lobby:", msg) - - // validation - var lobby game.Lobby - err := json.Unmarshal([]byte(msg), &lobby) - if err != nil { - log.Println(err) - } else { - broker.connectionsLock.RLock() - if cCode, ok := broker.connections[s.ID()]; ok { - err := task.PushJob(context.Background(), broker.client, cCode, task.LobbyJob, msg) - if err != nil { - log.Println(err) - } - err = broker.client.Set(context.Background(), rediskey.RoomCodesForConnCode(cCode), lobby.LobbyCode, time.Minute*15).Err() - if err != nil { - log.Println(err) - } else { - log.Printf("Updated room code %s for connect code %s in Redis", lobby.LobbyCode, cCode) - } - } - broker.connectionsLock.RUnlock() - } - }) - server.OnEvent("/", "state", func(s socketio.Conn, msg string) { - log.Println("phase received from capture: ", msg) - _, err := strconv.Atoi(msg) - if err != nil { - log.Println(err) - } else { - broker.connectionsLock.RLock() - if cCode, ok := broker.connections[s.ID()]; ok { - err := task.PushJob(context.Background(), broker.client, cCode, task.StateJob, msg) - if err != nil { - log.Println(err) - } - err = broker.client.Expire(context.Background(), rediskey.RoomCodesForConnCode(cCode), time.Minute*15).Err() - if !errors.Is(err, redis.Nil) && err != nil { - log.Println(err) - } - } - broker.connectionsLock.RUnlock() - } - }) - server.OnEvent("/", "player", func(s socketio.Conn, msg string) { - log.Println("player received from capture: ", msg) - - broker.connectionsLock.RLock() - if cCode, ok := broker.connections[s.ID()]; ok { - err := task.PushJob(context.Background(), broker.client, cCode, task.PlayerJob, msg) - if err != nil { - log.Println(err) - } - err = broker.client.Expire(context.Background(), rediskey.RoomCodesForConnCode(cCode), time.Minute*15).Err() - if !errors.Is(err, redis.Nil) && err != nil { - log.Println(err) - } - } - broker.connectionsLock.RUnlock() - }) - server.OnEvent("/", "gameover", func(s socketio.Conn, msg string) { - broker.connectionsLock.RLock() - if cCode, ok := broker.connections[s.ID()]; ok { - err := task.PushJob(context.Background(), broker.client, cCode, task.GameOverJob, msg) - if err != nil { - log.Println(err) - } - } - broker.connectionsLock.RUnlock() - }) - server.OnError("/", func(s socketio.Conn, e error) { - log.Println("meet error:", e) - }) - server.OnDisconnect("/", func(s socketio.Conn, reason string) { - log.Println("Client connection closed: ", reason) - - broker.connectionsLock.RLock() - if cCode, ok := broker.connections[s.ID()]; ok { - err := task.PushJob(context.Background(), broker.client, cCode, task.ConnectionJob, "false") - if err != nil { - log.Println(err) - } - server.ClearRoom("/", cCode) - } - broker.connectionsLock.RUnlock() - - broker.connectionsLock.Lock() - if c, ok := broker.ackKillChannels[s.ID()]; ok { - c <- true - } - delete(broker.ackKillChannels, s.ID()) - delete(broker.connections, s.ID()) - broker.connectionsLock.Unlock() - }) - go server.Serve() - defer server.Close() - - router := mux.NewRouter() - router.Handle("/socket.io/", server) - router.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { - // TODO For any higher-sensitivity info in the future, this should properly identify the origin specifically - w.Header().Set("Access-Control-Allow-Origin", "*") - w.Header().Set("Access-Control-Allow-Methods", "GET, OPTIONS") - w.Header().Set("Access-Control-Allow-Headers", "Accept, Content-Type, Content-Length") - - broker.connectionsLock.RLock() - activeConns := len(broker.connections) - broker.connectionsLock.RUnlock() - - // default to listing active games in the last 15 mins - activeGames := rediskey.GetActiveGames(context.Background(), broker.client, 900) - version, commit := rediskey.GetVersionAndCommit(context.Background(), broker.client) - totalGuilds := rediskey.GetGuildCounter(context.Background(), broker.client) - totalUsers := rediskey.GetTotalUsers(context.Background(), broker.client) - totalGames := rediskey.GetTotalGames(context.Background(), broker.client) - - data := map[string]interface{}{ - "version": version, - "commit": commit, - "totalGuilds": totalGuilds, - "activeConnections": activeConns, - "activeGames": activeGames, - "totalUsers": totalUsers, - "totalGames": totalGames, - } - - jsonBytes, err := json.Marshal(data) - if err != nil { - log.Println(err) - } - w.Write(jsonBytes) - }) - - router.HandleFunc("/lobbycode/{connectCode}", func(w http.ResponseWriter, r *http.Request) { - vars := mux.Vars(r) - conncode := vars["connectCode"] - - if conncode == "" || len(conncode) != ConnectCodeLength { - errorResponse(w) - return - } - - key, err := broker.client.Get(context.Background(), rediskey.RoomCodesForConnCode(conncode)).Result() - if errors.Is(err, redis.Nil) { - w.WriteHeader(http.StatusNotFound) - return - } - resp := Resp{Result: key} - jbytes, err := json.Marshal(resp) - if err != nil { - log.Println(err) - w.WriteHeader(http.StatusInternalServerError) - } else { - w.WriteHeader(http.StatusOK) - w.Write(jbytes) - } - }) - log.Printf("Message broker is running on port %s...\n", port) - log.Fatal(http.ListenAndServe(":"+port, router)) -} - -type Resp struct { - Result string `json:"result"` -} - -func errorResponse(w http.ResponseWriter) { - w.WriteHeader(http.StatusBadRequest) - r := Resp{Result: "error"} - jbytes, err := json.Marshal(r) - if err != nil { - log.Println(err) - w.WriteHeader(http.StatusInternalServerError) - } else { - w.Write(jbytes) - } -} - -// anytime a bot "acks", then push a notification -func (broker *Broker) AckWorker(ctx context.Context, connCode string, killChan <-chan bool) { - pubsub := task.AckSubscribe(ctx, broker.client, connCode) - channel := pubsub.Channel() - defer pubsub.Close() - - for { - select { - case <-killChan: - return - case <-channel: - err := task.PushJob(ctx, broker.client, connCode, task.ConnectionJob, "true") - if err != nil { - log.Println(err) - } - break - } - } -} diff --git a/main.go b/main.go index 84a6998..cf20b54 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,6 @@ package main import ( - "github.com/automuteus/galactus/broker" "github.com/automuteus/galactus/galactus" "log" "os" @@ -30,11 +29,6 @@ func main() { log.Println("No GALACTUS_PORT provided. Defaulting to " + DefaultGalactusPort) galactusPort = DefaultGalactusPort } - brokerPort := os.Getenv("BROKER_PORT") - if brokerPort == "" { - log.Println("No BROKER_PORT provided. Defaulting to " + DefaultBrokerPort) - brokerPort = DefaultBrokerPort - } redisUser := os.Getenv("REDIS_USER") redisPass := os.Getenv("REDIS_PASS") @@ -59,13 +53,10 @@ func main() { tp := galactus.NewTokenProvider(botToken, redisAddr, redisUser, redisPass, maxReq) tp.PopulateAndStartSessions() - msgBroker := broker.NewBroker(redisAddr, redisUser, redisPass) sc := make(chan os.Signal, 1) signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill) - go msgBroker.Start(brokerPort) - go tp.Run(galactusPort) <-sc tp.Close() From cbc37c027f240a568f1a0d9103b9815c9809b542 Mon Sep 17 00:00:00 2001 From: denverquane Date: Sat, 19 Dec 2020 13:15:17 -0700 Subject: [PATCH 02/50] Added shard manager, stubs for Discord event handlers --- go.mod | 4 +- go.sum | 49 +++-- internal/handler/guild_create.go | 12 ++ internal/handler/guild_delete.go | 12 ++ internal/handler/message_create.go | 28 +++ internal/handler/message_reaction_add.go | 12 ++ internal/handler/voice_state.go | 12 ++ {galactus => internal}/modify.go | 6 +- internal/redis/redis.go | 38 ++++ {galactus => internal}/server.go | 224 ++++++++++++----------- internal/shard_manager.go | 49 +++++ main.go | 5 +- 12 files changed, 321 insertions(+), 130 deletions(-) create mode 100644 internal/handler/guild_create.go create mode 100644 internal/handler/guild_delete.go create mode 100644 internal/handler/message_create.go create mode 100644 internal/handler/message_reaction_add.go create mode 100644 internal/handler/voice_state.go rename {galactus => internal}/modify.go (88%) create mode 100644 internal/redis/redis.go rename {galactus => internal}/server.go (65%) create mode 100644 internal/shard_manager.go diff --git a/go.mod b/go.mod index 24290e8..95d31d9 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,10 @@ go 1.15 require ( github.com/automuteus/utils v0.0.4 + github.com/bsm/redislock v0.7.0 github.com/bwmarrin/discordgo v0.22.0 github.com/go-redis/redis/v8 v8.4.2 - github.com/googollee/go-socket.io v1.4.4 github.com/gorilla/mux v1.8.0 + github.com/gorilla/websocket v1.4.1 // indirect + github.com/jonas747/dshardmanager v0.0.0-20180911185241-9e4282faed43 ) diff --git a/go.sum b/go.sum index 1eac26f..ce9631f 100644 --- a/go.sum +++ b/go.sum @@ -1,17 +1,17 @@ +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/automuteus/utils v0.0.1 h1:IP/dB2ozo2fiBTk5zksgdYMP8wtEotEws/lMaN8x224= -github.com/automuteus/utils v0.0.1/go.mod h1:hh3qQZ1bw0RkkWDqGdFr8w4oGJPgC6vLeQ22bC9/bFI= -github.com/automuteus/utils v0.0.2 h1:bnD1XH7thKJZRE04UBfr6dfpVfeWNGOTaxbJAKtumPk= -github.com/automuteus/utils v0.0.2/go.mod h1:hh3qQZ1bw0RkkWDqGdFr8w4oGJPgC6vLeQ22bC9/bFI= -github.com/automuteus/utils v0.0.3 h1:yc/Dxdiw4RFlXI05txhzwXaueTvvxumlZmdTLxbrBtA= -github.com/automuteus/utils v0.0.3/go.mod h1:hh3qQZ1bw0RkkWDqGdFr8w4oGJPgC6vLeQ22bC9/bFI= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/automuteus/utils v0.0.4 h1:weSw/mAMHjZvqEz6XR+jYVgrpawQhGGFb4PfWgt4JHg= github.com/automuteus/utils v0.0.4/go.mod h1:3/DMXEOYYnBADTtb0rbBsDBD+d+QDdIpBRbvhy8cPoI= +github.com/bsm/redislock v0.7.0 h1:RL7aZJhCKkuBjQbnSTKCeedTRifBWxd/ffP+GZ599Mo= +github.com/bsm/redislock v0.7.0/go.mod h1:3Kgu+cXw0JrkZ5pmY/JbcFpixGZ5M9v9G2PGWYqku+k= github.com/bwmarrin/discordgo v0.22.0 h1:uBxY1HmlVCsW1IuaPjpCGT6A2DBwRn0nvOguQIxDdFM= github.com/bwmarrin/discordgo v0.22.0/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= +github.com/cockroachdb/cockroach-go/v2 v2.0.3 h1:ZA346ACHIZctef6trOTwBAEvPVm1k0uLm/bb2Atc+S8= github.com/cockroachdb/cockroach-go/v2 v2.0.3/go.mod h1:hAuDgiVgDVkfirP9JnhXEfcXEPRKBpYdGz+l7mvYSzw= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -29,11 +29,14 @@ github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/georgysavva/scany v0.2.7 h1:SBEuurTvWOUp7FnGBOjeSF9XWaWmVzc91h9baPo6y2s= github.com/georgysavva/scany v0.2.7/go.mod h1:bcxPhzeQFQqAUmjlZVwTGlu6AnWFSOiHpalfBe0xQ6U= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-redis/redis/v8 v8.1.0/go.mod h1:isLoQT/NFSP7V67lyvM9GmdvLdyZ7pEhsXvvyQtnQTo= github.com/go-redis/redis/v8 v8.4.2 h1:gKRo1KZ+O3kXRfxeRblV5Tr470d2YJZJVIAv2/S8960= github.com/go-redis/redis/v8 v8.4.2/go.mod h1:A1tbYoHSa1fXwN+//ljcCYYJeLmVrwL9hbQN45Jdy0M= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE= github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -48,12 +51,11 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/googollee/go-socket.io v1.4.4 h1:UWOy//wzcT1ENMDeeVsrXwcCY49XOvC/YHVMZJDfy9M= -github.com/googollee/go-socket.io v1.4.4/go.mod h1:2lMkHRm5GLg158lACi6Zj6535AQaXuyA+IKbfqKzTOM= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= @@ -76,6 +78,7 @@ github.com/jackc/pgconn v1.8.0 h1:FmjZ0rOyXTr1wfWs45i4a9vjnjWUAGpMuQLD9OSs+lw= github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= +github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA= github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= @@ -122,20 +125,23 @@ github.com/jinzhu/gorm v1.9.12/go.mod h1:vhTjlKSJUTWNtcbQtrMBFCxy7eXTzeCAzfL5fBZ github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= +github.com/jonas747/dshardmanager v0.0.0-20180911185241-9e4282faed43 h1:KHo2jiz0A2Tdj889Ibu+wuwVUD6xursbrtdlZXGP+Cc= +github.com/jonas747/dshardmanager v0.0.0-20180911185241-9e4282faed43/go.mod h1:OxYl3OmsSR6ZQqhPsMDJvxAngw7LI/cZOsbpbqckiRI= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s= -github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.4.0 h1:TmtCFbH+Aw0AixwyttznSMQDgbR5Yed/Gg6S8Funrhc= github.com/lib/pq v1.4.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= @@ -151,10 +157,12 @@ github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.14.2 h1:8mVmC9kjFFmA8H4pKMUhcblgifdkOIXPvbhN1T36q1M= github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3 h1:gph6h/qe9GSUw1NhH1gp+qb+h8rXD8Cy60Z32Qw3ELA= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -169,6 +177,7 @@ github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThC github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shopspring/decimal v0.0.0-20200419222939-1884f454f8ea h1:jaXWVFZ98/ihXniiDzqNXQgMSgklX4kjfDWZTE3ZtdU= github.com/shopspring/decimal v0.0.0-20200419222939-1884f454f8ea/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -182,9 +191,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= +go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= go.opentelemetry.io/otel v0.14.0/go.mod h1:vH5xEuwy7Rts0GNtsCW3HYQoZDY+OmBJ6t1bFGGlxgw= go.opentelemetry.io/otel v0.15.0 h1:CZFy2lPhxd4HlhZnYK8gRyDotksO3Ip9rBweY1vVYJw= go.opentelemetry.io/otel v0.15.0/go.mod h1:e4GKElweB8W2gWUqbghw0B8t5MCTccc9212eNHnOHwA= @@ -203,12 +211,20 @@ golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaE golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20200908183739-ae8ad444f925/go.mod h1:1phAWC201xIgDyaFpmDeZkgf70Q4Pd/CNqfRtVPtxNw= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -225,18 +241,21 @@ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -250,9 +269,12 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -266,7 +288,10 @@ google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyz google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= diff --git a/internal/handler/guild_create.go b/internal/handler/guild_create.go new file mode 100644 index 0000000..c3d6295 --- /dev/null +++ b/internal/handler/guild_create.go @@ -0,0 +1,12 @@ +package handler + +import ( + "github.com/bwmarrin/discordgo" + "github.com/go-redis/redis/v8" +) + +func GuildCreateHandler(client *redis.Client) func(s *discordgo.Session, m *discordgo.GuildCreate) { + return func(s *discordgo.Session, m *discordgo.GuildCreate) { + + } +} diff --git a/internal/handler/guild_delete.go b/internal/handler/guild_delete.go new file mode 100644 index 0000000..78f783c --- /dev/null +++ b/internal/handler/guild_delete.go @@ -0,0 +1,12 @@ +package handler + +import ( + "github.com/bwmarrin/discordgo" + "github.com/go-redis/redis/v8" +) + +func GuildDeleteHandler(client *redis.Client) func(s *discordgo.Session, m *discordgo.GuildDelete) { + return func(s *discordgo.Session, m *discordgo.GuildDelete) { + + } +} diff --git a/internal/handler/message_create.go b/internal/handler/message_create.go new file mode 100644 index 0000000..a451719 --- /dev/null +++ b/internal/handler/message_create.go @@ -0,0 +1,28 @@ +package handler + +import ( + "context" + redis2 "github.com/automuteus/galactus/internal/redis" + "github.com/bwmarrin/discordgo" + "github.com/go-redis/redis/v8" +) + +func MessageCreateHandler(client *redis.Client) func(s *discordgo.Session, m *discordgo.MessageCreate) { + return func(s *discordgo.Session, m *discordgo.MessageCreate) { + // ignore messages created by the bot + if m.Author.ID == s.State.User.ID { + return + } + + if redis2.IsUserBanned(client, m.Author.ID) { + return + } + + snowflakeLock := redis2.LockSnowflake(context.Background(), client, m.ID) + // couldn't obtain lock; bail bail bail! + if snowflakeLock == nil { + return + } + defer snowflakeLock.Release(context.Background()) + } +} diff --git a/internal/handler/message_reaction_add.go b/internal/handler/message_reaction_add.go new file mode 100644 index 0000000..476eb59 --- /dev/null +++ b/internal/handler/message_reaction_add.go @@ -0,0 +1,12 @@ +package handler + +import ( + "github.com/bwmarrin/discordgo" + "github.com/go-redis/redis/v8" +) + +func MessageReactionAddHandler(client *redis.Client) func(s *discordgo.Session, m *discordgo.MessageReactionAdd) { + return func(s *discordgo.Session, m *discordgo.MessageReactionAdd) { + + } +} diff --git a/internal/handler/voice_state.go b/internal/handler/voice_state.go new file mode 100644 index 0000000..fd633af --- /dev/null +++ b/internal/handler/voice_state.go @@ -0,0 +1,12 @@ +package handler + +import ( + "github.com/bwmarrin/discordgo" + "github.com/go-redis/redis/v8" +) + +func VoiceStateUpdateHandler(client *redis.Client) func(s *discordgo.Session, m *discordgo.VoiceStateUpdate) { + return func(s *discordgo.Session, m *discordgo.VoiceStateUpdate) { + + } +} diff --git a/galactus/modify.go b/internal/modify.go similarity index 88% rename from galactus/modify.go rename to internal/modify.go index f66bc82..c5a97c1 100644 --- a/galactus/modify.go +++ b/internal/modify.go @@ -1,4 +1,4 @@ -package galactus +package internal import ( "context" @@ -9,7 +9,7 @@ import ( "time" ) -func (tokenProvider *TokenProvider) attemptOnSecondaryTokens(guildID, userID string, tokens []string, limit int, request task.UserModify) bool { +func (tokenProvider *GalactusAPI) attemptOnSecondaryTokens(guildID, userID string, tokens []string, limit int, request task.UserModify) bool { if tokens != nil && limit > 0 { sess, hToken := tokenProvider.getAnySession(guildID, tokens, limit) if sess != nil { @@ -30,7 +30,7 @@ func (tokenProvider *TokenProvider) attemptOnSecondaryTokens(guildID, userID str return false } -func (tokenProvider *TokenProvider) attemptOnCaptureBot(guildID, connectCode string, gid uint64, timeout time.Duration, request task.UserModify) bool { +func (tokenProvider *GalactusAPI) attemptOnCaptureBot(guildID, connectCode string, gid uint64, timeout time.Duration, request task.UserModify) bool { // this is cheeky, but use the connect code as part of the lock; don't issue too many requests on the capture client w/ this code if tokenProvider.IncrAndTestGuildTokenComboLock(guildID, connectCode) { // if the secondary token didn't work, then next we try the client-side capture request diff --git a/internal/redis/redis.go b/internal/redis/redis.go new file mode 100644 index 0000000..0c9f3b2 --- /dev/null +++ b/internal/redis/redis.go @@ -0,0 +1,38 @@ +package redis + +import ( + "context" + "errors" + "github.com/automuteus/utils/pkg/rediskey" + "github.com/bsm/redislock" + "github.com/go-redis/redis/v8" + "log" + "time" +) + +const SnowflakeLockDuration = time.Second * 3 + +func LockSnowflake(ctx context.Context, client *redis.Client, snowflake string) *redislock.Lock { + locker := redislock.New(client) + lock, err := locker.Obtain(ctx, rediskey.SnowflakeLockID(snowflake), SnowflakeLockDuration, nil) + if errors.Is(err, redislock.ErrNotObtained) { + return nil + } else if err != nil { + log.Println(err) + return nil + } + return lock +} + +func UserSoftbanKey(userID string) string { + return "automuteus:ratelimit:softban:user:" + userID +} + +func IsUserBanned(client *redis.Client, userID string) bool { + v, err := client.Exists(context.Background(), UserSoftbanKey(userID)).Result() + if err != nil { + log.Println(err) + return false + } + return v == 1 // =1 means the user is present, and thus rate-limited +} diff --git a/galactus/server.go b/internal/server.go similarity index 65% rename from galactus/server.go rename to internal/server.go index 46689da..e7750a1 100644 --- a/galactus/server.go +++ b/internal/server.go @@ -1,11 +1,10 @@ -package galactus +package internal import ( "context" "crypto/sha256" "encoding/hex" "encoding/json" - "errors" "github.com/automuteus/utils/pkg/premium" "github.com/automuteus/utils/pkg/rediskey" "github.com/automuteus/utils/pkg/task" @@ -13,12 +12,12 @@ import ( "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" "github.com/gorilla/mux" + "github.com/jonas747/dshardmanager" "io/ioutil" "log" "net/http" "os" "strconv" - "strings" "sync" "time" ) @@ -36,9 +35,9 @@ const DefaultCaptureBotTimeout = time.Second var ctx = context.Background() -type TokenProvider struct { - client *redis.Client - primarySession *discordgo.Session +type GalactusAPI struct { + client *redis.Client + shardManager *dshardmanager.Manager // maps hashed tokens to active discord sessions activeSessions map[string]*discordgo.Session @@ -46,7 +45,7 @@ type TokenProvider struct { sessionLock sync.RWMutex } -func NewTokenProvider(botToken, redisAddr, redisUser, redisPass string, maxReq int64) *TokenProvider { +func NewGalactusAPI(botToken, redisAddr, redisUser, redisPass string, maxReq int64) *GalactusAPI { rdb := redis.NewClient(&redis.Options{ Addr: redisAddr, Username: redisUser, @@ -54,44 +53,43 @@ func NewTokenProvider(botToken, redisAddr, redisUser, redisPass string, maxReq i DB: 0, // use default DB }) - token.WaitForToken(rdb, botToken) - token.LockForToken(rdb, botToken) - - dg, err := discordgo.New("Bot " + botToken) - if err != nil { - log.Fatal(err) - } - dg.Identify.Intents = discordgo.MakeIntent(discordgo.IntentsGuilds) - shards := os.Getenv("NUM_SHARDS") - if shards != "" { - n, err := strconv.ParseInt(shards, 10, 64) - if err != nil { - log.Println(err) - } - dg.ShardCount = int(n) - dg.ShardID = 0 - } - dg.AddHandler(rateLimitEventCallback) - - err = dg.Open() - if err != nil { - log.Fatal(err) - } - - return &TokenProvider{ + manager := MakeShardManager(botToken, discordgo.MakeIntent(discordgo.IntentsGuildVoiceStates|discordgo.IntentsGuildMessages|discordgo.IntentsGuilds|discordgo.IntentsGuildMessageReactions)) + AddHandlers(manager, rdb) + // + //token.WaitForToken(rdb, botToken) + //token.LockForToken(rdb, botToken) + // + //dg, err := discordgo.New("Bot " + botToken) + //if err != nil { + // log.Fatal(err) + //} + //dg.Identify.Intents = discordgo.MakeIntent(discordgo.IntentsGuilds) + //shards := os.Getenv("NUM_SHARDS") + //if shards != "" { + // n, err := strconv.ParseInt(shards, 10, 64) + // if err != nil { + // log.Println(err) + // } + // dg.ShardCount = int(n) + // dg.ShardID = 0 + //} + //dg.AddHandler(rateLimitEventCallback) + // + //err = dg.Open() + //if err != nil { + // log.Fatal(err) + //} + + return &GalactusAPI{ client: rdb, - primarySession: dg, + shardManager: manager, activeSessions: make(map[string]*discordgo.Session), maxRequests5Seconds: maxReq, sessionLock: sync.RWMutex{}, } } -func rateLimitEventCallback(sess *discordgo.Session, rl *discordgo.RateLimit) { - log.Println(rl.Message) -} - -func (tokenProvider *TokenProvider) PopulateAndStartSessions() { +func (tokenProvider *GalactusAPI) PopulateAndStartSessions() { keys, err := tokenProvider.client.HGetAll(ctx, rediskey.AllTokensHSet).Result() if err != nil { log.Println(err) @@ -103,7 +101,7 @@ func (tokenProvider *TokenProvider) PopulateAndStartSessions() { } } -func (tokenProvider *TokenProvider) openAndStartSessionWithToken(botToken string) bool { +func (tokenProvider *GalactusAPI) openAndStartSessionWithToken(botToken string) bool { k := hashToken(botToken) tokenProvider.sessionLock.Lock() defer tokenProvider.sessionLock.Unlock() @@ -131,7 +129,7 @@ func (tokenProvider *TokenProvider) openAndStartSessionWithToken(botToken string return false } -func (tokenProvider *TokenProvider) getAllTokensForGuild(guildID string) []string { +func (tokenProvider *GalactusAPI) getAllTokensForGuild(guildID string) []string { hTokens, err := tokenProvider.client.SMembers(context.Background(), rediskey.GuildTokensKey(guildID)).Result() if err != nil { return nil @@ -139,7 +137,7 @@ func (tokenProvider *TokenProvider) getAllTokensForGuild(guildID string) []strin return hTokens } -func (tokenProvider *TokenProvider) getAnySession(guildID string, tokens []string, limit int) (*discordgo.Session, string) { +func (tokenProvider *GalactusAPI) getAnySession(guildID string, tokens []string, limit int) (*discordgo.Session, string) { tokenProvider.sessionLock.RLock() defer tokenProvider.sessionLock.RUnlock() @@ -163,7 +161,7 @@ func (tokenProvider *TokenProvider) getAnySession(guildID string, tokens []strin return nil, "" } -func (tokenProvider *TokenProvider) IncrAndTestGuildTokenComboLock(guildID, hashToken string) bool { +func (tokenProvider *GalactusAPI) IncrAndTestGuildTokenComboLock(guildID, hashToken string) bool { i, err := tokenProvider.client.Incr(context.Background(), rediskey.GuildTokenLock(guildID, hashToken)).Result() if err != nil { log.Println(err) @@ -182,7 +180,7 @@ func (tokenProvider *TokenProvider) IncrAndTestGuildTokenComboLock(guildID, hash return true } -func (tokenProvider *TokenProvider) BlacklistTokenForDuration(guildID, hashToken string, duration time.Duration) error { +func (tokenProvider *GalactusAPI) BlacklistTokenForDuration(guildID, hashToken string, duration time.Duration) error { return tokenProvider.client.Set(context.Background(), rediskey.GuildTokenLock(guildID, hashToken), tokenProvider.maxRequests5Seconds, duration).Err() } @@ -190,7 +188,7 @@ const DefaultMaxWorkers = 8 var UnresponsiveCaptureBlacklistDuration = time.Minute * time.Duration(5) -func (tokenProvider *TokenProvider) Run(port string) { +func (tokenProvider *GalactusAPI) Run(port string) { r := mux.NewRouter() taskTimeoutms := DefaultCaptureBotTimeout @@ -271,7 +269,8 @@ func (tokenProvider *TokenProvider) Run(port string) { mdscLock.Unlock() } else { log.Printf("Applying mute=%v, deaf=%v using primary bot\n", request.Mute, request.Deaf) - err = task.ApplyMuteDeaf(tokenProvider.primarySession, guildID, userIDStr, request.Mute, request.Deaf) + // TODO round-robin the session ID (don't always go on 0; no reason) + err = task.ApplyMuteDeaf(tokenProvider.shardManager.Session(0), guildID, userIDStr, request.Mute, request.Deaf) if err != nil { log.Println(err) } else { @@ -306,80 +305,80 @@ func (tokenProvider *TokenProvider) Run(port string) { } }).Methods("POST") - r.HandleFunc("/addtoken", func(w http.ResponseWriter, r *http.Request) { - body, err := ioutil.ReadAll(r.Body) - if err != nil { - log.Println(err) - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte(err.Error())) - return - } - defer r.Body.Close() - - botToken := string(body) - log.Println(botToken) - - k := hashToken(botToken) - log.Println(k) - tokenProvider.sessionLock.RLock() - if _, ok := tokenProvider.activeSessions[k]; ok { - log.Println("Token already exists on the server") - w.WriteHeader(http.StatusAlreadyReported) - w.Write([]byte("Token already exists on the server")) - tokenProvider.sessionLock.RUnlock() - return - } - tokenProvider.sessionLock.RUnlock() - - token.WaitForToken(tokenProvider.client, botToken) - token.LockForToken(tokenProvider.client, botToken) - sess, err := discordgo.New("Bot " + botToken) - if err != nil { - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte(err.Error())) - return - } - sess.AddHandler(tokenProvider.newGuild(k)) - err = sess.Open() - if err != nil { - w.WriteHeader(http.StatusUnauthorized) - w.Write([]byte(err.Error())) - return - } - - tokenProvider.sessionLock.Lock() - tokenProvider.activeSessions[k] = sess - tokenProvider.sessionLock.Unlock() - - err = tokenProvider.client.HSet(ctx, rediskey.AllTokensHSet, k, botToken).Err() - if err != nil { - log.Println(err) - } - - for _, v := range sess.State.Guilds { - err := tokenProvider.client.SAdd(ctx, rediskey.GuildTokensKey(v.ID), k).Err() - if !errors.Is(err, redis.Nil) && err != nil { - log.Println(strings.ReplaceAll(err.Error(), botToken, "")) - } else { - log.Println("Added token for guild " + v.ID) - } - } - }).Methods("POST") + //r.HandleFunc("/addtoken", func(w http.ResponseWriter, r *http.Request) { + // body, err := ioutil.ReadAll(r.Body) + // if err != nil { + // log.Println(err) + // w.WriteHeader(http.StatusBadRequest) + // w.Write([]byte(err.Error())) + // return + // } + // defer r.Body.Close() + // + // botToken := string(body) + // log.Println(botToken) + // + // k := hashToken(botToken) + // log.Println(k) + // tokenProvider.sessionLock.RLock() + // if _, ok := tokenProvider.activeSessions[k]; ok { + // log.Println("Token already exists on the server") + // w.WriteHeader(http.StatusAlreadyReported) + // w.Write([]byte("Token already exists on the server")) + // tokenProvider.sessionLock.RUnlock() + // return + // } + // tokenProvider.sessionLock.RUnlock() + // + // token.WaitForToken(tokenProvider.client, botToken) + // token.LockForToken(tokenProvider.client, botToken) + // sess, err := discordgo.New("Bot " + botToken) + // if err != nil { + // w.WriteHeader(http.StatusBadRequest) + // w.Write([]byte(err.Error())) + // return + // } + // sess.AddHandler(tokenProvider.newGuild(k)) + // err = sess.Open() + // if err != nil { + // w.WriteHeader(http.StatusUnauthorized) + // w.Write([]byte(err.Error())) + // return + // } + // + // tokenProvider.sessionLock.Lock() + // tokenProvider.activeSessions[k] = sess + // tokenProvider.sessionLock.Unlock() + // + // err = tokenProvider.client.HSet(ctx, rediskey.AllTokensHSet, k, botToken).Err() + // if err != nil { + // log.Println(err) + // } + // + // for _, v := range sess.State.Guilds { + // err := tokenProvider.client.SAdd(ctx, rediskey.GuildTokensKey(v.ID), k).Err() + // if !errors.Is(err, redis.Nil) && err != nil { + // log.Println(strings.ReplaceAll(err.Error(), botToken, "")) + // } else { + // log.Println("Added token for guild " + v.ID) + // } + // } + //}).Methods("POST") r.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) w.Write([]byte("ok")) }).Methods("GET") - log.Println("Galactus token service is running on port " + port + "...") + log.Println("Galactus service is running on port " + port + "...") http.ListenAndServe(":"+port, r) } -func (tokenProvider *TokenProvider) rateLimitEventCallback(sess *discordgo.Session, rl *discordgo.RateLimit) { +func (tokenProvider *GalactusAPI) rateLimitEventCallback(sess *discordgo.Session, rl *discordgo.RateLimit) { log.Println(rl.Message) } -func (tokenProvider *TokenProvider) waitForAck(pubsub *redis.PubSub, waitTime time.Duration, result chan<- bool) { +func (tokenProvider *GalactusAPI) waitForAck(pubsub *redis.PubSub, waitTime time.Duration, result chan<- bool) { t := time.NewTimer(waitTime) defer pubsub.Close() channel := pubsub.Channel() @@ -404,18 +403,21 @@ func hashToken(token string) string { return hex.EncodeToString(h.Sum(nil)) } -func (tokenProvider *TokenProvider) Close() { +func (tokenProvider *GalactusAPI) Close() { + err := tokenProvider.shardManager.StopAll() + if err != nil { + log.Println(err) + } + tokenProvider.sessionLock.Lock() for _, v := range tokenProvider.activeSessions { v.Close() } - tokenProvider.activeSessions = map[string]*discordgo.Session{} tokenProvider.sessionLock.Unlock() - tokenProvider.primarySession.Close() } -func (tokenProvider *TokenProvider) newGuild(hashedToken string) func(s *discordgo.Session, m *discordgo.GuildCreate) { +func (tokenProvider *GalactusAPI) newGuild(hashedToken string) func(s *discordgo.Session, m *discordgo.GuildCreate) { return func(s *discordgo.Session, m *discordgo.GuildCreate) { tokenProvider.sessionLock.RLock() for test := range tokenProvider.activeSessions { diff --git a/internal/shard_manager.go b/internal/shard_manager.go new file mode 100644 index 0000000..9ee2f76 --- /dev/null +++ b/internal/shard_manager.go @@ -0,0 +1,49 @@ +package internal + +import ( + "github.com/automuteus/galactus/internal/handler" + "github.com/bwmarrin/discordgo" + "github.com/go-redis/redis/v8" + "github.com/jonas747/dshardmanager" + "log" +) + +const DefaultShards = 10 + +func MakeShardManager(token string, intent *discordgo.Intent) *dshardmanager.Manager { + manager := dshardmanager.New("Bot " + token) + manager.Name = "AutoMuteUs" + + recommended, err := manager.GetRecommendedCount() + if err != nil { + log.Fatal("Failed getting recommended shard count") + } + if recommended < 2 { + manager.SetNumShards(DefaultShards) + } + + log.Println("Starting the shard manager") + err = manager.Start() + if err != nil { + log.Fatal("Failed to start: ", err) + } + + log.Println("Started!") + + manager.Lock() + for _, v := range manager.Sessions { + v.Identify.Intents = intent + } + manager.Unlock() + + return manager +} + +func AddHandlers(manager *dshardmanager.Manager, client *redis.Client) { + manager.AddHandler(handler.GuildCreateHandler(client)) + manager.AddHandler(handler.GuildDeleteHandler(client)) + + manager.AddHandler(handler.VoiceStateUpdateHandler(client)) + manager.AddHandler(handler.MessageCreateHandler(client)) + manager.AddHandler(handler.MessageReactionAddHandler(client)) +} diff --git a/main.go b/main.go index cf20b54..2db9883 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/automuteus/galactus/galactus" + "github.com/automuteus/galactus/internal" "log" "os" "os/signal" @@ -10,7 +10,6 @@ import ( ) const DefaultGalactusPort = "5858" -const DefaultBrokerPort = "8123" const DefaultMaxRequests5Sec int64 = 7 func main() { @@ -51,7 +50,7 @@ func main() { maxReq = num } - tp := galactus.NewTokenProvider(botToken, redisAddr, redisUser, redisPass, maxReq) + tp := internal.NewGalactusAPI(botToken, redisAddr, redisUser, redisPass, maxReq) tp.PopulateAndStartSessions() sc := make(chan os.Signal, 1) From 4675b9ee0af82f2dd768cabf01213a733e9797b3 Mon Sep 17 00:00:00 2001 From: denverquane Date: Wed, 30 Dec 2020 16:15:36 -0700 Subject: [PATCH 03/50] Added zap logging, unit tests, Redis message queue stubs --- go.mod | 9 ++ go.sum | 35 +++++- internal/handler/guild_create.go | 20 +++- internal/handler/guild_delete.go | 20 +++- internal/handler/message_create.go | 32 +++++- internal/handler/message_reaction_add.go | 3 +- internal/handler/rate_limit.go | 16 +++ internal/handler/voice_state.go | 3 +- internal/redis/queue.go | 51 +++++++++ internal/redis/queue_test.go | 140 +++++++++++++++++++++++ internal/redis/redis.go | 3 +- internal/server.go | 39 ++----- internal/shard_manager.go | 37 +++--- main.go | 39 ++++--- 14 files changed, 371 insertions(+), 76 deletions(-) create mode 100644 internal/handler/rate_limit.go create mode 100644 internal/redis/queue.go create mode 100644 internal/redis/queue_test.go diff --git a/go.mod b/go.mod index 95d31d9..bacd049 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,20 @@ module github.com/automuteus/galactus go 1.15 require ( + github.com/alicebob/miniredis v2.5.0+incompatible // indirect + github.com/alicebob/miniredis/v2 v2.14.1 github.com/automuteus/utils v0.0.4 github.com/bsm/redislock v0.7.0 github.com/bwmarrin/discordgo v0.22.0 + github.com/elliotchance/redismock v1.5.3 + github.com/go-redis/redis v6.15.9+incompatible // indirect github.com/go-redis/redis/v8 v8.4.2 + github.com/gomodule/redigo v1.8.3 // indirect github.com/gorilla/mux v1.8.0 github.com/gorilla/websocket v1.4.1 // indirect github.com/jonas747/dshardmanager v0.0.0-20180911185241-9e4282faed43 + go.uber.org/multierr v1.6.0 // indirect + go.uber.org/zap v1.16.0 ) + +replace github.com/bwmarrin/discordgo v0.22.0 => github.com/automuteus/discordgo v0.22.1 diff --git a/go.sum b/go.sum index ce9631f..646ebac 100644 --- a/go.sum +++ b/go.sum @@ -1,14 +1,24 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk= +github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc= +github.com/alicebob/miniredis v2.5.0+incompatible h1:yBHoLpsyjupjz3NL3MhKMVkR41j82Yjf3KFv7ApYzUI= +github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk= +github.com/alicebob/miniredis/v2 v2.14.1 h1:GjlbSeoJ24bzdLRs13HoMEeaRZx9kg5nHoRW7QV/nCs= +github.com/alicebob/miniredis/v2 v2.14.1/go.mod h1:uS970Sw5Gs9/iK3yBg0l9Uj9s25wXxSpQUE9EaJ/Blg= +github.com/automuteus/discordgo v0.22.1 h1:IU58OXAtpTosrYq/MCMVbpoVuOuUeandgyju5MpuLQo= +github.com/automuteus/discordgo v0.22.1/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= github.com/automuteus/utils v0.0.4 h1:weSw/mAMHjZvqEz6XR+jYVgrpawQhGGFb4PfWgt4JHg= github.com/automuteus/utils v0.0.4/go.mod h1:3/DMXEOYYnBADTtb0rbBsDBD+d+QDdIpBRbvhy8cPoI= github.com/bsm/redislock v0.7.0 h1:RL7aZJhCKkuBjQbnSTKCeedTRifBWxd/ffP+GZ599Mo= github.com/bsm/redislock v0.7.0/go.mod h1:3Kgu+cXw0JrkZ5pmY/JbcFpixGZ5M9v9G2PGWYqku+k= -github.com/bwmarrin/discordgo v0.22.0 h1:uBxY1HmlVCsW1IuaPjpCGT6A2DBwRn0nvOguQIxDdFM= -github.com/bwmarrin/discordgo v0.22.0/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/cockroachdb/cockroach-go/v2 v2.0.3 h1:ZA346ACHIZctef6trOTwBAEvPVm1k0uLm/bb2Atc+S8= @@ -23,6 +33,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +github.com/elliotchance/redismock v1.5.3 h1:Lgi2CLfVB3PamPI1SPqjJf5AiGisPFMWvIOCiRIq+sI= +github.com/elliotchance/redismock v1.5.3/go.mod h1:8FFsGWghPUyP7nqj/UYXr2xqd6U2iNMxS4S5+Xadl5A= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= @@ -30,6 +42,8 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4 github.com/georgysavva/scany v0.2.7 h1:SBEuurTvWOUp7FnGBOjeSF9XWaWmVzc91h9baPo6y2s= github.com/georgysavva/scany v0.2.7/go.mod h1:bcxPhzeQFQqAUmjlZVwTGlu6AnWFSOiHpalfBe0xQ6U= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg= +github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/go-redis/redis/v8 v8.1.0/go.mod h1:isLoQT/NFSP7V67lyvM9GmdvLdyZ7pEhsXvvyQtnQTo= github.com/go-redis/redis/v8 v8.4.2 h1:gKRo1KZ+O3kXRfxeRblV5Tr470d2YJZJVIAv2/S8960= github.com/go-redis/redis/v8 v8.4.2/go.mod h1:A1tbYoHSa1fXwN+//ljcCYYJeLmVrwL9hbQN45Jdy0M= @@ -48,6 +62,8 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/gomodule/redigo v1.8.3 h1:HR0kYDX2RJZvAup8CsiJwxB4dTCSC0AaUq6S4SiLwUc= +github.com/gomodule/redigo v1.8.3/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -191,6 +207,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb h1:ZkM6LRnq40pR1Ox0hTHlnpkcOTuFIDQpZ1IN8rKKhX0= +github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= go.opentelemetry.io/otel v0.14.0/go.mod h1:vH5xEuwy7Rts0GNtsCW3HYQoZDY+OmBJ6t1bFGGlxgw= @@ -198,12 +216,20 @@ go.opentelemetry.io/otel v0.15.0 h1:CZFy2lPhxd4HlhZnYK8gRyDotksO3Ip9rBweY1vVYJw= go.opentelemetry.io/otel v0.15.0/go.mod h1:e4GKElweB8W2gWUqbghw0B8t5MCTccc9212eNHnOHwA= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= +go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM= +go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -220,10 +246,12 @@ golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL golang.org/x/exp v0.0.0-20200908183739-ae8ad444f925/go.mod h1:1phAWC201xIgDyaFpmDeZkgf70Q4Pd/CNqfRtVPtxNw= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449 h1:xUIPaMhvROX9dhPvRCenIJtU78+lbEenGbgqB5hfHCQ= golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -239,6 +267,7 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -270,6 +299,7 @@ golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa h1:5E4dL8+NgFOgjwbTKz+OOEGGhP+ectTmF842l6KjupQ= golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -304,4 +334,5 @@ gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= diff --git a/internal/handler/guild_create.go b/internal/handler/guild_create.go index c3d6295..4885ed3 100644 --- a/internal/handler/guild_create.go +++ b/internal/handler/guild_create.go @@ -1,12 +1,28 @@ package handler import ( + "encoding/json" + redis_utils "github.com/automuteus/galactus/internal/redis" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" + "go.uber.org/zap" ) -func GuildCreateHandler(client *redis.Client) func(s *discordgo.Session, m *discordgo.GuildCreate) { +func GuildCreateHandler(logger *zap.Logger, client *redis.Client) func(s *discordgo.Session, m *discordgo.GuildCreate) { return func(s *discordgo.Session, m *discordgo.GuildCreate) { - + byt, err := json.Marshal(m) + if err != nil { + logger.Error("error marshalling json for GuildCreate message", + zap.Error(err)) + } + err = redis_utils.PushDiscordMessage(client, redis_utils.GuildCreate, byt) + if err != nil { + logger.Error("error pushing discord message to Redis for GuildCreate", + zap.Error(err)) + } else { + logger.Info("received GuildCreate message", + zap.String("ID", m.ID), + ) + } } } diff --git a/internal/handler/guild_delete.go b/internal/handler/guild_delete.go index 78f783c..4f9e1e9 100644 --- a/internal/handler/guild_delete.go +++ b/internal/handler/guild_delete.go @@ -1,12 +1,28 @@ package handler import ( + "encoding/json" + redis_utils "github.com/automuteus/galactus/internal/redis" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" + "go.uber.org/zap" ) -func GuildDeleteHandler(client *redis.Client) func(s *discordgo.Session, m *discordgo.GuildDelete) { +func GuildDeleteHandler(logger *zap.Logger, client *redis.Client) func(s *discordgo.Session, m *discordgo.GuildDelete) { return func(s *discordgo.Session, m *discordgo.GuildDelete) { - + byt, err := json.Marshal(m) + if err != nil { + logger.Error("error marshalling json for GuildDelete message", + zap.Error(err)) + } + err = redis_utils.PushDiscordMessage(client, redis_utils.GuildDelete, byt) + if err != nil { + logger.Error("error pushing to Redis for GuildDelete message", + zap.Error(err)) + } else { + logger.Info("received GuildDelete message", + zap.String("ID", m.ID), + ) + } } } diff --git a/internal/handler/message_create.go b/internal/handler/message_create.go index a451719..c8449c9 100644 --- a/internal/handler/message_create.go +++ b/internal/handler/message_create.go @@ -2,27 +2,51 @@ package handler import ( "context" - redis2 "github.com/automuteus/galactus/internal/redis" + "encoding/json" + redis_utils "github.com/automuteus/galactus/internal/redis" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" + "go.uber.org/zap" ) -func MessageCreateHandler(client *redis.Client) func(s *discordgo.Session, m *discordgo.MessageCreate) { +func MessageCreateHandler(logger *zap.Logger, client *redis.Client) func(s *discordgo.Session, m *discordgo.MessageCreate) { return func(s *discordgo.Session, m *discordgo.MessageCreate) { // ignore messages created by the bot if m.Author.ID == s.State.User.ID { return } - if redis2.IsUserBanned(client, m.Author.ID) { + // TODO should find an efficient way to hook into a guild's prefix here. Would allow for filtering messages + // quickly without pushing them into the queue + + if redis_utils.IsUserBanned(client, m.Author.ID) { + logger.Info("ignoring message from softbanned user", + zap.String("author ID", m.Author.ID), + zap.String("message ID", m.Message.ID), + zap.String("contents", m.Message.Content)) return } - snowflakeLock := redis2.LockSnowflake(context.Background(), client, m.ID) + snowflakeLock := redis_utils.LockSnowflake(context.Background(), client, m.ID) // couldn't obtain lock; bail bail bail! if snowflakeLock == nil { + logger.Info("could not obtain snowflake lock", + zap.String("type", "MessageCreate"), + zap.Int("shard ID", s.ShardID), + zap.String("snowflakeID", m.ID)) return } defer snowflakeLock.Release(context.Background()) + + byt, err := json.Marshal(m) + if err != nil { + logger.Error("error marshalling json for MessageCreate message", + zap.Error(err)) + } + err = redis_utils.PushDiscordMessage(client, redis_utils.MessageCreate, byt) + if err != nil { + logger.Error("error pushing discord message to Redis for MessageCreate message", + zap.Error(err)) + } } } diff --git a/internal/handler/message_reaction_add.go b/internal/handler/message_reaction_add.go index 476eb59..0af90b1 100644 --- a/internal/handler/message_reaction_add.go +++ b/internal/handler/message_reaction_add.go @@ -3,9 +3,10 @@ package handler import ( "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" + "go.uber.org/zap" ) -func MessageReactionAddHandler(client *redis.Client) func(s *discordgo.Session, m *discordgo.MessageReactionAdd) { +func MessageReactionAddHandler(logger *zap.Logger, client *redis.Client) func(s *discordgo.Session, m *discordgo.MessageReactionAdd) { return func(s *discordgo.Session, m *discordgo.MessageReactionAdd) { } diff --git a/internal/handler/rate_limit.go b/internal/handler/rate_limit.go new file mode 100644 index 0000000..33a6be1 --- /dev/null +++ b/internal/handler/rate_limit.go @@ -0,0 +1,16 @@ +package handler + +import ( + "github.com/bwmarrin/discordgo" + "github.com/go-redis/redis/v8" + "go.uber.org/zap" +) + +func RateLimitHandler(logger *zap.Logger, client *redis.Client) func(sess *discordgo.Session, rl *discordgo.RateLimit) { + return func(sess *discordgo.Session, rl *discordgo.RateLimit) { + logger.Info("rate limit exceeded", + zap.String("message", rl.Message), + zap.String("url", rl.URL), + ) + } +} diff --git a/internal/handler/voice_state.go b/internal/handler/voice_state.go index fd633af..34c2976 100644 --- a/internal/handler/voice_state.go +++ b/internal/handler/voice_state.go @@ -3,9 +3,10 @@ package handler import ( "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" + "go.uber.org/zap" ) -func VoiceStateUpdateHandler(client *redis.Client) func(s *discordgo.Session, m *discordgo.VoiceStateUpdate) { +func VoiceStateUpdateHandler(logger *zap.Logger, client *redis.Client) func(s *discordgo.Session, m *discordgo.VoiceStateUpdate) { return func(s *discordgo.Session, m *discordgo.VoiceStateUpdate) { } diff --git a/internal/redis/queue.go b/internal/redis/queue.go new file mode 100644 index 0000000..c038221 --- /dev/null +++ b/internal/redis/queue.go @@ -0,0 +1,51 @@ +package redis + +import ( + "context" + "encoding/json" + "github.com/go-redis/redis/v8" +) + +const GatewayMessageKey = "automuteus:gateway:message" + +type DiscordMessageType int + +const ( + GuildCreate DiscordMessageType = iota + GuildDelete + VoiceStateUpdate + MessageCreate + MessageReactionAdd +) + +type DiscordMessage struct { + MessageType DiscordMessageType + Data []byte +} + +func PushDiscordMessage(client *redis.Client, messageType DiscordMessageType, data []byte) error { + s := DiscordMessage{ + MessageType: messageType, + Data: data, + } + byt, err := json.Marshal(s) + if err != nil { + return err + } + + return client.LPush(context.Background(), GatewayMessageKey, byt).Err() +} + +func PopDiscordMessage(client *redis.Client) (*DiscordMessage, error) { + res, err := client.RPop(context.Background(), GatewayMessageKey).Result() + if err != nil { + return nil, err + } + + var d DiscordMessage + err = json.Unmarshal([]byte(res), &d) + if err != nil { + return nil, err + } + return &d, nil +} diff --git a/internal/redis/queue_test.go b/internal/redis/queue_test.go new file mode 100644 index 0000000..ef13159 --- /dev/null +++ b/internal/redis/queue_test.go @@ -0,0 +1,140 @@ +package redis + +import ( + "errors" + "github.com/alicebob/miniredis/v2" + "github.com/go-redis/redis/v8" + "log" + "strings" + "testing" +) + +const inputMsg = "{\"id\":\"0\"," + + "\"channel_id\":\"1\"," + + "\"guild_id\":\"2\"," + + "\"content\":\"test\"," + + "\"timestamp\":\"2020-12-30T22:37:43.404000+00:00\"," + + "\"edited_timestamp\":\"\"," + + "\"mention_roles\":[]," + + "\"tts\":false," + + "\"mention_everyone\":false," + + "\"author\":{\"id\":\"3\",\"email\":\"\",\"username\":\"Soup\",\"avatar\":\"omitted\",\"locale\":\"\",\"discriminator\":\"1234\",\"token\":\"\",\"verified\":false,\"mfa_enabled\":false,\"bot\":false,\"public_flags\":0,\"premium_type\":0,\"system\":false,\"flags\":0}," + + "\"attachments\":[]," + + "\"embeds\":[]," + + "\"mentions\":[]," + + "\"reactions\":null," + + "\"pinned\":false," + + "\"type\":0," + + "\"webhook_id\":\"\"," + + "\"member\":{\"guild_id\":\"\",\"joined_at\":\"2016-01-25T07:32:22.570000+00:00\",\"nick\":\"\",\"deaf\":false,\"mute\":false,\"user\":null,\"roles\":[],\"premium_since\":\"\"}," + + "\"mention_channels\":null," + + "\"activity\":null," + + "\"application\":null," + + "\"message_reference\":null," + + "\"flags\":0}" + +func TestPopEmpty(t *testing.T) { + client := newTestRedis() + msg, err := PopDiscordMessage(client) + + if msg != nil { + t.Fatal("non-nil message received from empty pop") + } + + if err == nil { + t.Fatal("nil error returned from empty pop") + } + + if !errors.Is(err, redis.Nil) { + t.Fatal("error returned from empty pop is not redis.Nil") + } +} + +func TestPushAndPopSingle(t *testing.T) { + client := newTestRedis() + + err := PushDiscordMessage(client, MessageCreate, []byte(inputMsg)) + if err != nil { + t.Fatal(err) + } + + msg, err := PopDiscordMessage(client) + if err != nil { + t.Fatal(err) + } else if msg == nil { + t.Fatal("nil message returned when expected the previous msg we pushed") + } + + if msg.MessageType != MessageCreate { + t.Fatal("returned msg type is not msgcreate") + } + + if !strings.EqualFold(inputMsg, string(msg.Data)) { + t.Fatal("input and output messages are not equivalent") + } +} + +func TestPushAndPopMultiple(t *testing.T) { + client := newTestRedis() + + err := PushDiscordMessage(client, MessageCreate, []byte(inputMsg)) + if err != nil { + log.Fatal(err) + } + input2 := strings.Replace(inputMsg, "\"id\":\"0\"", "\"id\":\"1\"", 1) + err = PushDiscordMessage(client, MessageCreate, []byte(input2)) + if err != nil { + log.Fatal(err) + } + + msg, err := PopDiscordMessage(client) + if err != nil { + log.Fatal(err) + } else if msg == nil { + log.Fatal("nil message returned when expected the previous msg we pushed") + } + + if msg.MessageType != MessageCreate { + t.Fatal("returned msg type is not msgcreate") + } + + if !strings.EqualFold(inputMsg, string(msg.Data)) { + t.Fatal("input and output messages are not equivalent") + } + + msg, err = PopDiscordMessage(client) + if err != nil { + log.Fatal(err) + } else if msg == nil { + log.Fatal("nil message returned when expected the previous msg we pushed for input2") + } + + if msg.MessageType != MessageCreate { + t.Fatal("returned msg type is not msgcreate for input2") + } + + if !strings.EqualFold(input2, string(msg.Data)) { + t.Fatal("input2 and output messages are not equivalent") + } + + // replace back; now the string comparison should fail + input2 = strings.Replace(input2, "\"id\":\"1\"", "\"id\":\"0\"", 1) + + if strings.EqualFold(input2, string(msg.Data)) { + t.Fatal("input and output messages are equivalent, when we mutated the input on purpose") + } +} + +// newTestRedis returns a redis.Cmdable. +func newTestRedis() *redis.Client { + mr, err := miniredis.Run() + if err != nil { + panic(err) + } + + client := redis.NewClient(&redis.Options{ + Addr: mr.Addr(), + }) + + return client +} diff --git a/internal/redis/redis.go b/internal/redis/redis.go index 0c9f3b2..5f22938 100644 --- a/internal/redis/redis.go +++ b/internal/redis/redis.go @@ -24,6 +24,7 @@ func LockSnowflake(ctx context.Context, client *redis.Client, snowflake string) return lock } +// TODO use the one in utils func UserSoftbanKey(userID string) string { return "automuteus:ratelimit:softban:user:" + userID } @@ -34,5 +35,5 @@ func IsUserBanned(client *redis.Client, userID string) bool { log.Println(err) return false } - return v == 1 // =1 means the user is present, and thus rate-limited + return v == 1 // = 1 means the user is present, and thus rate-limited } diff --git a/internal/server.go b/internal/server.go index e7750a1..f4d3f7e 100644 --- a/internal/server.go +++ b/internal/server.go @@ -13,6 +13,7 @@ import ( "github.com/go-redis/redis/v8" "github.com/gorilla/mux" "github.com/jonas747/dshardmanager" + "go.uber.org/zap" "io/ioutil" "log" "net/http" @@ -33,7 +34,7 @@ var PremiumBotConstraints = map[premium.Tier]int{ const DefaultCaptureBotTimeout = time.Second -var ctx = context.Background() +var DefaultIntents = discordgo.MakeIntent(discordgo.IntentsGuildVoiceStates | discordgo.IntentsGuildMessages | discordgo.IntentsGuilds | discordgo.IntentsGuildMessageReactions) type GalactusAPI struct { client *redis.Client @@ -45,7 +46,7 @@ type GalactusAPI struct { sessionLock sync.RWMutex } -func NewGalactusAPI(botToken, redisAddr, redisUser, redisPass string, maxReq int64) *GalactusAPI { +func NewGalactusAPI(logger *zap.Logger, botToken, redisAddr, redisUser, redisPass string, maxReq int64) *GalactusAPI { rdb := redis.NewClient(&redis.Options{ Addr: redisAddr, Username: redisUser, @@ -53,32 +54,8 @@ func NewGalactusAPI(botToken, redisAddr, redisUser, redisPass string, maxReq int DB: 0, // use default DB }) - manager := MakeShardManager(botToken, discordgo.MakeIntent(discordgo.IntentsGuildVoiceStates|discordgo.IntentsGuildMessages|discordgo.IntentsGuilds|discordgo.IntentsGuildMessageReactions)) - AddHandlers(manager, rdb) - // - //token.WaitForToken(rdb, botToken) - //token.LockForToken(rdb, botToken) - // - //dg, err := discordgo.New("Bot " + botToken) - //if err != nil { - // log.Fatal(err) - //} - //dg.Identify.Intents = discordgo.MakeIntent(discordgo.IntentsGuilds) - //shards := os.Getenv("NUM_SHARDS") - //if shards != "" { - // n, err := strconv.ParseInt(shards, 10, 64) - // if err != nil { - // log.Println(err) - // } - // dg.ShardCount = int(n) - // dg.ShardID = 0 - //} - //dg.AddHandler(rateLimitEventCallback) - // - //err = dg.Open() - //if err != nil { - // log.Fatal(err) - //} + manager := MakeShardManager(logger, botToken, DefaultIntents) + AddHandlers(logger, manager, rdb) return &GalactusAPI{ client: rdb, @@ -90,7 +67,7 @@ func NewGalactusAPI(botToken, redisAddr, redisUser, redisPass string, maxReq int } func (tokenProvider *GalactusAPI) PopulateAndStartSessions() { - keys, err := tokenProvider.client.HGetAll(ctx, rediskey.AllTokensHSet).Result() + keys, err := tokenProvider.client.HGetAll(context.Background(), rediskey.AllTokensHSet).Result() if err != nil { log.Println(err) return @@ -374,7 +351,7 @@ func (tokenProvider *GalactusAPI) Run(port string) { http.ListenAndServe(":"+port, r) } -func (tokenProvider *GalactusAPI) rateLimitEventCallback(sess *discordgo.Session, rl *discordgo.RateLimit) { +func rateLimitEventCallback(sess *discordgo.Session, rl *discordgo.RateLimit) { log.Println(rl.Message) } @@ -422,7 +399,7 @@ func (tokenProvider *GalactusAPI) newGuild(hashedToken string) func(s *discordgo tokenProvider.sessionLock.RLock() for test := range tokenProvider.activeSessions { if hashedToken == test { - err := tokenProvider.client.SAdd(ctx, rediskey.GuildTokensKey(m.Guild.ID), hashedToken) + err := tokenProvider.client.SAdd(context.Background(), rediskey.GuildTokensKey(m.Guild.ID), hashedToken) if err != nil { log.Println(err) } else { diff --git a/internal/shard_manager.go b/internal/shard_manager.go index 9ee2f76..c27c8b7 100644 --- a/internal/shard_manager.go +++ b/internal/shard_manager.go @@ -5,30 +5,31 @@ import ( "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" "github.com/jonas747/dshardmanager" - "log" + "go.uber.org/zap" ) -const DefaultShards = 10 - -func MakeShardManager(token string, intent *discordgo.Intent) *dshardmanager.Manager { +func MakeShardManager(logger *zap.Logger, token string, intent *discordgo.Intent) *dshardmanager.Manager { manager := dshardmanager.New("Bot " + token) manager.Name = "AutoMuteUs" recommended, err := manager.GetRecommendedCount() if err != nil { - log.Fatal("Failed getting recommended shard count") - } - if recommended < 2 { - manager.SetNumShards(DefaultShards) + logger.Fatal("failed to obtain recommended shard count", + zap.Error(err)) } - log.Println("Starting the shard manager") + manager.SetNumShards(recommended) + + logger.Info("starting shard manager", + zap.Int("num shards", manager.GetNumShards())) + err = manager.Start() if err != nil { - log.Fatal("Failed to start: ", err) + logger.Fatal("failed to start shard manager", + zap.Error(err)) } - log.Println("Started!") + logger.Info("shard manager started successfully") manager.Lock() for _, v := range manager.Sessions { @@ -39,11 +40,13 @@ func MakeShardManager(token string, intent *discordgo.Intent) *dshardmanager.Man return manager } -func AddHandlers(manager *dshardmanager.Manager, client *redis.Client) { - manager.AddHandler(handler.GuildCreateHandler(client)) - manager.AddHandler(handler.GuildDeleteHandler(client)) +func AddHandlers(logger *zap.Logger, manager *dshardmanager.Manager, client *redis.Client) { + manager.AddHandler(handler.GuildCreateHandler(logger, client)) + manager.AddHandler(handler.GuildDeleteHandler(logger, client)) + + manager.AddHandler(handler.VoiceStateUpdateHandler(logger, client)) + manager.AddHandler(handler.MessageCreateHandler(logger, client)) + manager.AddHandler(handler.MessageReactionAddHandler(logger, client)) - manager.AddHandler(handler.VoiceStateUpdateHandler(client)) - manager.AddHandler(handler.MessageCreateHandler(client)) - manager.AddHandler(handler.MessageReactionAddHandler(client)) + manager.AddHandler(handler.RateLimitHandler(logger, client)) } diff --git a/main.go b/main.go index 2db9883..3bf6df0 100644 --- a/main.go +++ b/main.go @@ -2,6 +2,7 @@ package main import ( "github.com/automuteus/galactus/internal" + "go.uber.org/zap" "log" "os" "os/signal" @@ -13,6 +14,12 @@ const DefaultGalactusPort = "5858" const DefaultMaxRequests5Sec int64 = 7 func main() { + logger, err := zap.NewProduction() + if err != nil { + log.Println("Failed to initialize logger with error") + log.Fatal(err) + } + botToken := os.Getenv("DISCORD_BOT_TOKEN") if botToken == "" { log.Fatal("No DISCORD_BOT_TOKEN specified. Exiting.") @@ -31,26 +38,28 @@ func main() { redisUser := os.Getenv("REDIS_USER") redisPass := os.Getenv("REDIS_PASS") - if redisUser != "" { - log.Println("Using REDIS_USER=" + redisUser) - } else { - log.Println("No REDIS_USER specified.") - } - - if redisPass != "" { - log.Println("Using REDIS_PASS=") - } else { - log.Println("No REDIS_PASS specified.") - } maxReq5Sec := os.Getenv("MAX_REQ_5_SEC") maxReq := DefaultMaxRequests5Sec - num, err := strconv.ParseInt(maxReq5Sec, 10, 64) - if err == nil { - maxReq = num + if maxReq5Sec != "" { + num, err := strconv.ParseInt(maxReq5Sec, 10, 64) + if err == nil { + maxReq = num + } else { + logger.Error("failed to parse MAX_REQ_5_SEC as int64", + zap.String("received", maxReq5Sec)) + } } - tp := internal.NewGalactusAPI(botToken, redisAddr, redisUser, redisPass, maxReq) + logger.Info("loaded env", + zap.String("DISCORD_BOT_TOKEN", botToken), + zap.String("REDIS_ADDR", redisAddr), + zap.String("REDIS_USER", redisUser), + zap.String("REDIS_PASS", redisPass), + zap.Int("MAX_REQ_5_SEC", int(maxReq)), + ) + + tp := internal.NewGalactusAPI(logger, botToken, redisAddr, redisUser, redisPass, maxReq) tp.PopulateAndStartSessions() sc := make(chan os.Signal, 1) From 5de468b6059cd29e176388bceaa7bebc2cbdd85b Mon Sep 17 00:00:00 2001 From: denverquane Date: Wed, 30 Dec 2020 18:05:36 -0700 Subject: [PATCH 04/50] Added full logging for remaining events --- internal/handler/guild_create.go | 7 +++--- internal/handler/guild_delete.go | 7 +++--- internal/handler/log.go | 16 ++++++++++++ internal/handler/message_create.go | 7 +++++- internal/handler/message_reaction_add.go | 18 +++++++++++++- internal/handler/voice_state.go | 16 ++++++++++++ internal/redis/queue.go | 8 ++++++ internal/server.go | 31 ++++++++++++++++-------- 8 files changed, 92 insertions(+), 18 deletions(-) create mode 100644 internal/handler/log.go diff --git a/internal/handler/guild_create.go b/internal/handler/guild_create.go index 4885ed3..a44a2a1 100644 --- a/internal/handler/guild_create.go +++ b/internal/handler/guild_create.go @@ -10,6 +10,9 @@ import ( func GuildCreateHandler(logger *zap.Logger, client *redis.Client) func(s *discordgo.Session, m *discordgo.GuildCreate) { return func(s *discordgo.Session, m *discordgo.GuildCreate) { + if m == nil { + return + } byt, err := json.Marshal(m) if err != nil { logger.Error("error marshalling json for GuildCreate message", @@ -20,9 +23,7 @@ func GuildCreateHandler(logger *zap.Logger, client *redis.Client) func(s *discor logger.Error("error pushing discord message to Redis for GuildCreate", zap.Error(err)) } else { - logger.Info("received GuildCreate message", - zap.String("ID", m.ID), - ) + LogDiscordMessagePush(logger, redis_utils.GuildCreate, m.ID, "", m.OwnerID, m.ID) } } } diff --git a/internal/handler/guild_delete.go b/internal/handler/guild_delete.go index 4f9e1e9..8412940 100644 --- a/internal/handler/guild_delete.go +++ b/internal/handler/guild_delete.go @@ -10,6 +10,9 @@ import ( func GuildDeleteHandler(logger *zap.Logger, client *redis.Client) func(s *discordgo.Session, m *discordgo.GuildDelete) { return func(s *discordgo.Session, m *discordgo.GuildDelete) { + if m == nil { + return + } byt, err := json.Marshal(m) if err != nil { logger.Error("error marshalling json for GuildDelete message", @@ -20,9 +23,7 @@ func GuildDeleteHandler(logger *zap.Logger, client *redis.Client) func(s *discor logger.Error("error pushing to Redis for GuildDelete message", zap.Error(err)) } else { - logger.Info("received GuildDelete message", - zap.String("ID", m.ID), - ) + LogDiscordMessagePush(logger, redis_utils.GuildDelete, m.ID, "", m.OwnerID, m.ID) } } } diff --git a/internal/handler/log.go b/internal/handler/log.go new file mode 100644 index 0000000..2f12f37 --- /dev/null +++ b/internal/handler/log.go @@ -0,0 +1,16 @@ +package handler + +import ( + "github.com/automuteus/galactus/internal/redis" + "go.uber.org/zap" +) + +func LogDiscordMessagePush(logger *zap.Logger, msgType redis.DiscordMessageType, guildID, channelID, userID, ID string) { + logger.Info("pushed discord message to Redis", + zap.String("type", redis.DiscordMessageTypeStrings[msgType]), + zap.String("guild_id", guildID), + zap.String("channel_id", channelID), + zap.String("user_id", userID), + zap.String("id", ID), + ) +} diff --git a/internal/handler/message_create.go b/internal/handler/message_create.go index c8449c9..fb24bd2 100644 --- a/internal/handler/message_create.go +++ b/internal/handler/message_create.go @@ -11,8 +11,11 @@ import ( func MessageCreateHandler(logger *zap.Logger, client *redis.Client) func(s *discordgo.Session, m *discordgo.MessageCreate) { return func(s *discordgo.Session, m *discordgo.MessageCreate) { + if m == nil { + return + } // ignore messages created by the bot - if m.Author.ID == s.State.User.ID { + if m.Author == nil || m.Author.ID == s.State.User.ID { return } @@ -47,6 +50,8 @@ func MessageCreateHandler(logger *zap.Logger, client *redis.Client) func(s *disc if err != nil { logger.Error("error pushing discord message to Redis for MessageCreate message", zap.Error(err)) + } else { + LogDiscordMessagePush(logger, redis_utils.MessageCreate, m.GuildID, m.ChannelID, m.Author.ID, m.ID) } } } diff --git a/internal/handler/message_reaction_add.go b/internal/handler/message_reaction_add.go index 0af90b1..595e304 100644 --- a/internal/handler/message_reaction_add.go +++ b/internal/handler/message_reaction_add.go @@ -1,6 +1,8 @@ package handler import ( + "encoding/json" + redis_utils "github.com/automuteus/galactus/internal/redis" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" "go.uber.org/zap" @@ -8,6 +10,20 @@ import ( func MessageReactionAddHandler(logger *zap.Logger, client *redis.Client) func(s *discordgo.Session, m *discordgo.MessageReactionAdd) { return func(s *discordgo.Session, m *discordgo.MessageReactionAdd) { - + if m == nil { + return + } + byt, err := json.Marshal(m) + if err != nil { + logger.Error("error marshalling json for MessageReactionAdd message", + zap.Error(err)) + } + err = redis_utils.PushDiscordMessage(client, redis_utils.MessageReactionAdd, byt) + if err != nil { + logger.Error("error pushing to Redis for MessageReactionAdd message", + zap.Error(err)) + } else { + LogDiscordMessagePush(logger, redis_utils.MessageReactionAdd, m.GuildID, m.ChannelID, m.UserID, m.MessageID) + } } } diff --git a/internal/handler/voice_state.go b/internal/handler/voice_state.go index 34c2976..2168491 100644 --- a/internal/handler/voice_state.go +++ b/internal/handler/voice_state.go @@ -1,6 +1,8 @@ package handler import ( + "encoding/json" + redis_utils "github.com/automuteus/galactus/internal/redis" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" "go.uber.org/zap" @@ -8,6 +10,20 @@ import ( func VoiceStateUpdateHandler(logger *zap.Logger, client *redis.Client) func(s *discordgo.Session, m *discordgo.VoiceStateUpdate) { return func(s *discordgo.Session, m *discordgo.VoiceStateUpdate) { + // TODO filter voice changes when a game isn't happening in this guild. + // probably won't work to filter changes just by the voice channel ID; results in ppl not being unmuted when they leave the VC + byt, err := json.Marshal(m) + if err != nil { + logger.Error("error marshalling json for VoiceStateUpdate message", + zap.Error(err)) + } + err = redis_utils.PushDiscordMessage(client, redis_utils.VoiceStateUpdate, byt) + if err != nil { + logger.Error("error pushing to Redis for VoiceStateUpdate message", + zap.Error(err)) + } else { + LogDiscordMessagePush(logger, redis_utils.VoiceStateUpdate, m.GuildID, m.ChannelID, m.UserID, m.SessionID) + } } } diff --git a/internal/redis/queue.go b/internal/redis/queue.go index c038221..0e6b66d 100644 --- a/internal/redis/queue.go +++ b/internal/redis/queue.go @@ -18,6 +18,14 @@ const ( MessageReactionAdd ) +var DiscordMessageTypeStrings = []string{ + "GuildCreate", + "GuildDelete", + "VoiceStateUpdate", + "MessageCreate", + "MessageReactionAdd", +} + type DiscordMessage struct { MessageType DiscordMessageType Data []byte diff --git a/internal/server.go b/internal/server.go index f4d3f7e..739649e 100644 --- a/internal/server.go +++ b/internal/server.go @@ -5,6 +5,7 @@ import ( "crypto/sha256" "encoding/hex" "encoding/json" + "github.com/alicebob/miniredis/v2" "github.com/automuteus/utils/pkg/premium" "github.com/automuteus/utils/pkg/rediskey" "github.com/automuteus/utils/pkg/task" @@ -23,6 +24,8 @@ import ( "time" ) +const MOCK_REDIS = true + var PremiumBotConstraints = map[premium.Tier]int{ 0: 0, 1: 0, // Free and Bronze have no premium bots @@ -47,12 +50,24 @@ type GalactusAPI struct { } func NewGalactusAPI(logger *zap.Logger, botToken, redisAddr, redisUser, redisPass string, maxReq int64) *GalactusAPI { - rdb := redis.NewClient(&redis.Options{ - Addr: redisAddr, - Username: redisUser, - Password: redisPass, - DB: 0, // use default DB - }) + var rdb *redis.Client + if MOCK_REDIS { + mr, err := miniredis.Run() + if err != nil { + panic(err) + } + + rdb = redis.NewClient(&redis.Options{ + Addr: mr.Addr(), + }) + } else { + rdb = redis.NewClient(&redis.Options{ + Addr: redisAddr, + Username: redisUser, + Password: redisPass, + DB: 0, // use default DB + }) + } manager := MakeShardManager(logger, botToken, DefaultIntents) AddHandlers(logger, manager, rdb) @@ -351,10 +366,6 @@ func (tokenProvider *GalactusAPI) Run(port string) { http.ListenAndServe(":"+port, r) } -func rateLimitEventCallback(sess *discordgo.Session, rl *discordgo.RateLimit) { - log.Println(rl.Message) -} - func (tokenProvider *GalactusAPI) waitForAck(pubsub *redis.PubSub, waitTime time.Duration, result chan<- bool) { t := time.NewTimer(waitTime) defer pubsub.Close() From deca83b4ae7eba5b300adf243e48bdc59611241a Mon Sep 17 00:00:00 2001 From: denverquane Date: Sat, 2 Jan 2021 15:40:23 -0700 Subject: [PATCH 05/50] Basic job request/pop functionality --- internal/handler/message_reaction_add.go | 6 ++ internal/redis/queue.go | 19 +++--- internal/server.go | 75 +++++++++++++++++++++++- main.go | 2 +- 4 files changed, 88 insertions(+), 14 deletions(-) diff --git a/internal/handler/message_reaction_add.go b/internal/handler/message_reaction_add.go index 595e304..56d8682 100644 --- a/internal/handler/message_reaction_add.go +++ b/internal/handler/message_reaction_add.go @@ -13,6 +13,12 @@ func MessageReactionAddHandler(logger *zap.Logger, client *redis.Client) func(s if m == nil { return } + + // ignore reactions from the bot + if m.UserID == s.State.User.ID { + return + } + byt, err := json.Marshal(m) if err != nil { logger.Error("error marshalling json for MessageReactionAdd message", diff --git a/internal/redis/queue.go b/internal/redis/queue.go index 0e6b66d..fa705f9 100644 --- a/internal/redis/queue.go +++ b/internal/redis/queue.go @@ -28,13 +28,13 @@ var DiscordMessageTypeStrings = []string{ type DiscordMessage struct { MessageType DiscordMessageType - Data []byte + Data string } func PushDiscordMessage(client *redis.Client, messageType DiscordMessageType, data []byte) error { s := DiscordMessage{ MessageType: messageType, - Data: data, + Data: string(data), } byt, err := json.Marshal(s) if err != nil { @@ -44,16 +44,15 @@ func PushDiscordMessage(client *redis.Client, messageType DiscordMessageType, da return client.LPush(context.Background(), GatewayMessageKey, byt).Err() } -func PopDiscordMessage(client *redis.Client) (*DiscordMessage, error) { +func PopRawDiscordMessage(client *redis.Client) (string, error) { res, err := client.RPop(context.Background(), GatewayMessageKey).Result() if err != nil { - return nil, err + return "", err } - var d DiscordMessage - err = json.Unmarshal([]byte(res), &d) - if err != nil { - return nil, err - } - return &d, nil + return res, nil +} + +func DiscordMessagesSize(client *redis.Client) (int64, error) { + return client.LLen(context.Background(), GatewayMessageKey).Result() } diff --git a/internal/server.go b/internal/server.go index 739649e..a411d89 100644 --- a/internal/server.go +++ b/internal/server.go @@ -5,7 +5,9 @@ import ( "crypto/sha256" "encoding/hex" "encoding/json" + "errors" "github.com/alicebob/miniredis/v2" + redis_utils "github.com/automuteus/galactus/internal/redis" "github.com/automuteus/utils/pkg/premium" "github.com/automuteus/utils/pkg/rediskey" "github.com/automuteus/utils/pkg/task" @@ -24,7 +26,7 @@ import ( "time" ) -const MOCK_REDIS = true +const MockRedis = true var PremiumBotConstraints = map[premium.Tier]int{ 0: 0, @@ -51,7 +53,7 @@ type GalactusAPI struct { func NewGalactusAPI(logger *zap.Logger, botToken, redisAddr, redisUser, redisPass string, maxReq int64) *GalactusAPI { var rdb *redis.Client - if MOCK_REDIS { + if MockRedis { mr, err := miniredis.Run() if err != nil { panic(err) @@ -176,11 +178,15 @@ func (tokenProvider *GalactusAPI) BlacklistTokenForDuration(guildID, hashToken s return tokenProvider.client.Set(context.Background(), rediskey.GuildTokenLock(guildID, hashToken), tokenProvider.maxRequests5Seconds, duration).Err() } +type JobsNumber struct { + Jobs int64 `json:"jobs"` +} + const DefaultMaxWorkers = 8 var UnresponsiveCaptureBlacklistDuration = time.Minute * time.Duration(5) -func (tokenProvider *GalactusAPI) Run(port string) { +func (tokenProvider *GalactusAPI) Run(logger *zap.Logger, port string) { r := mux.NewRouter() taskTimeoutms := DefaultCaptureBotTimeout @@ -356,6 +362,69 @@ func (tokenProvider *GalactusAPI) Run(port string) { // } // } //}).Methods("POST") + // TODO maybe eventually provide some auth parameter, or version number? Something to prove that a worker can pop requests? + r.HandleFunc("/request/job", func(w http.ResponseWriter, r *http.Request) { + msg, err := redis_utils.PopRawDiscordMessage(tokenProvider.client) + + // no jobs available + switch { + case errors.Is(err, redis.Nil): + w.WriteHeader(http.StatusAccepted) + w.Write([]byte("{\"status\": \"No jobs available\"}")) + return + case err != nil: + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte("{\"error\": \"" + err.Error() + "\"}")) + logger.Error("redis error when popping job", + zap.String("endpoint", "/request/job"), + zap.Error(err)) + return + case msg == "": + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte("{\"error\": \"Nil job returned, despite no Redis errors\"}")) + logger.Error("nil job returned, despite no Redis errors", + zap.String("endpoint", "/request/job")) + return + } + + w.WriteHeader(http.StatusOK) + + _, err = w.Write([]byte(msg)) + if err != nil { + logger.Error("failed to write job as HTTP response", + zap.String("endpoint", "/request/job"), + zap.Error(err), + ) + } + }).Methods("POST") + + r.HandleFunc("/jobs", func(w http.ResponseWriter, r *http.Request) { + var jobs JobsNumber + + num, err := redis_utils.DiscordMessagesSize(tokenProvider.client) + if err == nil || errors.Is(err, redis.Nil) { + if errors.Is(err, redis.Nil) { + jobs.Jobs = 0 + } else { + jobs.Jobs = num + } + + byt, err := json.Marshal(jobs) + if err != nil { + logger.Error("error marshalling JobsNumber", + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte("{\"error\": \"" + err.Error() + "\"}")) + } else { + w.WriteHeader(http.StatusOK) + w.Write(byt) + } + } else { + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte("{\"error\": \"" + err.Error() + "\"}")) + } + }).Methods("GET") r.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) diff --git a/main.go b/main.go index 3bf6df0..41a5a9c 100644 --- a/main.go +++ b/main.go @@ -65,7 +65,7 @@ func main() { sc := make(chan os.Signal, 1) signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill) - go tp.Run(galactusPort) + go tp.Run(logger, galactusPort) <-sc tp.Close() } From b8aa2e20a928cf041e456e01d577a5145bea51c4 Mon Sep 17 00:00:00 2001 From: denverquane Date: Tue, 5 Jan 2021 01:57:48 -0700 Subject: [PATCH 06/50] Log env, move core galactus files, include latest utils --- go.mod | 3 +- go.sum | 2 + internal/galactus/modify.go | 218 ++++++++++ internal/galactus/server.go | 383 ++++++++++++++++++ internal/{ => galactus}/shard_manager.go | 2 +- internal/modify.go | 71 ---- internal/redis/queue_test.go | 48 ++- internal/redis/redis.go | 7 +- internal/server.go | 493 ----------------------- main.go | 35 +- 10 files changed, 670 insertions(+), 592 deletions(-) create mode 100644 internal/galactus/modify.go create mode 100644 internal/galactus/server.go rename internal/{ => galactus}/shard_manager.go (98%) delete mode 100644 internal/modify.go delete mode 100644 internal/server.go diff --git a/go.mod b/go.mod index bacd049..22866de 100644 --- a/go.mod +++ b/go.mod @@ -5,10 +5,9 @@ go 1.15 require ( github.com/alicebob/miniredis v2.5.0+incompatible // indirect github.com/alicebob/miniredis/v2 v2.14.1 - github.com/automuteus/utils v0.0.4 + github.com/automuteus/utils v0.0.6 github.com/bsm/redislock v0.7.0 github.com/bwmarrin/discordgo v0.22.0 - github.com/elliotchance/redismock v1.5.3 github.com/go-redis/redis v6.15.9+incompatible // indirect github.com/go-redis/redis/v8 v8.4.2 github.com/gomodule/redigo v1.8.3 // indirect diff --git a/go.sum b/go.sum index 646ebac..03c134c 100644 --- a/go.sum +++ b/go.sum @@ -12,6 +12,8 @@ github.com/automuteus/discordgo v0.22.1 h1:IU58OXAtpTosrYq/MCMVbpoVuOuUeandgyju5 github.com/automuteus/discordgo v0.22.1/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= github.com/automuteus/utils v0.0.4 h1:weSw/mAMHjZvqEz6XR+jYVgrpawQhGGFb4PfWgt4JHg= github.com/automuteus/utils v0.0.4/go.mod h1:3/DMXEOYYnBADTtb0rbBsDBD+d+QDdIpBRbvhy8cPoI= +github.com/automuteus/utils v0.0.6 h1:u14BvwfFzHN8A0aJ4qbeG7vkkyK2brnBYSOjMakWars= +github.com/automuteus/utils v0.0.6/go.mod h1:3/DMXEOYYnBADTtb0rbBsDBD+d+QDdIpBRbvhy8cPoI= github.com/bsm/redislock v0.7.0 h1:RL7aZJhCKkuBjQbnSTKCeedTRifBWxd/ffP+GZ599Mo= github.com/bsm/redislock v0.7.0/go.mod h1:3Kgu+cXw0JrkZ5pmY/JbcFpixGZ5M9v9G2PGWYqku+k= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= diff --git a/internal/galactus/modify.go b/internal/galactus/modify.go new file mode 100644 index 0000000..e9d5d9a --- /dev/null +++ b/internal/galactus/modify.go @@ -0,0 +1,218 @@ +package galactus + +import ( + "context" + "encoding/json" + "github.com/automuteus/utils/pkg/rediskey" + "github.com/automuteus/utils/pkg/task" + "github.com/gorilla/mux" + "go.uber.org/zap" + "io/ioutil" + "log" + "math/rand" + "net/http" + "strconv" + "sync" + "time" +) + +func (galactus *GalactusAPI) attemptOnSecondaryTokens(guildID, userID string, tokens []string, limit int, request task.UserModify) bool { + if tokens != nil && limit > 0 { + sess, hToken := galactus.getAnySession(guildID, tokens, limit) + if sess != nil { + err := task.ApplyMuteDeaf(sess, guildID, userID, request.Mute, request.Deaf) + if err != nil { + galactus.logger.Error("failed to apply mute/deaf on secondary bot", + zap.Error(err), + zap.String("guildID", guildID), + zap.Uint64("userID", request.UserID), + zap.String("hashedToken", hToken), + zap.Bool("mute", request.Mute), + zap.Bool("deaf", request.Deaf), + ) + } else { + galactus.logger.Info("successfully applied mute/deaf on secondary bot", + zap.Error(err), + zap.String("guildID", guildID), + zap.Uint64("userID", request.UserID), + zap.String("hashedToken", hToken), + zap.Bool("mute", request.Mute), + zap.Bool("deaf", request.Deaf), + ) + return true + } + } else { + galactus.logger.Info("no secondary bot tokens found", + zap.String("guildID", guildID), + zap.String("userID", userID), + ) + } + } else { + galactus.logger.Info("guild has no access to secondary bot tokens; skipping", + zap.String("guildID", guildID), + ) + } + return false +} + +var UnresponsiveCaptureBlacklistDuration = time.Minute * time.Duration(5) + +func (galactus *GalactusAPI) attemptOnCaptureBot(guildID, connectCode string, gid uint64, timeout time.Duration, request task.UserModify) bool { + // this is cheeky, but use the connect code as part of the lock; don't issue too many requests on the capture client w/ this code + if galactus.IncrAndTestGuildTokenComboLock(guildID, connectCode) { + // if the secondary token didn't work, then next we try the client-side capture request + taskObj := task.NewModifyTask(gid, request.UserID, task.PatchParams{ + Deaf: request.Deaf, + Mute: request.Mute, + }) + jBytes, err := json.Marshal(taskObj) + if err != nil { + log.Println(err) + return false + } + acked := make(chan bool) + // now we wait for an ack with respect to actually performing the mute + pubsub := galactus.client.Subscribe(context.Background(), rediskey.CompleteTask(taskObj.TaskID)) + err = galactus.client.Publish(context.Background(), rediskey.TasksSubscribe(connectCode), jBytes).Err() + if err != nil { + log.Println("Error in publishing task to " + rediskey.TasksSubscribe(connectCode)) + log.Println(err) + } else { + go galactus.waitForAck(pubsub, timeout, acked) + res := <-acked + if res { + log.Println("Successful mute/deafen using client capture bot!") + + // hooray! we did the mute with a client token! + return true + } + err := galactus.BlacklistTokenForDuration(guildID, connectCode, UnresponsiveCaptureBlacklistDuration) + if err == nil { + log.Printf("No ack from capture clients; blacklisting capture client for gamecode \"%s\" for %s\n", connectCode, UnresponsiveCaptureBlacklistDuration.String()) + } + } + } else { + log.Println("Capture client is probably rate-limited. Deferring to main bot instead") + } + return false +} + +func (galactus *GalactusAPI) modifyUserHandler(maxWorkers int, taskTimeout time.Duration) func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + vars := mux.Vars(r) + guildID := vars["guildID"] + connectCode := vars["connectCode"] + gid, gerr := strconv.ParseUint(guildID, 10, 64) + if gerr != nil { + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte("Invalid guildID received. Query should be of the form POST `/modify//`")) + return + } + + body, err := ioutil.ReadAll(r.Body) + if err != nil { + log.Println(err) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(err.Error())) + return + } + defer r.Body.Close() + + userModifications := task.UserModifyRequest{} + err = json.Unmarshal(body, &userModifications) + if err != nil { + log.Println(err) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(err.Error())) + return + } + + limit := PremiumBotConstraints[userModifications.Premium] + tokens := galactus.getAllTokensForGuild(guildID) + + tasksChannel := make(chan task.UserModify, len(userModifications.Users)) + wg := sync.WaitGroup{} + + mdsc := task.MuteDeafenSuccessCounts{ + Worker: 0, + Capture: 0, + Official: 0, + RateLimit: 0, + } + mdscLock := sync.Mutex{} + + // start a handful of workers to handle the tasks + for i := 0; i < maxWorkers; i++ { + go func() { + for request := range tasksChannel { + userIDStr := strconv.FormatUint(request.UserID, 10) + success := galactus.attemptOnSecondaryTokens(guildID, userIDStr, tokens, limit, request) + if success { + mdscLock.Lock() + mdsc.Worker++ + mdscLock.Unlock() + } else { + success = galactus.attemptOnCaptureBot(guildID, connectCode, gid, taskTimeout, request) + if success { + mdscLock.Lock() + mdsc.Capture++ + mdscLock.Unlock() + } else { + max := galactus.shardManager.GetNumShards() + sess := galactus.shardManager.Session(rand.Intn(max)) + + for sess == nil { + galactus.logger.Error("nil session when retrieving from shardmanager by random index", + zap.Int("shards", max), + ) + r := rand.Intn(max) + sess = galactus.shardManager.Session(r) + } + + err = task.ApplyMuteDeaf(sess, guildID, userIDStr, request.Mute, request.Deaf) + if err != nil { + galactus.logger.Error("error applying mute/deaf on official bot", + zap.Error(err), + zap.String("guildID", guildID), + zap.String("userID", userIDStr), + zap.Bool("mute", request.Mute), + zap.Bool("deaf", request.Deaf), + ) + } else { + galactus.logger.Error("successfully applied mute/deaf on official bot", + zap.String("guildID", guildID), + zap.String("userID", userIDStr), + zap.Bool("mute", request.Mute), + zap.Bool("deaf", request.Deaf), + ) + mdscLock.Lock() + mdsc.Official++ + mdscLock.Unlock() + } + } + } + wg.Done() + } + }() + } + + for _, modifyReq := range userModifications.Users { + wg.Add(1) + tasksChannel <- modifyReq + } + wg.Wait() + close(tasksChannel) + + w.WriteHeader(http.StatusOK) + + jbytes, err := json.Marshal(mdsc) + if err != nil { + log.Println(err) + } else { + _, err := w.Write(jbytes) + if err != nil { + log.Println(err) + } + } + } +} diff --git a/internal/galactus/server.go b/internal/galactus/server.go new file mode 100644 index 0000000..4c87d19 --- /dev/null +++ b/internal/galactus/server.go @@ -0,0 +1,383 @@ +package galactus + +import ( + "context" + "crypto/sha256" + "encoding/hex" + "encoding/json" + "errors" + "github.com/alicebob/miniredis/v2" + redisutils "github.com/automuteus/galactus/internal/redis" + "github.com/automuteus/utils/pkg/premium" + "github.com/automuteus/utils/pkg/rediskey" + "github.com/automuteus/utils/pkg/token" + "github.com/bwmarrin/discordgo" + "github.com/go-redis/redis/v8" + "github.com/gorilla/mux" + "github.com/jonas747/dshardmanager" + "go.uber.org/zap" + "net/http" + "os" + "strings" + "sync" + "time" +) + +const MockRedis = true + +var PremiumBotConstraints = map[premium.Tier]int{ + 0: 0, + 1: 0, // Free and Bronze have no premium bots + 2: 1, // Silver has 1 bot + 3: 3, // Gold has 3 bots + 4: 10, // Platinum (TBD) + 5: 100, // Selfhost; 100 bots(!) +} + +var DefaultIntents = discordgo.MakeIntent(discordgo.IntentsGuildVoiceStates | discordgo.IntentsGuildMessages | discordgo.IntentsGuilds | discordgo.IntentsGuildMessageReactions) + +type GalactusAPI struct { + client *redis.Client + shardManager *dshardmanager.Manager + + // maps hashed tokens to active discord sessions + activeSessions map[string]*discordgo.Session + maxRequests5Seconds int64 + sessionLock sync.RWMutex + + logger *zap.Logger +} + +func NewGalactusAPI(logger *zap.Logger, botToken, redisAddr, redisUser, redisPass string, maxReq int64) *GalactusAPI { + var rdb *redis.Client + if MockRedis { + mr, err := miniredis.Run() + if err != nil { + panic(err) + } + + rdb = redis.NewClient(&redis.Options{ + Addr: mr.Addr(), + }) + } else { + rdb = redis.NewClient(&redis.Options{ + Addr: redisAddr, + Username: redisUser, + Password: redisPass, + DB: 0, // use default DB + }) + } + + manager := MakeShardManager(logger, botToken, DefaultIntents) + AddHandlers(logger, manager, rdb) + + return &GalactusAPI{ + client: rdb, + shardManager: manager, + activeSessions: make(map[string]*discordgo.Session), + maxRequests5Seconds: maxReq, + sessionLock: sync.RWMutex{}, + logger: logger, + } +} + +func (galactus *GalactusAPI) getAllTokensForGuild(guildID string) []string { + hTokens, err := galactus.client.SMembers(context.Background(), rediskey.GuildTokensKey(guildID)).Result() + if err != nil { + galactus.logger.Error("error retrieving smembers from Redis", + zap.Error(err), + zap.String("guildID", guildID), + ) + return nil + } + return hTokens +} + +func (galactus *GalactusAPI) getAnySession(guildID string, tokens []string, limit int) (*discordgo.Session, string) { + galactus.sessionLock.RLock() + defer galactus.sessionLock.RUnlock() + + for i, hToken := range tokens { + if i == limit { + return nil, "" + } + // if this token isn't potentially rate-limited + if galactus.IncrAndTestGuildTokenComboLock(guildID, hToken) { + sess, ok := galactus.activeSessions[hToken] + if ok { + return sess, hToken + } + // remove this key from our records and keep going + galactus.client.SRem(context.Background(), rediskey.GuildTokensKey(guildID), hToken) + } else { + galactus.logger.Info("secondary token potentially rate-limited; skipping", + zap.String("hashedToken", hToken), + zap.String("guildID", guildID), + ) + } + } + + return nil, "" +} + +func (galactus *GalactusAPI) IncrAndTestGuildTokenComboLock(guildID, hashToken string) bool { + i, err := galactus.client.Incr(context.Background(), rediskey.GuildTokenLock(guildID, hashToken)).Result() + if err != nil { + galactus.logger.Error("error incrementing guild token combo", + zap.Error(err), + zap.String("guildID", guildID), + zap.String("hashedToken", hashToken), + ) + } + usable := i < galactus.maxRequests5Seconds + galactus.logger.Info("guild token combo", + zap.String("guildID", guildID), + zap.String("hashedToken", hashToken), + zap.Int64("count", i), + zap.Bool("using", usable), + ) + if !usable { + return false + } + + err = galactus.client.Expire(context.Background(), rediskey.GuildTokenLock(guildID, hashToken), time.Second*5).Err() + if err != nil { + galactus.logger.Error("error setting expiration for guild token combo", + zap.Error(err), + zap.String("guildID", guildID), + zap.String("hashedToken", hashToken), + ) + } + + return true +} + +func (galactus *GalactusAPI) BlacklistTokenForDuration(guildID, hashToken string, duration time.Duration) error { + return galactus.client.Set(context.Background(), rediskey.GuildTokenLock(guildID, hashToken), galactus.maxRequests5Seconds, duration).Err() +} + +type JobsNumber struct { + Jobs int64 `json:"jobs"` +} + +func (galactus *GalactusAPI) Run(port string, maxWorkers int, taskTimeout time.Duration) { + + galactus.loadTokensFromEnv() + + r := mux.NewRouter() + + r.HandleFunc("/modify/{guildID}/{connectCode}", galactus.modifyUserHandler(maxWorkers, taskTimeout)).Methods("POST") + + // TODO maybe eventually provide some auth parameter, or version number? Something to prove that a worker can pop requests? + r.HandleFunc("/request/job", func(w http.ResponseWriter, r *http.Request) { + msg, err := redisutils.PopRawDiscordMessage(galactus.client) + + // no jobs available + switch { + case errors.Is(err, redis.Nil): + w.WriteHeader(http.StatusAccepted) + w.Write([]byte("{\"status\": \"No jobs available\"}")) + return + case err != nil: + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte("{\"error\": \"" + err.Error() + "\"}")) + galactus.logger.Error("redis error when popping job", + zap.String("endpoint", "/request/job"), + zap.Error(err)) + return + case msg == "": + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte("{\"error\": \"Nil job returned, despite no Redis errors\"}")) + galactus.logger.Error("nil job returned, despite no Redis errors", + zap.String("endpoint", "/request/job")) + return + } + + w.WriteHeader(http.StatusOK) + + _, err = w.Write([]byte(msg)) + if err != nil { + galactus.logger.Error("failed to write job as HTTP response", + zap.String("endpoint", "/request/job"), + zap.Error(err), + ) + } + }).Methods("POST") + + r.HandleFunc("/jobs", func(w http.ResponseWriter, r *http.Request) { + var jobs JobsNumber + + num, err := redisutils.DiscordMessagesSize(galactus.client) + if err == nil || errors.Is(err, redis.Nil) { + if errors.Is(err, redis.Nil) { + jobs.Jobs = 0 + } else { + jobs.Jobs = num + } + + byt, err := json.Marshal(jobs) + if err != nil { + galactus.logger.Error("error marshalling JobsNumber", + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte("{\"error\": \"" + err.Error() + "\"}")) + } else { + w.WriteHeader(http.StatusOK) + w.Write(byt) + } + } else { + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte("{\"error\": \"" + err.Error() + "\"}")) + } + }).Methods("GET") + + r.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { + w.WriteHeader(http.StatusOK) + w.Write([]byte("ok")) + }).Methods("GET") + + galactus.logger.Info("galactus is running", + zap.String("port", port), + ) + + err := http.ListenAndServe(":"+port, r) + if err != nil { + galactus.logger.Error("http listener exited with error", + zap.Error(err), + ) + } +} + +func (galactus *GalactusAPI) loadTokensFromEnv() { + workerTokenStr := strings.ReplaceAll(os.Getenv("WORKER_BOT_TOKENS"), " ", "") + if workerTokenStr == "" { + galactus.logger.Info("no WORKER_BOT_TOKENS provided") + return + } + botTokens := strings.Split(workerTokenStr, ",") + for _, botToken := range botTokens { + hashedToken := hashToken(botToken) + galactus.logger.Info("loaded bot token", + zap.String("token", botToken)) + + galactus.sessionLock.RLock() + if _, ok := galactus.activeSessions[hashedToken]; ok { + galactus.logger.Info("token already has a running session on this instance", + zap.String("token", botToken)) + galactus.sessionLock.RUnlock() + continue + } + galactus.sessionLock.RUnlock() + + token.WaitForToken(galactus.client, botToken) + token.LockForToken(galactus.client, botToken) + + sess, err := discordgo.New("Bot " + botToken) + if err != nil { + galactus.logger.Error("error in CREATING discordgo session, possibly an invalid token", + zap.Error(err), + zap.String("token", botToken)) + continue + } + sess.Identify.Intents = discordgo.MakeIntent(discordgo.IntentsGuilds) + sess.AddHandler(galactus.newGuildHandler(hashedToken)) + err = sess.Open() + if err != nil { + galactus.logger.Error("error in OPENING discordgo session, possibly an invalid token", + zap.Error(err), + zap.String("token", botToken)) + continue + } + + galactus.sessionLock.Lock() + galactus.activeSessions[hashedToken] = sess + galactus.sessionLock.Unlock() + + for _, v := range sess.State.Guilds { + err := galactus.client.SAdd(context.Background(), rediskey.GuildTokensKey(v.ID), hashedToken).Err() + if !errors.Is(err, redis.Nil) && err != nil { + galactus.logger.Error("error adding bot token for specific guild", + zap.Error(err), + zap.String("token", botToken), + zap.String("guildID", v.ID)) + } else { + galactus.logger.Info("added bot token to guild successfully", + zap.String("token", botToken), + zap.String("guildID", v.ID), + ) + } + } + } +} + +func (galactus *GalactusAPI) waitForAck(pubsub *redis.PubSub, waitTime time.Duration, result chan<- bool) { + t := time.NewTimer(waitTime) + defer pubsub.Close() + channel := pubsub.Channel() + + for { + select { + case <-t.C: + t.Stop() + result <- false + return + case val := <-channel: + t.Stop() + result <- val.Payload == "true" + return + } + } +} + +func hashToken(token string) string { + h := sha256.New() + h.Write([]byte(token)) + return hex.EncodeToString(h.Sum(nil)) +} + +func (galactus *GalactusAPI) Close() { + err := galactus.shardManager.StopAll() + if err != nil { + galactus.logger.Error("error stopping all shard sessions", + zap.Error(err), + ) + } + + galactus.sessionLock.Lock() + for hToken, v := range galactus.activeSessions { + err = v.Close() + if err != nil { + galactus.logger.Error("error closing active session", + zap.Error(err), + zap.String("hashedToken", hToken), + ) + } + } + galactus.activeSessions = map[string]*discordgo.Session{} + galactus.sessionLock.Unlock() +} + +func (galactus *GalactusAPI) newGuildHandler(hashedToken string) func(s *discordgo.Session, m *discordgo.GuildCreate) { + return func(s *discordgo.Session, m *discordgo.GuildCreate) { + galactus.sessionLock.RLock() + for test := range galactus.activeSessions { + if hashedToken == test { + err := galactus.client.SAdd(context.Background(), rediskey.GuildTokensKey(m.Guild.ID), hashedToken).Err() + if err != nil { + galactus.logger.Error("error adding hashed token for guild", + zap.Error(err), + zap.String("hashedToken", hashedToken), + zap.String("guildID", m.Guild.ID), + ) + } else { + galactus.logger.Info("token added for guild", + zap.String("guildID", m.Guild.ID), + ) + } + } + } + + galactus.sessionLock.RUnlock() + } +} diff --git a/internal/shard_manager.go b/internal/galactus/shard_manager.go similarity index 98% rename from internal/shard_manager.go rename to internal/galactus/shard_manager.go index c27c8b7..6b7d82c 100644 --- a/internal/shard_manager.go +++ b/internal/galactus/shard_manager.go @@ -1,4 +1,4 @@ -package internal +package galactus import ( "github.com/automuteus/galactus/internal/handler" diff --git a/internal/modify.go b/internal/modify.go deleted file mode 100644 index c5a97c1..0000000 --- a/internal/modify.go +++ /dev/null @@ -1,71 +0,0 @@ -package internal - -import ( - "context" - "encoding/json" - "github.com/automuteus/utils/pkg/rediskey" - "github.com/automuteus/utils/pkg/task" - "log" - "time" -) - -func (tokenProvider *GalactusAPI) attemptOnSecondaryTokens(guildID, userID string, tokens []string, limit int, request task.UserModify) bool { - if tokens != nil && limit > 0 { - sess, hToken := tokenProvider.getAnySession(guildID, tokens, limit) - if sess != nil { - err := task.ApplyMuteDeaf(sess, guildID, userID, request.Mute, request.Deaf) - if err != nil { - log.Println("Failed to apply mute to player with error:") - log.Println(err) - } else { - log.Printf("Successfully applied mute=%v, deaf=%v to User %d using secondary bot: %s\n", request.Mute, request.Deaf, request.UserID, hToken) - return true - } - } else { - log.Println("No secondary bot tokens found. Trying other methods") - } - } else { - log.Println("Guild has no access to secondary bot tokens; skipping") - } - return false -} - -func (tokenProvider *GalactusAPI) attemptOnCaptureBot(guildID, connectCode string, gid uint64, timeout time.Duration, request task.UserModify) bool { - // this is cheeky, but use the connect code as part of the lock; don't issue too many requests on the capture client w/ this code - if tokenProvider.IncrAndTestGuildTokenComboLock(guildID, connectCode) { - // if the secondary token didn't work, then next we try the client-side capture request - taskObj := task.NewModifyTask(gid, request.UserID, task.PatchParams{ - Deaf: request.Deaf, - Mute: request.Mute, - }) - jBytes, err := json.Marshal(taskObj) - if err != nil { - log.Println(err) - return false - } - acked := make(chan bool) - // now we wait for an ack with respect to actually performing the mute - pubsub := tokenProvider.client.Subscribe(context.Background(), rediskey.CompleteTask(taskObj.TaskID)) - err = tokenProvider.client.Publish(context.Background(), rediskey.TasksSubscribe(connectCode), jBytes).Err() - if err != nil { - log.Println("Error in publishing task to " + rediskey.TasksSubscribe(connectCode)) - log.Println(err) - } else { - go tokenProvider.waitForAck(pubsub, timeout, acked) - res := <-acked - if res { - log.Println("Successful mute/deafen using client capture bot!") - - // hooray! we did the mute with a client token! - return true - } - err := tokenProvider.BlacklistTokenForDuration(guildID, connectCode, UnresponsiveCaptureBlacklistDuration) - if err == nil { - log.Printf("No ack from capture clients; blacklisting capture client for gamecode \"%s\" for %s\n", connectCode, UnresponsiveCaptureBlacklistDuration.String()) - } - } - } else { - log.Println("Capture client is probably rate-limited. Deferring to main bot instead") - } - return false -} diff --git a/internal/redis/queue_test.go b/internal/redis/queue_test.go index ef13159..ec94d84 100644 --- a/internal/redis/queue_test.go +++ b/internal/redis/queue_test.go @@ -1,6 +1,7 @@ package redis import ( + "encoding/json" "errors" "github.com/alicebob/miniredis/v2" "github.com/go-redis/redis/v8" @@ -35,9 +36,9 @@ const inputMsg = "{\"id\":\"0\"," + func TestPopEmpty(t *testing.T) { client := newTestRedis() - msg, err := PopDiscordMessage(client) + msg, err := PopRawDiscordMessage(client) - if msg != nil { + if msg != "" { t.Fatal("non-nil message received from empty pop") } @@ -58,18 +59,24 @@ func TestPushAndPopSingle(t *testing.T) { t.Fatal(err) } - msg, err := PopDiscordMessage(client) + msg, err := PopRawDiscordMessage(client) if err != nil { t.Fatal(err) - } else if msg == nil { + } else if msg == "" { t.Fatal("nil message returned when expected the previous msg we pushed") } - if msg.MessageType != MessageCreate { + var d DiscordMessage + err = json.Unmarshal([]byte(msg), &d) + if err != nil { + t.Fatal(err) + } + + if d.MessageType != MessageCreate { t.Fatal("returned msg type is not msgcreate") } - if !strings.EqualFold(inputMsg, string(msg.Data)) { + if !strings.EqualFold(inputMsg, d.Data) { t.Fatal("input and output messages are not equivalent") } } @@ -87,40 +94,51 @@ func TestPushAndPopMultiple(t *testing.T) { log.Fatal(err) } - msg, err := PopDiscordMessage(client) + msg, err := PopRawDiscordMessage(client) if err != nil { log.Fatal(err) - } else if msg == nil { + } else if msg == "" { log.Fatal("nil message returned when expected the previous msg we pushed") } - if msg.MessageType != MessageCreate { + var d DiscordMessage + err = json.Unmarshal([]byte(msg), &d) + if err != nil { + t.Fatal(err) + } + + if d.MessageType != MessageCreate { t.Fatal("returned msg type is not msgcreate") } - if !strings.EqualFold(inputMsg, string(msg.Data)) { + if !strings.EqualFold(inputMsg, d.Data) { t.Fatal("input and output messages are not equivalent") } - msg, err = PopDiscordMessage(client) + msg, err = PopRawDiscordMessage(client) if err != nil { log.Fatal(err) - } else if msg == nil { + } else if msg == "" { log.Fatal("nil message returned when expected the previous msg we pushed for input2") } - if msg.MessageType != MessageCreate { + err = json.Unmarshal([]byte(msg), &d) + if err != nil { + t.Fatal(err) + } + + if d.MessageType != MessageCreate { t.Fatal("returned msg type is not msgcreate for input2") } - if !strings.EqualFold(input2, string(msg.Data)) { + if !strings.EqualFold(input2, d.Data) { t.Fatal("input2 and output messages are not equivalent") } // replace back; now the string comparison should fail input2 = strings.Replace(input2, "\"id\":\"1\"", "\"id\":\"0\"", 1) - if strings.EqualFold(input2, string(msg.Data)) { + if strings.EqualFold(input2, d.Data) { t.Fatal("input and output messages are equivalent, when we mutated the input on purpose") } } diff --git a/internal/redis/redis.go b/internal/redis/redis.go index 5f22938..23af0d4 100644 --- a/internal/redis/redis.go +++ b/internal/redis/redis.go @@ -24,13 +24,8 @@ func LockSnowflake(ctx context.Context, client *redis.Client, snowflake string) return lock } -// TODO use the one in utils -func UserSoftbanKey(userID string) string { - return "automuteus:ratelimit:softban:user:" + userID -} - func IsUserBanned(client *redis.Client, userID string) bool { - v, err := client.Exists(context.Background(), UserSoftbanKey(userID)).Result() + v, err := client.Exists(context.Background(), rediskey.UserSoftban(userID)).Result() if err != nil { log.Println(err) return false diff --git a/internal/server.go b/internal/server.go deleted file mode 100644 index a411d89..0000000 --- a/internal/server.go +++ /dev/null @@ -1,493 +0,0 @@ -package internal - -import ( - "context" - "crypto/sha256" - "encoding/hex" - "encoding/json" - "errors" - "github.com/alicebob/miniredis/v2" - redis_utils "github.com/automuteus/galactus/internal/redis" - "github.com/automuteus/utils/pkg/premium" - "github.com/automuteus/utils/pkg/rediskey" - "github.com/automuteus/utils/pkg/task" - "github.com/automuteus/utils/pkg/token" - "github.com/bwmarrin/discordgo" - "github.com/go-redis/redis/v8" - "github.com/gorilla/mux" - "github.com/jonas747/dshardmanager" - "go.uber.org/zap" - "io/ioutil" - "log" - "net/http" - "os" - "strconv" - "sync" - "time" -) - -const MockRedis = true - -var PremiumBotConstraints = map[premium.Tier]int{ - 0: 0, - 1: 0, // Free and Bronze have no premium bots - 2: 1, // Silver has 1 bot - 3: 3, // Gold has 3 bots - 4: 10, // Platinum (TBD) - 5: 100, // Selfhost; 100 bots(!) -} - -const DefaultCaptureBotTimeout = time.Second - -var DefaultIntents = discordgo.MakeIntent(discordgo.IntentsGuildVoiceStates | discordgo.IntentsGuildMessages | discordgo.IntentsGuilds | discordgo.IntentsGuildMessageReactions) - -type GalactusAPI struct { - client *redis.Client - shardManager *dshardmanager.Manager - - // maps hashed tokens to active discord sessions - activeSessions map[string]*discordgo.Session - maxRequests5Seconds int64 - sessionLock sync.RWMutex -} - -func NewGalactusAPI(logger *zap.Logger, botToken, redisAddr, redisUser, redisPass string, maxReq int64) *GalactusAPI { - var rdb *redis.Client - if MockRedis { - mr, err := miniredis.Run() - if err != nil { - panic(err) - } - - rdb = redis.NewClient(&redis.Options{ - Addr: mr.Addr(), - }) - } else { - rdb = redis.NewClient(&redis.Options{ - Addr: redisAddr, - Username: redisUser, - Password: redisPass, - DB: 0, // use default DB - }) - } - - manager := MakeShardManager(logger, botToken, DefaultIntents) - AddHandlers(logger, manager, rdb) - - return &GalactusAPI{ - client: rdb, - shardManager: manager, - activeSessions: make(map[string]*discordgo.Session), - maxRequests5Seconds: maxReq, - sessionLock: sync.RWMutex{}, - } -} - -func (tokenProvider *GalactusAPI) PopulateAndStartSessions() { - keys, err := tokenProvider.client.HGetAll(context.Background(), rediskey.AllTokensHSet).Result() - if err != nil { - log.Println(err) - return - } - - for _, v := range keys { - tokenProvider.openAndStartSessionWithToken(v) - } -} - -func (tokenProvider *GalactusAPI) openAndStartSessionWithToken(botToken string) bool { - k := hashToken(botToken) - tokenProvider.sessionLock.Lock() - defer tokenProvider.sessionLock.Unlock() - - if _, ok := tokenProvider.activeSessions[k]; !ok { - token.WaitForToken(tokenProvider.client, botToken) - token.LockForToken(tokenProvider.client, botToken) - sess, err := discordgo.New("Bot " + botToken) - if err != nil { - log.Println(err) - return false - } - sess.Identify.Intents = discordgo.MakeIntent(discordgo.IntentsGuilds) - err = sess.Open() - if err != nil { - log.Println(err) - return false - } - // associates the guilds with this token to be used for requests - sess.AddHandler(tokenProvider.newGuild(k)) - log.Println("Opened session on startup for " + k) - tokenProvider.activeSessions[k] = sess - return true - } - return false -} - -func (tokenProvider *GalactusAPI) getAllTokensForGuild(guildID string) []string { - hTokens, err := tokenProvider.client.SMembers(context.Background(), rediskey.GuildTokensKey(guildID)).Result() - if err != nil { - return nil - } - return hTokens -} - -func (tokenProvider *GalactusAPI) getAnySession(guildID string, tokens []string, limit int) (*discordgo.Session, string) { - tokenProvider.sessionLock.RLock() - defer tokenProvider.sessionLock.RUnlock() - - for i, hToken := range tokens { - if i == limit { - return nil, "" - } - // if this token isn't potentially rate-limited - if tokenProvider.IncrAndTestGuildTokenComboLock(guildID, hToken) { - sess, ok := tokenProvider.activeSessions[hToken] - if ok { - return sess, hToken - } - // remove this key from our records and keep going - tokenProvider.client.SRem(context.Background(), rediskey.GuildTokensKey(guildID), hToken) - } else { - log.Println("Secondary token is potentially rate-limited. Skipping") - } - } - - return nil, "" -} - -func (tokenProvider *GalactusAPI) IncrAndTestGuildTokenComboLock(guildID, hashToken string) bool { - i, err := tokenProvider.client.Incr(context.Background(), rediskey.GuildTokenLock(guildID, hashToken)).Result() - if err != nil { - log.Println(err) - } - usable := i < tokenProvider.maxRequests5Seconds - log.Printf("Token %s on guild %s is at count %d. Using: %v", hashToken, guildID, i, usable) - if !usable { - return false - } - - err = tokenProvider.client.Expire(context.Background(), rediskey.GuildTokenLock(guildID, hashToken), time.Second*5).Err() - if err != nil { - log.Println(err) - } - - return true -} - -func (tokenProvider *GalactusAPI) BlacklistTokenForDuration(guildID, hashToken string, duration time.Duration) error { - return tokenProvider.client.Set(context.Background(), rediskey.GuildTokenLock(guildID, hashToken), tokenProvider.maxRequests5Seconds, duration).Err() -} - -type JobsNumber struct { - Jobs int64 `json:"jobs"` -} - -const DefaultMaxWorkers = 8 - -var UnresponsiveCaptureBlacklistDuration = time.Minute * time.Duration(5) - -func (tokenProvider *GalactusAPI) Run(logger *zap.Logger, port string) { - r := mux.NewRouter() - - taskTimeoutms := DefaultCaptureBotTimeout - - taskTimeoutmsStr := os.Getenv("ACK_TIMEOUT_MS") - num, err := strconv.ParseInt(taskTimeoutmsStr, 10, 64) - if err == nil { - log.Printf("Read from env; using ACK_TIMEOUT_MS=%d\n", num) - taskTimeoutms = time.Millisecond * time.Duration(num) - } - - maxWorkers := DefaultMaxWorkers - maxWorkersStr := os.Getenv("MAX_WORKERS") - num, err = strconv.ParseInt(maxWorkersStr, 10, 64) - if err == nil { - log.Printf("Read from env; using MAX_WORKERS=%d\n", num) - maxWorkers = int(num) - } - - r.HandleFunc("/modify/{guildID}/{connectCode}", func(w http.ResponseWriter, r *http.Request) { - vars := mux.Vars(r) - guildID := vars["guildID"] - connectCode := vars["connectCode"] - gid, gerr := strconv.ParseUint(guildID, 10, 64) - if gerr != nil { - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte("Invalid guildID received. Query should be of the form POST `/modify//`")) - return - } - - body, err := ioutil.ReadAll(r.Body) - if err != nil { - log.Println(err) - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte(err.Error())) - return - } - defer r.Body.Close() - - userModifications := task.UserModifyRequest{} - err = json.Unmarshal(body, &userModifications) - if err != nil { - log.Println(err) - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte(err.Error())) - return - } - - limit := PremiumBotConstraints[userModifications.Premium] - tokens := tokenProvider.getAllTokensForGuild(guildID) - - tasksChannel := make(chan task.UserModify, len(userModifications.Users)) - wg := sync.WaitGroup{} - - mdsc := task.MuteDeafenSuccessCounts{ - Worker: 0, - Capture: 0, - Official: 0, - RateLimit: 0, - } - mdscLock := sync.Mutex{} - - // start a handful of workers to handle the tasks - for i := 0; i < maxWorkers; i++ { - go func() { - for request := range tasksChannel { - userIDStr := strconv.FormatUint(request.UserID, 10) - success := tokenProvider.attemptOnSecondaryTokens(guildID, userIDStr, tokens, limit, request) - if success { - mdscLock.Lock() - mdsc.Worker++ - mdscLock.Unlock() - } else { - success = tokenProvider.attemptOnCaptureBot(guildID, connectCode, gid, taskTimeoutms, request) - if success { - mdscLock.Lock() - mdsc.Capture++ - mdscLock.Unlock() - } else { - log.Printf("Applying mute=%v, deaf=%v using primary bot\n", request.Mute, request.Deaf) - // TODO round-robin the session ID (don't always go on 0; no reason) - err = task.ApplyMuteDeaf(tokenProvider.shardManager.Session(0), guildID, userIDStr, request.Mute, request.Deaf) - if err != nil { - log.Println(err) - } else { - mdscLock.Lock() - mdsc.Official++ - mdscLock.Unlock() - } - } - } - wg.Done() - } - }() - } - - for _, modifyReq := range userModifications.Users { - wg.Add(1) - tasksChannel <- modifyReq - } - wg.Wait() - close(tasksChannel) - - w.WriteHeader(http.StatusOK) - - jbytes, err := json.Marshal(mdsc) - if err != nil { - log.Println(err) - } else { - _, err := w.Write(jbytes) - if err != nil { - log.Println(err) - } - } - }).Methods("POST") - - //r.HandleFunc("/addtoken", func(w http.ResponseWriter, r *http.Request) { - // body, err := ioutil.ReadAll(r.Body) - // if err != nil { - // log.Println(err) - // w.WriteHeader(http.StatusBadRequest) - // w.Write([]byte(err.Error())) - // return - // } - // defer r.Body.Close() - // - // botToken := string(body) - // log.Println(botToken) - // - // k := hashToken(botToken) - // log.Println(k) - // tokenProvider.sessionLock.RLock() - // if _, ok := tokenProvider.activeSessions[k]; ok { - // log.Println("Token already exists on the server") - // w.WriteHeader(http.StatusAlreadyReported) - // w.Write([]byte("Token already exists on the server")) - // tokenProvider.sessionLock.RUnlock() - // return - // } - // tokenProvider.sessionLock.RUnlock() - // - // token.WaitForToken(tokenProvider.client, botToken) - // token.LockForToken(tokenProvider.client, botToken) - // sess, err := discordgo.New("Bot " + botToken) - // if err != nil { - // w.WriteHeader(http.StatusBadRequest) - // w.Write([]byte(err.Error())) - // return - // } - // sess.AddHandler(tokenProvider.newGuild(k)) - // err = sess.Open() - // if err != nil { - // w.WriteHeader(http.StatusUnauthorized) - // w.Write([]byte(err.Error())) - // return - // } - // - // tokenProvider.sessionLock.Lock() - // tokenProvider.activeSessions[k] = sess - // tokenProvider.sessionLock.Unlock() - // - // err = tokenProvider.client.HSet(ctx, rediskey.AllTokensHSet, k, botToken).Err() - // if err != nil { - // log.Println(err) - // } - // - // for _, v := range sess.State.Guilds { - // err := tokenProvider.client.SAdd(ctx, rediskey.GuildTokensKey(v.ID), k).Err() - // if !errors.Is(err, redis.Nil) && err != nil { - // log.Println(strings.ReplaceAll(err.Error(), botToken, "")) - // } else { - // log.Println("Added token for guild " + v.ID) - // } - // } - //}).Methods("POST") - // TODO maybe eventually provide some auth parameter, or version number? Something to prove that a worker can pop requests? - r.HandleFunc("/request/job", func(w http.ResponseWriter, r *http.Request) { - msg, err := redis_utils.PopRawDiscordMessage(tokenProvider.client) - - // no jobs available - switch { - case errors.Is(err, redis.Nil): - w.WriteHeader(http.StatusAccepted) - w.Write([]byte("{\"status\": \"No jobs available\"}")) - return - case err != nil: - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte("{\"error\": \"" + err.Error() + "\"}")) - logger.Error("redis error when popping job", - zap.String("endpoint", "/request/job"), - zap.Error(err)) - return - case msg == "": - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte("{\"error\": \"Nil job returned, despite no Redis errors\"}")) - logger.Error("nil job returned, despite no Redis errors", - zap.String("endpoint", "/request/job")) - return - } - - w.WriteHeader(http.StatusOK) - - _, err = w.Write([]byte(msg)) - if err != nil { - logger.Error("failed to write job as HTTP response", - zap.String("endpoint", "/request/job"), - zap.Error(err), - ) - } - }).Methods("POST") - - r.HandleFunc("/jobs", func(w http.ResponseWriter, r *http.Request) { - var jobs JobsNumber - - num, err := redis_utils.DiscordMessagesSize(tokenProvider.client) - if err == nil || errors.Is(err, redis.Nil) { - if errors.Is(err, redis.Nil) { - jobs.Jobs = 0 - } else { - jobs.Jobs = num - } - - byt, err := json.Marshal(jobs) - if err != nil { - logger.Error("error marshalling JobsNumber", - zap.Error(err), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte("{\"error\": \"" + err.Error() + "\"}")) - } else { - w.WriteHeader(http.StatusOK) - w.Write(byt) - } - } else { - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte("{\"error\": \"" + err.Error() + "\"}")) - } - }).Methods("GET") - - r.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { - w.WriteHeader(http.StatusOK) - w.Write([]byte("ok")) - }).Methods("GET") - - log.Println("Galactus service is running on port " + port + "...") - http.ListenAndServe(":"+port, r) -} - -func (tokenProvider *GalactusAPI) waitForAck(pubsub *redis.PubSub, waitTime time.Duration, result chan<- bool) { - t := time.NewTimer(waitTime) - defer pubsub.Close() - channel := pubsub.Channel() - - for { - select { - case <-t.C: - t.Stop() - result <- false - return - case val := <-channel: - t.Stop() - result <- val.Payload == "true" - return - } - } -} - -func hashToken(token string) string { - h := sha256.New() - h.Write([]byte(token)) - return hex.EncodeToString(h.Sum(nil)) -} - -func (tokenProvider *GalactusAPI) Close() { - err := tokenProvider.shardManager.StopAll() - if err != nil { - log.Println(err) - } - - tokenProvider.sessionLock.Lock() - for _, v := range tokenProvider.activeSessions { - v.Close() - } - tokenProvider.activeSessions = map[string]*discordgo.Session{} - tokenProvider.sessionLock.Unlock() -} - -func (tokenProvider *GalactusAPI) newGuild(hashedToken string) func(s *discordgo.Session, m *discordgo.GuildCreate) { - return func(s *discordgo.Session, m *discordgo.GuildCreate) { - tokenProvider.sessionLock.RLock() - for test := range tokenProvider.activeSessions { - if hashedToken == test { - err := tokenProvider.client.SAdd(context.Background(), rediskey.GuildTokensKey(m.Guild.ID), hashedToken) - if err != nil { - log.Println(err) - } else { - log.Println("Token added for running guild " + m.Guild.ID) - } - } - } - - tokenProvider.sessionLock.RUnlock() - } -} diff --git a/main.go b/main.go index 41a5a9c..27c3195 100644 --- a/main.go +++ b/main.go @@ -1,17 +1,20 @@ package main import ( - "github.com/automuteus/galactus/internal" + "github.com/automuteus/galactus/internal/galactus" "go.uber.org/zap" "log" "os" "os/signal" "strconv" "syscall" + "time" ) const DefaultGalactusPort = "5858" const DefaultMaxRequests5Sec int64 = 7 +const DefaultMaxWorkers = 8 +const DefaultCaptureBotTimeout = time.Second func main() { logger, err := zap.NewProduction() @@ -51,21 +54,45 @@ func main() { } } + taskTimeout := DefaultCaptureBotTimeout + + taskTimeoutmsStr := os.Getenv("ACK_TIMEOUT_MS") + num, err := strconv.ParseInt(taskTimeoutmsStr, 10, 64) + if err == nil { + taskTimeout = time.Millisecond * time.Duration(num) + } else { + logger.Error("could not parse ACK_TIMEOUT_MS", + zap.Error(err), + zap.Int64("default", taskTimeout.Milliseconds())) + } + + maxWorkers := DefaultMaxWorkers + maxWorkersStr := os.Getenv("MAX_WORKERS") + num, err = strconv.ParseInt(maxWorkersStr, 10, 64) + if err == nil { + maxWorkers = int(num) + } else { + logger.Error("could not parse MAX_WORKERS", + zap.Error(err), + zap.Int("default", maxWorkers)) + } + logger.Info("loaded env", zap.String("DISCORD_BOT_TOKEN", botToken), zap.String("REDIS_ADDR", redisAddr), zap.String("REDIS_USER", redisUser), zap.String("REDIS_PASS", redisPass), zap.Int("MAX_REQ_5_SEC", int(maxReq)), + zap.Int("MAX_WORKERS", maxWorkers), + zap.Int64("ACK_TIMEOUT_MS", taskTimeout.Milliseconds()), ) - tp := internal.NewGalactusAPI(logger, botToken, redisAddr, redisUser, redisPass, maxReq) - tp.PopulateAndStartSessions() + tp := galactus.NewGalactusAPI(logger, botToken, redisAddr, redisUser, redisPass, maxReq) sc := make(chan os.Signal, 1) signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill) - go tp.Run(logger, galactusPort) + go tp.Run(galactusPort, maxWorkers, taskTimeout) <-sc tp.Close() } From eb3b3ea461f4ea490ad1e08e976628a19eeb74ce Mon Sep 17 00:00:00 2001 From: denverquane Date: Wed, 6 Jan 2021 00:50:17 -0700 Subject: [PATCH 07/50] Added send message/embed endpoints, more test code and unit tests --- internal/galactus/modify.go | 100 ++---------------------- internal/galactus/send_message.go | 76 ++++++++++++++++++ internal/galactus/send_message_embed.go | 89 +++++++++++++++++++++ internal/galactus/send_message_test.go | 49 ++++++++++++ internal/galactus/server.go | 11 +-- internal/galactus/session.go | 26 ++++++ internal/galactus/token.go | 92 ++++++++++++++++++++++ main.go | 4 +- pkg/endpoint/endpoints.go | 9 +++ pkg/validate/snowflake.go | 25 ++++++ pkg/validate/snowflake_test.go | 39 +++++++++ 11 files changed, 422 insertions(+), 98 deletions(-) create mode 100644 internal/galactus/send_message.go create mode 100644 internal/galactus/send_message_embed.go create mode 100644 internal/galactus/send_message_test.go create mode 100644 internal/galactus/session.go create mode 100644 internal/galactus/token.go create mode 100644 pkg/endpoint/endpoints.go create mode 100644 pkg/validate/snowflake.go create mode 100644 pkg/validate/snowflake_test.go diff --git a/internal/galactus/modify.go b/internal/galactus/modify.go index e9d5d9a..8178f41 100644 --- a/internal/galactus/modify.go +++ b/internal/galactus/modify.go @@ -1,102 +1,18 @@ package galactus import ( - "context" "encoding/json" - "github.com/automuteus/utils/pkg/rediskey" "github.com/automuteus/utils/pkg/task" "github.com/gorilla/mux" "go.uber.org/zap" "io/ioutil" "log" - "math/rand" "net/http" "strconv" "sync" "time" ) -func (galactus *GalactusAPI) attemptOnSecondaryTokens(guildID, userID string, tokens []string, limit int, request task.UserModify) bool { - if tokens != nil && limit > 0 { - sess, hToken := galactus.getAnySession(guildID, tokens, limit) - if sess != nil { - err := task.ApplyMuteDeaf(sess, guildID, userID, request.Mute, request.Deaf) - if err != nil { - galactus.logger.Error("failed to apply mute/deaf on secondary bot", - zap.Error(err), - zap.String("guildID", guildID), - zap.Uint64("userID", request.UserID), - zap.String("hashedToken", hToken), - zap.Bool("mute", request.Mute), - zap.Bool("deaf", request.Deaf), - ) - } else { - galactus.logger.Info("successfully applied mute/deaf on secondary bot", - zap.Error(err), - zap.String("guildID", guildID), - zap.Uint64("userID", request.UserID), - zap.String("hashedToken", hToken), - zap.Bool("mute", request.Mute), - zap.Bool("deaf", request.Deaf), - ) - return true - } - } else { - galactus.logger.Info("no secondary bot tokens found", - zap.String("guildID", guildID), - zap.String("userID", userID), - ) - } - } else { - galactus.logger.Info("guild has no access to secondary bot tokens; skipping", - zap.String("guildID", guildID), - ) - } - return false -} - -var UnresponsiveCaptureBlacklistDuration = time.Minute * time.Duration(5) - -func (galactus *GalactusAPI) attemptOnCaptureBot(guildID, connectCode string, gid uint64, timeout time.Duration, request task.UserModify) bool { - // this is cheeky, but use the connect code as part of the lock; don't issue too many requests on the capture client w/ this code - if galactus.IncrAndTestGuildTokenComboLock(guildID, connectCode) { - // if the secondary token didn't work, then next we try the client-side capture request - taskObj := task.NewModifyTask(gid, request.UserID, task.PatchParams{ - Deaf: request.Deaf, - Mute: request.Mute, - }) - jBytes, err := json.Marshal(taskObj) - if err != nil { - log.Println(err) - return false - } - acked := make(chan bool) - // now we wait for an ack with respect to actually performing the mute - pubsub := galactus.client.Subscribe(context.Background(), rediskey.CompleteTask(taskObj.TaskID)) - err = galactus.client.Publish(context.Background(), rediskey.TasksSubscribe(connectCode), jBytes).Err() - if err != nil { - log.Println("Error in publishing task to " + rediskey.TasksSubscribe(connectCode)) - log.Println(err) - } else { - go galactus.waitForAck(pubsub, timeout, acked) - res := <-acked - if res { - log.Println("Successful mute/deafen using client capture bot!") - - // hooray! we did the mute with a client token! - return true - } - err := galactus.BlacklistTokenForDuration(guildID, connectCode, UnresponsiveCaptureBlacklistDuration) - if err == nil { - log.Printf("No ack from capture clients; blacklisting capture client for gamecode \"%s\" for %s\n", connectCode, UnresponsiveCaptureBlacklistDuration.String()) - } - } - } else { - log.Println("Capture client is probably rate-limited. Deferring to main bot instead") - } - return false -} - func (galactus *GalactusAPI) modifyUserHandler(maxWorkers int, taskTimeout time.Duration) func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) @@ -158,15 +74,15 @@ func (galactus *GalactusAPI) modifyUserHandler(maxWorkers int, taskTimeout time. mdsc.Capture++ mdscLock.Unlock() } else { - max := galactus.shardManager.GetNumShards() - sess := galactus.shardManager.Session(rand.Intn(max)) - - for sess == nil { - galactus.logger.Error("nil session when retrieving from shardmanager by random index", - zap.Int("shards", max), + sess, err := getRandomSession(galactus.shardManager) + if err != nil { + galactus.logger.Error("error fetching random session for user modify", + zap.Error(err), + zap.String("guildID", guildID), + zap.String("userID", userIDStr), + zap.Bool("mute", request.Mute), + zap.Bool("deaf", request.Deaf), ) - r := rand.Intn(max) - sess = galactus.shardManager.Session(r) } err = task.ApplyMuteDeaf(sess, guildID, userIDStr, request.Mute, request.Deaf) diff --git a/internal/galactus/send_message.go b/internal/galactus/send_message.go new file mode 100644 index 0000000..d9a41ab --- /dev/null +++ b/internal/galactus/send_message.go @@ -0,0 +1,76 @@ +package galactus + +import ( + "github.com/automuteus/galactus/pkg/validate" + "github.com/gorilla/mux" + "github.com/jonas747/dshardmanager" + "go.uber.org/zap" + "io/ioutil" + "net/http" +) + +func SendChannelMessageHandler(logger *zap.Logger, shardManager *dshardmanager.Manager) func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + vars := mux.Vars(r) + channelID := vars["channelID"] + valid, err := validate.ValidSnowflake(channelID) + if !valid { + errMsg := "channelID provided to sendMessageHandler is invalid" + logger.Error(errMsg, + zap.String("channelID", channelID), + zap.Error(err), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + body, err := ioutil.ReadAll(r.Body) + if err != nil { + errMsg := "could not read http body with error" + logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + defer r.Body.Close() + + // TODO perform some validation on the message body? + // ex message length, empty contents, etc + + sess, err := getRandomSession(shardManager) + if err != nil { + errMsg := "error obtaining random session for sendMessageHandler" + logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + msg, err := sess.ChannelMessageSend(channelID, string(body)) + if err != nil { + errMsg := "error posting message to channel" + logger.Error(errMsg, + zap.Error(err), + zap.String("channelID", channelID), + zap.String("contents", string(body)), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + // TODO metrics logging here + logger.Info("posted message to channel", + zap.String("channelID", channelID), + zap.String("contents", string(body)), + zap.String("messageID", msg.ID), + ) + w.WriteHeader(http.StatusOK) + w.Write([]byte(msg.ID)) + } +} diff --git a/internal/galactus/send_message_embed.go b/internal/galactus/send_message_embed.go new file mode 100644 index 0000000..51fe03a --- /dev/null +++ b/internal/galactus/send_message_embed.go @@ -0,0 +1,89 @@ +package galactus + +import ( + "encoding/json" + "github.com/automuteus/galactus/pkg/validate" + "github.com/bwmarrin/discordgo" + "github.com/gorilla/mux" + "go.uber.org/zap" + "io/ioutil" + "net/http" +) + +func (galactus *GalactusAPI) SendChannelMessageEmbedHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + vars := mux.Vars(r) + channelID := vars["channelID"] + valid, err := validate.ValidSnowflake(channelID) + if !valid { + errMsg := "channelID provided to sendMessageEmbedHandler is invalid" + galactus.logger.Error(errMsg, + zap.String("channelID", channelID), + zap.Error(err), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + body, err := ioutil.ReadAll(r.Body) + if err != nil { + errMsg := "could not read http body with error" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + defer r.Body.Close() + + var embed *discordgo.MessageEmbed + err = json.Unmarshal(body, embed) + if err != nil { + errMsg := "error unmarshalling discordMessageEmbed from JSON" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("body", string(body)), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + // TODO extra validation here (empty embed fields and the like) + + sess, err := getRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for sendMessageEmbedHandler" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + msg, err := sess.ChannelMessageSendEmbed(channelID, embed) + if err != nil { + errMsg := "error posting messageEmbed to channel" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("channelID", channelID), + zap.String("contents", string(body)), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + // TODO metrics logging here + galactus.logger.Info("posted messageEmbed to channel", + zap.String("channelID", channelID), + zap.String("contents", string(body)), + zap.String("messageID", msg.ID), + ) + w.WriteHeader(http.StatusOK) + w.Write([]byte(msg.ID)) + } +} diff --git a/internal/galactus/send_message_test.go b/internal/galactus/send_message_test.go new file mode 100644 index 0000000..68873a2 --- /dev/null +++ b/internal/galactus/send_message_test.go @@ -0,0 +1,49 @@ +package galactus + +import ( + "fmt" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/gorilla/mux" + "go.uber.org/zap" + "io/ioutil" + "log" + "net/http" + "net/http/httptest" + "os" + "strings" + "testing" +) + +func TestGalactusAPI_SendChannelMessageHandler(t *testing.T) { + logger, err := zap.NewProduction() + if err != nil { + log.Println("Failed to initialize logger with error") + t.Fatal(err) + } + galactus := NewGalactusAPI(logger, true, os.Getenv("TEST_BOT_TOKEN"), "", "", "", 7) + defer galactus.Close() + + m := mux.NewRouter() + m.HandleFunc(endpoint.SendMessageFull, SendChannelMessageHandler(galactus.logger, galactus.shardManager)) + + ts := httptest.NewServer(m) + defer ts.Close() + + r := strings.NewReader("test message") + + resp, err := http.Post(ts.URL+endpoint.SendMessagePartial+os.Getenv("TEST_CHANNEL_ID"), "", r) + if err != nil { + log.Println(err) + return + } + defer resp.Body.Close() + + body, _ := ioutil.ReadAll(resp.Body) + + if resp.StatusCode != http.StatusOK { + log.Fatal(fmt.Sprintf("non 200 status response: %d", resp.StatusCode)) + } + + fmt.Println(resp.StatusCode) + fmt.Println(string(body)) +} diff --git a/internal/galactus/server.go b/internal/galactus/server.go index 4c87d19..3ebf877 100644 --- a/internal/galactus/server.go +++ b/internal/galactus/server.go @@ -8,6 +8,7 @@ import ( "errors" "github.com/alicebob/miniredis/v2" redisutils "github.com/automuteus/galactus/internal/redis" + "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/utils/pkg/premium" "github.com/automuteus/utils/pkg/rediskey" "github.com/automuteus/utils/pkg/token" @@ -23,8 +24,6 @@ import ( "time" ) -const MockRedis = true - var PremiumBotConstraints = map[premium.Tier]int{ 0: 0, 1: 0, // Free and Bronze have no premium bots @@ -48,9 +47,9 @@ type GalactusAPI struct { logger *zap.Logger } -func NewGalactusAPI(logger *zap.Logger, botToken, redisAddr, redisUser, redisPass string, maxReq int64) *GalactusAPI { +func NewGalactusAPI(logger *zap.Logger, mockRedis bool, botToken, redisAddr, redisUser, redisPass string, maxReq int64) *GalactusAPI { var rdb *redis.Client - if MockRedis { + if mockRedis { mr, err := miniredis.Run() if err != nil { panic(err) @@ -166,7 +165,9 @@ func (galactus *GalactusAPI) Run(port string, maxWorkers int, taskTimeout time.D r := mux.NewRouter() - r.HandleFunc("/modify/{guildID}/{connectCode}", galactus.modifyUserHandler(maxWorkers, taskTimeout)).Methods("POST") + r.HandleFunc(endpoint.ModifyUserbyGuildConnectCode, galactus.modifyUserHandler(maxWorkers, taskTimeout)).Methods("POST") + r.HandleFunc(endpoint.SendMessageFull, SendChannelMessageHandler(galactus.logger, galactus.shardManager)).Methods("POST") + r.HandleFunc(endpoint.SendMessageEmbedFull, galactus.SendChannelMessageEmbedHandler()).Methods("POST") // TODO maybe eventually provide some auth parameter, or version number? Something to prove that a worker can pop requests? r.HandleFunc("/request/job", func(w http.ResponseWriter, r *http.Request) { diff --git a/internal/galactus/session.go b/internal/galactus/session.go new file mode 100644 index 0000000..8ff5e66 --- /dev/null +++ b/internal/galactus/session.go @@ -0,0 +1,26 @@ +package galactus + +import ( + "errors" + "github.com/bwmarrin/discordgo" + "github.com/jonas747/dshardmanager" + "math/rand" +) + +const MaxInvalidRandomSessions = 5 + +func getRandomSession(manager *dshardmanager.Manager) (*discordgo.Session, error) { + max := manager.GetNumShards() + sess := manager.Session(rand.Intn(max)) + i := 1 + + for sess == nil { + if i > MaxInvalidRandomSessions { + return nil, errors.New("exceeded maximum retries for random session") + } + i++ + r := rand.Intn(max) + sess = manager.Session(r) + } + return sess, nil +} diff --git a/internal/galactus/token.go b/internal/galactus/token.go new file mode 100644 index 0000000..27beef1 --- /dev/null +++ b/internal/galactus/token.go @@ -0,0 +1,92 @@ +package galactus + +import ( + "context" + "encoding/json" + "github.com/automuteus/utils/pkg/rediskey" + "github.com/automuteus/utils/pkg/task" + "go.uber.org/zap" + "log" + "time" +) + +func (galactus *GalactusAPI) attemptOnSecondaryTokens(guildID, userID string, tokens []string, limit int, request task.UserModify) bool { + if tokens != nil && limit > 0 { + sess, hToken := galactus.getAnySession(guildID, tokens, limit) + if sess != nil { + err := task.ApplyMuteDeaf(sess, guildID, userID, request.Mute, request.Deaf) + if err != nil { + galactus.logger.Error("failed to apply mute/deaf on secondary bot", + zap.Error(err), + zap.String("guildID", guildID), + zap.Uint64("userID", request.UserID), + zap.String("hashedToken", hToken), + zap.Bool("mute", request.Mute), + zap.Bool("deaf", request.Deaf), + ) + } else { + galactus.logger.Info("successfully applied mute/deaf on secondary bot", + zap.Error(err), + zap.String("guildID", guildID), + zap.Uint64("userID", request.UserID), + zap.String("hashedToken", hToken), + zap.Bool("mute", request.Mute), + zap.Bool("deaf", request.Deaf), + ) + return true + } + } else { + galactus.logger.Info("no secondary bot tokens found", + zap.String("guildID", guildID), + zap.String("userID", userID), + ) + } + } else { + galactus.logger.Info("guild has no access to secondary bot tokens; skipping", + zap.String("guildID", guildID), + ) + } + return false +} + +var UnresponsiveCaptureBlacklistDuration = time.Minute * time.Duration(5) + +func (galactus *GalactusAPI) attemptOnCaptureBot(guildID, connectCode string, gid uint64, timeout time.Duration, request task.UserModify) bool { + // this is cheeky, but use the connect code as part of the lock; don't issue too many requests on the capture client w/ this code + if galactus.IncrAndTestGuildTokenComboLock(guildID, connectCode) { + // if the secondary token didn't work, then next we try the client-side capture request + taskObj := task.NewModifyTask(gid, request.UserID, task.PatchParams{ + Deaf: request.Deaf, + Mute: request.Mute, + }) + jBytes, err := json.Marshal(taskObj) + if err != nil { + log.Println(err) + return false + } + acked := make(chan bool) + // now we wait for an ack with respect to actually performing the mute + pubsub := galactus.client.Subscribe(context.Background(), rediskey.CompleteTask(taskObj.TaskID)) + err = galactus.client.Publish(context.Background(), rediskey.TasksSubscribe(connectCode), jBytes).Err() + if err != nil { + log.Println("Error in publishing task to " + rediskey.TasksSubscribe(connectCode)) + log.Println(err) + } else { + go galactus.waitForAck(pubsub, timeout, acked) + res := <-acked + if res { + log.Println("Successful mute/deafen using client capture bot!") + + // hooray! we did the mute with a client token! + return true + } + err := galactus.BlacklistTokenForDuration(guildID, connectCode, UnresponsiveCaptureBlacklistDuration) + if err == nil { + log.Printf("No ack from capture clients; blacklisting capture client for gamecode \"%s\" for %s\n", connectCode, UnresponsiveCaptureBlacklistDuration.String()) + } + } + } else { + log.Println("Capture client is probably rate-limited. Deferring to main bot instead") + } + return false +} diff --git a/main.go b/main.go index 27c3195..02c8f30 100644 --- a/main.go +++ b/main.go @@ -11,6 +11,8 @@ import ( "time" ) +const MockRedis = true + const DefaultGalactusPort = "5858" const DefaultMaxRequests5Sec int64 = 7 const DefaultMaxWorkers = 8 @@ -87,7 +89,7 @@ func main() { zap.Int64("ACK_TIMEOUT_MS", taskTimeout.Milliseconds()), ) - tp := galactus.NewGalactusAPI(logger, botToken, redisAddr, redisUser, redisPass, maxReq) + tp := galactus.NewGalactusAPI(logger, MockRedis, botToken, redisAddr, redisUser, redisPass, maxReq) sc := make(chan os.Signal, 1) signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill) diff --git a/pkg/endpoint/endpoints.go b/pkg/endpoint/endpoints.go new file mode 100644 index 0000000..999ac8d --- /dev/null +++ b/pkg/endpoint/endpoints.go @@ -0,0 +1,9 @@ +package endpoint + +const SendMessagePartial = "/sendMessage/" +const SendMessageFull = SendMessagePartial + "{channelID}" + +const SendMessageEmbedPartial = "/sendMessageEmbed/" +const SendMessageEmbedFull = SendMessageEmbedPartial + "{channelID}" + +const ModifyUserbyGuildConnectCode = "/modify/{guildID}/{connectCode}" diff --git a/pkg/validate/snowflake.go b/pkg/validate/snowflake.go new file mode 100644 index 0000000..28b5025 --- /dev/null +++ b/pkg/validate/snowflake.go @@ -0,0 +1,25 @@ +package validate + +import ( + "errors" + "strconv" +) + +const DiscordEpoch = 1420070400000 + +func ValidSnowflake(snowflake string) (bool, error) { + if snowflake == "" { + return false, errors.New("empty string") + } + + num, err := strconv.ParseUint(snowflake, 10, 64) + if err != nil { + return false, err + } + + if num < DiscordEpoch { + return false, errors.New("too small (prior to discord epoch)") + } + + return true, nil +} diff --git a/pkg/validate/snowflake_test.go b/pkg/validate/snowflake_test.go new file mode 100644 index 0000000..70f75d7 --- /dev/null +++ b/pkg/validate/snowflake_test.go @@ -0,0 +1,39 @@ +package validate + +import ( + "log" + "testing" +) + +func TestValidSnowflake(t *testing.T) { + snowflake := "" + v, err := ValidSnowflake(snowflake) + if v || err == nil { + t.Fatal("expected empty snowflake to be invalid and/or return non-nil error") + } + + snowflake = "-1" + v, err = ValidSnowflake(snowflake) + if v || err == nil { + t.Fatal("expected snowflake=-1 to be invalid and/or return non-nil error") + } + + snowflake = "1000" + v, err = ValidSnowflake(snowflake) + if v || err == nil { + t.Fatal("expected snowflake=1000 to be invalid and/or return non-nil error") + } + + snowflake = "abcd123" + v, err = ValidSnowflake(snowflake) + if v || err == nil { + log.Println(err) + t.Fatal("expected snowflake=1000 to be invalid and/or return non-nil error") + } + + snowflake = "754465589958803548" + v, err = ValidSnowflake(snowflake) + if !v || err != nil { + t.Fatal("expected snowflake=754465589958803548 to be valid and return nil error") + } +} From 5471d756af3d5afb513e12d2924ae99abdc2f4c7 Mon Sep 17 00:00:00 2001 From: denverquane Date: Sun, 10 Jan 2021 17:57:59 -0700 Subject: [PATCH 08/50] PoC for full receive+send+delete message pipeline --- internal/galactus/delete_message.go | 72 ++++++++++++++++++++++++ internal/galactus/send_message.go | 15 +++-- internal/galactus/send_message_embed.go | 6 +- internal/galactus/server.go | 14 +++-- internal/handler/guild_create.go | 5 +- internal/handler/guild_delete.go | 5 +- internal/handler/log.go | 6 +- internal/handler/message_create.go | 7 ++- internal/handler/message_reaction_add.go | 5 +- internal/handler/voice_state.go | 5 +- internal/redis/queue.go | 30 ++-------- internal/redis/queue_test.go | 25 ++++---- pkg/discord_message/message.go | 24 ++++++++ pkg/endpoint/endpoints.go | 6 ++ 14 files changed, 157 insertions(+), 68 deletions(-) create mode 100644 internal/galactus/delete_message.go create mode 100644 pkg/discord_message/message.go diff --git a/internal/galactus/delete_message.go b/internal/galactus/delete_message.go new file mode 100644 index 0000000..d1f717e --- /dev/null +++ b/internal/galactus/delete_message.go @@ -0,0 +1,72 @@ +package galactus + +import ( + "github.com/automuteus/galactus/pkg/validate" + "github.com/gorilla/mux" + "go.uber.org/zap" + "net/http" +) + +func (galactus *GalactusAPI) DeleteChannelMessageHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + vars := mux.Vars(r) + channelID := vars["channelID"] + messageID := vars["messageID"] + valid, err := validate.ValidSnowflake(channelID) + if !valid { + errMsg := "channelID provided to deleteMessageHandler is invalid" + galactus.logger.Error(errMsg, + zap.String("channelID", channelID), + zap.Error(err), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + valid, err = validate.ValidSnowflake(messageID) + if !valid { + errMsg := "messageID provided to deleteMessageHandler is invalid" + galactus.logger.Error(errMsg, + zap.String("messageID", messageID), + zap.Error(err), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + // TODO perform some validation on the message body? + // ex message length, empty contents, etc + + sess, err := getRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for sendMessageHandler" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + err = sess.ChannelMessageDelete(channelID, messageID) + if err != nil { + errMsg := "error deleting message in channel" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("channelID", channelID), + zap.String("messageID", messageID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + // TODO metrics logging here + galactus.logger.Info("deleted message in channel", + zap.String("channelID", channelID), + zap.String("messageID", messageID), + ) + w.WriteHeader(http.StatusOK) + w.Write([]byte(messageID)) + } +} diff --git a/internal/galactus/send_message.go b/internal/galactus/send_message.go index d9a41ab..82541a3 100644 --- a/internal/galactus/send_message.go +++ b/internal/galactus/send_message.go @@ -3,20 +3,19 @@ package galactus import ( "github.com/automuteus/galactus/pkg/validate" "github.com/gorilla/mux" - "github.com/jonas747/dshardmanager" "go.uber.org/zap" "io/ioutil" "net/http" ) -func SendChannelMessageHandler(logger *zap.Logger, shardManager *dshardmanager.Manager) func(w http.ResponseWriter, r *http.Request) { +func (galactus *GalactusAPI) SendChannelMessageHandler() func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) channelID := vars["channelID"] valid, err := validate.ValidSnowflake(channelID) if !valid { errMsg := "channelID provided to sendMessageHandler is invalid" - logger.Error(errMsg, + galactus.logger.Error(errMsg, zap.String("channelID", channelID), zap.Error(err), ) @@ -28,7 +27,7 @@ func SendChannelMessageHandler(logger *zap.Logger, shardManager *dshardmanager.M body, err := ioutil.ReadAll(r.Body) if err != nil { errMsg := "could not read http body with error" - logger.Error(errMsg, + galactus.logger.Error(errMsg, zap.Error(err), ) w.WriteHeader(http.StatusInternalServerError) @@ -40,10 +39,10 @@ func SendChannelMessageHandler(logger *zap.Logger, shardManager *dshardmanager.M // TODO perform some validation on the message body? // ex message length, empty contents, etc - sess, err := getRandomSession(shardManager) + sess, err := getRandomSession(galactus.shardManager) if err != nil { errMsg := "error obtaining random session for sendMessageHandler" - logger.Error(errMsg, + galactus.logger.Error(errMsg, zap.Error(err), ) w.WriteHeader(http.StatusInternalServerError) @@ -54,7 +53,7 @@ func SendChannelMessageHandler(logger *zap.Logger, shardManager *dshardmanager.M msg, err := sess.ChannelMessageSend(channelID, string(body)) if err != nil { errMsg := "error posting message to channel" - logger.Error(errMsg, + galactus.logger.Error(errMsg, zap.Error(err), zap.String("channelID", channelID), zap.String("contents", string(body)), @@ -65,7 +64,7 @@ func SendChannelMessageHandler(logger *zap.Logger, shardManager *dshardmanager.M } // TODO metrics logging here - logger.Info("posted message to channel", + galactus.logger.Info("posted message to channel", zap.String("channelID", channelID), zap.String("contents", string(body)), zap.String("messageID", msg.ID), diff --git a/internal/galactus/send_message_embed.go b/internal/galactus/send_message_embed.go index 51fe03a..bf686e8 100644 --- a/internal/galactus/send_message_embed.go +++ b/internal/galactus/send_message_embed.go @@ -38,8 +38,8 @@ func (galactus *GalactusAPI) SendChannelMessageEmbedHandler() func(w http.Respon } defer r.Body.Close() - var embed *discordgo.MessageEmbed - err = json.Unmarshal(body, embed) + var embed discordgo.MessageEmbed + err = json.Unmarshal(body, &embed) if err != nil { errMsg := "error unmarshalling discordMessageEmbed from JSON" galactus.logger.Error(errMsg, @@ -64,7 +64,7 @@ func (galactus *GalactusAPI) SendChannelMessageEmbedHandler() func(w http.Respon return } - msg, err := sess.ChannelMessageSendEmbed(channelID, embed) + msg, err := sess.ChannelMessageSendEmbed(channelID, &embed) if err != nil { errMsg := "error posting messageEmbed to channel" galactus.logger.Error(errMsg, diff --git a/internal/galactus/server.go b/internal/galactus/server.go index 3ebf877..4fd4b47 100644 --- a/internal/galactus/server.go +++ b/internal/galactus/server.go @@ -166,11 +166,13 @@ func (galactus *GalactusAPI) Run(port string, maxWorkers int, taskTimeout time.D r := mux.NewRouter() r.HandleFunc(endpoint.ModifyUserbyGuildConnectCode, galactus.modifyUserHandler(maxWorkers, taskTimeout)).Methods("POST") - r.HandleFunc(endpoint.SendMessageFull, SendChannelMessageHandler(galactus.logger, galactus.shardManager)).Methods("POST") + + r.HandleFunc(endpoint.SendMessageFull, galactus.SendChannelMessageHandler()).Methods("POST") r.HandleFunc(endpoint.SendMessageEmbedFull, galactus.SendChannelMessageEmbedHandler()).Methods("POST") + r.HandleFunc(endpoint.DeleteMessageFull, galactus.DeleteChannelMessageHandler()).Methods("POST") // TODO maybe eventually provide some auth parameter, or version number? Something to prove that a worker can pop requests? - r.HandleFunc("/request/job", func(w http.ResponseWriter, r *http.Request) { + r.HandleFunc(endpoint.RequestJob, func(w http.ResponseWriter, r *http.Request) { msg, err := redisutils.PopRawDiscordMessage(galactus.client) // no jobs available @@ -183,14 +185,14 @@ func (galactus *GalactusAPI) Run(port string, maxWorkers int, taskTimeout time.D w.WriteHeader(http.StatusInternalServerError) w.Write([]byte("{\"error\": \"" + err.Error() + "\"}")) galactus.logger.Error("redis error when popping job", - zap.String("endpoint", "/request/job"), + zap.String("endpoint", endpoint.RequestJob), zap.Error(err)) return case msg == "": w.WriteHeader(http.StatusInternalServerError) w.Write([]byte("{\"error\": \"Nil job returned, despite no Redis errors\"}")) galactus.logger.Error("nil job returned, despite no Redis errors", - zap.String("endpoint", "/request/job")) + zap.String("endpoint", endpoint.RequestJob)) return } @@ -199,13 +201,13 @@ func (galactus *GalactusAPI) Run(port string, maxWorkers int, taskTimeout time.D _, err = w.Write([]byte(msg)) if err != nil { galactus.logger.Error("failed to write job as HTTP response", - zap.String("endpoint", "/request/job"), + zap.String("endpoint", endpoint.RequestJob), zap.Error(err), ) } }).Methods("POST") - r.HandleFunc("/jobs", func(w http.ResponseWriter, r *http.Request) { + r.HandleFunc(endpoint.JobCount, func(w http.ResponseWriter, r *http.Request) { var jobs JobsNumber num, err := redisutils.DiscordMessagesSize(galactus.client) diff --git a/internal/handler/guild_create.go b/internal/handler/guild_create.go index a44a2a1..67896e4 100644 --- a/internal/handler/guild_create.go +++ b/internal/handler/guild_create.go @@ -3,6 +3,7 @@ package handler import ( "encoding/json" redis_utils "github.com/automuteus/galactus/internal/redis" + "github.com/automuteus/galactus/pkg/discord_message" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" "go.uber.org/zap" @@ -18,12 +19,12 @@ func GuildCreateHandler(logger *zap.Logger, client *redis.Client) func(s *discor logger.Error("error marshalling json for GuildCreate message", zap.Error(err)) } - err = redis_utils.PushDiscordMessage(client, redis_utils.GuildCreate, byt) + err = redis_utils.PushDiscordMessage(client, discord_message.GuildCreate, byt) if err != nil { logger.Error("error pushing discord message to Redis for GuildCreate", zap.Error(err)) } else { - LogDiscordMessagePush(logger, redis_utils.GuildCreate, m.ID, "", m.OwnerID, m.ID) + LogDiscordMessagePush(logger, discord_message.GuildCreate, m.ID, "", m.OwnerID, m.ID) } } } diff --git a/internal/handler/guild_delete.go b/internal/handler/guild_delete.go index 8412940..d8bfd9a 100644 --- a/internal/handler/guild_delete.go +++ b/internal/handler/guild_delete.go @@ -3,6 +3,7 @@ package handler import ( "encoding/json" redis_utils "github.com/automuteus/galactus/internal/redis" + "github.com/automuteus/galactus/pkg/discord_message" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" "go.uber.org/zap" @@ -18,12 +19,12 @@ func GuildDeleteHandler(logger *zap.Logger, client *redis.Client) func(s *discor logger.Error("error marshalling json for GuildDelete message", zap.Error(err)) } - err = redis_utils.PushDiscordMessage(client, redis_utils.GuildDelete, byt) + err = redis_utils.PushDiscordMessage(client, discord_message.GuildDelete, byt) if err != nil { logger.Error("error pushing to Redis for GuildDelete message", zap.Error(err)) } else { - LogDiscordMessagePush(logger, redis_utils.GuildDelete, m.ID, "", m.OwnerID, m.ID) + LogDiscordMessagePush(logger, discord_message.GuildDelete, m.ID, "", m.OwnerID, m.ID) } } } diff --git a/internal/handler/log.go b/internal/handler/log.go index 2f12f37..2ef4685 100644 --- a/internal/handler/log.go +++ b/internal/handler/log.go @@ -1,13 +1,13 @@ package handler import ( - "github.com/automuteus/galactus/internal/redis" + "github.com/automuteus/galactus/pkg/discord_message" "go.uber.org/zap" ) -func LogDiscordMessagePush(logger *zap.Logger, msgType redis.DiscordMessageType, guildID, channelID, userID, ID string) { +func LogDiscordMessagePush(logger *zap.Logger, msgType discord_message.DiscordMessageType, guildID, channelID, userID, ID string) { logger.Info("pushed discord message to Redis", - zap.String("type", redis.DiscordMessageTypeStrings[msgType]), + zap.String("type", discord_message.DiscordMessageTypeStrings[msgType]), zap.String("guild_id", guildID), zap.String("channel_id", channelID), zap.String("user_id", userID), diff --git a/internal/handler/message_create.go b/internal/handler/message_create.go index fb24bd2..1ee0cd5 100644 --- a/internal/handler/message_create.go +++ b/internal/handler/message_create.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" redis_utils "github.com/automuteus/galactus/internal/redis" + "github.com/automuteus/galactus/pkg/discord_message" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" "go.uber.org/zap" @@ -22,6 +23,8 @@ func MessageCreateHandler(logger *zap.Logger, client *redis.Client) func(s *disc // TODO should find an efficient way to hook into a guild's prefix here. Would allow for filtering messages // quickly without pushing them into the queue + // TODO softban the users at this level; bot logic shouldn't have to worry about it + if redis_utils.IsUserBanned(client, m.Author.ID) { logger.Info("ignoring message from softbanned user", zap.String("author ID", m.Author.ID), @@ -46,12 +49,12 @@ func MessageCreateHandler(logger *zap.Logger, client *redis.Client) func(s *disc logger.Error("error marshalling json for MessageCreate message", zap.Error(err)) } - err = redis_utils.PushDiscordMessage(client, redis_utils.MessageCreate, byt) + err = redis_utils.PushDiscordMessage(client, discord_message.MessageCreate, byt) if err != nil { logger.Error("error pushing discord message to Redis for MessageCreate message", zap.Error(err)) } else { - LogDiscordMessagePush(logger, redis_utils.MessageCreate, m.GuildID, m.ChannelID, m.Author.ID, m.ID) + LogDiscordMessagePush(logger, discord_message.MessageCreate, m.GuildID, m.ChannelID, m.Author.ID, m.ID) } } } diff --git a/internal/handler/message_reaction_add.go b/internal/handler/message_reaction_add.go index 56d8682..564722e 100644 --- a/internal/handler/message_reaction_add.go +++ b/internal/handler/message_reaction_add.go @@ -3,6 +3,7 @@ package handler import ( "encoding/json" redis_utils "github.com/automuteus/galactus/internal/redis" + "github.com/automuteus/galactus/pkg/discord_message" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" "go.uber.org/zap" @@ -24,12 +25,12 @@ func MessageReactionAddHandler(logger *zap.Logger, client *redis.Client) func(s logger.Error("error marshalling json for MessageReactionAdd message", zap.Error(err)) } - err = redis_utils.PushDiscordMessage(client, redis_utils.MessageReactionAdd, byt) + err = redis_utils.PushDiscordMessage(client, discord_message.MessageReactionAdd, byt) if err != nil { logger.Error("error pushing to Redis for MessageReactionAdd message", zap.Error(err)) } else { - LogDiscordMessagePush(logger, redis_utils.MessageReactionAdd, m.GuildID, m.ChannelID, m.UserID, m.MessageID) + LogDiscordMessagePush(logger, discord_message.MessageReactionAdd, m.GuildID, m.ChannelID, m.UserID, m.MessageID) } } } diff --git a/internal/handler/voice_state.go b/internal/handler/voice_state.go index 2168491..2317cac 100644 --- a/internal/handler/voice_state.go +++ b/internal/handler/voice_state.go @@ -3,6 +3,7 @@ package handler import ( "encoding/json" redis_utils "github.com/automuteus/galactus/internal/redis" + "github.com/automuteus/galactus/pkg/discord_message" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" "go.uber.org/zap" @@ -18,12 +19,12 @@ func VoiceStateUpdateHandler(logger *zap.Logger, client *redis.Client) func(s *d logger.Error("error marshalling json for VoiceStateUpdate message", zap.Error(err)) } - err = redis_utils.PushDiscordMessage(client, redis_utils.VoiceStateUpdate, byt) + err = redis_utils.PushDiscordMessage(client, discord_message.VoiceStateUpdate, byt) if err != nil { logger.Error("error pushing to Redis for VoiceStateUpdate message", zap.Error(err)) } else { - LogDiscordMessagePush(logger, redis_utils.VoiceStateUpdate, m.GuildID, m.ChannelID, m.UserID, m.SessionID) + LogDiscordMessagePush(logger, discord_message.VoiceStateUpdate, m.GuildID, m.ChannelID, m.UserID, m.SessionID) } } } diff --git a/internal/redis/queue.go b/internal/redis/queue.go index fa705f9..406f6dc 100644 --- a/internal/redis/queue.go +++ b/internal/redis/queue.go @@ -3,38 +3,16 @@ package redis import ( "context" "encoding/json" + "github.com/automuteus/galactus/pkg/discord_message" "github.com/go-redis/redis/v8" ) const GatewayMessageKey = "automuteus:gateway:message" -type DiscordMessageType int - -const ( - GuildCreate DiscordMessageType = iota - GuildDelete - VoiceStateUpdate - MessageCreate - MessageReactionAdd -) - -var DiscordMessageTypeStrings = []string{ - "GuildCreate", - "GuildDelete", - "VoiceStateUpdate", - "MessageCreate", - "MessageReactionAdd", -} - -type DiscordMessage struct { - MessageType DiscordMessageType - Data string -} - -func PushDiscordMessage(client *redis.Client, messageType DiscordMessageType, data []byte) error { - s := DiscordMessage{ +func PushDiscordMessage(client *redis.Client, messageType discord_message.DiscordMessageType, data []byte) error { + s := discord_message.DiscordMessage{ MessageType: messageType, - Data: string(data), + Data: data, } byt, err := json.Marshal(s) if err != nil { diff --git a/internal/redis/queue_test.go b/internal/redis/queue_test.go index ec94d84..167a3f3 100644 --- a/internal/redis/queue_test.go +++ b/internal/redis/queue_test.go @@ -4,6 +4,7 @@ import ( "encoding/json" "errors" "github.com/alicebob/miniredis/v2" + "github.com/automuteus/galactus/pkg/discord_message" "github.com/go-redis/redis/v8" "log" "strings" @@ -54,7 +55,7 @@ func TestPopEmpty(t *testing.T) { func TestPushAndPopSingle(t *testing.T) { client := newTestRedis() - err := PushDiscordMessage(client, MessageCreate, []byte(inputMsg)) + err := PushDiscordMessage(client, discord_message.MessageCreate, []byte(inputMsg)) if err != nil { t.Fatal(err) } @@ -66,17 +67,17 @@ func TestPushAndPopSingle(t *testing.T) { t.Fatal("nil message returned when expected the previous msg we pushed") } - var d DiscordMessage + var d discord_message.DiscordMessage err = json.Unmarshal([]byte(msg), &d) if err != nil { t.Fatal(err) } - if d.MessageType != MessageCreate { + if d.MessageType != discord_message.MessageCreate { t.Fatal("returned msg type is not msgcreate") } - if !strings.EqualFold(inputMsg, d.Data) { + if !strings.EqualFold(inputMsg, string(d.Data)) { t.Fatal("input and output messages are not equivalent") } } @@ -84,12 +85,12 @@ func TestPushAndPopSingle(t *testing.T) { func TestPushAndPopMultiple(t *testing.T) { client := newTestRedis() - err := PushDiscordMessage(client, MessageCreate, []byte(inputMsg)) + err := PushDiscordMessage(client, discord_message.MessageCreate, []byte(inputMsg)) if err != nil { log.Fatal(err) } input2 := strings.Replace(inputMsg, "\"id\":\"0\"", "\"id\":\"1\"", 1) - err = PushDiscordMessage(client, MessageCreate, []byte(input2)) + err = PushDiscordMessage(client, discord_message.MessageCreate, []byte(input2)) if err != nil { log.Fatal(err) } @@ -101,17 +102,17 @@ func TestPushAndPopMultiple(t *testing.T) { log.Fatal("nil message returned when expected the previous msg we pushed") } - var d DiscordMessage + var d discord_message.DiscordMessage err = json.Unmarshal([]byte(msg), &d) if err != nil { t.Fatal(err) } - if d.MessageType != MessageCreate { + if d.MessageType != discord_message.MessageCreate { t.Fatal("returned msg type is not msgcreate") } - if !strings.EqualFold(inputMsg, d.Data) { + if !strings.EqualFold(inputMsg, string(d.Data)) { t.Fatal("input and output messages are not equivalent") } @@ -127,18 +128,18 @@ func TestPushAndPopMultiple(t *testing.T) { t.Fatal(err) } - if d.MessageType != MessageCreate { + if d.MessageType != discord_message.MessageCreate { t.Fatal("returned msg type is not msgcreate for input2") } - if !strings.EqualFold(input2, d.Data) { + if !strings.EqualFold(input2, string(d.Data)) { t.Fatal("input2 and output messages are not equivalent") } // replace back; now the string comparison should fail input2 = strings.Replace(input2, "\"id\":\"1\"", "\"id\":\"0\"", 1) - if strings.EqualFold(input2, d.Data) { + if strings.EqualFold(input2, string(d.Data)) { t.Fatal("input and output messages are equivalent, when we mutated the input on purpose") } } diff --git a/pkg/discord_message/message.go b/pkg/discord_message/message.go new file mode 100644 index 0000000..f009ae1 --- /dev/null +++ b/pkg/discord_message/message.go @@ -0,0 +1,24 @@ +package discord_message + +type DiscordMessageType int + +const ( + GuildCreate DiscordMessageType = iota + GuildDelete + VoiceStateUpdate + MessageCreate + MessageReactionAdd +) + +var DiscordMessageTypeStrings = []string{ + "GuildCreate", + "GuildDelete", + "VoiceStateUpdate", + "MessageCreate", + "MessageReactionAdd", +} + +type DiscordMessage struct { + MessageType DiscordMessageType + Data []byte +} diff --git a/pkg/endpoint/endpoints.go b/pkg/endpoint/endpoints.go index 999ac8d..1f1ac85 100644 --- a/pkg/endpoint/endpoints.go +++ b/pkg/endpoint/endpoints.go @@ -6,4 +6,10 @@ const SendMessageFull = SendMessagePartial + "{channelID}" const SendMessageEmbedPartial = "/sendMessageEmbed/" const SendMessageEmbedFull = SendMessageEmbedPartial + "{channelID}" +const DeleteMessagePartial = "/deleteMessage/" +const DeleteMessageFull = DeleteMessagePartial + "{channelID}/{messageID}" + const ModifyUserbyGuildConnectCode = "/modify/{guildID}/{connectCode}" + +const RequestJob = "/request/job" +const JobCount = "/totalJobs" From 128b49db742b44a92be09bb2ca035a3958ae406e Mon Sep 17 00:00:00 2001 From: denverquane Date: Sun, 10 Jan 2021 20:56:12 -0700 Subject: [PATCH 09/50] Added all message endpoints for refactor of bot discord session management --- go.mod | 2 +- go.sum | 3 + internal/galactus/add_reaction.go | 49 +++++++++ internal/galactus/create_user_channel.go | 54 ++++++++++ internal/galactus/delete_message.go | 29 +---- internal/galactus/edit_message_embed.go | 85 +++++++++++++++ internal/galactus/get_guild.go | 59 +++++++++++ internal/galactus/get_guild_channels.go | 54 ++++++++++ internal/galactus/get_guild_member.go | 56 ++++++++++ internal/galactus/get_guild_roles.go | 54 ++++++++++ internal/galactus/remove_all_reactions.go | 42 ++++++++ internal/galactus/remove_reaction.go | 62 +++++++++++ internal/galactus/send_message.go | 23 ++-- internal/galactus/send_message_embed.go | 22 ++-- internal/galactus/server.go | 14 +++ pkg/endpoint/endpoints.go | 27 +++++ pkg/validate/params.go | 123 ++++++++++++++++++++++ 17 files changed, 706 insertions(+), 52 deletions(-) create mode 100644 internal/galactus/add_reaction.go create mode 100644 internal/galactus/create_user_channel.go create mode 100644 internal/galactus/edit_message_embed.go create mode 100644 internal/galactus/get_guild.go create mode 100644 internal/galactus/get_guild_channels.go create mode 100644 internal/galactus/get_guild_member.go create mode 100644 internal/galactus/get_guild_roles.go create mode 100644 internal/galactus/remove_all_reactions.go create mode 100644 internal/galactus/remove_reaction.go create mode 100644 pkg/validate/params.go diff --git a/go.mod b/go.mod index 22866de..da08d8a 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.15 require ( github.com/alicebob/miniredis v2.5.0+incompatible // indirect github.com/alicebob/miniredis/v2 v2.14.1 - github.com/automuteus/utils v0.0.6 + github.com/automuteus/utils v0.0.7 github.com/bsm/redislock v0.7.0 github.com/bwmarrin/discordgo v0.22.0 github.com/go-redis/redis v6.15.9+incompatible // indirect diff --git a/go.sum b/go.sum index 03c134c..49fb14d 100644 --- a/go.sum +++ b/go.sum @@ -14,6 +14,8 @@ github.com/automuteus/utils v0.0.4 h1:weSw/mAMHjZvqEz6XR+jYVgrpawQhGGFb4PfWgt4JH github.com/automuteus/utils v0.0.4/go.mod h1:3/DMXEOYYnBADTtb0rbBsDBD+d+QDdIpBRbvhy8cPoI= github.com/automuteus/utils v0.0.6 h1:u14BvwfFzHN8A0aJ4qbeG7vkkyK2brnBYSOjMakWars= github.com/automuteus/utils v0.0.6/go.mod h1:3/DMXEOYYnBADTtb0rbBsDBD+d+QDdIpBRbvhy8cPoI= +github.com/automuteus/utils v0.0.7 h1:WnGqvaqSxyysR6ixMltaF5RSIeoeL9ev9zRqqgVF3qk= +github.com/automuteus/utils v0.0.7/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= github.com/bsm/redislock v0.7.0 h1:RL7aZJhCKkuBjQbnSTKCeedTRifBWxd/ffP+GZ599Mo= github.com/bsm/redislock v0.7.0/go.mod h1:3Kgu+cXw0JrkZ5pmY/JbcFpixGZ5M9v9G2PGWYqku+k= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= @@ -171,6 +173,7 @@ github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2y github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/nicksnyder/go-i18n/v2 v2.1.1/go.mod h1:d++QJC9ZVf7pa48qrsRWhMJ5pSHIPmS3OLqK1niyLxs= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= diff --git a/internal/galactus/add_reaction.go b/internal/galactus/add_reaction.go new file mode 100644 index 0000000..0e25b47 --- /dev/null +++ b/internal/galactus/add_reaction.go @@ -0,0 +1,49 @@ +package galactus + +import ( + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "github.com/gorilla/mux" + "go.uber.org/zap" + "net/http" +) + +func (galactus *GalactusAPI) AddReactionHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + channelID, messageID := validate.ChannelAndMessageIDsAndRespond(galactus.logger, w, r, endpoint.AddReactionFull) + if channelID == "" || messageID == "" { + return + } + + // manually fetch the emojiID, because it can be a non-numeric Unicode emoji directly + + vars := mux.Vars(r) + emojiID := vars["emojiID"] + + sess, err := getRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for addReaction" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + err = sess.MessageReactionAdd(channelID, messageID, emojiID) + if err != nil { + errMsg := "failed to addReaction" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("channelID", channelID), + zap.String("messageID", messageID), + zap.String("emojiID", emojiID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + w.WriteHeader(http.StatusOK) + } +} diff --git a/internal/galactus/create_user_channel.go b/internal/galactus/create_user_channel.go new file mode 100644 index 0000000..4a75bcc --- /dev/null +++ b/internal/galactus/create_user_channel.go @@ -0,0 +1,54 @@ +package galactus + +import ( + "encoding/json" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "go.uber.org/zap" + "net/http" +) + +func (galactus *GalactusAPI) CreateUserChannelHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + userID := validate.UserIDAndRespond(galactus.logger, w, r, endpoint.UserChannelCreateFull) + if userID == "" { + return + } + + sess, err := getRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for getGuildMember" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + channel, err := sess.UserChannelCreate(userID) + if err != nil { + errMsg := "failed to create user channel" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("userID", userID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + jBytes, err := json.Marshal(channel) + if err != nil { + errMsg := "failed to marshal user channel" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("userID", userID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + w.WriteHeader(http.StatusOK) + w.Write(jBytes) + } +} diff --git a/internal/galactus/delete_message.go b/internal/galactus/delete_message.go index d1f717e..2424daa 100644 --- a/internal/galactus/delete_message.go +++ b/internal/galactus/delete_message.go @@ -1,37 +1,16 @@ package galactus import ( + "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" - "github.com/gorilla/mux" "go.uber.org/zap" "net/http" ) func (galactus *GalactusAPI) DeleteChannelMessageHandler() func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) { - vars := mux.Vars(r) - channelID := vars["channelID"] - messageID := vars["messageID"] - valid, err := validate.ValidSnowflake(channelID) - if !valid { - errMsg := "channelID provided to deleteMessageHandler is invalid" - galactus.logger.Error(errMsg, - zap.String("channelID", channelID), - zap.Error(err), - ) - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - valid, err = validate.ValidSnowflake(messageID) - if !valid { - errMsg := "messageID provided to deleteMessageHandler is invalid" - galactus.logger.Error(errMsg, - zap.String("messageID", messageID), - zap.Error(err), - ) - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte(errMsg + ": " + err.Error())) + channelID, messageID := validate.ChannelAndMessageIDsAndRespond(galactus.logger, w, r, endpoint.DeleteMessageFull) + if channelID == "" || messageID == "" { return } @@ -40,7 +19,7 @@ func (galactus *GalactusAPI) DeleteChannelMessageHandler() func(w http.ResponseW sess, err := getRandomSession(galactus.shardManager) if err != nil { - errMsg := "error obtaining random session for sendMessageHandler" + errMsg := "error obtaining random session for " + endpoint.DeleteMessageFull galactus.logger.Error(errMsg, zap.Error(err), ) diff --git a/internal/galactus/edit_message_embed.go b/internal/galactus/edit_message_embed.go new file mode 100644 index 0000000..d4c07cd --- /dev/null +++ b/internal/galactus/edit_message_embed.go @@ -0,0 +1,85 @@ +package galactus + +import ( + "encoding/json" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "github.com/bwmarrin/discordgo" + "go.uber.org/zap" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusAPI) EditMessageEmbedHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + channelID, messageID := validate.ChannelAndMessageIDsAndRespond(galactus.logger, w, r, endpoint.EditMessageEmbedFull) + if channelID == "" || messageID == "" { + return + } + + body, err := ioutil.ReadAll(r.Body) + if err != nil { + errMsg := "could not read http body with error" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + defer r.Body.Close() + + var embed discordgo.MessageEmbed + err = json.Unmarshal(body, &embed) + if err != nil { + errMsg := "error unmarshalling discordMessageEmbed from JSON" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("body", string(body)), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + // TODO perform some validation on the message body? + // ex message length, empty contents, etc + + sess, err := getRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for " + endpoint.EditMessageEmbedFull + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + msg, err := sess.ChannelMessageEditEmbed(channelID, messageID, &embed) + if err != nil { + errMsg := "error editing message in channel" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("channelID", channelID), + zap.String("messageID", messageID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + // TODO metrics logging here + galactus.logger.Info("edited message in channel", + zap.String("channelID", channelID), + zap.String("messageID", messageID), + ) + w.WriteHeader(http.StatusOK) + + jbytes, err := json.Marshal(msg) + if err != nil { + log.Println(err) + } + w.Write(jbytes) + } +} diff --git a/internal/galactus/get_guild.go b/internal/galactus/get_guild.go new file mode 100644 index 0000000..14db485 --- /dev/null +++ b/internal/galactus/get_guild.go @@ -0,0 +1,59 @@ +package galactus + +import ( + "encoding/json" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "go.uber.org/zap" + "net/http" + "strconv" +) + +func (galactus *GalactusAPI) GetGuildHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + guildID := validate.GuildIDAndRespond(galactus.logger, w, r, endpoint.GetGuildFull) + if guildID == "" { + return + } + + id, err := strconv.ParseInt(guildID, 10, 64) + if err != nil { + errMsg := "failed to parse guildID as int64" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + sess := galactus.shardManager.SessionForGuild(id) + guild, err := sess.State.Guild(guildID) + if err != nil { + errMsg := "failed to fetch guild from session state" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + // TODO fetch the guild with an actual API call here? if it fails via state? + + jBytes, err := json.Marshal(guild) + if err != nil { + errMsg := "failed to marshal guild to JSON" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + w.WriteHeader(http.StatusOK) + w.Write(jBytes) + } +} diff --git a/internal/galactus/get_guild_channels.go b/internal/galactus/get_guild_channels.go new file mode 100644 index 0000000..6860b43 --- /dev/null +++ b/internal/galactus/get_guild_channels.go @@ -0,0 +1,54 @@ +package galactus + +import ( + "encoding/json" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "go.uber.org/zap" + "net/http" +) + +func (galactus *GalactusAPI) GetGuildChannelsHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + guildID := validate.GuildIDAndRespond(galactus.logger, w, r, endpoint.GetGuildChannelsFull) + if guildID == "" { + return + } + + sess, err := getRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for getGuildChannels" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + channels, err := sess.GuildChannels(guildID) + if err != nil { + errMsg := "failed to fetch guild channels" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + jBytes, err := json.Marshal(channels) + if err != nil { + errMsg := "failed to marshal guild channels to JSON" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + w.WriteHeader(http.StatusOK) + w.Write(jBytes) + } +} diff --git a/internal/galactus/get_guild_member.go b/internal/galactus/get_guild_member.go new file mode 100644 index 0000000..747f6ba --- /dev/null +++ b/internal/galactus/get_guild_member.go @@ -0,0 +1,56 @@ +package galactus + +import ( + "encoding/json" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "go.uber.org/zap" + "net/http" +) + +func (galactus *GalactusAPI) GetGuildMemberHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + guildID, userID := validate.GuildAndUserIDsAndRespond(galactus.logger, w, r, endpoint.GetGuildMemberFull) + if guildID == "" || userID == "" { + return + } + + sess, err := getRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for getGuildMember" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + member, err := sess.GuildMember(guildID, userID) + if err != nil { + errMsg := "failed to fetch guild member" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + zap.String("userID", userID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + jBytes, err := json.Marshal(member) + if err != nil { + errMsg := "failed to marshal guild member" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + zap.String("userID", userID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + w.WriteHeader(http.StatusOK) + w.Write(jBytes) + } +} diff --git a/internal/galactus/get_guild_roles.go b/internal/galactus/get_guild_roles.go new file mode 100644 index 0000000..6522bc1 --- /dev/null +++ b/internal/galactus/get_guild_roles.go @@ -0,0 +1,54 @@ +package galactus + +import ( + "encoding/json" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "go.uber.org/zap" + "net/http" +) + +func (galactus *GalactusAPI) GetGuildRolesHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + guildID := validate.GuildIDAndRespond(galactus.logger, w, r, endpoint.GetGuildRolesFull) + if guildID == "" { + return + } + + sess, err := getRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for getGuildRoles" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + roles, err := sess.GuildRoles(guildID) + if err != nil { + errMsg := "failed to fetch guild roles" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + jBytes, err := json.Marshal(roles) + if err != nil { + errMsg := "failed to marshal guild roles to JSON" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + w.WriteHeader(http.StatusOK) + w.Write(jBytes) + } +} diff --git a/internal/galactus/remove_all_reactions.go b/internal/galactus/remove_all_reactions.go new file mode 100644 index 0000000..66f28f7 --- /dev/null +++ b/internal/galactus/remove_all_reactions.go @@ -0,0 +1,42 @@ +package galactus + +import ( + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "go.uber.org/zap" + "net/http" +) + +func (galactus *GalactusAPI) RemoveAllReactionsHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + channelID, messageID := validate.ChannelAndMessageIDsAndRespond(galactus.logger, w, r, endpoint.RemoveAllReactionsFull) + if channelID == "" || messageID == "" { + return + } + + sess, err := getRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for removeAllReactions" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + err = sess.MessageReactionsRemoveAll(channelID, messageID) + if err != nil { + errMsg := "failed to remove all reactions" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("channelID", channelID), + zap.String("messageID", messageID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + w.WriteHeader(http.StatusOK) + } +} diff --git a/internal/galactus/remove_reaction.go b/internal/galactus/remove_reaction.go new file mode 100644 index 0000000..ff5bb8d --- /dev/null +++ b/internal/galactus/remove_reaction.go @@ -0,0 +1,62 @@ +package galactus + +import ( + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "github.com/gorilla/mux" + "go.uber.org/zap" + "net/http" +) + +func (galactus *GalactusAPI) RemoveReactionHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + channelID, messageID := validate.ChannelAndMessageIDsAndRespond(galactus.logger, w, r, endpoint.RemoveReactionFull) + if channelID == "" || messageID == "" { + return + } + // manually fetch the userID and emojiID, because they can be weird ("@me", or Unicode emoji) + + vars := mux.Vars(r) + emojiID := vars["emojiID"] + userID := vars["userID"] + + valid, err := validate.ValidSnowflake(userID) + if !valid && userID != "@me" { + errMsg := "userID is invalid and not @me for removeReaction" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("userID", userID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + sess, err := getRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for removeReaction" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + err = sess.MessageReactionRemove(channelID, messageID, emojiID, userID) + if err != nil { + errMsg := "failed to removeReaction" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("channelID", channelID), + zap.String("messageID", messageID), + zap.String("emojiID", emojiID), + zap.String("userID", userID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + w.WriteHeader(http.StatusOK) + } +} diff --git a/internal/galactus/send_message.go b/internal/galactus/send_message.go index 82541a3..349357c 100644 --- a/internal/galactus/send_message.go +++ b/internal/galactus/send_message.go @@ -1,26 +1,19 @@ package galactus import ( + "encoding/json" + "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" - "github.com/gorilla/mux" "go.uber.org/zap" "io/ioutil" + "log" "net/http" ) func (galactus *GalactusAPI) SendChannelMessageHandler() func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) { - vars := mux.Vars(r) - channelID := vars["channelID"] - valid, err := validate.ValidSnowflake(channelID) - if !valid { - errMsg := "channelID provided to sendMessageHandler is invalid" - galactus.logger.Error(errMsg, - zap.String("channelID", channelID), - zap.Error(err), - ) - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte(errMsg + ": " + err.Error())) + channelID := validate.ChannelIDAndRespond(galactus.logger, w, r, endpoint.SendMessageFull) + if channelID == "" { return } @@ -70,6 +63,10 @@ func (galactus *GalactusAPI) SendChannelMessageHandler() func(w http.ResponseWri zap.String("messageID", msg.ID), ) w.WriteHeader(http.StatusOK) - w.Write([]byte(msg.ID)) + jbytes, err := json.Marshal(msg) + if err != nil { + log.Println(err) + } + w.Write(jbytes) } } diff --git a/internal/galactus/send_message_embed.go b/internal/galactus/send_message_embed.go index bf686e8..de5c16d 100644 --- a/internal/galactus/send_message_embed.go +++ b/internal/galactus/send_message_embed.go @@ -2,27 +2,19 @@ package galactus import ( "encoding/json" + "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" "github.com/bwmarrin/discordgo" - "github.com/gorilla/mux" "go.uber.org/zap" "io/ioutil" + "log" "net/http" ) func (galactus *GalactusAPI) SendChannelMessageEmbedHandler() func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) { - vars := mux.Vars(r) - channelID := vars["channelID"] - valid, err := validate.ValidSnowflake(channelID) - if !valid { - errMsg := "channelID provided to sendMessageEmbedHandler is invalid" - galactus.logger.Error(errMsg, - zap.String("channelID", channelID), - zap.Error(err), - ) - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte(errMsg + ": " + err.Error())) + channelID := validate.ChannelIDAndRespond(galactus.logger, w, r, endpoint.SendMessageEmbedFull) + if channelID == "" { return } @@ -84,6 +76,10 @@ func (galactus *GalactusAPI) SendChannelMessageEmbedHandler() func(w http.Respon zap.String("messageID", msg.ID), ) w.WriteHeader(http.StatusOK) - w.Write([]byte(msg.ID)) + jbytes, err := json.Marshal(msg) + if err != nil { + log.Println(err) + } + w.Write(jbytes) } } diff --git a/internal/galactus/server.go b/internal/galactus/server.go index 4fd4b47..d06db77 100644 --- a/internal/galactus/server.go +++ b/internal/galactus/server.go @@ -169,8 +169,22 @@ func (galactus *GalactusAPI) Run(port string, maxWorkers int, taskTimeout time.D r.HandleFunc(endpoint.SendMessageFull, galactus.SendChannelMessageHandler()).Methods("POST") r.HandleFunc(endpoint.SendMessageEmbedFull, galactus.SendChannelMessageEmbedHandler()).Methods("POST") + + r.HandleFunc(endpoint.EditMessageEmbedFull, galactus.EditMessageEmbedHandler()).Methods("POST") + r.HandleFunc(endpoint.DeleteMessageFull, galactus.DeleteChannelMessageHandler()).Methods("POST") + r.HandleFunc(endpoint.GetGuildFull, galactus.GetGuildHandler()).Methods("POST") + r.HandleFunc(endpoint.GetGuildChannelsFull, galactus.GetGuildChannelsHandler()).Methods("POST") + r.HandleFunc(endpoint.GetGuildMemberFull, galactus.GetGuildMemberHandler()).Methods("POST") + r.HandleFunc(endpoint.GetGuildRolesFull, galactus.GetGuildRolesHandler()).Methods("POST") + + r.HandleFunc(endpoint.AddReactionFull, galactus.AddReactionHandler()).Methods("POST") + r.HandleFunc(endpoint.RemoveReactionFull, galactus.RemoveReactionHandler()).Methods("POST") + r.HandleFunc(endpoint.RemoveAllReactionsFull, galactus.RemoveAllReactionsHandler()).Methods("POST") + + r.HandleFunc(endpoint.UserChannelCreateFull, galactus.CreateUserChannelHandler()).Methods("POST") + // TODO maybe eventually provide some auth parameter, or version number? Something to prove that a worker can pop requests? r.HandleFunc(endpoint.RequestJob, func(w http.ResponseWriter, r *http.Request) { msg, err := redisutils.PopRawDiscordMessage(galactus.client) diff --git a/pkg/endpoint/endpoints.go b/pkg/endpoint/endpoints.go index 1f1ac85..f999b6a 100644 --- a/pkg/endpoint/endpoints.go +++ b/pkg/endpoint/endpoints.go @@ -6,10 +6,37 @@ const SendMessageFull = SendMessagePartial + "{channelID}" const SendMessageEmbedPartial = "/sendMessageEmbed/" const SendMessageEmbedFull = SendMessageEmbedPartial + "{channelID}" +const EditMessageEmbedPartial = "/editMessageEmbed/" +const EditMessageEmbedFull = EditMessageEmbedPartial + "{channelID}/{messageID}" + const DeleteMessagePartial = "/deleteMessage/" const DeleteMessageFull = DeleteMessagePartial + "{channelID}/{messageID}" +const RemoveReactionPartial = "/removeReaction/" +const RemoveReactionFull = RemoveReactionPartial + "{channelID}/{messageID}/{emojiID}/{userID}" + +const RemoveAllReactionsPartial = "/removeAllReactions/" +const RemoveAllReactionsFull = RemoveAllReactionsPartial + "{channelID}/{messageID}" + +const AddReactionPartial = "/addReaction/" +const AddReactionFull = AddReactionPartial + "{channelID}/{messageID}/{emojiID}" + const ModifyUserbyGuildConnectCode = "/modify/{guildID}/{connectCode}" +const GetGuildPartial = "/guild/" +const GetGuildFull = GetGuildPartial + "{guildID}" + +const GetGuildChannelsPartial = "/guildChannels/" +const GetGuildChannelsFull = GetGuildChannelsPartial + "{guildID}" + +const GetGuildMemberPartial = "/guildMember/" +const GetGuildMemberFull = GetGuildMemberPartial + "{guildID}/{userID}" + +const GetGuildRolesPartial = "/guildRoles/" +const GetGuildRolesFull = GetGuildRolesPartial + "{guildID}" + +const UserChannelCreatePartial = "/createUserChannel/" +const UserChannelCreateFull = UserChannelCreatePartial + "{userID}" + const RequestJob = "/request/job" const JobCount = "/totalJobs" diff --git a/pkg/validate/params.go b/pkg/validate/params.go new file mode 100644 index 0000000..25ce43f --- /dev/null +++ b/pkg/validate/params.go @@ -0,0 +1,123 @@ +package validate + +import ( + "github.com/gorilla/mux" + "go.uber.org/zap" + "net/http" +) + +func ChannelAndMessageIDsAndRespond(logger *zap.Logger, w http.ResponseWriter, r *http.Request, endpoint string) (string, string) { + vars := mux.Vars(r) + channelID := vars["channelID"] + messageID := vars["messageID"] + valid, err := ValidSnowflake(channelID) + if !valid { + errMsg := "channelID provided to " + endpoint + " is invalid" + logger.Error(errMsg, + zap.String("channelID", channelID), + zap.String("endpoint", endpoint), + zap.Error(err), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg + ": " + err.Error())) + return "", "" + } + valid, err = ValidSnowflake(messageID) + if !valid { + errMsg := "messageID provided to " + endpoint + " is invalid" + logger.Error(errMsg, + zap.String("messageID", messageID), + zap.String("endpoint", endpoint), + zap.Error(err), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg + ": " + err.Error())) + return channelID, "" + } + return channelID, messageID +} + +func GuildAndUserIDsAndRespond(logger *zap.Logger, w http.ResponseWriter, r *http.Request, endpoint string) (string, string) { + vars := mux.Vars(r) + guildID := vars["guildID"] + userID := vars["userID"] + valid, err := ValidSnowflake(guildID) + if !valid { + errMsg := "channelID provided to " + endpoint + " is invalid" + logger.Error(errMsg, + zap.String("channelID", guildID), + zap.String("endpoint", endpoint), + zap.Error(err), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg + ": " + err.Error())) + return "", "" + } + valid, err = ValidSnowflake(userID) + if !valid { + errMsg := "userID provided to " + endpoint + " is invalid" + logger.Error(errMsg, + zap.String("userID", userID), + zap.String("endpoint", endpoint), + zap.Error(err), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg + ": " + err.Error())) + return guildID, "" + } + return guildID, userID +} + +func ChannelIDAndRespond(logger *zap.Logger, w http.ResponseWriter, r *http.Request, endpoint string) string { + vars := mux.Vars(r) + channelID := vars["channelID"] + valid, err := ValidSnowflake(channelID) + if !valid { + errMsg := "channelID provided to " + endpoint + " is invalid" + logger.Error(errMsg, + zap.String("channelID", channelID), + zap.String("endpoint", endpoint), + zap.Error(err), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg + ": " + err.Error())) + return "" + } + return channelID +} + +func GuildIDAndRespond(logger *zap.Logger, w http.ResponseWriter, r *http.Request, endpoint string) string { + vars := mux.Vars(r) + guildID := vars["guildID"] + valid, err := ValidSnowflake(guildID) + if !valid { + errMsg := "channelID provided to " + endpoint + " is invalid" + logger.Error(errMsg, + zap.String("channelID", guildID), + zap.String("endpoint", endpoint), + zap.Error(err), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg + ": " + err.Error())) + return "" + } + return guildID +} + +func UserIDAndRespond(logger *zap.Logger, w http.ResponseWriter, r *http.Request, endpoint string) string { + vars := mux.Vars(r) + userID := vars["userID"] + valid, err := ValidSnowflake(userID) + if !valid { + errMsg := "userID provided to " + endpoint + " is invalid" + logger.Error(errMsg, + zap.String("userID", userID), + zap.String("endpoint", endpoint), + zap.Error(err), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg + ": " + err.Error())) + return "" + } + return userID +} From 8c0c26b745a72ec55ea144ef3d649bbf13fdcb4e Mon Sep 17 00:00:00 2001 From: denverquane Date: Sun, 10 Jan 2021 23:22:04 -0700 Subject: [PATCH 10/50] Added endpoint to fetch guild settings --- README.md | 3 +- go.mod | 2 +- go.sum | 3 + internal/galactus/add_reaction.go | 5 +- internal/galactus/create_user_channel.go | 3 +- internal/galactus/delete_message.go | 3 +- internal/galactus/edit_message_embed.go | 3 +- internal/galactus/get_amu_settings.go | 62 +++++++++++++++++++ internal/galactus/get_guild_channels.go | 3 +- internal/galactus/get_guild_member.go | 3 +- internal/galactus/get_guild_roles.go | 3 +- internal/galactus/modify.go | 3 +- internal/galactus/remove_all_reactions.go | 3 +- internal/galactus/remove_reaction.go | 3 +- internal/galactus/send_message.go | 3 +- internal/galactus/send_message_embed.go | 3 +- internal/galactus/server.go | 7 ++- internal/galactus/session.go | 26 -------- .../{ => shard_manager}/shard_manager.go | 22 ++++++- main.go | 2 +- pkg/endpoint/endpoints.go | 3 + 21 files changed, 122 insertions(+), 46 deletions(-) create mode 100644 internal/galactus/get_amu_settings.go delete mode 100644 internal/galactus/session.go rename internal/galactus/{ => shard_manager}/shard_manager.go (75%) diff --git a/README.md b/README.md index 8e77575..5f004ec 100644 --- a/README.md +++ b/README.md @@ -28,10 +28,9 @@ storage of temporary tokens, and, crucially, communication between the Capture c * `GALACTUS_PORT`: The port on which Galactus will run and receive requests from AutoMuteUs. Defaults to 5858. * `REDIS_USER`: Username to authenticate with Redis, if applicable. * `REDIS_PASS`: Password to authenticate with Redis, if applicable. +* `WORKER_BOT_TOKENS`: Additional bot tokens that Galactus should leverage to issue mutes/deafens ## **Do not provide unless you know what you're doing**: -* `NUM_SHARDS`: Should match whatever automuteus is using -* `SHARD_ID`: Probably just use 0 * `MAX_REQ_5_SEC`: How many Discord API mute/deafens should be issued per token per 5 second window. Defaults to 7 (ratelimits returned by Discord are anywhere from [5-10]/5sec, so 7 is a decent heuristic) * `ACK_TIMEOUT_MS`: How many milliseconds after a Mute task is received before it times out, if no capture bot completes the task diff --git a/go.mod b/go.mod index da08d8a..c0b4055 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.15 require ( github.com/alicebob/miniredis v2.5.0+incompatible // indirect github.com/alicebob/miniredis/v2 v2.14.1 - github.com/automuteus/utils v0.0.7 + github.com/automuteus/utils v0.0.9 github.com/bsm/redislock v0.7.0 github.com/bwmarrin/discordgo v0.22.0 github.com/go-redis/redis v6.15.9+incompatible // indirect diff --git a/go.sum b/go.sum index 49fb14d..136e64f 100644 --- a/go.sum +++ b/go.sum @@ -16,6 +16,8 @@ github.com/automuteus/utils v0.0.6 h1:u14BvwfFzHN8A0aJ4qbeG7vkkyK2brnBYSOjMakWar github.com/automuteus/utils v0.0.6/go.mod h1:3/DMXEOYYnBADTtb0rbBsDBD+d+QDdIpBRbvhy8cPoI= github.com/automuteus/utils v0.0.7 h1:WnGqvaqSxyysR6ixMltaF5RSIeoeL9ev9zRqqgVF3qk= github.com/automuteus/utils v0.0.7/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= +github.com/automuteus/utils v0.0.9 h1:jXyRsDDt/f/r5qSAbPWgoUqs0HuUOESvNkpNjlWmvRw= +github.com/automuteus/utils v0.0.9/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= github.com/bsm/redislock v0.7.0 h1:RL7aZJhCKkuBjQbnSTKCeedTRifBWxd/ffP+GZ599Mo= github.com/bsm/redislock v0.7.0/go.mod h1:3Kgu+cXw0JrkZ5pmY/JbcFpixGZ5M9v9G2PGWYqku+k= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= @@ -173,6 +175,7 @@ github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2y github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/nicksnyder/go-i18n/v2 v2.1.1 h1:ATCOanRDlrfKVB4WHAdJnLEqZtDmKYsweqsOUYflnBU= github.com/nicksnyder/go-i18n/v2 v2.1.1/go.mod h1:d++QJC9ZVf7pa48qrsRWhMJ5pSHIPmS3OLqK1niyLxs= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= diff --git a/internal/galactus/add_reaction.go b/internal/galactus/add_reaction.go index 0e25b47..dea9d5e 100644 --- a/internal/galactus/add_reaction.go +++ b/internal/galactus/add_reaction.go @@ -1,6 +1,7 @@ package galactus import ( + "github.com/automuteus/galactus/internal/galactus/shard_manager" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" "github.com/gorilla/mux" @@ -15,12 +16,12 @@ func (galactus *GalactusAPI) AddReactionHandler() func(w http.ResponseWriter, r return } - // manually fetch the emojiID, because it can be a non-numeric Unicode emoji directly + // manually fetch the emojiID, because it can be a non-numeric/snowflake Unicode emoji vars := mux.Vars(r) emojiID := vars["emojiID"] - sess, err := getRandomSession(galactus.shardManager) + sess, err := shard_manager.GetRandomSession(galactus.shardManager) if err != nil { errMsg := "error obtaining random session for addReaction" galactus.logger.Error(errMsg, diff --git a/internal/galactus/create_user_channel.go b/internal/galactus/create_user_channel.go index 4a75bcc..defeb2e 100644 --- a/internal/galactus/create_user_channel.go +++ b/internal/galactus/create_user_channel.go @@ -2,6 +2,7 @@ package galactus import ( "encoding/json" + "github.com/automuteus/galactus/internal/galactus/shard_manager" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" "go.uber.org/zap" @@ -15,7 +16,7 @@ func (galactus *GalactusAPI) CreateUserChannelHandler() func(w http.ResponseWrit return } - sess, err := getRandomSession(galactus.shardManager) + sess, err := shard_manager.GetRandomSession(galactus.shardManager) if err != nil { errMsg := "error obtaining random session for getGuildMember" galactus.logger.Error(errMsg, diff --git a/internal/galactus/delete_message.go b/internal/galactus/delete_message.go index 2424daa..0fe8228 100644 --- a/internal/galactus/delete_message.go +++ b/internal/galactus/delete_message.go @@ -1,6 +1,7 @@ package galactus import ( + "github.com/automuteus/galactus/internal/galactus/shard_manager" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" "go.uber.org/zap" @@ -17,7 +18,7 @@ func (galactus *GalactusAPI) DeleteChannelMessageHandler() func(w http.ResponseW // TODO perform some validation on the message body? // ex message length, empty contents, etc - sess, err := getRandomSession(galactus.shardManager) + sess, err := shard_manager.GetRandomSession(galactus.shardManager) if err != nil { errMsg := "error obtaining random session for " + endpoint.DeleteMessageFull galactus.logger.Error(errMsg, diff --git a/internal/galactus/edit_message_embed.go b/internal/galactus/edit_message_embed.go index d4c07cd..3e954a2 100644 --- a/internal/galactus/edit_message_embed.go +++ b/internal/galactus/edit_message_embed.go @@ -2,6 +2,7 @@ package galactus import ( "encoding/json" + "github.com/automuteus/galactus/internal/galactus/shard_manager" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" "github.com/bwmarrin/discordgo" @@ -46,7 +47,7 @@ func (galactus *GalactusAPI) EditMessageEmbedHandler() func(w http.ResponseWrite // TODO perform some validation on the message body? // ex message length, empty contents, etc - sess, err := getRandomSession(galactus.shardManager) + sess, err := shard_manager.GetRandomSession(galactus.shardManager) if err != nil { errMsg := "error obtaining random session for " + endpoint.EditMessageEmbedFull galactus.logger.Error(errMsg, diff --git a/internal/galactus/get_amu_settings.go b/internal/galactus/get_amu_settings.go new file mode 100644 index 0000000..679ec7a --- /dev/null +++ b/internal/galactus/get_amu_settings.go @@ -0,0 +1,62 @@ +package galactus + +import ( + "context" + "crypto/sha256" + "encoding/hex" + "encoding/json" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "github.com/automuteus/utils/pkg/rediskey" + "github.com/automuteus/utils/pkg/settings" + "go.uber.org/zap" + "net/http" +) + +func (galactus *GalactusAPI) GetGuildAMUSettings() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + guildID := validate.GuildIDAndRespond(galactus.logger, w, r, endpoint.GetGuildAMUSettingsFull) + if guildID == "" { + return + } + + key := rediskey.GuildSettings(HashGuildID(guildID)) + var sett settings.GuildSettings + + str, err := galactus.client.Get(context.Background(), key).Result() + if err != nil { + errMsg := "error when fetching guild AMU settings" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + err = json.Unmarshal([]byte(str), &sett) + if err != nil { + errMsg := "error when unmarshalling guild AMU settings" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + zap.String("data", str), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + w.WriteHeader(http.StatusOK) + w.Write([]byte(str)) + } +} + +func HashGuildID(guildID string) string { + return genericHash(guildID) +} + +func genericHash(s string) string { + h := sha256.New() + h.Write([]byte(s)) + return hex.EncodeToString(h.Sum(nil)) +} diff --git a/internal/galactus/get_guild_channels.go b/internal/galactus/get_guild_channels.go index 6860b43..2817085 100644 --- a/internal/galactus/get_guild_channels.go +++ b/internal/galactus/get_guild_channels.go @@ -2,6 +2,7 @@ package galactus import ( "encoding/json" + "github.com/automuteus/galactus/internal/galactus/shard_manager" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" "go.uber.org/zap" @@ -15,7 +16,7 @@ func (galactus *GalactusAPI) GetGuildChannelsHandler() func(w http.ResponseWrite return } - sess, err := getRandomSession(galactus.shardManager) + sess, err := shard_manager.GetRandomSession(galactus.shardManager) if err != nil { errMsg := "error obtaining random session for getGuildChannels" galactus.logger.Error(errMsg, diff --git a/internal/galactus/get_guild_member.go b/internal/galactus/get_guild_member.go index 747f6ba..4e24155 100644 --- a/internal/galactus/get_guild_member.go +++ b/internal/galactus/get_guild_member.go @@ -2,6 +2,7 @@ package galactus import ( "encoding/json" + "github.com/automuteus/galactus/internal/galactus/shard_manager" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" "go.uber.org/zap" @@ -15,7 +16,7 @@ func (galactus *GalactusAPI) GetGuildMemberHandler() func(w http.ResponseWriter, return } - sess, err := getRandomSession(galactus.shardManager) + sess, err := shard_manager.GetRandomSession(galactus.shardManager) if err != nil { errMsg := "error obtaining random session for getGuildMember" galactus.logger.Error(errMsg, diff --git a/internal/galactus/get_guild_roles.go b/internal/galactus/get_guild_roles.go index 6522bc1..c32dfab 100644 --- a/internal/galactus/get_guild_roles.go +++ b/internal/galactus/get_guild_roles.go @@ -2,6 +2,7 @@ package galactus import ( "encoding/json" + "github.com/automuteus/galactus/internal/galactus/shard_manager" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" "go.uber.org/zap" @@ -15,7 +16,7 @@ func (galactus *GalactusAPI) GetGuildRolesHandler() func(w http.ResponseWriter, return } - sess, err := getRandomSession(galactus.shardManager) + sess, err := shard_manager.GetRandomSession(galactus.shardManager) if err != nil { errMsg := "error obtaining random session for getGuildRoles" galactus.logger.Error(errMsg, diff --git a/internal/galactus/modify.go b/internal/galactus/modify.go index 8178f41..63833a1 100644 --- a/internal/galactus/modify.go +++ b/internal/galactus/modify.go @@ -2,6 +2,7 @@ package galactus import ( "encoding/json" + "github.com/automuteus/galactus/internal/galactus/shard_manager" "github.com/automuteus/utils/pkg/task" "github.com/gorilla/mux" "go.uber.org/zap" @@ -74,7 +75,7 @@ func (galactus *GalactusAPI) modifyUserHandler(maxWorkers int, taskTimeout time. mdsc.Capture++ mdscLock.Unlock() } else { - sess, err := getRandomSession(galactus.shardManager) + sess, err := shard_manager.GetRandomSession(galactus.shardManager) if err != nil { galactus.logger.Error("error fetching random session for user modify", zap.Error(err), diff --git a/internal/galactus/remove_all_reactions.go b/internal/galactus/remove_all_reactions.go index 66f28f7..460ed1e 100644 --- a/internal/galactus/remove_all_reactions.go +++ b/internal/galactus/remove_all_reactions.go @@ -1,6 +1,7 @@ package galactus import ( + "github.com/automuteus/galactus/internal/galactus/shard_manager" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" "go.uber.org/zap" @@ -14,7 +15,7 @@ func (galactus *GalactusAPI) RemoveAllReactionsHandler() func(w http.ResponseWri return } - sess, err := getRandomSession(galactus.shardManager) + sess, err := shard_manager.GetRandomSession(galactus.shardManager) if err != nil { errMsg := "error obtaining random session for removeAllReactions" galactus.logger.Error(errMsg, diff --git a/internal/galactus/remove_reaction.go b/internal/galactus/remove_reaction.go index ff5bb8d..8d06000 100644 --- a/internal/galactus/remove_reaction.go +++ b/internal/galactus/remove_reaction.go @@ -1,6 +1,7 @@ package galactus import ( + "github.com/automuteus/galactus/internal/galactus/shard_manager" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" "github.com/gorilla/mux" @@ -32,7 +33,7 @@ func (galactus *GalactusAPI) RemoveReactionHandler() func(w http.ResponseWriter, return } - sess, err := getRandomSession(galactus.shardManager) + sess, err := shard_manager.GetRandomSession(galactus.shardManager) if err != nil { errMsg := "error obtaining random session for removeReaction" galactus.logger.Error(errMsg, diff --git a/internal/galactus/send_message.go b/internal/galactus/send_message.go index 349357c..87128fe 100644 --- a/internal/galactus/send_message.go +++ b/internal/galactus/send_message.go @@ -2,6 +2,7 @@ package galactus import ( "encoding/json" + "github.com/automuteus/galactus/internal/galactus/shard_manager" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" "go.uber.org/zap" @@ -32,7 +33,7 @@ func (galactus *GalactusAPI) SendChannelMessageHandler() func(w http.ResponseWri // TODO perform some validation on the message body? // ex message length, empty contents, etc - sess, err := getRandomSession(galactus.shardManager) + sess, err := shard_manager.GetRandomSession(galactus.shardManager) if err != nil { errMsg := "error obtaining random session for sendMessageHandler" galactus.logger.Error(errMsg, diff --git a/internal/galactus/send_message_embed.go b/internal/galactus/send_message_embed.go index de5c16d..e708795 100644 --- a/internal/galactus/send_message_embed.go +++ b/internal/galactus/send_message_embed.go @@ -2,6 +2,7 @@ package galactus import ( "encoding/json" + "github.com/automuteus/galactus/internal/galactus/shard_manager" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" "github.com/bwmarrin/discordgo" @@ -45,7 +46,7 @@ func (galactus *GalactusAPI) SendChannelMessageEmbedHandler() func(w http.Respon // TODO extra validation here (empty embed fields and the like) - sess, err := getRandomSession(galactus.shardManager) + sess, err := shard_manager.GetRandomSession(galactus.shardManager) if err != nil { errMsg := "error obtaining random session for sendMessageEmbedHandler" galactus.logger.Error(errMsg, diff --git a/internal/galactus/server.go b/internal/galactus/server.go index d06db77..8c2aa0f 100644 --- a/internal/galactus/server.go +++ b/internal/galactus/server.go @@ -7,6 +7,7 @@ import ( "encoding/json" "errors" "github.com/alicebob/miniredis/v2" + "github.com/automuteus/galactus/internal/galactus/shard_manager" redisutils "github.com/automuteus/galactus/internal/redis" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/utils/pkg/premium" @@ -67,8 +68,8 @@ func NewGalactusAPI(logger *zap.Logger, mockRedis bool, botToken, redisAddr, red }) } - manager := MakeShardManager(logger, botToken, DefaultIntents) - AddHandlers(logger, manager, rdb) + manager := shard_manager.MakeShardManager(logger, botToken, DefaultIntents) + shard_manager.AddHandlers(logger, manager, rdb) return &GalactusAPI{ client: rdb, @@ -179,6 +180,8 @@ func (galactus *GalactusAPI) Run(port string, maxWorkers int, taskTimeout time.D r.HandleFunc(endpoint.GetGuildMemberFull, galactus.GetGuildMemberHandler()).Methods("POST") r.HandleFunc(endpoint.GetGuildRolesFull, galactus.GetGuildRolesHandler()).Methods("POST") + r.HandleFunc(endpoint.GetGuildAMUSettingsFull, galactus.GetGuildAMUSettings()).Methods("POST") + r.HandleFunc(endpoint.AddReactionFull, galactus.AddReactionHandler()).Methods("POST") r.HandleFunc(endpoint.RemoveReactionFull, galactus.RemoveReactionHandler()).Methods("POST") r.HandleFunc(endpoint.RemoveAllReactionsFull, galactus.RemoveAllReactionsHandler()).Methods("POST") diff --git a/internal/galactus/session.go b/internal/galactus/session.go deleted file mode 100644 index 8ff5e66..0000000 --- a/internal/galactus/session.go +++ /dev/null @@ -1,26 +0,0 @@ -package galactus - -import ( - "errors" - "github.com/bwmarrin/discordgo" - "github.com/jonas747/dshardmanager" - "math/rand" -) - -const MaxInvalidRandomSessions = 5 - -func getRandomSession(manager *dshardmanager.Manager) (*discordgo.Session, error) { - max := manager.GetNumShards() - sess := manager.Session(rand.Intn(max)) - i := 1 - - for sess == nil { - if i > MaxInvalidRandomSessions { - return nil, errors.New("exceeded maximum retries for random session") - } - i++ - r := rand.Intn(max) - sess = manager.Session(r) - } - return sess, nil -} diff --git a/internal/galactus/shard_manager.go b/internal/galactus/shard_manager/shard_manager.go similarity index 75% rename from internal/galactus/shard_manager.go rename to internal/galactus/shard_manager/shard_manager.go index 6b7d82c..ce86ec8 100644 --- a/internal/galactus/shard_manager.go +++ b/internal/galactus/shard_manager/shard_manager.go @@ -1,11 +1,13 @@ -package galactus +package shard_manager import ( + "errors" "github.com/automuteus/galactus/internal/handler" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" "github.com/jonas747/dshardmanager" "go.uber.org/zap" + "math/rand" ) func MakeShardManager(logger *zap.Logger, token string, intent *discordgo.Intent) *dshardmanager.Manager { @@ -50,3 +52,21 @@ func AddHandlers(logger *zap.Logger, manager *dshardmanager.Manager, client *red manager.AddHandler(handler.RateLimitHandler(logger, client)) } + +const MaxInvalidRandomSessions = 5 + +func GetRandomSession(manager *dshardmanager.Manager) (*discordgo.Session, error) { + max := manager.GetNumShards() + sess := manager.Session(rand.Intn(max)) + i := 1 + + for sess == nil { + if i > MaxInvalidRandomSessions { + return nil, errors.New("exceeded maximum retries for random session") + } + i++ + r := rand.Intn(max) + sess = manager.Session(r) + } + return sess, nil +} diff --git a/main.go b/main.go index 02c8f30..70c4128 100644 --- a/main.go +++ b/main.go @@ -11,7 +11,7 @@ import ( "time" ) -const MockRedis = true +const MockRedis = false const DefaultGalactusPort = "5858" const DefaultMaxRequests5Sec int64 = 7 diff --git a/pkg/endpoint/endpoints.go b/pkg/endpoint/endpoints.go index f999b6a..13badae 100644 --- a/pkg/endpoint/endpoints.go +++ b/pkg/endpoint/endpoints.go @@ -40,3 +40,6 @@ const UserChannelCreateFull = UserChannelCreatePartial + "{userID}" const RequestJob = "/request/job" const JobCount = "/totalJobs" + +const GetGuildAMUSettingsPartial = "/getAMUSettings/" +const GetGuildAMUSettingsFull = GetGuildAMUSettingsPartial + "{guildID}" From 6b138e6140310dec83944f0ede9d93e61ad47057 Mon Sep 17 00:00:00 2001 From: denverquane Date: Wed, 13 Jan 2021 23:23:51 -0700 Subject: [PATCH 11/50] Added emoji endpoints --- internal/galactus/create_guild_emoji.go | 78 +++++++++++++++++++++++++ internal/galactus/get_guild_emojis.go | 55 +++++++++++++++++ internal/galactus/server.go | 3 + pkg/endpoint/endpoints.go | 6 ++ pkg/validate/params.go | 17 ++++++ 5 files changed, 159 insertions(+) create mode 100644 internal/galactus/create_guild_emoji.go create mode 100644 internal/galactus/get_guild_emojis.go diff --git a/internal/galactus/create_guild_emoji.go b/internal/galactus/create_guild_emoji.go new file mode 100644 index 0000000..8e7fa59 --- /dev/null +++ b/internal/galactus/create_guild_emoji.go @@ -0,0 +1,78 @@ +package galactus + +import ( + "encoding/json" + "github.com/automuteus/galactus/internal/galactus/shard_manager" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "go.uber.org/zap" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusAPI) CreateGuildEmojiHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + guildID := validate.GuildIDAndRespond(galactus.logger, w, r, endpoint.CreateGuildEmojiFull) + name := validate.NameAndRespond(galactus.logger, w, r, endpoint.CreateGuildEmojiFull) + if guildID == "" || name == "" { + return + } + + body, err := ioutil.ReadAll(r.Body) + if err != nil { + errMsg := "could not read http body with error" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + defer r.Body.Close() + + // TODO perform some validation on the message body? + // ex message length, empty contents, etc + + // Addl. constraint for emojis: must be under 256kB + + sess, err := shard_manager.GetRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for sendMessageHandler" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + emoji, err := sess.GuildEmojiCreate(guildID, name, string(body), nil) + if err != nil { + errMsg := "error creating emoji for guild" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + zap.String("name", name), + zap.String("emoji", string(body)), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + // TODO metrics logging here + galactus.logger.Info("created emoji for guild", + zap.String("guildID", guildID), + zap.String("name", name), + zap.String("emoji", string(body)), + zap.String("emojiID", emoji.ID), + ) + w.WriteHeader(http.StatusOK) + jbytes, err := json.Marshal(emoji) + if err != nil { + log.Println(err) + } + w.Write(jbytes) + } +} diff --git a/internal/galactus/get_guild_emojis.go b/internal/galactus/get_guild_emojis.go new file mode 100644 index 0000000..cf3e5c7 --- /dev/null +++ b/internal/galactus/get_guild_emojis.go @@ -0,0 +1,55 @@ +package galactus + +import ( + "encoding/json" + "github.com/automuteus/galactus/internal/galactus/shard_manager" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "go.uber.org/zap" + "net/http" +) + +func (galactus *GalactusAPI) GetGuildEmojisHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + guildID := validate.GuildIDAndRespond(galactus.logger, w, r, endpoint.GetGuildEmojisFull) + if guildID == "" { + return + } + + sess, err := shard_manager.GetRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for getGuildChannels" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + emojis, err := sess.GuildEmojis(guildID) + if err != nil { + errMsg := "failed to fetch guild emojis" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + jBytes, err := json.Marshal(emojis) + if err != nil { + errMsg := "failed to marshal guild emojis to JSON" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + w.WriteHeader(http.StatusOK) + w.Write(jBytes) + } +} diff --git a/internal/galactus/server.go b/internal/galactus/server.go index 8c2aa0f..7eb4912 100644 --- a/internal/galactus/server.go +++ b/internal/galactus/server.go @@ -188,6 +188,9 @@ func (galactus *GalactusAPI) Run(port string, maxWorkers int, taskTimeout time.D r.HandleFunc(endpoint.UserChannelCreateFull, galactus.CreateUserChannelHandler()).Methods("POST") + r.HandleFunc(endpoint.GetGuildEmojisFull, galactus.GetGuildEmojisHandler()).Methods("POST") + r.HandleFunc(endpoint.CreateGuildEmojiFull, galactus.CreateGuildEmojiHandler()).Methods("POST") + // TODO maybe eventually provide some auth parameter, or version number? Something to prove that a worker can pop requests? r.HandleFunc(endpoint.RequestJob, func(w http.ResponseWriter, r *http.Request) { msg, err := redisutils.PopRawDiscordMessage(galactus.client) diff --git a/pkg/endpoint/endpoints.go b/pkg/endpoint/endpoints.go index 13badae..097ce02 100644 --- a/pkg/endpoint/endpoints.go +++ b/pkg/endpoint/endpoints.go @@ -38,6 +38,12 @@ const GetGuildRolesFull = GetGuildRolesPartial + "{guildID}" const UserChannelCreatePartial = "/createUserChannel/" const UserChannelCreateFull = UserChannelCreatePartial + "{userID}" +const GetGuildEmojisPartial = "/guildEmojis/" +const GetGuildEmojisFull = GetGuildEmojisPartial + "{guildID}" + +const CreateGuildEmojiPartial = "/guildEmojiCreate/" +const CreateGuildEmojiFull = CreateGuildEmojiPartial + "{guildID}/{name}" + const RequestJob = "/request/job" const JobCount = "/totalJobs" diff --git a/pkg/validate/params.go b/pkg/validate/params.go index 25ce43f..32e70d2 100644 --- a/pkg/validate/params.go +++ b/pkg/validate/params.go @@ -121,3 +121,20 @@ func UserIDAndRespond(logger *zap.Logger, w http.ResponseWriter, r *http.Request } return userID } + +func NameAndRespond(logger *zap.Logger, w http.ResponseWriter, r *http.Request, endpoint string) string { + vars := mux.Vars(r) + name := vars["name"] + valid := name != "" + if !valid { + errMsg := "name provided to " + endpoint + " is empty and therefore invalid" + logger.Error(errMsg, + zap.String("name", name), + zap.String("endpoint", endpoint), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg)) + return "" + } + return name +} From 6ece3466f6b8f33c87de2e3607f757c63172efe8 Mon Sep 17 00:00:00 2001 From: denverquane Date: Fri, 15 Jan 2021 16:14:11 -0700 Subject: [PATCH 12/50] Switch to client long-polling to save on HTTP requests --- README.md | 3 ++- internal/galactus/server.go | 6 +++--- internal/redis/queue.go | 11 +++++++---- main.go | 25 +++++++++++++++++++------ 4 files changed, 31 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 5f004ec..556d58f 100644 --- a/README.md +++ b/README.md @@ -33,5 +33,6 @@ storage of temporary tokens, and, crucially, communication between the Capture c ## **Do not provide unless you know what you're doing**: * `MAX_REQ_5_SEC`: How many Discord API mute/deafens should be issued per token per 5 second window. Defaults to 7 (ratelimits returned by Discord are anywhere from [5-10]/5sec, so 7 is a decent heuristic) -* `ACK_TIMEOUT_MS`: How many milliseconds after a Mute task is received before it times out, if no capture bot completes the task +* `ACK_TIMEOUT_MS`: How many milliseconds after a Mute task is received before it times out, if no capture bot completes the task. Defaults to 1000 (1 second) +* `TASK_TIMEOUT_MS`: How long before a request for available tasks from a Bot times out (client long-polling). Defaults to 10000 (10 seconds) * `MAX_WORKERS`: Max concurrent workers for issuing mute/deafens for any inbound request. Defaults to 8 \ No newline at end of file diff --git a/internal/galactus/server.go b/internal/galactus/server.go index 7eb4912..6d3201e 100644 --- a/internal/galactus/server.go +++ b/internal/galactus/server.go @@ -160,13 +160,13 @@ type JobsNumber struct { Jobs int64 `json:"jobs"` } -func (galactus *GalactusAPI) Run(port string, maxWorkers int, taskTimeout time.Duration) { +func (galactus *GalactusAPI) Run(port string, maxWorkers int, captureAckTimeout time.Duration, taskTimeout time.Duration) { galactus.loadTokensFromEnv() r := mux.NewRouter() - r.HandleFunc(endpoint.ModifyUserbyGuildConnectCode, galactus.modifyUserHandler(maxWorkers, taskTimeout)).Methods("POST") + r.HandleFunc(endpoint.ModifyUserbyGuildConnectCode, galactus.modifyUserHandler(maxWorkers, captureAckTimeout)).Methods("POST") r.HandleFunc(endpoint.SendMessageFull, galactus.SendChannelMessageHandler()).Methods("POST") r.HandleFunc(endpoint.SendMessageEmbedFull, galactus.SendChannelMessageEmbedHandler()).Methods("POST") @@ -193,7 +193,7 @@ func (galactus *GalactusAPI) Run(port string, maxWorkers int, taskTimeout time.D // TODO maybe eventually provide some auth parameter, or version number? Something to prove that a worker can pop requests? r.HandleFunc(endpoint.RequestJob, func(w http.ResponseWriter, r *http.Request) { - msg, err := redisutils.PopRawDiscordMessage(galactus.client) + msg, err := redisutils.PopRawDiscordMessageTimeout(galactus.client, taskTimeout) // no jobs available switch { diff --git a/internal/redis/queue.go b/internal/redis/queue.go index 406f6dc..b4827eb 100644 --- a/internal/redis/queue.go +++ b/internal/redis/queue.go @@ -3,8 +3,10 @@ package redis import ( "context" "encoding/json" + "errors" "github.com/automuteus/galactus/pkg/discord_message" "github.com/go-redis/redis/v8" + "time" ) const GatewayMessageKey = "automuteus:gateway:message" @@ -22,13 +24,14 @@ func PushDiscordMessage(client *redis.Client, messageType discord_message.Discor return client.LPush(context.Background(), GatewayMessageKey, byt).Err() } -func PopRawDiscordMessage(client *redis.Client) (string, error) { - res, err := client.RPop(context.Background(), GatewayMessageKey).Result() +func PopRawDiscordMessageTimeout(client *redis.Client, timeout time.Duration) (string, error) { + res, err := client.BRPop(context.Background(), timeout, GatewayMessageKey).Result() if err != nil { return "", err + } else if len(res) < 2 { // we expect length 2+ because BRPOP returns the key and the value + return "", errors.New("empty queue") } - - return res, nil + return res[1], nil } func DiscordMessagesSize(client *redis.Client) (int64, error) { diff --git a/main.go b/main.go index 70c4128..367b0c1 100644 --- a/main.go +++ b/main.go @@ -17,6 +17,7 @@ const DefaultGalactusPort = "5858" const DefaultMaxRequests5Sec int64 = 7 const DefaultMaxWorkers = 8 const DefaultCaptureBotTimeout = time.Second +const DefaultTaskTimeout = time.Second * 10 func main() { logger, err := zap.NewProduction() @@ -56,14 +57,26 @@ func main() { } } - taskTimeout := DefaultCaptureBotTimeout + captureAckTimeout := DefaultCaptureBotTimeout - taskTimeoutmsStr := os.Getenv("ACK_TIMEOUT_MS") - num, err := strconv.ParseInt(taskTimeoutmsStr, 10, 64) + captureAckTimeoutStr := os.Getenv("ACK_TIMEOUT_MS") + num, err := strconv.ParseInt(captureAckTimeoutStr, 10, 64) if err == nil { - taskTimeout = time.Millisecond * time.Duration(num) + captureAckTimeout = time.Millisecond * time.Duration(num) } else { logger.Error("could not parse ACK_TIMEOUT_MS", + zap.Error(err), + zap.Int64("default", captureAckTimeout.Milliseconds())) + } + + taskTimeout := DefaultTaskTimeout + + taskTimeoutStr := os.Getenv("TASK_TIMEOUT_MS") + num, err = strconv.ParseInt(taskTimeoutStr, 10, 64) + if err == nil { + taskTimeout = time.Millisecond * time.Duration(num) + } else { + logger.Error("could not parse TASK_TIMEOUT_MS", zap.Error(err), zap.Int64("default", taskTimeout.Milliseconds())) } @@ -86,7 +99,7 @@ func main() { zap.String("REDIS_PASS", redisPass), zap.Int("MAX_REQ_5_SEC", int(maxReq)), zap.Int("MAX_WORKERS", maxWorkers), - zap.Int64("ACK_TIMEOUT_MS", taskTimeout.Milliseconds()), + zap.Int64("ACK_TIMEOUT_MS", captureAckTimeout.Milliseconds()), ) tp := galactus.NewGalactusAPI(logger, MockRedis, botToken, redisAddr, redisUser, redisPass, maxReq) @@ -94,7 +107,7 @@ func main() { sc := make(chan os.Signal, 1) signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill) - go tp.Run(galactusPort, maxWorkers, taskTimeout) + go tp.Run(galactusPort, maxWorkers, captureAckTimeout, taskTimeout) <-sc tp.Close() } From fff5d4f5b46465db9045a617f054d0c38ec688f7 Mon Sep 17 00:00:00 2001 From: denverquane Date: Sat, 16 Jan 2021 16:21:09 -0700 Subject: [PATCH 13/50] Added galactus client code --- go.mod | 4 +- go.sum | 7 + internal/galactus/add_capture_event.go | 61 ++++++ internal/galactus/capture_task_status.go | 51 +++++ internal/galactus/get_capture_task.go | 54 +++++ internal/galactus/modify.go | 17 +- internal/galactus/server.go | 62 +++--- internal/galactus/token.go | 14 +- internal/redis/queue.go | 24 +++ pkg/capture_message/message.go | 8 + pkg/client/add_reaction.go | 28 +++ pkg/client/client.go | 263 +++++++++++++++++++++++ pkg/client/create_guild_emoji.go | 37 ++++ pkg/client/create_user_channel.go | 37 ++++ pkg/client/delete_message.go | 27 +++ pkg/client/edit_message.go | 36 ++++ pkg/client/get_guild.go | 37 ++++ pkg/client/get_guild_channels.go | 37 ++++ pkg/client/get_guild_emojis.go | 37 ++++ pkg/client/get_guild_member.go | 37 ++++ pkg/client/get_guild_roles.go | 37 ++++ pkg/client/modify.go | 50 +++++ pkg/client/remove_all_reactions.go | 28 +++ pkg/client/remove_reaction.go | 28 +++ pkg/client/send_message.go | 56 +++++ pkg/endpoint/discord.go | 45 ++++ pkg/endpoint/endpoints.go | 51 +---- pkg/validate/capture.go | 31 +++ pkg/validate/params.go | 36 ++++ 29 files changed, 1149 insertions(+), 91 deletions(-) create mode 100644 internal/galactus/add_capture_event.go create mode 100644 internal/galactus/capture_task_status.go create mode 100644 internal/galactus/get_capture_task.go create mode 100644 pkg/capture_message/message.go create mode 100644 pkg/client/add_reaction.go create mode 100644 pkg/client/client.go create mode 100644 pkg/client/create_guild_emoji.go create mode 100644 pkg/client/create_user_channel.go create mode 100644 pkg/client/delete_message.go create mode 100644 pkg/client/edit_message.go create mode 100644 pkg/client/get_guild.go create mode 100644 pkg/client/get_guild_channels.go create mode 100644 pkg/client/get_guild_emojis.go create mode 100644 pkg/client/get_guild_member.go create mode 100644 pkg/client/get_guild_roles.go create mode 100644 pkg/client/modify.go create mode 100644 pkg/client/remove_all_reactions.go create mode 100644 pkg/client/remove_reaction.go create mode 100644 pkg/client/send_message.go create mode 100644 pkg/endpoint/discord.go create mode 100644 pkg/validate/capture.go diff --git a/go.mod b/go.mod index c0b4055..b69ce5a 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/alicebob/miniredis/v2 v2.14.1 github.com/automuteus/utils v0.0.9 github.com/bsm/redislock v0.7.0 - github.com/bwmarrin/discordgo v0.22.0 + github.com/bwmarrin/discordgo v0.22.1 github.com/go-redis/redis v6.15.9+incompatible // indirect github.com/go-redis/redis/v8 v8.4.2 github.com/gomodule/redigo v1.8.3 // indirect @@ -18,4 +18,4 @@ require ( go.uber.org/zap v1.16.0 ) -replace github.com/bwmarrin/discordgo v0.22.0 => github.com/automuteus/discordgo v0.22.1 +replace github.com/automuteus/utils v0.0.9 => github.com/automuteus/utils v0.0.11-0.20210116220058-40ad795561c0 diff --git a/go.sum b/go.sum index 136e64f..649152c 100644 --- a/go.sum +++ b/go.sum @@ -18,8 +18,15 @@ github.com/automuteus/utils v0.0.7 h1:WnGqvaqSxyysR6ixMltaF5RSIeoeL9ev9zRqqgVF3q github.com/automuteus/utils v0.0.7/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= github.com/automuteus/utils v0.0.9 h1:jXyRsDDt/f/r5qSAbPWgoUqs0HuUOESvNkpNjlWmvRw= github.com/automuteus/utils v0.0.9/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= +github.com/automuteus/utils v0.0.11-0.20210116011910-d830c3145b25 h1:A63HOz4z0LWEVox4Q87CK0uwMjrDGuwg1ityQR0D3HY= +github.com/automuteus/utils v0.0.11-0.20210116011910-d830c3145b25/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= +github.com/automuteus/utils v0.0.11-0.20210116220058-40ad795561c0 h1:XmGntgGGBNkgdHKoyekITQ8VJWDUBq3LwPHZFr8eMzo= +github.com/automuteus/utils v0.0.11-0.20210116220058-40ad795561c0/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= github.com/bsm/redislock v0.7.0 h1:RL7aZJhCKkuBjQbnSTKCeedTRifBWxd/ffP+GZ599Mo= github.com/bsm/redislock v0.7.0/go.mod h1:3Kgu+cXw0JrkZ5pmY/JbcFpixGZ5M9v9G2PGWYqku+k= +github.com/bwmarrin/discordgo v0.22.0/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= +github.com/bwmarrin/discordgo v0.22.1 h1:254fNYyfqJWKbPzO5g8j/nUvRgj4dNlI19EB8rnkpt8= +github.com/bwmarrin/discordgo v0.22.1/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= diff --git a/internal/galactus/add_capture_event.go b/internal/galactus/add_capture_event.go new file mode 100644 index 0000000..290852b --- /dev/null +++ b/internal/galactus/add_capture_event.go @@ -0,0 +1,61 @@ +package galactus + +import ( + "context" + "encoding/json" + "github.com/automuteus/galactus/pkg/capture_message" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "github.com/automuteus/utils/pkg/task" + "go.uber.org/zap" + "io/ioutil" + "net/http" +) + +func (galactus *GalactusAPI) AddCaptureEventHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + connectCode := validate.ConnectCodeAndRespond(galactus.logger, w, r, endpoint.AddCaptureEventFull) + if connectCode == "" { + return + } + + body, err := ioutil.ReadAll(r.Body) + if err != nil { + errMsg := "could not read http body with error" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + defer r.Body.Close() + + var message capture_message.CaptureMessage + err = json.Unmarshal(body, &message) + if err != nil { + errMsg := "error unmarshalling CaptureMessage from JSON" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("body", string(body)), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + err = task.PushJob(context.Background(), galactus.client, connectCode, message.MessageType, string(message.Data)) + if err != nil { + errMsg := "error pushing capture job to Redis" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("body", string(body)), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + w.WriteHeader(http.StatusOK) + } +} diff --git a/internal/galactus/capture_task_status.go b/internal/galactus/capture_task_status.go new file mode 100644 index 0000000..571a79d --- /dev/null +++ b/internal/galactus/capture_task_status.go @@ -0,0 +1,51 @@ +package galactus + +import ( + "context" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "github.com/automuteus/utils/pkg/rediskey" + "go.uber.org/zap" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusAPI) SetCaptureTaskStatusHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + taskID := validate.TaskIDAndRespond(galactus.logger, w, r, endpoint.SetCaptureTaskStatusFull) + if taskID == "" { + return + } + + body, err := ioutil.ReadAll(r.Body) + if err != nil { + log.Println(err) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(err.Error())) + return + } + defer r.Body.Close() + bodyStr := string(body) + var out string + + if bodyStr == "true" || bodyStr == "t" { + out = "true" + } else { + out = "false" + } + err = galactus.client.Publish(context.Background(), rediskey.CompleteTask(taskID), out).Err() + if err != nil { + errMsg := "failed to publish task status to Redis" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("taskID", taskID), + zap.String("value", out), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + w.WriteHeader(http.StatusOK) + } +} diff --git a/internal/galactus/get_capture_task.go b/internal/galactus/get_capture_task.go new file mode 100644 index 0000000..f42c2f7 --- /dev/null +++ b/internal/galactus/get_capture_task.go @@ -0,0 +1,54 @@ +package galactus + +import ( + "errors" + redisutils "github.com/automuteus/galactus/internal/redis" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "github.com/go-redis/redis/v8" + "go.uber.org/zap" + "net/http" + "time" +) + +func (galactus *GalactusAPI) GetCaptureTaskHandler(taskTimeout time.Duration) func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + connectCode := validate.ConnectCodeAndRespond(galactus.logger, w, r, endpoint.GetCaptureTaskFull) + if connectCode == "" { + return + } + + msg, err := redisutils.PopRawCaptureClientTask(galactus.client, connectCode, taskTimeout) + + // no jobs available + switch { + case errors.Is(err, redis.Nil): + w.WriteHeader(http.StatusAccepted) + w.Write([]byte("{\"status\": \"No capture client tasks available\"}")) + return + case err != nil: + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte("{\"error\": \"" + err.Error() + "\"}")) + galactus.logger.Error("redis error when popping capture task", + zap.String("endpoint", endpoint.GetCaptureTaskFull), + zap.Error(err)) + return + case msg == "": + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte("{\"error\": \"Nil capture task returned, despite no Redis errors\"}")) + galactus.logger.Error("nil capture task returned, despite no Redis errors", + zap.String("endpoint", endpoint.GetCaptureTaskFull)) + return + } + + w.WriteHeader(http.StatusOK) + + _, err = w.Write([]byte(msg)) + if err != nil { + galactus.logger.Error("failed to write capture task as HTTP response", + zap.String("endpoint", endpoint.GetCaptureTaskFull), + zap.Error(err), + ) + } + } +} diff --git a/internal/galactus/modify.go b/internal/galactus/modify.go index 63833a1..837405f 100644 --- a/internal/galactus/modify.go +++ b/internal/galactus/modify.go @@ -3,8 +3,9 @@ package galactus import ( "encoding/json" "github.com/automuteus/galactus/internal/galactus/shard_manager" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" "github.com/automuteus/utils/pkg/task" - "github.com/gorilla/mux" "go.uber.org/zap" "io/ioutil" "log" @@ -16,16 +17,16 @@ import ( func (galactus *GalactusAPI) modifyUserHandler(maxWorkers int, taskTimeout time.Duration) func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) { - vars := mux.Vars(r) - guildID := vars["guildID"] - connectCode := vars["connectCode"] - gid, gerr := strconv.ParseUint(guildID, 10, 64) - if gerr != nil { - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte("Invalid guildID received. Query should be of the form POST `/modify//`")) + guildID := validate.GuildIDAndRespond(galactus.logger, w, r, endpoint.ModifyUserbyGuildConnectCode) + connectCode := validate.ConnectCodeAndRespond(galactus.logger, w, r, endpoint.ModifyUserbyGuildConnectCode) + + if guildID == "" || connectCode == "" { return } + // We can safely ignore the error here, because we already validated the snowflake above + gid, _ := strconv.ParseUint(guildID, 10, 64) + body, err := ioutil.ReadAll(r.Body) if err != nil { log.Println(err) diff --git a/internal/galactus/server.go b/internal/galactus/server.go index 6d3201e..801c58e 100644 --- a/internal/galactus/server.go +++ b/internal/galactus/server.go @@ -164,36 +164,52 @@ func (galactus *GalactusAPI) Run(port string, maxWorkers int, captureAckTimeout galactus.loadTokensFromEnv() + // TODO maybe eventually provide some auth parameter, or version number? Something to prove that a worker can pop requests? r := mux.NewRouter() r.HandleFunc(endpoint.ModifyUserbyGuildConnectCode, galactus.modifyUserHandler(maxWorkers, captureAckTimeout)).Methods("POST") - r.HandleFunc(endpoint.SendMessageFull, galactus.SendChannelMessageHandler()).Methods("POST") r.HandleFunc(endpoint.SendMessageEmbedFull, galactus.SendChannelMessageEmbedHandler()).Methods("POST") - r.HandleFunc(endpoint.EditMessageEmbedFull, galactus.EditMessageEmbedHandler()).Methods("POST") - r.HandleFunc(endpoint.DeleteMessageFull, galactus.DeleteChannelMessageHandler()).Methods("POST") - r.HandleFunc(endpoint.GetGuildFull, galactus.GetGuildHandler()).Methods("POST") r.HandleFunc(endpoint.GetGuildChannelsFull, galactus.GetGuildChannelsHandler()).Methods("POST") r.HandleFunc(endpoint.GetGuildMemberFull, galactus.GetGuildMemberHandler()).Methods("POST") r.HandleFunc(endpoint.GetGuildRolesFull, galactus.GetGuildRolesHandler()).Methods("POST") - - r.HandleFunc(endpoint.GetGuildAMUSettingsFull, galactus.GetGuildAMUSettings()).Methods("POST") - r.HandleFunc(endpoint.AddReactionFull, galactus.AddReactionHandler()).Methods("POST") r.HandleFunc(endpoint.RemoveReactionFull, galactus.RemoveReactionHandler()).Methods("POST") r.HandleFunc(endpoint.RemoveAllReactionsFull, galactus.RemoveAllReactionsHandler()).Methods("POST") - r.HandleFunc(endpoint.UserChannelCreateFull, galactus.CreateUserChannelHandler()).Methods("POST") - r.HandleFunc(endpoint.GetGuildEmojisFull, galactus.GetGuildEmojisHandler()).Methods("POST") r.HandleFunc(endpoint.CreateGuildEmojiFull, galactus.CreateGuildEmojiHandler()).Methods("POST") - // TODO maybe eventually provide some auth parameter, or version number? Something to prove that a worker can pop requests? - r.HandleFunc(endpoint.RequestJob, func(w http.ResponseWriter, r *http.Request) { - msg, err := redisutils.PopRawDiscordMessageTimeout(galactus.client, taskTimeout) + r.HandleFunc(endpoint.GetGuildAMUSettingsFull, galactus.GetGuildAMUSettings()).Methods("POST") + r.HandleFunc(endpoint.GetCaptureTaskFull, galactus.GetCaptureTaskHandler(taskTimeout)).Methods("POST") + r.HandleFunc(endpoint.SetCaptureTaskStatusFull, galactus.SetCaptureTaskStatusHandler()).Methods("POST") + + r.HandleFunc(endpoint.RequestJob, galactus.requestJobHandler(taskTimeout)).Methods("POST") + r.HandleFunc(endpoint.JobCount, galactus.jobCount()).Methods("GET") + + r.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { + w.WriteHeader(http.StatusOK) + w.Write([]byte("ok")) + }).Methods("GET") + + galactus.logger.Info("galactus is running", + zap.String("port", port), + ) + + err := http.ListenAndServe(":"+port, r) + if err != nil { + galactus.logger.Error("http listener exited with error", + zap.Error(err), + ) + } +} + +func (galactus *GalactusAPI) requestJobHandler(timeout time.Duration) func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + msg, err := redisutils.PopRawDiscordMessageTimeout(galactus.client, timeout) // no jobs available switch { @@ -225,9 +241,11 @@ func (galactus *GalactusAPI) Run(port string, maxWorkers int, captureAckTimeout zap.Error(err), ) } - }).Methods("POST") + } +} - r.HandleFunc(endpoint.JobCount, func(w http.ResponseWriter, r *http.Request) { +func (galactus *GalactusAPI) jobCount() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { var jobs JobsNumber num, err := redisutils.DiscordMessagesSize(galactus.client) @@ -253,22 +271,6 @@ func (galactus *GalactusAPI) Run(port string, maxWorkers int, captureAckTimeout w.WriteHeader(http.StatusInternalServerError) w.Write([]byte("{\"error\": \"" + err.Error() + "\"}")) } - }).Methods("GET") - - r.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { - w.WriteHeader(http.StatusOK) - w.Write([]byte("ok")) - }).Methods("GET") - - galactus.logger.Info("galactus is running", - zap.String("port", port), - ) - - err := http.ListenAndServe(":"+port, r) - if err != nil { - galactus.logger.Error("http listener exited with error", - zap.Error(err), - ) } } diff --git a/internal/galactus/token.go b/internal/galactus/token.go index 27beef1..0d8563d 100644 --- a/internal/galactus/token.go +++ b/internal/galactus/token.go @@ -2,7 +2,7 @@ package galactus import ( "context" - "encoding/json" + "github.com/automuteus/galactus/internal/redis" "github.com/automuteus/utils/pkg/rediskey" "github.com/automuteus/utils/pkg/task" "go.uber.org/zap" @@ -59,17 +59,15 @@ func (galactus *GalactusAPI) attemptOnCaptureBot(guildID, connectCode string, gi Deaf: request.Deaf, Mute: request.Mute, }) - jBytes, err := json.Marshal(taskObj) - if err != nil { - log.Println(err) - return false - } + acked := make(chan bool) // now we wait for an ack with respect to actually performing the mute pubsub := galactus.client.Subscribe(context.Background(), rediskey.CompleteTask(taskObj.TaskID)) - err = galactus.client.Publish(context.Background(), rediskey.TasksSubscribe(connectCode), jBytes).Err() + defer pubsub.Close() + + err := redis.PushCaptureClientTask(galactus.client, connectCode, taskObj, timeout) if err != nil { - log.Println("Error in publishing task to " + rediskey.TasksSubscribe(connectCode)) + log.Println("Error in pushing task to " + rediskey.TasksList(connectCode)) log.Println(err) } else { go galactus.waitForAck(pubsub, timeout, acked) diff --git a/internal/redis/queue.go b/internal/redis/queue.go index b4827eb..25d19ba 100644 --- a/internal/redis/queue.go +++ b/internal/redis/queue.go @@ -5,6 +5,8 @@ import ( "encoding/json" "errors" "github.com/automuteus/galactus/pkg/discord_message" + "github.com/automuteus/utils/pkg/rediskey" + "github.com/automuteus/utils/pkg/task" "github.com/go-redis/redis/v8" "time" ) @@ -34,6 +36,28 @@ func PopRawDiscordMessageTimeout(client *redis.Client, timeout time.Duration) (s return res[1], nil } +func PushCaptureClientTask(client *redis.Client, connectCode string, taskObj task.ModifyTask, expiry time.Duration) error { + jBytes, err := json.Marshal(taskObj) + if err != nil { + return err + } + err = client.LPush(context.Background(), rediskey.TasksList(connectCode), jBytes).Err() + if err != nil { + return err + } + return client.Expire(context.Background(), rediskey.TasksList(connectCode), expiry).Err() +} + +func PopRawCaptureClientTask(client *redis.Client, connectCode string, timeout time.Duration) (string, error) { + res, err := client.BRPop(context.Background(), timeout, rediskey.TasksList(connectCode)).Result() + if err != nil { + return "", err + } else if len(res) < 2 { // we expect length 2+ because BRPOP returns the key and the value + return "", errors.New("empty queue") + } + return res[1], nil +} + func DiscordMessagesSize(client *redis.Client) (int64, error) { return client.LLen(context.Background(), GatewayMessageKey).Result() } diff --git a/pkg/capture_message/message.go b/pkg/capture_message/message.go new file mode 100644 index 0000000..36fe22c --- /dev/null +++ b/pkg/capture_message/message.go @@ -0,0 +1,8 @@ +package capture_message + +import "github.com/automuteus/utils/pkg/task" + +type CaptureMessage struct { + MessageType task.JobType + Data []byte +} diff --git a/pkg/client/add_reaction.go b/pkg/client/add_reaction.go new file mode 100644 index 0000000..6bf3bbe --- /dev/null +++ b/pkg/client/add_reaction.go @@ -0,0 +1,28 @@ +package galactus_client + +import ( + "bytes" + "github.com/automuteus/galactus/pkg/endpoint" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusClient) AddReaction(channelID, messageID, emojiID string) error { + resp, err := galactus.client.Post(galactus.Address+endpoint.AddReactionPartial+channelID+"/"+messageID+"/"+emojiID, "application/json", bytes.NewBufferString("")) + if err != nil { + return err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + log.Println("error reading all bytes from resp body for sendmessage") + log.Println(err) + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + log.Println("non-200 status code received for SendMessage:") + log.Println(string(respBytes)) + } + + return err +} diff --git a/pkg/client/client.go b/pkg/client/client.go new file mode 100644 index 0000000..dc1f9f7 --- /dev/null +++ b/pkg/client/client.go @@ -0,0 +1,263 @@ +package galactus_client + +import ( + "bytes" + "encoding/json" + "errors" + "github.com/automuteus/galactus/pkg/capture_message" + "github.com/automuteus/galactus/pkg/discord_message" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "github.com/bwmarrin/discordgo" + "go.uber.org/zap" + "io/ioutil" + "net/http" + "time" +) + +type GalactusClient struct { + Address string + logger *zap.Logger + client http.Client + killChannel chan struct{} + messageCreateHandlers []func(m discordgo.MessageCreate) + messageReactionAddHandlers []func(m discordgo.MessageReactionAdd) + voiceStateUpdateHandlers []func(m discordgo.VoiceStateUpdate) + guildDeleteHandlers []func(m discordgo.GuildDelete) + guildCreateHandlers []func(m discordgo.GuildCreate) + + genericCaptureHandlers []func(msg capture_message.CaptureMessage) +} + +func NewGalactusClient(address string, logger *zap.Logger) (*GalactusClient, error) { + gc := GalactusClient{ + Address: address, + logger: logger, + client: http.Client{ + // Note: any relevant config here + }, + killChannel: nil, + messageCreateHandlers: make([]func(m discordgo.MessageCreate), 0), + messageReactionAddHandlers: make([]func(m discordgo.MessageReactionAdd), 0), + voiceStateUpdateHandlers: make([]func(m discordgo.VoiceStateUpdate), 0), + guildDeleteHandlers: make([]func(m discordgo.GuildDelete), 0), + guildCreateHandlers: make([]func(m discordgo.GuildCreate), 0), + genericCaptureHandlers: make([]func(m capture_message.CaptureMessage), 0), + } + r, err := http.Get(gc.Address + "/") + if err != nil { + return &gc, err + } + defer r.Body.Close() + + if r.StatusCode != http.StatusOK { + return &gc, errors.New("galactus returned a non-200 status code; ensure it is reachable") + } + return &gc, nil +} + +type PollingType int + +const ( + DiscordPolling PollingType = iota + CapturePolling +) + +func (galactus *GalactusClient) StartPolling(pollingType PollingType, connectCode string) error { + if galactus.killChannel != nil { + return errors.New("client is already polling") + } + if pollingType == CapturePolling { + valid, err := validate.ValidConnectCode(connectCode) + if !valid { + return err + } + } + galactus.killChannel = make(chan struct{}) + connected := false + + go func() { + for { + select { + case <-galactus.killChannel: + return + + default: + var url string + switch pollingType { + case DiscordPolling: + url = galactus.Address + endpoint.RequestJob + case CapturePolling: + url = galactus.Address + endpoint.GetCaptureTaskPartial + connectCode + } + req, err := http.NewRequest("POST", url, bytes.NewBufferString("")) + if err != nil { + galactus.logger.Error("invalid url provided to galactus client", + zap.String("url", url)) + break + } + req.Cancel = galactus.killChannel + + response, err := http.DefaultClient.Do(req) + if err != nil { + connected = false + galactus.logger.Error("could not reach galactus", + zap.Error(err), + zap.String("url", url)) + galactus.logger.Info("waiting 1 second before retrying") + time.Sleep(time.Second * 1) + } else { + if !connected { + galactus.logger.Info("successful connection to galactus") + connected = true + } + body, err := ioutil.ReadAll(response.Body) + if err != nil { + galactus.logger.Error("error reading http response from galactus", + zap.Error(err), + zap.String("url", url), + zap.ByteString("message", body)) + } else if response.StatusCode == http.StatusOK { + switch pollingType { + case DiscordPolling: + var msg discord_message.DiscordMessage + err := json.Unmarshal(body, &msg) + if err != nil { + galactus.logger.Error("error unmarshalling discord message from galactus", + zap.Error(err), + zap.ByteString("message", body)) + } else { + galactus.dispatchDiscordMessage(msg) + } + case CapturePolling: + var msg capture_message.CaptureMessage + err := json.Unmarshal(body, &msg) + if err != nil { + galactus.logger.Error("error unmarshalling capture message from galactus", + zap.Error(err), + zap.ByteString("message", body)) + } else { + galactus.dispatchCaptureMessage(msg) + } + } + + } + response.Body.Close() + } + } + } + }() + return nil +} + +func (galactus *GalactusClient) dispatchDiscordMessage(msg discord_message.DiscordMessage) { + switch msg.MessageType { + case discord_message.MessageCreate: + var messageCreate discordgo.MessageCreate + err := json.Unmarshal(msg.Data, &messageCreate) + if err != nil { + galactus.logger.Error("error unmarshalling message data to MessageCreate", + zap.Error(err), + zap.ByteString("data", msg.Data)) + } else { + for _, v := range galactus.messageCreateHandlers { + v(messageCreate) + } + } + case discord_message.MessageReactionAdd: + var messageReactionAdd discordgo.MessageReactionAdd + err := json.Unmarshal(msg.Data, &messageReactionAdd) + if err != nil { + galactus.logger.Error("error unmarshalling message data to MessageReactionAdd", + zap.Error(err), + zap.ByteString("data", msg.Data)) + } else { + for _, v := range galactus.messageReactionAddHandlers { + v(messageReactionAdd) + } + } + case discord_message.VoiceStateUpdate: + var voiceStateUpdate discordgo.VoiceStateUpdate + err := json.Unmarshal(msg.Data, &voiceStateUpdate) + if err != nil { + galactus.logger.Error("error unmarshalling message data to VoiceStateUpdate", + zap.Error(err), + zap.ByteString("data", msg.Data)) + } else { + for _, v := range galactus.voiceStateUpdateHandlers { + v(voiceStateUpdate) + } + } + case discord_message.GuildDelete: + var guildDelete discordgo.GuildDelete + err := json.Unmarshal(msg.Data, &guildDelete) + if err != nil { + galactus.logger.Error("error unmarshalling message data to GuildDelete", + zap.Error(err), + zap.ByteString("data", msg.Data)) + } else { + for _, v := range galactus.guildDeleteHandlers { + v(guildDelete) + } + } + case discord_message.GuildCreate: + var guildCreate discordgo.GuildCreate + err := json.Unmarshal(msg.Data, &guildCreate) + if err != nil { + galactus.logger.Error("error unmarshalling message data to GuildCreate", + zap.Error(err), + zap.ByteString("data", msg.Data)) + } else { + for _, v := range galactus.guildCreateHandlers { + v(guildCreate) + } + } + } +} + +func (galactus *GalactusClient) dispatchCaptureMessage(msg capture_message.CaptureMessage) { + for _, v := range galactus.genericCaptureHandlers { + v(msg) + } +} + +func (galactus *GalactusClient) StopPolling() { + if galactus.killChannel != nil { + galactus.killChannel <- struct{}{} + } +} + +func (galactus *GalactusClient) RegisterDiscordHandler(msgType discord_message.DiscordMessageType, f interface{}) bool { + registered := false + switch msgType { + case discord_message.MessageCreate: + galactus.messageCreateHandlers = append(galactus.messageCreateHandlers, f.(func(m discordgo.MessageCreate))) + registered = true + case discord_message.MessageReactionAdd: + galactus.messageReactionAddHandlers = append(galactus.messageReactionAddHandlers, f.(func(m discordgo.MessageReactionAdd))) + registered = true + case discord_message.GuildDelete: + galactus.guildDeleteHandlers = append(galactus.guildDeleteHandlers, f.(func(m discordgo.GuildDelete))) + registered = true + case discord_message.VoiceStateUpdate: + galactus.voiceStateUpdateHandlers = append(galactus.voiceStateUpdateHandlers, f.(func(m discordgo.VoiceStateUpdate))) + registered = true + case discord_message.GuildCreate: + galactus.guildCreateHandlers = append(galactus.guildCreateHandlers, f.(func(m discordgo.GuildCreate))) + registered = true + } + if registered { + galactus.logger.Info("discord message handler registered", + zap.String("type", discord_message.DiscordMessageTypeStrings[msgType])) + } else { + galactus.logger.Error("discord message handler type not recognized, handler not registered", + zap.Int("type", int(msgType))) + } + return registered +} + +func (galactus *GalactusClient) RegisterCaptureHandler(f interface{}) bool { + galactus.genericCaptureHandlers = append(galactus.genericCaptureHandlers, f.(func(msg capture_message.CaptureMessage))) + galactus.logger.Info("generic capture message handler registered") + return true +} diff --git a/pkg/client/create_guild_emoji.go b/pkg/client/create_guild_emoji.go new file mode 100644 index 0000000..0157799 --- /dev/null +++ b/pkg/client/create_guild_emoji.go @@ -0,0 +1,37 @@ +package galactus_client + +import ( + "bytes" + "encoding/json" + "errors" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/bwmarrin/discordgo" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusClient) CreateGuildEmoji(guildID, emojiName, content string) (*discordgo.Emoji, error) { + resp, err := galactus.client.Post(galactus.Address+endpoint.CreateGuildEmojiPartial+guildID+"/"+emojiName, "application/json", bytes.NewBufferString(content)) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + log.Println("error reading all bytes from resp body for createGuildEmoji") + log.Println(err) + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 status code received for createGuildEmoji:") + return nil, err + } + + var emoji discordgo.Emoji + err = json.Unmarshal(respBytes, &emoji) + if err != nil { + return nil, err + } + return &emoji, nil +} diff --git a/pkg/client/create_user_channel.go b/pkg/client/create_user_channel.go new file mode 100644 index 0000000..3d8dbed --- /dev/null +++ b/pkg/client/create_user_channel.go @@ -0,0 +1,37 @@ +package galactus_client + +import ( + "bytes" + "encoding/json" + "errors" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/bwmarrin/discordgo" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusClient) CreateUserChannel(userID string) (*discordgo.Channel, error) { + resp, err := galactus.client.Post(galactus.Address+endpoint.UserChannelCreatePartial+userID, "application/json", bytes.NewBufferString("")) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + log.Println("error reading all bytes from resp body for createUserChannel") + log.Println(err) + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 status code received for createUserChannel:") + return nil, err + } + + var channel discordgo.Channel + err = json.Unmarshal(respBytes, &channel) + if err != nil { + return nil, err + } + return &channel, nil +} diff --git a/pkg/client/delete_message.go b/pkg/client/delete_message.go new file mode 100644 index 0000000..477d61b --- /dev/null +++ b/pkg/client/delete_message.go @@ -0,0 +1,27 @@ +package galactus_client + +import ( + "bytes" + "github.com/automuteus/galactus/pkg/endpoint" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusClient) DeleteChannelMessage(channelID, messageID string) error { + resp, err := galactus.client.Post(galactus.Address+endpoint.DeleteMessagePartial+channelID+"/"+messageID, "application/json", bytes.NewBufferString("")) + if err != nil { + return err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + log.Println("error reading all bytes from resp body for deleteChannelMessage") + log.Println(err) + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + log.Println("non-200 status code received for DeleteChannelMessage:") + log.Println(string(respBytes)) + } + return nil +} diff --git a/pkg/client/edit_message.go b/pkg/client/edit_message.go new file mode 100644 index 0000000..6c81fcd --- /dev/null +++ b/pkg/client/edit_message.go @@ -0,0 +1,36 @@ +package galactus_client + +import ( + "bytes" + "encoding/json" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/bwmarrin/discordgo" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusClient) EditChannelMessageEmbed(channelID, messageID string, embed discordgo.MessageEmbed) (*discordgo.Message, error) { + message, err := json.Marshal(embed) + if err != nil { + return nil, err + } + + resp, err := galactus.client.Post(galactus.Address+endpoint.EditMessageEmbedPartial+channelID+"/"+messageID, "application/json", bytes.NewBuffer(message)) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + log.Println("error reading all bytes from resp body for editChannelMessageEmbed") + log.Println(err) + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + log.Println("non-200 status code received for EditChannelMessageEmbed:") + log.Println(string(respBytes)) + } + var msg discordgo.Message + err = json.Unmarshal(respBytes, &msg) + return &msg, err +} diff --git a/pkg/client/get_guild.go b/pkg/client/get_guild.go new file mode 100644 index 0000000..b360dbb --- /dev/null +++ b/pkg/client/get_guild.go @@ -0,0 +1,37 @@ +package galactus_client + +import ( + "bytes" + "encoding/json" + "errors" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/bwmarrin/discordgo" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusClient) GetGuild(guildID string) (*discordgo.Guild, error) { + resp, err := galactus.client.Post(galactus.Address+endpoint.GetGuildPartial+guildID, "application/json", bytes.NewBufferString("")) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + log.Println("error reading all bytes from resp body for getGuild") + log.Println(err) + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 status code received for GetGuild:") + return nil, err + } + + var guild discordgo.Guild + err = json.Unmarshal(respBytes, &guild) + if err != nil { + return nil, err + } + return &guild, nil +} diff --git a/pkg/client/get_guild_channels.go b/pkg/client/get_guild_channels.go new file mode 100644 index 0000000..aaaac5e --- /dev/null +++ b/pkg/client/get_guild_channels.go @@ -0,0 +1,37 @@ +package galactus_client + +import ( + "bytes" + "encoding/json" + "errors" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/bwmarrin/discordgo" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusClient) GetGuildChannels(guildID string) ([]*discordgo.Channel, error) { + resp, err := galactus.client.Post(galactus.Address+endpoint.GetGuildChannelsPartial+guildID, "application/json", bytes.NewBufferString("")) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + log.Println("error reading all bytes from resp body for getChannels") + log.Println(err) + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 status code received for GetChannels:") + return nil, err + } + + var channels []*discordgo.Channel + err = json.Unmarshal(respBytes, &channels) + if err != nil { + return nil, err + } + return channels, nil +} diff --git a/pkg/client/get_guild_emojis.go b/pkg/client/get_guild_emojis.go new file mode 100644 index 0000000..ce09045 --- /dev/null +++ b/pkg/client/get_guild_emojis.go @@ -0,0 +1,37 @@ +package galactus_client + +import ( + "bytes" + "encoding/json" + "errors" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/bwmarrin/discordgo" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusClient) GetGuildEmojis(guildID string) ([]*discordgo.Emoji, error) { + resp, err := galactus.client.Post(galactus.Address+endpoint.GetGuildEmojisPartial+guildID, "application/json", bytes.NewBufferString("")) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + log.Println("error reading all bytes from resp body for getGuildEmojis") + log.Println(err) + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 status code received for getGuildEmojis") + return nil, err + } + + var emojis []*discordgo.Emoji + err = json.Unmarshal(respBytes, &emojis) + if err != nil { + return nil, err + } + return emojis, nil +} diff --git a/pkg/client/get_guild_member.go b/pkg/client/get_guild_member.go new file mode 100644 index 0000000..d6126fe --- /dev/null +++ b/pkg/client/get_guild_member.go @@ -0,0 +1,37 @@ +package galactus_client + +import ( + "bytes" + "encoding/json" + "errors" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/bwmarrin/discordgo" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusClient) GetGuildMember(guildID, userID string) (*discordgo.Member, error) { + resp, err := galactus.client.Post(galactus.Address+endpoint.GetGuildMemberPartial+guildID+"/"+userID, "application/json", bytes.NewBufferString("")) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + log.Println("error reading all bytes from resp body for getGuildMember") + log.Println(err) + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 status code received for GetChannels:") + return nil, err + } + + var member discordgo.Member + err = json.Unmarshal(respBytes, &member) + if err != nil { + return nil, err + } + return &member, nil +} diff --git a/pkg/client/get_guild_roles.go b/pkg/client/get_guild_roles.go new file mode 100644 index 0000000..37a08a2 --- /dev/null +++ b/pkg/client/get_guild_roles.go @@ -0,0 +1,37 @@ +package galactus_client + +import ( + "bytes" + "encoding/json" + "errors" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/bwmarrin/discordgo" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusClient) GetGuildRoles(guildID string) ([]*discordgo.Role, error) { + resp, err := galactus.client.Post(galactus.Address+endpoint.GetGuildRolesPartial+guildID, "application/json", bytes.NewBufferString("")) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + log.Println("error reading all bytes from resp body for getRoles") + log.Println(err) + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 status code received for GetRoles:") + return nil, err + } + + var roles []*discordgo.Role + err = json.Unmarshal(respBytes, &roles) + if err != nil { + return nil, err + } + return roles, nil +} diff --git a/pkg/client/modify.go b/pkg/client/modify.go new file mode 100644 index 0000000..47bd8df --- /dev/null +++ b/pkg/client/modify.go @@ -0,0 +1,50 @@ +package galactus_client + +import ( + "bytes" + "context" + "encoding/json" + "fmt" + "github.com/automuteus/utils/pkg/task" + "github.com/bsm/redislock" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusClient) ModifyUsers(guildID, connectCode string, request task.UserModifyRequest, lock *redislock.Lock) *task.MuteDeafenSuccessCounts { + if lock != nil { + defer lock.Release(context.Background()) + } + + fullURL := fmt.Sprintf("%s/modify/%s/%s", galactus.Address, guildID, connectCode) + jBytes, err := json.Marshal(request) + if err != nil { + return nil + } + + log.Println(request) + + resp, err := galactus.client.Post(fullURL, "application/json", bytes.NewBuffer(jBytes)) + if err != nil { + return nil + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + return nil + } + + mds := task.MuteDeafenSuccessCounts{} + jBytes, err = ioutil.ReadAll(resp.Body) + if err != nil { + log.Println(err) + return &mds + } + err = json.Unmarshal(jBytes, &mds) + if err != nil { + log.Println(err) + return &mds + } + return &mds +} diff --git a/pkg/client/remove_all_reactions.go b/pkg/client/remove_all_reactions.go new file mode 100644 index 0000000..d88faf1 --- /dev/null +++ b/pkg/client/remove_all_reactions.go @@ -0,0 +1,28 @@ +package galactus_client + +import ( + "bytes" + "github.com/automuteus/galactus/pkg/endpoint" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusClient) RemoveAllReactions(channelID, messageID string) error { + resp, err := galactus.client.Post(galactus.Address+endpoint.RemoveAllReactionsPartial+channelID+"/"+messageID, "application/json", bytes.NewBufferString("")) + if err != nil { + return err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + log.Println("error reading all bytes from resp body for removeAllReactions") + log.Println(err) + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + log.Println("non-200 status code received for removeAllReactions:") + log.Println(string(respBytes)) + } + + return err +} diff --git a/pkg/client/remove_reaction.go b/pkg/client/remove_reaction.go new file mode 100644 index 0000000..cbd3b1c --- /dev/null +++ b/pkg/client/remove_reaction.go @@ -0,0 +1,28 @@ +package galactus_client + +import ( + "bytes" + "github.com/automuteus/galactus/pkg/endpoint" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusClient) RemoveReaction(channelID, messageID, emojiID, userID string) error { + resp, err := galactus.client.Post(galactus.Address+endpoint.RemoveReactionPartial+channelID+"/"+messageID+"/"+emojiID+"/"+userID, "application/json", bytes.NewBufferString("")) + if err != nil { + return err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + log.Println("error reading all bytes from resp body for removeReaction") + log.Println(err) + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + log.Println("non-200 status code received for RemoveReaction:") + log.Println(string(respBytes)) + } + + return err +} diff --git a/pkg/client/send_message.go b/pkg/client/send_message.go new file mode 100644 index 0000000..3e67ff2 --- /dev/null +++ b/pkg/client/send_message.go @@ -0,0 +1,56 @@ +package galactus_client + +import ( + "bytes" + "encoding/json" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/bwmarrin/discordgo" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusClient) SendChannelMessage(channelID string, message string) (*discordgo.Message, error) { + resp, err := galactus.client.Post(galactus.Address+endpoint.SendMessagePartial+channelID, "application/json", bytes.NewBufferString(message)) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + log.Println("error reading all bytes from resp body for sendmessage") + log.Println(err) + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + log.Println("non-200 status code received for SendMessage:") + log.Println(string(respBytes)) + } + var msg discordgo.Message + err = json.Unmarshal(respBytes, &msg) + return &msg, err +} + +func (galactus *GalactusClient) SendChannelMessageEmbed(channelID string, embed *discordgo.MessageEmbed) (*discordgo.Message, error) { + message, err := json.Marshal(*embed) + if err != nil { + return nil, err + } + + resp, err := galactus.client.Post(galactus.Address+endpoint.SendMessageEmbedPartial+channelID, "application/json", bytes.NewBuffer(message)) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + log.Println("error reading all bytes from resp body for sendmessageembed") + log.Println(err) + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + log.Println("non-200 status code received for SendMessageEmbed:") + log.Println(string(respBytes)) + } + var msg discordgo.Message + err = json.Unmarshal(respBytes, &msg) + return &msg, err +} diff --git a/pkg/endpoint/discord.go b/pkg/endpoint/discord.go new file mode 100644 index 0000000..5bbf58e --- /dev/null +++ b/pkg/endpoint/discord.go @@ -0,0 +1,45 @@ +package endpoint + +const SendMessagePartial = "/sendMessage/" +const SendMessageFull = SendMessagePartial + "{channelID}" + +const SendMessageEmbedPartial = "/sendMessageEmbed/" +const SendMessageEmbedFull = SendMessageEmbedPartial + "{channelID}" + +const EditMessageEmbedPartial = "/editMessageEmbed/" +const EditMessageEmbedFull = EditMessageEmbedPartial + "{channelID}/{messageID}" + +const DeleteMessagePartial = "/deleteMessage/" +const DeleteMessageFull = DeleteMessagePartial + "{channelID}/{messageID}" + +const RemoveReactionPartial = "/removeReaction/" +const RemoveReactionFull = RemoveReactionPartial + "{channelID}/{messageID}/{emojiID}/{userID}" + +const RemoveAllReactionsPartial = "/removeAllReactions/" +const RemoveAllReactionsFull = RemoveAllReactionsPartial + "{channelID}/{messageID}" + +const AddReactionPartial = "/addReaction/" +const AddReactionFull = AddReactionPartial + "{channelID}/{messageID}/{emojiID}" + +const ModifyUserbyGuildConnectCode = "/modify/{guildID}/{connectCode}" + +const GetGuildPartial = "/guild/" +const GetGuildFull = GetGuildPartial + "{guildID}" + +const GetGuildChannelsPartial = "/guildChannels/" +const GetGuildChannelsFull = GetGuildChannelsPartial + "{guildID}" + +const GetGuildMemberPartial = "/guildMember/" +const GetGuildMemberFull = GetGuildMemberPartial + "{guildID}/{userID}" + +const GetGuildRolesPartial = "/guildRoles/" +const GetGuildRolesFull = GetGuildRolesPartial + "{guildID}" + +const UserChannelCreatePartial = "/createUserChannel/" +const UserChannelCreateFull = UserChannelCreatePartial + "{userID}" + +const GetGuildEmojisPartial = "/guildEmojis/" +const GetGuildEmojisFull = GetGuildEmojisPartial + "{guildID}" + +const CreateGuildEmojiPartial = "/guildEmojiCreate/" +const CreateGuildEmojiFull = CreateGuildEmojiPartial + "{guildID}/{name}" diff --git a/pkg/endpoint/endpoints.go b/pkg/endpoint/endpoints.go index 097ce02..b0dd952 100644 --- a/pkg/endpoint/endpoints.go +++ b/pkg/endpoint/endpoints.go @@ -1,51 +1,16 @@ package endpoint -const SendMessagePartial = "/sendMessage/" -const SendMessageFull = SendMessagePartial + "{channelID}" - -const SendMessageEmbedPartial = "/sendMessageEmbed/" -const SendMessageEmbedFull = SendMessageEmbedPartial + "{channelID}" - -const EditMessageEmbedPartial = "/editMessageEmbed/" -const EditMessageEmbedFull = EditMessageEmbedPartial + "{channelID}/{messageID}" - -const DeleteMessagePartial = "/deleteMessage/" -const DeleteMessageFull = DeleteMessagePartial + "{channelID}/{messageID}" - -const RemoveReactionPartial = "/removeReaction/" -const RemoveReactionFull = RemoveReactionPartial + "{channelID}/{messageID}/{emojiID}/{userID}" - -const RemoveAllReactionsPartial = "/removeAllReactions/" -const RemoveAllReactionsFull = RemoveAllReactionsPartial + "{channelID}/{messageID}" - -const AddReactionPartial = "/addReaction/" -const AddReactionFull = AddReactionPartial + "{channelID}/{messageID}/{emojiID}" - -const ModifyUserbyGuildConnectCode = "/modify/{guildID}/{connectCode}" - -const GetGuildPartial = "/guild/" -const GetGuildFull = GetGuildPartial + "{guildID}" - -const GetGuildChannelsPartial = "/guildChannels/" -const GetGuildChannelsFull = GetGuildChannelsPartial + "{guildID}" - -const GetGuildMemberPartial = "/guildMember/" -const GetGuildMemberFull = GetGuildMemberPartial + "{guildID}/{userID}" - -const GetGuildRolesPartial = "/guildRoles/" -const GetGuildRolesFull = GetGuildRolesPartial + "{guildID}" - -const UserChannelCreatePartial = "/createUserChannel/" -const UserChannelCreateFull = UserChannelCreatePartial + "{userID}" +const RequestJob = "/request/job" +const JobCount = "/totalJobs" -const GetGuildEmojisPartial = "/guildEmojis/" -const GetGuildEmojisFull = GetGuildEmojisPartial + "{guildID}" +const AddCaptureEventPartial = "/addCaptureEvent/" +const AddCaptureEventFull = AddCaptureEventPartial + "{connectCode}" -const CreateGuildEmojiPartial = "/guildEmojiCreate/" -const CreateGuildEmojiFull = CreateGuildEmojiPartial + "{guildID}/{name}" +const GetCaptureTaskPartial = "/getCaptureTask/" +const GetCaptureTaskFull = GetCaptureTaskPartial + "{connectCode}" -const RequestJob = "/request/job" -const JobCount = "/totalJobs" +const SetCaptureTaskStatusPartial = "/setCaptureTaskStatus/" +const SetCaptureTaskStatusFull = SetCaptureTaskStatusPartial + "{taskID}" const GetGuildAMUSettingsPartial = "/getAMUSettings/" const GetGuildAMUSettingsFull = GetGuildAMUSettingsPartial + "{guildID}" diff --git a/pkg/validate/capture.go b/pkg/validate/capture.go new file mode 100644 index 0000000..353d003 --- /dev/null +++ b/pkg/validate/capture.go @@ -0,0 +1,31 @@ +package validate + +import ( + "errors" + "fmt" + "github.com/automuteus/utils/pkg/task" +) + +const ConnectCodeLength = 8 + +func ValidConnectCode(code string) (bool, error) { + if code == "" { + return false, errors.New("empty connect code") + } + + if len(code) != ConnectCodeLength { + return false, errors.New(fmt.Sprintf("length of code is %d, not the expected %d", len(code), ConnectCodeLength)) + } + return true, nil +} + +func ValidTaskID(taskID string) (bool, error) { + if taskID == "" { + return false, errors.New("empty taskID") + } + + if len(taskID) != task.IDLength { + return false, errors.New(fmt.Sprintf("length of code is %d, not the expected %d", len(taskID), task.IDLength)) + } + return true, nil +} diff --git a/pkg/validate/params.go b/pkg/validate/params.go index 32e70d2..2c490ea 100644 --- a/pkg/validate/params.go +++ b/pkg/validate/params.go @@ -138,3 +138,39 @@ func NameAndRespond(logger *zap.Logger, w http.ResponseWriter, r *http.Request, } return name } + +func ConnectCodeAndRespond(logger *zap.Logger, w http.ResponseWriter, r *http.Request, endpoint string) string { + vars := mux.Vars(r) + connectCode := vars["connectCode"] + valid, err := ValidConnectCode(connectCode) + if !valid { + errMsg := "connectCode provided to " + endpoint + " is invalid" + logger.Error(errMsg, + zap.Error(err), + zap.String("connectCode", connectCode), + zap.String("endpoint", endpoint), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg)) + return "" + } + return connectCode +} + +func TaskIDAndRespond(logger *zap.Logger, w http.ResponseWriter, r *http.Request, endpoint string) string { + vars := mux.Vars(r) + taskID := vars["taskID"] + valid, err := ValidTaskID(taskID) + if !valid { + errMsg := "taskID provided to " + endpoint + " is invalid" + logger.Error(errMsg, + zap.Error(err), + zap.String("taskID", taskID), + zap.String("endpoint", endpoint), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg)) + return "" + } + return taskID +} From fd84a3ffde74568d42771a8f6698f18df5550fd1 Mon Sep 17 00:00:00 2001 From: denverquane Date: Sat, 16 Jan 2021 23:21:22 -0700 Subject: [PATCH 14/50] Added capture client code --- go.mod | 4 +-- go.sum | 4 +++ internal/galactus/add_capture_event.go | 30 ++++++++---------- internal/galactus/modify.go | 10 +++--- internal/galactus/send_message_test.go | 2 +- internal/galactus/server.go | 44 ++++++++++++++++++++++---- internal/galactus/token.go | 10 +++--- internal/redis/queue.go | 4 +-- pkg/capture_message/message.go | 4 +-- pkg/client/add_capture_event.go | 31 ++++++++++++++++++ pkg/client/capture_task_status.go | 28 ++++++++++++++++ pkg/endpoint/endpoints.go | 2 +- pkg/validate/capture.go | 15 +++++++-- pkg/validate/params.go | 24 ++++++++++++++ 14 files changed, 169 insertions(+), 43 deletions(-) create mode 100644 pkg/client/add_capture_event.go create mode 100644 pkg/client/capture_task_status.go diff --git a/go.mod b/go.mod index b69ce5a..b35adb7 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.15 require ( github.com/alicebob/miniredis v2.5.0+incompatible // indirect github.com/alicebob/miniredis/v2 v2.14.1 - github.com/automuteus/utils v0.0.9 + github.com/automuteus/utils v0.0.10 github.com/bsm/redislock v0.7.0 github.com/bwmarrin/discordgo v0.22.1 github.com/go-redis/redis v6.15.9+incompatible // indirect @@ -18,4 +18,4 @@ require ( go.uber.org/zap v1.16.0 ) -replace github.com/automuteus/utils v0.0.9 => github.com/automuteus/utils v0.0.11-0.20210116220058-40ad795561c0 +replace github.com/automuteus/utils v0.0.10 => github.com/automuteus/utils v0.0.11-0.20210117015211-09544f155513 diff --git a/go.sum b/go.sum index 649152c..3088216 100644 --- a/go.sum +++ b/go.sum @@ -18,10 +18,14 @@ github.com/automuteus/utils v0.0.7 h1:WnGqvaqSxyysR6ixMltaF5RSIeoeL9ev9zRqqgVF3q github.com/automuteus/utils v0.0.7/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= github.com/automuteus/utils v0.0.9 h1:jXyRsDDt/f/r5qSAbPWgoUqs0HuUOESvNkpNjlWmvRw= github.com/automuteus/utils v0.0.9/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= +github.com/automuteus/utils v0.0.10 h1:1yCu+0liCAExtg3fAxalv/DAcAQCmZ8gU1RbLf39paM= +github.com/automuteus/utils v0.0.10/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= github.com/automuteus/utils v0.0.11-0.20210116011910-d830c3145b25 h1:A63HOz4z0LWEVox4Q87CK0uwMjrDGuwg1ityQR0D3HY= github.com/automuteus/utils v0.0.11-0.20210116011910-d830c3145b25/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= github.com/automuteus/utils v0.0.11-0.20210116220058-40ad795561c0 h1:XmGntgGGBNkgdHKoyekITQ8VJWDUBq3LwPHZFr8eMzo= github.com/automuteus/utils v0.0.11-0.20210116220058-40ad795561c0/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= +github.com/automuteus/utils v0.0.11-0.20210117015211-09544f155513 h1:PjaCnn/wyjvLNAKGJbio6KYFnJLq5+pJr1YZ1JeAhOc= +github.com/automuteus/utils v0.0.11-0.20210117015211-09544f155513/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= github.com/bsm/redislock v0.7.0 h1:RL7aZJhCKkuBjQbnSTKCeedTRifBWxd/ffP+GZ599Mo= github.com/bsm/redislock v0.7.0/go.mod h1:3Kgu+cXw0JrkZ5pmY/JbcFpixGZ5M9v9G2PGWYqku+k= github.com/bwmarrin/discordgo v0.22.0/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= diff --git a/internal/galactus/add_capture_event.go b/internal/galactus/add_capture_event.go index 290852b..569ed94 100644 --- a/internal/galactus/add_capture_event.go +++ b/internal/galactus/add_capture_event.go @@ -2,11 +2,9 @@ package galactus import ( "context" - "encoding/json" - "github.com/automuteus/galactus/pkg/capture_message" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" - "github.com/automuteus/utils/pkg/task" + "github.com/automuteus/utils/pkg/capture" "go.uber.org/zap" "io/ioutil" "net/http" @@ -19,32 +17,32 @@ func (galactus *GalactusAPI) AddCaptureEventHandler() func(w http.ResponseWriter return } - body, err := ioutil.ReadAll(r.Body) - if err != nil { - errMsg := "could not read http body with error" + valid, eventType := validate.EventTypeAndRespond(galactus.logger, w, r, endpoint.AddCaptureEventFull) + if !valid { + errMsg := "invalid eventType provided" galactus.logger.Error(errMsg, - zap.Error(err), + zap.Int("eventType", int(eventType)), ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg)) return } - defer r.Body.Close() - var message capture_message.CaptureMessage - err = json.Unmarshal(body, &message) + body, err := ioutil.ReadAll(r.Body) if err != nil { - errMsg := "error unmarshalling CaptureMessage from JSON" + errMsg := "could not read http body with error" galactus.logger.Error(errMsg, zap.Error(err), - zap.String("body", string(body)), ) - w.WriteHeader(http.StatusBadRequest) + w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(errMsg + ": " + err.Error())) return } + defer r.Body.Close() + + // TODO more validation on the payload here? - err = task.PushJob(context.Background(), galactus.client, connectCode, message.MessageType, string(message.Data)) + err = capture.PushEvent(context.Background(), galactus.client, connectCode, eventType, string(body)) if err != nil { errMsg := "error pushing capture job to Redis" galactus.logger.Error(errMsg, diff --git a/internal/galactus/modify.go b/internal/galactus/modify.go index 837405f..7c41ed0 100644 --- a/internal/galactus/modify.go +++ b/internal/galactus/modify.go @@ -5,7 +5,7 @@ import ( "github.com/automuteus/galactus/internal/galactus/shard_manager" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" - "github.com/automuteus/utils/pkg/task" + "github.com/automuteus/utils/pkg/discord" "go.uber.org/zap" "io/ioutil" "log" @@ -36,7 +36,7 @@ func (galactus *GalactusAPI) modifyUserHandler(maxWorkers int, taskTimeout time. } defer r.Body.Close() - userModifications := task.UserModifyRequest{} + userModifications := discord.UserModifyRequest{} err = json.Unmarshal(body, &userModifications) if err != nil { log.Println(err) @@ -48,10 +48,10 @@ func (galactus *GalactusAPI) modifyUserHandler(maxWorkers int, taskTimeout time. limit := PremiumBotConstraints[userModifications.Premium] tokens := galactus.getAllTokensForGuild(guildID) - tasksChannel := make(chan task.UserModify, len(userModifications.Users)) + tasksChannel := make(chan discord.UserModify, len(userModifications.Users)) wg := sync.WaitGroup{} - mdsc := task.MuteDeafenSuccessCounts{ + mdsc := discord.MuteDeafenSuccessCounts{ Worker: 0, Capture: 0, Official: 0, @@ -87,7 +87,7 @@ func (galactus *GalactusAPI) modifyUserHandler(maxWorkers int, taskTimeout time. ) } - err = task.ApplyMuteDeaf(sess, guildID, userIDStr, request.Mute, request.Deaf) + err = discord.ApplyMuteDeaf(sess, guildID, userIDStr, request.Mute, request.Deaf) if err != nil { galactus.logger.Error("error applying mute/deaf on official bot", zap.Error(err), diff --git a/internal/galactus/send_message_test.go b/internal/galactus/send_message_test.go index 68873a2..9698b7b 100644 --- a/internal/galactus/send_message_test.go +++ b/internal/galactus/send_message_test.go @@ -24,7 +24,7 @@ func TestGalactusAPI_SendChannelMessageHandler(t *testing.T) { defer galactus.Close() m := mux.NewRouter() - m.HandleFunc(endpoint.SendMessageFull, SendChannelMessageHandler(galactus.logger, galactus.shardManager)) + m.HandleFunc(endpoint.SendMessageFull, galactus.SendChannelMessageHandler()) ts := httptest.NewServer(m) defer ts.Close() diff --git a/internal/galactus/server.go b/internal/galactus/server.go index 801c58e..a06e827 100644 --- a/internal/galactus/server.go +++ b/internal/galactus/server.go @@ -167,6 +167,9 @@ func (galactus *GalactusAPI) Run(port string, maxWorkers int, captureAckTimeout // TODO maybe eventually provide some auth parameter, or version number? Something to prove that a worker can pop requests? r := mux.NewRouter() + r.HandleFunc("/", galactus.indexHandler()).Methods("GET") + r.HandleFunc(endpoint.JobCount, galactus.jobCount()).Methods("GET") + r.HandleFunc(endpoint.ModifyUserbyGuildConnectCode, galactus.modifyUserHandler(maxWorkers, captureAckTimeout)).Methods("POST") r.HandleFunc(endpoint.SendMessageFull, galactus.SendChannelMessageHandler()).Methods("POST") r.HandleFunc(endpoint.SendMessageEmbedFull, galactus.SendChannelMessageEmbedHandler()).Methods("POST") @@ -188,12 +191,6 @@ func (galactus *GalactusAPI) Run(port string, maxWorkers int, captureAckTimeout r.HandleFunc(endpoint.SetCaptureTaskStatusFull, galactus.SetCaptureTaskStatusHandler()).Methods("POST") r.HandleFunc(endpoint.RequestJob, galactus.requestJobHandler(taskTimeout)).Methods("POST") - r.HandleFunc(endpoint.JobCount, galactus.jobCount()).Methods("GET") - - r.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { - w.WriteHeader(http.StatusOK) - w.Write([]byte("ok")) - }).Methods("GET") galactus.logger.Info("galactus is running", zap.String("port", port), @@ -207,6 +204,41 @@ func (galactus *GalactusAPI) Run(port string, maxWorkers int, captureAckTimeout } } +func (galactus *GalactusAPI) indexHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + // TODO For any higher-sensitivity info in the future, this should properly identify the origin specifically + w.Header().Set("Access-Control-Allow-Origin", "*") + w.Header().Set("Access-Control-Allow-Methods", "GET, OPTIONS") + w.Header().Set("Access-Control-Allow-Headers", "Accept, Content-Type, Content-Length") + + // default to listing active games in the last 15 mins + activeGames := rediskey.GetActiveGames(context.Background(), galactus.client, 900) + version, commit := rediskey.GetVersionAndCommit(context.Background(), galactus.client) + totalGuilds := rediskey.GetGuildCounter(context.Background(), galactus.client) + totalUsers := rediskey.GetTotalUsers(context.Background(), galactus.client) + totalGames := rediskey.GetTotalGames(context.Background(), galactus.client) + + data := map[string]interface{}{ + "version": version, + "commit": commit, + "totalGuilds": totalGuilds, + "activeGames": activeGames, + "totalUsers": totalUsers, + "totalGames": totalGames, + } + + w.WriteHeader(http.StatusOK) + jsonBytes, err := json.Marshal(data) + if err != nil { + galactus.logger.Error("error marshalling data for index endpoint", + zap.Error(err), + ) + } else { + w.Write(jsonBytes) + } + } +} + func (galactus *GalactusAPI) requestJobHandler(timeout time.Duration) func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) { msg, err := redisutils.PopRawDiscordMessageTimeout(galactus.client, timeout) diff --git a/internal/galactus/token.go b/internal/galactus/token.go index 0d8563d..59a5235 100644 --- a/internal/galactus/token.go +++ b/internal/galactus/token.go @@ -3,18 +3,18 @@ package galactus import ( "context" "github.com/automuteus/galactus/internal/redis" + "github.com/automuteus/utils/pkg/discord" "github.com/automuteus/utils/pkg/rediskey" - "github.com/automuteus/utils/pkg/task" "go.uber.org/zap" "log" "time" ) -func (galactus *GalactusAPI) attemptOnSecondaryTokens(guildID, userID string, tokens []string, limit int, request task.UserModify) bool { +func (galactus *GalactusAPI) attemptOnSecondaryTokens(guildID, userID string, tokens []string, limit int, request discord.UserModify) bool { if tokens != nil && limit > 0 { sess, hToken := galactus.getAnySession(guildID, tokens, limit) if sess != nil { - err := task.ApplyMuteDeaf(sess, guildID, userID, request.Mute, request.Deaf) + err := discord.ApplyMuteDeaf(sess, guildID, userID, request.Mute, request.Deaf) if err != nil { galactus.logger.Error("failed to apply mute/deaf on secondary bot", zap.Error(err), @@ -51,11 +51,11 @@ func (galactus *GalactusAPI) attemptOnSecondaryTokens(guildID, userID string, to var UnresponsiveCaptureBlacklistDuration = time.Minute * time.Duration(5) -func (galactus *GalactusAPI) attemptOnCaptureBot(guildID, connectCode string, gid uint64, timeout time.Duration, request task.UserModify) bool { +func (galactus *GalactusAPI) attemptOnCaptureBot(guildID, connectCode string, gid uint64, timeout time.Duration, request discord.UserModify) bool { // this is cheeky, but use the connect code as part of the lock; don't issue too many requests on the capture client w/ this code if galactus.IncrAndTestGuildTokenComboLock(guildID, connectCode) { // if the secondary token didn't work, then next we try the client-side capture request - taskObj := task.NewModifyTask(gid, request.UserID, task.PatchParams{ + taskObj := discord.NewModifyTask(gid, request.UserID, discord.PatchParams{ Deaf: request.Deaf, Mute: request.Mute, }) diff --git a/internal/redis/queue.go b/internal/redis/queue.go index 25d19ba..e0feb64 100644 --- a/internal/redis/queue.go +++ b/internal/redis/queue.go @@ -5,8 +5,8 @@ import ( "encoding/json" "errors" "github.com/automuteus/galactus/pkg/discord_message" + "github.com/automuteus/utils/pkg/discord" "github.com/automuteus/utils/pkg/rediskey" - "github.com/automuteus/utils/pkg/task" "github.com/go-redis/redis/v8" "time" ) @@ -36,7 +36,7 @@ func PopRawDiscordMessageTimeout(client *redis.Client, timeout time.Duration) (s return res[1], nil } -func PushCaptureClientTask(client *redis.Client, connectCode string, taskObj task.ModifyTask, expiry time.Duration) error { +func PushCaptureClientTask(client *redis.Client, connectCode string, taskObj discord.ModifyTask, expiry time.Duration) error { jBytes, err := json.Marshal(taskObj) if err != nil { return err diff --git a/pkg/capture_message/message.go b/pkg/capture_message/message.go index 36fe22c..5d8e86f 100644 --- a/pkg/capture_message/message.go +++ b/pkg/capture_message/message.go @@ -1,8 +1,8 @@ package capture_message -import "github.com/automuteus/utils/pkg/task" +import "github.com/automuteus/utils/pkg/capture" type CaptureMessage struct { - MessageType task.JobType + MessageType capture.EventType Data []byte } diff --git a/pkg/client/add_capture_event.go b/pkg/client/add_capture_event.go new file mode 100644 index 0000000..9d0e5cd --- /dev/null +++ b/pkg/client/add_capture_event.go @@ -0,0 +1,31 @@ +package galactus_client + +import ( + "bytes" + "fmt" + "github.com/automuteus/galactus/pkg/capture_message" + "github.com/automuteus/galactus/pkg/endpoint" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusClient) AddCaptureEvent(connectCode string, event capture_message.CaptureMessage) error { + url := fmt.Sprintf("%s%s/%d", galactus.Address+endpoint.AddCaptureEventPartial, connectCode, event.MessageType) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBuffer(event.Data)) + if err != nil { + return err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + log.Println("error reading all bytes from resp body for addcaptureevent") + log.Println(err) + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + log.Println("non-200 status code received for addcaptureevent:") + log.Println(string(respBytes)) + } + + return err +} diff --git a/pkg/client/capture_task_status.go b/pkg/client/capture_task_status.go new file mode 100644 index 0000000..4956dba --- /dev/null +++ b/pkg/client/capture_task_status.go @@ -0,0 +1,28 @@ +package galactus_client + +import ( + "bytes" + "github.com/automuteus/galactus/pkg/endpoint" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusClient) SetCaptureTaskStatus(taskID, status string) error { + resp, err := galactus.client.Post(galactus.Address+endpoint.SetCaptureTaskStatusPartial+taskID, "application/json", bytes.NewBufferString(status)) + if err != nil { + return err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + log.Println("error reading all bytes from resp body for setcapturestatus") + log.Println(err) + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + log.Println("non-200 status code received for setcapturestatus:") + log.Println(string(respBytes)) + } + + return err +} diff --git a/pkg/endpoint/endpoints.go b/pkg/endpoint/endpoints.go index b0dd952..f463a30 100644 --- a/pkg/endpoint/endpoints.go +++ b/pkg/endpoint/endpoints.go @@ -4,7 +4,7 @@ const RequestJob = "/request/job" const JobCount = "/totalJobs" const AddCaptureEventPartial = "/addCaptureEvent/" -const AddCaptureEventFull = AddCaptureEventPartial + "{connectCode}" +const AddCaptureEventFull = AddCaptureEventPartial + "{connectCode}/{eventType}" const GetCaptureTaskPartial = "/getCaptureTask/" const GetCaptureTaskFull = GetCaptureTaskPartial + "{connectCode}" diff --git a/pkg/validate/capture.go b/pkg/validate/capture.go index 353d003..22376d7 100644 --- a/pkg/validate/capture.go +++ b/pkg/validate/capture.go @@ -3,7 +3,8 @@ package validate import ( "errors" "fmt" - "github.com/automuteus/utils/pkg/task" + "github.com/automuteus/utils/pkg/capture" + "github.com/automuteus/utils/pkg/discord" ) const ConnectCodeLength = 8 @@ -24,8 +25,16 @@ func ValidTaskID(taskID string) (bool, error) { return false, errors.New("empty taskID") } - if len(taskID) != task.IDLength { - return false, errors.New(fmt.Sprintf("length of code is %d, not the expected %d", len(taskID), task.IDLength)) + if len(taskID) != discord.IDLength { + return false, errors.New(fmt.Sprintf("length of code is %d, not the expected %d", len(taskID), discord.IDLength)) } return true, nil } + +func ValidEventType(eventType int) (bool, error) { + if eventType == int(capture.Connection) || eventType == int(capture.Lobby) || eventType == int(capture.State) || + eventType == int(capture.Player) || eventType == int(capture.GameOver) { + return true, nil + } + return false, errors.New("eventType is not a valid value") +} diff --git a/pkg/validate/params.go b/pkg/validate/params.go index 2c490ea..d7cb814 100644 --- a/pkg/validate/params.go +++ b/pkg/validate/params.go @@ -1,9 +1,11 @@ package validate import ( + "github.com/automuteus/utils/pkg/capture" "github.com/gorilla/mux" "go.uber.org/zap" "net/http" + "strconv" ) func ChannelAndMessageIDsAndRespond(logger *zap.Logger, w http.ResponseWriter, r *http.Request, endpoint string) (string, string) { @@ -174,3 +176,25 @@ func TaskIDAndRespond(logger *zap.Logger, w http.ResponseWriter, r *http.Request } return taskID } + +func EventTypeAndRespond(logger *zap.Logger, w http.ResponseWriter, r *http.Request, endpoint string) (bool, capture.EventType) { + vars := mux.Vars(r) + eventType := vars["eventType"] + e, err := strconv.ParseInt(eventType, 10, 64) + if err != nil { + return false, 0 + } + valid, err := ValidEventType(int(e)) + if !valid { + errMsg := "eventType provided to " + endpoint + " is invalid" + logger.Error(errMsg, + zap.Error(err), + zap.String("eventType", eventType), + zap.String("endpoint", endpoint), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg)) + return false, 0 + } + return true, capture.EventType(e) +} From cec7b367bd3757865d6ead71e458466bbbd269e6 Mon Sep 17 00:00:00 2001 From: denverquane Date: Sat, 16 Jan 2021 23:43:04 -0700 Subject: [PATCH 15/50] Update modify users --- pkg/client/modify.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/client/modify.go b/pkg/client/modify.go index 47bd8df..dc69f3e 100644 --- a/pkg/client/modify.go +++ b/pkg/client/modify.go @@ -5,14 +5,14 @@ import ( "context" "encoding/json" "fmt" - "github.com/automuteus/utils/pkg/task" + "github.com/automuteus/utils/pkg/discord" "github.com/bsm/redislock" "io/ioutil" "log" "net/http" ) -func (galactus *GalactusClient) ModifyUsers(guildID, connectCode string, request task.UserModifyRequest, lock *redislock.Lock) *task.MuteDeafenSuccessCounts { +func (galactus *GalactusClient) ModifyUsers(guildID, connectCode string, request discord.UserModifyRequest, lock *redislock.Lock) *discord.MuteDeafenSuccessCounts { if lock != nil { defer lock.Release(context.Background()) } @@ -35,7 +35,7 @@ func (galactus *GalactusClient) ModifyUsers(guildID, connectCode string, request return nil } - mds := task.MuteDeafenSuccessCounts{} + mds := discord.MuteDeafenSuccessCounts{} jBytes, err = ioutil.ReadAll(resp.Body) if err != nil { log.Println(err) From ad8d1b6a8220256dff793602b583370196a7282f Mon Sep 17 00:00:00 2001 From: denverquane Date: Sun, 17 Jan 2021 00:33:45 -0700 Subject: [PATCH 16/50] Added capture message listeners based on connect code --- pkg/client/client.go | 80 ++++++++++++++++++++++++++++++++------------ 1 file changed, 58 insertions(+), 22 deletions(-) diff --git a/pkg/client/client.go b/pkg/client/client.go index dc1f9f7..7c0c187 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -16,17 +16,21 @@ import ( ) type GalactusClient struct { - Address string - logger *zap.Logger - client http.Client - killChannel chan struct{} + Address string + logger *zap.Logger + client http.Client + + // we'll have capture channels for every relevant connect code + captureKillChannels map[string]chan struct{} + discordKillChannel chan struct{} + messageCreateHandlers []func(m discordgo.MessageCreate) messageReactionAddHandlers []func(m discordgo.MessageReactionAdd) voiceStateUpdateHandlers []func(m discordgo.VoiceStateUpdate) guildDeleteHandlers []func(m discordgo.GuildDelete) guildCreateHandlers []func(m discordgo.GuildCreate) - genericCaptureHandlers []func(msg capture_message.CaptureMessage) + genericCaptureHandlers map[string][]func(msg capture_message.CaptureMessage) } func NewGalactusClient(address string, logger *zap.Logger) (*GalactusClient, error) { @@ -36,13 +40,15 @@ func NewGalactusClient(address string, logger *zap.Logger) (*GalactusClient, err client: http.Client{ // Note: any relevant config here }, - killChannel: nil, + captureKillChannels: make(map[string]chan struct{}), + discordKillChannel: nil, + messageCreateHandlers: make([]func(m discordgo.MessageCreate), 0), messageReactionAddHandlers: make([]func(m discordgo.MessageReactionAdd), 0), voiceStateUpdateHandlers: make([]func(m discordgo.VoiceStateUpdate), 0), guildDeleteHandlers: make([]func(m discordgo.GuildDelete), 0), guildCreateHandlers: make([]func(m discordgo.GuildCreate), 0), - genericCaptureHandlers: make([]func(m capture_message.CaptureMessage), 0), + genericCaptureHandlers: make(map[string][]func(m capture_message.CaptureMessage)), } r, err := http.Get(gc.Address + "/") if err != nil { @@ -64,22 +70,31 @@ const ( ) func (galactus *GalactusClient) StartPolling(pollingType PollingType, connectCode string) error { - if galactus.killChannel != nil { - return errors.New("client is already polling") - } + var channel chan struct{} if pollingType == CapturePolling { valid, err := validate.ValidConnectCode(connectCode) if !valid { return err } + if _, ok := galactus.captureKillChannels[connectCode]; ok { + return errors.New("already polling for capture events for connect code " + connectCode) + } + galactus.captureKillChannels[connectCode] = make(chan struct{}) + channel = galactus.captureKillChannels[connectCode] + } else { + if galactus.discordKillChannel != nil { + return errors.New("already polling for discord events") + } + galactus.discordKillChannel = make(chan struct{}) + channel = galactus.discordKillChannel } - galactus.killChannel = make(chan struct{}) + connected := false go func() { for { select { - case <-galactus.killChannel: + case <-channel: return default: @@ -96,7 +111,7 @@ func (galactus *GalactusClient) StartPolling(pollingType PollingType, connectCod zap.String("url", url)) break } - req.Cancel = galactus.killChannel + req.Cancel = channel response, err := http.DefaultClient.Do(req) if err != nil { @@ -137,7 +152,7 @@ func (galactus *GalactusClient) StartPolling(pollingType PollingType, connectCod zap.Error(err), zap.ByteString("message", body)) } else { - galactus.dispatchCaptureMessage(msg) + galactus.dispatchCaptureMessage(connectCode, msg) } } @@ -215,15 +230,30 @@ func (galactus *GalactusClient) dispatchDiscordMessage(msg discord_message.Disco } } -func (galactus *GalactusClient) dispatchCaptureMessage(msg capture_message.CaptureMessage) { - for _, v := range galactus.genericCaptureHandlers { - v(msg) +func (galactus *GalactusClient) dispatchCaptureMessage(connectCode string, msg capture_message.CaptureMessage) { + if handlers, ok := galactus.genericCaptureHandlers[connectCode]; ok { + for _, v := range handlers { + v(msg) + } } } -func (galactus *GalactusClient) StopPolling() { - if galactus.killChannel != nil { - galactus.killChannel <- struct{}{} +func (galactus *GalactusClient) StopCapturePolling(connectCode string) { + if galactus.captureKillChannels[connectCode] != nil { + galactus.captureKillChannels[connectCode] <- struct{}{} + } +} + +func (galactus *GalactusClient) StopDiscordPolling() { + if galactus.discordKillChannel != nil { + galactus.discordKillChannel <- struct{}{} + } +} + +func (galactus *GalactusClient) StopAllPolling() { + galactus.StopDiscordPolling() + for _, v := range galactus.captureKillChannels { + v <- struct{}{} } } @@ -256,8 +286,14 @@ func (galactus *GalactusClient) RegisterDiscordHandler(msgType discord_message.D return registered } -func (galactus *GalactusClient) RegisterCaptureHandler(f interface{}) bool { - galactus.genericCaptureHandlers = append(galactus.genericCaptureHandlers, f.(func(msg capture_message.CaptureMessage))) +func (galactus *GalactusClient) RegisterCaptureHandler(connectCode string, f interface{}) bool { + if handlers, ok := galactus.genericCaptureHandlers[connectCode]; ok { + handlers = append(handlers, f.(func(msg capture_message.CaptureMessage))) + galactus.genericCaptureHandlers[connectCode] = handlers + } else { + galactus.genericCaptureHandlers[connectCode] = make([]func(msg capture_message.CaptureMessage), 1) + galactus.genericCaptureHandlers[connectCode][0] = f.(func(msg capture_message.CaptureMessage)) + } galactus.logger.Info("generic capture message handler registered") return true } From bf2c07dd5b39079f87f9704cc303d8ede04517db Mon Sep 17 00:00:00 2001 From: denverquane Date: Sun, 17 Jan 2021 00:48:23 -0700 Subject: [PATCH 17/50] Added get_capture_task for client --- pkg/client/get_capture_task.go | 37 ++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkg/client/get_capture_task.go diff --git a/pkg/client/get_capture_task.go b/pkg/client/get_capture_task.go new file mode 100644 index 0000000..1ef5a6a --- /dev/null +++ b/pkg/client/get_capture_task.go @@ -0,0 +1,37 @@ +package galactus_client + +import ( + "bytes" + "encoding/json" + "errors" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/utils/pkg/discord" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusClient) GetCaptureTask(connectCode string) (*discord.ModifyTask, error) { + resp, err := galactus.client.Post(galactus.Address+endpoint.GetCaptureTaskPartial+connectCode, "application/json", bytes.NewBufferString("")) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + log.Println("error reading all bytes from resp body for getCaptureTask") + log.Println(err) + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 status code received for GetCaptureTask:") + return nil, err + } + + var task discord.ModifyTask + err = json.Unmarshal(respBytes, &task) + if err != nil { + return nil, err + } + return &task, nil +} From 16c91772b261a357ae5e8e8591505423bfb0d20d Mon Sep 17 00:00:00 2001 From: denverquane Date: Sun, 17 Jan 2021 01:45:18 -0700 Subject: [PATCH 18/50] Polling cleanup, added capture event get methods --- go.mod | 4 +- go.sum | 2 + internal/galactus/get_capture_event.go | 55 ++++++++++++++++++++++++++ internal/galactus/server.go | 3 ++ pkg/client/client.go | 10 +++-- pkg/client/get_capture_event.go | 37 +++++++++++++++++ pkg/endpoint/endpoints.go | 3 ++ 7 files changed, 109 insertions(+), 5 deletions(-) create mode 100644 internal/galactus/get_capture_event.go create mode 100644 pkg/client/get_capture_event.go diff --git a/go.mod b/go.mod index b35adb7..7271697 100644 --- a/go.mod +++ b/go.mod @@ -17,5 +17,5 @@ require ( go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.16.0 ) - -replace github.com/automuteus/utils v0.0.10 => github.com/automuteus/utils v0.0.11-0.20210117015211-09544f155513 +// TODO replace when V7 comes out +replace github.com/automuteus/utils v0.0.10 => github.com/automuteus/utils v0.0.11-0.20210117083518-7f1a542914b9 diff --git a/go.sum b/go.sum index 3088216..b27fe11 100644 --- a/go.sum +++ b/go.sum @@ -26,6 +26,8 @@ github.com/automuteus/utils v0.0.11-0.20210116220058-40ad795561c0 h1:XmGntgGGBNk github.com/automuteus/utils v0.0.11-0.20210116220058-40ad795561c0/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= github.com/automuteus/utils v0.0.11-0.20210117015211-09544f155513 h1:PjaCnn/wyjvLNAKGJbio6KYFnJLq5+pJr1YZ1JeAhOc= github.com/automuteus/utils v0.0.11-0.20210117015211-09544f155513/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= +github.com/automuteus/utils v0.0.11-0.20210117083518-7f1a542914b9 h1:BE1YZQbHohq3VmnhMb4wSggEBZ+doClDH2ZELAH/oRE= +github.com/automuteus/utils v0.0.11-0.20210117083518-7f1a542914b9/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= github.com/bsm/redislock v0.7.0 h1:RL7aZJhCKkuBjQbnSTKCeedTRifBWxd/ffP+GZ599Mo= github.com/bsm/redislock v0.7.0/go.mod h1:3Kgu+cXw0JrkZ5pmY/JbcFpixGZ5M9v9G2PGWYqku+k= github.com/bwmarrin/discordgo v0.22.0/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= diff --git a/internal/galactus/get_capture_event.go b/internal/galactus/get_capture_event.go new file mode 100644 index 0000000..1d440a3 --- /dev/null +++ b/internal/galactus/get_capture_event.go @@ -0,0 +1,55 @@ +package galactus + +import ( + "context" + "errors" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "github.com/automuteus/utils/pkg/capture" + "github.com/go-redis/redis/v8" + "go.uber.org/zap" + "net/http" + "time" +) + +func (galactus *GalactusAPI) GetCaptureEventHandler(timeout time.Duration) func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + connectCode := validate.ConnectCodeAndRespond(galactus.logger, w, r, endpoint.GetCaptureEventFull) + if connectCode == "" { + return + } + + msg, err := capture.PopRawEvent(context.Background(), galactus.client, connectCode, timeout) + + // no jobs available + switch { + case errors.Is(err, redis.Nil): + w.WriteHeader(http.StatusAccepted) + w.Write([]byte("{\"status\": \"No capture client events available\"}")) + return + case err != nil: + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte("{\"error\": \"" + err.Error() + "\"}")) + galactus.logger.Error("redis error when popping capture event", + zap.String("endpoint", endpoint.GetCaptureEventFull), + zap.Error(err)) + return + case msg == "": + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte("{\"error\": \"Nil capture task returned, despite no Redis errors\"}")) + galactus.logger.Error("nil capture task returned, despite no Redis errors", + zap.String("endpoint", endpoint.GetCaptureEventFull)) + return + } + + w.WriteHeader(http.StatusOK) + + _, err = w.Write([]byte(msg)) + if err != nil { + galactus.logger.Error("failed to write capture event as HTTP response", + zap.String("endpoint", endpoint.GetCaptureEventFull), + zap.Error(err), + ) + } + } +} diff --git a/internal/galactus/server.go b/internal/galactus/server.go index a06e827..332120a 100644 --- a/internal/galactus/server.go +++ b/internal/galactus/server.go @@ -190,6 +190,9 @@ func (galactus *GalactusAPI) Run(port string, maxWorkers int, captureAckTimeout r.HandleFunc(endpoint.GetCaptureTaskFull, galactus.GetCaptureTaskHandler(taskTimeout)).Methods("POST") r.HandleFunc(endpoint.SetCaptureTaskStatusFull, galactus.SetCaptureTaskStatusHandler()).Methods("POST") + r.HandleFunc(endpoint.AddCaptureEventFull, galactus.AddCaptureEventHandler()).Methods("POST") + r.HandleFunc(endpoint.GetCaptureEventFull, galactus.GetCaptureEventHandler(taskTimeout)).Methods("POST") + r.HandleFunc(endpoint.RequestJob, galactus.requestJobHandler(taskTimeout)).Methods("POST") galactus.logger.Info("galactus is running", diff --git a/pkg/client/client.go b/pkg/client/client.go index 7c0c187..29cb662 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -90,11 +90,13 @@ func (galactus *GalactusClient) StartPolling(pollingType PollingType, connectCod } connected := false + requestCancelChannel := make(chan struct{}) go func() { for { select { case <-channel: + requestCancelChannel <- struct{}{} return default: @@ -111,7 +113,7 @@ func (galactus *GalactusClient) StartPolling(pollingType PollingType, connectCod zap.String("url", url)) break } - req.Cancel = channel + req.Cancel = requestCancelChannel response, err := http.DefaultClient.Do(req) if err != nil { @@ -242,18 +244,20 @@ func (galactus *GalactusClient) StopCapturePolling(connectCode string) { if galactus.captureKillChannels[connectCode] != nil { galactus.captureKillChannels[connectCode] <- struct{}{} } + delete(galactus.captureKillChannels, connectCode) } func (galactus *GalactusClient) StopDiscordPolling() { if galactus.discordKillChannel != nil { galactus.discordKillChannel <- struct{}{} } + galactus.discordKillChannel = nil } func (galactus *GalactusClient) StopAllPolling() { galactus.StopDiscordPolling() - for _, v := range galactus.captureKillChannels { - v <- struct{}{} + for i := range galactus.captureKillChannels { + galactus.StopCapturePolling(i) } } diff --git a/pkg/client/get_capture_event.go b/pkg/client/get_capture_event.go new file mode 100644 index 0000000..a3793f1 --- /dev/null +++ b/pkg/client/get_capture_event.go @@ -0,0 +1,37 @@ +package galactus_client + +import ( + "bytes" + "encoding/json" + "errors" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/utils/pkg/capture" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusClient) GetCaptureEvent(connectCode string) (*capture.Event, error) { + resp, err := galactus.client.Post(galactus.Address+endpoint.GetCaptureEventPartial+connectCode, "application/json", bytes.NewBufferString("")) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + log.Println("error reading all bytes from resp body for getCaptureEvent") + log.Println(err) + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 status code received for GetCaptureEvent:") + return nil, err + } + + var event capture.Event + err = json.Unmarshal(respBytes, &event) + if err != nil { + return nil, err + } + return &event, nil +} diff --git a/pkg/endpoint/endpoints.go b/pkg/endpoint/endpoints.go index f463a30..99bc9d2 100644 --- a/pkg/endpoint/endpoints.go +++ b/pkg/endpoint/endpoints.go @@ -6,6 +6,9 @@ const JobCount = "/totalJobs" const AddCaptureEventPartial = "/addCaptureEvent/" const AddCaptureEventFull = AddCaptureEventPartial + "{connectCode}/{eventType}" +const GetCaptureEventPartial = "/getCaptureEvent/" +const GetCaptureEventFull = GetCaptureEventPartial + "{connectCode}" + const GetCaptureTaskPartial = "/getCaptureTask/" const GetCaptureTaskFull = GetCaptureTaskPartial + "{connectCode}" From 35f4242f3571d7e305c54769e20107152426d671 Mon Sep 17 00:00:00 2001 From: denverquane Date: Sun, 17 Jan 2021 01:57:55 -0700 Subject: [PATCH 19/50] Removed unneeded capture_message type --- pkg/capture_message/message.go | 8 -------- pkg/client/add_capture_event.go | 8 ++++---- pkg/client/client.go | 18 +++++++++--------- 3 files changed, 13 insertions(+), 21 deletions(-) delete mode 100644 pkg/capture_message/message.go diff --git a/pkg/capture_message/message.go b/pkg/capture_message/message.go deleted file mode 100644 index 5d8e86f..0000000 --- a/pkg/capture_message/message.go +++ /dev/null @@ -1,8 +0,0 @@ -package capture_message - -import "github.com/automuteus/utils/pkg/capture" - -type CaptureMessage struct { - MessageType capture.EventType - Data []byte -} diff --git a/pkg/client/add_capture_event.go b/pkg/client/add_capture_event.go index 9d0e5cd..dd62705 100644 --- a/pkg/client/add_capture_event.go +++ b/pkg/client/add_capture_event.go @@ -3,16 +3,16 @@ package galactus_client import ( "bytes" "fmt" - "github.com/automuteus/galactus/pkg/capture_message" "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/utils/pkg/capture" "io/ioutil" "log" "net/http" ) -func (galactus *GalactusClient) AddCaptureEvent(connectCode string, event capture_message.CaptureMessage) error { - url := fmt.Sprintf("%s%s/%d", galactus.Address+endpoint.AddCaptureEventPartial, connectCode, event.MessageType) - resp, err := galactus.client.Post(url, "application/json", bytes.NewBuffer(event.Data)) +func (galactus *GalactusClient) AddCaptureEvent(connectCode string, event capture.Event) error { + url := fmt.Sprintf("%s%s/%d", galactus.Address+endpoint.AddCaptureEventPartial, connectCode, event.EventType) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBuffer(event.Payload.([]byte))) if err != nil { return err } diff --git a/pkg/client/client.go b/pkg/client/client.go index 29cb662..1ada628 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -4,10 +4,10 @@ import ( "bytes" "encoding/json" "errors" - "github.com/automuteus/galactus/pkg/capture_message" "github.com/automuteus/galactus/pkg/discord_message" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" + "github.com/automuteus/utils/pkg/capture" "github.com/bwmarrin/discordgo" "go.uber.org/zap" "io/ioutil" @@ -30,7 +30,7 @@ type GalactusClient struct { guildDeleteHandlers []func(m discordgo.GuildDelete) guildCreateHandlers []func(m discordgo.GuildCreate) - genericCaptureHandlers map[string][]func(msg capture_message.CaptureMessage) + genericCaptureHandlers map[string][]func(msg capture.Event) } func NewGalactusClient(address string, logger *zap.Logger) (*GalactusClient, error) { @@ -48,7 +48,7 @@ func NewGalactusClient(address string, logger *zap.Logger) (*GalactusClient, err voiceStateUpdateHandlers: make([]func(m discordgo.VoiceStateUpdate), 0), guildDeleteHandlers: make([]func(m discordgo.GuildDelete), 0), guildCreateHandlers: make([]func(m discordgo.GuildCreate), 0), - genericCaptureHandlers: make(map[string][]func(m capture_message.CaptureMessage)), + genericCaptureHandlers: make(map[string][]func(m capture.Event)), } r, err := http.Get(gc.Address + "/") if err != nil { @@ -105,7 +105,7 @@ func (galactus *GalactusClient) StartPolling(pollingType PollingType, connectCod case DiscordPolling: url = galactus.Address + endpoint.RequestJob case CapturePolling: - url = galactus.Address + endpoint.GetCaptureTaskPartial + connectCode + url = galactus.Address + endpoint.GetCaptureEventPartial + connectCode } req, err := http.NewRequest("POST", url, bytes.NewBufferString("")) if err != nil { @@ -147,7 +147,7 @@ func (galactus *GalactusClient) StartPolling(pollingType PollingType, connectCod galactus.dispatchDiscordMessage(msg) } case CapturePolling: - var msg capture_message.CaptureMessage + var msg capture.Event err := json.Unmarshal(body, &msg) if err != nil { galactus.logger.Error("error unmarshalling capture message from galactus", @@ -232,7 +232,7 @@ func (galactus *GalactusClient) dispatchDiscordMessage(msg discord_message.Disco } } -func (galactus *GalactusClient) dispatchCaptureMessage(connectCode string, msg capture_message.CaptureMessage) { +func (galactus *GalactusClient) dispatchCaptureMessage(connectCode string, msg capture.Event) { if handlers, ok := galactus.genericCaptureHandlers[connectCode]; ok { for _, v := range handlers { v(msg) @@ -292,11 +292,11 @@ func (galactus *GalactusClient) RegisterDiscordHandler(msgType discord_message.D func (galactus *GalactusClient) RegisterCaptureHandler(connectCode string, f interface{}) bool { if handlers, ok := galactus.genericCaptureHandlers[connectCode]; ok { - handlers = append(handlers, f.(func(msg capture_message.CaptureMessage))) + handlers = append(handlers, f.(func(msg capture.Event))) galactus.genericCaptureHandlers[connectCode] = handlers } else { - galactus.genericCaptureHandlers[connectCode] = make([]func(msg capture_message.CaptureMessage), 1) - galactus.genericCaptureHandlers[connectCode][0] = f.(func(msg capture_message.CaptureMessage)) + galactus.genericCaptureHandlers[connectCode] = make([]func(msg capture.Event), 1) + galactus.genericCaptureHandlers[connectCode][0] = f.(func(msg capture.Event)) } galactus.logger.Info("generic capture message handler registered") return true From 5d779fcd864b6ba94c84c3e98f10a79569f1140d Mon Sep 17 00:00:00 2001 From: denverquane Date: Sun, 17 Jan 2021 02:08:20 -0700 Subject: [PATCH 20/50] Updated event payload type --- go.mod | 3 ++- go.sum | 2 ++ pkg/client/add_capture_event.go | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 7271697..7b0562c 100644 --- a/go.mod +++ b/go.mod @@ -17,5 +17,6 @@ require ( go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.16.0 ) + // TODO replace when V7 comes out -replace github.com/automuteus/utils v0.0.10 => github.com/automuteus/utils v0.0.11-0.20210117083518-7f1a542914b9 +replace github.com/automuteus/utils v0.0.10 => github.com/automuteus/utils v0.0.11-0.20210117090606-d48d8a0c6a4b diff --git a/go.sum b/go.sum index b27fe11..3e28838 100644 --- a/go.sum +++ b/go.sum @@ -28,6 +28,8 @@ github.com/automuteus/utils v0.0.11-0.20210117015211-09544f155513 h1:PjaCnn/wyjv github.com/automuteus/utils v0.0.11-0.20210117015211-09544f155513/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= github.com/automuteus/utils v0.0.11-0.20210117083518-7f1a542914b9 h1:BE1YZQbHohq3VmnhMb4wSggEBZ+doClDH2ZELAH/oRE= github.com/automuteus/utils v0.0.11-0.20210117083518-7f1a542914b9/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= +github.com/automuteus/utils v0.0.11-0.20210117090606-d48d8a0c6a4b h1:5WCoZsyNqCvAQQ3Sr4Xgb90IFzMZooXA/VgWJ03OHEU= +github.com/automuteus/utils v0.0.11-0.20210117090606-d48d8a0c6a4b/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= github.com/bsm/redislock v0.7.0 h1:RL7aZJhCKkuBjQbnSTKCeedTRifBWxd/ffP+GZ599Mo= github.com/bsm/redislock v0.7.0/go.mod h1:3Kgu+cXw0JrkZ5pmY/JbcFpixGZ5M9v9G2PGWYqku+k= github.com/bwmarrin/discordgo v0.22.0/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= diff --git a/pkg/client/add_capture_event.go b/pkg/client/add_capture_event.go index dd62705..5e350c6 100644 --- a/pkg/client/add_capture_event.go +++ b/pkg/client/add_capture_event.go @@ -12,7 +12,7 @@ import ( func (galactus *GalactusClient) AddCaptureEvent(connectCode string, event capture.Event) error { url := fmt.Sprintf("%s%s/%d", galactus.Address+endpoint.AddCaptureEventPartial, connectCode, event.EventType) - resp, err := galactus.client.Post(url, "application/json", bytes.NewBuffer(event.Payload.([]byte))) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBuffer(event.Payload)) if err != nil { return err } From cf6b3211c19db2336e6ad4005bc9245e88a0b5a9 Mon Sep 17 00:00:00 2001 From: denverquane Date: Mon, 18 Jan 2021 23:09:00 -0700 Subject: [PATCH 21/50] Consolidated files, added subrouters and base routes --- internal/galactus/add_capture_event.go | 59 ---- internal/galactus/add_reaction.go | 50 ---- internal/galactus/capture.go | 188 +++++++++++++ internal/galactus/capture_task_status.go | 51 ---- internal/galactus/create_guild_emoji.go | 78 ------ internal/galactus/delete_message.go | 52 ---- internal/galactus/edit_message_embed.go | 86 ------ internal/galactus/get_capture_event.go | 55 ---- internal/galactus/get_capture_task.go | 54 ---- internal/galactus/get_guild.go | 59 ---- internal/galactus/get_guild_channels.go | 55 ---- internal/galactus/get_guild_emojis.go | 55 ---- internal/galactus/get_guild_member.go | 57 ---- internal/galactus/get_guild_roles.go | 55 ---- internal/galactus/guild.go | 310 ++++++++++++++++++++++ internal/galactus/message.go | 263 ++++++++++++++++++ internal/galactus/modify.go | 4 +- internal/galactus/reaction.go | 137 ++++++++++ internal/galactus/remove_all_reactions.go | 43 --- internal/galactus/remove_reaction.go | 63 ----- internal/galactus/send_message.go | 73 ----- internal/galactus/send_message_embed.go | 86 ------ internal/galactus/server.go | 64 ++--- pkg/client/add_capture_event.go | 31 --- pkg/client/add_reaction.go | 28 -- pkg/client/capture.go | 117 ++++++++ pkg/client/capture_task_status.go | 28 -- pkg/client/create_guild_emoji.go | 37 --- pkg/client/create_user_channel.go | 13 +- pkg/client/delete_message.go | 27 -- pkg/client/edit_message.go | 36 --- pkg/client/get_capture_event.go | 37 --- pkg/client/get_capture_task.go | 37 --- pkg/client/get_guild.go | 37 --- pkg/client/get_guild_channels.go | 37 --- pkg/client/get_guild_emojis.go | 37 --- pkg/client/get_guild_member.go | 37 --- pkg/client/get_guild_roles.go | 37 --- pkg/client/guild.go | 180 +++++++++++++ pkg/client/message.go | 116 ++++++++ pkg/client/modify.go | 21 +- pkg/client/reaction.go | 79 ++++++ pkg/client/remove_all_reactions.go | 28 -- pkg/client/remove_reaction.go | 28 -- pkg/client/send_message.go | 56 ---- pkg/endpoint/{endpoints.go => capture.go} | 7 +- pkg/endpoint/discord.go | 5 +- pkg/endpoint/general.go | 3 + pkg/endpoint/settings.go | 6 + pkg/endpoint/stats.go | 3 + pkg/endpoint/url.go | 9 + 51 files changed, 1474 insertions(+), 1640 deletions(-) delete mode 100644 internal/galactus/add_capture_event.go delete mode 100644 internal/galactus/add_reaction.go create mode 100644 internal/galactus/capture.go delete mode 100644 internal/galactus/capture_task_status.go delete mode 100644 internal/galactus/create_guild_emoji.go delete mode 100644 internal/galactus/delete_message.go delete mode 100644 internal/galactus/edit_message_embed.go delete mode 100644 internal/galactus/get_capture_event.go delete mode 100644 internal/galactus/get_capture_task.go delete mode 100644 internal/galactus/get_guild.go delete mode 100644 internal/galactus/get_guild_channels.go delete mode 100644 internal/galactus/get_guild_emojis.go delete mode 100644 internal/galactus/get_guild_member.go delete mode 100644 internal/galactus/get_guild_roles.go create mode 100644 internal/galactus/guild.go create mode 100644 internal/galactus/message.go create mode 100644 internal/galactus/reaction.go delete mode 100644 internal/galactus/remove_all_reactions.go delete mode 100644 internal/galactus/remove_reaction.go delete mode 100644 internal/galactus/send_message.go delete mode 100644 internal/galactus/send_message_embed.go delete mode 100644 pkg/client/add_capture_event.go delete mode 100644 pkg/client/add_reaction.go create mode 100644 pkg/client/capture.go delete mode 100644 pkg/client/capture_task_status.go delete mode 100644 pkg/client/create_guild_emoji.go delete mode 100644 pkg/client/delete_message.go delete mode 100644 pkg/client/edit_message.go delete mode 100644 pkg/client/get_capture_event.go delete mode 100644 pkg/client/get_capture_task.go delete mode 100644 pkg/client/get_guild.go delete mode 100644 pkg/client/get_guild_channels.go delete mode 100644 pkg/client/get_guild_emojis.go delete mode 100644 pkg/client/get_guild_member.go delete mode 100644 pkg/client/get_guild_roles.go create mode 100644 pkg/client/guild.go create mode 100644 pkg/client/message.go create mode 100644 pkg/client/reaction.go delete mode 100644 pkg/client/remove_all_reactions.go delete mode 100644 pkg/client/remove_reaction.go delete mode 100644 pkg/client/send_message.go rename pkg/endpoint/{endpoints.go => capture.go} (82%) create mode 100644 pkg/endpoint/general.go create mode 100644 pkg/endpoint/settings.go create mode 100644 pkg/endpoint/stats.go create mode 100644 pkg/endpoint/url.go diff --git a/internal/galactus/add_capture_event.go b/internal/galactus/add_capture_event.go deleted file mode 100644 index 569ed94..0000000 --- a/internal/galactus/add_capture_event.go +++ /dev/null @@ -1,59 +0,0 @@ -package galactus - -import ( - "context" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/automuteus/galactus/pkg/validate" - "github.com/automuteus/utils/pkg/capture" - "go.uber.org/zap" - "io/ioutil" - "net/http" -) - -func (galactus *GalactusAPI) AddCaptureEventHandler() func(w http.ResponseWriter, r *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - connectCode := validate.ConnectCodeAndRespond(galactus.logger, w, r, endpoint.AddCaptureEventFull) - if connectCode == "" { - return - } - - valid, eventType := validate.EventTypeAndRespond(galactus.logger, w, r, endpoint.AddCaptureEventFull) - if !valid { - errMsg := "invalid eventType provided" - galactus.logger.Error(errMsg, - zap.Int("eventType", int(eventType)), - ) - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte(errMsg)) - return - } - - body, err := ioutil.ReadAll(r.Body) - if err != nil { - errMsg := "could not read http body with error" - galactus.logger.Error(errMsg, - zap.Error(err), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - defer r.Body.Close() - - // TODO more validation on the payload here? - - err = capture.PushEvent(context.Background(), galactus.client, connectCode, eventType, string(body)) - if err != nil { - errMsg := "error pushing capture job to Redis" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("body", string(body)), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - - w.WriteHeader(http.StatusOK) - } -} diff --git a/internal/galactus/add_reaction.go b/internal/galactus/add_reaction.go deleted file mode 100644 index dea9d5e..0000000 --- a/internal/galactus/add_reaction.go +++ /dev/null @@ -1,50 +0,0 @@ -package galactus - -import ( - "github.com/automuteus/galactus/internal/galactus/shard_manager" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/automuteus/galactus/pkg/validate" - "github.com/gorilla/mux" - "go.uber.org/zap" - "net/http" -) - -func (galactus *GalactusAPI) AddReactionHandler() func(w http.ResponseWriter, r *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - channelID, messageID := validate.ChannelAndMessageIDsAndRespond(galactus.logger, w, r, endpoint.AddReactionFull) - if channelID == "" || messageID == "" { - return - } - - // manually fetch the emojiID, because it can be a non-numeric/snowflake Unicode emoji - - vars := mux.Vars(r) - emojiID := vars["emojiID"] - - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for addReaction" - galactus.logger.Error(errMsg, - zap.Error(err), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - err = sess.MessageReactionAdd(channelID, messageID, emojiID) - if err != nil { - errMsg := "failed to addReaction" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("channelID", channelID), - zap.String("messageID", messageID), - zap.String("emojiID", emojiID), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - - w.WriteHeader(http.StatusOK) - } -} diff --git a/internal/galactus/capture.go b/internal/galactus/capture.go new file mode 100644 index 0000000..0cc0c82 --- /dev/null +++ b/internal/galactus/capture.go @@ -0,0 +1,188 @@ +package galactus + +import ( + "context" + "errors" + redisutils "github.com/automuteus/galactus/internal/redis" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "github.com/automuteus/utils/pkg/capture" + "github.com/automuteus/utils/pkg/rediskey" + "github.com/go-redis/redis/v8" + "go.uber.org/zap" + "io/ioutil" + "log" + "net/http" + "time" +) + +func (galactus *GalactusAPI) AddCaptureEventHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + connectCode := validate.ConnectCodeAndRespond(galactus.logger, w, r, endpoint.AddCaptureEventFull) + if connectCode == "" { + return + } + + valid, eventType := validate.EventTypeAndRespond(galactus.logger, w, r, endpoint.AddCaptureEventFull) + if !valid { + errMsg := "invalid eventType provided" + galactus.logger.Error(errMsg, + zap.Int("eventType", int(eventType)), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg)) + return + } + + body, err := ioutil.ReadAll(r.Body) + if err != nil { + errMsg := "could not read http body with error" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + defer r.Body.Close() + + // TODO more validation on the payload here? + + err = capture.PushEvent(context.Background(), galactus.client, connectCode, eventType, string(body)) + if err != nil { + errMsg := "error pushing capture job to Redis" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("body", string(body)), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + w.WriteHeader(http.StatusOK) + } +} + +func (galactus *GalactusAPI) GetCaptureEventHandler(timeout time.Duration) func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + connectCode := validate.ConnectCodeAndRespond(galactus.logger, w, r, endpoint.GetCaptureEventFull) + if connectCode == "" { + return + } + + msg, err := capture.PopRawEvent(context.Background(), galactus.client, connectCode, timeout) + + // no jobs available + switch { + case errors.Is(err, redis.Nil): + w.WriteHeader(http.StatusAccepted) + w.Write([]byte("{\"status\": \"No capture client events available\"}")) + return + case err != nil: + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte("{\"error\": \"" + err.Error() + "\"}")) + galactus.logger.Error("redis error when popping capture event", + zap.String("endpoint", endpoint.GetCaptureEventFull), + zap.Error(err)) + return + case msg == "": + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte("{\"error\": \"Nil capture task returned, despite no Redis errors\"}")) + galactus.logger.Error("nil capture task returned, despite no Redis errors", + zap.String("endpoint", endpoint.GetCaptureEventFull)) + return + } + + w.WriteHeader(http.StatusOK) + + _, err = w.Write([]byte(msg)) + if err != nil { + galactus.logger.Error("failed to write capture event as HTTP response", + zap.String("endpoint", endpoint.GetCaptureEventFull), + zap.Error(err), + ) + } + } +} + +func (galactus *GalactusAPI) GetCaptureTaskHandler(taskTimeout time.Duration) func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + connectCode := validate.ConnectCodeAndRespond(galactus.logger, w, r, endpoint.GetCaptureTaskFull) + if connectCode == "" { + return + } + + msg, err := redisutils.PopRawCaptureClientTask(galactus.client, connectCode, taskTimeout) + + // no jobs available + switch { + case errors.Is(err, redis.Nil): + w.WriteHeader(http.StatusAccepted) + w.Write([]byte("{\"status\": \"No capture client tasks available\"}")) + return + case err != nil: + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte("{\"error\": \"" + err.Error() + "\"}")) + galactus.logger.Error("redis error when popping capture task", + zap.String("endpoint", endpoint.GetCaptureTaskFull), + zap.Error(err)) + return + case msg == "": + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte("{\"error\": \"Nil capture task returned, despite no Redis errors\"}")) + galactus.logger.Error("nil capture task returned, despite no Redis errors", + zap.String("endpoint", endpoint.GetCaptureTaskFull)) + return + } + + w.WriteHeader(http.StatusOK) + + _, err = w.Write([]byte(msg)) + if err != nil { + galactus.logger.Error("failed to write capture task as HTTP response", + zap.String("endpoint", endpoint.GetCaptureTaskFull), + zap.Error(err), + ) + } + } +} + +func (galactus *GalactusAPI) SetCaptureTaskStatusHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + taskID := validate.TaskIDAndRespond(galactus.logger, w, r, endpoint.SetCaptureTaskStatusFull) + if taskID == "" { + return + } + + body, err := ioutil.ReadAll(r.Body) + if err != nil { + log.Println(err) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(err.Error())) + return + } + defer r.Body.Close() + bodyStr := string(body) + var out string + + if bodyStr == "true" || bodyStr == "t" { + out = "true" + } else { + out = "false" + } + err = galactus.client.Publish(context.Background(), rediskey.CompleteTask(taskID), out).Err() + if err != nil { + errMsg := "failed to publish task status to Redis" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("taskID", taskID), + zap.String("value", out), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + w.WriteHeader(http.StatusOK) + } +} diff --git a/internal/galactus/capture_task_status.go b/internal/galactus/capture_task_status.go deleted file mode 100644 index 571a79d..0000000 --- a/internal/galactus/capture_task_status.go +++ /dev/null @@ -1,51 +0,0 @@ -package galactus - -import ( - "context" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/automuteus/galactus/pkg/validate" - "github.com/automuteus/utils/pkg/rediskey" - "go.uber.org/zap" - "io/ioutil" - "log" - "net/http" -) - -func (galactus *GalactusAPI) SetCaptureTaskStatusHandler() func(w http.ResponseWriter, r *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - taskID := validate.TaskIDAndRespond(galactus.logger, w, r, endpoint.SetCaptureTaskStatusFull) - if taskID == "" { - return - } - - body, err := ioutil.ReadAll(r.Body) - if err != nil { - log.Println(err) - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte(err.Error())) - return - } - defer r.Body.Close() - bodyStr := string(body) - var out string - - if bodyStr == "true" || bodyStr == "t" { - out = "true" - } else { - out = "false" - } - err = galactus.client.Publish(context.Background(), rediskey.CompleteTask(taskID), out).Err() - if err != nil { - errMsg := "failed to publish task status to Redis" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("taskID", taskID), - zap.String("value", out), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - w.WriteHeader(http.StatusOK) - } -} diff --git a/internal/galactus/create_guild_emoji.go b/internal/galactus/create_guild_emoji.go deleted file mode 100644 index 8e7fa59..0000000 --- a/internal/galactus/create_guild_emoji.go +++ /dev/null @@ -1,78 +0,0 @@ -package galactus - -import ( - "encoding/json" - "github.com/automuteus/galactus/internal/galactus/shard_manager" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/automuteus/galactus/pkg/validate" - "go.uber.org/zap" - "io/ioutil" - "log" - "net/http" -) - -func (galactus *GalactusAPI) CreateGuildEmojiHandler() func(w http.ResponseWriter, r *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - guildID := validate.GuildIDAndRespond(galactus.logger, w, r, endpoint.CreateGuildEmojiFull) - name := validate.NameAndRespond(galactus.logger, w, r, endpoint.CreateGuildEmojiFull) - if guildID == "" || name == "" { - return - } - - body, err := ioutil.ReadAll(r.Body) - if err != nil { - errMsg := "could not read http body with error" - galactus.logger.Error(errMsg, - zap.Error(err), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - defer r.Body.Close() - - // TODO perform some validation on the message body? - // ex message length, empty contents, etc - - // Addl. constraint for emojis: must be under 256kB - - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for sendMessageHandler" - galactus.logger.Error(errMsg, - zap.Error(err), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - - emoji, err := sess.GuildEmojiCreate(guildID, name, string(body), nil) - if err != nil { - errMsg := "error creating emoji for guild" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("guildID", guildID), - zap.String("name", name), - zap.String("emoji", string(body)), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - - // TODO metrics logging here - galactus.logger.Info("created emoji for guild", - zap.String("guildID", guildID), - zap.String("name", name), - zap.String("emoji", string(body)), - zap.String("emojiID", emoji.ID), - ) - w.WriteHeader(http.StatusOK) - jbytes, err := json.Marshal(emoji) - if err != nil { - log.Println(err) - } - w.Write(jbytes) - } -} diff --git a/internal/galactus/delete_message.go b/internal/galactus/delete_message.go deleted file mode 100644 index 0fe8228..0000000 --- a/internal/galactus/delete_message.go +++ /dev/null @@ -1,52 +0,0 @@ -package galactus - -import ( - "github.com/automuteus/galactus/internal/galactus/shard_manager" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/automuteus/galactus/pkg/validate" - "go.uber.org/zap" - "net/http" -) - -func (galactus *GalactusAPI) DeleteChannelMessageHandler() func(w http.ResponseWriter, r *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - channelID, messageID := validate.ChannelAndMessageIDsAndRespond(galactus.logger, w, r, endpoint.DeleteMessageFull) - if channelID == "" || messageID == "" { - return - } - - // TODO perform some validation on the message body? - // ex message length, empty contents, etc - - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for " + endpoint.DeleteMessageFull - galactus.logger.Error(errMsg, - zap.Error(err), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - err = sess.ChannelMessageDelete(channelID, messageID) - if err != nil { - errMsg := "error deleting message in channel" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("channelID", channelID), - zap.String("messageID", messageID), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - - // TODO metrics logging here - galactus.logger.Info("deleted message in channel", - zap.String("channelID", channelID), - zap.String("messageID", messageID), - ) - w.WriteHeader(http.StatusOK) - w.Write([]byte(messageID)) - } -} diff --git a/internal/galactus/edit_message_embed.go b/internal/galactus/edit_message_embed.go deleted file mode 100644 index 3e954a2..0000000 --- a/internal/galactus/edit_message_embed.go +++ /dev/null @@ -1,86 +0,0 @@ -package galactus - -import ( - "encoding/json" - "github.com/automuteus/galactus/internal/galactus/shard_manager" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/automuteus/galactus/pkg/validate" - "github.com/bwmarrin/discordgo" - "go.uber.org/zap" - "io/ioutil" - "log" - "net/http" -) - -func (galactus *GalactusAPI) EditMessageEmbedHandler() func(w http.ResponseWriter, r *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - channelID, messageID := validate.ChannelAndMessageIDsAndRespond(galactus.logger, w, r, endpoint.EditMessageEmbedFull) - if channelID == "" || messageID == "" { - return - } - - body, err := ioutil.ReadAll(r.Body) - if err != nil { - errMsg := "could not read http body with error" - galactus.logger.Error(errMsg, - zap.Error(err), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - defer r.Body.Close() - - var embed discordgo.MessageEmbed - err = json.Unmarshal(body, &embed) - if err != nil { - errMsg := "error unmarshalling discordMessageEmbed from JSON" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("body", string(body)), - ) - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - - // TODO perform some validation on the message body? - // ex message length, empty contents, etc - - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for " + endpoint.EditMessageEmbedFull - galactus.logger.Error(errMsg, - zap.Error(err), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - msg, err := sess.ChannelMessageEditEmbed(channelID, messageID, &embed) - if err != nil { - errMsg := "error editing message in channel" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("channelID", channelID), - zap.String("messageID", messageID), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - - // TODO metrics logging here - galactus.logger.Info("edited message in channel", - zap.String("channelID", channelID), - zap.String("messageID", messageID), - ) - w.WriteHeader(http.StatusOK) - - jbytes, err := json.Marshal(msg) - if err != nil { - log.Println(err) - } - w.Write(jbytes) - } -} diff --git a/internal/galactus/get_capture_event.go b/internal/galactus/get_capture_event.go deleted file mode 100644 index 1d440a3..0000000 --- a/internal/galactus/get_capture_event.go +++ /dev/null @@ -1,55 +0,0 @@ -package galactus - -import ( - "context" - "errors" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/automuteus/galactus/pkg/validate" - "github.com/automuteus/utils/pkg/capture" - "github.com/go-redis/redis/v8" - "go.uber.org/zap" - "net/http" - "time" -) - -func (galactus *GalactusAPI) GetCaptureEventHandler(timeout time.Duration) func(w http.ResponseWriter, r *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - connectCode := validate.ConnectCodeAndRespond(galactus.logger, w, r, endpoint.GetCaptureEventFull) - if connectCode == "" { - return - } - - msg, err := capture.PopRawEvent(context.Background(), galactus.client, connectCode, timeout) - - // no jobs available - switch { - case errors.Is(err, redis.Nil): - w.WriteHeader(http.StatusAccepted) - w.Write([]byte("{\"status\": \"No capture client events available\"}")) - return - case err != nil: - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte("{\"error\": \"" + err.Error() + "\"}")) - galactus.logger.Error("redis error when popping capture event", - zap.String("endpoint", endpoint.GetCaptureEventFull), - zap.Error(err)) - return - case msg == "": - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte("{\"error\": \"Nil capture task returned, despite no Redis errors\"}")) - galactus.logger.Error("nil capture task returned, despite no Redis errors", - zap.String("endpoint", endpoint.GetCaptureEventFull)) - return - } - - w.WriteHeader(http.StatusOK) - - _, err = w.Write([]byte(msg)) - if err != nil { - galactus.logger.Error("failed to write capture event as HTTP response", - zap.String("endpoint", endpoint.GetCaptureEventFull), - zap.Error(err), - ) - } - } -} diff --git a/internal/galactus/get_capture_task.go b/internal/galactus/get_capture_task.go deleted file mode 100644 index f42c2f7..0000000 --- a/internal/galactus/get_capture_task.go +++ /dev/null @@ -1,54 +0,0 @@ -package galactus - -import ( - "errors" - redisutils "github.com/automuteus/galactus/internal/redis" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/automuteus/galactus/pkg/validate" - "github.com/go-redis/redis/v8" - "go.uber.org/zap" - "net/http" - "time" -) - -func (galactus *GalactusAPI) GetCaptureTaskHandler(taskTimeout time.Duration) func(w http.ResponseWriter, r *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - connectCode := validate.ConnectCodeAndRespond(galactus.logger, w, r, endpoint.GetCaptureTaskFull) - if connectCode == "" { - return - } - - msg, err := redisutils.PopRawCaptureClientTask(galactus.client, connectCode, taskTimeout) - - // no jobs available - switch { - case errors.Is(err, redis.Nil): - w.WriteHeader(http.StatusAccepted) - w.Write([]byte("{\"status\": \"No capture client tasks available\"}")) - return - case err != nil: - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte("{\"error\": \"" + err.Error() + "\"}")) - galactus.logger.Error("redis error when popping capture task", - zap.String("endpoint", endpoint.GetCaptureTaskFull), - zap.Error(err)) - return - case msg == "": - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte("{\"error\": \"Nil capture task returned, despite no Redis errors\"}")) - galactus.logger.Error("nil capture task returned, despite no Redis errors", - zap.String("endpoint", endpoint.GetCaptureTaskFull)) - return - } - - w.WriteHeader(http.StatusOK) - - _, err = w.Write([]byte(msg)) - if err != nil { - galactus.logger.Error("failed to write capture task as HTTP response", - zap.String("endpoint", endpoint.GetCaptureTaskFull), - zap.Error(err), - ) - } - } -} diff --git a/internal/galactus/get_guild.go b/internal/galactus/get_guild.go deleted file mode 100644 index 14db485..0000000 --- a/internal/galactus/get_guild.go +++ /dev/null @@ -1,59 +0,0 @@ -package galactus - -import ( - "encoding/json" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/automuteus/galactus/pkg/validate" - "go.uber.org/zap" - "net/http" - "strconv" -) - -func (galactus *GalactusAPI) GetGuildHandler() func(w http.ResponseWriter, r *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - guildID := validate.GuildIDAndRespond(galactus.logger, w, r, endpoint.GetGuildFull) - if guildID == "" { - return - } - - id, err := strconv.ParseInt(guildID, 10, 64) - if err != nil { - errMsg := "failed to parse guildID as int64" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("guildID", guildID), - ) - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - sess := galactus.shardManager.SessionForGuild(id) - guild, err := sess.State.Guild(guildID) - if err != nil { - errMsg := "failed to fetch guild from session state" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("guildID", guildID), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - - // TODO fetch the guild with an actual API call here? if it fails via state? - - jBytes, err := json.Marshal(guild) - if err != nil { - errMsg := "failed to marshal guild to JSON" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("guildID", guildID), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - w.WriteHeader(http.StatusOK) - w.Write(jBytes) - } -} diff --git a/internal/galactus/get_guild_channels.go b/internal/galactus/get_guild_channels.go deleted file mode 100644 index 2817085..0000000 --- a/internal/galactus/get_guild_channels.go +++ /dev/null @@ -1,55 +0,0 @@ -package galactus - -import ( - "encoding/json" - "github.com/automuteus/galactus/internal/galactus/shard_manager" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/automuteus/galactus/pkg/validate" - "go.uber.org/zap" - "net/http" -) - -func (galactus *GalactusAPI) GetGuildChannelsHandler() func(w http.ResponseWriter, r *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - guildID := validate.GuildIDAndRespond(galactus.logger, w, r, endpoint.GetGuildChannelsFull) - if guildID == "" { - return - } - - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for getGuildChannels" - galactus.logger.Error(errMsg, - zap.Error(err), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - channels, err := sess.GuildChannels(guildID) - if err != nil { - errMsg := "failed to fetch guild channels" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("guildID", guildID), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - - jBytes, err := json.Marshal(channels) - if err != nil { - errMsg := "failed to marshal guild channels to JSON" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("guildID", guildID), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - w.WriteHeader(http.StatusOK) - w.Write(jBytes) - } -} diff --git a/internal/galactus/get_guild_emojis.go b/internal/galactus/get_guild_emojis.go deleted file mode 100644 index cf3e5c7..0000000 --- a/internal/galactus/get_guild_emojis.go +++ /dev/null @@ -1,55 +0,0 @@ -package galactus - -import ( - "encoding/json" - "github.com/automuteus/galactus/internal/galactus/shard_manager" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/automuteus/galactus/pkg/validate" - "go.uber.org/zap" - "net/http" -) - -func (galactus *GalactusAPI) GetGuildEmojisHandler() func(w http.ResponseWriter, r *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - guildID := validate.GuildIDAndRespond(galactus.logger, w, r, endpoint.GetGuildEmojisFull) - if guildID == "" { - return - } - - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for getGuildChannels" - galactus.logger.Error(errMsg, - zap.Error(err), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - emojis, err := sess.GuildEmojis(guildID) - if err != nil { - errMsg := "failed to fetch guild emojis" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("guildID", guildID), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - - jBytes, err := json.Marshal(emojis) - if err != nil { - errMsg := "failed to marshal guild emojis to JSON" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("guildID", guildID), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - w.WriteHeader(http.StatusOK) - w.Write(jBytes) - } -} diff --git a/internal/galactus/get_guild_member.go b/internal/galactus/get_guild_member.go deleted file mode 100644 index 4e24155..0000000 --- a/internal/galactus/get_guild_member.go +++ /dev/null @@ -1,57 +0,0 @@ -package galactus - -import ( - "encoding/json" - "github.com/automuteus/galactus/internal/galactus/shard_manager" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/automuteus/galactus/pkg/validate" - "go.uber.org/zap" - "net/http" -) - -func (galactus *GalactusAPI) GetGuildMemberHandler() func(w http.ResponseWriter, r *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - guildID, userID := validate.GuildAndUserIDsAndRespond(galactus.logger, w, r, endpoint.GetGuildMemberFull) - if guildID == "" || userID == "" { - return - } - - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for getGuildMember" - galactus.logger.Error(errMsg, - zap.Error(err), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - member, err := sess.GuildMember(guildID, userID) - if err != nil { - errMsg := "failed to fetch guild member" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("guildID", guildID), - zap.String("userID", userID), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - - jBytes, err := json.Marshal(member) - if err != nil { - errMsg := "failed to marshal guild member" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("guildID", guildID), - zap.String("userID", userID), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - w.WriteHeader(http.StatusOK) - w.Write(jBytes) - } -} diff --git a/internal/galactus/get_guild_roles.go b/internal/galactus/get_guild_roles.go deleted file mode 100644 index c32dfab..0000000 --- a/internal/galactus/get_guild_roles.go +++ /dev/null @@ -1,55 +0,0 @@ -package galactus - -import ( - "encoding/json" - "github.com/automuteus/galactus/internal/galactus/shard_manager" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/automuteus/galactus/pkg/validate" - "go.uber.org/zap" - "net/http" -) - -func (galactus *GalactusAPI) GetGuildRolesHandler() func(w http.ResponseWriter, r *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - guildID := validate.GuildIDAndRespond(galactus.logger, w, r, endpoint.GetGuildRolesFull) - if guildID == "" { - return - } - - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for getGuildRoles" - galactus.logger.Error(errMsg, - zap.Error(err), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - roles, err := sess.GuildRoles(guildID) - if err != nil { - errMsg := "failed to fetch guild roles" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("guildID", guildID), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - - jBytes, err := json.Marshal(roles) - if err != nil { - errMsg := "failed to marshal guild roles to JSON" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("guildID", guildID), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - w.WriteHeader(http.StatusOK) - w.Write(jBytes) - } -} diff --git a/internal/galactus/guild.go b/internal/galactus/guild.go new file mode 100644 index 0000000..2a98c18 --- /dev/null +++ b/internal/galactus/guild.go @@ -0,0 +1,310 @@ +package galactus + +import ( + "encoding/json" + "github.com/automuteus/galactus/internal/galactus/shard_manager" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "go.uber.org/zap" + "io/ioutil" + "log" + "net/http" + "strconv" +) + +func (galactus *GalactusAPI) GetGuildHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + guildID := validate.GuildIDAndRespond(galactus.logger, w, r, endpoint.GetGuildFull) + if guildID == "" { + return + } + + id, err := strconv.ParseInt(guildID, 10, 64) + if err != nil { + errMsg := "failed to parse guildID as int64" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + sess := galactus.shardManager.SessionForGuild(id) + guild, err := sess.State.Guild(guildID) + if err != nil { + errMsg := "failed to fetch guild from session state" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + // TODO fetch the guild with an actual API call here? if it fails via state? + + jBytes, err := json.Marshal(guild) + if err != nil { + errMsg := "failed to marshal guild to JSON" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + w.WriteHeader(http.StatusOK) + w.Write(jBytes) + } +} + +func (galactus *GalactusAPI) GetGuildChannelsHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + guildID := validate.GuildIDAndRespond(galactus.logger, w, r, endpoint.GetGuildChannelsFull) + if guildID == "" { + return + } + + sess, err := shard_manager.GetRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for getGuildChannels" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + channels, err := sess.GuildChannels(guildID) + if err != nil { + errMsg := "failed to fetch guild channels" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + jBytes, err := json.Marshal(channels) + if err != nil { + errMsg := "failed to marshal guild channels to JSON" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + w.WriteHeader(http.StatusOK) + w.Write(jBytes) + } +} + +func (galactus *GalactusAPI) GetGuildEmojisHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + guildID := validate.GuildIDAndRespond(galactus.logger, w, r, endpoint.GetGuildEmojisFull) + if guildID == "" { + return + } + + sess, err := shard_manager.GetRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for getGuildChannels" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + emojis, err := sess.GuildEmojis(guildID) + if err != nil { + errMsg := "failed to fetch guild emojis" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + jBytes, err := json.Marshal(emojis) + if err != nil { + errMsg := "failed to marshal guild emojis to JSON" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + w.WriteHeader(http.StatusOK) + w.Write(jBytes) + } +} + +func (galactus *GalactusAPI) GetGuildMemberHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + guildID, userID := validate.GuildAndUserIDsAndRespond(galactus.logger, w, r, endpoint.GetGuildMemberFull) + if guildID == "" || userID == "" { + return + } + + sess, err := shard_manager.GetRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for getGuildMember" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + member, err := sess.GuildMember(guildID, userID) + if err != nil { + errMsg := "failed to fetch guild member" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + zap.String("userID", userID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + jBytes, err := json.Marshal(member) + if err != nil { + errMsg := "failed to marshal guild member" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + zap.String("userID", userID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + w.WriteHeader(http.StatusOK) + w.Write(jBytes) + } +} + +func (galactus *GalactusAPI) GetGuildRolesHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + guildID := validate.GuildIDAndRespond(galactus.logger, w, r, endpoint.GetGuildRolesFull) + if guildID == "" { + return + } + + sess, err := shard_manager.GetRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for getGuildRoles" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + roles, err := sess.GuildRoles(guildID) + if err != nil { + errMsg := "failed to fetch guild roles" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + jBytes, err := json.Marshal(roles) + if err != nil { + errMsg := "failed to marshal guild roles to JSON" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + w.WriteHeader(http.StatusOK) + w.Write(jBytes) + } +} + +func (galactus *GalactusAPI) CreateGuildEmojiHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + guildID := validate.GuildIDAndRespond(galactus.logger, w, r, endpoint.CreateGuildEmojiFull) + name := validate.NameAndRespond(galactus.logger, w, r, endpoint.CreateGuildEmojiFull) + if guildID == "" || name == "" { + return + } + + body, err := ioutil.ReadAll(r.Body) + if err != nil { + errMsg := "could not read http body with error" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + defer r.Body.Close() + + // TODO perform some validation on the message body? + // ex message length, empty contents, etc + + // Addl. constraint for emojis: must be under 256kB + + sess, err := shard_manager.GetRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for sendMessageHandler" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + emoji, err := sess.GuildEmojiCreate(guildID, name, string(body), nil) + if err != nil { + errMsg := "error creating emoji for guild" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + zap.String("name", name), + zap.String("emoji", string(body)), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + // TODO metrics logging here + galactus.logger.Info("created emoji for guild", + zap.String("guildID", guildID), + zap.String("name", name), + zap.String("emoji", string(body)), + zap.String("emojiID", emoji.ID), + ) + w.WriteHeader(http.StatusOK) + jbytes, err := json.Marshal(emoji) + if err != nil { + log.Println(err) + } + w.Write(jbytes) + } +} diff --git a/internal/galactus/message.go b/internal/galactus/message.go new file mode 100644 index 0000000..c6bfbec --- /dev/null +++ b/internal/galactus/message.go @@ -0,0 +1,263 @@ +package galactus + +import ( + "encoding/json" + "github.com/automuteus/galactus/internal/galactus/shard_manager" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "github.com/bwmarrin/discordgo" + "go.uber.org/zap" + "io/ioutil" + "log" + "net/http" +) + +func (galactus *GalactusAPI) SendChannelMessageHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + channelID := validate.ChannelIDAndRespond(galactus.logger, w, r, endpoint.SendMessageFull) + if channelID == "" { + return + } + + body, err := ioutil.ReadAll(r.Body) + if err != nil { + errMsg := "could not read http body with error" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + defer r.Body.Close() + + // TODO perform some validation on the message body? + // ex message length, empty contents, etc + + sess, err := shard_manager.GetRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for sendMessageHandler" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + msg, err := sess.ChannelMessageSend(channelID, string(body)) + if err != nil { + errMsg := "error posting message to channel" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("channelID", channelID), + zap.String("contents", string(body)), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + // TODO metrics logging here + galactus.logger.Info("posted message to channel", + zap.String("channelID", channelID), + zap.String("contents", string(body)), + zap.String("messageID", msg.ID), + ) + w.WriteHeader(http.StatusOK) + jbytes, err := json.Marshal(msg) + if err != nil { + log.Println(err) + } + w.Write(jbytes) + } +} + +func (galactus *GalactusAPI) SendChannelMessageEmbedHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + channelID := validate.ChannelIDAndRespond(galactus.logger, w, r, endpoint.SendMessageEmbedFull) + if channelID == "" { + return + } + + body, err := ioutil.ReadAll(r.Body) + if err != nil { + errMsg := "could not read http body with error" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + defer r.Body.Close() + + var embed discordgo.MessageEmbed + err = json.Unmarshal(body, &embed) + if err != nil { + errMsg := "error unmarshalling discordMessageEmbed from JSON" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("body", string(body)), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + // TODO extra validation here (empty embed fields and the like) + + sess, err := shard_manager.GetRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for sendMessageEmbedHandler" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + msg, err := sess.ChannelMessageSendEmbed(channelID, &embed) + if err != nil { + errMsg := "error posting messageEmbed to channel" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("channelID", channelID), + zap.String("contents", string(body)), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + // TODO metrics logging here + galactus.logger.Info("posted messageEmbed to channel", + zap.String("channelID", channelID), + zap.String("contents", string(body)), + zap.String("messageID", msg.ID), + ) + w.WriteHeader(http.StatusOK) + jbytes, err := json.Marshal(msg) + if err != nil { + log.Println(err) + } + w.Write(jbytes) + } +} + +func (galactus *GalactusAPI) EditMessageEmbedHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + channelID, messageID := validate.ChannelAndMessageIDsAndRespond(galactus.logger, w, r, endpoint.EditMessageEmbedFull) + if channelID == "" || messageID == "" { + return + } + + body, err := ioutil.ReadAll(r.Body) + if err != nil { + errMsg := "could not read http body with error" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + defer r.Body.Close() + + var embed discordgo.MessageEmbed + err = json.Unmarshal(body, &embed) + if err != nil { + errMsg := "error unmarshalling discordMessageEmbed from JSON" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("body", string(body)), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + // TODO perform some validation on the message body? + // ex message length, empty contents, etc + + sess, err := shard_manager.GetRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for " + endpoint.EditMessageEmbedFull + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + msg, err := sess.ChannelMessageEditEmbed(channelID, messageID, &embed) + if err != nil { + errMsg := "error editing message in channel" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("channelID", channelID), + zap.String("messageID", messageID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + // TODO metrics logging here + galactus.logger.Info("edited message in channel", + zap.String("channelID", channelID), + zap.String("messageID", messageID), + ) + w.WriteHeader(http.StatusOK) + + jbytes, err := json.Marshal(msg) + if err != nil { + log.Println(err) + } + w.Write(jbytes) + } +} + +func (galactus *GalactusAPI) DeleteChannelMessageHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + channelID, messageID := validate.ChannelAndMessageIDsAndRespond(galactus.logger, w, r, endpoint.DeleteMessageFull) + if channelID == "" || messageID == "" { + return + } + + // TODO perform some validation on the message body? + // ex message length, empty contents, etc + + sess, err := shard_manager.GetRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for " + endpoint.DeleteMessageFull + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + err = sess.ChannelMessageDelete(channelID, messageID) + if err != nil { + errMsg := "error deleting message in channel" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("channelID", channelID), + zap.String("messageID", messageID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + // TODO metrics logging here + galactus.logger.Info("deleted message in channel", + zap.String("channelID", channelID), + zap.String("messageID", messageID), + ) + w.WriteHeader(http.StatusOK) + w.Write([]byte(messageID)) + } +} diff --git a/internal/galactus/modify.go b/internal/galactus/modify.go index 7c41ed0..7f8698c 100644 --- a/internal/galactus/modify.go +++ b/internal/galactus/modify.go @@ -17,8 +17,8 @@ import ( func (galactus *GalactusAPI) modifyUserHandler(maxWorkers int, taskTimeout time.Duration) func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) { - guildID := validate.GuildIDAndRespond(galactus.logger, w, r, endpoint.ModifyUserbyGuildConnectCode) - connectCode := validate.ConnectCodeAndRespond(galactus.logger, w, r, endpoint.ModifyUserbyGuildConnectCode) + guildID := validate.GuildIDAndRespond(galactus.logger, w, r, endpoint.ModifyUserFull) + connectCode := validate.ConnectCodeAndRespond(galactus.logger, w, r, endpoint.ModifyUserFull) if guildID == "" || connectCode == "" { return diff --git a/internal/galactus/reaction.go b/internal/galactus/reaction.go new file mode 100644 index 0000000..76832d0 --- /dev/null +++ b/internal/galactus/reaction.go @@ -0,0 +1,137 @@ +package galactus + +import ( + "github.com/automuteus/galactus/internal/galactus/shard_manager" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "github.com/gorilla/mux" + "go.uber.org/zap" + "net/http" +) + +func (galactus *GalactusAPI) AddReactionHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + channelID, messageID := validate.ChannelAndMessageIDsAndRespond(galactus.logger, w, r, endpoint.AddReactionFull) + if channelID == "" || messageID == "" { + return + } + + // manually fetch the emojiID, because it can be a non-numeric/snowflake Unicode emoji + + vars := mux.Vars(r) + emojiID := vars["emojiID"] + + sess, err := shard_manager.GetRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for addReaction" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + err = sess.MessageReactionAdd(channelID, messageID, emojiID) + if err != nil { + errMsg := "failed to addReaction" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("channelID", channelID), + zap.String("messageID", messageID), + zap.String("emojiID", emojiID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + w.WriteHeader(http.StatusOK) + } +} + +func (galactus *GalactusAPI) RemoveReactionHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + channelID, messageID := validate.ChannelAndMessageIDsAndRespond(galactus.logger, w, r, endpoint.RemoveReactionFull) + if channelID == "" || messageID == "" { + return + } + // manually fetch the userID and emojiID, because they can be weird ("@me", or Unicode emoji) + + vars := mux.Vars(r) + emojiID := vars["emojiID"] + userID := vars["userID"] + + valid, err := validate.ValidSnowflake(userID) + if !valid && userID != "@me" { + errMsg := "userID is invalid and not @me for removeReaction" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("userID", userID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + sess, err := shard_manager.GetRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for removeReaction" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + err = sess.MessageReactionRemove(channelID, messageID, emojiID, userID) + if err != nil { + errMsg := "failed to removeReaction" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("channelID", channelID), + zap.String("messageID", messageID), + zap.String("emojiID", emojiID), + zap.String("userID", userID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + w.WriteHeader(http.StatusOK) + } +} + +func (galactus *GalactusAPI) RemoveAllReactionsHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + channelID, messageID := validate.ChannelAndMessageIDsAndRespond(galactus.logger, w, r, endpoint.RemoveAllReactionsFull) + if channelID == "" || messageID == "" { + return + } + + sess, err := shard_manager.GetRandomSession(galactus.shardManager) + if err != nil { + errMsg := "error obtaining random session for removeAllReactions" + galactus.logger.Error(errMsg, + zap.Error(err), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + err = sess.MessageReactionsRemoveAll(channelID, messageID) + if err != nil { + errMsg := "failed to remove all reactions" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("channelID", channelID), + zap.String("messageID", messageID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + + w.WriteHeader(http.StatusOK) + } +} diff --git a/internal/galactus/remove_all_reactions.go b/internal/galactus/remove_all_reactions.go deleted file mode 100644 index 460ed1e..0000000 --- a/internal/galactus/remove_all_reactions.go +++ /dev/null @@ -1,43 +0,0 @@ -package galactus - -import ( - "github.com/automuteus/galactus/internal/galactus/shard_manager" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/automuteus/galactus/pkg/validate" - "go.uber.org/zap" - "net/http" -) - -func (galactus *GalactusAPI) RemoveAllReactionsHandler() func(w http.ResponseWriter, r *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - channelID, messageID := validate.ChannelAndMessageIDsAndRespond(galactus.logger, w, r, endpoint.RemoveAllReactionsFull) - if channelID == "" || messageID == "" { - return - } - - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for removeAllReactions" - galactus.logger.Error(errMsg, - zap.Error(err), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - err = sess.MessageReactionsRemoveAll(channelID, messageID) - if err != nil { - errMsg := "failed to remove all reactions" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("channelID", channelID), - zap.String("messageID", messageID), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - - w.WriteHeader(http.StatusOK) - } -} diff --git a/internal/galactus/remove_reaction.go b/internal/galactus/remove_reaction.go deleted file mode 100644 index 8d06000..0000000 --- a/internal/galactus/remove_reaction.go +++ /dev/null @@ -1,63 +0,0 @@ -package galactus - -import ( - "github.com/automuteus/galactus/internal/galactus/shard_manager" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/automuteus/galactus/pkg/validate" - "github.com/gorilla/mux" - "go.uber.org/zap" - "net/http" -) - -func (galactus *GalactusAPI) RemoveReactionHandler() func(w http.ResponseWriter, r *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - channelID, messageID := validate.ChannelAndMessageIDsAndRespond(galactus.logger, w, r, endpoint.RemoveReactionFull) - if channelID == "" || messageID == "" { - return - } - // manually fetch the userID and emojiID, because they can be weird ("@me", or Unicode emoji) - - vars := mux.Vars(r) - emojiID := vars["emojiID"] - userID := vars["userID"] - - valid, err := validate.ValidSnowflake(userID) - if !valid && userID != "@me" { - errMsg := "userID is invalid and not @me for removeReaction" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("userID", userID), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for removeReaction" - galactus.logger.Error(errMsg, - zap.Error(err), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - err = sess.MessageReactionRemove(channelID, messageID, emojiID, userID) - if err != nil { - errMsg := "failed to removeReaction" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("channelID", channelID), - zap.String("messageID", messageID), - zap.String("emojiID", emojiID), - zap.String("userID", userID), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - - w.WriteHeader(http.StatusOK) - } -} diff --git a/internal/galactus/send_message.go b/internal/galactus/send_message.go deleted file mode 100644 index 87128fe..0000000 --- a/internal/galactus/send_message.go +++ /dev/null @@ -1,73 +0,0 @@ -package galactus - -import ( - "encoding/json" - "github.com/automuteus/galactus/internal/galactus/shard_manager" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/automuteus/galactus/pkg/validate" - "go.uber.org/zap" - "io/ioutil" - "log" - "net/http" -) - -func (galactus *GalactusAPI) SendChannelMessageHandler() func(w http.ResponseWriter, r *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - channelID := validate.ChannelIDAndRespond(galactus.logger, w, r, endpoint.SendMessageFull) - if channelID == "" { - return - } - - body, err := ioutil.ReadAll(r.Body) - if err != nil { - errMsg := "could not read http body with error" - galactus.logger.Error(errMsg, - zap.Error(err), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - defer r.Body.Close() - - // TODO perform some validation on the message body? - // ex message length, empty contents, etc - - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for sendMessageHandler" - galactus.logger.Error(errMsg, - zap.Error(err), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - - msg, err := sess.ChannelMessageSend(channelID, string(body)) - if err != nil { - errMsg := "error posting message to channel" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("channelID", channelID), - zap.String("contents", string(body)), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - - // TODO metrics logging here - galactus.logger.Info("posted message to channel", - zap.String("channelID", channelID), - zap.String("contents", string(body)), - zap.String("messageID", msg.ID), - ) - w.WriteHeader(http.StatusOK) - jbytes, err := json.Marshal(msg) - if err != nil { - log.Println(err) - } - w.Write(jbytes) - } -} diff --git a/internal/galactus/send_message_embed.go b/internal/galactus/send_message_embed.go deleted file mode 100644 index e708795..0000000 --- a/internal/galactus/send_message_embed.go +++ /dev/null @@ -1,86 +0,0 @@ -package galactus - -import ( - "encoding/json" - "github.com/automuteus/galactus/internal/galactus/shard_manager" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/automuteus/galactus/pkg/validate" - "github.com/bwmarrin/discordgo" - "go.uber.org/zap" - "io/ioutil" - "log" - "net/http" -) - -func (galactus *GalactusAPI) SendChannelMessageEmbedHandler() func(w http.ResponseWriter, r *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - channelID := validate.ChannelIDAndRespond(galactus.logger, w, r, endpoint.SendMessageEmbedFull) - if channelID == "" { - return - } - - body, err := ioutil.ReadAll(r.Body) - if err != nil { - errMsg := "could not read http body with error" - galactus.logger.Error(errMsg, - zap.Error(err), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - defer r.Body.Close() - - var embed discordgo.MessageEmbed - err = json.Unmarshal(body, &embed) - if err != nil { - errMsg := "error unmarshalling discordMessageEmbed from JSON" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("body", string(body)), - ) - w.WriteHeader(http.StatusBadRequest) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - - // TODO extra validation here (empty embed fields and the like) - - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for sendMessageEmbedHandler" - galactus.logger.Error(errMsg, - zap.Error(err), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - - msg, err := sess.ChannelMessageSendEmbed(channelID, &embed) - if err != nil { - errMsg := "error posting messageEmbed to channel" - galactus.logger.Error(errMsg, - zap.Error(err), - zap.String("channelID", channelID), - zap.String("contents", string(body)), - ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - - // TODO metrics logging here - galactus.logger.Info("posted messageEmbed to channel", - zap.String("channelID", channelID), - zap.String("contents", string(body)), - zap.String("messageID", msg.ID), - ) - w.WriteHeader(http.StatusOK) - jbytes, err := json.Marshal(msg) - if err != nil { - log.Println(err) - } - w.Write(jbytes) - } -} diff --git a/internal/galactus/server.go b/internal/galactus/server.go index 332120a..631351f 100644 --- a/internal/galactus/server.go +++ b/internal/galactus/server.go @@ -165,41 +165,45 @@ func (galactus *GalactusAPI) Run(port string, maxWorkers int, captureAckTimeout galactus.loadTokensFromEnv() // TODO maybe eventually provide some auth parameter, or version number? Something to prove that a worker can pop requests? - r := mux.NewRouter() - - r.HandleFunc("/", galactus.indexHandler()).Methods("GET") - r.HandleFunc(endpoint.JobCount, galactus.jobCount()).Methods("GET") - - r.HandleFunc(endpoint.ModifyUserbyGuildConnectCode, galactus.modifyUserHandler(maxWorkers, captureAckTimeout)).Methods("POST") - r.HandleFunc(endpoint.SendMessageFull, galactus.SendChannelMessageHandler()).Methods("POST") - r.HandleFunc(endpoint.SendMessageEmbedFull, galactus.SendChannelMessageEmbedHandler()).Methods("POST") - r.HandleFunc(endpoint.EditMessageEmbedFull, galactus.EditMessageEmbedHandler()).Methods("POST") - r.HandleFunc(endpoint.DeleteMessageFull, galactus.DeleteChannelMessageHandler()).Methods("POST") - r.HandleFunc(endpoint.GetGuildFull, galactus.GetGuildHandler()).Methods("POST") - r.HandleFunc(endpoint.GetGuildChannelsFull, galactus.GetGuildChannelsHandler()).Methods("POST") - r.HandleFunc(endpoint.GetGuildMemberFull, galactus.GetGuildMemberHandler()).Methods("POST") - r.HandleFunc(endpoint.GetGuildRolesFull, galactus.GetGuildRolesHandler()).Methods("POST") - r.HandleFunc(endpoint.AddReactionFull, galactus.AddReactionHandler()).Methods("POST") - r.HandleFunc(endpoint.RemoveReactionFull, galactus.RemoveReactionHandler()).Methods("POST") - r.HandleFunc(endpoint.RemoveAllReactionsFull, galactus.RemoveAllReactionsHandler()).Methods("POST") - r.HandleFunc(endpoint.UserChannelCreateFull, galactus.CreateUserChannelHandler()).Methods("POST") - r.HandleFunc(endpoint.GetGuildEmojisFull, galactus.GetGuildEmojisHandler()).Methods("POST") - r.HandleFunc(endpoint.CreateGuildEmojiFull, galactus.CreateGuildEmojiHandler()).Methods("POST") - - r.HandleFunc(endpoint.GetGuildAMUSettingsFull, galactus.GetGuildAMUSettings()).Methods("POST") - r.HandleFunc(endpoint.GetCaptureTaskFull, galactus.GetCaptureTaskHandler(taskTimeout)).Methods("POST") - r.HandleFunc(endpoint.SetCaptureTaskStatusFull, galactus.SetCaptureTaskStatusHandler()).Methods("POST") - - r.HandleFunc(endpoint.AddCaptureEventFull, galactus.AddCaptureEventHandler()).Methods("POST") - r.HandleFunc(endpoint.GetCaptureEventFull, galactus.GetCaptureEventHandler(taskTimeout)).Methods("POST") - - r.HandleFunc(endpoint.RequestJob, galactus.requestJobHandler(taskTimeout)).Methods("POST") + mainRouter := mux.NewRouter() + + generalRouter := mainRouter.PathPrefix(endpoint.GeneralRoute).Subrouter() + captureRouter := mainRouter.PathPrefix(endpoint.CaptureRoute).Subrouter() + discordRouter := mainRouter.PathPrefix(endpoint.DiscordRoute).Subrouter() + settingsRouter := mainRouter.PathPrefix(endpoint.SettingsRoute).Subrouter() + + generalRouter.HandleFunc("/", galactus.indexHandler()).Methods("GET") + + discordRouter.HandleFunc(endpoint.ModifyUserFull, galactus.modifyUserHandler(maxWorkers, captureAckTimeout)).Methods("POST") + discordRouter.HandleFunc(endpoint.SendMessageFull, galactus.SendChannelMessageHandler()).Methods("POST") + discordRouter.HandleFunc(endpoint.SendMessageEmbedFull, galactus.SendChannelMessageEmbedHandler()).Methods("POST") + discordRouter.HandleFunc(endpoint.EditMessageEmbedFull, galactus.EditMessageEmbedHandler()).Methods("POST") + discordRouter.HandleFunc(endpoint.DeleteMessageFull, galactus.DeleteChannelMessageHandler()).Methods("POST") + discordRouter.HandleFunc(endpoint.GetGuildFull, galactus.GetGuildHandler()).Methods("POST") + discordRouter.HandleFunc(endpoint.GetGuildChannelsFull, galactus.GetGuildChannelsHandler()).Methods("POST") + discordRouter.HandleFunc(endpoint.GetGuildMemberFull, galactus.GetGuildMemberHandler()).Methods("POST") + discordRouter.HandleFunc(endpoint.GetGuildRolesFull, galactus.GetGuildRolesHandler()).Methods("POST") + discordRouter.HandleFunc(endpoint.AddReactionFull, galactus.AddReactionHandler()).Methods("POST") + discordRouter.HandleFunc(endpoint.RemoveReactionFull, galactus.RemoveReactionHandler()).Methods("POST") + discordRouter.HandleFunc(endpoint.RemoveAllReactionsFull, galactus.RemoveAllReactionsHandler()).Methods("POST") + discordRouter.HandleFunc(endpoint.UserChannelCreateFull, galactus.CreateUserChannelHandler()).Methods("POST") + discordRouter.HandleFunc(endpoint.GetGuildEmojisFull, galactus.GetGuildEmojisHandler()).Methods("POST") + discordRouter.HandleFunc(endpoint.CreateGuildEmojiFull, galactus.CreateGuildEmojiHandler()).Methods("POST") + + settingsRouter.HandleFunc(endpoint.GetGuildAMUSettingsFull, galactus.GetGuildAMUSettings()).Methods("POST") + + captureRouter.HandleFunc(endpoint.JobCount, galactus.jobCount()).Methods("GET") + captureRouter.HandleFunc(endpoint.GetCaptureTaskFull, galactus.GetCaptureTaskHandler(taskTimeout)).Methods("POST") + captureRouter.HandleFunc(endpoint.SetCaptureTaskStatusFull, galactus.SetCaptureTaskStatusHandler()).Methods("POST") + captureRouter.HandleFunc(endpoint.AddCaptureEventFull, galactus.AddCaptureEventHandler()).Methods("POST") + captureRouter.HandleFunc(endpoint.GetCaptureEventFull, galactus.GetCaptureEventHandler(taskTimeout)).Methods("POST") + captureRouter.HandleFunc(endpoint.RequestJob, galactus.requestJobHandler(taskTimeout)).Methods("POST") galactus.logger.Info("galactus is running", zap.String("port", port), ) - err := http.ListenAndServe(":"+port, r) + err := http.ListenAndServe(":"+port, mainRouter) if err != nil { galactus.logger.Error("http listener exited with error", zap.Error(err), diff --git a/pkg/client/add_capture_event.go b/pkg/client/add_capture_event.go deleted file mode 100644 index 5e350c6..0000000 --- a/pkg/client/add_capture_event.go +++ /dev/null @@ -1,31 +0,0 @@ -package galactus_client - -import ( - "bytes" - "fmt" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/automuteus/utils/pkg/capture" - "io/ioutil" - "log" - "net/http" -) - -func (galactus *GalactusClient) AddCaptureEvent(connectCode string, event capture.Event) error { - url := fmt.Sprintf("%s%s/%d", galactus.Address+endpoint.AddCaptureEventPartial, connectCode, event.EventType) - resp, err := galactus.client.Post(url, "application/json", bytes.NewBuffer(event.Payload)) - if err != nil { - return err - } - respBytes, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Println("error reading all bytes from resp body for addcaptureevent") - log.Println(err) - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - log.Println("non-200 status code received for addcaptureevent:") - log.Println(string(respBytes)) - } - - return err -} diff --git a/pkg/client/add_reaction.go b/pkg/client/add_reaction.go deleted file mode 100644 index 6bf3bbe..0000000 --- a/pkg/client/add_reaction.go +++ /dev/null @@ -1,28 +0,0 @@ -package galactus_client - -import ( - "bytes" - "github.com/automuteus/galactus/pkg/endpoint" - "io/ioutil" - "log" - "net/http" -) - -func (galactus *GalactusClient) AddReaction(channelID, messageID, emojiID string) error { - resp, err := galactus.client.Post(galactus.Address+endpoint.AddReactionPartial+channelID+"/"+messageID+"/"+emojiID, "application/json", bytes.NewBufferString("")) - if err != nil { - return err - } - respBytes, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Println("error reading all bytes from resp body for sendmessage") - log.Println(err) - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - log.Println("non-200 status code received for SendMessage:") - log.Println(string(respBytes)) - } - - return err -} diff --git a/pkg/client/capture.go b/pkg/client/capture.go new file mode 100644 index 0000000..22a33b4 --- /dev/null +++ b/pkg/client/capture.go @@ -0,0 +1,117 @@ +package galactus_client + +import ( + "bytes" + "encoding/json" + "errors" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/utils/pkg/capture" + "github.com/automuteus/utils/pkg/discord" + "go.uber.org/zap" + "io/ioutil" + "net/http" + "strconv" +) + +func (galactus *GalactusClient) AddCaptureEvent(connectCode string, event capture.Event) error { + str := strconv.FormatInt(int64(event.EventType), 10) + url := endpoint.FormGalactusURL(galactus.Address, endpoint.CaptureRoute, endpoint.GetCaptureEventPartial, connectCode, str) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBuffer(event.Payload)) + if err != nil { + return err + } + _, err = ioutil.ReadAll(resp.Body) + if err != nil { + galactus.logger.Error("error reading all bytes from message body", + zap.Error(err), + zap.String("url", url), + ) + return err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 response code received for " + url) + return err + } + + return err +} + +func (galactus *GalactusClient) GetCaptureEvent(connectCode string) (*capture.Event, error) { + url := endpoint.FormGalactusURL(galactus.Address, endpoint.CaptureRoute, endpoint.GetCaptureEventPartial, connectCode) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBufferString("")) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + galactus.logger.Error("error reading all bytes from message body", + zap.Error(err), + zap.String("url", url), + ) + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 response code received for " + url) + return nil, err + } + + var event capture.Event + err = json.Unmarshal(respBytes, &event) + if err != nil { + return nil, err + } + return &event, nil +} + +func (galactus *GalactusClient) GetCaptureTask(connectCode string) (*discord.ModifyTask, error) { + url := endpoint.FormGalactusURL(galactus.Address, endpoint.CaptureRoute, endpoint.GetCaptureTaskPartial, connectCode) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBufferString("")) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + galactus.logger.Error("error reading all bytes from message body", + zap.Error(err), + zap.String("url", url), + ) + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 response code received for " + url) + return nil, err + } + + var task discord.ModifyTask + err = json.Unmarshal(respBytes, &task) + if err != nil { + return nil, err + } + return &task, nil +} + +func (galactus *GalactusClient) SetCaptureTaskStatus(taskID, status string) error { + url := endpoint.FormGalactusURL(galactus.Address, endpoint.CaptureRoute, endpoint.SetCaptureTaskStatusPartial, taskID) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBufferString(status)) + if err != nil { + return err + } + _, err = ioutil.ReadAll(resp.Body) + if err != nil { + galactus.logger.Error("error reading all bytes from message body", + zap.Error(err), + zap.String("url", url), + ) + return err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 response code received for " + url) + return err + } + + return err +} diff --git a/pkg/client/capture_task_status.go b/pkg/client/capture_task_status.go deleted file mode 100644 index 4956dba..0000000 --- a/pkg/client/capture_task_status.go +++ /dev/null @@ -1,28 +0,0 @@ -package galactus_client - -import ( - "bytes" - "github.com/automuteus/galactus/pkg/endpoint" - "io/ioutil" - "log" - "net/http" -) - -func (galactus *GalactusClient) SetCaptureTaskStatus(taskID, status string) error { - resp, err := galactus.client.Post(galactus.Address+endpoint.SetCaptureTaskStatusPartial+taskID, "application/json", bytes.NewBufferString(status)) - if err != nil { - return err - } - respBytes, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Println("error reading all bytes from resp body for setcapturestatus") - log.Println(err) - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - log.Println("non-200 status code received for setcapturestatus:") - log.Println(string(respBytes)) - } - - return err -} diff --git a/pkg/client/create_guild_emoji.go b/pkg/client/create_guild_emoji.go deleted file mode 100644 index 0157799..0000000 --- a/pkg/client/create_guild_emoji.go +++ /dev/null @@ -1,37 +0,0 @@ -package galactus_client - -import ( - "bytes" - "encoding/json" - "errors" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/bwmarrin/discordgo" - "io/ioutil" - "log" - "net/http" -) - -func (galactus *GalactusClient) CreateGuildEmoji(guildID, emojiName, content string) (*discordgo.Emoji, error) { - resp, err := galactus.client.Post(galactus.Address+endpoint.CreateGuildEmojiPartial+guildID+"/"+emojiName, "application/json", bytes.NewBufferString(content)) - if err != nil { - return nil, err - } - respBytes, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Println("error reading all bytes from resp body for createGuildEmoji") - log.Println(err) - return nil, err - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - err := errors.New("non-200 status code received for createGuildEmoji:") - return nil, err - } - - var emoji discordgo.Emoji - err = json.Unmarshal(respBytes, &emoji) - if err != nil { - return nil, err - } - return &emoji, nil -} diff --git a/pkg/client/create_user_channel.go b/pkg/client/create_user_channel.go index 3d8dbed..2597695 100644 --- a/pkg/client/create_user_channel.go +++ b/pkg/client/create_user_channel.go @@ -6,25 +6,28 @@ import ( "errors" "github.com/automuteus/galactus/pkg/endpoint" "github.com/bwmarrin/discordgo" + "go.uber.org/zap" "io/ioutil" - "log" "net/http" ) func (galactus *GalactusClient) CreateUserChannel(userID string) (*discordgo.Channel, error) { - resp, err := galactus.client.Post(galactus.Address+endpoint.UserChannelCreatePartial+userID, "application/json", bytes.NewBufferString("")) + url := endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.UserChannelCreatePartial, userID) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBufferString("")) if err != nil { return nil, err } respBytes, err := ioutil.ReadAll(resp.Body) if err != nil { - log.Println("error reading all bytes from resp body for createUserChannel") - log.Println(err) + galactus.logger.Error("error reading all bytes from message body", + zap.Error(err), + zap.String("url", url), + ) return nil, err } defer resp.Body.Close() if resp.StatusCode != http.StatusOK { - err := errors.New("non-200 status code received for createUserChannel:") + err := errors.New("non-200 response code received for " + url) return nil, err } diff --git a/pkg/client/delete_message.go b/pkg/client/delete_message.go deleted file mode 100644 index 477d61b..0000000 --- a/pkg/client/delete_message.go +++ /dev/null @@ -1,27 +0,0 @@ -package galactus_client - -import ( - "bytes" - "github.com/automuteus/galactus/pkg/endpoint" - "io/ioutil" - "log" - "net/http" -) - -func (galactus *GalactusClient) DeleteChannelMessage(channelID, messageID string) error { - resp, err := galactus.client.Post(galactus.Address+endpoint.DeleteMessagePartial+channelID+"/"+messageID, "application/json", bytes.NewBufferString("")) - if err != nil { - return err - } - respBytes, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Println("error reading all bytes from resp body for deleteChannelMessage") - log.Println(err) - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - log.Println("non-200 status code received for DeleteChannelMessage:") - log.Println(string(respBytes)) - } - return nil -} diff --git a/pkg/client/edit_message.go b/pkg/client/edit_message.go deleted file mode 100644 index 6c81fcd..0000000 --- a/pkg/client/edit_message.go +++ /dev/null @@ -1,36 +0,0 @@ -package galactus_client - -import ( - "bytes" - "encoding/json" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/bwmarrin/discordgo" - "io/ioutil" - "log" - "net/http" -) - -func (galactus *GalactusClient) EditChannelMessageEmbed(channelID, messageID string, embed discordgo.MessageEmbed) (*discordgo.Message, error) { - message, err := json.Marshal(embed) - if err != nil { - return nil, err - } - - resp, err := galactus.client.Post(galactus.Address+endpoint.EditMessageEmbedPartial+channelID+"/"+messageID, "application/json", bytes.NewBuffer(message)) - if err != nil { - return nil, err - } - respBytes, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Println("error reading all bytes from resp body for editChannelMessageEmbed") - log.Println(err) - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - log.Println("non-200 status code received for EditChannelMessageEmbed:") - log.Println(string(respBytes)) - } - var msg discordgo.Message - err = json.Unmarshal(respBytes, &msg) - return &msg, err -} diff --git a/pkg/client/get_capture_event.go b/pkg/client/get_capture_event.go deleted file mode 100644 index a3793f1..0000000 --- a/pkg/client/get_capture_event.go +++ /dev/null @@ -1,37 +0,0 @@ -package galactus_client - -import ( - "bytes" - "encoding/json" - "errors" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/automuteus/utils/pkg/capture" - "io/ioutil" - "log" - "net/http" -) - -func (galactus *GalactusClient) GetCaptureEvent(connectCode string) (*capture.Event, error) { - resp, err := galactus.client.Post(galactus.Address+endpoint.GetCaptureEventPartial+connectCode, "application/json", bytes.NewBufferString("")) - if err != nil { - return nil, err - } - respBytes, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Println("error reading all bytes from resp body for getCaptureEvent") - log.Println(err) - return nil, err - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - err := errors.New("non-200 status code received for GetCaptureEvent:") - return nil, err - } - - var event capture.Event - err = json.Unmarshal(respBytes, &event) - if err != nil { - return nil, err - } - return &event, nil -} diff --git a/pkg/client/get_capture_task.go b/pkg/client/get_capture_task.go deleted file mode 100644 index 1ef5a6a..0000000 --- a/pkg/client/get_capture_task.go +++ /dev/null @@ -1,37 +0,0 @@ -package galactus_client - -import ( - "bytes" - "encoding/json" - "errors" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/automuteus/utils/pkg/discord" - "io/ioutil" - "log" - "net/http" -) - -func (galactus *GalactusClient) GetCaptureTask(connectCode string) (*discord.ModifyTask, error) { - resp, err := galactus.client.Post(galactus.Address+endpoint.GetCaptureTaskPartial+connectCode, "application/json", bytes.NewBufferString("")) - if err != nil { - return nil, err - } - respBytes, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Println("error reading all bytes from resp body for getCaptureTask") - log.Println(err) - return nil, err - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - err := errors.New("non-200 status code received for GetCaptureTask:") - return nil, err - } - - var task discord.ModifyTask - err = json.Unmarshal(respBytes, &task) - if err != nil { - return nil, err - } - return &task, nil -} diff --git a/pkg/client/get_guild.go b/pkg/client/get_guild.go deleted file mode 100644 index b360dbb..0000000 --- a/pkg/client/get_guild.go +++ /dev/null @@ -1,37 +0,0 @@ -package galactus_client - -import ( - "bytes" - "encoding/json" - "errors" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/bwmarrin/discordgo" - "io/ioutil" - "log" - "net/http" -) - -func (galactus *GalactusClient) GetGuild(guildID string) (*discordgo.Guild, error) { - resp, err := galactus.client.Post(galactus.Address+endpoint.GetGuildPartial+guildID, "application/json", bytes.NewBufferString("")) - if err != nil { - return nil, err - } - respBytes, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Println("error reading all bytes from resp body for getGuild") - log.Println(err) - return nil, err - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - err := errors.New("non-200 status code received for GetGuild:") - return nil, err - } - - var guild discordgo.Guild - err = json.Unmarshal(respBytes, &guild) - if err != nil { - return nil, err - } - return &guild, nil -} diff --git a/pkg/client/get_guild_channels.go b/pkg/client/get_guild_channels.go deleted file mode 100644 index aaaac5e..0000000 --- a/pkg/client/get_guild_channels.go +++ /dev/null @@ -1,37 +0,0 @@ -package galactus_client - -import ( - "bytes" - "encoding/json" - "errors" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/bwmarrin/discordgo" - "io/ioutil" - "log" - "net/http" -) - -func (galactus *GalactusClient) GetGuildChannels(guildID string) ([]*discordgo.Channel, error) { - resp, err := galactus.client.Post(galactus.Address+endpoint.GetGuildChannelsPartial+guildID, "application/json", bytes.NewBufferString("")) - if err != nil { - return nil, err - } - respBytes, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Println("error reading all bytes from resp body for getChannels") - log.Println(err) - return nil, err - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - err := errors.New("non-200 status code received for GetChannels:") - return nil, err - } - - var channels []*discordgo.Channel - err = json.Unmarshal(respBytes, &channels) - if err != nil { - return nil, err - } - return channels, nil -} diff --git a/pkg/client/get_guild_emojis.go b/pkg/client/get_guild_emojis.go deleted file mode 100644 index ce09045..0000000 --- a/pkg/client/get_guild_emojis.go +++ /dev/null @@ -1,37 +0,0 @@ -package galactus_client - -import ( - "bytes" - "encoding/json" - "errors" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/bwmarrin/discordgo" - "io/ioutil" - "log" - "net/http" -) - -func (galactus *GalactusClient) GetGuildEmojis(guildID string) ([]*discordgo.Emoji, error) { - resp, err := galactus.client.Post(galactus.Address+endpoint.GetGuildEmojisPartial+guildID, "application/json", bytes.NewBufferString("")) - if err != nil { - return nil, err - } - respBytes, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Println("error reading all bytes from resp body for getGuildEmojis") - log.Println(err) - return nil, err - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - err := errors.New("non-200 status code received for getGuildEmojis") - return nil, err - } - - var emojis []*discordgo.Emoji - err = json.Unmarshal(respBytes, &emojis) - if err != nil { - return nil, err - } - return emojis, nil -} diff --git a/pkg/client/get_guild_member.go b/pkg/client/get_guild_member.go deleted file mode 100644 index d6126fe..0000000 --- a/pkg/client/get_guild_member.go +++ /dev/null @@ -1,37 +0,0 @@ -package galactus_client - -import ( - "bytes" - "encoding/json" - "errors" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/bwmarrin/discordgo" - "io/ioutil" - "log" - "net/http" -) - -func (galactus *GalactusClient) GetGuildMember(guildID, userID string) (*discordgo.Member, error) { - resp, err := galactus.client.Post(galactus.Address+endpoint.GetGuildMemberPartial+guildID+"/"+userID, "application/json", bytes.NewBufferString("")) - if err != nil { - return nil, err - } - respBytes, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Println("error reading all bytes from resp body for getGuildMember") - log.Println(err) - return nil, err - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - err := errors.New("non-200 status code received for GetChannels:") - return nil, err - } - - var member discordgo.Member - err = json.Unmarshal(respBytes, &member) - if err != nil { - return nil, err - } - return &member, nil -} diff --git a/pkg/client/get_guild_roles.go b/pkg/client/get_guild_roles.go deleted file mode 100644 index 37a08a2..0000000 --- a/pkg/client/get_guild_roles.go +++ /dev/null @@ -1,37 +0,0 @@ -package galactus_client - -import ( - "bytes" - "encoding/json" - "errors" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/bwmarrin/discordgo" - "io/ioutil" - "log" - "net/http" -) - -func (galactus *GalactusClient) GetGuildRoles(guildID string) ([]*discordgo.Role, error) { - resp, err := galactus.client.Post(galactus.Address+endpoint.GetGuildRolesPartial+guildID, "application/json", bytes.NewBufferString("")) - if err != nil { - return nil, err - } - respBytes, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Println("error reading all bytes from resp body for getRoles") - log.Println(err) - return nil, err - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - err := errors.New("non-200 status code received for GetRoles:") - return nil, err - } - - var roles []*discordgo.Role - err = json.Unmarshal(respBytes, &roles) - if err != nil { - return nil, err - } - return roles, nil -} diff --git a/pkg/client/guild.go b/pkg/client/guild.go new file mode 100644 index 0000000..d8e3e8b --- /dev/null +++ b/pkg/client/guild.go @@ -0,0 +1,180 @@ +package galactus_client + +import ( + "bytes" + "encoding/json" + "errors" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/bwmarrin/discordgo" + "go.uber.org/zap" + "io/ioutil" + "net/http" +) + +func (galactus *GalactusClient) GetGuild(guildID string) (*discordgo.Guild, error) { + url := endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.GetGuildPartial, guildID) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBufferString("")) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + galactus.logger.Error("error reading all bytes from message body", + zap.Error(err), + zap.String("url", url), + ) + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 response code received for " + url) + return nil, err + } + + var guild discordgo.Guild + err = json.Unmarshal(respBytes, &guild) + if err != nil { + return nil, err + } + return &guild, nil +} + +func (galactus *GalactusClient) GetGuildChannels(guildID string) ([]*discordgo.Channel, error) { + url := endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.GetGuildChannelsPartial, guildID) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBufferString("")) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + galactus.logger.Error("error reading all bytes from message body", + zap.Error(err), + zap.String("url", url), + ) + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 response code received for " + url) + return nil, err + } + + var channels []*discordgo.Channel + err = json.Unmarshal(respBytes, &channels) + if err != nil { + return nil, err + } + return channels, nil +} + +func (galactus *GalactusClient) GetGuildEmojis(guildID string) ([]*discordgo.Emoji, error) { + url := endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.GetGuildEmojisPartial, guildID) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBufferString("")) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + galactus.logger.Error("error reading all bytes from message body", + zap.Error(err), + zap.String("url", url), + ) + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 response code received for " + url) + return nil, err + } + + var emojis []*discordgo.Emoji + err = json.Unmarshal(respBytes, &emojis) + if err != nil { + return nil, err + } + return emojis, nil +} + +func (galactus *GalactusClient) CreateGuildEmoji(guildID, emojiName, content string) (*discordgo.Emoji, error) { + url := endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.CreateGuildEmojiPartial, guildID, emojiName) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBufferString(content)) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + galactus.logger.Error("error reading all bytes from message body", + zap.Error(err), + zap.String("url", url), + ) + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 response code received for " + url) + return nil, err + } + + var emoji discordgo.Emoji + err = json.Unmarshal(respBytes, &emoji) + if err != nil { + return nil, err + } + return &emoji, nil +} + +func (galactus *GalactusClient) GetGuildMember(guildID, userID string) (*discordgo.Member, error) { + url := endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.GetGuildMemberPartial, guildID, userID) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBufferString("")) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + galactus.logger.Error("error reading all bytes from message body", + zap.Error(err), + zap.String("url", url), + ) + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 response code received for " + url) + return nil, err + } + + var member discordgo.Member + err = json.Unmarshal(respBytes, &member) + if err != nil { + return nil, err + } + return &member, nil +} + +func (galactus *GalactusClient) GetGuildRoles(guildID string) ([]*discordgo.Role, error) { + url := endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.GetGuildRolesPartial, guildID) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBufferString("")) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + galactus.logger.Error("error reading all bytes from message body", + zap.Error(err), + zap.String("url", url), + ) + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 response code received for " + url) + return nil, err + } + + var roles []*discordgo.Role + err = json.Unmarshal(respBytes, &roles) + if err != nil { + return nil, err + } + return roles, nil +} diff --git a/pkg/client/message.go b/pkg/client/message.go new file mode 100644 index 0000000..a961141 --- /dev/null +++ b/pkg/client/message.go @@ -0,0 +1,116 @@ +package galactus_client + +import ( + "bytes" + "encoding/json" + "errors" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/bwmarrin/discordgo" + "go.uber.org/zap" + "io/ioutil" + "net/http" +) + +func (galactus *GalactusClient) SendChannelMessage(channelID string, message string) (*discordgo.Message, error) { + url := endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.SendMessagePartial, channelID) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBufferString(message)) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + galactus.logger.Error("error reading all bytes from message body", + zap.Error(err), + zap.String("url", url), + ) + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 response code received for " + url) + return nil, err + } + var msg discordgo.Message + err = json.Unmarshal(respBytes, &msg) + return &msg, err +} + +func (galactus *GalactusClient) SendChannelMessageEmbed(channelID string, embed *discordgo.MessageEmbed) (*discordgo.Message, error) { + message, err := json.Marshal(*embed) + if err != nil { + return nil, err + } + + url := endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.SendMessageEmbedPartial, channelID) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBuffer(message)) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + galactus.logger.Error("error reading all bytes from message body", + zap.Error(err), + zap.String("url", url), + ) + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 response code received for " + url) + return nil, err + } + var msg discordgo.Message + err = json.Unmarshal(respBytes, &msg) + return &msg, err +} + +func (galactus *GalactusClient) EditChannelMessageEmbed(channelID, messageID string, embed discordgo.MessageEmbed) (*discordgo.Message, error) { + message, err := json.Marshal(embed) + if err != nil { + return nil, err + } + + url := endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.EditMessageEmbedPartial, channelID, messageID) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBuffer(message)) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + galactus.logger.Error("error reading all bytes from message body", + zap.Error(err), + zap.String("url", url), + ) + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 response code received for " + url) + return nil, err + } + var msg discordgo.Message + err = json.Unmarshal(respBytes, &msg) + return &msg, err +} + +func (galactus *GalactusClient) DeleteChannelMessage(channelID, messageID string) error { + url := endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.DeleteMessagePartial, channelID, messageID) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBufferString("")) + if err != nil { + return err + } + _, err = ioutil.ReadAll(resp.Body) + if err != nil { + galactus.logger.Error("error reading all bytes from message body", + zap.Error(err), + zap.String("url", url), + ) + return err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 response code received for " + url) + return err + } + return nil +} diff --git a/pkg/client/modify.go b/pkg/client/modify.go index dc69f3e..15bf216 100644 --- a/pkg/client/modify.go +++ b/pkg/client/modify.go @@ -4,11 +4,11 @@ import ( "bytes" "context" "encoding/json" - "fmt" + "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/utils/pkg/discord" "github.com/bsm/redislock" + "go.uber.org/zap" "io/ioutil" - "log" "net/http" ) @@ -16,16 +16,13 @@ func (galactus *GalactusClient) ModifyUsers(guildID, connectCode string, request if lock != nil { defer lock.Release(context.Background()) } - - fullURL := fmt.Sprintf("%s/modify/%s/%s", galactus.Address, guildID, connectCode) + url := endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.ModifyUserPartial, guildID, connectCode) jBytes, err := json.Marshal(request) if err != nil { return nil } - log.Println(request) - - resp, err := galactus.client.Post(fullURL, "application/json", bytes.NewBuffer(jBytes)) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBuffer(jBytes)) if err != nil { return nil } @@ -38,12 +35,18 @@ func (galactus *GalactusClient) ModifyUsers(guildID, connectCode string, request mds := discord.MuteDeafenSuccessCounts{} jBytes, err = ioutil.ReadAll(resp.Body) if err != nil { - log.Println(err) + galactus.logger.Error("error reading all bytes from message body", + zap.Error(err), + zap.String("url", url), + ) return &mds } err = json.Unmarshal(jBytes, &mds) if err != nil { - log.Println(err) + galactus.logger.Error("error unmarshalling response body", + zap.Error(err), + zap.String("url", url), + ) return &mds } return &mds diff --git a/pkg/client/reaction.go b/pkg/client/reaction.go new file mode 100644 index 0000000..cdd16ff --- /dev/null +++ b/pkg/client/reaction.go @@ -0,0 +1,79 @@ +package galactus_client + +import ( + "bytes" + "errors" + "github.com/automuteus/galactus/pkg/endpoint" + "go.uber.org/zap" + "io/ioutil" + "net/http" +) + +func (galactus *GalactusClient) AddReaction(channelID, messageID, emojiID string) error { + url := endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.AddReactionPartial, channelID, messageID, emojiID) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBufferString("")) + if err != nil { + return err + } + _, err = ioutil.ReadAll(resp.Body) + if err != nil { + galactus.logger.Error("error reading all bytes from message body", + zap.Error(err), + zap.String("url", url), + ) + return err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 response code received for " + url) + return err + } + + return err +} + +func (galactus *GalactusClient) RemoveReaction(channelID, messageID, emojiID, userID string) error { + url := endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.RemoveReactionPartial, channelID, messageID, emojiID, userID) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBufferString("")) + if err != nil { + return err + } + _, err = ioutil.ReadAll(resp.Body) + if err != nil { + galactus.logger.Error("error reading all bytes from message body", + zap.Error(err), + zap.String("url", url), + ) + return err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 response code received for " + url) + return err + } + + return err +} + +func (galactus *GalactusClient) RemoveAllReactions(channelID, messageID string) error { + url := endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.RemoveAllReactionsPartial, channelID, messageID) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBufferString("")) + if err != nil { + return err + } + _, err = ioutil.ReadAll(resp.Body) + if err != nil { + galactus.logger.Error("error reading all bytes from message body", + zap.Error(err), + zap.String("url", url), + ) + return err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 response code received for " + url) + return err + } + + return err +} diff --git a/pkg/client/remove_all_reactions.go b/pkg/client/remove_all_reactions.go deleted file mode 100644 index d88faf1..0000000 --- a/pkg/client/remove_all_reactions.go +++ /dev/null @@ -1,28 +0,0 @@ -package galactus_client - -import ( - "bytes" - "github.com/automuteus/galactus/pkg/endpoint" - "io/ioutil" - "log" - "net/http" -) - -func (galactus *GalactusClient) RemoveAllReactions(channelID, messageID string) error { - resp, err := galactus.client.Post(galactus.Address+endpoint.RemoveAllReactionsPartial+channelID+"/"+messageID, "application/json", bytes.NewBufferString("")) - if err != nil { - return err - } - respBytes, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Println("error reading all bytes from resp body for removeAllReactions") - log.Println(err) - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - log.Println("non-200 status code received for removeAllReactions:") - log.Println(string(respBytes)) - } - - return err -} diff --git a/pkg/client/remove_reaction.go b/pkg/client/remove_reaction.go deleted file mode 100644 index cbd3b1c..0000000 --- a/pkg/client/remove_reaction.go +++ /dev/null @@ -1,28 +0,0 @@ -package galactus_client - -import ( - "bytes" - "github.com/automuteus/galactus/pkg/endpoint" - "io/ioutil" - "log" - "net/http" -) - -func (galactus *GalactusClient) RemoveReaction(channelID, messageID, emojiID, userID string) error { - resp, err := galactus.client.Post(galactus.Address+endpoint.RemoveReactionPartial+channelID+"/"+messageID+"/"+emojiID+"/"+userID, "application/json", bytes.NewBufferString("")) - if err != nil { - return err - } - respBytes, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Println("error reading all bytes from resp body for removeReaction") - log.Println(err) - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - log.Println("non-200 status code received for RemoveReaction:") - log.Println(string(respBytes)) - } - - return err -} diff --git a/pkg/client/send_message.go b/pkg/client/send_message.go deleted file mode 100644 index 3e67ff2..0000000 --- a/pkg/client/send_message.go +++ /dev/null @@ -1,56 +0,0 @@ -package galactus_client - -import ( - "bytes" - "encoding/json" - "github.com/automuteus/galactus/pkg/endpoint" - "github.com/bwmarrin/discordgo" - "io/ioutil" - "log" - "net/http" -) - -func (galactus *GalactusClient) SendChannelMessage(channelID string, message string) (*discordgo.Message, error) { - resp, err := galactus.client.Post(galactus.Address+endpoint.SendMessagePartial+channelID, "application/json", bytes.NewBufferString(message)) - if err != nil { - return nil, err - } - respBytes, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Println("error reading all bytes from resp body for sendmessage") - log.Println(err) - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - log.Println("non-200 status code received for SendMessage:") - log.Println(string(respBytes)) - } - var msg discordgo.Message - err = json.Unmarshal(respBytes, &msg) - return &msg, err -} - -func (galactus *GalactusClient) SendChannelMessageEmbed(channelID string, embed *discordgo.MessageEmbed) (*discordgo.Message, error) { - message, err := json.Marshal(*embed) - if err != nil { - return nil, err - } - - resp, err := galactus.client.Post(galactus.Address+endpoint.SendMessageEmbedPartial+channelID, "application/json", bytes.NewBuffer(message)) - if err != nil { - return nil, err - } - respBytes, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Println("error reading all bytes from resp body for sendmessageembed") - log.Println(err) - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - log.Println("non-200 status code received for SendMessageEmbed:") - log.Println(string(respBytes)) - } - var msg discordgo.Message - err = json.Unmarshal(respBytes, &msg) - return &msg, err -} diff --git a/pkg/endpoint/endpoints.go b/pkg/endpoint/capture.go similarity index 82% rename from pkg/endpoint/endpoints.go rename to pkg/endpoint/capture.go index 99bc9d2..3b2a576 100644 --- a/pkg/endpoint/endpoints.go +++ b/pkg/endpoint/capture.go @@ -1,7 +1,9 @@ package endpoint -const RequestJob = "/request/job" +const CaptureRoute = "/api/capture" + const JobCount = "/totalJobs" +const RequestJob = "/request/job" const AddCaptureEventPartial = "/addCaptureEvent/" const AddCaptureEventFull = AddCaptureEventPartial + "{connectCode}/{eventType}" @@ -14,6 +16,3 @@ const GetCaptureTaskFull = GetCaptureTaskPartial + "{connectCode}" const SetCaptureTaskStatusPartial = "/setCaptureTaskStatus/" const SetCaptureTaskStatusFull = SetCaptureTaskStatusPartial + "{taskID}" - -const GetGuildAMUSettingsPartial = "/getAMUSettings/" -const GetGuildAMUSettingsFull = GetGuildAMUSettingsPartial + "{guildID}" diff --git a/pkg/endpoint/discord.go b/pkg/endpoint/discord.go index 5bbf58e..5843c4b 100644 --- a/pkg/endpoint/discord.go +++ b/pkg/endpoint/discord.go @@ -1,5 +1,7 @@ package endpoint +const DiscordRoute = "/api/discord" + const SendMessagePartial = "/sendMessage/" const SendMessageFull = SendMessagePartial + "{channelID}" @@ -21,7 +23,8 @@ const RemoveAllReactionsFull = RemoveAllReactionsPartial + "{channelID}/{message const AddReactionPartial = "/addReaction/" const AddReactionFull = AddReactionPartial + "{channelID}/{messageID}/{emojiID}" -const ModifyUserbyGuildConnectCode = "/modify/{guildID}/{connectCode}" +const ModifyUserPartial = "/modifyUser/" +const ModifyUserFull = ModifyUserPartial + "{guildID}/{connectCode}" const GetGuildPartial = "/guild/" const GetGuildFull = GetGuildPartial + "{guildID}" diff --git a/pkg/endpoint/general.go b/pkg/endpoint/general.go new file mode 100644 index 0000000..38b32c0 --- /dev/null +++ b/pkg/endpoint/general.go @@ -0,0 +1,3 @@ +package endpoint + +const GeneralRoute = "/api" diff --git a/pkg/endpoint/settings.go b/pkg/endpoint/settings.go new file mode 100644 index 0000000..6f6aedb --- /dev/null +++ b/pkg/endpoint/settings.go @@ -0,0 +1,6 @@ +package endpoint + +const SettingsRoute = "/api/settings" + +const GetGuildAMUSettingsPartial = "/getAMUSettings/" +const GetGuildAMUSettingsFull = GetGuildAMUSettingsPartial + "{guildID}" diff --git a/pkg/endpoint/stats.go b/pkg/endpoint/stats.go new file mode 100644 index 0000000..56954d7 --- /dev/null +++ b/pkg/endpoint/stats.go @@ -0,0 +1,3 @@ +package endpoint + +const StatsRoute = "/api/stats" diff --git a/pkg/endpoint/url.go b/pkg/endpoint/url.go new file mode 100644 index 0000000..7cfa245 --- /dev/null +++ b/pkg/endpoint/url.go @@ -0,0 +1,9 @@ +package endpoint + +func FormGalactusURL(address, baseRoute, endpoint string, childPaths ...string) (url string) { + url = address + baseRoute + endpoint + for _, v := range childPaths { + url += v + "/" + } + return +} From 06a3949464d0892c4d33a0f1fa2d064815ba8855 Mon Sep 17 00:00:00 2001 From: denverquane Date: Wed, 20 Jan 2021 20:48:53 -0700 Subject: [PATCH 22/50] Filter messages by prefix, fixed client endpoints --- internal/galactus/get_amu_gamestate.go | 1 + internal/galactus/get_amu_settings.go | 36 ++---- internal/galactus/server.go | 27 ++--- .../galactus/shard_manager/shard_manager.go | 4 +- internal/handler/guild_create.go | 7 +- internal/handler/guild_delete.go | 7 +- internal/handler/log.go | 16 --- internal/handler/message_create.go | 65 +++++++--- internal/handler/message_reaction_add.go | 8 +- internal/handler/voice_state.go | 8 +- internal/redis/{redis.go => lock.go} | 9 -- internal/redis/queue.go | 11 +- internal/redis/settings.go | 36 ++++++ internal/redis/user_ratelimit.go | 113 ++++++++++++++++++ main.go | 12 +- pkg/client/client.go | 6 +- 16 files changed, 267 insertions(+), 99 deletions(-) create mode 100644 internal/galactus/get_amu_gamestate.go delete mode 100644 internal/handler/log.go rename internal/redis/{redis.go => lock.go} (67%) create mode 100644 internal/redis/settings.go create mode 100644 internal/redis/user_ratelimit.go diff --git a/internal/galactus/get_amu_gamestate.go b/internal/galactus/get_amu_gamestate.go new file mode 100644 index 0000000..e523944 --- /dev/null +++ b/internal/galactus/get_amu_gamestate.go @@ -0,0 +1 @@ +package galactus diff --git a/internal/galactus/get_amu_settings.go b/internal/galactus/get_amu_settings.go index 679ec7a..4ac05eb 100644 --- a/internal/galactus/get_amu_settings.go +++ b/internal/galactus/get_amu_settings.go @@ -1,14 +1,10 @@ package galactus import ( - "context" - "crypto/sha256" - "encoding/hex" "encoding/json" + redis_utils "github.com/automuteus/galactus/internal/redis" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" - "github.com/automuteus/utils/pkg/rediskey" - "github.com/automuteus/utils/pkg/settings" "go.uber.org/zap" "net/http" ) @@ -20,43 +16,27 @@ func (galactus *GalactusAPI) GetGuildAMUSettings() func(w http.ResponseWriter, r return } - key := rediskey.GuildSettings(HashGuildID(guildID)) - var sett settings.GuildSettings - - str, err := galactus.client.Get(context.Background(), key).Result() + sett, err := redis_utils.GetSettingsFromRedis(galactus.client, guildID) if err != nil { errMsg := "error when fetching guild AMU settings" galactus.logger.Error(errMsg, zap.Error(err), zap.String("guildID", guildID), ) - w.WriteHeader(http.StatusBadRequest) + w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(errMsg + ": " + err.Error())) return } - err = json.Unmarshal([]byte(str), &sett) + jBytes, err := json.Marshal(sett) if err != nil { - errMsg := "error when unmarshalling guild AMU settings" - galactus.logger.Error(errMsg, + galactus.logger.Error("encountered an impossible error when marshalling guild settings that were just unmarshalled...", zap.Error(err), zap.String("guildID", guildID), - zap.String("data", str), ) w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return + } else { + w.WriteHeader(http.StatusOK) + w.Write(jBytes) } - w.WriteHeader(http.StatusOK) - w.Write([]byte(str)) } } - -func HashGuildID(guildID string) string { - return genericHash(guildID) -} - -func genericHash(s string) string { - h := sha256.New() - h.Write([]byte(s)) - return hex.EncodeToString(h.Sum(nil)) -} diff --git a/internal/galactus/server.go b/internal/galactus/server.go index 631351f..8822768 100644 --- a/internal/galactus/server.go +++ b/internal/galactus/server.go @@ -6,7 +6,6 @@ import ( "encoding/hex" "encoding/json" "errors" - "github.com/alicebob/miniredis/v2" "github.com/automuteus/galactus/internal/galactus/shard_manager" redisutils "github.com/automuteus/galactus/internal/redis" "github.com/automuteus/galactus/pkg/endpoint" @@ -48,28 +47,18 @@ type GalactusAPI struct { logger *zap.Logger } -func NewGalactusAPI(logger *zap.Logger, mockRedis bool, botToken, redisAddr, redisUser, redisPass string, maxReq int64) *GalactusAPI { +func NewGalactusAPI(logger *zap.Logger, botToken, redisAddr, redisUser, redisPass string, maxReq int64, botPrefix string) *GalactusAPI { var rdb *redis.Client - if mockRedis { - mr, err := miniredis.Run() - if err != nil { - panic(err) - } - rdb = redis.NewClient(&redis.Options{ - Addr: mr.Addr(), - }) - } else { - rdb = redis.NewClient(&redis.Options{ - Addr: redisAddr, - Username: redisUser, - Password: redisPass, - DB: 0, // use default DB - }) - } + rdb = redis.NewClient(&redis.Options{ + Addr: redisAddr, + Username: redisUser, + Password: redisPass, + DB: 0, // use default DB + }) manager := shard_manager.MakeShardManager(logger, botToken, DefaultIntents) - shard_manager.AddHandlers(logger, manager, rdb) + shard_manager.AddHandlers(logger, manager, rdb, botPrefix) return &GalactusAPI{ client: rdb, diff --git a/internal/galactus/shard_manager/shard_manager.go b/internal/galactus/shard_manager/shard_manager.go index ce86ec8..7848e1a 100644 --- a/internal/galactus/shard_manager/shard_manager.go +++ b/internal/galactus/shard_manager/shard_manager.go @@ -42,12 +42,12 @@ func MakeShardManager(logger *zap.Logger, token string, intent *discordgo.Intent return manager } -func AddHandlers(logger *zap.Logger, manager *dshardmanager.Manager, client *redis.Client) { +func AddHandlers(logger *zap.Logger, manager *dshardmanager.Manager, client *redis.Client, botPrefix string) { manager.AddHandler(handler.GuildCreateHandler(logger, client)) manager.AddHandler(handler.GuildDeleteHandler(logger, client)) manager.AddHandler(handler.VoiceStateUpdateHandler(logger, client)) - manager.AddHandler(handler.MessageCreateHandler(logger, client)) + manager.AddHandler(handler.MessageCreateHandler(logger, client, botPrefix)) manager.AddHandler(handler.MessageReactionAddHandler(logger, client)) manager.AddHandler(handler.RateLimitHandler(logger, client)) diff --git a/internal/handler/guild_create.go b/internal/handler/guild_create.go index 67896e4..1994c7b 100644 --- a/internal/handler/guild_create.go +++ b/internal/handler/guild_create.go @@ -24,7 +24,12 @@ func GuildCreateHandler(logger *zap.Logger, client *redis.Client) func(s *discor logger.Error("error pushing discord message to Redis for GuildCreate", zap.Error(err)) } else { - LogDiscordMessagePush(logger, discord_message.GuildCreate, m.ID, "", m.OwnerID, m.ID) + logger.Info("pushed discord message to Redis", + zap.String("type", discord_message.DiscordMessageTypeStrings[discord_message.GuildCreate]), + zap.String("guild_id", m.ID), + zap.String("user_id", m.OwnerID), + zap.String("id", m.ID), + ) } } } diff --git a/internal/handler/guild_delete.go b/internal/handler/guild_delete.go index d8bfd9a..90b3dc6 100644 --- a/internal/handler/guild_delete.go +++ b/internal/handler/guild_delete.go @@ -24,7 +24,12 @@ func GuildDeleteHandler(logger *zap.Logger, client *redis.Client) func(s *discor logger.Error("error pushing to Redis for GuildDelete message", zap.Error(err)) } else { - LogDiscordMessagePush(logger, discord_message.GuildDelete, m.ID, "", m.OwnerID, m.ID) + logger.Info("pushed discord message to Redis", + zap.String("type", discord_message.DiscordMessageTypeStrings[discord_message.GuildDelete]), + zap.String("guild_id", m.ID), + zap.String("user_id", m.OwnerID), + zap.String("id", m.ID), + ) } } } diff --git a/internal/handler/log.go b/internal/handler/log.go deleted file mode 100644 index 2ef4685..0000000 --- a/internal/handler/log.go +++ /dev/null @@ -1,16 +0,0 @@ -package handler - -import ( - "github.com/automuteus/galactus/pkg/discord_message" - "go.uber.org/zap" -) - -func LogDiscordMessagePush(logger *zap.Logger, msgType discord_message.DiscordMessageType, guildID, channelID, userID, ID string) { - logger.Info("pushed discord message to Redis", - zap.String("type", discord_message.DiscordMessageTypeStrings[msgType]), - zap.String("guild_id", guildID), - zap.String("channel_id", channelID), - zap.String("user_id", userID), - zap.String("id", ID), - ) -} diff --git a/internal/handler/message_create.go b/internal/handler/message_create.go index 1ee0cd5..a726aba 100644 --- a/internal/handler/message_create.go +++ b/internal/handler/message_create.go @@ -8,9 +8,10 @@ import ( "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" "go.uber.org/zap" + "strings" ) -func MessageCreateHandler(logger *zap.Logger, client *redis.Client) func(s *discordgo.Session, m *discordgo.MessageCreate) { +func MessageCreateHandler(logger *zap.Logger, client *redis.Client, globalPrefix string) func(s *discordgo.Session, m *discordgo.MessageCreate) { return func(s *discordgo.Session, m *discordgo.MessageCreate) { if m == nil { return @@ -20,10 +21,16 @@ func MessageCreateHandler(logger *zap.Logger, client *redis.Client) func(s *disc return } - // TODO should find an efficient way to hook into a guild's prefix here. Would allow for filtering messages - // quickly without pushing them into the queue - - // TODO softban the users at this level; bot logic shouldn't have to worry about it + snowflakeLock := redis_utils.LockSnowflake(context.Background(), client, m.ID) + // couldn't obtain lock; bail bail bail! + if snowflakeLock == nil { + logger.Info("could not obtain snowflake lock", + zap.String("type", "MessageCreate"), + zap.Int("shard ID", s.ShardID), + zap.String("snowflakeID", m.ID)) + return + } + defer snowflakeLock.Release(context.Background()) if redis_utils.IsUserBanned(client, m.Author.ID) { logger.Info("ignoring message from softbanned user", @@ -33,16 +40,31 @@ func MessageCreateHandler(logger *zap.Logger, client *redis.Client) func(s *disc return } - snowflakeLock := redis_utils.LockSnowflake(context.Background(), client, m.ID) - // couldn't obtain lock; bail bail bail! - if snowflakeLock == nil { - logger.Info("could not obtain snowflake lock", - zap.String("type", "MessageCreate"), - zap.Int("shard ID", s.ShardID), - zap.String("snowflakeID", m.ID)) + detectedPrefix := "" + sett, err := redis_utils.GetSettingsFromRedis(client, m.GuildID) + + if sett != nil && err == nil { + if strings.HasPrefix(m.Content, sett.CommandPrefix) { + detectedPrefix = sett.CommandPrefix + } + } + + if detectedPrefix == "" { + if strings.HasPrefix(m.Content, "<@!"+s.State.User.ID+">") { + detectedPrefix = "<@!" + s.State.User.ID + ">" + } else if strings.HasPrefix(m.Content, globalPrefix) { + detectedPrefix = globalPrefix + } + } + + // wasn't a message for the bot; don't push to redis + if detectedPrefix == "" { return } - defer snowflakeLock.Release(context.Background()) + + m.Content = stripPrefix(m.Content, detectedPrefix) + + // TODO softban the users at this level; bot logic shouldn't have to worry about it byt, err := json.Marshal(m) if err != nil { @@ -54,7 +76,22 @@ func MessageCreateHandler(logger *zap.Logger, client *redis.Client) func(s *disc logger.Error("error pushing discord message to Redis for MessageCreate message", zap.Error(err)) } else { - LogDiscordMessagePush(logger, discord_message.MessageCreate, m.GuildID, m.ChannelID, m.Author.ID, m.ID) + logger.Info("pushed discord message to Redis", + zap.String("type", discord_message.DiscordMessageTypeStrings[discord_message.MessageCreate]), + zap.String("guild_id", m.GuildID), + zap.String("channel_id", m.ChannelID), + zap.String("user_id", m.Author.ID), + zap.String("id", m.ID), + ) } } } + +func stripPrefix(msg, prefix string) string { + newMsg := strings.Replace(msg, prefix+"", "", 1) + // didn't substitute anything + if len(newMsg) == len(msg) { + return strings.Replace(msg, prefix, "", 1) + } + return newMsg +} diff --git a/internal/handler/message_reaction_add.go b/internal/handler/message_reaction_add.go index 564722e..6967e02 100644 --- a/internal/handler/message_reaction_add.go +++ b/internal/handler/message_reaction_add.go @@ -30,7 +30,13 @@ func MessageReactionAddHandler(logger *zap.Logger, client *redis.Client) func(s logger.Error("error pushing to Redis for MessageReactionAdd message", zap.Error(err)) } else { - LogDiscordMessagePush(logger, discord_message.MessageReactionAdd, m.GuildID, m.ChannelID, m.UserID, m.MessageID) + logger.Info("pushed discord message to Redis", + zap.String("type", discord_message.DiscordMessageTypeStrings[discord_message.MessageReactionAdd]), + zap.String("guild_id", m.GuildID), + zap.String("channel_id", m.ChannelID), + zap.String("user_id", m.UserID), + zap.String("id", m.MessageID), + ) } } } diff --git a/internal/handler/voice_state.go b/internal/handler/voice_state.go index 2317cac..30b865b 100644 --- a/internal/handler/voice_state.go +++ b/internal/handler/voice_state.go @@ -24,7 +24,13 @@ func VoiceStateUpdateHandler(logger *zap.Logger, client *redis.Client) func(s *d logger.Error("error pushing to Redis for VoiceStateUpdate message", zap.Error(err)) } else { - LogDiscordMessagePush(logger, discord_message.VoiceStateUpdate, m.GuildID, m.ChannelID, m.UserID, m.SessionID) + logger.Info("pushed discord message to Redis", + zap.String("type", discord_message.DiscordMessageTypeStrings[discord_message.VoiceStateUpdate]), + zap.String("guild_id", m.GuildID), + zap.String("channel_id", m.ChannelID), + zap.String("user_id", m.UserID), + zap.String("id", m.SessionID), + ) } } } diff --git a/internal/redis/redis.go b/internal/redis/lock.go similarity index 67% rename from internal/redis/redis.go rename to internal/redis/lock.go index 23af0d4..5e8afd6 100644 --- a/internal/redis/redis.go +++ b/internal/redis/lock.go @@ -23,12 +23,3 @@ func LockSnowflake(ctx context.Context, client *redis.Client, snowflake string) } return lock } - -func IsUserBanned(client *redis.Client, userID string) bool { - v, err := client.Exists(context.Background(), rediskey.UserSoftban(userID)).Result() - if err != nil { - log.Println(err) - return false - } - return v == 1 // = 1 means the user is present, and thus rate-limited -} diff --git a/internal/redis/queue.go b/internal/redis/queue.go index e0feb64..0d33af7 100644 --- a/internal/redis/queue.go +++ b/internal/redis/queue.go @@ -11,6 +11,9 @@ import ( "time" ) +//if no w +const DiscordMessageTimeout = time.Second * 5 + const GatewayMessageKey = "automuteus:gateway:message" func PushDiscordMessage(client *redis.Client, messageType discord_message.DiscordMessageType, data []byte) error { @@ -23,7 +26,13 @@ func PushDiscordMessage(client *redis.Client, messageType discord_message.Discor return err } - return client.LPush(context.Background(), GatewayMessageKey, byt).Err() + err = client.LPush(context.Background(), GatewayMessageKey, byt).Err() + if err != nil { + return err + } + + client.Expire(context.Background(), GatewayMessageKey, DiscordMessageTimeout) + return err } func PopRawDiscordMessageTimeout(client *redis.Client, timeout time.Duration) (string, error) { diff --git a/internal/redis/settings.go b/internal/redis/settings.go new file mode 100644 index 0000000..6e90486 --- /dev/null +++ b/internal/redis/settings.go @@ -0,0 +1,36 @@ +package redis + +import ( + "context" + "crypto/sha256" + "encoding/hex" + "encoding/json" + "github.com/automuteus/utils/pkg/rediskey" + "github.com/automuteus/utils/pkg/settings" + "github.com/go-redis/redis/v8" +) + +func GetSettingsFromRedis(client *redis.Client, guildID string) (*settings.GuildSettings, error) { + var sett settings.GuildSettings + key := rediskey.GuildSettings(hashGuildID(guildID)) + + str, err := client.Get(context.Background(), key).Result() + if err != nil { + return nil, err + } + err = json.Unmarshal([]byte(str), &sett) + if err != nil { + return nil, err + } + return &sett, nil +} + +func hashGuildID(guildID string) string { + return genericHash(guildID) +} + +func genericHash(s string) string { + h := sha256.New() + h.Write([]byte(s)) + return hex.EncodeToString(h.Sum(nil)) +} diff --git a/internal/redis/user_ratelimit.go b/internal/redis/user_ratelimit.go new file mode 100644 index 0000000..f76688e --- /dev/null +++ b/internal/redis/user_ratelimit.go @@ -0,0 +1,113 @@ +package redis + +import ( + "context" + "fmt" + "github.com/go-redis/redis/v8" + "log" + "time" +) + +const GlobalUserRateLimitDuration = 1 * time.Second + +// when a user exceeds the threshold, they're ignored for this long +const SoftbanDuration = 5 * time.Minute + +// how many violations before a softban +const SoftbanThreshold = 3 + +// how far back the bot should look for violations. Softban is invoked by violations>threshold in this amt of time +const SoftbanExpiration = 10 * time.Minute + +func UserRateLimitGeneralKey(userID string) string { + return "automuteus:ratelimit:user:" + userID +} + +func UserRateLimitSpecificKey(userID, cmdType string) string { + return "automuteus:ratelimit:user:" + cmdType + ":" + userID +} + +func UserSoftbanKey(userID string) string { + return "automuteus:ratelimit:softban:user:" + userID +} + +func UserSoftbanCountKey(userID string) string { + return "automuteus:ratelimit:softban:count:user:" + userID +} + +func MarkUserRateLimit(client *redis.Client, userID, cmdType string, ttl time.Duration) { + err := client.Set(context.Background(), UserRateLimitGeneralKey(userID), "", GlobalUserRateLimitDuration).Err() + if err != nil { + log.Println(err) + } + + if cmdType != "" && ttl > 0 { + err = client.Set(context.Background(), UserRateLimitSpecificKey(userID, cmdType), "", ttl).Err() + if err != nil { + log.Println(err) + } + } +} + +func IncrementRateLimitExceed(client *redis.Client, userID string) bool { + t := time.Now().Unix() + _, err := client.ZAdd(context.Background(), UserSoftbanCountKey(userID), &redis.Z{ + Score: float64(t), + Member: float64(t), + }).Result() + if err != nil { + log.Println(err) + } + + beforeStr := fmt.Sprintf("%d", time.Now().Add(-SoftbanExpiration).Unix()) + + count, err := client.ZCount(context.Background(), UserSoftbanCountKey(userID), + beforeStr, + fmt.Sprintf("%d", t), + ).Result() + if err != nil { + log.Println(err) + } + if count > SoftbanThreshold { + softbanUser(client, userID) + return true + } + + go client.ZRemRangeByScore(context.Background(), UserSoftbanCountKey(userID), "-inf", beforeStr) + + return false +} + +func softbanUser(client *redis.Client, userID string) { + err := client.Set(context.Background(), UserSoftbanKey(userID), "", SoftbanDuration).Err() + if err != nil { + log.Println(err) + } +} + +func IsUserBanned(client *redis.Client, userID string) bool { + v, err := client.Exists(context.Background(), UserSoftbanKey(userID)).Result() + if err != nil { + log.Println(err) + return false + } + return v == 1 // =1 means the user is present, and thus rate-limited +} + +func IsUserRateLimitedGeneral(client *redis.Client, userID string) bool { + v, err := client.Exists(context.Background(), UserRateLimitGeneralKey(userID)).Result() + if err != nil { + log.Println(err) + return false + } + return v == 1 // =1 means the user is present, and thus rate-limited +} + +func IsUserRateLimitedSpecific(client *redis.Client, userID string, cmdType string) bool { + v, err := client.Exists(context.Background(), UserRateLimitSpecificKey(userID, cmdType)).Result() + if err != nil { + log.Println(err) + return false + } + return v == 1 // =1 means the user is present, and thus rate-limited +} diff --git a/main.go b/main.go index 367b0c1..7458cf7 100644 --- a/main.go +++ b/main.go @@ -11,13 +11,13 @@ import ( "time" ) -const MockRedis = false - const DefaultGalactusPort = "5858" + const DefaultMaxRequests5Sec int64 = 7 const DefaultMaxWorkers = 8 const DefaultCaptureBotTimeout = time.Second const DefaultTaskTimeout = time.Second * 10 +const DefaultBotPrefix = ".au" func main() { logger, err := zap.NewProduction() @@ -92,6 +92,11 @@ func main() { zap.Int("default", maxWorkers)) } + botPrefix := DefaultBotPrefix + if os.Getenv("AUTOMUTEUS_GLOBAL_PREFIX") != "" { + botPrefix = os.Getenv("AUTOMUTEUS_GLOBAL_PREFIX") + } + logger.Info("loaded env", zap.String("DISCORD_BOT_TOKEN", botToken), zap.String("REDIS_ADDR", redisAddr), @@ -100,9 +105,10 @@ func main() { zap.Int("MAX_REQ_5_SEC", int(maxReq)), zap.Int("MAX_WORKERS", maxWorkers), zap.Int64("ACK_TIMEOUT_MS", captureAckTimeout.Milliseconds()), + zap.String("AUTOMUTEUS_GLOBAL_PREFIX", botPrefix), ) - tp := galactus.NewGalactusAPI(logger, MockRedis, botToken, redisAddr, redisUser, redisPass, maxReq) + tp := galactus.NewGalactusAPI(logger, botToken, redisAddr, redisUser, redisPass, maxReq, botToken) sc := make(chan os.Signal, 1) signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill) diff --git a/pkg/client/client.go b/pkg/client/client.go index 1ada628..81048f9 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -50,7 +50,7 @@ func NewGalactusClient(address string, logger *zap.Logger) (*GalactusClient, err guildCreateHandlers: make([]func(m discordgo.GuildCreate), 0), genericCaptureHandlers: make(map[string][]func(m capture.Event)), } - r, err := http.Get(gc.Address + "/") + r, err := http.Get(gc.Address + endpoint.GeneralRoute + "/") if err != nil { return &gc, err } @@ -103,9 +103,9 @@ func (galactus *GalactusClient) StartPolling(pollingType PollingType, connectCod var url string switch pollingType { case DiscordPolling: - url = galactus.Address + endpoint.RequestJob + url = endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.RequestJob) case CapturePolling: - url = galactus.Address + endpoint.GetCaptureEventPartial + connectCode + url = endpoint.FormGalactusURL(galactus.Address, endpoint.CaptureRoute, endpoint.GetCaptureEventPartial) } req, err := http.NewRequest("POST", url, bytes.NewBufferString("")) if err != nil { From f769534c74947997eba7aade4186da87c2eb9510 Mon Sep 17 00:00:00 2001 From: denverquane Date: Wed, 20 Jan 2021 21:24:45 -0700 Subject: [PATCH 23/50] Filter reactions and voice messages, fixed client endpoint (again) --- internal/handler/message_create.go | 4 +-- internal/handler/message_reaction_add.go | 8 ++++++ internal/handler/voice_state.go | 17 ++++++++++-- internal/redis/game.go | 33 ++++++++++++++++++++++++ pkg/endpoint/url.go | 7 +++-- 5 files changed, 63 insertions(+), 6 deletions(-) create mode 100644 internal/redis/game.go diff --git a/internal/handler/message_create.go b/internal/handler/message_create.go index a726aba..599eb1c 100644 --- a/internal/handler/message_create.go +++ b/internal/handler/message_create.go @@ -62,10 +62,10 @@ func MessageCreateHandler(logger *zap.Logger, client *redis.Client, globalPrefix return } - m.Content = stripPrefix(m.Content, detectedPrefix) - // TODO softban the users at this level; bot logic shouldn't have to worry about it + m.Content = stripPrefix(m.Content, detectedPrefix) + byt, err := json.Marshal(m) if err != nil { logger.Error("error marshalling json for MessageCreate message", diff --git a/internal/handler/message_reaction_add.go b/internal/handler/message_reaction_add.go index 6967e02..83e972e 100644 --- a/internal/handler/message_reaction_add.go +++ b/internal/handler/message_reaction_add.go @@ -1,9 +1,11 @@ package handler import ( + "context" "encoding/json" redis_utils "github.com/automuteus/galactus/internal/redis" "github.com/automuteus/galactus/pkg/discord_message" + "github.com/automuteus/utils/pkg/rediskey" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" "go.uber.org/zap" @@ -20,6 +22,12 @@ func MessageReactionAddHandler(logger *zap.Logger, client *redis.Client) func(s return } + // if no active games in this text channel, completely ignore this message reaction message + res, err := client.Exists(context.Background(), rediskey.TextChannelPtr(m.GuildID, m.ChannelID)).Result() + if err != nil || res == 0 { + return + } + byt, err := json.Marshal(m) if err != nil { logger.Error("error marshalling json for MessageReactionAdd message", diff --git a/internal/handler/voice_state.go b/internal/handler/voice_state.go index 30b865b..2a2f3fc 100644 --- a/internal/handler/voice_state.go +++ b/internal/handler/voice_state.go @@ -11,8 +11,21 @@ import ( func VoiceStateUpdateHandler(logger *zap.Logger, client *redis.Client) func(s *discordgo.Session, m *discordgo.VoiceStateUpdate) { return func(s *discordgo.Session, m *discordgo.VoiceStateUpdate) { - // TODO filter voice changes when a game isn't happening in this guild. - // probably won't work to filter changes just by the voice channel ID; results in ppl not being unmuted when they leave the VC + if m == nil { + return + } + // ignore the bot + if m.UserID == s.State.User.ID { + return + } + + // if no active games, completely ignore message reactions + if !redis_utils.AnyActiveGamesInGuild(client, m.GuildID) { + return + } + + // a game is happening in this guild; in the background, make sure it's pruned of inactive games + go redis_utils.PurgeOldGuildGames(client, m.GuildID) byt, err := json.Marshal(m) if err != nil { diff --git a/internal/redis/game.go b/internal/redis/game.go new file mode 100644 index 0000000..5446b48 --- /dev/null +++ b/internal/redis/game.go @@ -0,0 +1,33 @@ +package redis + +import ( + "context" + "fmt" + "github.com/automuteus/utils/pkg/rediskey" + "github.com/go-redis/redis/v8" + "time" +) + +// 15 minute timeout +const GameTimeoutSeconds = 900 + +// only deletes from the guild's responsibility, NOT the entire guild counter! +func AnyActiveGamesInGuild(client *redis.Client, guildID string) bool { + hash := rediskey.ActiveGamesForGuild(guildID) + + games, err := client.ZCard(context.Background(), hash).Result() + + if err != nil { + return false + } + + return games > 0 +} + +func PurgeOldGuildGames(client *redis.Client, guildID string) { + hash := rediskey.ActiveGamesForGuild(guildID) + + before := time.Now().Add(-time.Second * GameTimeoutSeconds).Unix() + + client.ZRemRangeByScore(context.Background(), hash, "-inf", fmt.Sprintf("%d", before)) +} diff --git a/pkg/endpoint/url.go b/pkg/endpoint/url.go index 7cfa245..58098ad 100644 --- a/pkg/endpoint/url.go +++ b/pkg/endpoint/url.go @@ -2,8 +2,11 @@ package endpoint func FormGalactusURL(address, baseRoute, endpoint string, childPaths ...string) (url string) { url = address + baseRoute + endpoint - for _, v := range childPaths { - url += v + "/" + for i, v := range childPaths { + url += v + if i < len(childPaths)-1 { + url += "/" + } } return } From f4ec706572585dfec3a7842e9f25d544ae81045f Mon Sep 17 00:00:00 2001 From: denverquane Date: Wed, 20 Jan 2021 21:52:57 -0700 Subject: [PATCH 24/50] Fixed router, added user softban/ratelimit for reactions and messages --- internal/galactus/server.go | 4 ++-- internal/handler/message_create.go | 15 +++++++++++++-- internal/handler/message_reaction_add.go | 13 +++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/internal/galactus/server.go b/internal/galactus/server.go index 8822768..f8a9082 100644 --- a/internal/galactus/server.go +++ b/internal/galactus/server.go @@ -163,6 +163,8 @@ func (galactus *GalactusAPI) Run(port string, maxWorkers int, captureAckTimeout generalRouter.HandleFunc("/", galactus.indexHandler()).Methods("GET") + discordRouter.HandleFunc(endpoint.JobCount, galactus.jobCount()).Methods("GET") + discordRouter.HandleFunc(endpoint.RequestJob, galactus.requestJobHandler(taskTimeout)).Methods("POST") discordRouter.HandleFunc(endpoint.ModifyUserFull, galactus.modifyUserHandler(maxWorkers, captureAckTimeout)).Methods("POST") discordRouter.HandleFunc(endpoint.SendMessageFull, galactus.SendChannelMessageHandler()).Methods("POST") discordRouter.HandleFunc(endpoint.SendMessageEmbedFull, galactus.SendChannelMessageEmbedHandler()).Methods("POST") @@ -181,12 +183,10 @@ func (galactus *GalactusAPI) Run(port string, maxWorkers int, captureAckTimeout settingsRouter.HandleFunc(endpoint.GetGuildAMUSettingsFull, galactus.GetGuildAMUSettings()).Methods("POST") - captureRouter.HandleFunc(endpoint.JobCount, galactus.jobCount()).Methods("GET") captureRouter.HandleFunc(endpoint.GetCaptureTaskFull, galactus.GetCaptureTaskHandler(taskTimeout)).Methods("POST") captureRouter.HandleFunc(endpoint.SetCaptureTaskStatusFull, galactus.SetCaptureTaskStatusHandler()).Methods("POST") captureRouter.HandleFunc(endpoint.AddCaptureEventFull, galactus.AddCaptureEventHandler()).Methods("POST") captureRouter.HandleFunc(endpoint.GetCaptureEventFull, galactus.GetCaptureEventHandler(taskTimeout)).Methods("POST") - captureRouter.HandleFunc(endpoint.RequestJob, galactus.requestJobHandler(taskTimeout)).Methods("POST") galactus.logger.Info("galactus is running", zap.String("port", port), diff --git a/internal/handler/message_create.go b/internal/handler/message_create.go index 599eb1c..428bf23 100644 --- a/internal/handler/message_create.go +++ b/internal/handler/message_create.go @@ -62,7 +62,18 @@ func MessageCreateHandler(logger *zap.Logger, client *redis.Client, globalPrefix return } - // TODO softban the users at this level; bot logic shouldn't have to worry about it + if redis_utils.IsUserRateLimitedGeneral(client, m.Author.ID) { + // record the violation with this call + if redis_utils.IncrementRateLimitExceed(client, m.Author.ID) { + // NOTE user is banned here + + return + } else { + // NOTE user is warned here + return + } + } + redis_utils.MarkUserRateLimit(client, m.Author.ID, "", 0) m.Content = stripPrefix(m.Content, detectedPrefix) @@ -88,7 +99,7 @@ func MessageCreateHandler(logger *zap.Logger, client *redis.Client, globalPrefix } func stripPrefix(msg, prefix string) string { - newMsg := strings.Replace(msg, prefix+"", "", 1) + newMsg := strings.Replace(msg, prefix+" ", "", 1) // didn't substitute anything if len(newMsg) == len(msg) { return strings.Replace(msg, prefix, "", 1) diff --git a/internal/handler/message_reaction_add.go b/internal/handler/message_reaction_add.go index 83e972e..e51a9ff 100644 --- a/internal/handler/message_reaction_add.go +++ b/internal/handler/message_reaction_add.go @@ -28,6 +28,19 @@ func MessageReactionAddHandler(logger *zap.Logger, client *redis.Client) func(s return } + if redis_utils.IsUserRateLimitedGeneral(client, m.UserID) { + // record the violation with this call + if redis_utils.IncrementRateLimitExceed(client, m.UserID) { + // NOTE user is banned here + + return + } else { + // NOTE user is warned here + return + } + } + redis_utils.MarkUserRateLimit(client, m.UserID, "", 0) + byt, err := json.Marshal(m) if err != nil { logger.Error("error marshalling json for MessageReactionAdd message", From 2f5ef14a0adec5b3ba68b57f98119823dde0671f Mon Sep 17 00:00:00 2001 From: denverquane Date: Thu, 21 Jan 2021 23:13:41 -0700 Subject: [PATCH 25/50] Fixed erroneous endpoint for client's getCaptureEvent --- internal/handler/message_create.go | 21 +++++++++++---------- main.go | 4 +--- pkg/client/capture.go | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/internal/handler/message_create.go b/internal/handler/message_create.go index 428bf23..a42ae70 100644 --- a/internal/handler/message_create.go +++ b/internal/handler/message_create.go @@ -41,19 +41,20 @@ func MessageCreateHandler(logger *zap.Logger, client *redis.Client, globalPrefix } detectedPrefix := "" - sett, err := redis_utils.GetSettingsFromRedis(client, m.GuildID) - - if sett != nil && err == nil { - if strings.HasPrefix(m.Content, sett.CommandPrefix) { - detectedPrefix = sett.CommandPrefix - } + if strings.HasPrefix(m.Content, "<@!"+s.State.User.ID+">") { + detectedPrefix = "<@!" + s.State.User.ID + ">" + } else if strings.HasPrefix(m.Content, globalPrefix) { + detectedPrefix = globalPrefix } if detectedPrefix == "" { - if strings.HasPrefix(m.Content, "<@!"+s.State.User.ID+">") { - detectedPrefix = "<@!" + s.State.User.ID + ">" - } else if strings.HasPrefix(m.Content, globalPrefix) { - detectedPrefix = globalPrefix + // TODO this is called every time a message is posted in any channel of any guild... + // need a more optimal store in Redis so we don't need to unmarshal an ENTIRE settings object every time + sett, err := redis_utils.GetSettingsFromRedis(client, m.GuildID) + if sett != nil && err == nil { + if strings.HasPrefix(m.Content, sett.CommandPrefix) { + detectedPrefix = sett.CommandPrefix + } } } diff --git a/main.go b/main.go index 7458cf7..67d44c7 100644 --- a/main.go +++ b/main.go @@ -45,8 +45,8 @@ func main() { redisUser := os.Getenv("REDIS_USER") redisPass := os.Getenv("REDIS_PASS") - maxReq5Sec := os.Getenv("MAX_REQ_5_SEC") maxReq := DefaultMaxRequests5Sec + maxReq5Sec := os.Getenv("MAX_REQ_5_SEC") if maxReq5Sec != "" { num, err := strconv.ParseInt(maxReq5Sec, 10, 64) if err == nil { @@ -58,7 +58,6 @@ func main() { } captureAckTimeout := DefaultCaptureBotTimeout - captureAckTimeoutStr := os.Getenv("ACK_TIMEOUT_MS") num, err := strconv.ParseInt(captureAckTimeoutStr, 10, 64) if err == nil { @@ -70,7 +69,6 @@ func main() { } taskTimeout := DefaultTaskTimeout - taskTimeoutStr := os.Getenv("TASK_TIMEOUT_MS") num, err = strconv.ParseInt(taskTimeoutStr, 10, 64) if err == nil { diff --git a/pkg/client/capture.go b/pkg/client/capture.go index 22a33b4..08ea1a1 100644 --- a/pkg/client/capture.go +++ b/pkg/client/capture.go @@ -15,7 +15,7 @@ import ( func (galactus *GalactusClient) AddCaptureEvent(connectCode string, event capture.Event) error { str := strconv.FormatInt(int64(event.EventType), 10) - url := endpoint.FormGalactusURL(galactus.Address, endpoint.CaptureRoute, endpoint.GetCaptureEventPartial, connectCode, str) + url := endpoint.FormGalactusURL(galactus.Address, endpoint.CaptureRoute, endpoint.AddCaptureEventPartial, connectCode, str) resp, err := galactus.client.Post(url, "application/json", bytes.NewBuffer(event.Payload)) if err != nil { return err From 0e63c62447dc2aaf9c820f5b662f7c50e2ed9f42 Mon Sep 17 00:00:00 2001 From: denverquane Date: Thu, 21 Jan 2021 23:30:26 -0700 Subject: [PATCH 26/50] Rename discord job endpoints, fix capture endpoint --- internal/galactus/server.go | 10 +++++----- pkg/client/client.go | 4 ++-- pkg/endpoint/capture.go | 3 --- pkg/endpoint/discord.go | 3 +++ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/galactus/server.go b/internal/galactus/server.go index f8a9082..d5a6ef0 100644 --- a/internal/galactus/server.go +++ b/internal/galactus/server.go @@ -163,8 +163,8 @@ func (galactus *GalactusAPI) Run(port string, maxWorkers int, captureAckTimeout generalRouter.HandleFunc("/", galactus.indexHandler()).Methods("GET") - discordRouter.HandleFunc(endpoint.JobCount, galactus.jobCount()).Methods("GET") - discordRouter.HandleFunc(endpoint.RequestJob, galactus.requestJobHandler(taskTimeout)).Methods("POST") + discordRouter.HandleFunc(endpoint.DiscordJobCount, galactus.jobCount()).Methods("GET") + discordRouter.HandleFunc(endpoint.DiscordJobRequest, galactus.requestJobHandler(taskTimeout)).Methods("POST") discordRouter.HandleFunc(endpoint.ModifyUserFull, galactus.modifyUserHandler(maxWorkers, captureAckTimeout)).Methods("POST") discordRouter.HandleFunc(endpoint.SendMessageFull, galactus.SendChannelMessageHandler()).Methods("POST") discordRouter.HandleFunc(endpoint.SendMessageEmbedFull, galactus.SendChannelMessageEmbedHandler()).Methods("POST") @@ -249,14 +249,14 @@ func (galactus *GalactusAPI) requestJobHandler(timeout time.Duration) func(w htt w.WriteHeader(http.StatusInternalServerError) w.Write([]byte("{\"error\": \"" + err.Error() + "\"}")) galactus.logger.Error("redis error when popping job", - zap.String("endpoint", endpoint.RequestJob), + zap.String("endpoint", endpoint.DiscordJobRequest), zap.Error(err)) return case msg == "": w.WriteHeader(http.StatusInternalServerError) w.Write([]byte("{\"error\": \"Nil job returned, despite no Redis errors\"}")) galactus.logger.Error("nil job returned, despite no Redis errors", - zap.String("endpoint", endpoint.RequestJob)) + zap.String("endpoint", endpoint.DiscordJobRequest)) return } @@ -265,7 +265,7 @@ func (galactus *GalactusAPI) requestJobHandler(timeout time.Duration) func(w htt _, err = w.Write([]byte(msg)) if err != nil { galactus.logger.Error("failed to write job as HTTP response", - zap.String("endpoint", endpoint.RequestJob), + zap.String("endpoint", endpoint.DiscordJobRequest), zap.Error(err), ) } diff --git a/pkg/client/client.go b/pkg/client/client.go index 81048f9..7b7b748 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -103,9 +103,9 @@ func (galactus *GalactusClient) StartPolling(pollingType PollingType, connectCod var url string switch pollingType { case DiscordPolling: - url = endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.RequestJob) + url = endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.DiscordJobRequest) case CapturePolling: - url = endpoint.FormGalactusURL(galactus.Address, endpoint.CaptureRoute, endpoint.GetCaptureEventPartial) + url = endpoint.FormGalactusURL(galactus.Address, endpoint.CaptureRoute, endpoint.GetCaptureEventPartial, connectCode) } req, err := http.NewRequest("POST", url, bytes.NewBufferString("")) if err != nil { diff --git a/pkg/endpoint/capture.go b/pkg/endpoint/capture.go index 3b2a576..f7860a1 100644 --- a/pkg/endpoint/capture.go +++ b/pkg/endpoint/capture.go @@ -2,9 +2,6 @@ package endpoint const CaptureRoute = "/api/capture" -const JobCount = "/totalJobs" -const RequestJob = "/request/job" - const AddCaptureEventPartial = "/addCaptureEvent/" const AddCaptureEventFull = AddCaptureEventPartial + "{connectCode}/{eventType}" diff --git a/pkg/endpoint/discord.go b/pkg/endpoint/discord.go index 5843c4b..501d972 100644 --- a/pkg/endpoint/discord.go +++ b/pkg/endpoint/discord.go @@ -2,6 +2,9 @@ package endpoint const DiscordRoute = "/api/discord" +const DiscordJobCount = "/job/count" +const DiscordJobRequest = "/job/request" + const SendMessagePartial = "/sendMessage/" const SendMessageFull = SendMessagePartial + "{channelID}" From 6bc1c75360c888104e6bf17c31617d53b6db896d Mon Sep 17 00:00:00 2001 From: denverquane Date: Sat, 23 Jan 2021 20:24:24 -0700 Subject: [PATCH 27/50] Separated Discord/Capture polling, proper HTTP request cancellation on StopPolling --- pkg/client/client.go | 132 +---------------------------- pkg/client/client_test.go | 91 ++++++++++++++++++++ pkg/client/polling.go | 174 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 268 insertions(+), 129 deletions(-) create mode 100644 pkg/client/client_test.go create mode 100644 pkg/client/polling.go diff --git a/pkg/client/client.go b/pkg/client/client.go index 7b7b748..1572fe1 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -1,7 +1,6 @@ package galactus_client import ( - "bytes" "encoding/json" "errors" "github.com/automuteus/galactus/pkg/discord_message" @@ -10,9 +9,7 @@ import ( "github.com/automuteus/utils/pkg/capture" "github.com/bwmarrin/discordgo" "go.uber.org/zap" - "io/ioutil" "net/http" - "time" ) type GalactusClient struct { @@ -62,111 +59,6 @@ func NewGalactusClient(address string, logger *zap.Logger) (*GalactusClient, err return &gc, nil } -type PollingType int - -const ( - DiscordPolling PollingType = iota - CapturePolling -) - -func (galactus *GalactusClient) StartPolling(pollingType PollingType, connectCode string) error { - var channel chan struct{} - if pollingType == CapturePolling { - valid, err := validate.ValidConnectCode(connectCode) - if !valid { - return err - } - if _, ok := galactus.captureKillChannels[connectCode]; ok { - return errors.New("already polling for capture events for connect code " + connectCode) - } - galactus.captureKillChannels[connectCode] = make(chan struct{}) - channel = galactus.captureKillChannels[connectCode] - } else { - if galactus.discordKillChannel != nil { - return errors.New("already polling for discord events") - } - galactus.discordKillChannel = make(chan struct{}) - channel = galactus.discordKillChannel - } - - connected := false - requestCancelChannel := make(chan struct{}) - - go func() { - for { - select { - case <-channel: - requestCancelChannel <- struct{}{} - return - - default: - var url string - switch pollingType { - case DiscordPolling: - url = endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.DiscordJobRequest) - case CapturePolling: - url = endpoint.FormGalactusURL(galactus.Address, endpoint.CaptureRoute, endpoint.GetCaptureEventPartial, connectCode) - } - req, err := http.NewRequest("POST", url, bytes.NewBufferString("")) - if err != nil { - galactus.logger.Error("invalid url provided to galactus client", - zap.String("url", url)) - break - } - req.Cancel = requestCancelChannel - - response, err := http.DefaultClient.Do(req) - if err != nil { - connected = false - galactus.logger.Error("could not reach galactus", - zap.Error(err), - zap.String("url", url)) - galactus.logger.Info("waiting 1 second before retrying") - time.Sleep(time.Second * 1) - } else { - if !connected { - galactus.logger.Info("successful connection to galactus") - connected = true - } - body, err := ioutil.ReadAll(response.Body) - if err != nil { - galactus.logger.Error("error reading http response from galactus", - zap.Error(err), - zap.String("url", url), - zap.ByteString("message", body)) - } else if response.StatusCode == http.StatusOK { - switch pollingType { - case DiscordPolling: - var msg discord_message.DiscordMessage - err := json.Unmarshal(body, &msg) - if err != nil { - galactus.logger.Error("error unmarshalling discord message from galactus", - zap.Error(err), - zap.ByteString("message", body)) - } else { - galactus.dispatchDiscordMessage(msg) - } - case CapturePolling: - var msg capture.Event - err := json.Unmarshal(body, &msg) - if err != nil { - galactus.logger.Error("error unmarshalling capture message from galactus", - zap.Error(err), - zap.ByteString("message", body)) - } else { - galactus.dispatchCaptureMessage(connectCode, msg) - } - } - - } - response.Body.Close() - } - } - } - }() - return nil -} - func (galactus *GalactusClient) dispatchDiscordMessage(msg discord_message.DiscordMessage) { switch msg.MessageType { case discord_message.MessageCreate: @@ -240,27 +132,6 @@ func (galactus *GalactusClient) dispatchCaptureMessage(connectCode string, msg c } } -func (galactus *GalactusClient) StopCapturePolling(connectCode string) { - if galactus.captureKillChannels[connectCode] != nil { - galactus.captureKillChannels[connectCode] <- struct{}{} - } - delete(galactus.captureKillChannels, connectCode) -} - -func (galactus *GalactusClient) StopDiscordPolling() { - if galactus.discordKillChannel != nil { - galactus.discordKillChannel <- struct{}{} - } - galactus.discordKillChannel = nil -} - -func (galactus *GalactusClient) StopAllPolling() { - galactus.StopDiscordPolling() - for i := range galactus.captureKillChannels { - galactus.StopCapturePolling(i) - } -} - func (galactus *GalactusClient) RegisterDiscordHandler(msgType discord_message.DiscordMessageType, f interface{}) bool { registered := false switch msgType { @@ -291,6 +162,9 @@ func (galactus *GalactusClient) RegisterDiscordHandler(msgType discord_message.D } func (galactus *GalactusClient) RegisterCaptureHandler(connectCode string, f interface{}) bool { + if len(connectCode) != validate.ConnectCodeLength { + return false + } if handlers, ok := galactus.genericCaptureHandlers[connectCode]; ok { handlers = append(handlers, f.(func(msg capture.Event))) galactus.genericCaptureHandlers[connectCode] = handlers diff --git a/pkg/client/client_test.go b/pkg/client/client_test.go new file mode 100644 index 0000000..f8afdcb --- /dev/null +++ b/pkg/client/client_test.go @@ -0,0 +1,91 @@ +package galactus_client + +import ( + "github.com/automuteus/utils/pkg/capture" + "go.uber.org/zap" + "log" + "sync" + "testing" + "time" +) + +const TOTAL_TASKS = 10000 + +func TestNewGalactusClientRepeatedPolling(t *testing.T) { + logger, _ := zap.NewProduction() + + client, err := NewGalactusClient("http://localhost:5858", logger) + if err != nil { + log.Println(err) + t.Fail() + } + + // even if we never made any handlers, this shouldn't crash + err = client.StartDiscordPolling() + if err != nil { + log.Println(err) + t.Fail() + } + + err = client.StartDiscordPolling() + if err == nil { + log.Println("expected error thrown from starting polling after already polling") + t.Fail() + } + + client.StopDiscordPolling() + client.StopAllPolling() +} + +func TestNewGalactusClientCapture(t *testing.T) { + logger, _ := zap.NewProduction() + + client, err := NewGalactusClient("http://localhost:5858", logger) + if err != nil { + log.Println(err) + t.Fail() + } + + counter := 0 + + wg := sync.WaitGroup{} + wg.Add(1) + + f := func(event capture.Event) { + counter++ + if counter == TOTAL_TASKS { + wg.Done() + } + + } + cCode := "ABCDEFGH" + + client.RegisterCaptureHandler(cCode, f) + + start := time.Now() + for i := 0; i < TOTAL_TASKS; i++ { + err := client.AddCaptureEvent(cCode, capture.Event{ + EventType: capture.GameOver, + Payload: nil, + }) + if err != nil { + log.Println(err) + t.Fail() + } + } + log.Println(time.Now().Sub(start).String() + " to add all events") + + start = time.Now() + err = client.StartCapturePolling(cCode) + if err != nil { + log.Println(err) + t.Fail() + } + + wg.Wait() + log.Println(time.Now().Sub(start).String() + " to process all events") + + //client.StopAllPolling() + client.StopCapturePolling(cCode) + +} diff --git a/pkg/client/polling.go b/pkg/client/polling.go new file mode 100644 index 0000000..49cbfa5 --- /dev/null +++ b/pkg/client/polling.go @@ -0,0 +1,174 @@ +package galactus_client + +import ( + "bytes" + "context" + "encoding/json" + "errors" + "github.com/automuteus/galactus/pkg/discord_message" + "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/galactus/pkg/validate" + "github.com/automuteus/utils/pkg/capture" + "go.uber.org/zap" + "io/ioutil" + "net/http" + "time" +) + +func (galactus *GalactusClient) StartCapturePolling(connectCode string) error { + valid, err := validate.ValidConnectCode(connectCode) + if !valid { + return err + } + if _, ok := galactus.captureKillChannels[connectCode]; ok { + return errors.New("already polling for capture events for connect code " + connectCode) + } + galactus.captureKillChannels[connectCode] = make(chan struct{}) + + connected := false + + ctx, cancelRequest := context.WithCancel(context.Background()) + + url := endpoint.FormGalactusURL(galactus.Address, endpoint.CaptureRoute, endpoint.GetCaptureEventPartial, connectCode) + go func() { + for { + <-galactus.captureKillChannels[connectCode] + cancelRequest() + delete(galactus.captureKillChannels, connectCode) + return + } + }() + + go func() { + for { + req, err := http.NewRequest("POST", url, bytes.NewBufferString("")) + if err != nil { + galactus.logger.Error("invalid url provided to galactus client", + zap.String("url", url)) + break + } + // if we're told to stop polling, we'd better do so + req.WithContext(ctx) + + response, err := http.DefaultClient.Do(req) + if err != nil { + connected = false + galactus.logger.Error("could not reach galactus", + zap.Error(err), + zap.String("url", url)) + galactus.logger.Info("waiting 1 second before retrying") + time.Sleep(time.Second * 1) + } else { + if !connected { + galactus.logger.Info("successful connection to galactus") + connected = true + } + body, err := ioutil.ReadAll(response.Body) + if err != nil { + galactus.logger.Error("error reading http response from galactus", + zap.Error(err), + zap.String("url", url), + zap.ByteString("message", body)) + } else if response.StatusCode == http.StatusOK { + var msg capture.Event + err := json.Unmarshal(body, &msg) + if err != nil { + galactus.logger.Error("error unmarshalling capture message from galactus", + zap.Error(err), + zap.ByteString("message", body)) + } else { + galactus.dispatchCaptureMessage(connectCode, msg) + } + } + response.Body.Close() + } + } + }() + return nil +} + +func (galactus *GalactusClient) StartDiscordPolling() error { + if galactus.discordKillChannel != nil { + return errors.New("already polling for discord events") + } + galactus.discordKillChannel = make(chan struct{}) + + connected := false + ctx, cancelRequest := context.WithCancel(context.Background()) + + url := endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.DiscordJobRequest) + + go func() { + for { + <-galactus.discordKillChannel + cancelRequest() + galactus.discordKillChannel = nil + return + } + }() + + go func() { + for { + req, err := http.NewRequest("POST", url, bytes.NewBufferString("")) + if err != nil { + galactus.logger.Error("invalid url provided to galactus client", + zap.String("url", url)) + break + } + req.WithContext(ctx) + + response, err := http.DefaultClient.Do(req) + if err != nil { + connected = false + galactus.logger.Error("could not reach galactus", + zap.Error(err), + zap.String("url", url)) + galactus.logger.Info("waiting 1 second before retrying") + time.Sleep(time.Second * 1) + } else { + if !connected { + galactus.logger.Info("successful connection to galactus") + connected = true + } + body, err := ioutil.ReadAll(response.Body) + if err != nil { + galactus.logger.Error("error reading http response from galactus", + zap.Error(err), + zap.String("url", url), + zap.ByteString("message", body)) + } else if response.StatusCode == http.StatusOK { + var msg discord_message.DiscordMessage + err := json.Unmarshal(body, &msg) + if err != nil { + galactus.logger.Error("error unmarshalling discord message from galactus", + zap.Error(err), + zap.ByteString("message", body)) + } else { + galactus.dispatchDiscordMessage(msg) + } + } + response.Body.Close() + } + } + }() + return nil +} + +func (galactus *GalactusClient) StopCapturePolling(connectCode string) { + if galactus.captureKillChannels[connectCode] != nil { + galactus.captureKillChannels[connectCode] <- struct{}{} + } +} + +func (galactus *GalactusClient) StopDiscordPolling() { + if galactus.discordKillChannel != nil { + galactus.discordKillChannel <- struct{}{} + } +} + +func (galactus *GalactusClient) StopAllPolling() { + galactus.StopDiscordPolling() + for i := range galactus.captureKillChannels { + galactus.StopCapturePolling(i) + } +} From 2150b3740efde7e0e6c95fd85c39817a289685d0 Mon Sep 17 00:00:00 2001 From: denverquane Date: Sun, 24 Jan 2021 13:39:43 -0700 Subject: [PATCH 28/50] Allow context cancellation of client HTTP request for "getTask" --- pkg/client/capture.go | 18 ++++++++++++++++-- pkg/client/polling.go | 4 ++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/pkg/client/capture.go b/pkg/client/capture.go index 08ea1a1..b81520a 100644 --- a/pkg/client/capture.go +++ b/pkg/client/capture.go @@ -2,6 +2,7 @@ package galactus_client import ( "bytes" + "context" "encoding/json" "errors" "github.com/automuteus/galactus/pkg/endpoint" @@ -65,9 +66,22 @@ func (galactus *GalactusClient) GetCaptureEvent(connectCode string) (*capture.Ev return &event, nil } -func (galactus *GalactusClient) GetCaptureTask(connectCode string) (*discord.ModifyTask, error) { +func (galactus *GalactusClient) GetCaptureTask(ctx context.Context, connectCode string) (*discord.ModifyTask, error) { url := endpoint.FormGalactusURL(galactus.Address, endpoint.CaptureRoute, endpoint.GetCaptureTaskPartial, connectCode) - resp, err := galactus.client.Post(url, "application/json", bytes.NewBufferString("")) + + req, err := http.NewRequest("POST", url, bytes.NewBufferString("")) + if err != nil { + galactus.logger.Error("invalid URL provided to Galactus client", + zap.Error(err), + zap.String("url", url), + ) + return nil, err + } + + // allows the request to be abandoned if it is cancelled by the caller + req.WithContext(ctx) + + resp, err := galactus.client.Do(req) if err != nil { return nil, err } diff --git a/pkg/client/polling.go b/pkg/client/polling.go index 49cbfa5..6697700 100644 --- a/pkg/client/polling.go +++ b/pkg/client/polling.go @@ -43,7 +43,7 @@ func (galactus *GalactusClient) StartCapturePolling(connectCode string) error { for { req, err := http.NewRequest("POST", url, bytes.NewBufferString("")) if err != nil { - galactus.logger.Error("invalid url provided to galactus client", + galactus.logger.Error("invalid URL provided to galactus client", zap.String("url", url)) break } @@ -111,7 +111,7 @@ func (galactus *GalactusClient) StartDiscordPolling() error { for { req, err := http.NewRequest("POST", url, bytes.NewBufferString("")) if err != nil { - galactus.logger.Error("invalid url provided to galactus client", + galactus.logger.Error("invalid URL provided to galactus client", zap.String("url", url)) break } From 1417a10b736ae848526665176409e8745fd1ecd7 Mon Sep 17 00:00:00 2001 From: denverquane Date: Sun, 24 Jan 2021 13:49:45 -0700 Subject: [PATCH 29/50] All outgoing Discord requests on session 0 to respect rate-limits --- internal/galactus/create_user_channel.go | 13 ++-- internal/galactus/guild.go | 61 ++++++++----------- internal/galactus/message.go | 51 +++++++--------- internal/galactus/modify.go | 8 +-- internal/galactus/reaction.go | 41 ++++++------- .../galactus/shard_manager/shard_manager.go | 20 ------ 6 files changed, 71 insertions(+), 123 deletions(-) diff --git a/internal/galactus/create_user_channel.go b/internal/galactus/create_user_channel.go index defeb2e..4cb029f 100644 --- a/internal/galactus/create_user_channel.go +++ b/internal/galactus/create_user_channel.go @@ -2,7 +2,6 @@ package galactus import ( "encoding/json" - "github.com/automuteus/galactus/internal/galactus/shard_manager" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" "go.uber.org/zap" @@ -16,14 +15,12 @@ func (galactus *GalactusAPI) CreateUserChannelHandler() func(w http.ResponseWrit return } - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for getGuildMember" - galactus.logger.Error(errMsg, - zap.Error(err), - ) + sess := galactus.shardManager.Session(0) + if sess == nil { + errMsg := "error obtaining session 0 for " + endpoint.UserChannelCreateFull + galactus.logger.Error(errMsg) w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) + w.Write([]byte(errMsg)) return } channel, err := sess.UserChannelCreate(userID) diff --git a/internal/galactus/guild.go b/internal/galactus/guild.go index 2a98c18..734ad21 100644 --- a/internal/galactus/guild.go +++ b/internal/galactus/guild.go @@ -2,7 +2,6 @@ package galactus import ( "encoding/json" - "github.com/automuteus/galactus/internal/galactus/shard_manager" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" "go.uber.org/zap" @@ -68,14 +67,12 @@ func (galactus *GalactusAPI) GetGuildChannelsHandler() func(w http.ResponseWrite return } - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for getGuildChannels" - galactus.logger.Error(errMsg, - zap.Error(err), - ) + sess := galactus.shardManager.Session(0) + if sess == nil { + errMsg := "error obtaining session 0 for " + endpoint.GetGuildChannelsFull + galactus.logger.Error(errMsg) w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) + w.Write([]byte(errMsg)) return } channels, err := sess.GuildChannels(guildID) @@ -113,14 +110,12 @@ func (galactus *GalactusAPI) GetGuildEmojisHandler() func(w http.ResponseWriter, return } - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for getGuildChannels" - galactus.logger.Error(errMsg, - zap.Error(err), - ) + sess := galactus.shardManager.Session(0) + if sess == nil { + errMsg := "error obtaining session 0 for " + endpoint.GetGuildEmojisFull + galactus.logger.Error(errMsg) w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) + w.Write([]byte(errMsg)) return } emojis, err := sess.GuildEmojis(guildID) @@ -158,14 +153,12 @@ func (galactus *GalactusAPI) GetGuildMemberHandler() func(w http.ResponseWriter, return } - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for getGuildMember" - galactus.logger.Error(errMsg, - zap.Error(err), - ) + sess := galactus.shardManager.Session(0) + if sess == nil { + errMsg := "error obtaining session 0 for " + endpoint.GetGuildMemberFull + galactus.logger.Error(errMsg) w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) + w.Write([]byte(errMsg)) return } member, err := sess.GuildMember(guildID, userID) @@ -205,14 +198,12 @@ func (galactus *GalactusAPI) GetGuildRolesHandler() func(w http.ResponseWriter, return } - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for getGuildRoles" - galactus.logger.Error(errMsg, - zap.Error(err), - ) + sess := galactus.shardManager.Session(0) + if sess == nil { + errMsg := "error obtaining session 0 for " + endpoint.GetGuildRolesFull + galactus.logger.Error(errMsg) w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) + w.Write([]byte(errMsg)) return } roles, err := sess.GuildRoles(guildID) @@ -268,14 +259,12 @@ func (galactus *GalactusAPI) CreateGuildEmojiHandler() func(w http.ResponseWrite // Addl. constraint for emojis: must be under 256kB - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for sendMessageHandler" - galactus.logger.Error(errMsg, - zap.Error(err), - ) + sess := galactus.shardManager.Session(0) + if sess == nil { + errMsg := "error obtaining session 0 for " + endpoint.CreateGuildEmojiFull + galactus.logger.Error(errMsg) w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) + w.Write([]byte(errMsg)) return } diff --git a/internal/galactus/message.go b/internal/galactus/message.go index c6bfbec..cb5bc56 100644 --- a/internal/galactus/message.go +++ b/internal/galactus/message.go @@ -2,7 +2,6 @@ package galactus import ( "encoding/json" - "github.com/automuteus/galactus/internal/galactus/shard_manager" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" "github.com/bwmarrin/discordgo" @@ -34,14 +33,12 @@ func (galactus *GalactusAPI) SendChannelMessageHandler() func(w http.ResponseWri // TODO perform some validation on the message body? // ex message length, empty contents, etc - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for sendMessageHandler" - galactus.logger.Error(errMsg, - zap.Error(err), - ) + sess := galactus.shardManager.Session(0) + if sess == nil { + errMsg := "error obtaining session 0 for " + endpoint.SendMessageFull + galactus.logger.Error(errMsg) w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) + w.Write([]byte(errMsg)) return } @@ -107,14 +104,12 @@ func (galactus *GalactusAPI) SendChannelMessageEmbedHandler() func(w http.Respon // TODO extra validation here (empty embed fields and the like) - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for sendMessageEmbedHandler" - galactus.logger.Error(errMsg, - zap.Error(err), - ) + sess := galactus.shardManager.Session(0) + if sess == nil { + errMsg := "error obtaining session 0 for " + endpoint.SendMessageEmbedFull + galactus.logger.Error(errMsg) w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) + w.Write([]byte(errMsg)) return } @@ -181,14 +176,12 @@ func (galactus *GalactusAPI) EditMessageEmbedHandler() func(w http.ResponseWrite // TODO perform some validation on the message body? // ex message length, empty contents, etc - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for " + endpoint.EditMessageEmbedFull - galactus.logger.Error(errMsg, - zap.Error(err), - ) + sess := galactus.shardManager.Session(0) + if sess == nil { + errMsg := "error obtaining session 0 for " + endpoint.EditMessageEmbedFull + galactus.logger.Error(errMsg) w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) + w.Write([]byte(errMsg)) return } msg, err := sess.ChannelMessageEditEmbed(channelID, messageID, &embed) @@ -229,17 +222,15 @@ func (galactus *GalactusAPI) DeleteChannelMessageHandler() func(w http.ResponseW // TODO perform some validation on the message body? // ex message length, empty contents, etc - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for " + endpoint.DeleteMessageFull - galactus.logger.Error(errMsg, - zap.Error(err), - ) + sess := galactus.shardManager.Session(0) + if sess == nil { + errMsg := "error obtaining session 0 for " + endpoint.DeleteMessageFull + galactus.logger.Error(errMsg) w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) + w.Write([]byte(errMsg)) return } - err = sess.ChannelMessageDelete(channelID, messageID) + err := sess.ChannelMessageDelete(channelID, messageID) if err != nil { errMsg := "error deleting message in channel" galactus.logger.Error(errMsg, diff --git a/internal/galactus/modify.go b/internal/galactus/modify.go index 7f8698c..2fe1d4b 100644 --- a/internal/galactus/modify.go +++ b/internal/galactus/modify.go @@ -2,7 +2,6 @@ package galactus import ( "encoding/json" - "github.com/automuteus/galactus/internal/galactus/shard_manager" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" "github.com/automuteus/utils/pkg/discord" @@ -76,10 +75,9 @@ func (galactus *GalactusAPI) modifyUserHandler(maxWorkers int, taskTimeout time. mdsc.Capture++ mdscLock.Unlock() } else { - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - galactus.logger.Error("error fetching random session for user modify", - zap.Error(err), + sess := galactus.shardManager.Session(0) + if sess == nil { + galactus.logger.Error("error fetching session 0 for user modify", zap.String("guildID", guildID), zap.String("userID", userIDStr), zap.Bool("mute", request.Mute), diff --git a/internal/galactus/reaction.go b/internal/galactus/reaction.go index 76832d0..0a3a5a3 100644 --- a/internal/galactus/reaction.go +++ b/internal/galactus/reaction.go @@ -1,7 +1,6 @@ package galactus import ( - "github.com/automuteus/galactus/internal/galactus/shard_manager" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" "github.com/gorilla/mux" @@ -21,17 +20,15 @@ func (galactus *GalactusAPI) AddReactionHandler() func(w http.ResponseWriter, r vars := mux.Vars(r) emojiID := vars["emojiID"] - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for addReaction" - galactus.logger.Error(errMsg, - zap.Error(err), - ) + sess := galactus.shardManager.Session(0) + if sess == nil { + errMsg := "error obtaining session 0 for " + endpoint.AddReactionFull + galactus.logger.Error(errMsg) w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) + w.Write([]byte(errMsg)) return } - err = sess.MessageReactionAdd(channelID, messageID, emojiID) + err := sess.MessageReactionAdd(channelID, messageID, emojiID) if err != nil { errMsg := "failed to addReaction" galactus.logger.Error(errMsg, @@ -73,14 +70,12 @@ func (galactus *GalactusAPI) RemoveReactionHandler() func(w http.ResponseWriter, return } - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for removeReaction" - galactus.logger.Error(errMsg, - zap.Error(err), - ) + sess := galactus.shardManager.Session(0) + if sess == nil { + errMsg := "error obtaining session 0 for " + endpoint.RemoveReactionFull + galactus.logger.Error(errMsg) w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) + w.Write([]byte(errMsg)) return } err = sess.MessageReactionRemove(channelID, messageID, emojiID, userID) @@ -109,17 +104,15 @@ func (galactus *GalactusAPI) RemoveAllReactionsHandler() func(w http.ResponseWri return } - sess, err := shard_manager.GetRandomSession(galactus.shardManager) - if err != nil { - errMsg := "error obtaining random session for removeAllReactions" - galactus.logger.Error(errMsg, - zap.Error(err), - ) + sess := galactus.shardManager.Session(0) + if sess == nil { + errMsg := "error obtaining session 0 for " + endpoint.RemoveAllReactionsFull + galactus.logger.Error(errMsg) w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) + w.Write([]byte(errMsg)) return } - err = sess.MessageReactionsRemoveAll(channelID, messageID) + err := sess.MessageReactionsRemoveAll(channelID, messageID) if err != nil { errMsg := "failed to remove all reactions" galactus.logger.Error(errMsg, diff --git a/internal/galactus/shard_manager/shard_manager.go b/internal/galactus/shard_manager/shard_manager.go index 7848e1a..a130273 100644 --- a/internal/galactus/shard_manager/shard_manager.go +++ b/internal/galactus/shard_manager/shard_manager.go @@ -1,13 +1,11 @@ package shard_manager import ( - "errors" "github.com/automuteus/galactus/internal/handler" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" "github.com/jonas747/dshardmanager" "go.uber.org/zap" - "math/rand" ) func MakeShardManager(logger *zap.Logger, token string, intent *discordgo.Intent) *dshardmanager.Manager { @@ -52,21 +50,3 @@ func AddHandlers(logger *zap.Logger, manager *dshardmanager.Manager, client *red manager.AddHandler(handler.RateLimitHandler(logger, client)) } - -const MaxInvalidRandomSessions = 5 - -func GetRandomSession(manager *dshardmanager.Manager) (*discordgo.Session, error) { - max := manager.GetNumShards() - sess := manager.Session(rand.Intn(max)) - i := 1 - - for sess == nil { - if i > MaxInvalidRandomSessions { - return nil, errors.New("exceeded maximum retries for random session") - } - i++ - r := rand.Intn(max) - sess = manager.Session(r) - } - return sess, nil -} From 0481203fb9dcac4e0c221cf99b86fcc80bdfeff9 Mon Sep 17 00:00:00 2001 From: denverquane Date: Sun, 24 Jan 2021 14:33:32 -0700 Subject: [PATCH 30/50] Better logging, added user rate limit warnings/bans --- internal/galactus/capture.go | 26 +++++++++++++++----- internal/galactus/create_user_channel.go | 4 ++++ internal/galactus/get_amu_settings.go | 10 +++++--- internal/galactus/guild.go | 26 ++++++++++++++++++-- internal/galactus/message.go | 13 ++++++---- internal/galactus/modify.go | 13 ++++++---- internal/galactus/reaction.go | 16 +++++++++++++ internal/handler/message_create.go | 26 +++++++++++++++++--- internal/handler/message_reaction_add.go | 25 +++++++++++++++++--- pkg/discord_message/message.go | 15 ++++++++++++ pkg/endpoint/capture.go | 8 +++---- pkg/endpoint/discord.go | 30 ++++++++++++------------ pkg/endpoint/settings.go | 2 +- 13 files changed, 168 insertions(+), 46 deletions(-) diff --git a/internal/galactus/capture.go b/internal/galactus/capture.go index 0cc0c82..1988bbf 100644 --- a/internal/galactus/capture.go +++ b/internal/galactus/capture.go @@ -46,8 +46,6 @@ func (galactus *GalactusAPI) AddCaptureEventHandler() func(w http.ResponseWriter } defer r.Body.Close() - // TODO more validation on the payload here? - err = capture.PushEvent(context.Background(), galactus.client, connectCode, eventType, string(body)) if err != nil { errMsg := "error pushing capture job to Redis" @@ -59,6 +57,10 @@ func (galactus *GalactusAPI) AddCaptureEventHandler() func(w http.ResponseWriter w.Write([]byte(errMsg + ": " + err.Error())) return } + galactus.logger.Info("added capture event", + zap.String("connectCode", connectCode), + zap.ByteString("event", body), + ) w.WriteHeader(http.StatusOK) } @@ -94,15 +96,19 @@ func (galactus *GalactusAPI) GetCaptureEventHandler(timeout time.Duration) func( return } - w.WriteHeader(http.StatusOK) - _, err = w.Write([]byte(msg)) if err != nil { galactus.logger.Error("failed to write capture event as HTTP response", zap.String("endpoint", endpoint.GetCaptureEventFull), zap.Error(err), ) + return } + galactus.logger.Info("popped capture event", + zap.String("connectCode", connectCode), + zap.String("event", msg), + ) + w.WriteHeader(http.StatusOK) } } @@ -136,15 +142,19 @@ func (galactus *GalactusAPI) GetCaptureTaskHandler(taskTimeout time.Duration) fu return } - w.WriteHeader(http.StatusOK) - _, err = w.Write([]byte(msg)) if err != nil { galactus.logger.Error("failed to write capture task as HTTP response", zap.String("endpoint", endpoint.GetCaptureTaskFull), zap.Error(err), ) + return } + galactus.logger.Info("popped capture task", + zap.String("connectCode", connectCode), + zap.String("task", msg), + ) + w.WriteHeader(http.StatusOK) } } @@ -183,6 +193,10 @@ func (galactus *GalactusAPI) SetCaptureTaskStatusHandler() func(w http.ResponseW w.Write([]byte(errMsg + ": " + err.Error())) return } + galactus.logger.Info("wrote task status", + zap.String("taskID", taskID), + zap.String("value", out), + ) w.WriteHeader(http.StatusOK) } } diff --git a/internal/galactus/create_user_channel.go b/internal/galactus/create_user_channel.go index 4cb029f..dbcd22f 100644 --- a/internal/galactus/create_user_channel.go +++ b/internal/galactus/create_user_channel.go @@ -46,6 +46,10 @@ func (galactus *GalactusAPI) CreateUserChannelHandler() func(w http.ResponseWrit w.Write([]byte(errMsg + ": " + err.Error())) return } + galactus.logger.Info("created user channel", + zap.String("userID", userID), + zap.String("channelID", channel.ID), + ) w.WriteHeader(http.StatusOK) w.Write(jBytes) } diff --git a/internal/galactus/get_amu_settings.go b/internal/galactus/get_amu_settings.go index 4ac05eb..e918b5b 100644 --- a/internal/galactus/get_amu_settings.go +++ b/internal/galactus/get_amu_settings.go @@ -34,9 +34,13 @@ func (galactus *GalactusAPI) GetGuildAMUSettings() func(w http.ResponseWriter, r zap.String("guildID", guildID), ) w.WriteHeader(http.StatusInternalServerError) - } else { - w.WriteHeader(http.StatusOK) - w.Write(jBytes) + return } + galactus.logger.Info("fetched guild settings", + zap.String("guildID", guildID), + zap.ByteString("settings", jBytes), + ) + w.WriteHeader(http.StatusOK) + w.Write(jBytes) } } diff --git a/internal/galactus/guild.go b/internal/galactus/guild.go index 734ad21..a58e783 100644 --- a/internal/galactus/guild.go +++ b/internal/galactus/guild.go @@ -6,7 +6,6 @@ import ( "github.com/automuteus/galactus/pkg/validate" "go.uber.org/zap" "io/ioutil" - "log" "net/http" "strconv" ) @@ -55,6 +54,9 @@ func (galactus *GalactusAPI) GetGuildHandler() func(w http.ResponseWriter, r *ht w.Write([]byte(errMsg + ": " + err.Error())) return } + galactus.logger.Info("fetched guild", + zap.String("guildID", guildID), + ) w.WriteHeader(http.StatusOK) w.Write(jBytes) } @@ -98,6 +100,9 @@ func (galactus *GalactusAPI) GetGuildChannelsHandler() func(w http.ResponseWrite w.Write([]byte(errMsg + ": " + err.Error())) return } + galactus.logger.Info("fetched guild channels", + zap.String("guildID", guildID), + ) w.WriteHeader(http.StatusOK) w.Write(jBytes) } @@ -141,6 +146,9 @@ func (galactus *GalactusAPI) GetGuildEmojisHandler() func(w http.ResponseWriter, w.Write([]byte(errMsg + ": " + err.Error())) return } + galactus.logger.Info("fetched guild emojis", + zap.String("guildID", guildID), + ) w.WriteHeader(http.StatusOK) w.Write(jBytes) } @@ -186,6 +194,10 @@ func (galactus *GalactusAPI) GetGuildMemberHandler() func(w http.ResponseWriter, w.Write([]byte(errMsg + ": " + err.Error())) return } + galactus.logger.Info("fetched guild member", + zap.String("guildID", guildID), + zap.String("userID", userID), + ) w.WriteHeader(http.StatusOK) w.Write(jBytes) } @@ -229,6 +241,9 @@ func (galactus *GalactusAPI) GetGuildRolesHandler() func(w http.ResponseWriter, w.Write([]byte(errMsg + ": " + err.Error())) return } + galactus.logger.Info("fetched guild roles", + zap.String("guildID", guildID), + ) w.WriteHeader(http.StatusOK) w.Write(jBytes) } @@ -292,8 +307,15 @@ func (galactus *GalactusAPI) CreateGuildEmojiHandler() func(w http.ResponseWrite w.WriteHeader(http.StatusOK) jbytes, err := json.Marshal(emoji) if err != nil { - log.Println(err) + galactus.logger.Error("failed to marshal emoji to JSON", + zap.Error(err), + ) } w.Write(jbytes) + + galactus.logger.Info("created guild emoji", + zap.String("guildID", guildID), + zap.String("name", name), + ) } } diff --git a/internal/galactus/message.go b/internal/galactus/message.go index cb5bc56..52bd385 100644 --- a/internal/galactus/message.go +++ b/internal/galactus/message.go @@ -7,7 +7,6 @@ import ( "github.com/bwmarrin/discordgo" "go.uber.org/zap" "io/ioutil" - "log" "net/http" ) @@ -64,7 +63,9 @@ func (galactus *GalactusAPI) SendChannelMessageHandler() func(w http.ResponseWri w.WriteHeader(http.StatusOK) jbytes, err := json.Marshal(msg) if err != nil { - log.Println(err) + galactus.logger.Error("failed to marshal message to JSON", + zap.Error(err), + ) } w.Write(jbytes) } @@ -135,7 +136,9 @@ func (galactus *GalactusAPI) SendChannelMessageEmbedHandler() func(w http.Respon w.WriteHeader(http.StatusOK) jbytes, err := json.Marshal(msg) if err != nil { - log.Println(err) + galactus.logger.Error("failed to marshal embed message to JSON", + zap.Error(err), + ) } w.Write(jbytes) } @@ -206,7 +209,9 @@ func (galactus *GalactusAPI) EditMessageEmbedHandler() func(w http.ResponseWrite jbytes, err := json.Marshal(msg) if err != nil { - log.Println(err) + galactus.logger.Error("failed to marshal edit embed message to JSON", + zap.Error(err), + ) } w.Write(jbytes) } diff --git a/internal/galactus/modify.go b/internal/galactus/modify.go index 2fe1d4b..fa7c3e8 100644 --- a/internal/galactus/modify.go +++ b/internal/galactus/modify.go @@ -7,7 +7,6 @@ import ( "github.com/automuteus/utils/pkg/discord" "go.uber.org/zap" "io/ioutil" - "log" "net/http" "strconv" "sync" @@ -28,7 +27,8 @@ func (galactus *GalactusAPI) modifyUserHandler(maxWorkers int, taskTimeout time. body, err := ioutil.ReadAll(r.Body) if err != nil { - log.Println(err) + galactus.logger.Error("failed to read HTTP request body", + zap.Error(err)) w.WriteHeader(http.StatusBadRequest) w.Write([]byte(err.Error())) return @@ -38,7 +38,8 @@ func (galactus *GalactusAPI) modifyUserHandler(maxWorkers int, taskTimeout time. userModifications := discord.UserModifyRequest{} err = json.Unmarshal(body, &userModifications) if err != nil { - log.Println(err) + galactus.logger.Error("failed to unmarshal user modification request", + zap.Error(err)) w.WriteHeader(http.StatusBadRequest) w.Write([]byte(err.Error())) return @@ -123,11 +124,13 @@ func (galactus *GalactusAPI) modifyUserHandler(maxWorkers int, taskTimeout time. jbytes, err := json.Marshal(mdsc) if err != nil { - log.Println(err) + galactus.logger.Error("failed to marshal mutedeafensuccesscounts to JSON", + zap.Error(err)) } else { _, err := w.Write(jbytes) if err != nil { - log.Println(err) + galactus.logger.Error("failed to write out json response", + zap.Error(err)) } } } diff --git a/internal/galactus/reaction.go b/internal/galactus/reaction.go index 0a3a5a3..40853ef 100644 --- a/internal/galactus/reaction.go +++ b/internal/galactus/reaction.go @@ -41,6 +41,11 @@ func (galactus *GalactusAPI) AddReactionHandler() func(w http.ResponseWriter, r w.Write([]byte(errMsg + ": " + err.Error())) return } + galactus.logger.Info("added reaction to channel message", + zap.String("channelID", channelID), + zap.String("messageID", messageID), + zap.String("emojiID", emojiID), + ) w.WriteHeader(http.StatusOK) } @@ -92,6 +97,12 @@ func (galactus *GalactusAPI) RemoveReactionHandler() func(w http.ResponseWriter, w.Write([]byte(errMsg + ": " + err.Error())) return } + galactus.logger.Info("removed reaction on channel message", + zap.String("channelID", channelID), + zap.String("messageID", messageID), + zap.String("emojiID", emojiID), + zap.String("userID", userID), + ) w.WriteHeader(http.StatusOK) } @@ -125,6 +136,11 @@ func (galactus *GalactusAPI) RemoveAllReactionsHandler() func(w http.ResponseWri return } + galactus.logger.Info("removed all reactions on channel message", + zap.String("channelID", channelID), + zap.String("messageID", messageID), + ) + w.WriteHeader(http.StatusOK) } } diff --git a/internal/handler/message_create.go b/internal/handler/message_create.go index a42ae70..b9bf9bb 100644 --- a/internal/handler/message_create.go +++ b/internal/handler/message_create.go @@ -3,12 +3,14 @@ package handler import ( "context" "encoding/json" + "fmt" redis_utils "github.com/automuteus/galactus/internal/redis" "github.com/automuteus/galactus/pkg/discord_message" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" "go.uber.org/zap" "strings" + "time" ) func MessageCreateHandler(logger *zap.Logger, client *redis.Client, globalPrefix string) func(s *discordgo.Session, m *discordgo.MessageCreate) { @@ -63,14 +65,32 @@ func MessageCreateHandler(logger *zap.Logger, client *redis.Client, globalPrefix return } + // TODO how to easily and cleanly localize these messages? if redis_utils.IsUserRateLimitedGeneral(client, m.Author.ID) { // record the violation with this call if redis_utils.IncrementRateLimitExceed(client, m.Author.ID) { - // NOTE user is banned here - + msg, err := s.ChannelMessageSend(m.ChannelID, + fmt.Sprintf("%s has been spamming. I'm ignoring them for the next %f minutes.", + discord_message.MentionByUserID(m.Author.ID), + redis_utils.SoftbanDuration.Minutes())) + if err != nil { + logger.Error("error posting ratelimit ban message", + zap.Error(err), + ) + } else { + go discord_message.DeleteMessageWorker(s, msg.ChannelID, msg.ID, time.Second*3) + } return } else { - // NOTE user is warned here + msg, err := s.ChannelMessageSend(m.ChannelID, fmt.Sprintf("%s, you're issuing commands too fast! Please slow down!", + discord_message.MentionByUserID(m.Author.ID))) + if err != nil { + logger.Error("error posting ratelimit warning message", + zap.Error(err), + ) + } else { + go discord_message.DeleteMessageWorker(s, msg.ChannelID, msg.ID, time.Second*3) + } return } } diff --git a/internal/handler/message_reaction_add.go b/internal/handler/message_reaction_add.go index e51a9ff..7a05fd0 100644 --- a/internal/handler/message_reaction_add.go +++ b/internal/handler/message_reaction_add.go @@ -3,12 +3,14 @@ package handler import ( "context" "encoding/json" + "fmt" redis_utils "github.com/automuteus/galactus/internal/redis" "github.com/automuteus/galactus/pkg/discord_message" "github.com/automuteus/utils/pkg/rediskey" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" "go.uber.org/zap" + "time" ) func MessageReactionAddHandler(logger *zap.Logger, client *redis.Client) func(s *discordgo.Session, m *discordgo.MessageReactionAdd) { @@ -28,14 +30,31 @@ func MessageReactionAddHandler(logger *zap.Logger, client *redis.Client) func(s return } + // TODO how to easily and cleanly localize these messages? if redis_utils.IsUserRateLimitedGeneral(client, m.UserID) { // record the violation with this call if redis_utils.IncrementRateLimitExceed(client, m.UserID) { - // NOTE user is banned here - + msg, err := s.ChannelMessageSend(m.ChannelID, + fmt.Sprintf("%s has been spamming. I'm ignoring them for the next %f minutes.", + discord_message.MentionByUserID(m.UserID), + redis_utils.SoftbanDuration.Minutes())) + if err != nil { + logger.Error("error posting ratelimit ban message", + zap.Error(err), + ) + } else { + go discord_message.DeleteMessageWorker(s, msg.ChannelID, msg.ID, time.Second*3) + } return } else { - // NOTE user is warned here + msg, err := s.ChannelMessageSend(m.ChannelID, fmt.Sprintf("%s, you're reacting too fast! Please slow down!", discord_message.MentionByUserID(m.UserID))) + if err != nil { + logger.Error("error posting ratelimit warning message", + zap.Error(err), + ) + } else { + go discord_message.DeleteMessageWorker(s, msg.ChannelID, msg.ID, time.Second*3) + } return } } diff --git a/pkg/discord_message/message.go b/pkg/discord_message/message.go index f009ae1..a2d91d4 100644 --- a/pkg/discord_message/message.go +++ b/pkg/discord_message/message.go @@ -1,5 +1,10 @@ package discord_message +import ( + "github.com/bwmarrin/discordgo" + "time" +) + type DiscordMessageType int const ( @@ -22,3 +27,13 @@ type DiscordMessage struct { MessageType DiscordMessageType Data []byte } + +func MentionByUserID(userID string) string { + return "<@!" + userID + ">" +} + +func DeleteMessageWorker(sess *discordgo.Session, channelID, messageID string, wait time.Duration) error { + time.Sleep(wait) + + return sess.ChannelMessageDelete(channelID, messageID) +} diff --git a/pkg/endpoint/capture.go b/pkg/endpoint/capture.go index f7860a1..b73a784 100644 --- a/pkg/endpoint/capture.go +++ b/pkg/endpoint/capture.go @@ -2,14 +2,14 @@ package endpoint const CaptureRoute = "/api/capture" -const AddCaptureEventPartial = "/addCaptureEvent/" +const AddCaptureEventPartial = "/event/add/" const AddCaptureEventFull = AddCaptureEventPartial + "{connectCode}/{eventType}" -const GetCaptureEventPartial = "/getCaptureEvent/" +const GetCaptureEventPartial = "/event/get/" const GetCaptureEventFull = GetCaptureEventPartial + "{connectCode}" -const GetCaptureTaskPartial = "/getCaptureTask/" +const GetCaptureTaskPartial = "/task/get/" const GetCaptureTaskFull = GetCaptureTaskPartial + "{connectCode}" -const SetCaptureTaskStatusPartial = "/setCaptureTaskStatus/" +const SetCaptureTaskStatusPartial = "/task/set/" const SetCaptureTaskStatusFull = SetCaptureTaskStatusPartial + "{taskID}" diff --git a/pkg/endpoint/discord.go b/pkg/endpoint/discord.go index 501d972..2b8b2c4 100644 --- a/pkg/endpoint/discord.go +++ b/pkg/endpoint/discord.go @@ -5,47 +5,47 @@ const DiscordRoute = "/api/discord" const DiscordJobCount = "/job/count" const DiscordJobRequest = "/job/request" -const SendMessagePartial = "/sendMessage/" +const SendMessagePartial = "/message/send/" const SendMessageFull = SendMessagePartial + "{channelID}" -const SendMessageEmbedPartial = "/sendMessageEmbed/" +const SendMessageEmbedPartial = "/messageEmbed/send/" const SendMessageEmbedFull = SendMessageEmbedPartial + "{channelID}" -const EditMessageEmbedPartial = "/editMessageEmbed/" +const EditMessageEmbedPartial = "/messageEmbed/edit/" const EditMessageEmbedFull = EditMessageEmbedPartial + "{channelID}/{messageID}" -const DeleteMessagePartial = "/deleteMessage/" +const DeleteMessagePartial = "/message/delete/" const DeleteMessageFull = DeleteMessagePartial + "{channelID}/{messageID}" -const RemoveReactionPartial = "/removeReaction/" +const RemoveReactionPartial = "/reaction/remove/" const RemoveReactionFull = RemoveReactionPartial + "{channelID}/{messageID}/{emojiID}/{userID}" -const RemoveAllReactionsPartial = "/removeAllReactions/" +const RemoveAllReactionsPartial = "/reaction/remove/all/" const RemoveAllReactionsFull = RemoveAllReactionsPartial + "{channelID}/{messageID}" -const AddReactionPartial = "/addReaction/" +const AddReactionPartial = "/reaction/add/" const AddReactionFull = AddReactionPartial + "{channelID}/{messageID}/{emojiID}" -const ModifyUserPartial = "/modifyUser/" +const ModifyUserPartial = "/user/modify/" const ModifyUserFull = ModifyUserPartial + "{guildID}/{connectCode}" -const GetGuildPartial = "/guild/" +const GetGuildPartial = "/guild/get/" const GetGuildFull = GetGuildPartial + "{guildID}" -const GetGuildChannelsPartial = "/guildChannels/" +const GetGuildChannelsPartial = "/guild/channels/get/" const GetGuildChannelsFull = GetGuildChannelsPartial + "{guildID}" -const GetGuildMemberPartial = "/guildMember/" +const GetGuildMemberPartial = "/guild/member/get/" const GetGuildMemberFull = GetGuildMemberPartial + "{guildID}/{userID}" -const GetGuildRolesPartial = "/guildRoles/" +const GetGuildRolesPartial = "/guild/roles/get/" const GetGuildRolesFull = GetGuildRolesPartial + "{guildID}" -const UserChannelCreatePartial = "/createUserChannel/" +const UserChannelCreatePartial = "/user/channel/create/" const UserChannelCreateFull = UserChannelCreatePartial + "{userID}" -const GetGuildEmojisPartial = "/guildEmojis/" +const GetGuildEmojisPartial = "/guild/emojis/get/" const GetGuildEmojisFull = GetGuildEmojisPartial + "{guildID}" -const CreateGuildEmojiPartial = "/guildEmojiCreate/" +const CreateGuildEmojiPartial = "/guild/emoji/create/" const CreateGuildEmojiFull = CreateGuildEmojiPartial + "{guildID}/{name}" diff --git a/pkg/endpoint/settings.go b/pkg/endpoint/settings.go index 6f6aedb..35b49bd 100644 --- a/pkg/endpoint/settings.go +++ b/pkg/endpoint/settings.go @@ -2,5 +2,5 @@ package endpoint const SettingsRoute = "/api/settings" -const GetGuildAMUSettingsPartial = "/getAMUSettings/" +const GetGuildAMUSettingsPartial = "/get/" const GetGuildAMUSettingsFull = GetGuildAMUSettingsPartial + "{guildID}" From 835a21125646a9622abb5ac2eb554edf34c572e4 Mon Sep 17 00:00:00 2001 From: denverquane Date: Sun, 24 Jan 2021 20:03:19 -0700 Subject: [PATCH 31/50] Added top.gg user vote check example --- go.mod | 4 +--- go.sum | 32 ++++---------------------------- internal/galactus/server.go | 12 +++++++++++- internal/galactus/top_gg.go | 13 +++++++++++++ main.go | 15 ++++++++++++++- 5 files changed, 43 insertions(+), 33 deletions(-) create mode 100644 internal/galactus/top_gg.go diff --git a/go.mod b/go.mod index 7b0562c..d87bafa 100644 --- a/go.mod +++ b/go.mod @@ -3,17 +3,15 @@ module github.com/automuteus/galactus go 1.15 require ( - github.com/alicebob/miniredis v2.5.0+incompatible // indirect github.com/alicebob/miniredis/v2 v2.14.1 github.com/automuteus/utils v0.0.10 github.com/bsm/redislock v0.7.0 github.com/bwmarrin/discordgo v0.22.1 - github.com/go-redis/redis v6.15.9+incompatible // indirect github.com/go-redis/redis/v8 v8.4.2 - github.com/gomodule/redigo v1.8.3 // indirect github.com/gorilla/mux v1.8.0 github.com/gorilla/websocket v1.4.1 // indirect github.com/jonas747/dshardmanager v0.0.0-20180911185241-9e4282faed43 + github.com/top-gg/go-dbl v0.0.0-20201116001615-e844586b1159 go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.16.0 ) diff --git a/go.sum b/go.sum index 3e28838..b274046 100644 --- a/go.sum +++ b/go.sum @@ -4,30 +4,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk= github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc= -github.com/alicebob/miniredis v2.5.0+incompatible h1:yBHoLpsyjupjz3NL3MhKMVkR41j82Yjf3KFv7ApYzUI= -github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk= github.com/alicebob/miniredis/v2 v2.14.1 h1:GjlbSeoJ24bzdLRs13HoMEeaRZx9kg5nHoRW7QV/nCs= github.com/alicebob/miniredis/v2 v2.14.1/go.mod h1:uS970Sw5Gs9/iK3yBg0l9Uj9s25wXxSpQUE9EaJ/Blg= -github.com/automuteus/discordgo v0.22.1 h1:IU58OXAtpTosrYq/MCMVbpoVuOuUeandgyju5MpuLQo= -github.com/automuteus/discordgo v0.22.1/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= -github.com/automuteus/utils v0.0.4 h1:weSw/mAMHjZvqEz6XR+jYVgrpawQhGGFb4PfWgt4JHg= -github.com/automuteus/utils v0.0.4/go.mod h1:3/DMXEOYYnBADTtb0rbBsDBD+d+QDdIpBRbvhy8cPoI= -github.com/automuteus/utils v0.0.6 h1:u14BvwfFzHN8A0aJ4qbeG7vkkyK2brnBYSOjMakWars= -github.com/automuteus/utils v0.0.6/go.mod h1:3/DMXEOYYnBADTtb0rbBsDBD+d+QDdIpBRbvhy8cPoI= -github.com/automuteus/utils v0.0.7 h1:WnGqvaqSxyysR6ixMltaF5RSIeoeL9ev9zRqqgVF3qk= -github.com/automuteus/utils v0.0.7/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= -github.com/automuteus/utils v0.0.9 h1:jXyRsDDt/f/r5qSAbPWgoUqs0HuUOESvNkpNjlWmvRw= -github.com/automuteus/utils v0.0.9/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= -github.com/automuteus/utils v0.0.10 h1:1yCu+0liCAExtg3fAxalv/DAcAQCmZ8gU1RbLf39paM= -github.com/automuteus/utils v0.0.10/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= -github.com/automuteus/utils v0.0.11-0.20210116011910-d830c3145b25 h1:A63HOz4z0LWEVox4Q87CK0uwMjrDGuwg1ityQR0D3HY= -github.com/automuteus/utils v0.0.11-0.20210116011910-d830c3145b25/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= -github.com/automuteus/utils v0.0.11-0.20210116220058-40ad795561c0 h1:XmGntgGGBNkgdHKoyekITQ8VJWDUBq3LwPHZFr8eMzo= -github.com/automuteus/utils v0.0.11-0.20210116220058-40ad795561c0/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= -github.com/automuteus/utils v0.0.11-0.20210117015211-09544f155513 h1:PjaCnn/wyjvLNAKGJbio6KYFnJLq5+pJr1YZ1JeAhOc= -github.com/automuteus/utils v0.0.11-0.20210117015211-09544f155513/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= -github.com/automuteus/utils v0.0.11-0.20210117083518-7f1a542914b9 h1:BE1YZQbHohq3VmnhMb4wSggEBZ+doClDH2ZELAH/oRE= -github.com/automuteus/utils v0.0.11-0.20210117083518-7f1a542914b9/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= github.com/automuteus/utils v0.0.11-0.20210117090606-d48d8a0c6a4b h1:5WCoZsyNqCvAQQ3Sr4Xgb90IFzMZooXA/VgWJ03OHEU= github.com/automuteus/utils v0.0.11-0.20210117090606-d48d8a0c6a4b/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= github.com/bsm/redislock v0.7.0 h1:RL7aZJhCKkuBjQbnSTKCeedTRifBWxd/ffP+GZ599Mo= @@ -54,8 +32,6 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= -github.com/elliotchance/redismock v1.5.3 h1:Lgi2CLfVB3PamPI1SPqjJf5AiGisPFMWvIOCiRIq+sI= -github.com/elliotchance/redismock v1.5.3/go.mod h1:8FFsGWghPUyP7nqj/UYXr2xqd6U2iNMxS4S5+Xadl5A= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= @@ -63,8 +39,6 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4 github.com/georgysavva/scany v0.2.7 h1:SBEuurTvWOUp7FnGBOjeSF9XWaWmVzc91h9baPo6y2s= github.com/georgysavva/scany v0.2.7/go.mod h1:bcxPhzeQFQqAUmjlZVwTGlu6AnWFSOiHpalfBe0xQ6U= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg= -github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/go-redis/redis/v8 v8.1.0/go.mod h1:isLoQT/NFSP7V67lyvM9GmdvLdyZ7pEhsXvvyQtnQTo= github.com/go-redis/redis/v8 v8.4.2 h1:gKRo1KZ+O3kXRfxeRblV5Tr470d2YJZJVIAv2/S8960= github.com/go-redis/redis/v8 v8.4.2/go.mod h1:A1tbYoHSa1fXwN+//ljcCYYJeLmVrwL9hbQN45Jdy0M= @@ -83,8 +57,6 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/gomodule/redigo v1.8.3 h1:HR0kYDX2RJZvAup8CsiJwxB4dTCSC0AaUq6S4SiLwUc= -github.com/gomodule/redigo v1.8.3/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -230,6 +202,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/top-gg/go-dbl v0.0.0-20201116001615-e844586b1159 h1:25mzrW8AGLqqrtwx7uO2AT6v6WT3i46EuzCKH1UZxWg= +github.com/top-gg/go-dbl v0.0.0-20201116001615-e844586b1159/go.mod h1:iWzDb/dmbZ5oHEuSOfbTe4iO3ETj6qvvEwSh4MzZNtM= github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb h1:ZkM6LRnq40pR1Ox0hTHlnpkcOTuFIDQpZ1IN8rKKhX0= github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= @@ -314,6 +288,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= diff --git a/internal/galactus/server.go b/internal/galactus/server.go index d5a6ef0..2c90c67 100644 --- a/internal/galactus/server.go +++ b/internal/galactus/server.go @@ -16,6 +16,7 @@ import ( "github.com/go-redis/redis/v8" "github.com/gorilla/mux" "github.com/jonas747/dshardmanager" + "github.com/top-gg/go-dbl" "go.uber.org/zap" "net/http" "os" @@ -38,6 +39,8 @@ var DefaultIntents = discordgo.MakeIntent(discordgo.IntentsGuildVoiceStates | di type GalactusAPI struct { client *redis.Client shardManager *dshardmanager.Manager + topggClient *dbl.Client + botID string // maps hashed tokens to active discord sessions activeSessions map[string]*discordgo.Session @@ -47,7 +50,7 @@ type GalactusAPI struct { logger *zap.Logger } -func NewGalactusAPI(logger *zap.Logger, botToken, redisAddr, redisUser, redisPass string, maxReq int64, botPrefix string) *GalactusAPI { +func NewGalactusAPI(logger *zap.Logger, botToken, topGGtoken, botID, redisAddr, redisUser, redisPass string, maxReq int64, botPrefix string) *GalactusAPI { var rdb *redis.Client rdb = redis.NewClient(&redis.Options{ @@ -60,9 +63,16 @@ func NewGalactusAPI(logger *zap.Logger, botToken, redisAddr, redisUser, redisPas manager := shard_manager.MakeShardManager(logger, botToken, DefaultIntents) shard_manager.AddHandlers(logger, manager, rdb, botPrefix) + var topgg *dbl.Client = nil + if topGGtoken != "" { + topgg, _ = dbl.NewClient(topGGtoken) + } + return &GalactusAPI{ client: rdb, shardManager: manager, + topggClient: topgg, + botID: botID, activeSessions: make(map[string]*discordgo.Session), maxRequests5Seconds: maxReq, sessionLock: sync.RWMutex{}, diff --git a/internal/galactus/top_gg.go b/internal/galactus/top_gg.go new file mode 100644 index 0000000..beed49e --- /dev/null +++ b/internal/galactus/top_gg.go @@ -0,0 +1,13 @@ +package galactus + +import ( + "errors" +) + +func (galactus *GalactusAPI) HasUserVoted(userID string) (bool, error) { + if galactus.topggClient == nil || galactus.botID == "" { + return false, errors.New("topgg client or BotID has not been initialized and thus cannot be checked") + } + + return galactus.topggClient.HasUserVoted(galactus.botID, userID) +} diff --git a/main.go b/main.go index 67d44c7..499cd6c 100644 --- a/main.go +++ b/main.go @@ -18,6 +18,7 @@ const DefaultMaxWorkers = 8 const DefaultCaptureBotTimeout = time.Second const DefaultTaskTimeout = time.Second * 10 const DefaultBotPrefix = ".au" +const DefaultBotID = "753795015830011944" // Official AutoMuteUs bot ID func main() { logger, err := zap.NewProduction() @@ -95,6 +96,16 @@ func main() { botPrefix = os.Getenv("AUTOMUTEUS_GLOBAL_PREFIX") } + topGGToken := "" + if os.Getenv("TOP_GG_TOKEN") != "" { + topGGToken = os.Getenv("TOP_GG_TOKEN") + } + + botID := DefaultBotID + if os.Getenv("BOT_ID") != "" { + botID = os.Getenv("BOT_ID") + } + logger.Info("loaded env", zap.String("DISCORD_BOT_TOKEN", botToken), zap.String("REDIS_ADDR", redisAddr), @@ -104,9 +115,11 @@ func main() { zap.Int("MAX_WORKERS", maxWorkers), zap.Int64("ACK_TIMEOUT_MS", captureAckTimeout.Milliseconds()), zap.String("AUTOMUTEUS_GLOBAL_PREFIX", botPrefix), + zap.String("TOP_GG_TOKEN", topGGToken), + zap.String("BOT_ID", botID), ) - tp := galactus.NewGalactusAPI(logger, botToken, redisAddr, redisUser, redisPass, maxReq, botToken) + tp := galactus.NewGalactusAPI(logger, botToken, topGGToken, botID, redisAddr, redisUser, redisPass, maxReq, botToken) sc := make(chan os.Signal, 1) signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill) From a000609285624e7384720e2e287bdb020b1ad931 Mon Sep 17 00:00:00 2001 From: denverquane Date: Sun, 24 Jan 2021 23:46:38 -0700 Subject: [PATCH 32/50] Caching for edit embed, better logging, metrics reporting --- go.mod | 1 + go.sum | 303 ++++++++++++++++++ internal/galactus/capture.go | 2 +- internal/galactus/create_user_channel.go | 1 + internal/galactus/guild.go | 26 +- internal/galactus/message.go | 23 ++ internal/galactus/metrics.go | 135 ++++++++ internal/galactus/modify.go | 4 +- internal/{handler => galactus}/rate_limit.go | 3 +- internal/galactus/reaction.go | 5 + internal/galactus/server.go | 3 + .../galactus/shard_manager/shard_manager.go | 4 +- internal/galactus/token.go | 18 +- internal/redis/cache.go | 52 +++ main.go | 2 +- pkg/client/capture.go | 4 +- 16 files changed, 567 insertions(+), 19 deletions(-) create mode 100644 internal/galactus/metrics.go rename internal/{handler => galactus}/rate_limit.go (86%) create mode 100644 internal/redis/cache.go diff --git a/go.mod b/go.mod index d87bafa..845f153 100644 --- a/go.mod +++ b/go.mod @@ -11,6 +11,7 @@ require ( github.com/gorilla/mux v1.8.0 github.com/gorilla/websocket v1.4.1 // indirect github.com/jonas747/dshardmanager v0.0.0-20180911185241-9e4282faed43 + github.com/prometheus/client_golang v1.9.0 github.com/top-gg/go-dbl v0.0.0-20201116001615-e844586b1159 go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.16.0 diff --git a/go.sum b/go.sum index b274046..c2564b2 100644 --- a/go.sum +++ b/go.sum @@ -1,44 +1,100 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= +github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= +github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= +github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk= github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc= github.com/alicebob/miniredis/v2 v2.14.1 h1:GjlbSeoJ24bzdLRs13HoMEeaRZx9kg5nHoRW7QV/nCs= github.com/alicebob/miniredis/v2 v2.14.1/go.mod h1:uS970Sw5Gs9/iK3yBg0l9Uj9s25wXxSpQUE9EaJ/Blg= +github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= github.com/automuteus/utils v0.0.11-0.20210117090606-d48d8a0c6a4b h1:5WCoZsyNqCvAQQ3Sr4Xgb90IFzMZooXA/VgWJ03OHEU= github.com/automuteus/utils v0.0.11-0.20210117090606-d48d8a0c6a4b/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= +github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= +github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bsm/redislock v0.7.0 h1:RL7aZJhCKkuBjQbnSTKCeedTRifBWxd/ffP+GZ599Mo= github.com/bsm/redislock v0.7.0/go.mod h1:3Kgu+cXw0JrkZ5pmY/JbcFpixGZ5M9v9G2PGWYqku+k= github.com/bwmarrin/discordgo v0.22.0/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= github.com/bwmarrin/discordgo v0.22.1 h1:254fNYyfqJWKbPzO5g8j/nUvRgj4dNlI19EB8rnkpt8= github.com/bwmarrin/discordgo v0.22.1/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= +github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= +github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/cockroachdb/cockroach-go/v2 v2.0.3 h1:ZA346ACHIZctef6trOTwBAEvPVm1k0uLm/bb2Atc+S8= github.com/cockroachdb/cockroach-go/v2 v2.0.3/go.mod h1:hAuDgiVgDVkfirP9JnhXEfcXEPRKBpYdGz+l7mvYSzw= +github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= +github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/georgysavva/scany v0.2.7 h1:SBEuurTvWOUp7FnGBOjeSF9XWaWmVzc91h9baPo6y2s= github.com/georgysavva/scany v0.2.7/go.mod h1:bcxPhzeQFQqAUmjlZVwTGlu6AnWFSOiHpalfBe0xQ6U= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-redis/redis/v8 v8.1.0/go.mod h1:isLoQT/NFSP7V67lyvM9GmdvLdyZ7pEhsXvvyQtnQTo= github.com/go-redis/redis/v8 v8.4.2 h1:gKRo1KZ+O3kXRfxeRblV5Tr470d2YJZJVIAv2/S8960= github.com/go-redis/redis/v8 v8.4.2/go.mod h1:A1tbYoHSa1fXwN+//ljcCYYJeLmVrwL9hbQN45Jdy0M= @@ -47,9 +103,18 @@ github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE= github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= @@ -57,6 +122,12 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -64,14 +135,47 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= +github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= @@ -133,12 +237,25 @@ github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dv github.com/jinzhu/gorm v1.9.12/go.mod h1:vhTjlKSJUTWNtcbQtrMBFCxy7eXTzeCAzfL5fBZT/Qs= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/jonas747/dshardmanager v0.0.0-20180911185241-9e4282faed43 h1:KHo2jiz0A2Tdj889Ibu+wuwVUD6xursbrtdlZXGP+Cc= github.com/jonas747/dshardmanager v0.0.0-20180911185241-9e4282faed43/go.mod h1:OxYl3OmsSR6ZQqhPsMDJvxAngw7LI/cZOsbpbqckiRI= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -152,46 +269,144 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.4.0 h1:TmtCFbH+Aw0AixwyttznSMQDgbR5Yed/Gg6S8Funrhc= github.com/lib/pq v1.4.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= +github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= +github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= +github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= +github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= +github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nicksnyder/go-i18n/v2 v2.1.1 h1:ATCOanRDlrfKVB4WHAdJnLEqZtDmKYsweqsOUYflnBU= github.com/nicksnyder/go-i18n/v2 v2.1.1/go.mod h1:d++QJC9ZVf7pa48qrsRWhMJ5pSHIPmS3OLqK1niyLxs= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= +github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.14.2 h1:8mVmC9kjFFmA8H4pKMUhcblgifdkOIXPvbhN1T36q1M= github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3 h1:gph6h/qe9GSUw1NhH1gp+qb+h8rXD8Cy60Z32Qw3ELA= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= +github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= +github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= +github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= +github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= +github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= +github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= +github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.9.0 h1:Rrch9mh17XcxvEu9D9DEpb4isxjGBtcevQjKvxPRQIU= +github.com/prometheus/client_golang v1.9.0/go.mod h1:FqZLKOZnGdFAhOK4nqGHa7D66IdsO+O441Eve7ptJDU= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.15.0 h1:4fgOnadei3EZvgRwxJ7RMpG1k1pOZth5Pc13tyspaKM= +github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.2.0 h1:wH4vA7pcjKuZzjF7lM8awk4fnuJO6idemZXoKnULUx4= +github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v0.0.0-20200419222939-1884f454f8ea h1:jaXWVFZ98/ihXniiDzqNXQgMSgklX4kjfDWZTE3ZtdU= github.com/shopspring/decimal v0.0.0-20200419222939-1884f454f8ea/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= @@ -202,22 +417,33 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/top-gg/go-dbl v0.0.0-20201116001615-e844586b1159 h1:25mzrW8AGLqqrtwx7uO2AT6v6WT3i46EuzCKH1UZxWg= github.com/top-gg/go-dbl v0.0.0-20201116001615-e844586b1159/go.mod h1:iWzDb/dmbZ5oHEuSOfbTe4iO3ETj6qvvEwSh4MzZNtM= +github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb h1:ZkM6LRnq40pR1Ox0hTHlnpkcOTuFIDQpZ1IN8rKKhX0= github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= +go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= +go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0= go.opentelemetry.io/otel v0.14.0/go.mod h1:vH5xEuwy7Rts0GNtsCW3HYQoZDY+OmBJ6t1bFGGlxgw= go.opentelemetry.io/otel v0.15.0 h1:CZFy2lPhxd4HlhZnYK8gRyDotksO3Ip9rBweY1vVYJw= go.opentelemetry.io/otel v0.15.0/go.mod h1:e4GKElweB8W2gWUqbghw0B8t5MCTccc9212eNHnOHwA= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= @@ -225,13 +451,17 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -239,10 +469,15 @@ golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20200908183739-ae8ad444f925/go.mod h1:1phAWC201xIgDyaFpmDeZkgf70Q4Pd/CNqfRtVPtxNw= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= @@ -251,19 +486,41 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449 h1:xUIPaMhvROX9dhPvRCenIJtU78+lbEenGbgqB5hfHCQ= golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0 h1:wBouT66WTYFXdxfVdz9sVWARVd/2vfGcmI45D2gj45M= golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -271,33 +528,49 @@ golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e h1:AyodaIpKjppX+cBfTASF2E1US3H2JFBj920Ot3rtDjs= +golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa h1:5E4dL8+NgFOgjwbTKz+OOEGGhP+ectTmF842l6KjupQ= golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -306,8 +579,25 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -315,23 +605,36 @@ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miE google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/internal/galactus/capture.go b/internal/galactus/capture.go index 1988bbf..466d134 100644 --- a/internal/galactus/capture.go +++ b/internal/galactus/capture.go @@ -96,6 +96,7 @@ func (galactus *GalactusAPI) GetCaptureEventHandler(timeout time.Duration) func( return } + w.WriteHeader(http.StatusOK) _, err = w.Write([]byte(msg)) if err != nil { galactus.logger.Error("failed to write capture event as HTTP response", @@ -108,7 +109,6 @@ func (galactus *GalactusAPI) GetCaptureEventHandler(timeout time.Duration) func( zap.String("connectCode", connectCode), zap.String("event", msg), ) - w.WriteHeader(http.StatusOK) } } diff --git a/internal/galactus/create_user_channel.go b/internal/galactus/create_user_channel.go index dbcd22f..26a911b 100644 --- a/internal/galactus/create_user_channel.go +++ b/internal/galactus/create_user_channel.go @@ -23,6 +23,7 @@ func (galactus *GalactusAPI) CreateUserChannelHandler() func(w http.ResponseWrit w.Write([]byte(errMsg)) return } + RecordDiscordRequest(galactus.client, UserChannel) channel, err := sess.UserChannelCreate(userID) if err != nil { errMsg := "failed to create user channel" diff --git a/internal/galactus/guild.go b/internal/galactus/guild.go index a58e783..ebaf8d9 100644 --- a/internal/galactus/guild.go +++ b/internal/galactus/guild.go @@ -28,6 +28,7 @@ func (galactus *GalactusAPI) GetGuildHandler() func(w http.ResponseWriter, r *ht w.Write([]byte(errMsg + ": " + err.Error())) return } + fromState := true sess := galactus.shardManager.SessionForGuild(id) guild, err := sess.State.Guild(guildID) if err != nil { @@ -36,12 +37,21 @@ func (galactus *GalactusAPI) GetGuildHandler() func(w http.ResponseWriter, r *ht zap.Error(err), zap.String("guildID", guildID), ) - w.WriteHeader(http.StatusInternalServerError) - w.Write([]byte(errMsg + ": " + err.Error())) - return - } - // TODO fetch the guild with an actual API call here? if it fails via state? + fromState = false + RecordDiscordRequest(galactus.client, Guild) + guild, err = sess.Guild(guildID) + if err != nil { + errMsg := "failed to fetch guild via API call" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("guildID", guildID), + ) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } + } jBytes, err := json.Marshal(guild) if err != nil { @@ -55,6 +65,7 @@ func (galactus *GalactusAPI) GetGuildHandler() func(w http.ResponseWriter, r *ht return } galactus.logger.Info("fetched guild", + zap.Bool("fromState", fromState), zap.String("guildID", guildID), ) w.WriteHeader(http.StatusOK) @@ -77,6 +88,7 @@ func (galactus *GalactusAPI) GetGuildChannelsHandler() func(w http.ResponseWrite w.Write([]byte(errMsg)) return } + RecordDiscordRequest(galactus.client, GuildChannels) channels, err := sess.GuildChannels(guildID) if err != nil { errMsg := "failed to fetch guild channels" @@ -123,6 +135,7 @@ func (galactus *GalactusAPI) GetGuildEmojisHandler() func(w http.ResponseWriter, w.Write([]byte(errMsg)) return } + RecordDiscordRequest(galactus.client, GuildEmojis) emojis, err := sess.GuildEmojis(guildID) if err != nil { errMsg := "failed to fetch guild emojis" @@ -169,6 +182,7 @@ func (galactus *GalactusAPI) GetGuildMemberHandler() func(w http.ResponseWriter, w.Write([]byte(errMsg)) return } + RecordDiscordRequest(galactus.client, GuildMember) member, err := sess.GuildMember(guildID, userID) if err != nil { errMsg := "failed to fetch guild member" @@ -218,6 +232,7 @@ func (galactus *GalactusAPI) GetGuildRolesHandler() func(w http.ResponseWriter, w.Write([]byte(errMsg)) return } + RecordDiscordRequest(galactus.client, GuildRoles) roles, err := sess.GuildRoles(guildID) if err != nil { errMsg := "failed to fetch guild roles" @@ -283,6 +298,7 @@ func (galactus *GalactusAPI) CreateGuildEmojiHandler() func(w http.ResponseWrite return } + RecordDiscordRequest(galactus.client, CreateGuildEmoji) emoji, err := sess.GuildEmojiCreate(guildID, name, string(body), nil) if err != nil { errMsg := "error creating emoji for guild" diff --git a/internal/galactus/message.go b/internal/galactus/message.go index 52bd385..8eca438 100644 --- a/internal/galactus/message.go +++ b/internal/galactus/message.go @@ -2,6 +2,7 @@ package galactus import ( "encoding/json" + "github.com/automuteus/galactus/internal/redis" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" "github.com/bwmarrin/discordgo" @@ -41,6 +42,7 @@ func (galactus *GalactusAPI) SendChannelMessageHandler() func(w http.ResponseWri return } + RecordDiscordRequest(galactus.client, MessageCreate) msg, err := sess.ChannelMessageSend(channelID, string(body)) if err != nil { errMsg := "error posting message to channel" @@ -60,6 +62,7 @@ func (galactus *GalactusAPI) SendChannelMessageHandler() func(w http.ResponseWri zap.String("contents", string(body)), zap.String("messageID", msg.ID), ) + w.WriteHeader(http.StatusOK) jbytes, err := json.Marshal(msg) if err != nil { @@ -114,6 +117,7 @@ func (galactus *GalactusAPI) SendChannelMessageEmbedHandler() func(w http.Respon return } + RecordDiscordRequest(galactus.client, MessageEmbedCreate) msg, err := sess.ChannelMessageSendEmbed(channelID, &embed) if err != nil { errMsg := "error posting messageEmbed to channel" @@ -133,6 +137,7 @@ func (galactus *GalactusAPI) SendChannelMessageEmbedHandler() func(w http.Respon zap.String("contents", string(body)), zap.String("messageID", msg.ID), ) + w.WriteHeader(http.StatusOK) jbytes, err := json.Marshal(msg) if err != nil { @@ -176,6 +181,21 @@ func (galactus *GalactusAPI) EditMessageEmbedHandler() func(w http.ResponseWrite return } + unique, err := redis.IsEmbedEditUnique(galactus.client, channelID, messageID, &embed) + if err != nil { + galactus.logger.Error("error when checking editEmbed uniqueness", + zap.Error(err), + ) + } + if !unique { + galactus.logger.Info("hash of message embed matched previous value - not editing message for the same contents", + zap.String("channelID", channelID), + zap.String("messageID", messageID), + ) + w.WriteHeader(http.StatusAlreadyReported) + return + } + // TODO perform some validation on the message body? // ex message length, empty contents, etc @@ -187,6 +207,7 @@ func (galactus *GalactusAPI) EditMessageEmbedHandler() func(w http.ResponseWrite w.Write([]byte(errMsg)) return } + RecordDiscordRequest(galactus.client, MessageEmbedEdit) msg, err := sess.ChannelMessageEditEmbed(channelID, messageID, &embed) if err != nil { errMsg := "error editing message in channel" @@ -235,6 +256,7 @@ func (galactus *GalactusAPI) DeleteChannelMessageHandler() func(w http.ResponseW w.Write([]byte(errMsg)) return } + RecordDiscordRequest(galactus.client, MessageDelete) err := sess.ChannelMessageDelete(channelID, messageID) if err != nil { errMsg := "error deleting message in channel" @@ -253,6 +275,7 @@ func (galactus *GalactusAPI) DeleteChannelMessageHandler() func(w http.ResponseW zap.String("channelID", channelID), zap.String("messageID", messageID), ) + w.WriteHeader(http.StatusOK) w.Write([]byte(messageID)) } diff --git a/internal/galactus/metrics.go b/internal/galactus/metrics.go new file mode 100644 index 0000000..4cff284 --- /dev/null +++ b/internal/galactus/metrics.go @@ -0,0 +1,135 @@ +package galactus + +import ( + "context" + "errors" + "github.com/automuteus/utils/pkg/rediskey" + "github.com/go-redis/redis/v8" + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promhttp" + "log" + "net/http" + "strconv" +) + +type EventType int + +const ( + MuteDeafenOfficial EventType = iota + MuteDeafenCapture + MuteDeafenWorker + MessageCreate + MessageEmbedCreate + MessageDelete + MessageEmbedEdit + ReactionAdd + ReactionRemove + ReactionRemoveAll + Guild + GuildChannels + GuildEmojis + GuildMember + GuildRoles + CreateGuildEmoji + UserChannel + InvalidRequest + OfficialRequest //must be the last metric +) + +var MetricTypeStrings = []string{ + "mute_deafen_official", + "mute_deafen_capture", + "mute_deafen_worker", + "message_create", + "message_embed_create", + "message_delete", + "message_embed_edit", + "reaction_add", + "reaction_remove", + "reaction_remove_all", + "guild", + "guild_channels", + "guild_emojis", + "guild_member", + "guild_roles", + "create_guild_emoji", + "user_channel", + "invalid_request", + "official_request", //must be the last request, because of how the sum is calculated in Collect below +} + +type Collector struct { + counterDesc *prometheus.Desc + client *redis.Client + commit string +} + +func (c *Collector) Describe(ch chan<- *prometheus.Desc) { + ch <- c.counterDesc +} + +func (c *Collector) Collect(ch chan<- prometheus.Metric) { + official := int64(0) + for i, str := range MetricTypeStrings { + if i != int(OfficialRequest) { + v, err := c.client.Get(context.Background(), rediskey.RequestsByType(str)).Result() + if !errors.Is(err, redis.Nil) && err != nil { + log.Println(err) + continue + } else { + num := int64(0) + if v != "" { + num, err = strconv.ParseInt(v, 10, 64) + if err != nil { + log.Println(err) + num = 0 + } + } + + ch <- prometheus.MustNewConstMetric( + c.counterDesc, + prometheus.CounterValue, + float64(num), + str, + ) + if i != int(MuteDeafenCapture) && i != int(MuteDeafenWorker) { + official += num + } + } + } else { + ch <- prometheus.MustNewConstMetric( + c.counterDesc, + prometheus.CounterValue, + float64(official), + str, + ) + } + } +} + +func RecordDiscordRequests(client *redis.Client, requestType EventType, num int64) { + for i := int64(0); i < num; i++ { + typeStr := MetricTypeStrings[requestType] + client.Incr(context.Background(), rediskey.RequestsByType(typeStr)) + } +} + +func RecordDiscordRequest(client *redis.Client, requestType EventType) { + typeStr := MetricTypeStrings[requestType] + client.Incr(context.Background(), rediskey.RequestsByType(typeStr)) +} + +func NewCollector(client *redis.Client) *Collector { + return &Collector{ + counterDesc: prometheus.NewDesc("discord_requests_by_type", "Number of discord requests made, differentiated by type", []string{"type"}, nil), + client: client, + } +} + +func PrometheusMetricsServer(client *redis.Client, port string) error { + prometheus.MustRegister(NewCollector(client)) + + http.Handle("/metrics", promhttp.Handler()) + + return http.ListenAndServe(":"+port, nil) +} diff --git a/internal/galactus/modify.go b/internal/galactus/modify.go index fa7c3e8..c252c15 100644 --- a/internal/galactus/modify.go +++ b/internal/galactus/modify.go @@ -121,7 +121,6 @@ func (galactus *GalactusAPI) modifyUserHandler(maxWorkers int, taskTimeout time. close(tasksChannel) w.WriteHeader(http.StatusOK) - jbytes, err := json.Marshal(mdsc) if err != nil { galactus.logger.Error("failed to marshal mutedeafensuccesscounts to JSON", @@ -133,5 +132,8 @@ func (galactus *GalactusAPI) modifyUserHandler(maxWorkers int, taskTimeout time. zap.Error(err)) } } + RecordDiscordRequests(galactus.client, MuteDeafenOfficial, mdsc.Official) + RecordDiscordRequests(galactus.client, MuteDeafenWorker, mdsc.Worker) + RecordDiscordRequests(galactus.client, MuteDeafenCapture, mdsc.Capture) } } diff --git a/internal/handler/rate_limit.go b/internal/galactus/rate_limit.go similarity index 86% rename from internal/handler/rate_limit.go rename to internal/galactus/rate_limit.go index 33a6be1..ff45aee 100644 --- a/internal/handler/rate_limit.go +++ b/internal/galactus/rate_limit.go @@ -1,4 +1,4 @@ -package handler +package galactus import ( "github.com/bwmarrin/discordgo" @@ -12,5 +12,6 @@ func RateLimitHandler(logger *zap.Logger, client *redis.Client) func(sess *disco zap.String("message", rl.Message), zap.String("url", rl.URL), ) + RecordDiscordRequest(client, InvalidRequest) } } diff --git a/internal/galactus/reaction.go b/internal/galactus/reaction.go index 40853ef..0ea4b15 100644 --- a/internal/galactus/reaction.go +++ b/internal/galactus/reaction.go @@ -28,6 +28,7 @@ func (galactus *GalactusAPI) AddReactionHandler() func(w http.ResponseWriter, r w.Write([]byte(errMsg)) return } + RecordDiscordRequest(galactus.client, ReactionAdd) err := sess.MessageReactionAdd(channelID, messageID, emojiID) if err != nil { errMsg := "failed to addReaction" @@ -83,6 +84,8 @@ func (galactus *GalactusAPI) RemoveReactionHandler() func(w http.ResponseWriter, w.Write([]byte(errMsg)) return } + + RecordDiscordRequest(galactus.client, ReactionRemove) err = sess.MessageReactionRemove(channelID, messageID, emojiID, userID) if err != nil { errMsg := "failed to removeReaction" @@ -123,6 +126,8 @@ func (galactus *GalactusAPI) RemoveAllReactionsHandler() func(w http.ResponseWri w.Write([]byte(errMsg)) return } + + RecordDiscordRequest(galactus.client, ReactionRemoveAll) err := sess.MessageReactionsRemoveAll(channelID, messageID) if err != nil { errMsg := "failed to remove all reactions" diff --git a/internal/galactus/server.go b/internal/galactus/server.go index 2c90c67..1f61b3e 100644 --- a/internal/galactus/server.go +++ b/internal/galactus/server.go @@ -62,6 +62,7 @@ func NewGalactusAPI(logger *zap.Logger, botToken, topGGtoken, botID, redisAddr, manager := shard_manager.MakeShardManager(logger, botToken, DefaultIntents) shard_manager.AddHandlers(logger, manager, rdb, botPrefix) + shard_manager.AddRateLimitHandler(manager, RateLimitHandler(logger, rdb)) var topgg *dbl.Client = nil if topGGtoken != "" { @@ -163,6 +164,8 @@ func (galactus *GalactusAPI) Run(port string, maxWorkers int, captureAckTimeout galactus.loadTokensFromEnv() + go PrometheusMetricsServer(galactus.client, "2112") + // TODO maybe eventually provide some auth parameter, or version number? Something to prove that a worker can pop requests? mainRouter := mux.NewRouter() diff --git a/internal/galactus/shard_manager/shard_manager.go b/internal/galactus/shard_manager/shard_manager.go index a130273..e0def3b 100644 --- a/internal/galactus/shard_manager/shard_manager.go +++ b/internal/galactus/shard_manager/shard_manager.go @@ -47,6 +47,8 @@ func AddHandlers(logger *zap.Logger, manager *dshardmanager.Manager, client *red manager.AddHandler(handler.VoiceStateUpdateHandler(logger, client)) manager.AddHandler(handler.MessageCreateHandler(logger, client, botPrefix)) manager.AddHandler(handler.MessageReactionAddHandler(logger, client)) +} - manager.AddHandler(handler.RateLimitHandler(logger, client)) +func AddRateLimitHandler(manager *dshardmanager.Manager, handler func(sess *discordgo.Session, rl *discordgo.RateLimit)) { + manager.AddHandler(handler) } diff --git a/internal/galactus/token.go b/internal/galactus/token.go index 59a5235..03ef1d5 100644 --- a/internal/galactus/token.go +++ b/internal/galactus/token.go @@ -6,7 +6,6 @@ import ( "github.com/automuteus/utils/pkg/discord" "github.com/automuteus/utils/pkg/rediskey" "go.uber.org/zap" - "log" "time" ) @@ -67,24 +66,29 @@ func (galactus *GalactusAPI) attemptOnCaptureBot(guildID, connectCode string, gi err := redis.PushCaptureClientTask(galactus.client, connectCode, taskObj, timeout) if err != nil { - log.Println("Error in pushing task to " + rediskey.TasksList(connectCode)) - log.Println(err) + galactus.logger.Error("error pushing capture client task", + zap.Error(err), + zap.String("key", rediskey.TasksList(connectCode))) } else { go galactus.waitForAck(pubsub, timeout, acked) res := <-acked if res { - log.Println("Successful mute/deafen using client capture bot!") - + galactus.logger.Info("successful mute/deafen using client capture bot", + zap.String("taskID", taskObj.TaskID), + ) // hooray! we did the mute with a client token! return true } err := galactus.BlacklistTokenForDuration(guildID, connectCode, UnresponsiveCaptureBlacklistDuration) if err == nil { - log.Printf("No ack from capture clients; blacklisting capture client for gamecode \"%s\" for %s\n", connectCode, UnresponsiveCaptureBlacklistDuration.String()) + galactus.logger.Info("no ack from capture clients. Not using capture client for a time period", + zap.String("connectCode", connectCode), + zap.String("duration", UnresponsiveCaptureBlacklistDuration.String()), + ) } } } else { - log.Println("Capture client is probably rate-limited. Deferring to main bot instead") + galactus.logger.Info("capture client likely rate-limited or refusing tasks. Using main bot instead") } return false } diff --git a/internal/redis/cache.go b/internal/redis/cache.go new file mode 100644 index 0000000..730e427 --- /dev/null +++ b/internal/redis/cache.go @@ -0,0 +1,52 @@ +package redis + +import ( + "context" + "crypto/sha256" + "encoding/hex" + "github.com/bwmarrin/discordgo" + "github.com/go-redis/redis/v8" + "time" +) + +func IsEmbedEditUnique(client *redis.Client, channelID, messageID string, msg *discordgo.MessageEmbed) (bool, error) { + oldHash := getEmbedHash(client, channelID, messageID) + newHash := hash(msg) + + if newHash != oldHash { + return true, writeEmbedHash(client, channelID, messageID, newHash) + } + return false, nil +} + +func hash(msg *discordgo.MessageEmbed) string { + if msg == nil { + return "" + } + + h := sha256.New() + h.Write([]byte(msg.Title)) + h.Write([]byte(msg.Description)) + for _, v := range msg.Fields { + if v != nil { + h.Write([]byte(v.Name)) + h.Write([]byte(v.Value)) + } + } + return hex.EncodeToString(h.Sum(nil)) +} + +// TODO move to utils +func EmbedHashKey(channelID, messageID string) string { + return "automuteus:hash:embed:" + channelID + ":" + messageID +} + +func getEmbedHash(client *redis.Client, channelID, messageID string) string { + // we actually don't care about the error here. Just assume no cache entry, embed is uncached + r, _ := client.Get(context.Background(), EmbedHashKey(channelID, messageID)).Result() + return r +} + +func writeEmbedHash(client *redis.Client, channelID, messageID, hash string) error { + return client.Set(context.Background(), EmbedHashKey(channelID, messageID), hash, time.Second*30).Err() +} diff --git a/main.go b/main.go index 499cd6c..4cc8eb4 100644 --- a/main.go +++ b/main.go @@ -119,7 +119,7 @@ func main() { zap.String("BOT_ID", botID), ) - tp := galactus.NewGalactusAPI(logger, botToken, topGGToken, botID, redisAddr, redisUser, redisPass, maxReq, botToken) + tp := galactus.NewGalactusAPI(logger, botToken, topGGToken, botID, redisAddr, redisUser, redisPass, maxReq, botPrefix) sc := make(chan os.Signal, 1) signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill) diff --git a/pkg/client/capture.go b/pkg/client/capture.go index b81520a..58c6c04 100644 --- a/pkg/client/capture.go +++ b/pkg/client/capture.go @@ -53,7 +53,7 @@ func (galactus *GalactusClient) GetCaptureEvent(connectCode string) (*capture.Ev return nil, err } defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { + if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusAccepted { err := errors.New("non-200 response code received for " + url) return nil, err } @@ -94,7 +94,7 @@ func (galactus *GalactusClient) GetCaptureTask(ctx context.Context, connectCode return nil, err } defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { + if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusAccepted { err := errors.New("non-200 response code received for " + url) return nil, err } From fed71160a373abce16d93b6d2862ab3d7778cbc8 Mon Sep 17 00:00:00 2001 From: denverquane Date: Sun, 24 Jan 2021 23:57:40 -0700 Subject: [PATCH 33/50] Fix superfluous HTTP header write --- internal/galactus/capture.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/galactus/capture.go b/internal/galactus/capture.go index 466d134..aad32be 100644 --- a/internal/galactus/capture.go +++ b/internal/galactus/capture.go @@ -142,6 +142,7 @@ func (galactus *GalactusAPI) GetCaptureTaskHandler(taskTimeout time.Duration) fu return } + w.WriteHeader(http.StatusOK) _, err = w.Write([]byte(msg)) if err != nil { galactus.logger.Error("failed to write capture task as HTTP response", @@ -154,7 +155,6 @@ func (galactus *GalactusAPI) GetCaptureTaskHandler(taskTimeout time.Duration) fu zap.String("connectCode", connectCode), zap.String("task", msg), ) - w.WriteHeader(http.StatusOK) } } From ab5ea4769825955c68698e88ee8bc63204918af0 Mon Sep 17 00:00:00 2001 From: denverquane Date: Sat, 30 Jan 2021 19:11:08 -0700 Subject: [PATCH 34/50] Update discordgo, use Redis key for prefix separately (optimization to not fetch entire settings) --- go.mod | 2 +- go.sum | 2 ++ internal/galactus/shard_manager/shard_manager.go | 2 +- internal/handler/message_create.go | 10 ++++------ internal/handler/voice_state.go | 2 +- internal/redis/settings.go | 15 +++++++++++++++ 6 files changed, 24 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 845f153..e6a2dea 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/alicebob/miniredis/v2 v2.14.1 github.com/automuteus/utils v0.0.10 github.com/bsm/redislock v0.7.0 - github.com/bwmarrin/discordgo v0.22.1 + github.com/bwmarrin/discordgo v0.23.1 github.com/go-redis/redis/v8 v8.4.2 github.com/gorilla/mux v1.8.0 github.com/gorilla/websocket v1.4.1 // indirect diff --git a/go.sum b/go.sum index c2564b2..8c985cd 100644 --- a/go.sum +++ b/go.sum @@ -39,6 +39,8 @@ github.com/bsm/redislock v0.7.0/go.mod h1:3Kgu+cXw0JrkZ5pmY/JbcFpixGZ5M9v9G2PGWY github.com/bwmarrin/discordgo v0.22.0/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= github.com/bwmarrin/discordgo v0.22.1 h1:254fNYyfqJWKbPzO5g8j/nUvRgj4dNlI19EB8rnkpt8= github.com/bwmarrin/discordgo v0.22.1/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= +github.com/bwmarrin/discordgo v0.23.1 h1:xlK4/69bpl/VSoCYaKe3BOc9j1HkNopoRdCppRYu8dk= +github.com/bwmarrin/discordgo v0.23.1/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= diff --git a/internal/galactus/shard_manager/shard_manager.go b/internal/galactus/shard_manager/shard_manager.go index e0def3b..7e61a4a 100644 --- a/internal/galactus/shard_manager/shard_manager.go +++ b/internal/galactus/shard_manager/shard_manager.go @@ -8,7 +8,7 @@ import ( "go.uber.org/zap" ) -func MakeShardManager(logger *zap.Logger, token string, intent *discordgo.Intent) *dshardmanager.Manager { +func MakeShardManager(logger *zap.Logger, token string, intent discordgo.Intent) *dshardmanager.Manager { manager := dshardmanager.New("Bot " + token) manager.Name = "AutoMuteUs" diff --git a/internal/handler/message_create.go b/internal/handler/message_create.go index b9bf9bb..2cc453d 100644 --- a/internal/handler/message_create.go +++ b/internal/handler/message_create.go @@ -50,12 +50,10 @@ func MessageCreateHandler(logger *zap.Logger, client *redis.Client, globalPrefix } if detectedPrefix == "" { - // TODO this is called every time a message is posted in any channel of any guild... - // need a more optimal store in Redis so we don't need to unmarshal an ENTIRE settings object every time - sett, err := redis_utils.GetSettingsFromRedis(client, m.GuildID) - if sett != nil && err == nil { - if strings.HasPrefix(m.Content, sett.CommandPrefix) { - detectedPrefix = sett.CommandPrefix + prefix, err := redis_utils.GetPrefixFromRedis(client, m.GuildID) + if prefix != "" && err == nil { + if strings.HasPrefix(m.Content, prefix) { + detectedPrefix = prefix } } } diff --git a/internal/handler/voice_state.go b/internal/handler/voice_state.go index 2a2f3fc..f298647 100644 --- a/internal/handler/voice_state.go +++ b/internal/handler/voice_state.go @@ -19,7 +19,7 @@ func VoiceStateUpdateHandler(logger *zap.Logger, client *redis.Client) func(s *d return } - // if no active games, completely ignore message reactions + // if no active games, completely ignore voice messages if !redis_utils.AnyActiveGamesInGuild(client, m.GuildID) { return } diff --git a/internal/redis/settings.go b/internal/redis/settings.go index 6e90486..57d935b 100644 --- a/internal/redis/settings.go +++ b/internal/redis/settings.go @@ -8,8 +8,23 @@ import ( "github.com/automuteus/utils/pkg/rediskey" "github.com/automuteus/utils/pkg/settings" "github.com/go-redis/redis/v8" + "time" ) +func GetPrefixFromRedis(client *redis.Client, guildID string) (string, error) { + key := rediskey.GuildPrefix(hashGuildID(guildID)) + str, err := client.Get(context.Background(), key).Result() + if err != nil { + sett, err := GetSettingsFromRedis(client, guildID) + if err != nil { + return "", err + } + client.Set(context.Background(), key, sett.CommandPrefix, time.Hour*12) + return sett.CommandPrefix, err + } + return str, err +} + func GetSettingsFromRedis(client *redis.Client, guildID string) (*settings.GuildSettings, error) { var sett settings.GuildSettings key := rediskey.GuildSettings(hashGuildID(guildID)) From 70667e0fd03196db7c1e611b0d170dbc455d592c Mon Sep 17 00:00:00 2001 From: denverquane Date: Sat, 30 Jan 2021 19:31:34 -0700 Subject: [PATCH 35/50] Use utils to hash guildID --- go.mod | 5 +---- go.sum | 6 ++---- internal/redis/settings.go | 16 ++-------------- 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/go.mod b/go.mod index e6a2dea..385e717 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/alicebob/miniredis/v2 v2.14.1 - github.com/automuteus/utils v0.0.10 + github.com/automuteus/utils v0.0.11 github.com/bsm/redislock v0.7.0 github.com/bwmarrin/discordgo v0.23.1 github.com/go-redis/redis/v8 v8.4.2 @@ -16,6 +16,3 @@ require ( go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.16.0 ) - -// TODO replace when V7 comes out -replace github.com/automuteus/utils v0.0.10 => github.com/automuteus/utils v0.0.11-0.20210117090606-d48d8a0c6a4b diff --git a/go.sum b/go.sum index 8c985cd..7512332 100644 --- a/go.sum +++ b/go.sum @@ -24,8 +24,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= -github.com/automuteus/utils v0.0.11-0.20210117090606-d48d8a0c6a4b h1:5WCoZsyNqCvAQQ3Sr4Xgb90IFzMZooXA/VgWJ03OHEU= -github.com/automuteus/utils v0.0.11-0.20210117090606-d48d8a0c6a4b/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= +github.com/automuteus/utils v0.0.11 h1:0AE++H2xawEDxZGMg8iZm61R6QQdbgrTx7EYXlGSfzo= +github.com/automuteus/utils v0.0.11/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= @@ -37,8 +37,6 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB github.com/bsm/redislock v0.7.0 h1:RL7aZJhCKkuBjQbnSTKCeedTRifBWxd/ffP+GZ599Mo= github.com/bsm/redislock v0.7.0/go.mod h1:3Kgu+cXw0JrkZ5pmY/JbcFpixGZ5M9v9G2PGWYqku+k= github.com/bwmarrin/discordgo v0.22.0/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= -github.com/bwmarrin/discordgo v0.22.1 h1:254fNYyfqJWKbPzO5g8j/nUvRgj4dNlI19EB8rnkpt8= -github.com/bwmarrin/discordgo v0.22.1/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= github.com/bwmarrin/discordgo v0.23.1 h1:xlK4/69bpl/VSoCYaKe3BOc9j1HkNopoRdCppRYu8dk= github.com/bwmarrin/discordgo v0.23.1/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= diff --git a/internal/redis/settings.go b/internal/redis/settings.go index 57d935b..2a59ae3 100644 --- a/internal/redis/settings.go +++ b/internal/redis/settings.go @@ -2,8 +2,6 @@ package redis import ( "context" - "crypto/sha256" - "encoding/hex" "encoding/json" "github.com/automuteus/utils/pkg/rediskey" "github.com/automuteus/utils/pkg/settings" @@ -12,7 +10,7 @@ import ( ) func GetPrefixFromRedis(client *redis.Client, guildID string) (string, error) { - key := rediskey.GuildPrefix(hashGuildID(guildID)) + key := rediskey.GuildPrefix(rediskey.HashGuildID(guildID)) str, err := client.Get(context.Background(), key).Result() if err != nil { sett, err := GetSettingsFromRedis(client, guildID) @@ -27,7 +25,7 @@ func GetPrefixFromRedis(client *redis.Client, guildID string) (string, error) { func GetSettingsFromRedis(client *redis.Client, guildID string) (*settings.GuildSettings, error) { var sett settings.GuildSettings - key := rediskey.GuildSettings(hashGuildID(guildID)) + key := rediskey.GuildSettings(rediskey.HashGuildID(guildID)) str, err := client.Get(context.Background(), key).Result() if err != nil { @@ -39,13 +37,3 @@ func GetSettingsFromRedis(client *redis.Client, guildID string) (*settings.Guild } return &sett, nil } - -func hashGuildID(guildID string) string { - return genericHash(guildID) -} - -func genericHash(s string) string { - h := sha256.New() - h.Write([]byte(s)) - return hex.EncodeToString(h.Sum(nil)) -} From 705ec97d9fbf3ca495a7d0af989153be26d7fed1 Mon Sep 17 00:00:00 2001 From: denverquane Date: Sun, 31 Jan 2021 20:35:29 -0700 Subject: [PATCH 36/50] Added helper for send and delete message --- pkg/client/message.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkg/client/message.go b/pkg/client/message.go index a961141..1998049 100644 --- a/pkg/client/message.go +++ b/pkg/client/message.go @@ -9,6 +9,7 @@ import ( "go.uber.org/zap" "io/ioutil" "net/http" + "time" ) func (galactus *GalactusClient) SendChannelMessage(channelID string, message string) (*discordgo.Message, error) { @@ -114,3 +115,14 @@ func (galactus *GalactusClient) DeleteChannelMessage(channelID, messageID string } return nil } + +func (galactus *GalactusClient) SendAndDeleteMessage(channelID string, message string, timeout time.Duration) error { + msg, err := galactus.SendChannelMessage(channelID, message) + if err != nil { + return err + } + + time.Sleep(timeout) + + return galactus.DeleteChannelMessage(channelID, msg.ID) +} From c5fc0a2730657a1e8414a82844617a47156fd1f1 Mon Sep 17 00:00:00 2001 From: denverquane Date: Mon, 1 Feb 2021 14:51:57 -0700 Subject: [PATCH 37/50] Added NUM_SHARDS as override for recommended shard count --- internal/galactus/server.go | 4 ++-- internal/galactus/shard_manager/shard_manager.go | 13 ++++++++++--- main.go | 15 ++++++++++++++- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/internal/galactus/server.go b/internal/galactus/server.go index 1f61b3e..614f9eb 100644 --- a/internal/galactus/server.go +++ b/internal/galactus/server.go @@ -50,7 +50,7 @@ type GalactusAPI struct { logger *zap.Logger } -func NewGalactusAPI(logger *zap.Logger, botToken, topGGtoken, botID, redisAddr, redisUser, redisPass string, maxReq int64, botPrefix string) *GalactusAPI { +func NewGalactusAPI(logger *zap.Logger, botToken string, numShards int, topGGtoken, botID, redisAddr, redisUser, redisPass string, maxReq int64, botPrefix string) *GalactusAPI { var rdb *redis.Client rdb = redis.NewClient(&redis.Options{ @@ -60,7 +60,7 @@ func NewGalactusAPI(logger *zap.Logger, botToken, topGGtoken, botID, redisAddr, DB: 0, // use default DB }) - manager := shard_manager.MakeShardManager(logger, botToken, DefaultIntents) + manager := shard_manager.MakeShardManager(logger, botToken, numShards, DefaultIntents) shard_manager.AddHandlers(logger, manager, rdb, botPrefix) shard_manager.AddRateLimitHandler(manager, RateLimitHandler(logger, rdb)) diff --git a/internal/galactus/shard_manager/shard_manager.go b/internal/galactus/shard_manager/shard_manager.go index 7e61a4a..e1f4f68 100644 --- a/internal/galactus/shard_manager/shard_manager.go +++ b/internal/galactus/shard_manager/shard_manager.go @@ -8,7 +8,7 @@ import ( "go.uber.org/zap" ) -func MakeShardManager(logger *zap.Logger, token string, intent discordgo.Intent) *dshardmanager.Manager { +func MakeShardManager(logger *zap.Logger, token string, numShards int, intent discordgo.Intent) *dshardmanager.Manager { manager := dshardmanager.New("Bot " + token) manager.Name = "AutoMuteUs" @@ -17,8 +17,15 @@ func MakeShardManager(logger *zap.Logger, token string, intent discordgo.Intent) logger.Fatal("failed to obtain recommended shard count", zap.Error(err)) } - - manager.SetNumShards(recommended) + if numShards > 0 { + logger.Info("obtained recommended number of shards, but using provided value instead", + zap.Int("recommended", recommended), + zap.Int("NUM_SHARDS", numShards), + ) + manager.SetNumShards(numShards) + } else { + manager.SetNumShards(recommended) + } logger.Info("starting shard manager", zap.Int("num shards", manager.GetNumShards())) diff --git a/main.go b/main.go index 4cc8eb4..fa197c5 100644 --- a/main.go +++ b/main.go @@ -106,6 +106,18 @@ func main() { botID = os.Getenv("BOT_ID") } + numShards := -1 + if os.Getenv("NUM_SHARDS") != "" { + num, err := strconv.ParseInt(os.Getenv("NUM_SHARDS"), 10, 64) + if err != nil { + logger.Error("could not parse NUM_SHARDS. Will use Discord-recommended value instead", + zap.Error(err), + ) + } else { + numShards = int(num) + } + } + logger.Info("loaded env", zap.String("DISCORD_BOT_TOKEN", botToken), zap.String("REDIS_ADDR", redisAddr), @@ -117,9 +129,10 @@ func main() { zap.String("AUTOMUTEUS_GLOBAL_PREFIX", botPrefix), zap.String("TOP_GG_TOKEN", topGGToken), zap.String("BOT_ID", botID), + zap.Int("NUM_SHARDS", numShards), ) - tp := galactus.NewGalactusAPI(logger, botToken, topGGToken, botID, redisAddr, redisUser, redisPass, maxReq, botPrefix) + tp := galactus.NewGalactusAPI(logger, botToken, numShards, topGGToken, botID, redisAddr, redisUser, redisPass, maxReq, botPrefix) sc := make(chan os.Signal, 1) signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill) From 57688cb93c774021e7ea1a1eae9d0d37dfe6c862 Mon Sep 17 00:00:00 2001 From: denverquane Date: Mon, 1 Feb 2021 19:03:54 -0700 Subject: [PATCH 38/50] Switch from redislock to redsync, lock all relevant snowflakes --- go.mod | 2 +- go.sum | 37 ++++++++++--------- .../galactus/shard_manager/shard_manager.go | 15 +++++--- internal/handler/guild_create.go | 14 ++++++- internal/handler/guild_delete.go | 15 +++++++- internal/handler/message_create.go | 16 ++++---- internal/handler/message_reaction_add.go | 14 ++++++- internal/handler/voice_state.go | 15 +++++++- internal/redis/lock.go | 25 ++++--------- internal/redis/user_ratelimit.go | 4 +- pkg/client/modify.go | 9 ++--- 11 files changed, 104 insertions(+), 62 deletions(-) diff --git a/go.mod b/go.mod index 385e717..7f15cba 100644 --- a/go.mod +++ b/go.mod @@ -5,9 +5,9 @@ go 1.15 require ( github.com/alicebob/miniredis/v2 v2.14.1 github.com/automuteus/utils v0.0.11 - github.com/bsm/redislock v0.7.0 github.com/bwmarrin/discordgo v0.23.1 github.com/go-redis/redis/v8 v8.4.2 + github.com/go-redsync/redsync/v4 v4.0.4 github.com/gorilla/mux v1.8.0 github.com/gorilla/websocket v1.4.1 // indirect github.com/jonas747/dshardmanager v0.0.0-20180911185241-9e4282faed43 diff --git a/go.sum b/go.sum index 7512332..5d4341a 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= @@ -34,8 +32,6 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bsm/redislock v0.7.0 h1:RL7aZJhCKkuBjQbnSTKCeedTRifBWxd/ffP+GZ599Mo= -github.com/bsm/redislock v0.7.0/go.mod h1:3Kgu+cXw0JrkZ5pmY/JbcFpixGZ5M9v9G2PGWYqku+k= github.com/bwmarrin/discordgo v0.22.0/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= github.com/bwmarrin/discordgo v0.23.1 h1:xlK4/69bpl/VSoCYaKe3BOc9j1HkNopoRdCppRYu8dk= github.com/bwmarrin/discordgo v0.23.1/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= @@ -88,16 +84,21 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4 github.com/georgysavva/scany v0.2.7 h1:SBEuurTvWOUp7FnGBOjeSF9XWaWmVzc91h9baPo6y2s= github.com/georgysavva/scany v0.2.7/go.mod h1:bcxPhzeQFQqAUmjlZVwTGlu6AnWFSOiHpalfBe0xQ6U= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-redis/redis/v8 v8.1.0/go.mod h1:isLoQT/NFSP7V67lyvM9GmdvLdyZ7pEhsXvvyQtnQTo= +github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg= +github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= +github.com/go-redis/redis/v7 v7.4.0 h1:7obg6wUoj05T0EpY0o8B59S9w5yeMWql7sw2kwNW1x4= +github.com/go-redis/redis/v7 v7.4.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg= +github.com/go-redis/redis/v8 v8.1.1/go.mod h1:ysgGY09J/QeDYbu3HikWEIPCwaeOkuNoTgKayTEaEOw= github.com/go-redis/redis/v8 v8.4.2 h1:gKRo1KZ+O3kXRfxeRblV5Tr470d2YJZJVIAv2/S8960= github.com/go-redis/redis/v8 v8.4.2/go.mod h1:A1tbYoHSa1fXwN+//ljcCYYJeLmVrwL9hbQN45Jdy0M= +github.com/go-redsync/redsync/v4 v4.0.4 h1:ru0qG+VCefaZSx3a5ADmlKZXkNdgeeYWIuymDu/tzV8= +github.com/go-redsync/redsync/v4 v4.0.4/go.mod h1:QBOJAs1k8O6Eyrre4a++pxQgHe5eQ+HF56KuTVv+8Bs= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= @@ -125,6 +126,8 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/gomodule/redigo v1.8.2 h1:H5XSIre1MB5NbPYFp+i1NBbb5qN1W8Y8YAQoAYbkm8k= +github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -154,11 +157,14 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g4TbElacI= +github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= @@ -318,11 +324,13 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.14.2 h1:8mVmC9kjFFmA8H4pKMUhcblgifdkOIXPvbhN1T36q1M= github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= @@ -417,6 +425,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203 h1:QVqDTf3h2WHt08YuiTGPZLls0Wq99X9bWd0Q5ZSBesM= +github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203/go.mod h1:oqN97ltKNihBbwlX8dLpwxCl3+HnXKV/R0e+sRLd9C8= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/top-gg/go-dbl v0.0.0-20201116001615-e844586b1159 h1:25mzrW8AGLqqrtwx7uO2AT6v6WT3i46EuzCKH1UZxWg= github.com/top-gg/go-dbl v0.0.0-20201116001615-e844586b1159/go.mod h1:iWzDb/dmbZ5oHEuSOfbTe4iO3ETj6qvvEwSh4MzZNtM= @@ -470,21 +480,14 @@ golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20200908183739-ae8ad444f925/go.mod h1:1phAWC201xIgDyaFpmDeZkgf70Q4Pd/CNqfRtVPtxNw= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449 h1:xUIPaMhvROX9dhPvRCenIJtU78+lbEenGbgqB5hfHCQ= -golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -501,6 +504,7 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0 h1:wBouT66WTYFXdxfVdz9sVWARVd/2vfGcmI45D2gj45M= @@ -524,7 +528,6 @@ golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -533,8 +536,8 @@ golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -569,10 +572,8 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200103221440-774c71fcf114 h1:DnSr2mCsxyCE6ZgIkmcWUQY2R5cH/6wL7eIxEmQOMSE= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa h1:5E4dL8+NgFOgjwbTKz+OOEGGhP+ectTmF842l6KjupQ= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/internal/galactus/shard_manager/shard_manager.go b/internal/galactus/shard_manager/shard_manager.go index e1f4f68..d974cb4 100644 --- a/internal/galactus/shard_manager/shard_manager.go +++ b/internal/galactus/shard_manager/shard_manager.go @@ -4,6 +4,8 @@ import ( "github.com/automuteus/galactus/internal/handler" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" + "github.com/go-redsync/redsync/v4" + "github.com/go-redsync/redsync/v4/redis/goredis/v8" "github.com/jonas747/dshardmanager" "go.uber.org/zap" ) @@ -48,12 +50,15 @@ func MakeShardManager(logger *zap.Logger, token string, numShards int, intent di } func AddHandlers(logger *zap.Logger, manager *dshardmanager.Manager, client *redis.Client, botPrefix string) { - manager.AddHandler(handler.GuildCreateHandler(logger, client)) - manager.AddHandler(handler.GuildDeleteHandler(logger, client)) + pool := goredis.NewPool(client) // or, pool := redigo.NewPool(...) - manager.AddHandler(handler.VoiceStateUpdateHandler(logger, client)) - manager.AddHandler(handler.MessageCreateHandler(logger, client, botPrefix)) - manager.AddHandler(handler.MessageReactionAddHandler(logger, client)) + locker := redsync.New(pool) + manager.AddHandler(handler.GuildCreateHandler(logger, client, locker)) + manager.AddHandler(handler.GuildDeleteHandler(logger, client, locker)) + + manager.AddHandler(handler.VoiceStateUpdateHandler(logger, client, locker)) + manager.AddHandler(handler.MessageCreateHandler(logger, client, locker, botPrefix)) + manager.AddHandler(handler.MessageReactionAddHandler(logger, client, locker)) } func AddRateLimitHandler(manager *dshardmanager.Manager, handler func(sess *discordgo.Session, rl *discordgo.RateLimit)) { diff --git a/internal/handler/guild_create.go b/internal/handler/guild_create.go index 1994c7b..a6efa10 100644 --- a/internal/handler/guild_create.go +++ b/internal/handler/guild_create.go @@ -6,14 +6,26 @@ import ( "github.com/automuteus/galactus/pkg/discord_message" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" + "github.com/go-redsync/redsync/v4" "go.uber.org/zap" ) -func GuildCreateHandler(logger *zap.Logger, client *redis.Client) func(s *discordgo.Session, m *discordgo.GuildCreate) { +func GuildCreateHandler(logger *zap.Logger, client *redis.Client, locker *redsync.Redsync) func(s *discordgo.Session, m *discordgo.GuildCreate) { return func(s *discordgo.Session, m *discordgo.GuildCreate) { if m == nil { return } + snowflakeMutex, err := redis_utils.LockSnowflake(locker, m.ID+"_create") + // couldn't obtain lock; bail bail bail! + if snowflakeMutex == nil { + logger.Info("could not obtain snowflake lock", + zap.String("type", "GuildCreate"), + zap.Int("shard ID", s.ShardID), + zap.String("snowflakeID", m.ID+"_create")) + return + } + defer snowflakeMutex.Unlock() + byt, err := json.Marshal(m) if err != nil { logger.Error("error marshalling json for GuildCreate message", diff --git a/internal/handler/guild_delete.go b/internal/handler/guild_delete.go index 90b3dc6..c68b85f 100644 --- a/internal/handler/guild_delete.go +++ b/internal/handler/guild_delete.go @@ -6,14 +6,27 @@ import ( "github.com/automuteus/galactus/pkg/discord_message" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" + "github.com/go-redsync/redsync/v4" "go.uber.org/zap" ) -func GuildDeleteHandler(logger *zap.Logger, client *redis.Client) func(s *discordgo.Session, m *discordgo.GuildDelete) { +func GuildDeleteHandler(logger *zap.Logger, client *redis.Client, locker *redsync.Redsync) func(s *discordgo.Session, m *discordgo.GuildDelete) { return func(s *discordgo.Session, m *discordgo.GuildDelete) { if m == nil { return } + + snowflakeMutex, err := redis_utils.LockSnowflake(locker, m.ID+"_delete") + // couldn't obtain lock; bail bail bail! + if snowflakeMutex == nil { + logger.Info("could not obtain snowflake lock", + zap.String("type", "GuildDelete"), + zap.Int("shard ID", s.ShardID), + zap.String("snowflakeID", m.ID+"_delete")) + return + } + defer snowflakeMutex.Unlock() + byt, err := json.Marshal(m) if err != nil { logger.Error("error marshalling json for GuildDelete message", diff --git a/internal/handler/message_create.go b/internal/handler/message_create.go index 2cc453d..d5ead70 100644 --- a/internal/handler/message_create.go +++ b/internal/handler/message_create.go @@ -1,19 +1,19 @@ package handler import ( - "context" "encoding/json" "fmt" redis_utils "github.com/automuteus/galactus/internal/redis" "github.com/automuteus/galactus/pkg/discord_message" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" + "github.com/go-redsync/redsync/v4" "go.uber.org/zap" "strings" "time" ) -func MessageCreateHandler(logger *zap.Logger, client *redis.Client, globalPrefix string) func(s *discordgo.Session, m *discordgo.MessageCreate) { +func MessageCreateHandler(logger *zap.Logger, client *redis.Client, locker *redsync.Redsync, globalPrefix string) func(s *discordgo.Session, m *discordgo.MessageCreate) { return func(s *discordgo.Session, m *discordgo.MessageCreate) { if m == nil { return @@ -23,16 +23,16 @@ func MessageCreateHandler(logger *zap.Logger, client *redis.Client, globalPrefix return } - snowflakeLock := redis_utils.LockSnowflake(context.Background(), client, m.ID) + snowflakeMutex, err := redis_utils.LockSnowflake(locker, m.ID) // couldn't obtain lock; bail bail bail! - if snowflakeLock == nil { + if snowflakeMutex == nil { logger.Info("could not obtain snowflake lock", zap.String("type", "MessageCreate"), zap.Int("shard ID", s.ShardID), zap.String("snowflakeID", m.ID)) return } - defer snowflakeLock.Release(context.Background()) + defer snowflakeMutex.Unlock() if redis_utils.IsUserBanned(client, m.Author.ID) { logger.Info("ignoring message from softbanned user", @@ -68,15 +68,15 @@ func MessageCreateHandler(logger *zap.Logger, client *redis.Client, globalPrefix // record the violation with this call if redis_utils.IncrementRateLimitExceed(client, m.Author.ID) { msg, err := s.ChannelMessageSend(m.ChannelID, - fmt.Sprintf("%s has been spamming. I'm ignoring them for the next %f minutes.", + fmt.Sprintf("%s has been spamming. I'm ignoring them for the next %d minutes.", discord_message.MentionByUserID(m.Author.ID), - redis_utils.SoftbanDuration.Minutes())) + int(redis_utils.SoftbanDuration.Minutes()))) if err != nil { logger.Error("error posting ratelimit ban message", zap.Error(err), ) } else { - go discord_message.DeleteMessageWorker(s, msg.ChannelID, msg.ID, time.Second*3) + go discord_message.DeleteMessageWorker(s, msg.ChannelID, msg.ID, redis_utils.SoftbanDuration) } return } else { diff --git a/internal/handler/message_reaction_add.go b/internal/handler/message_reaction_add.go index 7a05fd0..e7d1806 100644 --- a/internal/handler/message_reaction_add.go +++ b/internal/handler/message_reaction_add.go @@ -9,11 +9,12 @@ import ( "github.com/automuteus/utils/pkg/rediskey" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" + "github.com/go-redsync/redsync/v4" "go.uber.org/zap" "time" ) -func MessageReactionAddHandler(logger *zap.Logger, client *redis.Client) func(s *discordgo.Session, m *discordgo.MessageReactionAdd) { +func MessageReactionAddHandler(logger *zap.Logger, client *redis.Client, locker *redsync.Redsync) func(s *discordgo.Session, m *discordgo.MessageReactionAdd) { return func(s *discordgo.Session, m *discordgo.MessageReactionAdd) { if m == nil { return @@ -24,6 +25,17 @@ func MessageReactionAddHandler(logger *zap.Logger, client *redis.Client) func(s return } + snowflakeMutex, err := redis_utils.LockSnowflake(locker, m.MessageID+m.Emoji.ID+m.UserID) + // couldn't obtain lock; bail bail bail! + if snowflakeMutex == nil { + logger.Info("could not obtain snowflake lock", + zap.String("type", "ReactionAdd"), + zap.Int("shard ID", s.ShardID), + zap.String("snowflakeID", m.MessageID+m.Emoji.ID+m.UserID)) + return + } + defer snowflakeMutex.Unlock() + // if no active games in this text channel, completely ignore this message reaction message res, err := client.Exists(context.Background(), rediskey.TextChannelPtr(m.GuildID, m.ChannelID)).Result() if err != nil || res == 0 { diff --git a/internal/handler/voice_state.go b/internal/handler/voice_state.go index f298647..765274c 100644 --- a/internal/handler/voice_state.go +++ b/internal/handler/voice_state.go @@ -6,10 +6,11 @@ import ( "github.com/automuteus/galactus/pkg/discord_message" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" + "github.com/go-redsync/redsync/v4" "go.uber.org/zap" ) -func VoiceStateUpdateHandler(logger *zap.Logger, client *redis.Client) func(s *discordgo.Session, m *discordgo.VoiceStateUpdate) { +func VoiceStateUpdateHandler(logger *zap.Logger, client *redis.Client, locker *redsync.Redsync) func(s *discordgo.Session, m *discordgo.VoiceStateUpdate) { return func(s *discordgo.Session, m *discordgo.VoiceStateUpdate) { if m == nil { return @@ -19,6 +20,18 @@ func VoiceStateUpdateHandler(logger *zap.Logger, client *redis.Client) func(s *d return } + id := m.GuildID + m.ChannelID + m.UserID + m.SessionID + snowflakeMutex, err := redis_utils.LockSnowflake(locker, id) + // couldn't obtain lock; bail bail bail! + if snowflakeMutex == nil { + logger.Info("could not obtain snowflake lock", + zap.String("type", "VoiceStateUpdate"), + zap.Int("shard ID", s.ShardID), + zap.String("snowflakeID", id)) + return + } + defer snowflakeMutex.Unlock() + // if no active games, completely ignore voice messages if !redis_utils.AnyActiveGamesInGuild(client, m.GuildID) { return diff --git a/internal/redis/lock.go b/internal/redis/lock.go index 5e8afd6..a5cd689 100644 --- a/internal/redis/lock.go +++ b/internal/redis/lock.go @@ -1,25 +1,14 @@ package redis import ( - "context" - "errors" - "github.com/automuteus/utils/pkg/rediskey" - "github.com/bsm/redislock" - "github.com/go-redis/redis/v8" - "log" - "time" + "github.com/go-redsync/redsync/v4" ) -const SnowflakeLockDuration = time.Second * 3 - -func LockSnowflake(ctx context.Context, client *redis.Client, snowflake string) *redislock.Lock { - locker := redislock.New(client) - lock, err := locker.Obtain(ctx, rediskey.SnowflakeLockID(snowflake), SnowflakeLockDuration, nil) - if errors.Is(err, redislock.ErrNotObtained) { - return nil - } else if err != nil { - log.Println(err) - return nil +func LockSnowflake(locker *redsync.Redsync, snowflake string) (*redsync.Mutex, error) { + mutex := locker.NewMutex(snowflake) + err := mutex.Lock() + if err != nil { + return nil, err } - return lock + return mutex, nil } diff --git a/internal/redis/user_ratelimit.go b/internal/redis/user_ratelimit.go index f76688e..37c4243 100644 --- a/internal/redis/user_ratelimit.go +++ b/internal/redis/user_ratelimit.go @@ -36,7 +36,7 @@ func UserSoftbanCountKey(userID string) string { } func MarkUserRateLimit(client *redis.Client, userID, cmdType string, ttl time.Duration) { - err := client.Set(context.Background(), UserRateLimitGeneralKey(userID), "", GlobalUserRateLimitDuration).Err() + err := client.Set(context.Background(), UserRateLimitGeneralKey(userID), "true", GlobalUserRateLimitDuration).Err() if err != nil { log.Println(err) } @@ -97,7 +97,6 @@ func IsUserBanned(client *redis.Client, userID string) bool { func IsUserRateLimitedGeneral(client *redis.Client, userID string) bool { v, err := client.Exists(context.Background(), UserRateLimitGeneralKey(userID)).Result() if err != nil { - log.Println(err) return false } return v == 1 // =1 means the user is present, and thus rate-limited @@ -106,7 +105,6 @@ func IsUserRateLimitedGeneral(client *redis.Client, userID string) bool { func IsUserRateLimitedSpecific(client *redis.Client, userID string, cmdType string) bool { v, err := client.Exists(context.Background(), UserRateLimitSpecificKey(userID, cmdType)).Result() if err != nil { - log.Println(err) return false } return v == 1 // =1 means the user is present, and thus rate-limited diff --git a/pkg/client/modify.go b/pkg/client/modify.go index 15bf216..0ee7c16 100644 --- a/pkg/client/modify.go +++ b/pkg/client/modify.go @@ -2,19 +2,18 @@ package galactus_client import ( "bytes" - "context" "encoding/json" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/utils/pkg/discord" - "github.com/bsm/redislock" + "github.com/go-redsync/redsync/v4" "go.uber.org/zap" "io/ioutil" "net/http" ) -func (galactus *GalactusClient) ModifyUsers(guildID, connectCode string, request discord.UserModifyRequest, lock *redislock.Lock) *discord.MuteDeafenSuccessCounts { - if lock != nil { - defer lock.Release(context.Background()) +func (galactus *GalactusClient) ModifyUsers(guildID, connectCode string, request discord.UserModifyRequest, mutex *redsync.Mutex) *discord.MuteDeafenSuccessCounts { + if mutex != nil { + defer mutex.Unlock() } url := endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.ModifyUserPartial, guildID, connectCode) jBytes, err := json.Marshal(request) From 55f263e042697f1d36bef80bf99915a0c450bdee Mon Sep 17 00:00:00 2001 From: denverquane Date: Mon, 1 Feb 2021 19:54:20 -0700 Subject: [PATCH 39/50] Better lock settings --- internal/redis/lock.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/redis/lock.go b/internal/redis/lock.go index a5cd689..53516b1 100644 --- a/internal/redis/lock.go +++ b/internal/redis/lock.go @@ -2,10 +2,12 @@ package redis import ( "github.com/go-redsync/redsync/v4" + "time" ) +// locks have 5 second duration, 3 seconds total of retries, retries every 500 ms func LockSnowflake(locker *redsync.Redsync, snowflake string) (*redsync.Mutex, error) { - mutex := locker.NewMutex(snowflake) + mutex := locker.NewMutex(snowflake, redsync.WithExpiry(time.Second*5), redsync.WithRetryDelay(time.Millisecond*500), redsync.WithTries(6)) err := mutex.Lock() if err != nil { return nil, err From 1c920ffd22fedc01b079c717740637263bf8d2c5 Mon Sep 17 00:00:00 2001 From: denverquane Date: Mon, 1 Feb 2021 20:57:59 -0700 Subject: [PATCH 40/50] Removed ARM builds, I can't take the build times anymore --- .github/workflows/docker.yml | 2 +- internal/galactus/shard_manager/shard_manager.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c01db26..1616815 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -41,7 +41,7 @@ jobs: with: context: . file: ./Dockerfile - platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64,linux/arm/v6 + platforms: linux/amd64,linux/386,linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.docker_meta.outputs.tags }} labels: ${{ steps.docker_meta.outputs.labels }} diff --git a/internal/galactus/shard_manager/shard_manager.go b/internal/galactus/shard_manager/shard_manager.go index d974cb4..245e61b 100644 --- a/internal/galactus/shard_manager/shard_manager.go +++ b/internal/galactus/shard_manager/shard_manager.go @@ -50,7 +50,7 @@ func MakeShardManager(logger *zap.Logger, token string, numShards int, intent di } func AddHandlers(logger *zap.Logger, manager *dshardmanager.Manager, client *redis.Client, botPrefix string) { - pool := goredis.NewPool(client) // or, pool := redigo.NewPool(...) + pool := goredis.NewPool(client) locker := redsync.New(pool) manager.AddHandler(handler.GuildCreateHandler(logger, client, locker)) From ec5e7ecd0a7db0b58c0f118f577e92c2bf1f0879 Mon Sep 17 00:00:00 2001 From: denverquane Date: Mon, 1 Feb 2021 21:20:14 -0700 Subject: [PATCH 41/50] Remove lock from modifyusers call --- internal/redis/lock.go | 5 ++--- pkg/client/modify.go | 6 +----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/internal/redis/lock.go b/internal/redis/lock.go index 53516b1..6b471ed 100644 --- a/internal/redis/lock.go +++ b/internal/redis/lock.go @@ -2,12 +2,11 @@ package redis import ( "github.com/go-redsync/redsync/v4" - "time" ) -// locks have 5 second duration, 3 seconds total of retries, retries every 500 ms +// default lock is 8 seconds; only allow 1 consumer to pick up the message (no retries in case it's processed/released quickly) func LockSnowflake(locker *redsync.Redsync, snowflake string) (*redsync.Mutex, error) { - mutex := locker.NewMutex(snowflake, redsync.WithExpiry(time.Second*5), redsync.WithRetryDelay(time.Millisecond*500), redsync.WithTries(6)) + mutex := locker.NewMutex(snowflake, redsync.WithTries(1)) err := mutex.Lock() if err != nil { return nil, err diff --git a/pkg/client/modify.go b/pkg/client/modify.go index 0ee7c16..9e52010 100644 --- a/pkg/client/modify.go +++ b/pkg/client/modify.go @@ -5,16 +5,12 @@ import ( "encoding/json" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/utils/pkg/discord" - "github.com/go-redsync/redsync/v4" "go.uber.org/zap" "io/ioutil" "net/http" ) -func (galactus *GalactusClient) ModifyUsers(guildID, connectCode string, request discord.UserModifyRequest, mutex *redsync.Mutex) *discord.MuteDeafenSuccessCounts { - if mutex != nil { - defer mutex.Unlock() - } +func (galactus *GalactusClient) ModifyUsers(guildID, connectCode string, request discord.UserModifyRequest) *discord.MuteDeafenSuccessCounts { url := endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.ModifyUserPartial, guildID, connectCode) jBytes, err := json.Marshal(request) if err != nil { From 66ca6e4458d50b7786a4377e78a40dfbbc787e4e Mon Sep 17 00:00:00 2001 From: denverquane Date: Mon, 1 Feb 2021 21:41:56 -0700 Subject: [PATCH 42/50] Change locking strategy to explicitly not unlock (no duplicate processing) --- internal/handler/guild_create.go | 2 +- internal/handler/guild_delete.go | 2 +- internal/handler/message_create.go | 2 +- internal/handler/message_reaction_add.go | 2 +- internal/handler/voice_state.go | 2 +- internal/redis/lock.go | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/handler/guild_create.go b/internal/handler/guild_create.go index a6efa10..eb3bfdc 100644 --- a/internal/handler/guild_create.go +++ b/internal/handler/guild_create.go @@ -24,7 +24,7 @@ func GuildCreateHandler(logger *zap.Logger, client *redis.Client, locker *redsyn zap.String("snowflakeID", m.ID+"_create")) return } - defer snowflakeMutex.Unlock() + // explicitly DO NOT unlock the snowflake! We don't want anyone else processing the event! byt, err := json.Marshal(m) if err != nil { diff --git a/internal/handler/guild_delete.go b/internal/handler/guild_delete.go index c68b85f..3a7f9dd 100644 --- a/internal/handler/guild_delete.go +++ b/internal/handler/guild_delete.go @@ -25,7 +25,7 @@ func GuildDeleteHandler(logger *zap.Logger, client *redis.Client, locker *redsyn zap.String("snowflakeID", m.ID+"_delete")) return } - defer snowflakeMutex.Unlock() + // explicitly DO NOT unlock the snowflake! We don't want anyone else processing the event! byt, err := json.Marshal(m) if err != nil { diff --git a/internal/handler/message_create.go b/internal/handler/message_create.go index d5ead70..8d10b17 100644 --- a/internal/handler/message_create.go +++ b/internal/handler/message_create.go @@ -32,7 +32,7 @@ func MessageCreateHandler(logger *zap.Logger, client *redis.Client, locker *reds zap.String("snowflakeID", m.ID)) return } - defer snowflakeMutex.Unlock() + // explicitly DO NOT unlock the snowflake! We don't want anyone else processing the event! if redis_utils.IsUserBanned(client, m.Author.ID) { logger.Info("ignoring message from softbanned user", diff --git a/internal/handler/message_reaction_add.go b/internal/handler/message_reaction_add.go index e7d1806..8e2b41f 100644 --- a/internal/handler/message_reaction_add.go +++ b/internal/handler/message_reaction_add.go @@ -34,7 +34,7 @@ func MessageReactionAddHandler(logger *zap.Logger, client *redis.Client, locker zap.String("snowflakeID", m.MessageID+m.Emoji.ID+m.UserID)) return } - defer snowflakeMutex.Unlock() + // explicitly DO NOT unlock the snowflake! We don't want anyone else processing the event! // if no active games in this text channel, completely ignore this message reaction message res, err := client.Exists(context.Background(), rediskey.TextChannelPtr(m.GuildID, m.ChannelID)).Result() diff --git a/internal/handler/voice_state.go b/internal/handler/voice_state.go index 765274c..aecc11c 100644 --- a/internal/handler/voice_state.go +++ b/internal/handler/voice_state.go @@ -30,7 +30,7 @@ func VoiceStateUpdateHandler(logger *zap.Logger, client *redis.Client, locker *r zap.String("snowflakeID", id)) return } - defer snowflakeMutex.Unlock() + // explicitly DO NOT unlock the snowflake! We don't want anyone else processing the event! // if no active games, completely ignore voice messages if !redis_utils.AnyActiveGamesInGuild(client, m.GuildID) { diff --git a/internal/redis/lock.go b/internal/redis/lock.go index 6b471ed..4fa623d 100644 --- a/internal/redis/lock.go +++ b/internal/redis/lock.go @@ -4,9 +4,9 @@ import ( "github.com/go-redsync/redsync/v4" ) -// default lock is 8 seconds; only allow 1 consumer to pick up the message (no retries in case it's processed/released quickly) +// default lock is 8 seconds; only allow 4 retries * 500ms interval for 2secs of leniency without duplicate processing func LockSnowflake(locker *redsync.Redsync, snowflake string) (*redsync.Mutex, error) { - mutex := locker.NewMutex(snowflake, redsync.WithTries(1)) + mutex := locker.NewMutex(snowflake, redsync.WithTries(4)) err := mutex.Lock() if err != nil { return nil, err From 27ac0dd320f577a7d2c7b49397f051cf8beea059 Mon Sep 17 00:00:00 2001 From: denverquane Date: Tue, 2 Feb 2021 18:53:32 -0700 Subject: [PATCH 43/50] Added Premium endpoint to server and client code, alongside caching via Redis --- go.mod | 2 +- go.sum | 4 ++ internal/galactus/guild.go | 77 +++++++++++++++++++++++++++++++++++++ internal/galactus/server.go | 26 +++++++++++-- main.go | 20 ++++++++++ pkg/client/guild.go | 28 ++++++++++++++ pkg/endpoint/discord.go | 3 ++ 7 files changed, 155 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 7f15cba..78432c3 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/alicebob/miniredis/v2 v2.14.1 - github.com/automuteus/utils v0.0.11 + github.com/automuteus/utils v0.0.13 github.com/bwmarrin/discordgo v0.23.1 github.com/go-redis/redis/v8 v8.4.2 github.com/go-redsync/redsync/v4 v4.0.4 diff --git a/go.sum b/go.sum index 5d4341a..fd3d16c 100644 --- a/go.sum +++ b/go.sum @@ -24,6 +24,10 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= github.com/automuteus/utils v0.0.11 h1:0AE++H2xawEDxZGMg8iZm61R6QQdbgrTx7EYXlGSfzo= github.com/automuteus/utils v0.0.11/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= +github.com/automuteus/utils v0.0.12 h1:9R/uKrd3bnAEJWtyZd7MyGOT0u3rexjAhYJeCrcPvGY= +github.com/automuteus/utils v0.0.12/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= +github.com/automuteus/utils v0.0.13 h1:G1cIBQzNUb+QAYEhwJXM5ZtZBFOAYenEBUpGIldCC48= +github.com/automuteus/utils v0.0.13/go.mod h1:rCHtrQ3nNXdagcOKW8Mcr4wAW3CaXyB1aArsdMtXS30= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= diff --git a/internal/galactus/guild.go b/internal/galactus/guild.go index ebaf8d9..08eadf9 100644 --- a/internal/galactus/guild.go +++ b/internal/galactus/guild.go @@ -1,13 +1,17 @@ package galactus import ( + "context" "encoding/json" "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/galactus/pkg/validate" + "github.com/automuteus/utils/pkg/premium" + "github.com/automuteus/utils/pkg/rediskey" "go.uber.org/zap" "io/ioutil" "net/http" "strconv" + "time" ) func (galactus *GalactusAPI) GetGuildHandler() func(w http.ResponseWriter, r *http.Request) { @@ -335,3 +339,76 @@ func (galactus *GalactusAPI) CreateGuildEmojiHandler() func(w http.ResponseWrite ) } } + +const PremiumStatusExpiry = time.Hour * 6 +const FreeStatusExpiry = time.Minute + +func (galactus *GalactusAPI) GetGuildPremiumHandler() func(w http.ResponseWriter, r *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + guildID := validate.GuildIDAndRespond(galactus.logger, w, r, endpoint.GetGuildPremiumFull) + if guildID == "" { + return + } + + key := rediskey.GuildPremiumRecord(guildID) + str, err := galactus.client.Get(context.Background(), key).Result() + if err == nil { + var rec premium.PremiumRecord + err = json.Unmarshal([]byte(str), &rec) + if err == nil { + w.WriteHeader(http.StatusOK) + w.Write([]byte(str)) + return + } + } + + if galactus.storageClient == nil { + errMsg := "storage interface has not been initialized" + galactus.logger.Error(errMsg) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg)) + return + } + + tier, days := galactus.storageClient.GetGuildPremiumStatus(guildID) + rec := premium.PremiumRecord{ + Tier: tier, + Days: days, + } + jBytes, err := json.Marshal(rec) + if err != nil { + errMsg := "failed to marshal premium record to JSON" + galactus.logger.Error(errMsg) + w.WriteHeader(http.StatusInternalServerError) + w.Write([]byte(errMsg)) + return + } + + // queries when a user is free should be done every minute, maximum. But premium status should stick in Redis + // for longer; decreased load on Postgres as a whole, and faster response times for premium users + expiry := FreeStatusExpiry + if tier > premium.FreeTier { + expiry = PremiumStatusExpiry + } + + err = galactus.client.Set(context.Background(), key, jBytes, expiry).Err() + if err != nil { + galactus.logger.Error("error setting premium status in Redis", + zap.Error(err), + zap.String("guildID", guildID), + zap.String("key", key), + zap.ByteString("value", jBytes), + zap.String("expiry", expiry.String()), + ) + } else { + galactus.logger.Info("cached guild premium status in Redis", + zap.String("guildID", guildID), + zap.Int("tier", int(tier)), + zap.Int("days", days), + zap.String("expiry", expiry.String()), + ) + } + w.WriteHeader(http.StatusOK) + w.Write(jBytes) + } +} diff --git a/internal/galactus/server.go b/internal/galactus/server.go index 614f9eb..49554c5 100644 --- a/internal/galactus/server.go +++ b/internal/galactus/server.go @@ -11,6 +11,7 @@ import ( "github.com/automuteus/galactus/pkg/endpoint" "github.com/automuteus/utils/pkg/premium" "github.com/automuteus/utils/pkg/rediskey" + "github.com/automuteus/utils/pkg/storage" "github.com/automuteus/utils/pkg/token" "github.com/bwmarrin/discordgo" "github.com/go-redis/redis/v8" @@ -37,10 +38,11 @@ var PremiumBotConstraints = map[premium.Tier]int{ var DefaultIntents = discordgo.MakeIntent(discordgo.IntentsGuildVoiceStates | discordgo.IntentsGuildMessages | discordgo.IntentsGuilds | discordgo.IntentsGuildMessageReactions) type GalactusAPI struct { - client *redis.Client - shardManager *dshardmanager.Manager - topggClient *dbl.Client - botID string + client *redis.Client + storageClient *storage.PsqlInterface + shardManager *dshardmanager.Manager + topggClient *dbl.Client + botID string // maps hashed tokens to active discord sessions activeSessions map[string]*discordgo.Session @@ -81,6 +83,17 @@ func NewGalactusAPI(logger *zap.Logger, botToken string, numShards int, topGGtok } } +func (galactus *GalactusAPI) InitStorage(addr, user, pass string) error { + connectUrl := storage.ConstructPsqlConnectURL(addr, user, pass) + var storageClient = storage.PsqlInterface{} + err := storageClient.Init(connectUrl) + if err != nil { + return err + } + galactus.storageClient = &storageClient + return nil +} + func (galactus *GalactusAPI) getAllTokensForGuild(guildID string) []string { hTokens, err := galactus.client.SMembers(context.Background(), rediskey.GuildTokensKey(guildID)).Result() if err != nil { @@ -192,6 +205,7 @@ func (galactus *GalactusAPI) Run(port string, maxWorkers int, captureAckTimeout discordRouter.HandleFunc(endpoint.RemoveAllReactionsFull, galactus.RemoveAllReactionsHandler()).Methods("POST") discordRouter.HandleFunc(endpoint.UserChannelCreateFull, galactus.CreateUserChannelHandler()).Methods("POST") discordRouter.HandleFunc(endpoint.GetGuildEmojisFull, galactus.GetGuildEmojisHandler()).Methods("POST") + discordRouter.HandleFunc(endpoint.GetGuildPremiumFull, galactus.GetGuildPremiumHandler()).Methods("POST") discordRouter.HandleFunc(endpoint.CreateGuildEmojiFull, galactus.CreateGuildEmojiHandler()).Methods("POST") settingsRouter.HandleFunc(endpoint.GetGuildAMUSettingsFull, galactus.GetGuildAMUSettings()).Methods("POST") @@ -422,6 +436,10 @@ func (galactus *GalactusAPI) Close() { } galactus.activeSessions = map[string]*discordgo.Session{} galactus.sessionLock.Unlock() + + if galactus.storageClient != nil { + galactus.storageClient.Close() + } } func (galactus *GalactusAPI) newGuildHandler(hashedToken string) func(s *discordgo.Session, m *discordgo.GuildCreate) { diff --git a/main.go b/main.go index fa197c5..debab13 100644 --- a/main.go +++ b/main.go @@ -46,6 +46,10 @@ func main() { redisUser := os.Getenv("REDIS_USER") redisPass := os.Getenv("REDIS_PASS") + postgresAddr := os.Getenv("POSTGRES_ADDR") + postgresUser := os.Getenv("POSTGRES_USER") + postgresPass := os.Getenv("POSTGRES_PASS") + maxReq := DefaultMaxRequests5Sec maxReq5Sec := os.Getenv("MAX_REQ_5_SEC") if maxReq5Sec != "" { @@ -123,6 +127,9 @@ func main() { zap.String("REDIS_ADDR", redisAddr), zap.String("REDIS_USER", redisUser), zap.String("REDIS_PASS", redisPass), + zap.String("POSTGRES_ADDR", postgresAddr), + zap.String("POSTGRES_USER", postgresUser), + zap.String("POSTGRES_PASS", postgresPass), zap.Int("MAX_REQ_5_SEC", int(maxReq)), zap.Int("MAX_WORKERS", maxWorkers), zap.Int64("ACK_TIMEOUT_MS", captureAckTimeout.Milliseconds()), @@ -134,6 +141,19 @@ func main() { tp := galactus.NewGalactusAPI(logger, botToken, numShards, topGGToken, botID, redisAddr, redisUser, redisPass, maxReq, botPrefix) + if postgresAddr != "" && postgresUser != "" { + err := tp.InitStorage(postgresAddr, postgresUser, postgresPass) + if err != nil { + logger.Error("error initializing storage interface", + zap.Error(err), + ) + } else { + logger.Info("storage interface initialized properly") + } + } else { + logger.Info("Storage interface was NOT initialized (insufficient postgres details provided)") + } + sc := make(chan os.Signal, 1) signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill) diff --git a/pkg/client/guild.go b/pkg/client/guild.go index d8e3e8b..4538109 100644 --- a/pkg/client/guild.go +++ b/pkg/client/guild.go @@ -5,6 +5,7 @@ import ( "encoding/json" "errors" "github.com/automuteus/galactus/pkg/endpoint" + "github.com/automuteus/utils/pkg/premium" "github.com/bwmarrin/discordgo" "go.uber.org/zap" "io/ioutil" @@ -178,3 +179,30 @@ func (galactus *GalactusClient) GetGuildRoles(guildID string) ([]*discordgo.Role } return roles, nil } + +func (galactus *GalactusClient) GetGuildPremium(guildID string) (*premium.PremiumRecord, error) { + url := endpoint.FormGalactusURL(galactus.Address, endpoint.DiscordRoute, endpoint.GetGuildPremiumPartial, guildID) + resp, err := galactus.client.Post(url, "application/json", bytes.NewBufferString("")) + if err != nil { + return nil, err + } + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + galactus.logger.Error("error reading all bytes from message body", + zap.Error(err), + zap.String("url", url), + ) + return nil, err + } + defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + err := errors.New("non-200 response code received for " + url) + return nil, err + } + var rec premium.PremiumRecord + err = json.Unmarshal(respBytes, &rec) + if err != nil { + return nil, err + } + return &rec, nil +} diff --git a/pkg/endpoint/discord.go b/pkg/endpoint/discord.go index 2b8b2c4..d41fd09 100644 --- a/pkg/endpoint/discord.go +++ b/pkg/endpoint/discord.go @@ -47,5 +47,8 @@ const UserChannelCreateFull = UserChannelCreatePartial + "{userID}" const GetGuildEmojisPartial = "/guild/emojis/get/" const GetGuildEmojisFull = GetGuildEmojisPartial + "{guildID}" +const GetGuildPremiumPartial = "/guild/premium/get/" +const GetGuildPremiumFull = GetGuildPremiumPartial + "{guildID}" + const CreateGuildEmojiPartial = "/guild/emoji/create/" const CreateGuildEmojiFull = CreateGuildEmojiPartial + "{guildID}/{name}" From 10e59f773097fd449813f61e86bd29fc259660da Mon Sep 17 00:00:00 2001 From: CarbonNeuron <16768821+CarbonNeuron@users.noreply.github.com> Date: Wed, 3 Feb 2021 09:51:21 -0600 Subject: [PATCH 44/50] Add Content-Type header to stats endpoint This fixes #7 --- internal/galactus/server.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/galactus/server.go b/internal/galactus/server.go index 49554c5..4351c48 100644 --- a/internal/galactus/server.go +++ b/internal/galactus/server.go @@ -233,6 +233,7 @@ func (galactus *GalactusAPI) indexHandler() func(w http.ResponseWriter, r *http. w.Header().Set("Access-Control-Allow-Origin", "*") w.Header().Set("Access-Control-Allow-Methods", "GET, OPTIONS") w.Header().Set("Access-Control-Allow-Headers", "Accept, Content-Type, Content-Length") + w.Header().Set("Content-Type", "application/json") //Set content type to Application/Json because we are serving json data // default to listing active games in the last 15 mins activeGames := rediskey.GetActiveGames(context.Background(), galactus.client, 900) From be6f14c089fac53bc6e31dde52fdf3fea4fa6b2d Mon Sep 17 00:00:00 2001 From: denverquane Date: Wed, 3 Feb 2021 18:41:35 -0700 Subject: [PATCH 45/50] Misc ratelimit and message fixes --- internal/handler/message_create.go | 4 +++- internal/handler/message_reaction_add.go | 10 +++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/internal/handler/message_create.go b/internal/handler/message_create.go index 8d10b17..bcbe0b0 100644 --- a/internal/handler/message_create.go +++ b/internal/handler/message_create.go @@ -19,7 +19,7 @@ func MessageCreateHandler(logger *zap.Logger, client *redis.Client, locker *reds return } // ignore messages created by the bot - if m.Author == nil || m.Author.ID == s.State.User.ID { + if m.Author == nil || m.Author.ID == s.State.User.ID || m.Author.Bot { return } @@ -45,6 +45,8 @@ func MessageCreateHandler(logger *zap.Logger, client *redis.Client, locker *reds detectedPrefix := "" if strings.HasPrefix(m.Content, "<@!"+s.State.User.ID+">") { detectedPrefix = "<@!" + s.State.User.ID + ">" + } else if strings.HasPrefix(m.Content, "<@"+s.State.User.ID+">") { + detectedPrefix = "<@" + s.State.User.ID + ">" } else if strings.HasPrefix(m.Content, globalPrefix) { detectedPrefix = globalPrefix } diff --git a/internal/handler/message_reaction_add.go b/internal/handler/message_reaction_add.go index 8e2b41f..a8cfad8 100644 --- a/internal/handler/message_reaction_add.go +++ b/internal/handler/message_reaction_add.go @@ -34,11 +34,15 @@ func MessageReactionAddHandler(logger *zap.Logger, client *redis.Client, locker zap.String("snowflakeID", m.MessageID+m.Emoji.ID+m.UserID)) return } + + if redis_utils.IsUserBanned(client, m.UserID) { + return + } // explicitly DO NOT unlock the snowflake! We don't want anyone else processing the event! // if no active games in this text channel, completely ignore this message reaction message - res, err := client.Exists(context.Background(), rediskey.TextChannelPtr(m.GuildID, m.ChannelID)).Result() - if err != nil || res == 0 { + game, err := rediskey.IsGameInTextChannel(context.Background(), client, m.GuildID, m.ChannelID) + if err != nil || !game { return } @@ -47,7 +51,7 @@ func MessageReactionAddHandler(logger *zap.Logger, client *redis.Client, locker // record the violation with this call if redis_utils.IncrementRateLimitExceed(client, m.UserID) { msg, err := s.ChannelMessageSend(m.ChannelID, - fmt.Sprintf("%s has been spamming. I'm ignoring them for the next %f minutes.", + fmt.Sprintf("%s has been spamming. I'm ignoring them for the next %d minutes.", discord_message.MentionByUserID(m.UserID), redis_utils.SoftbanDuration.Minutes())) if err != nil { From 1f349332817506bfc105ee0ae0155ae2c72cb5c8 Mon Sep 17 00:00:00 2001 From: denverquane Date: Wed, 3 Feb 2021 19:05:55 -0700 Subject: [PATCH 46/50] Embed validation on empty fields/names --- internal/galactus/message.go | 11 ++++++++++- internal/handler/message_create.go | 8 ++++---- pkg/validate/embed.go | 15 +++++++++++++++ 3 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 pkg/validate/embed.go diff --git a/internal/galactus/message.go b/internal/galactus/message.go index 8eca438..9d0709b 100644 --- a/internal/galactus/message.go +++ b/internal/galactus/message.go @@ -106,7 +106,16 @@ func (galactus *GalactusAPI) SendChannelMessageEmbedHandler() func(w http.Respon return } - // TODO extra validation here (empty embed fields and the like) + if !validate.ValidFields(&embed) { + errMsg := "embed is missing fields and is invalid" + galactus.logger.Error(errMsg, + zap.Error(err), + zap.String("body", string(body)), + ) + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(errMsg + ": " + err.Error())) + return + } sess := galactus.shardManager.Session(0) if sess == nil { diff --git a/internal/handler/message_create.go b/internal/handler/message_create.go index bcbe0b0..b387bd8 100644 --- a/internal/handler/message_create.go +++ b/internal/handler/message_create.go @@ -26,10 +26,10 @@ func MessageCreateHandler(logger *zap.Logger, client *redis.Client, locker *reds snowflakeMutex, err := redis_utils.LockSnowflake(locker, m.ID) // couldn't obtain lock; bail bail bail! if snowflakeMutex == nil { - logger.Info("could not obtain snowflake lock", - zap.String("type", "MessageCreate"), - zap.Int("shard ID", s.ShardID), - zap.String("snowflakeID", m.ID)) + //logger.Info("could not obtain snowflake lock", + // zap.String("type", "MessageCreate"), + // zap.Int("shard ID", s.ShardID), + // zap.String("snowflakeID", m.ID)) return } // explicitly DO NOT unlock the snowflake! We don't want anyone else processing the event! diff --git a/pkg/validate/embed.go b/pkg/validate/embed.go new file mode 100644 index 0000000..f237cf7 --- /dev/null +++ b/pkg/validate/embed.go @@ -0,0 +1,15 @@ +package validate + +import "github.com/bwmarrin/discordgo" + +func ValidFields(me *discordgo.MessageEmbed) bool { + for _, v := range me.Fields { + if v == nil { + return false + } + if v.Name == "" || v.Value == "" { + return false + } + } + return true +} From 1bd854dca0cf97590beb114ba2c9f656bf51c38f Mon Sep 17 00:00:00 2001 From: denverquane Date: Mon, 8 Feb 2021 22:26:31 -0700 Subject: [PATCH 47/50] Capture endless broadcast fix --- pkg/client/capture.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkg/client/capture.go b/pkg/client/capture.go index 58c6c04..ad8774f 100644 --- a/pkg/client/capture.go +++ b/pkg/client/capture.go @@ -58,6 +58,10 @@ func (galactus *GalactusClient) GetCaptureEvent(connectCode string) (*capture.Ev return nil, err } + if resp.StatusCode == http.StatusAccepted { + return nil, nil + } + var event capture.Event err = json.Unmarshal(respBytes, &event) if err != nil { @@ -99,6 +103,10 @@ func (galactus *GalactusClient) GetCaptureTask(ctx context.Context, connectCode return nil, err } + if resp.StatusCode == http.StatusAccepted { + return nil, nil + } + var task discord.ModifyTask err = json.Unmarshal(respBytes, &task) if err != nil { From 1503b9abed8ffd246694c4d90fc632879a8d3ae6 Mon Sep 17 00:00:00 2001 From: denverquane Date: Tue, 23 Feb 2021 18:11:57 -0700 Subject: [PATCH 48/50] Don't cache self-host values --- internal/galactus/guild.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/galactus/guild.go b/internal/galactus/guild.go index 08eadf9..4da8e20 100644 --- a/internal/galactus/guild.go +++ b/internal/galactus/guild.go @@ -387,7 +387,7 @@ func (galactus *GalactusAPI) GetGuildPremiumHandler() func(w http.ResponseWriter // queries when a user is free should be done every minute, maximum. But premium status should stick in Redis // for longer; decreased load on Postgres as a whole, and faster response times for premium users expiry := FreeStatusExpiry - if tier > premium.FreeTier { + if tier != premium.SelfHostTier && tier > premium.FreeTier { expiry = PremiumStatusExpiry } From 301c081b54de4bfbb3e068467cf8d076c315ac71 Mon Sep 17 00:00:00 2001 From: kurokobo <2920259+kurokobo@users.noreply.github.com> Date: Mon, 8 Mar 2021 12:56:44 +0000 Subject: [PATCH 49/50] fix(shard_manager): #10 Move AddHandlers before start() --- internal/galactus/server.go | 3 +- .../galactus/shard_manager/shard_manager.go | 38 ++++++++++--------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/internal/galactus/server.go b/internal/galactus/server.go index 4351c48..8e7fd1b 100644 --- a/internal/galactus/server.go +++ b/internal/galactus/server.go @@ -62,9 +62,10 @@ func NewGalactusAPI(logger *zap.Logger, botToken string, numShards int, topGGtok DB: 0, // use default DB }) - manager := shard_manager.MakeShardManager(logger, botToken, numShards, DefaultIntents) + manager := shard_manager.MakeShardManager(logger, botToken, numShards) shard_manager.AddHandlers(logger, manager, rdb, botPrefix) shard_manager.AddRateLimitHandler(manager, RateLimitHandler(logger, rdb)) + shard_manager.Start(logger, manager, DefaultIntents) var topgg *dbl.Client = nil if topGGtoken != "" { diff --git a/internal/galactus/shard_manager/shard_manager.go b/internal/galactus/shard_manager/shard_manager.go index 245e61b..1361581 100644 --- a/internal/galactus/shard_manager/shard_manager.go +++ b/internal/galactus/shard_manager/shard_manager.go @@ -10,7 +10,7 @@ import ( "go.uber.org/zap" ) -func MakeShardManager(logger *zap.Logger, token string, numShards int, intent discordgo.Intent) *dshardmanager.Manager { +func MakeShardManager(logger *zap.Logger, token string, numShards int) *dshardmanager.Manager { manager := dshardmanager.New("Bot " + token) manager.Name = "AutoMuteUs" @@ -29,23 +29,6 @@ func MakeShardManager(logger *zap.Logger, token string, numShards int, intent di manager.SetNumShards(recommended) } - logger.Info("starting shard manager", - zap.Int("num shards", manager.GetNumShards())) - - err = manager.Start() - if err != nil { - logger.Fatal("failed to start shard manager", - zap.Error(err)) - } - - logger.Info("shard manager started successfully") - - manager.Lock() - for _, v := range manager.Sessions { - v.Identify.Intents = intent - } - manager.Unlock() - return manager } @@ -64,3 +47,22 @@ func AddHandlers(logger *zap.Logger, manager *dshardmanager.Manager, client *red func AddRateLimitHandler(manager *dshardmanager.Manager, handler func(sess *discordgo.Session, rl *discordgo.RateLimit)) { manager.AddHandler(handler) } + +func Start(logger *zap.Logger, manager *dshardmanager.Manager, intent discordgo.Intent) { + logger.Info("starting shard manager", + zap.Int("num shards", manager.GetNumShards())) + + err := manager.Start() + if err != nil { + logger.Fatal("failed to start shard manager", + zap.Error(err)) + } + + logger.Info("shard manager started successfully") + + manager.Lock() + for _, v := range manager.Sessions { + v.Identify.Intents = intent + } + manager.Unlock() +} From bbc4206aa075620ca8a499a58fc45f10019765ae Mon Sep 17 00:00:00 2001 From: denverquane Date: Wed, 19 Jan 2022 15:42:11 -0500 Subject: [PATCH 50/50] Small fixes to test files --- internal/galactus/guild.go | 1 - internal/galactus/send_message_test.go | 2 +- internal/handler/message_reaction_add.go | 2 +- internal/redis/queue_test.go | 9 +++++---- pkg/client/client_test.go | 12 ++++++++++++ 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/internal/galactus/guild.go b/internal/galactus/guild.go index 4da8e20..2113f79 100644 --- a/internal/galactus/guild.go +++ b/internal/galactus/guild.go @@ -321,7 +321,6 @@ func (galactus *GalactusAPI) CreateGuildEmojiHandler() func(w http.ResponseWrite galactus.logger.Info("created emoji for guild", zap.String("guildID", guildID), zap.String("name", name), - zap.String("emoji", string(body)), zap.String("emojiID", emoji.ID), ) w.WriteHeader(http.StatusOK) diff --git a/internal/galactus/send_message_test.go b/internal/galactus/send_message_test.go index 9698b7b..dee0aac 100644 --- a/internal/galactus/send_message_test.go +++ b/internal/galactus/send_message_test.go @@ -20,7 +20,7 @@ func TestGalactusAPI_SendChannelMessageHandler(t *testing.T) { log.Println("Failed to initialize logger with error") t.Fatal(err) } - galactus := NewGalactusAPI(logger, true, os.Getenv("TEST_BOT_TOKEN"), "", "", "", 7) + galactus := NewGalactusAPI(logger, os.Getenv("TEST_BOT_TOKEN"), 0, "", "", "", "", "", 7, "") defer galactus.Close() m := mux.NewRouter() diff --git a/internal/handler/message_reaction_add.go b/internal/handler/message_reaction_add.go index a8cfad8..84c0fe8 100644 --- a/internal/handler/message_reaction_add.go +++ b/internal/handler/message_reaction_add.go @@ -53,7 +53,7 @@ func MessageReactionAddHandler(logger *zap.Logger, client *redis.Client, locker msg, err := s.ChannelMessageSend(m.ChannelID, fmt.Sprintf("%s has been spamming. I'm ignoring them for the next %d minutes.", discord_message.MentionByUserID(m.UserID), - redis_utils.SoftbanDuration.Minutes())) + int(redis_utils.SoftbanDuration.Minutes()))) if err != nil { logger.Error("error posting ratelimit ban message", zap.Error(err), diff --git a/internal/redis/queue_test.go b/internal/redis/queue_test.go index 167a3f3..6c392f7 100644 --- a/internal/redis/queue_test.go +++ b/internal/redis/queue_test.go @@ -9,6 +9,7 @@ import ( "log" "strings" "testing" + "time" ) const inputMsg = "{\"id\":\"0\"," + @@ -37,7 +38,7 @@ const inputMsg = "{\"id\":\"0\"," + func TestPopEmpty(t *testing.T) { client := newTestRedis() - msg, err := PopRawDiscordMessage(client) + msg, err := PopRawDiscordMessageTimeout(client, time.Second) if msg != "" { t.Fatal("non-nil message received from empty pop") @@ -60,7 +61,7 @@ func TestPushAndPopSingle(t *testing.T) { t.Fatal(err) } - msg, err := PopRawDiscordMessage(client) + msg, err := PopRawDiscordMessageTimeout(client, time.Second) if err != nil { t.Fatal(err) } else if msg == "" { @@ -95,7 +96,7 @@ func TestPushAndPopMultiple(t *testing.T) { log.Fatal(err) } - msg, err := PopRawDiscordMessage(client) + msg, err := PopRawDiscordMessageTimeout(client, time.Second) if err != nil { log.Fatal(err) } else if msg == "" { @@ -116,7 +117,7 @@ func TestPushAndPopMultiple(t *testing.T) { t.Fatal("input and output messages are not equivalent") } - msg, err = PopRawDiscordMessage(client) + msg, err = PopRawDiscordMessageTimeout(client, time.Second) if err != nil { log.Fatal(err) } else if msg == "" { diff --git a/pkg/client/client_test.go b/pkg/client/client_test.go index f8afdcb..3655ca5 100644 --- a/pkg/client/client_test.go +++ b/pkg/client/client_test.go @@ -1,9 +1,11 @@ package galactus_client import ( + galactus2 "github.com/automuteus/galactus/internal/galactus" "github.com/automuteus/utils/pkg/capture" "go.uber.org/zap" "log" + "os" "sync" "testing" "time" @@ -14,6 +16,11 @@ const TOTAL_TASKS = 10000 func TestNewGalactusClientRepeatedPolling(t *testing.T) { logger, _ := zap.NewProduction() + galactus := galactus2.NewGalactusAPI(logger, os.Getenv("TEST_BOT_TOKEN"), 0, "", "", "", "", "", 7, "") + defer galactus.Close() + + go galactus.Run("5858", 1, time.Second, time.Second) + client, err := NewGalactusClient("http://localhost:5858", logger) if err != nil { log.Println(err) @@ -40,6 +47,11 @@ func TestNewGalactusClientRepeatedPolling(t *testing.T) { func TestNewGalactusClientCapture(t *testing.T) { logger, _ := zap.NewProduction() + galactus := galactus2.NewGalactusAPI(logger, os.Getenv("TEST_BOT_TOKEN"), 0, "", "", "", "", "", 7, "") + defer galactus.Close() + + go galactus.Run("5858", 1, time.Second, time.Second) + client, err := NewGalactusClient("http://localhost:5858", logger) if err != nil { log.Println(err)