Ken 2 недель назад
Родитель
Сommit
543168c23f
2 измененных файлов с 12 добавлено и 5 удалено
  1. 9 2
      app/Models/User.php
  2. 3 3
      app/Services/UserService.php

+ 9 - 2
app/Models/User.php

@@ -17,6 +17,7 @@ use Illuminate\Database\Eloquent\Builder;
  * @property mixed $member_id
  * @property mixed $username
  * @property mixed $first_name
+ * @property mixed $language
  */
 class User extends Authenticatable
 {
@@ -24,7 +25,7 @@ class User extends Authenticatable
 
     protected $table = 'users';
     protected $hidden = ['created_at', 'updated_at'];
-    protected $fillable = ['usdt', 'member_id', 'first_name', 'game_id', 'username', 'secret_key', 'secret_pass','language'];
+    protected $fillable = ['usdt', 'member_id', 'first_name', 'game_id', 'username', 'secret_key', 'secret_pass', 'language'];
 
     public function wallet()
     {
@@ -37,12 +38,18 @@ class User extends Authenticatable
         return $this->member_id;
     }
 
+    public function setLanguage($language): void
+    {
+        $this->language = $language;
+    }
+
     public function getUsername()
     {
         return $this->username;
     }
 
-    public function getFirstName(){
+    public function getFirstName()
+    {
         return $this->first_name;
     }
 

+ 3 - 3
app/Services/UserService.php

@@ -125,16 +125,16 @@ class UserService extends BaseService
         $pattern = "/^setLanguage@@.*$/";
         if (preg_match($pattern, $data)) {
             $language = preg_replace('/^setLanguage@@/', '', $data);
-            $res = UserService::setLanguage($chatId, $language, $messageId);
+            $res = UserService::setLanguage($chatId, $language);
             $telegram->deleteMessage(['chat_id' => $chatId, 'message_id' => $messageId]);
             $telegram->sendMessage($res);
         }
     }
 
-    public static function setLanguage($chatId, $language, $messageId): array
+    public static function setLanguage($chatId, $language): array
     {
         $userInfo = self::findOne(['member_id' => $chatId]);
-        $userInfo->language = $language;
+        $userInfo->setLanguage($language);
         $userInfo->save();
         App::setLocale($language);
         return self::getLanguages($chatId);