balki-aur/gotosocial_aur
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update patch to 0.19.1

Browse Source
This commit is contained in:
Balakrishnan Balasubramanian
2025-05-07 10:30:34 -04:00
parent d093e3fcb2
commit ddb049b558
3 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
modded.patch
View File

@@ -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