From e6cf39831d8e8e7f46ffa17d19df0909ca7a37a2 Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Sat, 23 Dec 2023 18:22:12 +0800 Subject: [PATCH] fix daily note fetch uid crash --- .../Snap.Hutao/Service/DailyNote/DailyNoteService.cs | 2 +- .../Snap.Hutao/Service/User/UserCollectionService.cs | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs index 1112ef38..2abc4b4c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs @@ -77,7 +77,7 @@ internal sealed partial class DailyNoteService : IDailyNoteService, IRecipient entryList = await dailyNoteDbService.GetDailyNoteEntryIncludeUserListAsync().ConfigureAwait(false); entryList.ForEach(entry => { entry.UserGameRole = userService.GetUserGameRoleByUid(entry.Uid); }); - entries = new(entryList); + entries = entryList.ToObservableCollection(); } return entries; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/User/UserCollectionService.cs b/src/Snap.Hutao/Snap.Hutao/Service/User/UserCollectionService.cs index 6ea7d8ff..d059b1fb 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/User/UserCollectionService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/User/UserCollectionService.cs @@ -131,17 +131,7 @@ internal sealed partial class UserCollectionService : IUserCollectionService return default; } - try - { - return uidUserGameRoleMap[uid]; - } - catch (InvalidOperationException) - { - // Sequence contains more than one matching element - // TODO: return a specialize UserGameRole to indicate error - } - - return default; + return uidUserGameRoleMap.GetValueOrDefault(uid); } public bool TryGetUserByMid(string mid, [NotNullWhen(true)] out BindingUser? user)