fix conflict (#651)

LagrangeDev · Oct 21, 2024 · bff0f20 · bff0f20
1 parent d015386
commit bff0f20
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Lagrange.Core/Internal/Context/Logic/Implementation/CachingLogic.cs b/Lagrange.Core/Internal/Context/Logic/Implementation/CachingLogic.cs
@@ -75,7 +75,7 @@ public async Task<List<BotGroup>> GetCachedGroups(bool refreshCache, Cancellatio
         return _uinToUid.GetValueOrDefault(friendUin);
     }
 
-    public async Task<uint?> ResolveUin(uint? groupUin, string friendUid, bool force, CancellationToken cancellationToken)
+    public async Task<uint?> ResolveUin(uint? groupUin, string friendUid, bool force = false, CancellationToken cancellationToken = default)
     {
         if (_uinToUid.Count == 0) await ResolveFriendsUidAndFriendGroups(cancellationToken);
         if (groupUin == null) return _uinToUid.FirstOrDefault(x => x.Value == friendUid).Key;
@@ -85,7 +85,7 @@ public async Task<List<BotGroup>> GetCachedGroups(bool refreshCache, Cancellatio
         return _uinToUid.FirstOrDefault(x => x.Value == friendUid).Key;
     }
 
-    public async Task<List<BotGroupMember>> GetCachedMembers(uint groupUin, bool refreshCache, CancellationToken cancellationToken)
+    public async Task<List<BotGroupMember>> GetCachedMembers(uint groupUin, bool refreshCache, CancellationToken cancellationToken = default)
     {
         if (!_cachedGroupMembers.TryGetValue(groupUin, out var members) || refreshCache)
         {

diff --git a/Lagrange.Core/Internal/Context/Logic/Implementation/MessagingLogic.cs b/Lagrange.Core/Internal/Context/Logic/Implementation/MessagingLogic.cs
@@ -238,7 +238,7 @@ public override async Task Incoming(ProtocolEvent e, CancellationToken cancellat
             }
             case GroupSysTodoEvent todo:
             {
-                uint uin = await Collection.Business.CachingLogic.ResolveUin(todo.GroupUin, todo.OperatorUid) ?? 0;
+                uint uin = await Collection.Business.CachingLogic.ResolveUin(todo.GroupUin, todo.OperatorUid, false, cancellationToken) ?? 0;
 
                 Collection.Invoker.PostEvent(new GroupTodoEvent(todo.GroupUin, uin));
                 break;