update patch to 0.19.1

Merge remote-tracking branch 'aur/main'
upgpkg: 0.19.1-1
2025-05-07 10:30:34 -04:00 · 2025-05-07 10:27:40 -04:00 · 2025-05-07 01:29:51 +00:00 · 2025-04-28 17:37:40 -04:00 · 2025-04-28 17:22:43 -04:00 · 2025-04-27 12:33:51 +12:00
4 changed files with 288 additions and 462 deletions
--- a/.SRCINFO
+++ b/.SRCINFO
@ -1,6 +1,6 @@
 pkgbase = gotosocial
 	pkgdesc = ActivityPub social network server written in Golang
-	pkgver = 0.18.1
+	pkgver = 0.19.1
 	pkgrel = 11
 	url = https://gotosocial.org
 	arch = x86_64
@ -13,11 +13,12 @@ pkgbase = gotosocial
 	depends = glibc
 	options = !lto
 	backup = etc/gotosocial/config.yaml
+	backup = etc/gotosocial/template/2fa.tmpl
 	backup = etc/gotosocial/template/404.tmpl
 	backup = etc/gotosocial/template/about.tmpl
 	backup = etc/gotosocial/template/authorize.tmpl
-	backup = etc/gotosocial/template/confirm_email.tmpl
-	backup = etc/gotosocial/template/confirmed_email.tmpl
+	backup = etc/gotosocial/template/confirm-email.tmpl
+	backup = etc/gotosocial/template/confirmed-email.tmpl
 	backup = etc/gotosocial/template/domain-blocklist.tmpl
 	backup = etc/gotosocial/template/email_confirm.tmpl
 	backup = etc/gotosocial/template/email_new_report.tmpl
@ -30,43 +31,48 @@ pkgbase = gotosocial
 	backup = etc/gotosocial/template/error.tmpl
 	backup = etc/gotosocial/template/finalize.tmpl
 	backup = etc/gotosocial/template/index.tmpl
-	backup = etc/gotosocial/template/index_apps.tmpl
 	backup = etc/gotosocial/template/index_register.tmpl
 	backup = etc/gotosocial/template/index_what_is_this.tmpl
+	backup = etc/gotosocial/template/login-info.tmpl
+	backup = etc/gotosocial/template/login_button.tmpl
+	backup = etc/gotosocial/template/maintenance.tmpl
 	backup = etc/gotosocial/template/oob.tmpl
 	backup = etc/gotosocial/template/page.tmpl
 	backup = etc/gotosocial/template/page_footer.tmpl
 	backup = etc/gotosocial/template/page_header.tmpl
 	backup = etc/gotosocial/template/page_ogmeta.tmpl
 	backup = etc/gotosocial/template/page_stylesheets.tmpl
+	backup = etc/gotosocial/template/profile-gallery.tmpl
 	backup = etc/gotosocial/template/profile.tmpl
+	backup = etc/gotosocial/template/profile_about_user.tmpl
 	backup = etc/gotosocial/template/profile_fields.tmpl
+	backup = etc/gotosocial/template/profile_header.tmpl
 	backup = etc/gotosocial/template/settings.tmpl
 	backup = etc/gotosocial/template/sign-in.tmpl
 	backup = etc/gotosocial/template/sign-up.tmpl
 	backup = etc/gotosocial/template/signed-up.tmpl
 	backup = etc/gotosocial/template/status.tmpl
-	backup = etc/gotosocial/template/status_attachments.tmpl
+	backup = etc/gotosocial/template/status_attachment.tmpl
 	backup = etc/gotosocial/template/status_attributes.tmpl
 	backup = etc/gotosocial/template/status_header.tmpl
 	backup = etc/gotosocial/template/status_info.tmpl
 	backup = etc/gotosocial/template/status_poll.tmpl
 	backup = etc/gotosocial/template/tag.tmpl
 	backup = etc/gotosocial/template/thread.tmpl
-	source = gotosocial::git+https://github.com/superseriousbusiness/gotosocial#tag=v0.18.1
+	source = gotosocial::git+https://github.com/superseriousbusiness/gotosocial#tag=v0.19.1
 	source = sysusers.conf
 	source = tmpfiles.conf
 	source = use-fhs-directories.patch
-	source = support-unix-sockets.patch
-	sha512sums = 74733f80ed011e3a3cad455ae35a931eb93b051cf493e5f87341d8f9a47f416e6886cc769b4ffeb623536466ff72932f3384c62da5348285801ddfe8107fc063
-	sha512sums = 68890539a1285a819d5a2cd755aeabd59a9872926d9c32e5d54faaf2771414f006e568f2f813f3c6fcd9dbeda7b6e57c924d7490521880cb65632e02fabcbd63
+	source = modded.patch
+	sha512sums = cab294e99184ec25888101e04e5753ab9f042711662258e0155619e071750a364f102132682aa44e95fba7a9c10ca3cf00da18537406f8bdfa4ec95e2a74663d
+	sha512sums = 2ff5499a31e12733cb20a9261942ed135fbac327d5a836b8955f3e86c009a603cf965440d9dbe6db64b80d0f652ba56faddb0ef398393b72474d8cf6c438ab80
 	sha512sums = b89fad3073e140f17167515b38942e5b5e2bc2aee03c484e1bb7cf6444f86cb1e2a13a60b101e04d22633d348be073ca26cd309da4746e5062c12b4f3ce4b38a
 	sha512sums = 913a5209487aba06bf1d8ac7c02506a05d01a8e12f172666c84bf6870d6237640d4745617b0f07ea8c9dcf665f4e0d24a0aabef31611909f7e9384ed6e7b7e77
-	sha512sums = 5cd0f4f325c452f311e5187147a0d91bae5b2537f329a087e6bc8618317021dbf2d80d7c42d135946ce2399223bebfa4988d856bdba730a20084ce9c21f77990
-	b2sums = eb0e91b9e7196c93a4e1eddf5eba448951ae9cb38cf599dfe87c182235f666a5f89deb28819ddcaf70c3cb0f0a1ed90ef05dbac4b23972ec05645cd6f23eaf29
-	b2sums = 0a5be7ac18af882c0c89d8e930eb76c2e60bc2c1d5a375ab04e987c7de9a7a3175319c4e5fbc818261141daf5f70d583aebcc2dc197fe3a88047fbfe488ccb94
+	sha512sums = 7a9837521e4765d3b6b509876ccf19a89de6dcafa69e82e436d1c26ca98e416ec012e5323c2d446ef92288821d0c64669076ebe647f72dba4d4d51fc63ffd847
+	b2sums = 773c579ec4f504141dbae393dcaf6cd2b9669f8338d4f01d546def27c05f5899b12b3f7287bcf229743a11335597d6cadd8bc803e076f3558848dcd808d80277
+	b2sums = ccf672731b88fc6700b0b81737790365e1eea0066bad1bbf6b13dac1e5b42af69063838efca47a6d9c16ee3f6308e2e23b92cf79d4226cd88f8551fb7361649b
 	b2sums = 4f65af952441c0f54bb32049a149675e207f8993678423d369c4095c57476464614ac720eccc64d7a93a81268ad7ca41cae75ca7211bd7b78f9035f6e5341f04
 	b2sums = 9edd4520fb99856feb82d01935588add7f805aa180f2ed0fe169cb26576bc2e1d2c1e6ab11604d977cec6a4ad8f1d5be1413e1a366de59b89c5b869136538f8c
-	b2sums = a2ae0a592608bb66784c704a076ceacd3f96b81006354a02da33d1292125f5e4e96c35472206cd2c998a9bc0eb2f191ccc66be69eb1397d8aa3eee145c9e7a7a
+	b2sums = 9958c7a20249ced130963fd5cfc9c8750ee4b98554a404f62d2d488298008a7e891bc136fab2373bdbb82534881e8407430f08ff519138fb649e93052e197c11

 pkgname = gotosocial
--- a/38
+++ b/38
@ -3,7 +3,7 @@
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>

 pkgname=gotosocial
-pkgver=0.18.1
+pkgver=0.19.1
 pkgrel=11
 pkgdesc='ActivityPub social network server written in Golang'
 arch=('x86_64')
@ -14,11 +14,12 @@ makedepends=('git' 'go' 'yarn' 'nodejs' 'go-swagger')
 options=('!lto')
 backup=(
  'etc/gotosocial/config.yaml'
+  'etc/gotosocial/template/2fa.tmpl'
  'etc/gotosocial/template/404.tmpl'
  'etc/gotosocial/template/about.tmpl'
  'etc/gotosocial/template/authorize.tmpl'
-  'etc/gotosocial/template/confirm_email.tmpl'
-  'etc/gotosocial/template/confirmed_email.tmpl'
+  'etc/gotosocial/template/confirm-email.tmpl'
+  'etc/gotosocial/template/confirmed-email.tmpl'
  'etc/gotosocial/template/domain-blocklist.tmpl'
  'etc/gotosocial/template/email_confirm.tmpl'
  'etc/gotosocial/template/email_new_report.tmpl'
@ -31,23 +32,28 @@ backup=(
  'etc/gotosocial/template/error.tmpl'
  'etc/gotosocial/template/finalize.tmpl'
  'etc/gotosocial/template/index.tmpl'
-  'etc/gotosocial/template/index_apps.tmpl'
  'etc/gotosocial/template/index_register.tmpl'
  'etc/gotosocial/template/index_what_is_this.tmpl'
+  'etc/gotosocial/template/login-info.tmpl'
+  'etc/gotosocial/template/login_button.tmpl'
+  'etc/gotosocial/template/maintenance.tmpl'
  'etc/gotosocial/template/oob.tmpl'
  'etc/gotosocial/template/page.tmpl'
  'etc/gotosocial/template/page_footer.tmpl'
  'etc/gotosocial/template/page_header.tmpl'
  'etc/gotosocial/template/page_ogmeta.tmpl'
  'etc/gotosocial/template/page_stylesheets.tmpl'
+  'etc/gotosocial/template/profile-gallery.tmpl'
  'etc/gotosocial/template/profile.tmpl'
+  'etc/gotosocial/template/profile_about_user.tmpl'
  'etc/gotosocial/template/profile_fields.tmpl'
+  'etc/gotosocial/template/profile_header.tmpl'
  'etc/gotosocial/template/settings.tmpl'
  'etc/gotosocial/template/sign-in.tmpl'
  'etc/gotosocial/template/sign-up.tmpl'
  'etc/gotosocial/template/signed-up.tmpl'
  'etc/gotosocial/template/status.tmpl'
-  'etc/gotosocial/template/status_attachments.tmpl'
+  'etc/gotosocial/template/status_attachment.tmpl'
  'etc/gotosocial/template/status_attributes.tmpl'
  'etc/gotosocial/template/status_header.tmpl'
  'etc/gotosocial/template/status_info.tmpl'
@ -60,24 +66,18 @@ source=(
  'sysusers.conf'
  'tmpfiles.conf'
  'use-fhs-directories.patch'
-  'support-unix-sockets.patch'
+  'modded.patch'
 )
-sha512sums=('74733f80ed011e3a3cad455ae35a931eb93b051cf493e5f87341d8f9a47f416e6886cc769b4ffeb623536466ff72932f3384c62da5348285801ddfe8107fc063'
-            '68890539a1285a819d5a2cd755aeabd59a9872926d9c32e5d54faaf2771414f006e568f2f813f3c6fcd9dbeda7b6e57c924d7490521880cb65632e02fabcbd63'
+sha512sums=('cab294e99184ec25888101e04e5753ab9f042711662258e0155619e071750a364f102132682aa44e95fba7a9c10ca3cf00da18537406f8bdfa4ec95e2a74663d'
+            '2ff5499a31e12733cb20a9261942ed135fbac327d5a836b8955f3e86c009a603cf965440d9dbe6db64b80d0f652ba56faddb0ef398393b72474d8cf6c438ab80'
            'b89fad3073e140f17167515b38942e5b5e2bc2aee03c484e1bb7cf6444f86cb1e2a13a60b101e04d22633d348be073ca26cd309da4746e5062c12b4f3ce4b38a'
            '913a5209487aba06bf1d8ac7c02506a05d01a8e12f172666c84bf6870d6237640d4745617b0f07ea8c9dcf665f4e0d24a0aabef31611909f7e9384ed6e7b7e77'
-            '5cd0f4f325c452f311e5187147a0d91bae5b2537f329a087e6bc8618317021dbf2d80d7c42d135946ce2399223bebfa4988d856bdba730a20084ce9c21f77990')
-b2sums=('eb0e91b9e7196c93a4e1eddf5eba448951ae9cb38cf599dfe87c182235f666a5f89deb28819ddcaf70c3cb0f0a1ed90ef05dbac4b23972ec05645cd6f23eaf29'
-        '0a5be7ac18af882c0c89d8e930eb76c2e60bc2c1d5a375ab04e987c7de9a7a3175319c4e5fbc818261141daf5f70d583aebcc2dc197fe3a88047fbfe488ccb94'
+            '7a9837521e4765d3b6b509876ccf19a89de6dcafa69e82e436d1c26ca98e416ec012e5323c2d446ef92288821d0c64669076ebe647f72dba4d4d51fc63ffd847')
+b2sums=('773c579ec4f504141dbae393dcaf6cd2b9669f8338d4f01d546def27c05f5899b12b3f7287bcf229743a11335597d6cadd8bc803e076f3558848dcd808d80277'
+        'ccf672731b88fc6700b0b81737790365e1eea0066bad1bbf6b13dac1e5b42af69063838efca47a6d9c16ee3f6308e2e23b92cf79d4226cd88f8551fb7361649b'
        '4f65af952441c0f54bb32049a149675e207f8993678423d369c4095c57476464614ac720eccc64d7a93a81268ad7ca41cae75ca7211bd7b78f9035f6e5341f04'
        '9edd4520fb99856feb82d01935588add7f805aa180f2ed0fe169cb26576bc2e1d2c1e6ab11604d977cec6a4ad8f1d5be1413e1a366de59b89c5b869136538f8c'
-        'a2ae0a592608bb66784c704a076ceacd3f96b81006354a02da33d1292125f5e4e96c35472206cd2c998a9bc0eb2f191ccc66be69eb1397d8aa3eee145c9e7a7a')
-
-pkgver() {
-  cd "$pkgname"
-
-  git describe --tags | sed 's/^v//'
-}
+        '9958c7a20249ced130963fd5cfc9c8750ee4b98554a404f62d2d488298008a7e891bc136fab2373bdbb82534881e8407430f08ff519138fb649e93052e197c11')

 prepare() {
  cd "$pkgname"
@ -85,7 +85,7 @@ prepare() {
  # create directory for build output
  mkdir build

-  patch -p1 -i "$srcdir/support-unix-sockets.patch"
+  patch -p1 -i "$srcdir/modded.patch"
  # download dependencies
  export GOPATH="${srcdir}"
  go mod download
--- a/support-unix-sockets.patch
+++ b/support-unix-sockets.patch
@ -1,13 +1,5 @@
-From 81a5c46ffe501341d942a2be7931b7c6b5ce9571 Mon Sep 17 00:00:00 2001
-From: Balakrishnan Balasubramanian <git.user@balki.me>
-Date: Thu, 9 May 2024 00:04:42 -0400
-Subject: [PATCH 1/2] Support listening on unix sockets
-
-1. bind-address now accepts unix socket paths
-2. Add config option trusted-platform
-
 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: ""
@ -49,11 +41,36 @@ index 2b3a873fb..52615a345 100644
 # Default: ""
 db-address: ""
 
+diff --git a/go.mod b/go.mod
+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.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.35.0
+diff --git a/go.sum b/go.sum
+index 597cee716..532e99852 100644
+--- a/go.sum
+++ b/go.sum
+@@ -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=
+go.balki.me/anyhttp v0.5.0/go.mod h1:JhfekOIjgVODoVqUCficjpIgmB3wwlB7jhN0eN2EZ/s=
+ go.mongodb.org/mongo-driver v1.17.3 h1:TQyXhnsWfWtgAhMtOgtYHMTkZIfBTpMTsMnd9ZBeHxQ=
+ 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 8ce2105b4..fa90aad80 100644
+index b9804d404..331d41139 100644
 --- a/internal/config/config.go
 +++ b/internal/config/config.go
-@@ -59,6 +59,7 @@ type Configuration struct {
+@@ -58,6 +58,7 @@ type Configuration struct {
 	BindAddress        string   `name:"bind-address" usage:"Bind address to use for the GoToSocial server (eg., 0.0.0.0, 172.138.0.9, [::], localhost). For ipv6, enclose the address in square brackets, eg [2001:db8::fed1]. Default binds to all interfaces."`
 	Port               int      `name:"port" usage:"Port to use for GoToSocial. Change this to 443 if you're running the binary directly on the host machine."`
 	TrustedProxies     []string `name:"trusted-proxies" usage:"Proxies to trust when parsing x-forwarded headers into real IPs."`
@ -61,11 +78,31 @@ index 8ce2105b4..fa90aad80 100644
 	SoftwareVersion    string   `name:"software-version" usage:""`
 
 	DbType                     string        `name:"db-type" usage:"Database type: eg., postgres"`
+@@ -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'."`
+
+	KalaclistaAllowedUnauthorizedGet bool `name:"kalaclista-allowed-unauthorized-get" usage:"unlock AUTHOZIED_FETCH (aka Secure mode in Mastodon) mode."`
+ }
+ 
+ type HTTPClientConfiguration struct {
+diff --git a/internal/config/defaults.go b/internal/config/defaults.go
+index 57c64db44..c19864002 100644
+--- a/internal/config/defaults.go
+++ b/internal/config/defaults.go
+@@ -234,4 +234,6 @@
+ 	RequestIDHeader: "X-Request-Id",
+ 
+ 	LogClientIP: true,
+
+	KalaclistaAllowedUnauthorizedGet: false,
+ }
 diff --git a/internal/config/helpers.gen.go b/internal/config/helpers.gen.go
-index 156c19fd5..a3c09fe8b 100644
+index f063cbf93..cdb5a663f 100644
 --- a/internal/config/helpers.gen.go
 +++ b/internal/config/helpers.gen.go
-@@ -351,6 +351,31 @@ func GetTrustedProxies() []string { return global.GetTrustedProxies() }
+@@ -350,6 +350,31 @@ func GetTrustedProxies() []string { return global.GetTrustedProxies() }
 // SetTrustedProxies safely sets the value for global configuration 'TrustedProxies' field
 func SetTrustedProxies(v []string) { global.SetTrustedProxies(v) }
 
@ -97,8 +134,122 @@ index 156c19fd5..a3c09fe8b 100644
 // GetSoftwareVersion safely fetches the Configuration value for state's 'SoftwareVersion' field
 func (st *ConfigState) GetSoftwareVersion() (v string) {
 	st.mutex.RLock()
+@@ -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) }
+
+// GetKalaclistaAllowedUnauthorizedGet safely fetches the Configuration value for state's 'KalaclistaAllowedUnauthorizedGet' field
+func (st *ConfigState) GetKalaclistaAllowedUnauthorizedGet() (v bool) {
+	st.mutex.RLock()
+	v = st.config.KalaclistaAllowedUnauthorizedGet
+	st.mutex.RUnlock()
+	return
+}
+
+// SetKalaclistaAllowedUnauthorizedGet safely sets the Configuration value for state's 'KalaclistaAllowedUnauthorizedGet' field
+func (st *ConfigState) SetKalaclistaAllowedUnauthorizedGet(v bool) {
+	st.mutex.Lock()
+	defer st.mutex.Unlock()
+	st.config.KalaclistaAllowedUnauthorizedGet = v
+	st.reloadToViper()
+}
+
+// KalaclistaAllowedUnauthorizedGetFlag returns the flag name for the 'KalaclistaAllowedUnauthorizedGet' field
+func KalaclistaAllowedUnauthorizedGetFlag() string { return "kalaclista-allowed-unauthorized-get" }
+
+// GetKalaclistaAllowedUnauthorizedGet safely fetches the value for global configuration 'KalaclistaAllowedUnauthorizedGet' field
+func GetKalaclistaAllowedUnauthorizedGet() bool { return global.GetKalaclistaAllowedUnauthorizedGet() }
+
+// 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 9059aef39..6e9a22b59 100644
+--- a/internal/processing/fedi/common.go
+++ b/internal/processing/fedi/common.go
+@@ -20,8 +20,10 @@
+ import (
+ 	"context"
+ 	"errors"
+	"net/http"
+ 	"net/url"
+ 
+	"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)
+ 	if errWithCode != nil {
+		if config.GetKalaclistaAllowedUnauthorizedGet() && errWithCode.Code() == http.StatusUnauthorized {
+			return &commonAuth{
+				receivingAcct: receiver,
+			}, nil
+		}
+
+ 		return nil, errWithCode
+ 	}
+ 
+diff --git a/internal/processing/fedi/emoji.go b/internal/processing/fedi/emoji.go
+index 8db8b48ea..d7e503f7d 100644
+--- a/internal/processing/fedi/emoji.go
+++ b/internal/processing/fedi/emoji.go
+@@ -20,14 +20,20 @@
+ import (
+ 	"context"
+ 	"fmt"
+	"net/http"
+ 
+ 	"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.
+ func (p *Processor) EmojiGet(ctx context.Context, requestedEmojiID string) (interface{}, gtserror.WithCode) {
+ 	if _, errWithCode := p.federator.AuthenticateFederatedRequest(ctx, ""); errWithCode != nil {
+		if !(config.GetKalaclistaAllowedUnauthorizedGet() && errWithCode.Code() == http.StatusUnauthorized) {
+			return nil, errWithCode
+		}
+
+ 		return nil, errWithCode
+ 	}
+ 
+diff --git a/internal/processing/fedi/user.go b/internal/processing/fedi/user.go
+index 53dfd6022..7d976a523 100644
+--- a/internal/processing/fedi/user.go
+++ b/internal/processing/fedi/user.go
+@@ -21,9 +21,11 @@
+ 	"context"
+ 	"errors"
+ 	"fmt"
+	"net/http"
+ 	"net/url"
+ 
+ 	"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)
+ 	if errWithCode != nil {
+		if config.GetKalaclistaAllowedUnauthorizedGet() && errWithCode.Code() == http.StatusUnauthorized {
+			person, err := p.converter.AccountToAS(ctx, receiver)
+			if err != nil {
+				err := gtserror.Newf("error converting account: %w", err)
+				return nil, gtserror.NewErrorInternalError(err)
+			}
+
+			return data(person)
+		}
+ 		return nil, errWithCode // likely 401
+ 	}
+ 
 diff --git a/internal/router/router.go b/internal/router/router.go
-index c2bf18b4f..73bfc8e96 100644
+index 45419807d..7ef90e297 100644
 --- a/internal/router/router.go
 +++ b/internal/router/router.go
@@ -23,6 +23,7 @@
@ -108,11 +259,11 @@ index c2bf18b4f..73bfc8e96 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"
 )
@ -142,9 +293,9 @@ index c2bf18b4f..73bfc8e96 100644
 		}
 
 +	// TLS handled by reverse proxy connecting using unix socket
-+	case strings.HasPrefix(bindAddr, "unix/"):
+	case strings.HasPrefix(bindAddr, "unix?"):
 +		listen, err = func() (func() error, error) {
-+			_, listener, err := anyhttp.GetListener(bindAddr)
+			listener, _, _, err := anyhttp.GetListener(bindAddr)
 +			if err != nil {
 +				return nil, err
 +			}
@ -365,10 +516,10 @@ index 000000000..ad2653ac1
 +   limitations under the License.
 diff --git a/vendor/go.balki.me/anyhttp/README.md b/vendor/go.balki.me/anyhttp/README.md
 new file mode 100644
-index 000000000..7e9b11922
+index 000000000..85bce6fc3
 --- /dev/null
 +++ b/vendor/go.balki.me/anyhttp/README.md
-@@ -0,0 +1,77 @@
+@@ -0,0 +1,80 @@
 +Create http server listening on unix sockets and systemd socket activated fds
 +
 +## Quick Usage
@ -388,56 +539,57 @@ index 000000000..7e9b11922
 +
 +Syntax
 +
-+    unix/<path to socket>
+    unix?path=<socket_path>&mode=<socket file mode>&remove_existing=<true|false>
 +
 +Examples
 +
-+    unix/relative/path.sock
-+    unix//var/run/app/absolutepath.sock
+    unix?path=relative/path.sock
+    unix?path=/var/run/app/absolutepath.sock
+    unix?path=/run/app.sock&mode=600&remove_existing=false
+
+| option          | description                                    | default  |
+|-----------------|------------------------------------------------|----------|
+| path            | path to unix socket                            | Required |
+| mode            | socket file mode                               | 666      |
+| remove_existing | Whether to remove existing socket file or fail | true     |
 +
 +### Systemd Socket activated fd:
 +
 +Syntax
 +
-+    sysd/fdidx/<fd index starting at 0>
-+    sysd/fdname/<fd name set using FileDescriptorName socket setting >
+    sysd?idx=<fd index>&name=<fd name>&check_pid=<true|false>&unset_env=<true|false>&idle_timeout=<duration>
+
+Only one of `idx` or `name` has to be set
 +
 +Examples:
-+    
+
 +    # First (or only) socket fd passed to app
-+    sysd/fdidx/0
+    sysd?idx=0
 +
 +    # Socket with FileDescriptorName
-+    sysd/fdname/myapp
+    sysd?name=myapp
 +
-+    # Using default name
-+    sysd/fdname/myapp.socket
+    # Using default name and auto shutdown if no requests received in last 30 minutes
+    sysd?name=myapp.socket&idle_timeout=30m
 +
-+### TCP port
+| option       | description                                                                                | default          |
+|--------------|--------------------------------------------------------------------------------------------|------------------|
+| name         | Name configured via FileDescriptorName or socket file name                                 | Required         |
+| idx          | FD Index. Actual fd num will be 3 + idx                                                    | Required         |
+| idle_timeout | time to wait before shutdown. [syntax][0]                                                  | no auto shutdown |
+| check_pid    | Check process PID matches LISTEN_PID                                                       | true             |
+| unset_env    | Unsets the LISTEN\* environment variables, so they don't get passed to any child processes | true             |
 +
-+If the address is a number less than 65536, it is assumed as a port and passed
-+as `http.ListenAndServe(":<port>",...)` Anything else is directly passed to
-+`http.ListenAndServe` as well. Below examples should work
+### TCP
+
+If the address is not one of above, it is assumed to be tcp and passed to `http.ListenAndServe`.
+
+Examples:
 +
 +    :http
 +    :8888
 +    127.0.0.1:8080
 +
-+## Idle server auto shutdown
-+
-+When using systemd socket activation, idle servers can be shut down to save on
-+resources.  They will be restarted with socket activation when new request
-+arrives. Quick example for the case. (Error checking skipped for brevity)
-+
-+```go
-+addrType, httpServer, done, _ := anyhttp.Serve(addr, idle.WrapHandler(nil))
-+if addrType == anyhttp.SystemdFD {
-+    idle.Wait(30 * time.Minute)
-+    httpServer.Shutdown(context.TODO())
-+}
-+<-done
-+```
-+
 +## Documentation
 +
 +https://pkg.go.dev/go.balki.me/anyhttp
@ -446,35 +598,42 @@ index 000000000..7e9b11922
 +
 +  * https://gist.github.com/teknoraver/5ffacb8757330715bcbcc90e6d46ac74#file-unixhttpd-go
 +  * https://github.com/coreos/go-systemd/tree/main/activation
+
+[0]: https://pkg.go.dev/time#ParseDuration
 diff --git a/vendor/go.balki.me/anyhttp/anyhttp.go b/vendor/go.balki.me/anyhttp/anyhttp.go
 new file mode 100644
-index 000000000..5c0615442
+index 000000000..8d316a78f
 --- /dev/null
 +++ b/vendor/go.balki.me/anyhttp/anyhttp.go
-@@ -0,0 +1,269 @@
+@@ -0,0 +1,440 @@
 +// Package anyhttp has helpers to serve http from unix sockets and systemd socket activated fds
 +package anyhttp
 +
 +import (
+	"context"
 +	"errors"
 +	"fmt"
 +	"io/fs"
 +	"net"
 +	"net/http"
+	"net/url"
 +	"os"
 +	"strconv"
 +	"strings"
 +	"sync"
 +	"syscall"
+	"time"
+
+	"go.balki.me/anyhttp/idle"
 +)
 +
 +// AddressType of the address passed
 +type AddressType string
 +
 +var (
-+	// UnixSocket - address is a unix socket, e.g. unix//run/foo.sock
+	// UnixSocket - address is a unix socket, e.g. unix?path=/run/foo.sock
 +	UnixSocket AddressType = "UnixSocket"
-+	// SystemdFD - address is a systemd fd, e.g. sysd/fdname/myapp.socket
+	// SystemdFD - address is a systemd fd, e.g. sysd?name=myapp.socket
 +	SystemdFD AddressType = "SystemdFD"
 +	// TCP - address is a TCP address, e.g. :1234
 +	TCP AddressType = "TCP"
@ -551,6 +710,8 @@ index 000000000..5c0615442
 +	CheckPID bool
 +	// Unsets the LISTEN* environment variables, so they don't get passed to any child processes
 +	UnsetEnv bool
+	// Shutdown http server if no requests received for below timeout
+	IdleTimeout *time.Duration
 +}
 +
 +// DefaultSysdConfig has the default values for SysdConfig
@ -650,353 +811,34 @@ index 000000000..5c0615442
 +	return nil, errors.New("neither FDIndex nor FDName set")
 +}
 +
-+// GetListener gets a unix or systemd socket listener
-+func GetListener(addr string) (AddressType, net.Listener, error) {
-+	if strings.HasPrefix(addr, "unix/") {
-+		usc := NewUnixSocketConfig(strings.TrimPrefix(addr, "unix/"))
-+		l, err := usc.GetListener()
-+		return UnixSocket, l, err
-+	}
-+
-+	if strings.HasPrefix(addr, "sysd/fdidx/") {
-+		idx, err := strconv.Atoi(strings.TrimPrefix(addr, "sysd/fdidx/"))
-+		if err != nil {
-+			return Unknown, nil, fmt.Errorf("invalid fdidx, addr:%q err: %w", addr, err)
-+		}
-+		sysdc := NewSysDConfigWithFDIdx(idx)
-+		l, err := sysdc.GetListener()
-+		return SystemdFD, l, err
-+	}
-+
-+	if strings.HasPrefix(addr, "sysd/fdname/") {
-+		sysdc := NewSysDConfigWithFDName(strings.TrimPrefix(addr, "sysd/fdname/"))
-+		l, err := sysdc.GetListener()
-+		return SystemdFD, l, err
-+	}
-+
-+	if port, err := strconv.Atoi(addr); err == nil {
-+		if port > 0 && port < 65536 {
-+			addr = fmt.Sprintf(":%v", port)
-+		} else {
-+			return Unknown, nil, fmt.Errorf("invalid port: %v", port)
-+		}
-+	}
-+
-+	if addr == "" {
-+		addr = ":http"
-+	}
-+
-+	l, err := net.Listen("tcp", addr)
-+	return TCP, l, err
-+}
-+
-+// Serve creates and serve a http server.
-+func Serve(addr string, h http.Handler) (AddressType, *http.Server, <-chan error, error) {
-+	addrType, listener, err := GetListener(addr)
-+	if err != nil {
-+		return addrType, nil, nil, err
-+	}
-+	srv := &http.Server{Handler: h}
-+	done := make(chan error)
-+	go func() {
-+		done <- srv.Serve(listener)
-+		close(done)
-+	}()
-+	return addrType, srv, done, nil
-+}
-+
-+// ListenAndServe is the drop-in replacement for `http.ListenAndServe`.
-+// Supports unix and systemd sockets in addition
-+func ListenAndServe(addr string, h http.Handler) error {
-+	_, _, done, err := Serve(addr, h)
-+	if err != nil {
-+		return err
-+	}
-+	return <-done
-+}
-+
-+// UnsetSystemdListenVars unsets the LISTEN* environment variables so they are not passed to any child processes
-+func UnsetSystemdListenVars() {
-+	_ = os.Unsetenv("LISTEN_PID")
-+	_ = os.Unsetenv("LISTEN_FDS")
-+	_ = os.Unsetenv("LISTEN_FDNAMES")
-+}
-diff --git a/vendor/modules.txt b/vendor/modules.txt
-index 8c52d8949..dfb915c88 100644
--- a/vendor/modules.txt
-+++ b/vendor/modules.txt
-@@ -961,6 +961,9 @@ github.com/yuin/goldmark/renderer
- github.com/yuin/goldmark/renderer/html
- github.com/yuin/goldmark/text
- github.com/yuin/goldmark/util
-+# go.balki.me/anyhttp v0.3.0
-+## explicit; go 1.20
-+go.balki.me/anyhttp
- # go.mongodb.org/mongo-driver v1.14.0
- ## explicit; go 1.18
- go.mongodb.org/mongo-driver/bson
-- 
-2.48.1
-
-
-From d2de56e788b1660b404b50e99371937e9aa5128c Mon Sep 17 00:00:00 2001
-From: Balakrishnan Balasubramanian <git.user@balki.me>
-Date: Tue, 25 Feb 2025 17:35:39 -0500
-Subject: [PATCH 2/2] Update anyhttp
-
-Run go mod tidy
-Run go mod vendor
-Update GetListener function
-
-diff --git a/go.mod b/go.mod
-index 1dff4fe44..51f014ba4 100644
--- a/go.mod
-+++ b/go.mod
-@@ -70,6 +70,7 @@ require (
- 	github.com/uptrace/bun/extra/bunotel v1.2.9
- 	github.com/wagslane/go-password-validator v0.3.0
- 	github.com/yuin/goldmark v1.7.8
-+	go.balki.me/anyhttp v0.5.0
- 	go.opentelemetry.io/otel v1.34.0
- 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0
- 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0
-diff --git a/go.sum b/go.sum
-index d1713cceb..18e258500 100644
--- a/go.sum
-+++ b/go.sum
-@@ -619,6 +619,8 @@ github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic=
- github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
- gitlab.com/NyaaaWhatsUpDoc/sqlite v1.35.0-concurrency-workaround h1:rSPHdoNXzXyWQUUeMEy8pdOFn8lH7XqdBRTS9G+jdTg=
- gitlab.com/NyaaaWhatsUpDoc/sqlite v1.35.0-concurrency-workaround/go.mod h1:9cr2sicr7jIaWTBKQmAxQLfBv9LL0su4ZTEV+utt3ic=
-+go.balki.me/anyhttp v0.5.0 h1:uys0oRciBpZfwtxXAevScKy6amIQBXyDrcV0EtGF5zo=
-+go.balki.me/anyhttp v0.5.0/go.mod h1:JhfekOIjgVODoVqUCficjpIgmB3wwlB7jhN0eN2EZ/s=
- go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80=
- go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
- go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-diff --git a/internal/router/router.go b/internal/router/router.go
-index 73bfc8e96..97ee65847 100644
--- a/internal/router/router.go
-+++ b/internal/router/router.go
-@@ -164,9 +164,9 @@ func (r *Router) Start() error {
- 		}
- 
- 	// TLS handled by reverse proxy connecting using unix socket
-	case strings.HasPrefix(bindAddr, "unix/"):
-+	case strings.HasPrefix(bindAddr, "unix?"):
- 		listen, err = func() (func() error, error) {
-			_, listener, err := anyhttp.GetListener(bindAddr)
-+			listener, _, _, err := anyhttp.GetListener(bindAddr)
- 			if err != nil {
- 				return nil, err
- 			}
-diff --git a/vendor/go.balki.me/anyhttp/README.md b/vendor/go.balki.me/anyhttp/README.md
-index 7e9b11922..85bce6fc3 100644
--- a/vendor/go.balki.me/anyhttp/README.md
-+++ b/vendor/go.balki.me/anyhttp/README.md
-@@ -17,56 +17,57 @@ Just replace `http.ListenAndServe` with `anyhttp.ListenAndServe`.
- 
- Syntax
- 
-    unix/<path to socket>
-+    unix?path=<socket_path>&mode=<socket file mode>&remove_existing=<true|false>
- 
- Examples
- 
-    unix/relative/path.sock
-    unix//var/run/app/absolutepath.sock
-+    unix?path=relative/path.sock
-+    unix?path=/var/run/app/absolutepath.sock
-+    unix?path=/run/app.sock&mode=600&remove_existing=false
-+
-+| option          | description                                    | default  |
-+|-----------------|------------------------------------------------|----------|
-+| path            | path to unix socket                            | Required |
-+| mode            | socket file mode                               | 666      |
-+| remove_existing | Whether to remove existing socket file or fail | true     |
- 
- ### Systemd Socket activated fd:
- 
- Syntax
- 
-    sysd/fdidx/<fd index starting at 0>
-    sysd/fdname/<fd name set using FileDescriptorName socket setting >
-+    sysd?idx=<fd index>&name=<fd name>&check_pid=<true|false>&unset_env=<true|false>&idle_timeout=<duration>
-+
-+Only one of `idx` or `name` has to be set
- 
- Examples:
-    
-+
-     # First (or only) socket fd passed to app
-    sysd/fdidx/0
-+    sysd?idx=0
- 
-     # Socket with FileDescriptorName
-    sysd/fdname/myapp
-+    sysd?name=myapp
- 
-    # Using default name
-    sysd/fdname/myapp.socket
-+    # Using default name and auto shutdown if no requests received in last 30 minutes
-+    sysd?name=myapp.socket&idle_timeout=30m
- 
-### TCP port
-+| option       | description                                                                                | default          |
-+|--------------|--------------------------------------------------------------------------------------------|------------------|
-+| name         | Name configured via FileDescriptorName or socket file name                                 | Required         |
-+| idx          | FD Index. Actual fd num will be 3 + idx                                                    | Required         |
-+| idle_timeout | time to wait before shutdown. [syntax][0]                                                  | no auto shutdown |
-+| check_pid    | Check process PID matches LISTEN_PID                                                       | true             |
-+| unset_env    | Unsets the LISTEN\* environment variables, so they don't get passed to any child processes | true             |
- 
-If the address is a number less than 65536, it is assumed as a port and passed
-as `http.ListenAndServe(":<port>",...)` Anything else is directly passed to
-`http.ListenAndServe` as well. Below examples should work
-+### TCP
-+
-+If the address is not one of above, it is assumed to be tcp and passed to `http.ListenAndServe`.
-+
-+Examples:
- 
-     :http
-     :8888
-     127.0.0.1:8080
- 
-## Idle server auto shutdown
-
-When using systemd socket activation, idle servers can be shut down to save on
-resources.  They will be restarted with socket activation when new request
-arrives. Quick example for the case. (Error checking skipped for brevity)
-
-```go
-addrType, httpServer, done, _ := anyhttp.Serve(addr, idle.WrapHandler(nil))
-if addrType == anyhttp.SystemdFD {
-    idle.Wait(30 * time.Minute)
-    httpServer.Shutdown(context.TODO())
-}
-<-done
-```
-
- ## Documentation
- 
- https://pkg.go.dev/go.balki.me/anyhttp
-@@ -75,3 +76,5 @@ https://pkg.go.dev/go.balki.me/anyhttp
- 
-   * https://gist.github.com/teknoraver/5ffacb8757330715bcbcc90e6d46ac74#file-unixhttpd-go
-   * https://github.com/coreos/go-systemd/tree/main/activation
-+
-+[0]: https://pkg.go.dev/time#ParseDuration
-diff --git a/vendor/go.balki.me/anyhttp/anyhttp.go b/vendor/go.balki.me/anyhttp/anyhttp.go
-index 5c0615442..8d316a78f 100644
--- a/vendor/go.balki.me/anyhttp/anyhttp.go
-+++ b/vendor/go.balki.me/anyhttp/anyhttp.go
-@@ -2,25 +2,30 @@
- package anyhttp
- 
- import (
-+	"context"
- 	"errors"
- 	"fmt"
- 	"io/fs"
- 	"net"
- 	"net/http"
-+	"net/url"
- 	"os"
- 	"strconv"
- 	"strings"
- 	"sync"
- 	"syscall"
-+	"time"
-+
-+	"go.balki.me/anyhttp/idle"
- )
- 
- // AddressType of the address passed
- type AddressType string
- 
- var (
-	// UnixSocket - address is a unix socket, e.g. unix//run/foo.sock
-+	// UnixSocket - address is a unix socket, e.g. unix?path=/run/foo.sock
- 	UnixSocket AddressType = "UnixSocket"
-	// SystemdFD - address is a systemd fd, e.g. sysd/fdname/myapp.socket
-+	// SystemdFD - address is a systemd fd, e.g. sysd?name=myapp.socket
- 	SystemdFD AddressType = "SystemdFD"
- 	// TCP - address is a TCP address, e.g. :1234
- 	TCP AddressType = "TCP"
-@@ -97,6 +102,8 @@ type SysdConfig struct {
- 	CheckPID bool
- 	// Unsets the LISTEN* environment variables, so they don't get passed to any child processes
- 	UnsetEnv bool
-+	// Shutdown http server if no requests received for below timeout
-+	IdleTimeout *time.Duration
- }
- 
- // DefaultSysdConfig has the default values for SysdConfig
-@@ -196,69 +203,86 @@ func (s *SysdConfig) GetListener() (net.Listener, error) {
- 	return nil, errors.New("neither FDIndex nor FDName set")
- }
- 
-// GetListener gets a unix or systemd socket listener
-func GetListener(addr string) (AddressType, net.Listener, error) {
-	if strings.HasPrefix(addr, "unix/") {
-		usc := NewUnixSocketConfig(strings.TrimPrefix(addr, "unix/"))
-		l, err := usc.GetListener()
-		return UnixSocket, l, err
-	}
 +// GetListener is low level function for use with non-http servers. e.g. tcp, smtp
 +// Caller should handle idle timeout if needed
 +func GetListener(addr string) (net.Listener, AddressType, any /* cfg */, error) {
- 
-	if strings.HasPrefix(addr, "sysd/fdidx/") {
-		idx, err := strconv.Atoi(strings.TrimPrefix(addr, "sysd/fdidx/"))
+
 +	addrType, unixSocketConfig, sysdConfig, perr := parseAddress(addr)
 +	if perr != nil {
 +		return nil, Unknown, nil, perr
 +	}
 +	if unixSocketConfig != nil {
 +		listener, err := unixSocketConfig.GetListener()
- 		if err != nil {
-			return Unknown, nil, fmt.Errorf("invalid fdidx, addr:%q err: %w", addr, err)
+		if err != nil {
 +			return nil, Unknown, nil, err
- 		}
-		sysdc := NewSysDConfigWithFDIdx(idx)
-		l, err := sysdc.GetListener()
-		return SystemdFD, l, err
-	}
-
-	if strings.HasPrefix(addr, "sysd/fdname/") {
-		sysdc := NewSysDConfigWithFDName(strings.TrimPrefix(addr, "sysd/fdname/"))
-		l, err := sysdc.GetListener()
-		return SystemdFD, l, err
-	}
-
-	if port, err := strconv.Atoi(addr); err == nil {
-		if port > 0 && port < 65536 {
-			addr = fmt.Sprintf(":%v", port)
-		} else {
-			return Unknown, nil, fmt.Errorf("invalid port: %v", port)
+		}
 +		return listener, addrType, unixSocketConfig, nil
 +	} else if sysdConfig != nil {
 +		listener, err := sysdConfig.GetListener()
 +		if err != nil {
 +			return nil, Unknown, nil, err
- 		}
+		}
 +		return listener, addrType, sysdConfig, nil
- 	}
-
- 	if addr == "" {
- 		addr = ":http"
- 	}
-
-	l, err := net.Listen("tcp", addr)
-	return TCP, l, err
+	}
+	if addr == "" {
+		addr = ":http"
+	}
 +	listener, err := net.Listen("tcp", addr)
 +	return listener, TCP, nil, err
- }
- 
-// Serve creates and serve a http server.
-func Serve(addr string, h http.Handler) (AddressType, *http.Server, <-chan error, error) {
-	addrType, listener, err := GetListener(addr)
+}
+
 +type ServerCtx struct {
 +	AddressType      AddressType
 +	Listener         net.Listener
@ -1017,17 +859,9 @@ index 5c0615442..8d316a78f 100644
 +
 +func (s *ServerCtx) Shutdown(ctx context.Context) error {
 +	err := s.Server.Shutdown(ctx)
- 	if err != nil {
-		return addrType, nil, nil, err
+	if err != nil {
 +		return err
- 	}
-	srv := &http.Server{Handler: h}
-	done := make(chan error)
-	go func() {
-		done <- srv.Serve(listener)
-		close(done)
-	}()
-	return addrType, srv, done, nil
+	}
 +	return <-s.Done
 +}
 +
@ -1039,17 +873,15 @@ index 5c0615442..8d316a78f 100644
 +// Serve creates and serves a HTTP server.
 +func Serve(addr string, h http.Handler) (*ServerCtx, error) {
 +	return serve(addr, h, "", "")
- }
- 
- // ListenAndServe is the drop-in replacement for `http.ListenAndServe`.
- // Supports unix and systemd sockets in addition
- func ListenAndServe(addr string, h http.Handler) error {
-	_, _, done, err := Serve(addr, h)
+}
+
+// ListenAndServe is the drop-in replacement for `http.ListenAndServe`.
+// Supports unix and systemd sockets in addition
+func ListenAndServe(addr string, h http.Handler) error {
 +	ctx, err := Serve(addr, h)
- 	if err != nil {
- 		return err
- 	}
-	return <-done
+	if err != nil {
+		return err
+	}
 +	return ctx.Wait()
 +}
 +
@ -1059,13 +891,14 @@ index 5c0615442..8d316a78f 100644
 +		return err
 +	}
 +	return ctx.Wait()
- }
- 
- // UnsetSystemdListenVars unsets the LISTEN* environment variables so they are not passed to any child processes
-@@ -267,3 +291,150 @@ func UnsetSystemdListenVars() {
- 	_ = os.Unsetenv("LISTEN_FDS")
- 	_ = os.Unsetenv("LISTEN_FDNAMES")
- }
+}
+
+// UnsetSystemdListenVars unsets the LISTEN* environment variables so they are not passed to any child processes
+func UnsetSystemdListenVars() {
+	_ = os.Unsetenv("LISTEN_PID")
+	_ = os.Unsetenv("LISTEN_FDS")
+	_ = os.Unsetenv("LISTEN_FDNAMES")
+}
 +
 +func parseAddress(addr string) (addrType AddressType, usc *UnixSocketConfig, sysc *SysdConfig, err error) {
 +	usc = nil
@ -1347,30 +1180,17 @@ index 000000000..ee3d81ff1
 +	return i.c
 +}
 diff --git a/vendor/modules.txt b/vendor/modules.txt
-index dfb915c88..bd7da894d 100644
+index 276f0f17c..ec3ecb43d 100644
 --- a/vendor/modules.txt
 +++ b/vendor/modules.txt
-@@ -466,8 +466,6 @@ github.com/microcosm-cc/bluemonday/css
- # github.com/miekg/dns v1.1.63
- ## explicit; go 1.19
- github.com/miekg/dns
-# github.com/minio/crc64nvme v1.0.0
-## explicit; go 1.22
- # github.com/minio/md5-simd v1.1.2
- ## explicit; go 1.14
- github.com/minio/md5-simd
-@@ -961,9 +959,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
-# go.balki.me/anyhttp v0.3.0
 +# go.balki.me/anyhttp v0.5.0
- ## explicit; go 1.20
- go.balki.me/anyhttp
+## explicit; go 1.20
+go.balki.me/anyhttp
 +go.balki.me/anyhttp/idle
- # go.mongodb.org/mongo-driver v1.14.0
+ # go.mongodb.org/mongo-driver v1.17.3
 ## explicit; go 1.18
 go.mongodb.org/mongo-driver/bson
-- 
-2.48.1
-
--- a/sysusers.conf
+++ b/sysusers.conf
@ -1 +1 @@
-u gotosocial - "gotosocial daemon user" /var/lib/gotosocial
+u! gotosocial - "gotosocial daemon user" /var/lib/gotosocial
Author	SHA1	Message	Date
Balakrishnan Balasubramanian	ddb049b558	update patch to 0.19.1	2025-05-07 10:30:34 -04:00
Balakrishnan Balasubramanian	d093e3fcb2	Merge remote-tracking branch 'aur/main'	2025-05-07 10:27:40 -04:00
George Rawlinson	3266938652	upgpkg: 0.19.1-1	2025-05-07 01:29:51 +00:00
Balakrishnan Balasubramanian	fef593f4aa	update patch to latest version	2025-04-28 17:37:40 -04:00
Balakrishnan Balasubramanian	7db82fad46	Merge remote-tracking branch 'aur/main'	2025-04-28 17:22:43 -04:00
George Rawlinson	e889e49d02	upgpkg: 0.19.0-1	2025-04-27 12:33:51 +12:00
Balakrishnan Balasubramanian	3894d3b818	Merge remote-tracking branch 'aur/main'	2025-03-21 21:41:41 -04:00
Jelle van der Waa	7179c0b2d8	upgpkg: 0.18.3-1	2025-03-21 20:36:18 +01:00
Balakrishnan Balasubramanian	85847aba04	Rename to modded patch	2025-03-14 16:54:14 -04:00
Balakrishnan Balasubramanian	0382f924da	Merge remote-tracking branch 'aur/main'	2025-03-14 16:48:34 -04:00
George Rawlinson	d64c8f34b6	upgpkg: 0.18.2-1	2025-03-13 20:19:46 +13:00
George Rawlinson	c6556d33f4	fix: switch to fully-locked sysuser account https://archlinux.org/todo/change-sysusers-to-fully-locked-system-accounts/	2025-03-04 12:37:51 +13:00
Jelle van der Waa	e0bad33f24	upgpkg: 0.18.1-1	2025-02-24 14:15:01 +01:00
Jelle van der Waa	d48988c207	upgpkg: 0.18.0-1	2025-02-23 10:09:07 +01:00
Jelle van der Waa	247cc9f5ec	upgpkg: 0.17.4-1	2025-02-15 11:00:26 +01:00