Compare commits

...
6 Commits
Author SHA1 Message Date
Dustin Pianalto 8a9373637f Test broadcast response
CI / build (push) Has been cancelled
2021-06-30 21:10:53 -08:00
Dustin Pianalto b1f705746e Test broadcast response
CI / build (push) Has been cancelled
2021-06-30 21:00:43 -08:00
Dustin Pianalto 8893cc62f4 Test broadcast response
CI / build (push) Has been cancelled
2021-06-30 20:56:51 -08:00
Dustin Pianalto 0bc5953c65 Test broadcast response
CI / build (push) Has been cancelled
2021-06-30 14:51:04 -08:00
Dustin Pianalto 821ede69cf Test broadcast response
CI / build (push) Has been cancelled
2021-06-30 14:34:03 -08:00
Dustin Pianalto fe2e28357a Add broadcast command
CI / build (push) Has been cancelled
2021-02-24 17:18:52 -09:00
3 changed files with 7 additions and 2 deletions
+1
View File
@@ -8,6 +8,7 @@ require (
github.com/go-bindata/go-bindata v3.1.2+incompatible // indirect github.com/go-bindata/go-bindata v3.1.2+incompatible // indirect
github.com/golang-migrate/migrate v3.5.4+incompatible // indirect github.com/golang-migrate/migrate v3.5.4+incompatible // indirect
github.com/golang-migrate/migrate/v4 v4.14.1 github.com/golang-migrate/migrate/v4 v4.14.1
github.com/gorcon/rcon v1.3.1
github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/lib/pq v1.8.0 github.com/lib/pq v1.8.0
) )
+2
View File
@@ -152,6 +152,8 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
github.com/gorcon/rcon v1.3.1 h1:z6a5iOlojfdkvA1qaKEng7QfCJuCzYlC9BUDs6/M+74=
github.com/gorcon/rcon v1.3.1/go.mod h1:2gztBPSV2WxkPkqV4jiJkdHs+NT46mNSGb8JxbPesx4=
github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+4 -2
View File
@@ -2,6 +2,7 @@ package arcon
import ( import (
"fmt" "fmt"
"log"
"strings" "strings"
"github.com/dustinpianalto/disgoman" "github.com/dustinpianalto/disgoman"
@@ -126,7 +127,7 @@ func broadcastCommandFunc(ctx disgoman.Context, args []string) {
if !discord_utils.IsGuildAdmin(ctx, author) && !discord_utils.IsGuildMod(ctx, author) { if !discord_utils.IsGuildAdmin(ctx, author) && !discord_utils.IsGuildMod(ctx, author) {
return return
} }
message := strings.Join(args[1:len(args)-1], " ") message := strings.Join(args[1:len(args)], " ")
if strings.ToLower(args[0]) == "all" { if strings.ToLower(args[0]) == "all" {
servers, err := services.ServerService.GuildServers(guild) servers, err := services.ServerService.GuildServers(guild)
if err != nil { if err != nil {
@@ -170,7 +171,8 @@ func broadcast(ctx disgoman.Context, server geeksbot.Server, message string) {
) )
return return
} }
if response == "Server recieved, But no response!!" { log.Printf("%#v", response)
if strings.Contains(response, "Server recieved, But no response!!") {
_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID, _, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
fmt.Sprintf("**%s Broadcast Successful**", server.Name), fmt.Sprintf("**%s Broadcast Successful**", server.Name),
) )