Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b8ca9506c9 | ||
|
|
1d8de473c4 | ||
|
|
6a08f06101 | ||
|
|
dddcc8c316 | ||
|
|
5a384305b0 | ||
|
|
fb5f508fdf | ||
|
|
1fbe5ca7bf | ||
|
|
2e0762ee0f | ||
|
|
ccb450e543 | ||
|
|
c34f475084 | ||
|
|
1a7d9b824f | ||
|
|
0bf31a3e5d | ||
|
|
128011c79a | ||
|
|
53dc44abda | ||
|
|
6262ebfeb4 | ||
|
|
005dfc815f | ||
|
|
986d16b346 |
@@ -28,6 +28,7 @@ func main() {
|
||||
}
|
||||
|
||||
database.ConnectDatabase(os.Getenv("DATABASE_URL"))
|
||||
database.RunMigrations()
|
||||
services.InitializeServices()
|
||||
|
||||
owners := []string{
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
package discord_utils
|
||||
|
||||
import "github.com/dustinpianalto/disgoman"
|
||||
|
||||
func GetChannelName(ctx disgoman.Context, id string) string {
|
||||
channel, err := ctx.Session.Channel(id)
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
return channel.Name
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package discord_utils
|
||||
|
||||
import "github.com/dustinpianalto/disgoman"
|
||||
|
||||
func GetDisplayName(ctx disgoman.Context, id string) string {
|
||||
member, err := ctx.Session.GuildMember(ctx.Guild.ID, id)
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
if member.Nick != "" {
|
||||
return member.Nick
|
||||
}
|
||||
return member.User.Username
|
||||
}
|
||||
@@ -0,0 +1,182 @@
|
||||
package arcon
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/dustinpianalto/disgoman"
|
||||
"github.com/dustinpianalto/geeksbot"
|
||||
"github.com/dustinpianalto/geeksbot/internal/discord_utils"
|
||||
"github.com/dustinpianalto/geeksbot/pkg/services"
|
||||
"github.com/gorcon/rcon"
|
||||
)
|
||||
|
||||
var ListplayersCommand = &disgoman.Command{
|
||||
Name: "listplayers",
|
||||
Aliases: nil,
|
||||
Description: "List the players currently connected to a ARK server.",
|
||||
OwnerOnly: false,
|
||||
Hidden: false,
|
||||
RequiredPermissions: 0,
|
||||
Invoke: listplayersCommandFunc,
|
||||
}
|
||||
|
||||
func listplayersCommandFunc(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
|
||||
}
|
||||
if len(args) == 0 {
|
||||
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 listplayers(ctx, server)
|
||||
}
|
||||
return
|
||||
}
|
||||
serverName := strings.Join(args, " ")
|
||||
server, err := services.ServerService.ServerByName(serverName, guild)
|
||||
if err != nil {
|
||||
discord_utils.SendErrorMessage(ctx,
|
||||
fmt.Sprintf("Could not find **%s** in this guild.", serverName),
|
||||
err,
|
||||
)
|
||||
return
|
||||
}
|
||||
listplayers(ctx, server)
|
||||
}
|
||||
|
||||
func listplayers(ctx disgoman.Context, server geeksbot.Server) {
|
||||
msg, err := ctx.Send(fmt.Sprintf("**Getting data for %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()
|
||||
response, err := conn.Execute("listplayers")
|
||||
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
|
||||
}
|
||||
if strings.HasPrefix(response, "No Players") {
|
||||
_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
|
||||
fmt.Sprintf("**%s: %s**", server.Name, response),
|
||||
)
|
||||
return
|
||||
}
|
||||
players := strings.Split(response, "\n")
|
||||
for i, player := range players {
|
||||
parts := strings.Split(player, ", ")
|
||||
steamID := parts[len(parts)-1]
|
||||
user, err := services.UserService.GetBySteamID(steamID)
|
||||
if err == nil {
|
||||
duser, err := ctx.Session.GuildMember(ctx.Guild.ID, user.ID)
|
||||
if err == nil {
|
||||
players[i] = fmt.Sprintf("%s (%s)", player, duser.Mention())
|
||||
}
|
||||
}
|
||||
}
|
||||
_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
|
||||
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)-1], " ")
|
||||
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
|
||||
}
|
||||
if response == "Server recieved, 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),
|
||||
)
|
||||
}
|
||||
@@ -2,6 +2,7 @@ package exts
|
||||
|
||||
import (
|
||||
"github.com/dustinpianalto/disgoman"
|
||||
"github.com/dustinpianalto/geeksbot/internal/exts/arcon"
|
||||
"github.com/dustinpianalto/geeksbot/internal/exts/guild"
|
||||
"github.com/dustinpianalto/geeksbot/internal/exts/requests"
|
||||
"github.com/dustinpianalto/geeksbot/internal/exts/utils"
|
||||
@@ -34,4 +35,8 @@ func AddCommandHandlers(g *disgoman.CommandManager) {
|
||||
_ = g.AddCommand(requests.RequestCommand)
|
||||
_ = g.AddCommand(requests.CloseCommand)
|
||||
_ = g.AddCommand(requests.ListCommand)
|
||||
_ = g.AddCommand(requests.ViewCommand)
|
||||
_ = g.AddCommand(requests.CommentCommand)
|
||||
_ = g.AddCommand(arcon.ListplayersCommand)
|
||||
_ = g.AddCommand(arcon.BroadcastCommand)
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package requests
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -78,7 +79,7 @@ func requestCommandFunc(ctx disgoman.Context, args []string) {
|
||||
if c.Admin {
|
||||
_, _ = ctx.Session.ChannelMessageSend(c.ID,
|
||||
fmt.Sprintf("%s\n"+
|
||||
"New Request ID %d "+
|
||||
"New Request ID %d\n"+
|
||||
"%s has requested assistance: \n"+
|
||||
"```\n%s\n```\n"+
|
||||
"Requested At: %s\n"+
|
||||
@@ -153,7 +154,7 @@ func closeCommandFunc(ctx disgoman.Context, args []string) {
|
||||
continue
|
||||
}
|
||||
if request.Author != closer && !closer.IsStaff && !closer.IsAdmin {
|
||||
if !discord_utils.IsGuildMod(ctx, closer) || !discord_utils.IsGuildAdmin(ctx, closer) {
|
||||
if !discord_utils.IsGuildMod(ctx, closer) && !discord_utils.IsGuildAdmin(ctx, closer) {
|
||||
discord_utils.SendErrorMessage(ctx, fmt.Sprintf("You are not authorized to close %d", id), nil)
|
||||
continue
|
||||
}
|
||||
@@ -179,7 +180,17 @@ func closeCommandFunc(ctx disgoman.Context, args []string) {
|
||||
if err != nil {
|
||||
discord_utils.SendErrorMessage(ctx, "There was an error sending the message. The request was closed.", err)
|
||||
}
|
||||
|
||||
dmChannel, err := ctx.Session.UserChannelCreate(request.Author.ID)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
_, _ = ctx.Session.ChannelMessageSend(dmChannel.ID,
|
||||
fmt.Sprintf("%s has closed request %d which you opened in the %s channel.\n```%s```\n",
|
||||
discord_utils.GetDisplayName(ctx, request.CompletedBy.ID),
|
||||
request.ID,
|
||||
discord_utils.GetChannelName(ctx, request.Channel.ID),
|
||||
request.Content,
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -232,18 +243,22 @@ func listCommandFunc(ctx disgoman.Context, args []string) {
|
||||
} else {
|
||||
channelName = channel.Name
|
||||
}
|
||||
|
||||
commentCount, err := services.RequestService.RequestCommentCount(request)
|
||||
if err != nil {
|
||||
commentCount = 0
|
||||
}
|
||||
_, _ = ctx.Send(fmt.Sprintf("```md\n"+
|
||||
"< Request ID Requested By >\n"+
|
||||
"< Request ID Requested By >\n"+
|
||||
"< %-11d %23s >\n"+
|
||||
"%s\n\n"+
|
||||
"Comments: Not Implemented Yet\n"+
|
||||
"Comments: %d\n"+
|
||||
"Requested At: %s\n"+
|
||||
"In: %s\n"+
|
||||
"```",
|
||||
request.ID,
|
||||
authorName,
|
||||
request.Content,
|
||||
commentCount,
|
||||
request.RequestedAt.Format("2006-01-02 15:04:05 MST"),
|
||||
channelName,
|
||||
))
|
||||
@@ -251,3 +266,184 @@ func listCommandFunc(ctx disgoman.Context, args []string) {
|
||||
|
||||
_, _ = ctx.Send(fmt.Sprintf("```There %s currently %d open %s```", utils.PluralizeString("is", len(requests)), len(requests), utils.PluralizeString("request", len(requests))))
|
||||
}
|
||||
|
||||
var CommentCommand = &disgoman.Command{
|
||||
Name: "comment",
|
||||
Aliases: []string{"update", "add_comment"},
|
||||
Description: "Add a comment to an existing request.",
|
||||
OwnerOnly: false,
|
||||
Hidden: false,
|
||||
RequiredPermissions: 0,
|
||||
Invoke: commentCommandFunc,
|
||||
}
|
||||
|
||||
func commentCommandFunc(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
|
||||
}
|
||||
id, err := strconv.ParseInt(args[0], 10, 64)
|
||||
if err != nil {
|
||||
discord_utils.SendErrorMessage(ctx, "Please include the ID of the request to update.", err)
|
||||
return
|
||||
}
|
||||
message := strings.Join(args[1:len(args)], " ")
|
||||
author, err := services.UserService.GetOrCreateUser(ctx.Message.Author.ID)
|
||||
if err != nil {
|
||||
discord_utils.SendErrorMessage(ctx, "Sorry, there was an issue finding your user account", err)
|
||||
return
|
||||
}
|
||||
request, err := services.RequestService.Request(id)
|
||||
if err != nil || request.Guild.ID != guild.ID {
|
||||
discord_utils.SendErrorMessage(ctx, fmt.Sprintf("%d is not a valid request for this guild", id), err)
|
||||
return
|
||||
}
|
||||
int64ID, _ := strconv.ParseInt(ctx.Message.ID, 10, 64)
|
||||
s := discord_utils.ParseSnowflake(int64ID)
|
||||
comment := geeksbot.Comment{
|
||||
Author: author,
|
||||
Request: request,
|
||||
CommentAt: s.CreationTime,
|
||||
Content: message,
|
||||
}
|
||||
comment, err = services.RequestService.CreateComment(comment)
|
||||
if err != nil {
|
||||
discord_utils.SendErrorMessage(ctx, "There was a problem adding your comment", err)
|
||||
return
|
||||
}
|
||||
channels, err := services.ChannelService.GuildChannels(guild)
|
||||
if err == nil {
|
||||
comments, _ := services.RequestService.RequestComments(request)
|
||||
var commentString string
|
||||
var commentStrings []string
|
||||
commentString = fmt.Sprintf("Comment added:\n```md\n"+
|
||||
"< Request ID Requested By >\n"+
|
||||
"< %-11d %23s >\n"+
|
||||
"%s\n\n"+
|
||||
"Comments: Not Implemented Yet\n"+
|
||||
"Requested At: %s\n"+
|
||||
"In: %s\n"+
|
||||
"```",
|
||||
request.ID,
|
||||
discord_utils.GetDisplayName(ctx, request.Author.ID),
|
||||
request.Content,
|
||||
request.RequestedAt.Format("2006-01-02 15:04:05"),
|
||||
discord_utils.GetChannelName(ctx, request.Channel.ID),
|
||||
)
|
||||
for _, c := range comments {
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
continue
|
||||
}
|
||||
cs := fmt.Sprintf("```md\n%s\n- %s At %s\n```\n",
|
||||
c.Content,
|
||||
discord_utils.GetDisplayName(ctx, c.Author.ID),
|
||||
c.CommentAt.Format("2006-01-02 15:04:05"),
|
||||
)
|
||||
if len(commentString+cs) >= 2000 {
|
||||
commentStrings = append(commentStrings, commentString)
|
||||
commentString = ""
|
||||
}
|
||||
commentString += cs
|
||||
}
|
||||
commentStrings = append(commentStrings, commentString)
|
||||
for _, c := range channels {
|
||||
if c.Admin {
|
||||
for _, s := range commentStrings {
|
||||
_, _ = ctx.Session.ChannelMessageSend(c.ID, s)
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
log.Println(err)
|
||||
}
|
||||
_, err = ctx.Send(fmt.Sprintf("%s your comment has been added.", ctx.Message.Author.Mention()))
|
||||
dmChannel, err := ctx.Session.UserChannelCreate(request.Author.ID)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
_, _ = ctx.Session.ChannelMessageSend(dmChannel.ID,
|
||||
fmt.Sprintf("%s has add a comment to request %d which you opened in the %s channel.\n```%s```\n```%s```",
|
||||
discord_utils.GetDisplayName(ctx, author.ID),
|
||||
request.ID,
|
||||
discord_utils.GetChannelName(ctx, ctx.Channel.ID),
|
||||
request.Content,
|
||||
message,
|
||||
))
|
||||
|
||||
}
|
||||
|
||||
var ViewCommand = &disgoman.Command{
|
||||
Name: "view",
|
||||
Aliases: nil,
|
||||
Description: "View the details about a request.",
|
||||
OwnerOnly: false,
|
||||
Hidden: false,
|
||||
RequiredPermissions: 0,
|
||||
Invoke: viewCommandFunc,
|
||||
}
|
||||
|
||||
func viewCommandFunc(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
|
||||
}
|
||||
id, err := strconv.ParseInt(args[0], 10, 64)
|
||||
if err != nil {
|
||||
discord_utils.SendErrorMessage(ctx, "Please include the ID of the request to view.", err)
|
||||
return
|
||||
}
|
||||
request, err := services.RequestService.Request(id)
|
||||
if err != nil || request.Guild.ID != guild.ID {
|
||||
discord_utils.SendErrorMessage(ctx, fmt.Sprintf("%d is not a valid request in this guild", id), err)
|
||||
return
|
||||
}
|
||||
requestor, err := services.UserService.GetOrCreateUser(ctx.Message.Author.ID)
|
||||
if err != nil {
|
||||
discord_utils.SendErrorMessage(ctx, "Sorry, there was an issue finding your user account", err)
|
||||
return
|
||||
}
|
||||
if request.Author.ID != ctx.Message.Author.ID &&
|
||||
!discord_utils.IsGuildMod(ctx, requestor) &&
|
||||
!discord_utils.IsGuildAdmin(ctx, requestor) {
|
||||
discord_utils.SendErrorMessage(ctx, "You are not authorized to view that request", nil)
|
||||
return
|
||||
}
|
||||
comments, err := services.RequestService.RequestComments(request)
|
||||
if err != nil {
|
||||
discord_utils.SendErrorMessage(ctx, "There was an error getting the comments.", err)
|
||||
}
|
||||
var commentString string
|
||||
var commentStrings []string
|
||||
commentString = fmt.Sprintf("```md\n"+
|
||||
"< Request ID Requested By >\n"+
|
||||
"< %-11d %23s >\n"+
|
||||
"%s\n\n"+
|
||||
"Requested At: %s\n"+
|
||||
"In: %s\n"+
|
||||
"```",
|
||||
request.ID,
|
||||
discord_utils.GetDisplayName(ctx, request.Author.ID),
|
||||
request.Content,
|
||||
request.RequestedAt.Format("2006-01-02 15:04:05"),
|
||||
discord_utils.GetChannelName(ctx, request.Channel.ID),
|
||||
)
|
||||
for _, c := range comments {
|
||||
cs := fmt.Sprintf("```md\n%s\n- %s At %s\n```\n",
|
||||
c.Content,
|
||||
discord_utils.GetDisplayName(ctx, c.Author.ID),
|
||||
c.CommentAt.Format("2006-01-02 15:04:05"),
|
||||
)
|
||||
if len(commentString+cs) >= 2000 {
|
||||
commentStrings = append(commentStrings, commentString)
|
||||
commentString = ""
|
||||
}
|
||||
commentString += cs
|
||||
}
|
||||
commentStrings = append(commentStrings, commentString)
|
||||
for _, c := range commentStrings {
|
||||
_, _ = ctx.Send(c)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,10 +23,6 @@ var (
|
||||
)
|
||||
|
||||
func ConnectDatabase(dbConnString string) {
|
||||
s := bindata.Resource(migrations.AssetNames(),
|
||||
func(name string) ([]byte, error) {
|
||||
return migrations.Asset(name)
|
||||
})
|
||||
var err error
|
||||
db, err = sql.Open("postgres", dbConnString)
|
||||
if err != nil {
|
||||
@@ -36,6 +32,15 @@ func ConnectDatabase(dbConnString string) {
|
||||
db.SetMaxOpenConns(75)
|
||||
db.SetMaxIdleConns(5)
|
||||
db.SetConnMaxLifetime(300)
|
||||
initServices()
|
||||
log.Println("Services Initialized")
|
||||
}
|
||||
|
||||
func RunMigrations() {
|
||||
s := bindata.Resource(migrations.AssetNames(),
|
||||
func(name string) ([]byte, error) {
|
||||
return migrations.Asset(name)
|
||||
})
|
||||
d, err := bindata.WithInstance(s)
|
||||
if err != nil {
|
||||
log.Fatal(fmt.Errorf("cannot load migrations: %w", err))
|
||||
@@ -57,8 +62,7 @@ func ConnectDatabase(dbConnString string) {
|
||||
}
|
||||
}
|
||||
log.Println("Migrations Run")
|
||||
initServices()
|
||||
log.Println("Services Initialized")
|
||||
|
||||
}
|
||||
|
||||
func initServices() {
|
||||
|
||||
@@ -154,7 +154,7 @@ func (s requestService) UpdateRequest(r geeksbot.Request) (geeksbot.Request, err
|
||||
queryString := `UPDATE requests SET
|
||||
completed = $2, completed_at = $3, completed_by = $4, completed_message = $5
|
||||
WHERE id = $1`
|
||||
_, err := s.db.Exec(queryString, r.ID, r.Completed, r.CompletedAt, r.CompletedBy, r.CompletedMessage)
|
||||
_, err := s.db.Exec(queryString, r.ID, r.Completed, r.CompletedAt, r.CompletedBy.ID, r.CompletedMessage)
|
||||
return r, err
|
||||
}
|
||||
|
||||
|
||||
@@ -19,11 +19,12 @@ func (s serverService) ServerByID(id int) (geeksbot.Server, error) {
|
||||
var iMsgID sql.NullString
|
||||
var sMsgID sql.NullString
|
||||
queryString := `SELECT id, name, ip_address, port, password, alerts_channel_id,
|
||||
guild_id, info_channel_id, info_message_id, settings_message_id
|
||||
guild_id, info_channel_id, info_message_id, settings_message_id,
|
||||
ftp_port, ftp_username, ftp_password
|
||||
FROM servers WHERE id = $1`
|
||||
row := s.db.QueryRow(queryString, id)
|
||||
err := row.Scan(&server.ID, &server.Name, &server.IPAddr, &server.Port, &server.Password,
|
||||
&aChanID, &guildID, &iChanID, &iMsgID, &sMsgID)
|
||||
&aChanID, &guildID, &iChanID, &iMsgID, &sMsgID, &server.FTPPort, &server.FTPUser, &server.FTPPass)
|
||||
if err != nil {
|
||||
return geeksbot.Server{}, err
|
||||
}
|
||||
@@ -73,7 +74,7 @@ func (s serverService) ServerByID(id int) (geeksbot.Server, error) {
|
||||
|
||||
func (s serverService) ServerByName(name string, guild geeksbot.Guild) (geeksbot.Server, error) {
|
||||
var id int
|
||||
queryString := "SELECT id FROM servers WHERE name = $1 AND guild_id = $2"
|
||||
queryString := "SELECT id FROM servers WHERE LOWER(name) = LOWER($1) AND guild_id = $2"
|
||||
row := s.db.QueryRow(queryString, name, guild.ID)
|
||||
err := row.Scan(&id)
|
||||
if err != nil {
|
||||
@@ -115,7 +116,8 @@ func (s serverService) DeleteServer(server geeksbot.Server) error {
|
||||
func (s serverService) UpdateServer(server geeksbot.Server) (geeksbot.Server, error) {
|
||||
queryString := `UPDATE servers SET name = $2, ip_address = $3, port = $4, password = $5,
|
||||
alerts_channel_id = $6, info_channel_id = $7, info_message_id = $8,
|
||||
settings_message_id = $9 WHERE id = $1`
|
||||
settings_message_id = $9, ftp_port = $10, ftp_username = $11,
|
||||
ftp_password = $12 WHERE id = $1`
|
||||
_, err := s.db.Exec(queryString,
|
||||
server.Name,
|
||||
server.IPAddr,
|
||||
@@ -125,6 +127,9 @@ func (s serverService) UpdateServer(server geeksbot.Server) (geeksbot.Server, er
|
||||
server.InfoChannel.ID,
|
||||
server.InfoMessage.ID,
|
||||
server.SettingsMessage.ID,
|
||||
server.FTPPort,
|
||||
server.FTPUser,
|
||||
server.FTPPass,
|
||||
)
|
||||
return server, err
|
||||
}
|
||||
|
||||
@@ -49,3 +49,14 @@ func (s userService) GetOrCreateUser(id string) (geeksbot.User, error) {
|
||||
}
|
||||
return user, err
|
||||
}
|
||||
|
||||
func (s userService) GetBySteamID(steamID string) (geeksbot.User, error) {
|
||||
var id string
|
||||
queryString := "SELECT id FROM users WHERE steam_id = $1"
|
||||
err := s.db.QueryRow(queryString, steamID).Scan(&id)
|
||||
if err != nil {
|
||||
return geeksbot.User{}, err
|
||||
}
|
||||
user, err := s.User(id)
|
||||
return user, err
|
||||
}
|
||||
|
||||
@@ -11,6 +11,9 @@ type Server struct {
|
||||
InfoChannel *Channel
|
||||
InfoMessage *Message
|
||||
SettingsMessage *Message
|
||||
FTPPort int
|
||||
FTPUser string
|
||||
FTPPass string
|
||||
}
|
||||
|
||||
type ServerService interface {
|
||||
|
||||
Reference in New Issue
Block a user