diff --git a/go.mod b/go.mod index f062033..3a1908c 100644 --- a/go.mod +++ b/go.mod @@ -3,12 +3,11 @@ module fornaxian.tech/pixeldrain_web go 1.17 require ( - fornaxian.tech/log v0.0.0-20190617093801-1c7ce9a7c9b3 // indirect - fornaxian.tech/pixeldrain_api_client v0.0.0-20211102100427-d8ecaecb350b + fornaxian.tech/config v0.0.0-20211108212237-6133aed90586 + fornaxian.tech/log v0.0.0-20211102185326-552e9b1f8640 + fornaxian.tech/pixeldrain_api_client v0.0.0-20211116125507-617387c4f7e7 fornaxian.tech/util v0.0.0-20211102152345-9a486dee9787 github.com/BurntSushi/toml v0.4.1 // indirect - github.com/Fornaxian/config v0.0.0-20180915150834-ac41cf746a70 - github.com/Fornaxian/log v0.0.0-20190617093801-1c7ce9a7c9b3 github.com/aymerick/douceur v0.2.0 // indirect github.com/gocql/gocql v0.0.0-20211015133455-b225f9b53fa1 // indirect github.com/golang/snappy v0.0.4 // indirect @@ -17,7 +16,7 @@ require ( github.com/julienschmidt/httprouter v1.3.0 github.com/microcosm-cc/bluemonday v1.0.16 github.com/russross/blackfriday/v2 v2.1.0 - golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect - golang.org/x/net v0.0.0-20211101193420-4a448f8816b3 // indirect + golang.org/x/crypto v0.0.0-20211115234514-b4de73f9ece8 // indirect + golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect gopkg.in/inf.v0 v0.9.1 // indirect ) diff --git a/go.sum b/go.sum index bc5d0f8..400c3fd 100644 --- a/go.sum +++ b/go.sum @@ -1,15 +1,14 @@ -fornaxian.tech/log v0.0.0-20190617093801-1c7ce9a7c9b3 h1:xmaCGgVg74JFhF8x9r8DYeGbe3OHZ8SyGDjMojCFSz0= +fornaxian.tech/config v0.0.0-20211108212237-6133aed90586 h1:/4a0Iq3cYeyTWcPHsN9pVAGJH3UTq1GapK253lHfXnE= +fornaxian.tech/config v0.0.0-20211108212237-6133aed90586/go.mod h1:ULIXF4J1DbBw4EsIPRNQDf6J3hl4P/jlihjy6UCm9FM= fornaxian.tech/log v0.0.0-20190617093801-1c7ce9a7c9b3/go.mod h1:OyWUNsNPlo5AmlOHvJ4s6WcStQw+9rQyBMwmTz0buEM= -fornaxian.tech/pixeldrain_api_client v0.0.0-20211102100427-d8ecaecb350b h1:Kr2u1Ukss+oX+o8mmb2a0xVnLqMCSjJW9OFlrbBV7OA= -fornaxian.tech/pixeldrain_api_client v0.0.0-20211102100427-d8ecaecb350b/go.mod h1:uajB2ofEsefUtxjvs4m7SDyPVRlfrI3qzCSWcud47hY= +fornaxian.tech/log v0.0.0-20211102185326-552e9b1f8640 h1:UPDxJwLRCfh/cv80UMSanzmZ0jIcfS1mcd0Y06HYuLw= +fornaxian.tech/log v0.0.0-20211102185326-552e9b1f8640/go.mod h1:sN82qMToeHhP2u3ehvrcE8y1IudRZJAZO9yG5OBYblo= +fornaxian.tech/pixeldrain_api_client v0.0.0-20211116125507-617387c4f7e7 h1:GVCPM2LiwfEaqA4zbIThe2obUww16rh1OvfcSGTEsw8= +fornaxian.tech/pixeldrain_api_client v0.0.0-20211116125507-617387c4f7e7/go.mod h1:uajB2ofEsefUtxjvs4m7SDyPVRlfrI3qzCSWcud47hY= fornaxian.tech/util v0.0.0-20211102152345-9a486dee9787 h1:9ujI8Qi6+FTL/YW6xQAS9DmWDMerHBe8foQvVD/G/i0= fornaxian.tech/util v0.0.0-20211102152345-9a486dee9787/go.mod h1:FqVgfghmxTGR3l9Zx4MOMeZ9KHjiEFl3s3C0BSTvBwk= github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw= github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/Fornaxian/config v0.0.0-20180915150834-ac41cf746a70 h1:yRkXab8h+BAWEphLE0qexJVxIOdPgw+3T9VSLuyPXus= -github.com/Fornaxian/config v0.0.0-20180915150834-ac41cf746a70/go.mod h1:Ig5am30IOP/eqsjogI1TuSlOTIeTPHoMOpYYM1bisww= -github.com/Fornaxian/log v0.0.0-20190617093801-1c7ce9a7c9b3 h1:PfKr7anK3z4kLG9V6BbbKOVFhVaGEAJi4HxXCAa+QeU= -github.com/Fornaxian/log v0.0.0-20190617093801-1c7ce9a7c9b3/go.mod h1:jdnyerqAlXJJpQmpyrdmSYMitRaRZ8RejEXuXz6n5QY= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 h1:mXoPYz/Ul5HYEDvkta6I8/rnYM5gSdSV2tJ6XbZuEtY= @@ -42,13 +41,13 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20201217014255-9d1352758620/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211115234514-b4de73f9ece8 h1:5QRxNnVsaJP6NAse0UdkRgL3zHMvCRRkrDVLNdNpdy4= +golang.org/x/crypto v0.0.0-20211115234514-b4de73f9ece8/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211101193420-4a448f8816b3 h1:VrJZAjbekhoRn7n5FBujY31gboH+iB3pdLxn3gE9FjU= -golang.org/x/net v0.0.0-20211101193420-4a448f8816b3/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/init/init.go b/init/init.go index 30fb6e2..12d3c8d 100644 --- a/init/init.go +++ b/init/init.go @@ -5,9 +5,9 @@ import ( "os" "time" + "fornaxian.tech/config" + "fornaxian.tech/log" "fornaxian.tech/pixeldrain_web/webcontroller" - "github.com/Fornaxian/config" - "github.com/Fornaxian/log" "github.com/julienschmidt/httprouter" ) diff --git a/main.go b/main.go index d93bfe9..20a75cb 100644 --- a/main.go +++ b/main.go @@ -5,9 +5,9 @@ import ( "net" "net/http" + "fornaxian.tech/log" web "fornaxian.tech/pixeldrain_web/init" "fornaxian.tech/util" - "github.com/Fornaxian/log" "github.com/julienschmidt/httprouter" ) diff --git a/webcontroller/ad_click.go b/webcontroller/ad_click.go index b32d12e..8d38041 100644 --- a/webcontroller/ad_click.go +++ b/webcontroller/ad_click.go @@ -4,8 +4,8 @@ import ( "net/http" "time" + "fornaxian.tech/log" "fornaxian.tech/util" - "github.com/Fornaxian/log" "github.com/julienschmidt/httprouter" ) diff --git a/webcontroller/admin_panel.go b/webcontroller/admin_panel.go index 3dc98ae..e1f0abf 100644 --- a/webcontroller/admin_panel.go +++ b/webcontroller/admin_panel.go @@ -5,8 +5,8 @@ import ( "html/template" "net/http" + "fornaxian.tech/log" "fornaxian.tech/pixeldrain_api_client/pixelapi" - "github.com/Fornaxian/log" ) func (wc *WebController) adminGlobalsForm(td *TemplateData, r *http.Request) (f Form) { diff --git a/webcontroller/file_preview.go b/webcontroller/file_preview.go index daeaf47..3933c72 100644 --- a/webcontroller/file_preview.go +++ b/webcontroller/file_preview.go @@ -6,8 +6,8 @@ import ( "net/http" "strings" + "fornaxian.tech/log" "fornaxian.tech/util" - "github.com/Fornaxian/log" "github.com/julienschmidt/httprouter" "github.com/microcosm-cc/bluemonday" blackfriday "github.com/russross/blackfriday/v2" diff --git a/webcontroller/file_viewer.go b/webcontroller/file_viewer.go index 38d309d..fb39c49 100644 --- a/webcontroller/file_viewer.go +++ b/webcontroller/file_viewer.go @@ -6,8 +6,8 @@ import ( "strings" "time" + "fornaxian.tech/log" "fornaxian.tech/pixeldrain_api_client/pixelapi" - "github.com/Fornaxian/log" "github.com/julienschmidt/httprouter" ) diff --git a/webcontroller/filesystem.go b/webcontroller/filesystem.go index d4323d2..c7735ba 100644 --- a/webcontroller/filesystem.go +++ b/webcontroller/filesystem.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/Fornaxian/log" + "fornaxian.tech/log" "github.com/julienschmidt/httprouter" ) diff --git a/webcontroller/misc.go b/webcontroller/misc.go index 693a8cd..daaa42f 100644 --- a/webcontroller/misc.go +++ b/webcontroller/misc.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/Fornaxian/log" + "fornaxian.tech/log" "github.com/julienschmidt/httprouter" ) diff --git a/webcontroller/templates.go b/webcontroller/templates.go index 08295a3..05e9c86 100644 --- a/webcontroller/templates.go +++ b/webcontroller/templates.go @@ -15,9 +15,9 @@ import ( "strings" "time" + "fornaxian.tech/log" "fornaxian.tech/pixeldrain_api_client/pixelapi" "fornaxian.tech/util" - "github.com/Fornaxian/log" ) // TemplateData is a struct that every template expects when being rendered. In diff --git a/webcontroller/user_account.go b/webcontroller/user_account.go index 80dab29..f520b72 100644 --- a/webcontroller/user_account.go +++ b/webcontroller/user_account.go @@ -6,8 +6,8 @@ import ( "net/http" "time" + "fornaxian.tech/log" "fornaxian.tech/pixeldrain_api_client/pixelapi" - "github.com/Fornaxian/log" "github.com/julienschmidt/httprouter" ) diff --git a/webcontroller/user_export.go b/webcontroller/user_export.go index 77dc118..b6c846e 100644 --- a/webcontroller/user_export.go +++ b/webcontroller/user_export.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/Fornaxian/log" + "fornaxian.tech/log" "github.com/julienschmidt/httprouter" ) diff --git a/webcontroller/web_controller.go b/webcontroller/web_controller.go index e7becd6..4b7688c 100644 --- a/webcontroller/web_controller.go +++ b/webcontroller/web_controller.go @@ -12,8 +12,8 @@ import ( "strings" "time" + "fornaxian.tech/log" "fornaxian.tech/pixeldrain_api_client/pixelapi" - "github.com/Fornaxian/log" "github.com/julienschmidt/httprouter" blackfriday "github.com/russross/blackfriday/v2" )