From dbc4ee7316a51afbf549f34bc3d3389331994f6b Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Mon, 1 Aug 2022 22:36:19 +0800
Subject: [PATCH] feat: Change the delimiter for credit store to a semicolon

---
 src/MeoAsstGui/Resources/Localizations/en-us.xaml | 4 ++--
 src/MeoAsstGui/Resources/Localizations/ja-jp.xaml | 4 ++--
 src/MeoAsstGui/Resources/Localizations/ko-kr.xaml | 4 ++--
 src/MeoAsstGui/Resources/Localizations/zh-cn.xaml | 4 ++--
 src/MeoAsstGui/Resources/Localizations/zh-tw.xaml | 4 ++--
 src/MeoAsstGui/ViewModels/SettingsViewModel.cs    | 9 +++++----
 src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs   | 4 ++--
 7 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/MeoAsstGui/Resources/Localizations/en-us.xaml b/src/MeoAsstGui/Resources/Localizations/en-us.xaml
index dce1d1fb1a..d28c677a84 100644
--- a/src/MeoAsstGui/Resources/Localizations/en-us.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/en-us.xaml
@@ -105,8 +105,8 @@
     <system:String x:Key="PenguinID">Penguin Report ID(Number part only)</system:String>
 
     <system:String x:Key="SocialPtShop">Social Point shopping</system:String>
-    <system:String x:Key="HighPriority">Whitelist (split by space)</system:String>
-    <system:String x:Key="Blacklist">Blacklist (split by space)</system:String>
+    <system:String x:Key="HighPriority">Whitelist (split by semicolon)</system:String>
+    <system:String x:Key="Blacklist">Blacklist (split by semicolon)</system:String>
     <system:String x:Key="Drink">Would you like a drink🍷? doctor</system:String>
 
     <system:String x:Key="DroneUsage">Drone Usage</system:String>
diff --git a/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml b/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
index 0e4ecbebc0..c6c51ac62b 100644
--- a/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
@@ -105,8 +105,8 @@
     <system:String x:Key="PenguinID">Penguin StatisticsレポートID（デジタル部分のみ）</system:String>
 
     <system:String x:Key="SocialPtShop">FP交換</system:String>
-    <system:String x:Key="HighPriority">優先購入　スペースで区切</system:String>
-    <system:String x:Key="Blacklist">ブラックリスト　スペースで区切</system:String>
+    <system:String x:Key="HighPriority">優先購入　セミコロンで区切</system:String>
+    <system:String x:Key="Blacklist">ブラックリスト　セミコロンで区切</system:String>
     <system:String x:Key="Drink">飲み物はいかがですか🍷？ドクター</system:String>
 
     <system:String x:Key="DroneUsage">ドローンの使用</system:String>
diff --git a/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml b/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml
index 08b622a4a5..776ddac42b 100644
--- a/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml
@@ -105,8 +105,8 @@
     <system:String x:Key="PenguinID">PenguinStats 보고 ID (숫자만)</system:String>
 
     <system:String x:Key="SocialPtShop">크레딧 구매</system:String>
-    <system:String x:Key="HighPriority">구매 우선 항목 (공백으로 구분)</system:String>
-    <system:String x:Key="Blacklist">무시 항목 (공백으로 구분)</system:String>
+    <system:String x:Key="HighPriority">구매 우선 항목 (세미콜론으로 구분)</system:String>
+    <system:String x:Key="Blacklist">무시 항목 (세미콜론으로 구분)</system:String>
     <system:String x:Key="Drink">술 한잔은 어떻습니까🍷? 박사님</system:String>
 
     <system:String x:Key="DroneUsage">드런 용법</system:String>
diff --git a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
index ac50701ad2..d4dcf7b0ba 100644
--- a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
@@ -105,8 +105,8 @@
     <system:String x:Key="PenguinID">企鹅物流汇报ID（仅数字部分）</system:String>
 
     <system:String x:Key="SocialPtShop">信用购物</system:String>
-    <system:String x:Key="HighPriority">优先购买 子串即可 空格分隔</system:String>
-    <system:String x:Key="Blacklist">黑名单 子串即可 空格分隔</system:String>
+    <system:String x:Key="HighPriority">优先购买 子串即可 分号分隔</system:String>
+    <system:String x:Key="Blacklist">黑名单 子串即可 分号分隔</system:String>
     <system:String x:Key="Drink">要来一杯美酒吗🍷？博士</system:String>
 
     <system:String x:Key="DroneUsage">无人机用途</system:String>
diff --git a/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml b/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml
index 1f870f1306..e7029c0769 100644
--- a/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml
@@ -105,8 +105,8 @@
     <system:String x:Key="PenguinID">企鵝物流匯報ID（僅數字部分）</system:String>
 
     <system:String x:Key="SocialPtShop">信用購物</system:String>
-    <system:String x:Key="HighPriority">優先購買 子串即可 空格分隔</system:String>
-    <system:String x:Key="Blacklist">黑名單 子串即可 空格分隔</system:String>
+    <system:String x:Key="HighPriority">優先購買 子串即可 分号分隔</system:String>
+    <system:String x:Key="Blacklist">黑名單 子串即可 分号分隔</system:String>
     <system:String x:Key="Drink">要來一杯美酒嗎🍷？博士</system:String>
 
     <system:String x:Key="DroneUsage">無人機用途</system:String>
diff --git a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
index 87353947ae..9e7438dd22 100644
--- a/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
+++ b/src/MeoAsstGui/ViewModels/SettingsViewModel.cs
@@ -855,7 +855,7 @@ namespace MeoAsstGui
             }
         }
 
-        private string _creditFirstList = ViewStatusStorage.Get("Mall.CreditFirstList", "招聘许可 龙门币");
+        private string _creditFirstList = ViewStatusStorage.Get("Mall.CreditFirstListNew", "招聘许可；龙门币");
 
         /// <summary>
         /// Gets or sets the priority item list of credit shop.
@@ -870,11 +870,11 @@ namespace MeoAsstGui
             set
             {
                 SetAndNotify(ref _creditFirstList, value);
-                ViewStatusStorage.Set("Mall.CreditFirstList", value);
+                ViewStatusStorage.Set("Mall.CreditFirstListNew", value);
             }
         }
 
-        private string _creditBlackList = ViewStatusStorage.Get("Mall.CreditBlackList", "碳 家具");
+        private string _creditBlackList = ViewStatusStorage.Get("Mall.CreditBlackListNew", "碳；家具");
 
         /// <summary>
         /// Gets or sets the blacklist of credit shop.
@@ -889,7 +889,7 @@ namespace MeoAsstGui
             set
             {
                 SetAndNotify(ref _creditBlackList, value);
-                ViewStatusStorage.Set("Mall.CreditBlackList", value);
+                ViewStatusStorage.Set("Mall.CreditBlackListNew", value);
             }
         }
 
@@ -1660,6 +1660,7 @@ namespace MeoAsstGui
         /// Gets or sets a value indicating whether to use tray icon.
         /// </summary>
         public bool UseTray = true;
+
 #pragma warning restore SA1401 // Fields should be private
 
         // private bool _useTray = Convert.ToBoolean(ViewStatusStorage.Get("GUI.UseTray", bool.TrueString));
diff --git a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs
index 13f24437eb..982508d0e7 100644
--- a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs
+++ b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs
@@ -895,8 +895,8 @@ namespace MeoAsstGui
         {
             var settings = _container.Get<SettingsViewModel>();
             var asstProxy = _container.Get<AsstProxy>();
-            var buy_first = settings.CreditFirstList.Split(new char[] { ' ', ',', '，', ';', '；', '|' });
-            var black_list = settings.CreditBlackList.Split(new char[] { ' ', ',', '，', ';', '；', '|' });
+            var buy_first = settings.CreditFirstList.Split(new char[] { ';', '；' });
+            var black_list = settings.CreditBlackList.Split(new char[] { ';', '；' });
             return asstProxy.AsstAppendMall(settings.CreditShopping, buy_first, black_list);
         }