[All] Fix poke may not have action_str (#531)

LagrangeDev · Aug 20, 2024 · 8f4c6e2 · 8f4c6e2
1 parent 7c19535
commit 8f4c6e2
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 27 deletions.
diff --git a/Lagrange.Core/Event/EventArg/FriendPokeEvent.cs b/Lagrange.Core/Event/EventArg/FriendPokeEvent.cs
@@ -9,14 +9,17 @@ public class FriendPokeEvent : EventBase
     public string Action { get; }
 
     public string Suffix { get; }
+
+    public string ActionImgUrl { get; }
 
-    public FriendPokeEvent(uint operatorUin, uint targetUin, string action, string suffix)
+    public FriendPokeEvent(uint operatorUin, uint targetUin, string action, string suffix, string actionImgUrl)
     { 
         OperatorUin = operatorUin;
         TargetUin = targetUin;
         Action = action;
         Suffix = suffix;
+        ActionImgUrl = actionImgUrl;
 
-        EventMessage = $"{nameof(FriendPokeEvent)}: OperatorUin: {OperatorUin} | TargetUin: {TargetUin} | Action: {Action} | Suffix: {Suffix}";
+        EventMessage = $"{nameof(FriendPokeEvent)}: OperatorUin: {OperatorUin} | TargetUin: {TargetUin} | Action: {Action} | Suffix: {Suffix} | ActionImgUrl: {ActionImgUrl}";
     }
-}
+}
diff --git a/Lagrange.Core/Event/EventArg/GroupPokeEvent.cs b/Lagrange.Core/Event/EventArg/GroupPokeEvent.cs
@@ -1,4 +1,4 @@
-namespace Lagrange.Core.Event.EventArg;
+namespace Lagrange.Core.Event.EventArg;
 
 public class GroupPokeEvent : EventBase
 {
@@ -12,14 +12,17 @@ public class GroupPokeEvent : EventBase
 
     public string Suffix { get; }
 
-    public GroupPokeEvent(uint groupUin, uint operatorUin, uint targetUin, string action, string suffix)
+    public string ActionImgUrl { get; }
+
+    public GroupPokeEvent(uint groupUin, uint operatorUin, uint targetUin, string action, string suffix, string actionImgUrl)
     {
         GroupUin = groupUin;
         OperatorUin = operatorUin;
         TargetUin = targetUin;
         Action = action;
         Suffix = suffix;
+        ActionImgUrl = actionImgUrl;
 
-        EventMessage = $"{nameof(GroupPokeEvent)}:  GroupUin: {GroupUin} | OperatorUin: {OperatorUin} | TargetUin: {TargetUin} | Action: {Action} | Suffix: {Suffix}";
+        EventMessage = $"{nameof(GroupPokeEvent)}:  GroupUin: {GroupUin} | OperatorUin: {OperatorUin} | TargetUin: {TargetUin} | Action: {Action} | Suffix: {Suffix} | ActionImgUrl: {ActionImgUrl}";
     }
-}
+}
diff --git a/Lagrange.Core/Internal/Context/Logic/Implementation/MessagingLogic.cs b/Lagrange.Core/Internal/Context/Logic/Implementation/MessagingLogic.cs
@@ -126,7 +126,7 @@ public override async Task Incoming(ProtocolEvent e)
             }
             case GroupSysPokeEvent poke:
             {
-                var pokeArgs = new GroupPokeEvent(poke.GroupUin, poke.OperatorUin, poke.TargetUin, poke.Action, poke.Suffix);
+                var pokeArgs = new GroupPokeEvent(poke.GroupUin, poke.OperatorUin, poke.TargetUin, poke.Action, poke.Suffix, poke.ActionImgUrl);
                 Collection.Invoker.PostEvent(pokeArgs);
                 break;
             }
@@ -200,7 +200,7 @@ public override async Task Incoming(ProtocolEvent e)
             }
             case FriendSysPokeEvent poke:
             {
-                var pokeArgs = new FriendPokeEvent(poke.OperatorUin, poke.TargetUin, poke.Action, poke.Suffix);
+                var pokeArgs = new FriendPokeEvent(poke.OperatorUin, poke.TargetUin, poke.Action, poke.Suffix, poke.ActionImgUrl);
                 Collection.Invoker.PostEvent(pokeArgs);
                 break;
             }
@@ -415,4 +415,4 @@ private async Task ResolveChainMetadata(MessageChain chain)
             }
         }
     }
-}
+}
diff --git a/Lagrange.Core/Internal/Event/Notify/FriendSysPokeEvent.cs b/Lagrange.Core/Internal/Event/Notify/FriendSysPokeEvent.cs
@@ -10,14 +10,17 @@ internal class FriendSysPokeEvent : ProtocolEvent
 
     public string Suffix { get; }
 
-    private FriendSysPokeEvent(uint operatorUin, uint targetUin, string action, string suffix) : base(0)
+    public string ActionImgUrl { get; }
+
+    private FriendSysPokeEvent(uint operatorUin, uint targetUin, string action, string suffix, string actionImgUrl) : base(0)
     {
         OperatorUin = operatorUin;
         TargetUin = targetUin;
         Action = action;
         Suffix = suffix;
+        ActionImgUrl = actionImgUrl;
     }
 
-    public static FriendSysPokeEvent Result(uint operatorUin, uint targetUin, string action, string suffix) 
-        => new(operatorUin, targetUin, action, suffix);
-}
+    public static FriendSysPokeEvent Result(uint operatorUin, uint targetUin, string action, string suffix, string actionImgUrl) 
+        => new(operatorUin, targetUin, action, suffix, actionImgUrl);
+}
diff --git a/Lagrange.Core/Internal/Event/Notify/GroupSysPokeEvent.cs b/Lagrange.Core/Internal/Event/Notify/GroupSysPokeEvent.cs
@@ -12,15 +12,18 @@ internal class GroupSysPokeEvent : ProtocolEvent
 
     public string Suffix { get; }
 
-    private GroupSysPokeEvent(uint groupUin, uint operatorUin, uint targetUin, string action, string suffix) : base(0)
+    public string ActionImgUrl { get; }
+
+    private GroupSysPokeEvent(uint groupUin, uint operatorUin, uint targetUin, string action, string suffix, string actionImgUrl) : base(0)
     {
         GroupUin = groupUin;
         OperatorUin = operatorUin;
         TargetUin = targetUin;
         Action = action;
         Suffix = suffix;
+        ActionImgUrl = actionImgUrl;
     }
 
-    public static GroupSysPokeEvent Result(uint groupUin, uint operatorUin, uint targetUin, string action, string suffix) 
-        => new(groupUin, operatorUin, targetUin, action, suffix);
-}
+    public static GroupSysPokeEvent Result(uint groupUin, uint operatorUin, uint targetUin, string action, string suffix, string actionImgUrl) 
+        => new(groupUin, operatorUin, targetUin, action, suffix, actionImgUrl);
+}
diff --git a/Lagrange.Core/Internal/Service/Message/PushMessageService.cs b/Lagrange.Core/Internal/Service/Message/PushMessageService.cs
@@ -197,9 +197,17 @@ private static void ProcessEvent0x2DC(Span<byte> payload, PushMsg msg, List<Prot
 
                 var templates = greyTip.GeneralGrayTip.MsgTemplParam.ToDictionary(x => x.Name, x => x.Value);
 
+                if (!templates.TryGetValue("action_str", out var actionStr) || actionStr == null)
+                {
+                    if (!templates.TryGetValue("alt_str1", out actionStr) || actionStr == null)
+                    {
+                        actionStr = string.Empty;
+                    }
+                }
+
                 if (greyTip.GeneralGrayTip.BusiType == 12)  // poke
                 {
-                    var groupPokeEvent = GroupSysPokeEvent.Result(groupUin, uint.Parse(templates["uin_str1"]), uint.Parse(templates["uin_str2"]), templates["action_str"], templates["suffix_str"]);
+                    var groupPokeEvent = GroupSysPokeEvent.Result(groupUin, uint.Parse(templates["uin_str1"]), uint.Parse(templates["uin_str2"]), actionStr, templates["suffix_str"], templates["action_img_url"]);
                     extraEvents.Add(groupPokeEvent);
                 }
                 break;
@@ -248,10 +256,18 @@ private static void ProcessEvent0x210(Span<byte> payload, PushMsg msg, List<Prot
                 var greyTip = Serializer.Deserialize<GeneralGrayTipInfo>(content.AsSpan());
                 var templates = greyTip.MsgTemplParam.ToDictionary(x => x.Name, x => x.Value);
 
+                if (!templates.TryGetValue("action_str", out var actionStr) || actionStr == null)
+                {
+                    if (!templates.TryGetValue("alt_str1", out actionStr) || actionStr == null)
+                    {
+                        actionStr = string.Empty;
+                    }
+                }
+
                 if (greyTip.BusiType == 12)  // poke
                 {
-                    var groupPokeEvent = FriendSysPokeEvent.Result(uint.Parse(templates["uin_str1"]), uint.Parse(templates["uin_str2"]), templates["action_str"], templates["suffix_str"]);
-                    extraEvents.Add(groupPokeEvent);
+                    var friendPokeEvent = FriendSysPokeEvent.Result(uint.Parse(templates["uin_str1"]), uint.Parse(templates["uin_str2"]), actionStr, templates["suffix_str"], templates["action_img_url"]);
+                    extraEvents.Add(friendPokeEvent);
                 }
                 break;
             }

diff --git a/Lagrange.OneBot/Core/Entity/Notify/OneBotFriendPoke.cs b/Lagrange.OneBot/Core/Entity/Notify/OneBotFriendPoke.cs
@@ -11,9 +11,11 @@ public class OneBotFriendPoke(uint selfId) : OneBotNotify(selfId, "notify")
 
     [JsonPropertyName("user_id")] public uint UserId { get; set; }
 
-    [JsonPropertyName("target_id")] public uint TargetId { get; set; } // self
+    [JsonPropertyName("target_id")] public uint TargetId { get; set; }
 
     [JsonPropertyName("action")] public string Action { get; set; } = string.Empty;
 
     [JsonPropertyName("suffix")] public string Suffix { get; set; } = string.Empty;
-}
+
+    [JsonPropertyName("action_img_url")] public string ActionImgUrl { get; set; } = string.Empty;
+}
diff --git a/Lagrange.OneBot/Core/Entity/Notify/OneBotGroupPoke.cs b/Lagrange.OneBot/Core/Entity/Notify/OneBotGroupPoke.cs
@@ -11,9 +11,11 @@ public class OneBotGroupPoke(uint selfId) : OneBotNotify(selfId, "notify")
 
     [JsonPropertyName("user_id")] public uint UserId { get; set; }
 
-    [JsonPropertyName("target_id")] public uint TargetId { get; set; } // self
+    [JsonPropertyName("target_id")] public uint TargetId { get; set; }
 
     [JsonPropertyName("action")] public string Action { get; set; } = string.Empty;
 
     [JsonPropertyName("suffix")] public string Suffix { get; set; } = string.Empty;
-}
+
+    [JsonPropertyName("action_img_url")] public string ActionImgUrl { get; set; } = string.Empty;
+}
diff --git a/Lagrange.OneBot/Core/Notify/NotifyService.cs b/Lagrange.OneBot/Core/Notify/NotifyService.cs
@@ -160,7 +160,8 @@ await service.SendJsonAsync(new OneBotFriendPoke(bot.BotUin)
                 UserId = @event.OperatorUin,
                 TargetId = @event.TargetUin,
                 Action = @event.Action,
-                Suffix = @event.Suffix
+                Suffix = @event.Suffix,
+                ActionImgUrl = @event.ActionImgUrl
             });
         };
 
@@ -173,7 +174,8 @@ await service.SendJsonAsync(new OneBotGroupPoke(bot.BotUin)
                 UserId = @event.OperatorUin,
                 TargetId = @event.TargetUin,
                 Action = @event.Action,
-                Suffix = @event.Suffix
+                Suffix = @event.Suffix,
+                ActionImgUrl = @event.ActionImgUrl
             });
         };