bug fixes

Author: colinhartigan

src/localization/locales.py

@@ -519,7 +519,7 @@
         },
     },
     "ja-JP": {
-        "author": "@Yossi#1114",
+        # "author": "@Yossi#1114",
 
         # cmd doesnt support kanji :(
         # "config": {
@@ -577,51 +577,51 @@
         #         "checker_error": "アップデートを確認できませんでした。",
         #     }
         # },
-        "presences": {
-            "party_states": {
-                "open": "オープンパーティー",
-                "solo": "ソロ",
-                "in_party": "パーティーに参加中",
-            },
-            "client_states": {
-                "away": "離席中",
-                "menu": "メニュー",
-                "custom_setup": "カスタム設定",
-                "queue": "マッチを検索中",
-                "pregame": "試合開始前",
-            },
-            "team_names": {
-                "TeamOne": "ディフェンダー",
-                "TeamTwo": "アタッカー",
-                "TeamSpectate": "観戦者",
-                "TeamOneCoaches": "ディフェンダー側コーチ",
-                "TeamTwoCoaches": "アタッカー側コーチ",
-            },
-            "modes": {
-                "newmap": "新マップ",
-                "competitive": "コンペティティブ",
-                "unrated": "アンレート",
-                "spikerush": "スパイクラッシュ",
-                "deathmatch": "デスマッチ",
-                "ggteam": "エスカレーション",
-                "onefa": "レプリケーション",
-                "custom": "カスタムゲーム",
-                "snowball": "スノーボールファイト",
-                "": "カスタム",
-            },
-            "pregame": {
-                "selecting": "選択中",
-                "locked": "ロック済み",
-            },
-            "leveling": {
-                "level": "レベル",
-                "ranked_rating": "RR",
-            },
-            "startup": {
-                "loading": "ロード中",
-                "view_github": "GitHubで確認",
-            }
-        },
+        # "presences": {
+        #     "party_states": {
+        #         "open": "オープンパーティー",
+        #         "solo": "ソロ",
+        #         "in_party": "パーティーに参加中",
+        #     },
+        #     "client_states": {
+        #         "away": "離席中",
+        #         "menu": "メニュー",
+        #         "custom_setup": "カスタム設定",
+        #         "queue": "マッチを検索中",
+        #         "pregame": "試合開始前",
+        #     },
+        #     "team_names": {
+        #         "TeamOne": "ディフェンダー",
+        #         "TeamTwo": "アタッカー",
+        #         "TeamSpectate": "観戦者",
+        #         "TeamOneCoaches": "ディフェンダー側コーチ",
+        #         "TeamTwoCoaches": "アタッカー側コーチ",
+        #     },
+        #     "modes": {
+        #         "newmap": "新マップ",
+        #         "competitive": "コンペティティブ",
+        #         "unrated": "アンレート",
+        #         "spikerush": "スパイクラッシュ",
+        #         "deathmatch": "デスマッチ",
+        #         "ggteam": "エスカレーション",
+        #         "onefa": "レプリケーション",
+        #         "custom": "カスタムゲーム",
+        #         "snowball": "スノーボールファイト",
+        #         "": "カスタム",
+        #     },
+        #     "pregame": {
+        #         "selecting": "選択中",
+        #         "locked": "ロック済み",
+        #     },
+        #     "leveling": {
+        #         "level": "レベル",
+        #         "ranked_rating": "RR",
+        #     },
+        #     "startup": {
+        #         "loading": "ロード中",
+        #         "view_github": "GitHubで確認",
+        #     }
+        # },
     },
     "ko-KR": {},
     "pl-PL": {},

src/localization/localization.py

@@ -46,6 +46,7 @@ def unlocalize_key(key):
                 return k
         return key
 
+    @staticmethod
     def get_config_value(*keys):
         localized_keys = [Localizer.get_config_key(key) for key in keys]
         result = Localizer.config

src/presence/presences/ingame.py

@@ -1,19 +1,22 @@
 from .ingame_presences.session import Game_Session
 from .ingame_presences.range import Range_Session
+from valclient.exceptions import PhaseError
 
 def presence(rpc,client=None,data=None,content_data=None,config=None):
-    coregame = client.coregame_fetch_player()
+    try:
+        coregame = client.coregame_fetch_player()
 
-    if coregame is not None:
-        match_id = coregame["MatchID"]
-        if data["provisioningFlow"] != "ShootingRange":
-            try:
-                session = Game_Session(rpc,client,data,match_id,content_data,config)
+        if coregame is not None:
+            match_id = coregame["MatchID"]
+            if data["provisioningFlow"] != "ShootingRange":
+                try:
+                    session = Game_Session(rpc,client,data,match_id,content_data,config)
+                    session.main_loop()
+                except:
+                    pass
+            else:
+                session = Range_Session(rpc,client,data,match_id,content_data,config)
                 session.main_loop()
-            except:
-                pass
-        else:
-            session = Range_Session(rpc,client,data,match_id,content_data,config)
-            session.main_loop()
-
 
+    except PhaseError:
+        pass

src/utilities/config/app_config.py

@@ -7,7 +7,7 @@
 from ...localization.localization import Localizer
 
 default_config = {
-    "version": "v3.1.0",
+    "version": "v3.1.1",
     "region": ["",Client.fetch_regions()],
     "client_id": 811469787657928704,
     "presence_refresh_interval": 3,