From a992fc61653677143312ddfbae717b000381e23c Mon Sep 17 00:00:00 2001 From: TangMo Date: Thu, 29 Dec 2022 22:47:22 +0000 Subject: [PATCH] Support forwarded sender name, Change EN/ZH chara count --- src/Commands/GenericmessageCommand.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Commands/GenericmessageCommand.php b/src/Commands/GenericmessageCommand.php index 80d8772..590a338 100644 --- a/src/Commands/GenericmessageCommand.php +++ b/src/Commands/GenericmessageCommand.php @@ -67,7 +67,7 @@ class GenericmessageCommand extends SystemCommand $text_chara_count = count(preg_split('//u', $text, -1, PREG_SPLIT_NO_EMPTY)); $text_english_count = count(preg_split('~[^a-z]*~i', $text, 0, PREG_SPLIT_NO_EMPTY)); - if ($text_english_count >= ($text_chara_count / 2)) { + if ($text_english_count >= ($text_chara_count*2 /3)) { $sourceLang = 'en'; $targetLang = 'zh'; $glossary = self::EN_TO_ZH; @@ -92,7 +92,7 @@ class GenericmessageCommand extends SystemCommand ]); } - $message_forwarded_from = $message->getForwardFrom()?->getFirstName(); + $message_forwarded_from = $message->getForwardFrom()?->getFirstName() ?? $message->getForwardSenderName(); if ($message_forwarded_from !== null) { $translated = $message_forwarded_from . ': ' . $translated; }