Compare commits
13
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1e88425853 | ||
|
|
eacdd455f9 | ||
|
|
1e184c97a2 | ||
|
|
8c2bb50637 | ||
|
|
5f20f1b129 | ||
|
|
8a9373637f | ||
|
|
b1f705746e | ||
|
|
8893cc62f4 | ||
|
|
0bc5953c65 | ||
|
|
821ede69cf | ||
|
|
fe2e28357a | ||
|
|
b8ca9506c9 | ||
|
|
1d8de473c4 |
@@ -34,3 +34,5 @@ spec:
|
|||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: geeksbot
|
name: geeksbot
|
||||||
key: discord_token
|
key: discord_token
|
||||||
|
nodeSelector:
|
||||||
|
geeks: "yes"
|
||||||
|
|||||||
@@ -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
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -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=
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package arcon
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"log"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/dustinpianalto/disgoman"
|
"github.com/dustinpianalto/disgoman"
|
||||||
@@ -101,3 +102,83 @@ func listplayers(ctx disgoman.Context, server geeksbot.Server) {
|
|||||||
fmt.Sprintf("**%s:**%s", server.Name, strings.Join(players, "\n")),
|
fmt.Sprintf("**%s:**%s", server.Name, strings.Join(players, "\n")),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var BroadcastCommand = &disgoman.Command{
|
||||||
|
Name: "broadcast",
|
||||||
|
Aliases: nil,
|
||||||
|
Description: "Broadcast a message to ARK servers.",
|
||||||
|
OwnerOnly: false,
|
||||||
|
Hidden: false,
|
||||||
|
RequiredPermissions: 0,
|
||||||
|
Invoke: broadcastCommandFunc,
|
||||||
|
}
|
||||||
|
|
||||||
|
func broadcastCommandFunc(ctx disgoman.Context, args []string) {
|
||||||
|
guild, err := services.GuildService.GetOrCreateGuild(ctx.Guild.ID)
|
||||||
|
if err != nil {
|
||||||
|
discord_utils.SendErrorMessage(ctx, "Error getting Guild from the database", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
author, err := services.UserService.GetOrCreateUser(ctx.Message.Author.ID)
|
||||||
|
if err != nil {
|
||||||
|
discord_utils.SendErrorMessage(ctx, "Sorry, there was a problem getting your user.", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !discord_utils.IsGuildAdmin(ctx, author) && !discord_utils.IsGuildMod(ctx, author) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
message := strings.Join(args[1:len(args)], " ")
|
||||||
|
if strings.ToLower(args[0]) == "all" {
|
||||||
|
servers, err := services.ServerService.GuildServers(guild)
|
||||||
|
if err != nil {
|
||||||
|
discord_utils.SendErrorMessage(ctx, "Could not find any servers for this guild", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for _, server := range servers {
|
||||||
|
go broadcast(ctx, server, message)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
} else {
|
||||||
|
serverName := strings.Title(strings.ReplaceAll(args[0], "_", " "))
|
||||||
|
server, err := services.ServerService.ServerByName(serverName, guild)
|
||||||
|
if err != nil {
|
||||||
|
discord_utils.SendErrorMessage(ctx, fmt.Sprintf("Could not find %s", serverName), err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
broadcast(ctx, server, message)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func broadcast(ctx disgoman.Context, server geeksbot.Server, message string) {
|
||||||
|
msg, err := ctx.Send(fmt.Sprintf("**Broadcasting to: %s**", server.Name))
|
||||||
|
if err != nil {
|
||||||
|
discord_utils.SendErrorMessage(ctx, "There was an error getting the player list", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
conn, err := rcon.Dial(fmt.Sprintf("%s:%d", server.IPAddr, server.Port), server.Password)
|
||||||
|
if err != nil {
|
||||||
|
_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
|
||||||
|
fmt.Sprintf("**Could not open connection to %s**", server.Name),
|
||||||
|
)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
userName := discord_utils.GetDisplayName(ctx, ctx.Message.Author.ID)
|
||||||
|
response, err := conn.Execute(fmt.Sprintf("broadcast %s: %s", userName, message))
|
||||||
|
if err != nil {
|
||||||
|
_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
|
||||||
|
fmt.Sprintf("**There was a problem getting a response from %s**", server.Name),
|
||||||
|
)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
log.Printf("%T - %#v", response, response)
|
||||||
|
if strings.Contains(response, "Server received, But no response!!") {
|
||||||
|
_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
|
||||||
|
fmt.Sprintf("**%s Broadcast Successful**", server.Name),
|
||||||
|
)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
|
||||||
|
fmt.Sprintf("**Broadcasting to %s Failed!**", server.Name),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|||||||
@@ -38,4 +38,5 @@ func AddCommandHandlers(g *disgoman.CommandManager) {
|
|||||||
_ = g.AddCommand(requests.ViewCommand)
|
_ = g.AddCommand(requests.ViewCommand)
|
||||||
_ = g.AddCommand(requests.CommentCommand)
|
_ = g.AddCommand(requests.CommentCommand)
|
||||||
_ = g.AddCommand(arcon.ListplayersCommand)
|
_ = g.AddCommand(arcon.ListplayersCommand)
|
||||||
|
_ = g.AddCommand(arcon.BroadcastCommand)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user