3f4123 was incomplete. fix it now.

fiatjaf · fiatjaf · commit 77eb800366ed · 2026-01-27T00:19:31.000-03:00
fixes #13 this time for real.
diff --git a/favorites/relay.go b/favorites/relay.go
@@ -21,6 +21,8 @@ var (
 )
 
 func Init() {
+	Relay = khatru.NewRelay()
+
 	if global.Settings.Favorites.Enabled {
 		// relay enabled
 		setupEnabled()
@@ -31,7 +33,6 @@ func Init() {
 }
 
 func setupDisabled() {
-	Relay = khatru.NewRelay()
 	global.CleanupRelay(Relay)
 
 	mux := http.NewServeMux()
@@ -46,8 +47,6 @@ func setupDisabled() {
 func setupEnabled() {
 	db := global.IL.Favorites
 
-	Relay = khatru.NewRelay()
-
 	Relay.ServiceURL = global.Settings.WSScheme() + global.Settings.Domain + "/" + global.Settings.Favorites.HTTPBasePath
 
 	Relay.ManagementAPI.ChangeRelayName = changeRelayNameHandler
diff --git a/inbox/relay.go b/inbox/relay.go
@@ -25,6 +25,8 @@ var (
 )
 
 func Init() {
+	Relay = khatru.NewRelay()
+
 	if global.Settings.Inbox.Enabled {
 		// relay enabled
 		setupEnabled()
@@ -35,7 +37,6 @@ func Init() {
 }
 
 func setupDisabled() {
-	Relay = khatru.NewRelay()
 	global.CleanupRelay(Relay)
 
 	mux := http.NewServeMux()
@@ -48,7 +49,6 @@ func setupDisabled() {
 }
 
 func setupEnabled() {
-	Relay = khatru.NewRelay()
 	Relay.ServiceURL = global.Settings.WSScheme() + global.Settings.Domain + "/" + global.Settings.Inbox.HTTPBasePath
 
 	Relay.ManagementAPI.ChangeRelayName = changeRelayNameHandler
diff --git a/internal/relay.go b/internal/relay.go
@@ -21,6 +21,8 @@ var (
 )
 
 func Init() {
+	Relay = khatru.NewRelay()
+
 	if global.Settings.Internal.Enabled {
 		// relay enabled
 		setupEnabled()
@@ -31,7 +33,6 @@ func Init() {
 }
 
 func setupDisabled() {
-	Relay = khatru.NewRelay()
 	global.CleanupRelay(Relay)
 
 	mux := http.NewServeMux()
@@ -46,8 +47,6 @@ func setupDisabled() {
 func setupEnabled() {
 	db := global.IL.Internal
 
-	Relay = khatru.NewRelay()
-
 	Relay.ServiceURL = global.Settings.WSScheme() + global.Settings.Domain + "/" + global.Settings.Internal.HTTPBasePath
 
 	Relay.ManagementAPI.ChangeRelayName = changeRelayNameHandler
diff --git a/moderated/relay.go b/moderated/relay.go
@@ -22,6 +22,8 @@ var (
 )
 
 func Init() {
+	Relay = khatru.NewRelay()
+
 	if global.Settings.Moderated.Enabled {
 		setupEnabled()
 	} else {
@@ -30,7 +32,6 @@ func Init() {
 }
 
 func setupDisabled() {
-	Relay = khatru.NewRelay()
 	global.CleanupRelay(Relay)
 
 	mux := http.NewServeMux()
@@ -43,8 +44,6 @@ func setupDisabled() {
 }
 
 func setupEnabled() {
-	Relay = khatru.NewRelay()
-
 	Relay.ServiceURL = global.Settings.WSScheme() + global.Settings.Domain + "/" + global.Settings.Moderated.HTTPBasePath
 
 	pk := global.Settings.RelayInternalSecretKey.Public()
diff --git a/personal/relay.go b/personal/relay.go
@@ -22,6 +22,8 @@ var (
 )
 
 func Init() {
+	Relay = khatru.NewRelay()
+
 	if global.Settings.Personal.Enabled {
 		setupEnabled()
 	} else {
@@ -30,7 +32,6 @@ func Init() {
 }
 
 func setupDisabled() {
-	Relay = khatru.NewRelay()
 	global.CleanupRelay(Relay)
 
 	mux := http.NewServeMux()
@@ -45,8 +46,6 @@ func setupDisabled() {
 func setupEnabled() {
 	db := global.IL.Personal
 
-	Relay = khatru.NewRelay()
-
 	Relay.ServiceURL = global.Settings.WSScheme() + global.Settings.Domain + "/" + global.Settings.Personal.HTTPBasePath
 
 	Relay.ManagementAPI.ChangeRelayName = changeRelayNameHandler
diff --git a/popular/relay.go b/popular/relay.go
@@ -21,6 +21,8 @@ var (
 )
 
 func Init() {
+	Relay = khatru.NewRelay()
+
 	if global.Settings.Popular.Enabled {
 		// relay enabled
 		setupEnabled()
@@ -31,7 +33,6 @@ func Init() {
 }
 
 func setupDisabled() {
-	Relay = khatru.NewRelay()
 	global.CleanupRelay(Relay)
 
 	mux := http.NewServeMux()
@@ -46,8 +47,6 @@ func setupDisabled() {
 func setupEnabled() {
 	db := global.IL.Popular
 
-	Relay = khatru.NewRelay()
-
 	Relay.ServiceURL = global.Settings.WSScheme() + global.Settings.Domain + "/" + global.Settings.Popular.HTTPBasePath
 
 	Relay.ManagementAPI.ChangeRelayName = changeRelayNameHandler

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ var (`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`func Init() {`
	`28`	`+ Relay = khatru.NewRelay()`
	`29`	`+`
`28`	`30`	`if global.Settings.Inbox.Enabled {`
`29`	`31`	`// relay enabled`
`30`	`32`	`setupEnabled()`
`@@ -35,7 +37,6 @@ func Init() {`
`35`	`37`	`}`
`36`	`38`
`37`	`39`	`func setupDisabled() {`
`38`		`- Relay = khatru.NewRelay()`
`39`	`40`	`global.CleanupRelay(Relay)`
`40`	`41`
`41`	`42`	`mux := http.NewServeMux()`
`@@ -48,7 +49,6 @@ func setupDisabled() {`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`func setupEnabled() {`
`51`		`- Relay = khatru.NewRelay()`
`52`	`52`	`Relay.ServiceURL = global.Settings.WSScheme() + global.Settings.Domain + "/" + global.Settings.Inbox.HTTPBasePath`
`53`	`53`
`54`	`54`	`Relay.ManagementAPI.ChangeRelayName = changeRelayNameHandler`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ var (`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`func Init() {`
	`25`	`+ Relay = khatru.NewRelay()`
	`26`	`+`
`25`	`27`	`if global.Settings.Moderated.Enabled {`
`26`	`28`	`setupEnabled()`
`27`	`29`	`} else {`
`@@ -30,7 +32,6 @@ func Init() {`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`func setupDisabled() {`
`33`		`- Relay = khatru.NewRelay()`
`34`	`35`	`global.CleanupRelay(Relay)`
`35`	`36`
`36`	`37`	`mux := http.NewServeMux()`
`@@ -43,8 +44,6 @@ func setupDisabled() {`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`func setupEnabled() {`
`46`		`- Relay = khatru.NewRelay()`
`47`		`-`
`48`	`47`	`Relay.ServiceURL = global.Settings.WSScheme() + global.Settings.Domain + "/" + global.Settings.Moderated.HTTPBasePath`
`49`	`48`
`50`	`49`	`pk := global.Settings.RelayInternalSecretKey.Public()`