dkforest

commit 538f917d0dc76af02fb3dc1566f5120271ae4839
parent c5cc601260abf42a03e98cac8cbecf5a896c2934
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Thu,  2 Mar 2023 20:37:52 -0800

cleanup

Diffstat:
M
pkg/database/table_forum_threads.go
 | 
4
++++
M
pkg/web/handlers/handlers.go
 | 
9
++++-----

2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/pkg/database/table_forum_threads.go b/pkg/database/table_forum_threads.go
@@ -37,6 +37,10 @@ type ForumThread struct {
 	Category   ForumCategory
 }
 
+func MakeForumThread(threadName string, userID UserID, categoryID ForumCategoryID) ForumThread {
+	return ForumThread{UUID: ForumThreadUUID(uuid.New().String()), Name: threadName, UserID: userID, CategoryID: categoryID}
+}
+
 func (u *ForumThread) DoSave() {
 	if err := DB.Save(u).Error; err != nil {
 		logrus.Error(err)
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -55,7 +55,6 @@ import (
 	"github.com/alecthomas/chroma/styles"
 	"github.com/asaskevich/govalidator"
 	humanize "github.com/dustin/go-humanize"
-	"github.com/google/uuid"
 	"github.com/labstack/echo"
 	"github.com/pquerna/otp"
 	"github.com/pquerna/otp/totp"
@@ -1954,7 +1953,7 @@ func ClubThreadReplyHandler(c echo.Context) error {
 			data.ErrorMessage = "Message must have at least 3 characters"
 			return c.Render(http.StatusOK, "club.new-thread", data)
 		}
-		message := database.ForumMessage{UUID: database.ForumMessageUUID(uuid.New().String()), Message: data.Message, UserID: authUser.ID, ThreadID: thread.ID}
+		message := database.MakeForumMessage(data.Message, authUser.ID, thread.ID)
 		database.DB.Create(&message)
 		return c.Redirect(http.StatusFound, "/club/threads/"+utils.FormatInt64(int64(thread.ID)))
 	}
@@ -2274,7 +2273,7 @@ func NewThreadHandler(c echo.Context) error {
 			authUser.DoSave()
 			return c.Redirect(http.StatusFound, "/")
 		}
-		thread := database.ForumThread{UUID: database.ForumThreadUUID(uuid.New().String()), Name: data.ThreadName, UserID: authUser.ID, CategoryID: 1}
+		thread := database.MakeForumThread(data.ThreadName, authUser.ID, 1)
 		database.DB.Create(&thread)
 		message := database.MakeForumMessage(data.Message, authUser.ID, thread.ID)
 		message.IsSigned = message.ValidateSignature(authUser.GPGPublicKey)
@@ -2302,9 +2301,9 @@ func ClubNewThreadHandler(c echo.Context) error {
 			data.ErrorMessage = "Thread name must have at least 3 characters"
 			return c.Render(http.StatusOK, "club.new-thread", data)
 		}
-		thread := database.ForumThread{UUID: database.ForumThreadUUID(uuid.New().String()), Name: data.ThreadName, UserID: authUser.ID}
+		thread := database.MakeForumThread(data.ThreadName, authUser.ID, 0)
 		database.DB.Create(&thread)
-		message := database.ForumMessage{UUID: database.ForumMessageUUID(uuid.New().String()), Message: data.Message, UserID: authUser.ID, ThreadID: thread.ID}
+		message := database.MakeForumMessage(data.Message, authUser.ID, thread.ID)
 		database.DB.Create(&message)
 		return c.Redirect(http.StatusFound, "/club/threads/"+utils.FormatInt64(int64(thread.ID)))
 	}