From 74ef3b90306cebcecbfe3acd51b1fd0396a48b36 Mon Sep 17 00:00:00 2001 From: Arzumify Date: Tue, 15 Oct 2024 19:06:36 +0100 Subject: [PATCH] Updated fulgens library --- go.mod | 2 +- go.sum | 8 ++------ main.go | 7 ++++--- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 45d915c..846135d 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module git.oreonproject.org/oreonproject/eternity-web go 1.23.1 require ( - git.ailur.dev/ailur/fg-library v1.0.1 + git.ailur.dev/ailur/fg-library/v2 v2.0.0 git.ailur.dev/ailur/fg-nucleus-library v1.0.0 git.oreonproject.org/oreonproject/eternity v1.0.0 github.com/go-git/go-git/v5 v5.12.0 diff --git a/go.sum b/go.sum index e5971f8..83e400b 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,7 @@ dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s= dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= -git.ailur.dev/ailur/fg-library v1.0.0 h1:61RkJW9g4PqAiZFjpwUnx6QUYYSeXJXLjLi1d47NfTA= -git.ailur.dev/ailur/fg-library v1.0.0/go.mod h1:hOUkxs2rRouSwNnNZlo7CsFVH12kmjqheyzPQ4to1N8= -git.ailur.dev/ailur/fg-library v1.0.1 h1:7TY2shmYNfKPzCTeYC80uj+sFZPbBWeOlqKT6ZsKFmc= -git.ailur.dev/ailur/fg-library v1.0.1/go.mod h1:hOUkxs2rRouSwNnNZlo7CsFVH12kmjqheyzPQ4to1N8= +git.ailur.dev/ailur/fg-library/v2 v2.0.0 h1:NanDV52W+NBu96v/HPDPGqH8NOxLp6MRrRdXLPEsgYw= +git.ailur.dev/ailur/fg-library/v2 v2.0.0/go.mod h1:1jYbWhabGcIwp7CkhHqvRwC8eP+nHv5BrXPe9NX2HE8= git.ailur.dev/ailur/fg-nucleus-library v1.0.0 h1:TT1V4cfka+uUpvV1zU7bc4KXFkgnsI/sIvaZDDxXk+k= git.ailur.dev/ailur/fg-nucleus-library v1.0.0/go.mod h1:m4gNSEypfgrUV8bXaR8NLB8zchUM59y0ellV1wp/C+I= git.oreonproject.org/oreonproject/eternity v1.0.0 h1:EHKJsLI84+L/yFz8yECys0AZCUn0bnGNSoD7KpXzgYY= @@ -113,8 +111,6 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= -golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/main.go b/main.go index 439ec57..9bcd734 100644 --- a/main.go +++ b/main.go @@ -3,6 +3,7 @@ package main import ( "bytes" "errors" + "github.com/go-chi/chi/v5" "net/url" "os" "time" @@ -16,7 +17,7 @@ import ( "net/http" "path/filepath" - library "git.ailur.dev/ailur/fg-library" + library "git.ailur.dev/ailur/fg-library/v2" authLibrary "git.ailur.dev/ailur/fg-nucleus-library" "git.oreonproject.org/oreonproject/eternity/common" "git.oreonproject.org/oreonproject/eternity/lib" @@ -265,7 +266,7 @@ func Main(information library.ServiceInitializationInformation) { } // Set up the router - router := information.Router + router := chi.NewRouter() // Set up the static routes staticDir, err := fs.Sub(information.ResourceDir, "static") @@ -604,6 +605,6 @@ func Main(information library.ServiceInitializationInformation) { ForServiceID: uuid.MustParse("00000000-0000-0000-0000-000000000001"), // Activation service MessageType: 0, SentAt: time.Now(), - Message: true, + Message: router, } }