From 541956d0e930fcfe22c53df0fc67807c8c24b9da Mon Sep 17 00:00:00 2001 From: LittleSheep Date: Thu, 5 Feb 2026 13:26:07 +0800 Subject: [PATCH] :art: Optimize code --- .env.testing.example | 43 ------------------- .../Startup/ServiceCollectionExtensions.cs | 11 ++--- .../Localization/JsonLocalizationService.cs | 12 +++--- .../Startup/ServiceCollectionExtensions.cs | 6 +-- .../Startup/ServiceCollectionExtensions.cs | 4 +- 5 files changed, 17 insertions(+), 59 deletions(-) delete mode 100644 .env.testing.example diff --git a/.env.testing.example b/.env.testing.example deleted file mode 100644 index 96651314..00000000 --- a/.env.testing.example +++ /dev/null @@ -1,43 +0,0 @@ -# ActivityPub Testing Environment Variables - -# Solar Network Configuration -SOLAR_DOMAIN=solar.local -SOLAR_PORT=5000 -SOLAR_URL=http://solar.local:5000 - -# Mastodon (Self-Hosted Test Instance) -MASTODON_DOMAIN=mastodon.local -MASTODON_PORT=3001 -MASTODON_STREAMING_PORT=4000 -MASTODON_URL=http://mastodon.local:3001 - -# Database -DB_CONNECTION_STRING=Host=localhost;Port=5432;Database=dyson_network;Username=postgres;Password=postgres - -# Test Accounts -SOLAR_TEST_USERNAME=solaruser -MASTODON_TEST_USERNAME=testuser -MASTODON_TEST_PASSWORD=TestPassword123! - -# ActivityPub Settings -ACTIVITYPUB_DOMAIN=solar.local -ACTIVITYPUB_ENABLE_FEDERATION=true -ACTIVITYPUB_SIGNATURE_ALGORITHM=rsa-sha256 - -# HTTP Settings -HTTP_TIMEOUT=30 -HTTP_MAX_RETRIES=3 - -# Logging -LOG_LEVEL=Debug -ACTIVITYPUB_LOG_LEVEL=Trace - -# Testing -TEST_SKIP_DATABASE_RESET=false -TEST_SKIP_MASTODON_SETUP=false -TEST_AUTO_ACCEPT_FOLLOWS=false - -# Development (only in dev environment) -DEV_DISABLE_SIGNATURE_VERIFICATION=false -DEV_LOG_HTTP_BODIES=false -DEV_DISABLE_CORS=false diff --git a/DysonNetwork.Pass/Startup/ServiceCollectionExtensions.cs b/DysonNetwork.Pass/Startup/ServiceCollectionExtensions.cs index 1a064270..2208e2e5 100644 --- a/DysonNetwork.Pass/Startup/ServiceCollectionExtensions.cs +++ b/DysonNetwork.Pass/Startup/ServiceCollectionExtensions.cs @@ -24,6 +24,7 @@ using DysonNetwork.Pass.Safety; using DysonNetwork.Shared.Cache; using DysonNetwork.Shared.Geometry; using DysonNetwork.Shared.Registry; +using DysonNetwork.Shared.Localization; namespace DysonNetwork.Pass.Startup; @@ -138,9 +139,9 @@ public static class ServiceCollectionExtensions { var assembly = System.Reflection.Assembly.GetExecutingAssembly(); var resourceNamespace = "DysonNetwork.Pass.Resources.Locales"; - return new DysonNetwork.Shared.Localization.JsonLocalizationService(assembly, resourceNamespace); + return new JsonLocalizationService(assembly, resourceNamespace); }); - services.AddScoped(sp => + services.AddScoped(sp => { var assembly = System.Reflection.Assembly.GetExecutingAssembly(); var resourceNamespace = "DysonNetwork.Pass.Resources.Templates"; @@ -166,18 +167,18 @@ public static class ServiceCollectionExtensions services.AddScoped(); services.AddScoped(); services.AddScoped(); - + services.AddScoped(); services.AddScoped(); services.AddScoped(); services.AddScoped(); - + services.Configure(configuration.GetSection("OidcProvider")); services.AddScoped(); services.AddScoped(); services.AddScoped(); - + services.AddHostedService(); return services; diff --git a/DysonNetwork.Shared/Localization/JsonLocalizationService.cs b/DysonNetwork.Shared/Localization/JsonLocalizationService.cs index 2ff9edaa..83f37af1 100644 --- a/DysonNetwork.Shared/Localization/JsonLocalizationService.cs +++ b/DysonNetwork.Shared/Localization/JsonLocalizationService.cs @@ -10,7 +10,7 @@ public class JsonLocalizationService : ILocalizationService private readonly Assembly _assembly; private readonly string _resourceNamespace; private readonly object _lock = new(); - private readonly List _availableLocales = new(); + private readonly List _availableLocales = []; public JsonLocalizationService(Assembly? assembly = null, string? resourceNamespace = null) { @@ -24,7 +24,7 @@ public class JsonLocalizationService : ILocalizationService var resourceNames = _assembly.GetManifestResourceNames(); var prefix = $"{_resourceNamespace}."; var suffix = ".json"; - + foreach (var resourceName in resourceNames) { if (resourceName.StartsWith(prefix) && resourceName.EndsWith(suffix)) @@ -135,7 +135,7 @@ public class JsonLocalizationService : ILocalizationService private Dictionary LoadLocale(string locale) { var resourceName = $"{_resourceNamespace}.{locale}.json"; - + using var stream = _assembly.GetManifestResourceStream(resourceName); if (stream == null) { @@ -144,7 +144,7 @@ public class JsonLocalizationService : ILocalizationService using var reader = new StreamReader(stream); var json = reader.ReadToEnd(); - + var root = JsonSerializer.Deserialize>(json); if (root == null) { @@ -199,14 +199,14 @@ public class JsonLocalizationService : ILocalizationService return entry.One; } } - + return entry.Other ?? entry.One ?? string.Empty; } private int? GetCountValue(object args) { if (args == null) return null; - + var type = args.GetType(); var countProperty = type.GetProperty("Count", BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase); if (countProperty != null) diff --git a/DysonNetwork.Sphere/Startup/ServiceCollectionExtensions.cs b/DysonNetwork.Sphere/Startup/ServiceCollectionExtensions.cs index 8646f4a1..c82e4f29 100644 --- a/DysonNetwork.Sphere/Startup/ServiceCollectionExtensions.cs +++ b/DysonNetwork.Sphere/Startup/ServiceCollectionExtensions.cs @@ -86,13 +86,13 @@ public static class ServiceCollectionExtensions public IServiceCollection AddAppBusinessServices(IConfiguration configuration ) { - services.AddSingleton(sp => + _ = services.AddSingleton(sp => { var assembly = System.Reflection.Assembly.GetExecutingAssembly(); var resourceNamespace = "DysonNetwork.Sphere.Resources.Locales"; - return new DysonNetwork.Shared.Localization.JsonLocalizationService(assembly, resourceNamespace); + return new Shared.Localization.JsonLocalizationService(assembly, resourceNamespace); }); - + services.Configure(configuration.GetSection("GeoIP")); services.Configure(configuration.GetSection("ActivityPubDelivery")); services.AddScoped(); diff --git a/DysonNetwork.Wallet/Startup/ServiceCollectionExtensions.cs b/DysonNetwork.Wallet/Startup/ServiceCollectionExtensions.cs index c8c51f30..b0dd9153 100644 --- a/DysonNetwork.Wallet/Startup/ServiceCollectionExtensions.cs +++ b/DysonNetwork.Wallet/Startup/ServiceCollectionExtensions.cs @@ -90,9 +90,9 @@ public static class ServiceCollectionExtensions { var assembly = System.Reflection.Assembly.GetExecutingAssembly(); var resourceNamespace = "DysonNetwork.Wallet.Resources.Locales"; - return new DysonNetwork.Shared.Localization.JsonLocalizationService(assembly, resourceNamespace); + return new Shared.Localization.JsonLocalizationService(assembly, resourceNamespace); }); - + services.Configure(configuration.GetSection("GeoIP")); services.AddScoped();