diff --git a/.SRCINFO b/.SRCINFO index a9ee16f..ae5c3bb 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -68,11 +68,11 @@ pkgbase = gotosocial sha512sums = 2ff5499a31e12733cb20a9261942ed135fbac327d5a836b8955f3e86c009a603cf965440d9dbe6db64b80d0f652ba56faddb0ef398393b72474d8cf6c438ab80 sha512sums = b89fad3073e140f17167515b38942e5b5e2bc2aee03c484e1bb7cf6444f86cb1e2a13a60b101e04d22633d348be073ca26cd309da4746e5062c12b4f3ce4b38a sha512sums = 913a5209487aba06bf1d8ac7c02506a05d01a8e12f172666c84bf6870d6237640d4745617b0f07ea8c9dcf665f4e0d24a0aabef31611909f7e9384ed6e7b7e77 - sha512sums = 362181afc9823315045896eaeaa9367bc3af8671637ecd42d8d62a12274241753cd24c004e41fb86877cfec9a5e1ae4fd6730d31a8cb055d9b0a498a99422e8c + sha512sums = 7a9837521e4765d3b6b509876ccf19a89de6dcafa69e82e436d1c26ca98e416ec012e5323c2d446ef92288821d0c64669076ebe647f72dba4d4d51fc63ffd847 b2sums = 773c579ec4f504141dbae393dcaf6cd2b9669f8338d4f01d546def27c05f5899b12b3f7287bcf229743a11335597d6cadd8bc803e076f3558848dcd808d80277 b2sums = ccf672731b88fc6700b0b81737790365e1eea0066bad1bbf6b13dac1e5b42af69063838efca47a6d9c16ee3f6308e2e23b92cf79d4226cd88f8551fb7361649b b2sums = 4f65af952441c0f54bb32049a149675e207f8993678423d369c4095c57476464614ac720eccc64d7a93a81268ad7ca41cae75ca7211bd7b78f9035f6e5341f04 b2sums = 9edd4520fb99856feb82d01935588add7f805aa180f2ed0fe169cb26576bc2e1d2c1e6ab11604d977cec6a4ad8f1d5be1413e1a366de59b89c5b869136538f8c - b2sums = 71b2441e96c372f48bd6b1a1fabc2222c704b6a3c3d589c37e92ebcd892656e57e872ea9fbbf240a189f325e67527f4e542363b80ad4628a9cd94d28070ec6ad + b2sums = 9958c7a20249ced130963fd5cfc9c8750ee4b98554a404f62d2d488298008a7e891bc136fab2373bdbb82534881e8407430f08ff519138fb649e93052e197c11 pkgname = gotosocial diff --git a/PKGBUILD b/PKGBUILD index ad6309d..cb7f45c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -72,12 +72,12 @@ sha512sums=('cab294e99184ec25888101e04e5753ab9f042711662258e0155619e071750a364f1 '2ff5499a31e12733cb20a9261942ed135fbac327d5a836b8955f3e86c009a603cf965440d9dbe6db64b80d0f652ba56faddb0ef398393b72474d8cf6c438ab80' 'b89fad3073e140f17167515b38942e5b5e2bc2aee03c484e1bb7cf6444f86cb1e2a13a60b101e04d22633d348be073ca26cd309da4746e5062c12b4f3ce4b38a' '913a5209487aba06bf1d8ac7c02506a05d01a8e12f172666c84bf6870d6237640d4745617b0f07ea8c9dcf665f4e0d24a0aabef31611909f7e9384ed6e7b7e77' - '362181afc9823315045896eaeaa9367bc3af8671637ecd42d8d62a12274241753cd24c004e41fb86877cfec9a5e1ae4fd6730d31a8cb055d9b0a498a99422e8c') + '7a9837521e4765d3b6b509876ccf19a89de6dcafa69e82e436d1c26ca98e416ec012e5323c2d446ef92288821d0c64669076ebe647f72dba4d4d51fc63ffd847') b2sums=('773c579ec4f504141dbae393dcaf6cd2b9669f8338d4f01d546def27c05f5899b12b3f7287bcf229743a11335597d6cadd8bc803e076f3558848dcd808d80277' 'ccf672731b88fc6700b0b81737790365e1eea0066bad1bbf6b13dac1e5b42af69063838efca47a6d9c16ee3f6308e2e23b92cf79d4226cd88f8551fb7361649b' '4f65af952441c0f54bb32049a149675e207f8993678423d369c4095c57476464614ac720eccc64d7a93a81268ad7ca41cae75ca7211bd7b78f9035f6e5341f04' '9edd4520fb99856feb82d01935588add7f805aa180f2ed0fe169cb26576bc2e1d2c1e6ab11604d977cec6a4ad8f1d5be1413e1a366de59b89c5b869136538f8c' - '71b2441e96c372f48bd6b1a1fabc2222c704b6a3c3d589c37e92ebcd892656e57e872ea9fbbf240a189f325e67527f4e542363b80ad4628a9cd94d28070ec6ad') + '9958c7a20249ced130963fd5cfc9c8750ee4b98554a404f62d2d488298008a7e891bc136fab2373bdbb82534881e8407430f08ff519138fb649e93052e197c11') prepare() { cd "$pkgname" diff --git a/modded.patch b/modded.patch index 2009617..ef7a5a9 100644 --- a/modded.patch +++ b/modded.patch @@ -1,5 +1,5 @@ diff --git a/example/config.yaml b/example/config.yaml -index 2b3a873fb..52615a345 100644 +index 17a57b857..bf645a364 100644 --- a/example/config.yaml +++ b/example/config.yaml @@ -105,13 +105,13 @@ account-domain: "" @@ -42,23 +42,23 @@ index 2b3a873fb..52615a345 100644 db-address: "" diff --git a/go.mod b/go.mod -index 09796fba7..ff7e08475 100644 +index 4169208ed..60b3a1281 100644 --- a/go.mod +++ b/go.mod @@ -74,6 +74,7 @@ require ( github.com/uptrace/bun/extra/bunotel v1.2.11 github.com/wagslane/go-password-validator v0.3.0 - github.com/yuin/goldmark v1.7.10 + github.com/yuin/goldmark v1.7.11 + go.balki.me/anyhttp v0.5.0 go.opentelemetry.io/otel v1.35.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0 diff --git a/go.sum b/go.sum -index 17885f27e..8a123642f 100644 +index 597cee716..532e99852 100644 --- a/go.sum +++ b/go.sum -@@ -491,6 +491,8 @@ github.com/yuin/goldmark v1.7.10 h1:S+LrtBjRmqMac2UdtB6yyCEJm+UILZ2fefI4p7o0QpI= - github.com/yuin/goldmark v1.7.10/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg= +@@ -489,6 +489,8 @@ github.com/yuin/goldmark v1.7.11 h1:ZCxLyDMtz0nT2HFfsYG8WZ47Trip2+JyLysKcMYE5bo= + github.com/yuin/goldmark v1.7.11/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg= gitlab.com/NyaaaWhatsUpDoc/sqlite v1.37.0-concurrency-workaround h1:QbfrBqNKgAFSSK89fYf547vxDQuz8p6iJUzzAMrusNk= gitlab.com/NyaaaWhatsUpDoc/sqlite v1.37.0-concurrency-workaround/go.mod h1:5YiWv+YviqGMuGw4V+PNplcyaJ5v+vQd7TQOgkACoJM= +go.balki.me/anyhttp v0.5.0 h1:uys0oRciBpZfwtxXAevScKy6amIQBXyDrcV0EtGF5zo= @@ -67,7 +67,7 @@ index 17885f27e..8a123642f 100644 go.mongodb.org/mongo-driver v1.17.3/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= diff --git a/internal/config/config.go b/internal/config/config.go -index d4b3901e7..c63157f0c 100644 +index b9804d404..331d41139 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -58,6 +58,7 @@ type Configuration struct { @@ -78,7 +78,7 @@ index d4b3901e7..c63157f0c 100644 SoftwareVersion string `name:"software-version" usage:""` DbType string `name:"db-type" usage:"Database type: eg., postgres"` -@@ -192,6 +193,8 @@ type Configuration struct { +@@ -193,6 +194,8 @@ type Configuration struct { AdminMediaListRemoteOnly bool `name:"remote-only" usage:"list only remote attachments/emojis; if specified then local-only cannot also be true"` RequestIDHeader string `name:"request-id-header" usage:"Header to extract the Request ID from. Eg.,'X-Request-Id'."` @@ -88,10 +88,10 @@ index d4b3901e7..c63157f0c 100644 type HTTPClientConfiguration struct { diff --git a/internal/config/defaults.go b/internal/config/defaults.go -index 9a507b421..4f63c2569 100644 +index 57c64db44..c19864002 100644 --- a/internal/config/defaults.go +++ b/internal/config/defaults.go -@@ -233,4 +233,6 @@ +@@ -234,4 +234,6 @@ RequestIDHeader: "X-Request-Id", LogClientIP: true, @@ -99,7 +99,7 @@ index 9a507b421..4f63c2569 100644 + KalaclistaAllowedUnauthorizedGet: false, } diff --git a/internal/config/helpers.gen.go b/internal/config/helpers.gen.go -index ac41a73e9..39266add6 100644 +index f063cbf93..cdb5a663f 100644 --- a/internal/config/helpers.gen.go +++ b/internal/config/helpers.gen.go @@ -350,6 +350,31 @@ func GetTrustedProxies() []string { return global.GetTrustedProxies() } @@ -134,7 +134,7 @@ index ac41a73e9..39266add6 100644 // GetSoftwareVersion safely fetches the Configuration value for state's 'SoftwareVersion' field func (st *ConfigState) GetSoftwareVersion() (v string) { st.mutex.RLock() -@@ -4656,3 +4681,28 @@ func GetRequestIDHeader() string { return global.GetRequestIDHeader() } +@@ -4681,3 +4706,28 @@ func GetRequestIDHeader() string { return global.GetRequestIDHeader() } // SetRequestIDHeader safely sets the value for global configuration 'RequestIDHeader' field func SetRequestIDHeader(v string) { global.SetRequestIDHeader(v) } @@ -164,7 +164,7 @@ index ac41a73e9..39266add6 100644 +// SetKalaclistaAllowedUnauthorizedGet safely sets the value for global configuration 'KalaclistaAllowedUnauthorizedGet' field +func SetKalaclistaAllowedUnauthorizedGet(v bool) { global.SetKalaclistaAllowedUnauthorizedGet(v) } diff --git a/internal/processing/fedi/common.go b/internal/processing/fedi/common.go -index 1a4d38bc1..1d62aacdb 100644 +index 9059aef39..6e9a22b59 100644 --- a/internal/processing/fedi/common.go +++ b/internal/processing/fedi/common.go @@ -20,8 +20,10 @@ @@ -174,10 +174,10 @@ index 1a4d38bc1..1d62aacdb 100644 + "net/http" "net/url" -+ "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" ++ "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" @@ -51,6 +53,12 @@ func (p *Processor) authenticate(ctx context.Context, requestedUser string) (*co // get requesting account, dereferencing if necessary. pubKeyAuth, errWithCode := p.federator.AuthenticateFederatedRequest(ctx, requestedUser) @@ -192,7 +192,7 @@ index 1a4d38bc1..1d62aacdb 100644 } diff --git a/internal/processing/fedi/emoji.go b/internal/processing/fedi/emoji.go -index 9ac0ea244..1c8b0bda7 100644 +index 8db8b48ea..d7e503f7d 100644 --- a/internal/processing/fedi/emoji.go +++ b/internal/processing/fedi/emoji.go @@ -20,14 +20,20 @@ @@ -201,9 +201,9 @@ index 9ac0ea244..1c8b0bda7 100644 "fmt" + "net/http" - "github.com/superseriousbusiness/gotosocial/internal/ap" -+ "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/ap" ++ "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" ) // EmojiGet handles the GET for a federated emoji originating from this instance. @@ -217,7 +217,7 @@ index 9ac0ea244..1c8b0bda7 100644 } diff --git a/internal/processing/fedi/user.go b/internal/processing/fedi/user.go -index 79c1b4fdb..376191036 100644 +index 53dfd6022..7d976a523 100644 --- a/internal/processing/fedi/user.go +++ b/internal/processing/fedi/user.go @@ -21,9 +21,11 @@ @@ -227,11 +227,11 @@ index 79c1b4fdb..376191036 100644 + "net/http" "net/url" - "github.com/superseriousbusiness/gotosocial/internal/ap" -+ "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/db" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/uris" + "code.superseriousbusiness.org/gotosocial/internal/ap" ++ "code.superseriousbusiness.org/gotosocial/internal/config" + "code.superseriousbusiness.org/gotosocial/internal/db" + "code.superseriousbusiness.org/gotosocial/internal/gtserror" + "code.superseriousbusiness.org/gotosocial/internal/uris" @@ -67,6 +69,15 @@ func (p *Processor) UserGet(ctx context.Context, requestedUsername string, reque // we can serve a more complete profile. pubKeyAuth, errWithCode := p.federator.AuthenticateFederatedRequest(ctx, requestedUsername) @@ -249,7 +249,7 @@ index 79c1b4fdb..376191036 100644 } diff --git a/internal/router/router.go b/internal/router/router.go -index c2bf18b4f..97ee65847 100644 +index 45419807d..7ef90e297 100644 --- a/internal/router/router.go +++ b/internal/router/router.go @@ -23,6 +23,7 @@ @@ -259,11 +259,11 @@ index c2bf18b4f..97ee65847 100644 + "strings" "time" - "codeberg.org/gruf/go-bytesize" + "code.superseriousbusiness.org/gotosocial/internal/config" @@ -31,6 +32,7 @@ - "github.com/superseriousbusiness/gotosocial/internal/config" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/log" + "codeberg.org/gruf/go-bytesize" + "codeberg.org/gruf/go-debug" + "github.com/gin-gonic/gin" + "go.balki.me/anyhttp" "golang.org/x/crypto/acme/autocert" ) @@ -1180,10 +1180,10 @@ index 000000000..ee3d81ff1 + return i.c +} diff --git a/vendor/modules.txt b/vendor/modules.txt -index c0b7298f3..7a620f2fc 100644 +index 276f0f17c..ec3ecb43d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt -@@ -957,6 +957,10 @@ github.com/yuin/goldmark/renderer +@@ -968,6 +968,10 @@ github.com/yuin/goldmark/renderer github.com/yuin/goldmark/renderer/html github.com/yuin/goldmark/text github.com/yuin/goldmark/util