Add more icons for Chinese socials

Co-Authored-By: Ron Friedman <[email protected]>

Author: gablm

Hi3Helper.Plugin.DNA/Management/Api/DNAApiResponseSocials.cs

@@ -48,6 +48,12 @@ public class DNAApiResponseMediumInlet
 
     [JsonPropertyName("inletUrl")]
     public string? Url { get; set; }
+
+    [JsonPropertyName("image")]
+    public string? ImageUrl { get; set; }
+
+    [JsonPropertyName("imageText")]
+    public string? ImageText { get; set; }
 }
 
 public class DNAApiResponseMediumContent

Hi3Helper.Plugin.DNA/Management/Api/DNAGlobalLauncherApiNews.cs

@@ -104,12 +104,11 @@ public override void GetNewsEntries(out nint handle, out int count, out bool isD
                         isValid = time > DateTimeOffset.Now;
                     }
 
-                    return
-                    !string.IsNullOrEmpty(x.Event.Name) &&
-                    !string.IsNullOrEmpty(x.Event.Type) &&
-                    !string.IsNullOrEmpty(x.Event.Date) &&
-                    x.Event.Content != null && x.Event.Content.Count > 0
-                    && isValid;
+                    return !string.IsNullOrEmpty(x.Event.Name)
+                        && !string.IsNullOrEmpty(x.Event.Type)
+                        && !string.IsNullOrEmpty(x.Event.Date)
+                        && x.Event.Content != null && x.Event.Content.Count > 0
+                        && isValid;
                 })];
 
             int entryCount = validEntries.Count;
@@ -186,9 +185,9 @@ public override void GetCarouselEntries(out nint handle, out int count, out bool
                         isValid = time > DateTimeOffset.Now;
                     }
 
-                    return !string.IsNullOrEmpty(x.Name) &&
-                            x.Content != null && x.Content.Count > 0 &&
-                            isValid;
+                    return !string.IsNullOrEmpty(x.Name)
+                        && x.Content != null && x.Content.Count > 0
+                        && isValid;
                 })];
 
             int entryCount = validEntries.Count;
@@ -271,22 +270,27 @@ public override void GetSocialMediaEntries(out nint handle, out int count, out b
                 var content = validEntries[i].Content!
                     .First(x => x.Language != null && x.Language?.Code == LangCode);
 
-                var inlet = content.Inlets!.First();
+                var inlet = content.Inlets!.First(x => x.Type == "1");
 
-                string socialMediaName = validEntries[i].Medium?.Code!;
+                string codeName = validEntries[i].Medium?.Code!;
+                string socialMediaName = inlet.Name!;
                 string clickUrl = inlet.Url!;
 
-                byte[]? iconData = DNAImageData.GetEmbeddedData(socialMediaName);
-                if (iconData == null)
-                {
-                    continue;
-                }
+                byte[]? iconData = DNAImageData.GetEmbeddedData(codeName);
+                iconData ??= DNAImageData.GetEmbeddedData("unknown");
 
                 ref LauncherSocialMediaEntry unmanagedEntry = ref memory[i];
 
                 unmanagedEntry.WriteIcon(iconData);
                 unmanagedEntry.WriteDescription(socialMediaName);
                 unmanagedEntry.WriteClickUrl(clickUrl);
+
+                var qrCode = content.Inlets!.FirstOrDefault(x => x.Type == "0");
+                if (qrCode != null)
+                {
+                    unmanagedEntry.WriteQrImage(qrCode.ImageUrl);
+                    unmanagedEntry.WriteQrImageDescription(qrCode.ImageText);
+                }
             }
 
             isAllocated = true;

Hi3Helper.Plugin.DNA/Management/PresetConfig/DNABilibiliPresetConfig.cs

@@ -1,8 +1,6 @@
 using Hi3Helper.Plugin.Core.Management;
 using Hi3Helper.Plugin.DNA.Management.Api;
-using Hi3Helper.Plugin.DNA.Utility;
 using System.Diagnostics.CodeAnalysis;
-using System.Net.Security;
 using System.Runtime.InteropServices.Marshalling;
 
 // ReSharper disable IdentifierTypo
@@ -13,7 +11,7 @@ namespace Hi3Helper.Plugin.DNA.Management.PresetConfig;
 [GeneratedComClass]
 public partial class DNABiliBilliPresetConfig : DNAChinaPresetConfig
 {
-    private DNAApiResponseDetails ApiResponseDetails = new DNAApiResponseDetails()
+    private readonly DNAApiResponseDetails ApiResponseDetails = new()
     {
         BaseUrls = [
             "http://pan01-cdn-dna-ali.shyxhy.com",

Hi3Helper.Plugin.DNA/Management/PresetConfig/DNAChinaPresetConfig.cs

@@ -1,7 +1,6 @@
 using Hi3Helper.Plugin.Core.Management;
 using Hi3Helper.Plugin.Core.Management.Api;
 using Hi3Helper.Plugin.DNA.Management.Api;
-using Hi3Helper.Plugin.DNA.Utility;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
@@ -17,7 +16,7 @@ namespace Hi3Helper.Plugin.DNA.Management.PresetConfig;
 [GeneratedComClass]
 public partial class DNAChinaPresetConfig : DNAPresetConfig
 {
-    private DNAApiResponseDetails ApiResponseDetails = new DNAApiResponseDetails()
+    private readonly DNAApiResponseDetails ApiResponseDetails = new()
     {
         BaseUrls = [
             "http://pan01-cdn-dna-ali.shyxhy.com",

Hi3Helper.Plugin.DNA/Management/PresetConfig/DNAEpicPresetConfig.cs

@@ -1,6 +1,5 @@
 using Hi3Helper.Plugin.Core.Management;
 using Hi3Helper.Plugin.DNA.Management.Api;
-using Hi3Helper.Plugin.DNA.Utility;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices.Marshalling;
 
@@ -12,13 +11,13 @@ namespace Hi3Helper.Plugin.DNA.Management.PresetConfig;
 [GeneratedComClass]
 public partial class DNAEpicPresetConfig : DNAGlobalPresetConfig
 {
-    private DNAApiResponseDetails ApiResponseDetails = new DNAApiResponseDetails()
+    private readonly DNAApiResponseDetails ApiResponseDetails = new()
     {
         BaseUrls = [
-            "http://pan01-cdn-aws-jp.dna-panstudio.com/",
-            "http://pan01-cdn-ali-jp.dna-panstudio.com/",
-            "http://pan01-cdn-eo-jp.dna-panstudio.com/",
-            "http://pan01-cdn-hs-jp.dna-panstudio.com/",
+            "http://pan01-cdn-aws-jp.dna-panstudio.com",
+            "http://pan01-cdn-ali-jp.dna-panstudio.com",
+            "http://pan01-cdn-eo-jp.dna-panstudio.com",
+            "http://pan01-cdn-hs-jp.dna-panstudio.com",
         ],
         Tag = "PC_OBT_Global_Epic_Pub",
         Region = "Global",

Hi3Helper.Plugin.DNA/Management/PresetConfig/DNAGlobalPresetConfig.cs

@@ -1,7 +1,6 @@
 using Hi3Helper.Plugin.Core.Management;
 using Hi3Helper.Plugin.Core.Management.Api;
 using Hi3Helper.Plugin.DNA.Management.Api;
-using Hi3Helper.Plugin.DNA.Utility;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
@@ -17,13 +16,13 @@ namespace Hi3Helper.Plugin.DNA.Management.PresetConfig;
 [GeneratedComClass]
 public partial class DNAGlobalPresetConfig : DNAPresetConfig
 {
-    private DNAApiResponseDetails ApiResponseDetails = new DNAApiResponseDetails()
+    private readonly DNAApiResponseDetails ApiResponseDetails = new()
     {
         BaseUrls = [
-            "http://pan01-cdn-aws-jp.dna-panstudio.com/",
-            "http://pan01-cdn-ali-jp.dna-panstudio.com/",
-            "http://pan01-cdn-eo-jp.dna-panstudio.com/",
-            "http://pan01-cdn-hs-jp.dna-panstudio.com/",
+            "http://pan01-cdn-aws-jp.dna-panstudio.com",
+            "http://pan01-cdn-ali-jp.dna-panstudio.com",
+            "http://pan01-cdn-eo-jp.dna-panstudio.com",
+            "http://pan01-cdn-hs-jp.dna-panstudio.com",
         ],
         Tag = "PC_OBT_Global_Pub",
         Region = "Global",