From 8930548f4411510fc3c2350ca83d1fbddc43a02e Mon Sep 17 00:00:00 2001
From: Lightczx <1686188646@qq.com>
Date: Sun, 18 Feb 2024 09:19:09 +0800
Subject: [PATCH] code style

---
 .../Snap.Hutao/Resource/Localization/SH.resx  |  3 +++
 .../Service/Discord/DiscordService.cs         | 25 +++++++------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
index 1a90fc7f..8e91eb72 100644
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
@@ -824,6 +824,9 @@
   <data name="ServiceDailyNoteNotifierTransformerHint" xml:space="preserve">
     <value>参量质变仪已准备完成</value>
   </data>
+  <data name="ServiceDiscordActivityElevationRequiredHint" xml:space="preserve">
+    <value>权限不足，将无法为您设置 Discord Activity 状态</value>
+  </data>
   <data name="ServiceDiscordGameActivityDetails" xml:space="preserve">
     <value>正在提瓦特大陆中探索</value>
   </data>
diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Discord/DiscordService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Discord/DiscordService.cs
index 7d4181ca..c977e243 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/Discord/DiscordService.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/Discord/DiscordService.cs
@@ -3,6 +3,7 @@
 
 using Snap.Hutao.Core;
 using Snap.Hutao.Service.Notification;
+using System.Diagnostics;
 
 namespace Snap.Hutao.Service.Discord;
 
@@ -17,7 +18,7 @@ internal sealed partial class DiscordService : IDiscordService, IDisposable
 
     public async ValueTask SetPlayingActivityAsync(bool isOversea)
     {
-        if (CheckDiscordStatus())
+        if (IsSupported())
         {
             _ = isOversea
                 ? await DiscordController.SetPlayingGenshinImpactAsync().ConfigureAwait(false)
@@ -27,7 +28,7 @@ internal sealed partial class DiscordService : IDiscordService, IDisposable
 
     public async ValueTask SetNormalActivityAsync()
     {
-        if (CheckDiscordStatus())
+        if (IsSupported())
         {
             _ = await DiscordController.SetDefaultActivityAsync(runtimeOptions.AppLaunchTime).ConfigureAwait(false);
         }
@@ -38,35 +39,30 @@ internal sealed partial class DiscordService : IDiscordService, IDisposable
         DiscordController.Stop();
     }
 
-    private bool CheckDiscordStatus()
+    private bool IsSupported()
     {
         try
         {
             // Actually requires a discord client to be running on Windows platform.
             // If not, discord core creation code will throw.
-            System.Diagnostics.Process[] discordProcesses = System.Diagnostics.Process.GetProcessesByName("Discord");
+            Process[] discordProcesses = Process.GetProcessesByName("Discord");
 
             if (discordProcesses.Length <= 0)
             {
-                if (!isInitialized)
-                {
-                    infoBarService.Warning("Discord 未运行，将无法设置 Discord Activity 状态。");
-                }
-
                 return false;
             }
 
-            foreach (System.Diagnostics.Process process in discordProcesses)
+            foreach (Process process in discordProcesses)
             {
                 try
                 {
                     _ = process.Handle;
                 }
-                catch (Win32Exception)
+                catch (Exception)
                 {
                     if (!isInitialized)
                     {
-                        infoBarService.Warning("权限不足，将无法设置 Discord Activity 状态。");
+                        infoBarService.Warning(SH.ServiceDiscordActivityElevationRequiredHint);
                     }
 
                     return false;
@@ -77,10 +73,7 @@ internal sealed partial class DiscordService : IDiscordService, IDisposable
         }
         finally
         {
-            if (!isInitialized)
-            {
-                isInitialized = true;
-            }
+            isInitialized = true;
         }
     }
 }
\ No newline at end of file