|
|
@@ -65,6 +65,7 @@ class TelegramWebHook extends BaseController
|
|
|
try {
|
|
|
$chatId = $message->chat->id;
|
|
|
$firstName = $message->chat->firstName;
|
|
|
+ $username = $message->chat->username;
|
|
|
$messageId = $message->messageId;
|
|
|
if (!$from->isBot) {
|
|
|
$chatId = $from->id;
|
|
|
@@ -76,6 +77,7 @@ class TelegramWebHook extends BaseController
|
|
|
$user = new User();
|
|
|
$user->member_id = $chatId;
|
|
|
}
|
|
|
+ if ($username) $user->username = $username;
|
|
|
$user->first_name = $firstName;
|
|
|
$user->save();
|
|
|
App::setLocale($user->language);
|
|
|
@@ -483,8 +485,8 @@ class TelegramWebHook extends BaseController
|
|
|
if ($message['chat']['type'] === 'private') {
|
|
|
|
|
|
// 校验开始菜单事件
|
|
|
- $returnMsg = KeyboardService::checkStart($chatId,$text);
|
|
|
- if($returnMsg){
|
|
|
+ $returnMsg = KeyboardService::checkStart($chatId, $text);
|
|
|
+ if ($returnMsg) {
|
|
|
return $returnMsg;
|
|
|
}
|
|
|
|
|
|
@@ -494,7 +496,7 @@ class TelegramWebHook extends BaseController
|
|
|
Util::delCache($chatId);
|
|
|
//给每个用户生成一个专属的USDT钱包
|
|
|
WalletService::getUserWallet($chatId);
|
|
|
- self::setReplyKeyboard($chatId,$user->language);
|
|
|
+ self::setReplyKeyboard($chatId, $user->language);
|
|
|
break;
|
|
|
// case lang("近期注单"):
|
|
|
// case lang('"✅近期注单"'):
|
|
|
@@ -642,11 +644,11 @@ class TelegramWebHook extends BaseController
|
|
|
* @param {*} $chatId
|
|
|
* @throws TelegramSDKException
|
|
|
*/
|
|
|
- public static function setReplyKeyboard($chatId,$language = 'en'):void
|
|
|
+ public static function setReplyKeyboard($chatId, $language = 'en'): void
|
|
|
{
|
|
|
- $replyInfo = KeyboardService::findOne(['button' => '开始使用','language'=>$language]);
|
|
|
- if(empty($replyInfo)){
|
|
|
- $replyInfo = KeyboardService::findOne(['button' => '开始使用','language'=>'en']);
|
|
|
+ $replyInfo = KeyboardService::findOne(['button' => '开始使用', 'language' => $language]);
|
|
|
+ if (empty($replyInfo)) {
|
|
|
+ $replyInfo = KeyboardService::findOne(['button' => '开始使用', 'language' => 'en']);
|
|
|
}
|
|
|
$telegram = new Api(config('services.telegram.token'));
|
|
|
|