diff --git a/common/go.mod b/common/go.mod index 7d05bb2..05b4e4e 100644 --- a/common/go.mod +++ b/common/go.mod @@ -2,6 +2,6 @@ module github.com/hrfee/jfa-go/common replace github.com/hrfee/jfa-go/logmessages => ../logmessages -go 1.22.4 +go 1.18 require github.com/hrfee/jfa-go/logmessages v0.0.0-20240806200606-6308db495a0a diff --git a/easyproxy/go.mod b/easyproxy/go.mod index f88550a..83a1fc3 100644 --- a/easyproxy/go.mod +++ b/easyproxy/go.mod @@ -1,6 +1,6 @@ module github.com/hrfee/jfa-go/easyproxy -go 1.20 +go 1.18 require golang.org/x/net v0.15.0 diff --git a/go.mod b/go.mod index 5d7301e..48bbfe7 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/hrfee/jfa-go -go 1.22.4 +go 1.22 + +toolchain go1.22.4 replace github.com/hrfee/jfa-go/docs => ./docs @@ -33,18 +35,18 @@ require ( github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible github.com/golang-jwt/jwt v3.2.2+incompatible github.com/gomarkdown/markdown v0.0.0-20240730141124-034f12af3bf6 - github.com/hrfee/jfa-go/common v0.0.0-20240806200606-6308db495a0a - github.com/hrfee/jfa-go/docs v0.0.0-20240806200606-6308db495a0a - github.com/hrfee/jfa-go/easyproxy v0.0.0-20240806200606-6308db495a0a - github.com/hrfee/jfa-go/jellyseerr v0.0.0-20240806200606-6308db495a0a - github.com/hrfee/jfa-go/linecache v0.0.0-20240806200606-6308db495a0a - github.com/hrfee/jfa-go/logger v0.0.0-20240806200606-6308db495a0a - github.com/hrfee/jfa-go/logmessages v0.0.0-20240806200606-6308db495a0a - github.com/hrfee/jfa-go/ombi v0.0.0-20240806200606-6308db495a0a + github.com/hrfee/jfa-go/common v0.0.0-20240824141650-fcdd4e451882 + github.com/hrfee/jfa-go/docs v0.0.0-20240824141650-fcdd4e451882 + github.com/hrfee/jfa-go/easyproxy v0.0.0-20240824141650-fcdd4e451882 + github.com/hrfee/jfa-go/jellyseerr v0.0.0-20240824141650-fcdd4e451882 + github.com/hrfee/jfa-go/linecache v0.0.0-20240824141650-fcdd4e451882 + github.com/hrfee/jfa-go/logger v0.0.0-20240824141650-fcdd4e451882 + github.com/hrfee/jfa-go/logmessages v0.0.0-20240824141650-fcdd4e451882 + github.com/hrfee/jfa-go/ombi v0.0.0-20240824141650-fcdd4e451882 github.com/hrfee/mediabrowser v0.3.18 github.com/itchyny/timefmt-go v0.1.6 github.com/lithammer/shortuuid/v3 v3.0.7 - github.com/mailgun/mailgun-go/v4 v4.14.0 + github.com/mailgun/mailgun-go/v4 v4.15.0 github.com/mattn/go-sqlite3 v1.14.22 github.com/robert-nix/ansihtml v1.0.1 github.com/steambap/captcha v1.4.1 @@ -54,7 +56,8 @@ require ( github.com/writeas/go-strip-markdown v2.0.1+incompatible github.com/xhit/go-simple-mail/v2 v2.16.0 gopkg.in/ini.v1 v1.67.0 - maunium.net/go/mautrix v0.19.0 + gopkg.in/yaml.v3 v3.0.1 + maunium.net/go/mautrix v0.20.0 ) require ( @@ -110,7 +113,8 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect - github.com/pelletier/go-toml/v2 v2.2.2 // indirect + github.com/pelletier/go-toml/v2 v2.2.3 // indirect + github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/rs/zerolog v1.33.0 // indirect github.com/swaggo/swag v1.16.3 // indirect @@ -122,21 +126,20 @@ require ( github.com/toorop/go-dkim v0.0.0-20240103092955-90b7d1423f92 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect - go.mau.fi/util v0.6.0 // indirect + go.mau.fi/util v0.7.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/otel v1.28.0 // indirect - go.opentelemetry.io/otel/metric v1.28.0 // indirect - go.opentelemetry.io/otel/trace v1.28.0 // indirect + go.opentelemetry.io/otel v1.29.0 // indirect + go.opentelemetry.io/otel/metric v1.29.0 // indirect + go.opentelemetry.io/otel/trace v1.29.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/arch v0.9.0 // indirect golang.org/x/crypto v0.26.0 // indirect - golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect + golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect golang.org/x/image v0.19.0 // indirect golang.org/x/net v0.28.0 // indirect golang.org/x/sys v0.24.0 // indirect golang.org/x/text v0.17.0 // indirect golang.org/x/tools v0.24.0 // indirect google.golang.org/protobuf v1.34.2 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 03a2e58..7e73e8d 100644 --- a/go.sum +++ b/go.sum @@ -258,6 +258,8 @@ github.com/magisterquis/connectproxy v0.0.0-20200725203833-3582e84f0c9b h1:xZ59n github.com/magisterquis/connectproxy v0.0.0-20200725203833-3582e84f0c9b/go.mod h1:uDd4sYVYsqcxAB8j+Q7uhL6IJCs/r1kxib1HV4bgOMg= github.com/mailgun/mailgun-go/v4 v4.14.0 h1:N9GMNs0XUq5nn3v2TlZHCknF9khSh88MkA1hdRm1o7I= github.com/mailgun/mailgun-go/v4 v4.14.0/go.mod h1:L9s941Lgk7iB3TgywTPz074pK2Ekkg4kgbnAaAyJ2z8= +github.com/mailgun/mailgun-go/v4 v4.15.0 h1:3NQU0r2XItJbyIZ21iBI9ps0+vPIMoGyI2XK7ZTN/DQ= +github.com/mailgun/mailgun-go/v4 v4.15.0/go.mod h1:L9s941Lgk7iB3TgywTPz074pK2Ekkg4kgbnAaAyJ2z8= github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -290,6 +292,10 @@ github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwU github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= +github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= +github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= +github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 h1:Dx7Ovyv/SFnMFw3fD4oEoeorXc6saIiQ23LrGLth0Gw= +github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -384,17 +390,25 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.mau.fi/util v0.6.0 h1:W6SyB3Bm/GjenQ5iq8Z8WWdN85Gy2xS6L0wmnR7SVjg= go.mau.fi/util v0.6.0/go.mod h1:ljYdq3sPfpICc3zMU+/mHV/sa4z0nKxc67hSBwnrk8U= +go.mau.fi/util v0.7.0 h1:l31z+ivrSQw+cv/9eFebEqtQW2zhxivGypn+JT0h/ws= +go.mau.fi/util v0.7.0/go.mod h1:bWYreIoTULL/UiRbZdfddPh7uWDFW5yX4YCv5FB0eE0= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw= +go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8= go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc= +go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8= go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTNGg6VODnOiPo= go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= +go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4= +go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -419,6 +433,8 @@ golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn5 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI= golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= +golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 h1:kx6Ds3MlpiUHKj7syVnbp57++8WpuKPcR5yjLBjvLEA= +golang.org/x/exp v0.0.0-20240823005443-9b4947da3948/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= golang.org/x/image v0.19.0 h1:D9FX4QWkLfkeqaC62SonffIIuYdOk/UE2XKUBgRIBIQ= golang.org/x/image v0.19.0/go.mod h1:y0zrRqlQRWQ5PXaYCOMLTW2fpsxZ8Qh9I/ohnInJEys= @@ -577,4 +593,6 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= maunium.net/go/mautrix v0.19.0 h1:67eSJWam93mw44Q0/1SiOG7zQzXMUknUv5UaWkrODDU= maunium.net/go/mautrix v0.19.0/go.mod h1:UE+mSQ4sDUuJMbjN0aB9EjQSGgXd48AzMvZ6+QJV1k8= +maunium.net/go/mautrix v0.20.0 h1:bzQnVQR+LvQxV1YlAr7BSWCS8AWa0Ov0lyPhbbChM0o= +maunium.net/go/mautrix v0.20.0/go.mod h1:V725r8w7oddsS7CxnmTAp634A4nwJCFY7J3jiTMUz2c= nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= diff --git a/jellyseerr/go.mod b/jellyseerr/go.mod index fbf7aa3..2ef973a 100644 --- a/jellyseerr/go.mod +++ b/jellyseerr/go.mod @@ -2,7 +2,7 @@ module github.com/hrfee/jfa-go/jellyseerr replace github.com/hrfee/jfa-go/common => ../common -go 1.22.4 +go 1.18 require github.com/hrfee/jfa-go/common v0.0.0-20240728190513-dabef831d769 diff --git a/logmessages/go.mod b/logmessages/go.mod index 7461dc9..e5340c2 100644 --- a/logmessages/go.mod +++ b/logmessages/go.mod @@ -1,3 +1,3 @@ module github.com/hrfee/jfa-go/logmessages -go 1.22.4 +go 1.18 diff --git a/ombi/go.mod b/ombi/go.mod index 51cac95..ad4b786 100644 --- a/ombi/go.mod +++ b/ombi/go.mod @@ -2,7 +2,7 @@ module github.com/hrfee/jfa-go/ombi replace github.com/hrfee/jfa-go/common => ../common -go 1.22.4 +go 1.18 require github.com/hrfee/jfa-go/common v0.0.0-20240806200606-6308db495a0a diff --git a/scripts/account-gen/go.mod b/scripts/account-gen/go.mod index bdcfa36..56c3b7b 100644 --- a/scripts/account-gen/go.mod +++ b/scripts/account-gen/go.mod @@ -1,5 +1,5 @@ module github.com/hrfee/jfa-go/scripts/account-gen -go 1.20 +go 1.18 require github.com/hrfee/mediabrowser v0.3.8 // indirect diff --git a/scripts/ini/go.mod b/scripts/ini/go.mod index 13194df..531d89f 100644 --- a/scripts/ini/go.mod +++ b/scripts/ini/go.mod @@ -2,7 +2,7 @@ module github.com/hrfee/jfa-go/scripts/ini replace github.com/hrfee/jfa-go/common => ../../common -go 1.22.4 +go 1.18 require ( github.com/hrfee/jfa-go/common v0.0.0-20240824141650-fcdd4e451882 // indirect