Fix permission bug in close

internal/discord_utils/channel_utils.go

@@ -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
+}

internal/discord_utils/user_utils.go

@@ -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
+}

internal/exts/init.go

@@ -34,4 +34,6 @@ 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)
 }

internal/exts/requests/requests.go

@@ -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)
+	}
+}

pkg/database/request.go

@@ -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
 }
 

pkg/database/server.go

@@ -24,7 +24,7 @@ func (s serverService) ServerByID(id int) (geeksbot.Server, error) {
 						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, &server.FTPPort, &server.FTPUser, &server.FTPPass, &sMsgID)
+		&aChanID, &guildID, &iChanID, &iMsgID, &sMsgID, &server.FTPPort, &server.FTPUser, &server.FTPPass)
 	if err != nil {
 		return geeksbot.Server{}, err
 	}