Rework all database interactions into prisma

Author: math280h

.golangci.yml

@@ -23,7 +23,7 @@ linters-settings:
     # The maximal average package complexity.
     # If it's higher than 0.0 (float) the check is enabled
     # Default: 0.0
-    package-average: 10.0
+    package-average: 15.0
 
   errcheck:
     # Report about not checking of errors in type assertions: `a := b.(MyStruct)`.
@@ -71,11 +71,11 @@ linters-settings:
     # Checks the number of lines in a function.
     # If lower than 0, disable the check.
     # Default: 60
-    lines: 100
+    lines: 150
     # Checks the number of statements in a function.
     # If lower than 0, disable the check.
     # Default: 40
-    statements: 50
+    statements: 60
     # Ignore comments when counting lines.
     # Default false
     ignore-comments: true
@@ -338,3 +338,6 @@ issues:
         - gosec
         - noctx
         - wrapcheck
+
+  exclude-files:
+    - ".*db_gen.go"

README.md

@@ -67,3 +67,28 @@ Wisp can be configured either through parameters passed to the bot or through en
 You can find all env variables in the [.env.example](.env.example) file.
 
 You can find all command line arguments [flags.go](internal/shared/flags.go)
+
+## Development
+
+### Prisma
+
+```bash
+go run github.com/steebchen/prisma-client-go generate
+go run github.com/steebchen/prisma-client-go db push
+```
+
+### Running the bot
+
+Use [air](https://github.com/air-verse/air) to run the bot with hot reloading.
+
+### Windows
+
+```bash
+air --build.cmd "go build -o /tmp/main.exe cmd\main.go"
+```
+
+### Linux
+
+```bash
+air --build.cmd "go build -o /tmp/main cmd/main.go"
+```

cmd/main.go

@@ -1,4 +1,4 @@
-package main //nolint:cyclop // Complexity is high due to number of commands, this can maybe be refactored in the future
+package main 
 
 import (
 	"os"
@@ -8,7 +8,6 @@ import (
 	"github.com/rs/zerolog/log"
 
 	"math280h/wisp/internal/core"
-	"math280h/wisp/internal/db"
 	"math280h/wisp/internal/history"
 	"math280h/wisp/internal/moderation"
 	"math280h/wisp/internal/reports"
@@ -60,7 +59,7 @@ func main() {
 		discordgo.IntentsGuildMembers |
 		discordgo.IntentMessageContent
 
-	db.InitDB()
+	shared.InitDB()
 
 	if *shared.PrettyLogs {
 		log.Logger = log.Output( //nolint:reassign // This only changes if the user prefers JSON over PrettyLogs

db/.gitignore

@@ -0,0 +1,2 @@
+# gitignore generated by Prisma Client Go. DO NOT EDIT.
+*_gen.go

go.mod

@@ -7,12 +7,15 @@ require (
 	github.com/joho/godotenv v1.5.1
 	github.com/mattn/go-sqlite3 v1.14.24
 	github.com/rs/zerolog v1.33.0
+	github.com/shopspring/decimal v1.4.0
+	github.com/steebchen/prisma-client-go v0.45.0
 )
 
 require (
 	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b // indirect
+	go.mongodb.org/mongo-driver/v2 v2.0.0-beta2 // indirect
+	golang.org/x/crypto v0.27.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 )

go.sum

@@ -1,7 +1,11 @@
 github.com/bwmarrin/discordgo v0.28.1 h1:gXsuo2GBO7NbR6uqmrrBDplPUx2T3nzu775q/Rd1aG4=
 github.com/bwmarrin/discordgo v0.28.1/go.mod h1:NJZpH+1AfhIcyQsPeuBKsUtYrRnjkyu0kIVMCHkZtRY=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
@@ -15,11 +19,22 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D
 github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM=
 github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
 github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
-golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b h1:7mWr3k41Qtv8XlltBkDkl8LoP3mpSgBW8BUoxtEdbXg=
+github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
+github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
+github.com/steebchen/prisma-client-go v0.45.0 h1:sXqCi96/1HIh3CScfd/27OlcR/YDXDtgbrpkDSk+3TY=
+github.com/steebchen/prisma-client-go v0.45.0/go.mod h1:4sNeijtPnYSX04/CIXRptUrczEsmPDpWSYR7ahY+H+c=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+go.mongodb.org/mongo-driver/v2 v2.0.0-beta2 h1:PRtbRKwblE8ZfI8qOhofcjn9y8CmKZI7trS5vDMeJX0=
+go.mongodb.org/mongo-driver/v2 v2.0.0-beta2/go.mod h1:UGLb3ZgEzaY0cCbJpH9UFt9B6gEXiTPzsnJS38nBeoU=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
+golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -30,3 +45,5 @@ golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/core/messages.go

@@ -1,7 +1,8 @@
 package core
 
 import (
-	"math280h/wisp/internal/db"
+	"context"
+	"math280h/wisp/db"
 	"math280h/wisp/internal/reports"
 	"math280h/wisp/internal/shared"
 
@@ -29,9 +30,20 @@ func HandleIncomingMessages(s *discordgo.Session, m *discordgo.MessageCreate) {
 		}
 
 		if channel.ParentID == *shared.ReportCategory {
-			userID, _ := db.GetReportByChannelID(m.ChannelID)
-			log.Debug().Msg("Message is to user: " + userID)
-			userChannel, usrChnlErr := s.UserChannelCreate(userID)
+			// userID, _ := db.GetReportByChannelID(m.ChannelID)
+			reportObj, reportErr := shared.DBClient.Report.FindFirst(
+				db.Report.ChannelID.Equals(m.ChannelID),
+			).With(
+				db.Report.User.Fetch(),
+			).Exec(context.Background())
+			if reportErr != nil {
+				log.Error().Err(reportErr).Msg("Failed to get report")
+				return
+			}
+			user := reportObj.User()
+
+			log.Debug().Msg("Message is to user: " + user.UserID)
+			userChannel, usrChnlErr := s.UserChannelCreate(user.UserID)
 			if usrChnlErr != nil {
 				log.Error().Err(usrChnlErr).Msg("Error creating user channel")
 				return
@@ -44,7 +56,18 @@ func HandleIncomingMessages(s *discordgo.Session, m *discordgo.MessageCreate) {
 				return
 			}
 		} else {
-			db.CreateMessage(m.ID, m.Content, m.Author.ID, m.Author.Mention(), m.Timestamp.String(), m.ChannelID)
+			_, msgErr := shared.DBClient.Message.CreateOne(
+				db.Message.ID.Set(m.ID),
+				db.Message.Content.Set(m.Content),
+				db.Message.Author.Link(
+					db.User.UserID.Equals(m.Author.ID),
+				),
+				db.Message.ChannelID.Set(m.ChannelID),
+			).Exec(context.Background())
+			if msgErr != nil {
+				log.Error().Err(err).Msg("Failed to create message")
+				return
+			}
 		}
 		return
 	}