Merge branch 'main' of github.com:dhrdlicka/errorbot

dhrdlicka · dhrdlicka · commit 024aad5f778f · 2025-06-21T16:31:34.000+02:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "gomod" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -0,0 +1,28 @@
+# This workflow will build a golang project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go
+
+name: Go
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Go
+      uses: actions/setup-go@v4
+      with:
+        go-version: '1.24'
+
+    - name: Build
+      run: go build -v ./...
+
+    - name: Test
+      run: go test -v ./...
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2024-2025 David Hrdlička
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/commands/bugcheck.go b/commands/bugcheck.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	tempest "github.com/Amatsagu/Tempest"
+	tempest "github.com/amatsagu/tempest"
 	"github.com/dhrdlicka/errorbot/repo"
 )
 
@@ -42,7 +42,7 @@ func handleBugCheck(itx *tempest.CommandInteraction) {
 		embed := tempest.Embed{
 			Title:       match.Name,
 			Description: match.Description,
-			Fields: []*tempest.EmbedField{
+			Fields: []tempest.EmbedField{
 				{
 					Name:  "Bugcheck code",
 					Value: fmt.Sprintf("`0x%08X`", match.Code),
@@ -58,19 +58,19 @@ func handleBugCheck(itx *tempest.CommandInteraction) {
 			}
 
 			if len(parameters) < 1024 {
-				embed.Fields = append(embed.Fields, &tempest.EmbedField{
+				embed.Fields = append(embed.Fields, tempest.EmbedField{
 					Name:  "Parameters",
 					Value: parameters,
 				})
 			}
 		}
 
-		embed.Fields = append(embed.Fields, &tempest.EmbedField{
+		embed.Fields = append(embed.Fields, tempest.EmbedField{
 			Name:  "Documentation",
 			Value: match.URL,
 		})
 
-		response.Embeds = append(response.Embeds, &embed)
+		response.Embeds = append(response.Embeds, embed)
 
 	} else {
 		response.Content = fmt.Sprintf("Could not find bug check code %s (`0x%08X`)", value, codes[0])
diff --git a/commands/error.go b/commands/error.go
@@ -5,7 +5,7 @@ import (
 	"log/slog"
 	"strings"
 
-	tempest "github.com/Amatsagu/Tempest"
+	tempest "github.com/amatsagu/tempest"
 	"github.com/dhrdlicka/errorbot/repo"
 )
 
@@ -57,7 +57,7 @@ func handleError(itx *tempest.CommandInteraction) {
 		if len(matches) > 0 {
 			found = true
 
-			response.Embeds = append(response.Embeds, &tempest.Embed{
+			response.Embeds = append(response.Embeds, tempest.Embed{
 				Title:       fmt.Sprintf("Possible %s codes", errorRepo.name),
 				Description: formatResults(matches),
 			})
diff --git a/commands/hello.go b/commands/hello.go
@@ -1,6 +1,6 @@
 package commands
 
-import tempest "github.com/Amatsagu/Tempest"
+import tempest "github.com/amatsagu/tempest"
 
 var HelloCommand = tempest.Command{
 	Name:                "hello",
diff --git a/commands/hresult.go b/commands/hresult.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log/slog"
 
-	tempest "github.com/Amatsagu/Tempest"
+	tempest "github.com/amatsagu/tempest"
 	"github.com/dhrdlicka/errorbot/repo"
 	"github.com/dhrdlicka/errorbot/winerror"
 )
@@ -61,12 +61,12 @@ func hResultSeverityToString(severity bool) string {
 	}
 }
 
-func createHResultEmbed(hResult repo.ErrorInfo) *tempest.Embed {
-	return &tempest.Embed{
+func createHResultEmbed(hResult repo.ErrorInfo) tempest.Embed {
+	return tempest.Embed{
 		Title:       hResult.Name,
 		Description: hResult.Description,
 		Fields: append(
-			[]*tempest.EmbedField{
+			[]tempest.EmbedField{
 				{
 					Name:  "HRESULT code",
 					Value: fmt.Sprintf("`0x%08X` (%d)", hResult.Code, hResult.Code),
@@ -75,10 +75,10 @@ func createHResultEmbed(hResult repo.ErrorInfo) *tempest.Embed {
 	}
 }
 
-func createUnknownHResultEmbed(code uint32) *tempest.Embed {
-	return &tempest.Embed{
+func createUnknownHResultEmbed(code uint32) tempest.Embed {
+	return tempest.Embed{
 		Fields: append(
-			[]*tempest.EmbedField{
+			[]tempest.EmbedField{
 				{
 					Name:  "HRESULT code",
 					Value: fmt.Sprintf("`0x%08X` (%d)", code, code),
@@ -87,7 +87,7 @@ func createUnknownHResultEmbed(code uint32) *tempest.Embed {
 	}
 }
 
-func createHResultEmbedFields(hResult winerror.HResult) []*tempest.EmbedField {
+func createHResultEmbedFields(hResult winerror.HResult) []tempest.EmbedField {
 	if hResult.N() {
 		// mapped NTSTATUS
 		return createNTStatusEmbedFields(winerror.NTStatus(hResult))
@@ -99,7 +99,7 @@ func createHResultEmbedFields(hResult winerror.HResult) []*tempest.EmbedField {
 		facility = fmt.Sprintf("%s (%s)", facility_name, facility)
 	}
 
-	return []*tempest.EmbedField{
+	return []tempest.EmbedField{
 		{
 			Name:   "Severity",
 			Value:  fmt.Sprintf("%s (%d)", hResultSeverityToString(hResult.S()), boolToInt(hResult.S())),
diff --git a/commands/ntstatus.go b/commands/ntstatus.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log/slog"
 
-	tempest "github.com/Amatsagu/Tempest"
+	tempest "github.com/amatsagu/tempest"
 	"github.com/dhrdlicka/errorbot/repo"
 	"github.com/dhrdlicka/errorbot/winerror"
 )
@@ -68,12 +68,12 @@ func ntStatusSeverityToString(severity uint8) string {
 	return ""
 }
 
-func createNTStatusEmbed(ntStatus repo.ErrorInfo) *tempest.Embed {
-	return &tempest.Embed{
+func createNTStatusEmbed(ntStatus repo.ErrorInfo) tempest.Embed {
+	return tempest.Embed{
 		Title:       ntStatus.Name,
 		Description: ntStatus.Description,
 		Fields: append(
-			[]*tempest.EmbedField{
+			[]tempest.EmbedField{
 				{
 					Name:  "NTSTATUS code",
 					Value: fmt.Sprintf("`0x%08X` (%d)", ntStatus.Code, ntStatus.Code),
@@ -82,10 +82,10 @@ func createNTStatusEmbed(ntStatus repo.ErrorInfo) *tempest.Embed {
 	}
 }
 
-func createUnknownNTStatusEmbed(code uint32) *tempest.Embed {
-	return &tempest.Embed{
+func createUnknownNTStatusEmbed(code uint32) tempest.Embed {
+	return tempest.Embed{
 		Fields: append(
-			[]*tempest.EmbedField{
+			[]tempest.EmbedField{
 				{
 					Name:  "NTSTATUS code",
 					Value: fmt.Sprintf("`0x%08X` (%d)", code, code),
@@ -94,14 +94,14 @@ func createUnknownNTStatusEmbed(code uint32) *tempest.Embed {
 	}
 }
 
-func createNTStatusEmbedFields(status winerror.NTStatus) []*tempest.EmbedField {
+func createNTStatusEmbedFields(status winerror.NTStatus) []tempest.EmbedField {
 	facility := fmt.Sprintf("%d", status.Facility())
 
 	if facility_name, ok := repoInstance.NTStatus.Facilities[status.Facility()]; ok {
 		facility = fmt.Sprintf("%s (%s)", facility_name, facility)
 	}
 
-	return []*tempest.EmbedField{
+	return []tempest.EmbedField{
 		{
 			Name:   "Severity",
 			Value:  fmt.Sprintf("%s (%d)", ntStatusSeverityToString(status.Sev()), status.Sev()),
diff --git a/go.mod b/go.mod
@@ -1,7 +1,9 @@
 module github.com/dhrdlicka/errorbot
 
-go 1.22.6
+go 1.24.0
 
-require github.com/Amatsagu/Tempest v1.2.0
+toolchain go1.24.3
+
+require github.com/amatsagu/tempest v1.2.3
 
 require gopkg.in/yaml.v3 v3.0.1
diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-github.com/Amatsagu/Tempest v1.2.0 h1:beLRJNona64e1putLBpbd7PrVZnBSeBTG8GD/uyjPak=
-github.com/Amatsagu/Tempest v1.2.0/go.mod h1:6pJb/I5+sg0g0bc78zRPVh7G5s1pL7FxCzGDoHlVugE=
+github.com/amatsagu/tempest v1.2.3 h1:VpbXmhvpytBZkYrmShxEG9mOz/lQ5nj6AoCdzXE+ggc=
+github.com/amatsagu/tempest v1.2.3/go.mod h1:NuRaGM2wOabFv4Z0IDCKkdXQcJ6WrqwVrk2CUPcJbmk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
diff --git a/main.go b/main.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"os"
 
-	tempest "github.com/Amatsagu/Tempest"
+	tempest "github.com/amatsagu/tempest"
 	"github.com/dhrdlicka/errorbot/commands"
 )
 
@@ -18,7 +18,7 @@ func main() {
 
 	client := tempest.NewClient(tempest.ClientOptions{
 		PublicKey: os.Getenv("DISCORD_PUBLIC_KEY"),
-		Rest:      tempest.NewRestClient(os.Getenv("DISCORD_BOT_TOKEN")),
+		Token:     os.Getenv("DISCORD_BOT_TOKEN"),
 	})
 
 	//client.RegisterCommand(commands.HelloCommand)
@@ -27,13 +27,13 @@ func main() {
 	client.RegisterCommand(commands.NTStatusCommand)
 	client.RegisterCommand(commands.HResultCommand)
 
-	err = client.SyncCommands(nil, nil, false)
+	err = client.SyncCommandsWithDiscord(nil, nil, false)
 
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	http.HandleFunc("POST /interactions", client.HandleDiscordRequest)
+	http.HandleFunc("POST /interactions", client.DiscordRequestHandler)
 
 	log.Fatal(http.ListenAndServe(":"+os.Getenv("PORT"), nil))
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"log/slog"`
`6`	`6`
`7`		`- tempest "github.com/Amatsagu/Tempest"`
	`7`	`+ tempest "github.com/amatsagu/tempest"`
`8`	`8`	`"github.com/dhrdlicka/errorbot/repo"`
`9`	`9`	`"github.com/dhrdlicka/errorbot/winerror"`
`10`	`10`	`)`
`@@ -61,12 +61,12 @@ func hResultSeverityToString(severity bool) string {`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`		`-func createHResultEmbed(hResult repo.ErrorInfo) *tempest.Embed {`
`65`		`- return &tempest.Embed{`
	`64`	`+func createHResultEmbed(hResult repo.ErrorInfo) tempest.Embed {`
	`65`	`+ return tempest.Embed{`
`66`	`66`	`Title: hResult.Name,`
`67`	`67`	`Description: hResult.Description,`
`68`	`68`	`Fields: append(`
`69`		`- []*tempest.EmbedField{`
	`69`	`+ []tempest.EmbedField{`
`70`	`70`	`{`
`71`	`71`	`Name: "HRESULT code",`
`72`	`72`	Value: fmt.Sprintf("`0x%08X` (%d)", hResult.Code, hResult.Code),
`@@ -75,10 +75,10 @@ func createHResultEmbed(hResult repo.ErrorInfo) *tempest.Embed {`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`78`		`-func createUnknownHResultEmbed(code uint32) *tempest.Embed {`
`79`		`- return &tempest.Embed{`
	`78`	`+func createUnknownHResultEmbed(code uint32) tempest.Embed {`
	`79`	`+ return tempest.Embed{`
`80`	`80`	`Fields: append(`
`81`		`- []*tempest.EmbedField{`
	`81`	`+ []tempest.EmbedField{`
`82`	`82`	`{`
`83`	`83`	`Name: "HRESULT code",`
`84`	`84`	Value: fmt.Sprintf("`0x%08X` (%d)", code, code),
`@@ -87,7 +87,7 @@ func createUnknownHResultEmbed(code uint32) *tempest.Embed {`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`		`-func createHResultEmbedFields(hResult winerror.HResult) []*tempest.EmbedField {`
	`90`	`+func createHResultEmbedFields(hResult winerror.HResult) []tempest.EmbedField {`
`91`	`91`	`if hResult.N() {`
`92`	`92`	`// mapped NTSTATUS`
`93`	`93`	`return createNTStatusEmbedFields(winerror.NTStatus(hResult))`
`@@ -99,7 +99,7 @@ func createHResultEmbedFields(hResult winerror.HResult) []*tempest.EmbedField {`
`99`	`99`	`facility = fmt.Sprintf("%s (%s)", facility_name, facility)`
`100`	`100`	`}`
`101`	`101`
`102`		`- return []*tempest.EmbedField{`
	`102`	`+ return []tempest.EmbedField{`
`103`	`103`	`{`
`104`	`104`	`Name: "Severity",`
`105`	`105`	`Value: fmt.Sprintf("%s (%d)", hResultSeverityToString(hResult.S()), boolToInt(hResult.S())),`