update to hutao api v2

DGP-Studio · Oct 13, 2022 · 67a1d5d · 67a1d5d
1 parent 6e6d125
commit 67a1d5d
Show file tree

Hide file tree

Showing 48 changed files with 412 additions and 814 deletions.
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Logging/LogEntryQueue.cs b/src/Snap.Hutao/Snap.Hutao/Core/Logging/LogEntryQueue.cs
@@ -70,9 +70,8 @@ private static LogDbContext InitializeDbContext()
             logDbContext.Database.Migrate();
         }
 
-        logDbContext.Logs.RemoveRange(logDbContext.Logs);
-        logDbContext.SaveChanges();
-
+        // only raw sql can pass
+        logDbContext.Database.ExecuteSqlRaw("DELETE FROM logs WHERE Exception IS NULL");
         return logDbContext;
     }
 

diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Threading/ConcurrentCancellationTokenSource.cs b/src/Snap.Hutao/Snap.Hutao/Core/Threading/ConcurrentCancellationTokenSource.cs
@@ -28,4 +28,4 @@ public CancellationToken Register(TItem item)
 
         return waitingItems.GetOrAdd(item, new CancellationTokenSource()).Token;
     }
-}
+}
diff --git a/...Hutao/Extension/BinaryReaderExtensions.cs → ....Hutao/Extension/BinaryReaderExtension.cs b/...Hutao/Extension/BinaryReaderExtensions.cs → ....Hutao/Extension/BinaryReaderExtension.cs
@@ -8,7 +8,7 @@ namespace Snap.Hutao.Extension;
 /// <summary>
 /// <see cref="BinaryReader"/> 扩展
 /// </summary>
-public static class BinaryReaderExtensions
+public static class BinaryReaderExtension
 {
     /// <summary>
     /// 判断是否处于流的结尾

diff --git a/...tao/Extension/DateTimeOffsetExtensions.cs → ...utao/Extension/DateTimeOffsetExtension.cs b/...tao/Extension/DateTimeOffsetExtensions.cs → ...utao/Extension/DateTimeOffsetExtension.cs
@@ -6,7 +6,7 @@ namespace Snap.Hutao.Extension;
 /// <summary>
 /// <see cref="DateTimeOffset"/> 扩展
 /// </summary>
-public static class DateTimeOffsetExtensions
+public static class DateTimeOffsetExtension
 {
     /// <summary>
     /// Converts the current <see cref="DateTimeOffset"/> to a <see cref="DateTimeOffset"/> that represents the local time.

diff --git a/...ao/Snap.Hutao/Extension/EnumExtensions.cs → ...tao/Snap.Hutao/Extension/EnumExtension.cs b/...ao/Snap.Hutao/Extension/EnumExtensions.cs → ...tao/Snap.Hutao/Extension/EnumExtension.cs
@@ -8,7 +8,7 @@ namespace Snap.Hutao.Extension;
 /// <summary>
 /// 枚举拓展
 /// </summary>
-public static class EnumExtensions
+public static class EnumExtension
 {
     /// <summary>
     /// 获取枚举的描述

diff --git a/...p.Hutao/Extension/EnumerableExtensions.cs → ...ap.Hutao/Extension/EnumerableExtension.cs b/...p.Hutao/Extension/EnumerableExtensions.cs → ...ap.Hutao/Extension/EnumerableExtension.cs
@@ -9,7 +9,7 @@ namespace Snap.Hutao.Extension;
 /// <summary>
 /// <see cref="IEnumerable{T}"/> 扩展
 /// </summary>
-public static partial class EnumerableExtensions
+public static partial class EnumerableExtension
 {
     /// <inheritdoc cref="Enumerable.Average(IEnumerable{int})"/>
     public static double AverageNoThrow(this List<int> source)

diff --git a/.../Snap.Hutao/Extension/NumberExtensions.cs → ...o/Snap.Hutao/Extension/NumberExtension.cs b/.../Snap.Hutao/Extension/NumberExtensions.cs → ...o/Snap.Hutao/Extension/NumberExtension.cs
@@ -6,7 +6,7 @@ namespace Snap.Hutao.Extension;
 /// <summary>
 /// 数高性能扩展
 /// </summary>
-public static class NumberExtensions
+public static class NumberExtension
 {
     /// <summary>
     /// 获取从右向左某位上的数字

diff --git a/.../Snap.Hutao/Extension/ObjectExtensions.cs → ...o/Snap.Hutao/Extension/ObjectExtension.cs b/.../Snap.Hutao/Extension/ObjectExtensions.cs → ...o/Snap.Hutao/Extension/ObjectExtension.cs
@@ -6,7 +6,7 @@ namespace Snap.Hutao.Extension;
 /// <summary>
 /// 对象扩展
 /// </summary>
-public static class ObjectExtensions
+public static class ObjectExtension
 {
     /// <summary>
     /// <see langword="as"/> 的链式调用扩展

diff --git a/...tao/Extension/PackageVersionExtensions.cs → ...utao/Extension/PackageVersionExtension.cs b/...tao/Extension/PackageVersionExtensions.cs → ...utao/Extension/PackageVersionExtension.cs
@@ -8,7 +8,7 @@ namespace Snap.Hutao.Extension;
 /// <summary>
 /// 包版本扩展
 /// </summary>
-public static class PackageVersionExtensions
+public static class PackageVersionExtension
 {
     /// <summary>
     /// 将包版本转换为版本

diff --git a/src/Snap.Hutao/Snap.Hutao/Model/InterChange/Achievement/UIAFInfo.cs b/src/Snap.Hutao/Snap.Hutao/Model/InterChange/Achievement/UIAFInfo.cs
@@ -28,7 +28,7 @@ public class UIAFInfo
     public DateTimeOffset ExportDateTime
     {
         // Hot fix | 1.0.31 | UIAF.Info.ExportTimestamp can be milliseconds
-        get => DateTimeOffsetExtensions.FromUnixTime(ExportTimestamp, DateTimeOffset.MinValue);
+        get => DateTimeOffsetExtension.FromUnixTime(ExportTimestamp, DateTimeOffset.MinValue);
     }
 
     /// <summary>

diff --git a/src/Snap.Hutao/Snap.Hutao/Model/InterChange/GachaLog/UIGFInfo.cs b/src/Snap.Hutao/Snap.Hutao/Model/InterChange/GachaLog/UIGFInfo.cs
@@ -34,7 +34,7 @@ public class UIGFInfo
     /// </summary>
     public DateTimeOffset ExportDateTime
     {
-        get => DateTimeOffsetExtensions.FromUnixTime(ExportTimestamp, DateTimeOffset.MinValue);
+        get => DateTimeOffsetExtension.FromUnixTime(ExportTimestamp, DateTimeOffset.MinValue);
     }
 
     /// <summary>

diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoService.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoService.cs
@@ -117,6 +117,11 @@ private async Task<Summary> GetSummaryCoreAsync(PlayerInfo info, IEnumerable<Web
 
         foreach (Web.Enka.Model.AvatarInfo webInfo in webInfos)
         {
+            if (webInfo.AvatarId == 10000005 || webInfo.AvatarId == 10000007)
+            {
+                continue;
+            }
+
             Model.Entity.AvatarInfo? entity = dbInfos.SingleOrDefault(i => i.Info.AvatarId == webInfo.AvatarId);
 
             if (entity == null)
@@ -141,8 +146,9 @@ private async Task<Summary> GetSummaryCoreAsync(PlayerInfo info, IEnumerable<Web
         return appDbContext.AvatarInfos
             .Where(i => i.Uid == uid)
             .Select(i => i.Info)
-            .AsEnumerable()
-            .OrderByDescending(i => i.AvatarId)
+
+            // .AsEnumerable()
+            // .OrderByDescending(i => i.AvatarId)
             .ToList();
     }
 }
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Common/Announcement/AnnouncementClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Common/Announcement/AnnouncementClient.cs
@@ -55,6 +55,6 @@ public async Task<List<AnnouncementContent>> GetAnnouncementContentsAsync(Cancel
             .GetFromJsonAsync<Response<ListWrapper<AnnouncementContent>>>(ApiEndpoints.AnnContent, jsonSerializerOptions, cancellationToken)
             .ConfigureAwait(false);
 
-        return EnumerableExtensions.EmptyIfNull(resp?.Data?.List);
+        return EnumerableExtension.EmptyIfNull(resp?.Data?.List);
     }
 }
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/PlayerUid.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/PlayerUid.cs
@@ -8,7 +8,7 @@ namespace Snap.Hutao.Web.Hoyolab;
 /// </summary>
 public struct PlayerUid
 {
-    private string? region = null;
+    private string? region = default;
 
     /// <summary>
     /// 构造一个新的玩家 Uid 结构

diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Binding/BindingClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Binding/BindingClient.cs
@@ -45,6 +45,6 @@ public async Task<List<UserGameRole>> GetUserGameRolesAsync(User user, Cancellat
             .TryCatchGetFromJsonAsync<Response<ListWrapper<UserGameRole>>>(ApiEndpoints.UserGameRoles, options, logger, token)
             .ConfigureAwait(false);
 
-        return EnumerableExtensions.EmptyIfNull(resp?.Data?.List);
+        return EnumerableExtension.EmptyIfNull(resp?.Data?.List);
     }
 }
diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/GameRecordClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/GameRecordClient.cs
@@ -127,7 +127,7 @@ public async Task<List<Character>> GetCharactersAsync(User user, PlayerUid uid,
             .TryCatchPostAsJsonAsync<Response<CharacterWrapper>>(logger, token)
             .ConfigureAwait(false);
 
-        return EnumerableExtensions.EmptyIfNull(resp?.Data?.Avatars);
+        return EnumerableExtension.EmptyIfNull(resp?.Data?.Avatars);
     }
 
     private class CharacterData