From e0398cf2e57e1c6313849f6f6394b385fd3b5bed Mon Sep 17 00:00:00 2001 From: nkxingxh Date: Sat, 13 Aug 2022 20:08:30 +0800 Subject: [PATCH] Update core.php --- core.php | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/core.php b/core.php index dcb982f..621cf33 100644 --- a/core.php +++ b/core.php @@ -149,16 +149,19 @@ function sendTempMessage($qq, $group, $messageChain, $quote = 0, $sessionKey = ' */ function recall($messageId = true, $target = true, $sessionKey = '') { - if ($messageId === true && webhook) { + if (webhook) { global $_DATA; - if ($_DATA['type'] == 'GroupMessage') $messageId = $_DATA['messageChain'][0]['id']; - else return false; - } else $messageId = (int) $messageId; - if ($target === true && webhook) { - global $_DATA; - if ($_DATA['type'] == 'GroupMessage') $target = $_DATA['sender']['group']['id']; - else $target = $_DATA['sender']['id']; - } else $target = (int) $target; + if ($messageId === true && webhook) { + + if ($_DATA['type'] == 'GroupMessage') $messageId = $_DATA['messageChain'][0]['id']; + else return false; + } else $messageId = (int) $messageId; + if ($target === true && webhook) { + global $_DATA; + if ($_DATA['type'] == 'GroupMessage') $target = $_DATA['sender']['group']['id']; + else $target = $_DATA['sender']['id']; + } else $target = (int) $target; + } if (empty($messageId) || empty($target)) return false; return autoAdapter(__FUNCTION__, array('sessionKey' => $sessionKey, 'messageId' => $messageId, 'target' => $target)); }