From 242d01583f82aceeac988c94bfed817653af3cdf Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Sun, 28 Jan 2024 18:55:21 +0100
Subject: [PATCH] Use WebDomain as fallback redis prefix if none is set
 explicitly

---
 .../Core/Extensions/ServiceExtensions.cs         | 16 +++++++++-------
 Iceshrimp.Backend/configuration.ini              |  2 ++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Iceshrimp.Backend/Core/Extensions/ServiceExtensions.cs b/Iceshrimp.Backend/Core/Extensions/ServiceExtensions.cs
index 61959abc..4e27f3b5 100644
--- a/Iceshrimp.Backend/Core/Extensions/ServiceExtensions.cs
+++ b/Iceshrimp.Backend/Core/Extensions/ServiceExtensions.cs
@@ -70,16 +70,18 @@ public static class ServiceExtensions {
 	}
 
 	public static void AddRedis(this IServiceCollection services, IConfiguration configuration) {
-		var config = configuration.GetSection("Redis").Get<Config.RedisSection>();
-		if (config == null) throw new Exception("Failed to initialize redis: Failed to load configuration");
+		var instance = configuration.GetSection("Instance").Get<Config.InstanceSection>();
+		var redis    = configuration.GetSection("Redis").Get<Config.RedisSection>();
+		if (redis == null || instance == null)
+			throw new Exception("Failed to initialize redis: Failed to load configuration");
 		services.AddStackExchangeRedisCache(options => {
-			options.InstanceName = config.Prefix + ":";
+			options.InstanceName = redis.Prefix ?? instance.WebDomain + ":";
 			options.ConfigurationOptions = new ConfigurationOptions {
-				User            = config.Username,
-				Password        = config.Password,
-				DefaultDatabase = config.Database,
+				User            = redis.Username,
+				Password        = redis.Password,
+				DefaultDatabase = redis.Database,
 				EndPoints = new EndPointCollection {
-					{ config.Host, config.Port }
+					{ redis.Host, redis.Port }
 				}
 			};
 		});
diff --git a/Iceshrimp.Backend/configuration.ini b/Iceshrimp.Backend/configuration.ini
index 5d3c0be5..80a56ce4 100644
--- a/Iceshrimp.Backend/configuration.ini
+++ b/Iceshrimp.Backend/configuration.ini
@@ -1,5 +1,7 @@
 [Instance]
 ListenPort = 3000
+
+;; Caution: changing these settings after initial setup *will* break federation
 WebDomain = shrimp.example.org
 AccountDomain = example.org