|
|
@@ -72,8 +72,8 @@ class TelegramWebHook extends BaseController
|
|
|
}
|
|
|
|
|
|
//用户注册和初始化用户钱包
|
|
|
- PublicService::index($chatId, $username, $firstName);
|
|
|
-
|
|
|
+ $user = PublicService::index($chatId, $username, $firstName);
|
|
|
+ App::setLocale($user->language);
|
|
|
|
|
|
PublicService::init($telegram, $data, $chatId, $firstName, $messageId);
|
|
|
WalletService::init($telegram, $data, $chatId, $firstName, $messageId, $callbackId);
|
|
|
@@ -225,36 +225,14 @@ class TelegramWebHook extends BaseController
|
|
|
} //用户发送了消息
|
|
|
else if (isset($message['text'])) {
|
|
|
$text = $message['text'];
|
|
|
-
|
|
|
- $user = User::where('member_id', $chatId)->first();
|
|
|
- if (!$user) {
|
|
|
- $user = new User();
|
|
|
- $user->member_id = $chatId;
|
|
|
- }
|
|
|
- if (empty($user->register_ip)) {
|
|
|
- $registerIp = request()->ip();
|
|
|
- if (User::where('register_ip', $registerIp)->exists()) {
|
|
|
- User::where('register_ip', $registerIp)->update(['status' => 1]);
|
|
|
- $user->status = 1;
|
|
|
- }
|
|
|
- $user->register_ip = $registerIp;
|
|
|
- }
|
|
|
-
|
|
|
- $user->first_name = $message['chat']['first_name'];
|
|
|
- if (isset($message['chat']['username'])) {
|
|
|
- $user->username = $message['chat']['username'];
|
|
|
- }
|
|
|
- $user->save();
|
|
|
+ $user = PublicSerVICE::index($chatId, $message['chat']['username'], $message['chat']['first_name']);
|
|
|
App::setLocale($user->language);
|
|
|
if ($message['chat']['type'] === 'private') {
|
|
|
-
|
|
|
// 校验开始菜单事件
|
|
|
$returnMsg = KeyboardService::checkStart($chatId, $text);
|
|
|
if ($returnMsg) {
|
|
|
return $returnMsg;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
switch ($text) {
|
|
|
case "/start":
|
|
|
Util::delCache($chatId);
|