[Change] RPCを改善、v5.4.7

Author: Hiro527

app/js/preload/game.js

@@ -32,14 +32,14 @@ const initDiscordRPC = () => {
         try {
             const gameActivity = window.getGameActivity();
             rpcActivity = {
-                state: gameActivity.map.length ? gameActivity.map : 'Playing Krunker',
-                details: gameActivity.mode,
+                state: gameActivity.map.length && config.get('shareMapInfo', true) ? gameActivity.map : 'Playing Krunker',
+                details: gameActivity.mode && config.get('shareModeInfo', true) ? gameActivity.mode : undefined,
                 largeImageKey: 'laf_icon',
-                largeImageText: 'LaF CLient',
-                smallImageKey: `icon_${gameActivity.class.index}`,
-                smallImageText: gameActivity.class.name,
+                largeImageText: 'LaF Client',
+                smallImageKey: config.get('shareClassInfo', true) ? `icon_${gameActivity.class.index}` : undefined,
+                smallImageText: config.get('shareClassInfo', true) ? gameActivity.class.name : undefined,
             };
-            if (gameActivity.time) {
+            if (gameActivity.time && config.get('shareTimerInfo', true)) {
                 rpcActivity.endTimestamp = Date.now() + gameActivity.time * 1e3;
             }
             ipcRenderer.invoke('RPC_SEND', rpcActivity);

app/js/util/settings.js

@@ -32,21 +32,57 @@ module.exports = {
         restart: true,
         default: true,
     },
+    enableAltMng: {
+        id: 'enableAltMng',
+        title: langPack.settings.enableAltManager,
+        cat: 'General',
+        type: 'checkbox',
+        val: config.get('enableAltMng', true),
+        restart: false,
+        default: true,
+    },
     enableRPC: {
         id: 'enableRPC',
         title: langPack.settings.enableRPC,
-        cat: 'General',
+        cat: 'Discord',
         type: 'checkbox',
         val: config.get('enableRPC', true),
         restart: true,
         default: true,
     },
-    enableAltMng: {
-        id: 'enableAltMng',
-        title: langPack.settings.enableAltManager,
-        cat: 'General',
+    shareMapInfo: {
+        id: 'shareMapInfo',
+        title: langPack.settings.shareMapInfo,
+        cat: 'Discord',
         type: 'checkbox',
-        val: config.get('enableAltMng', true),
+        val: config.get('shareMapInfo', true),
+        restart: false,
+        default: true,
+    },
+    shareModeInfo: {
+        id: 'shareModeInfo',
+        title: langPack.settings.shareModeInfo,
+        cat: 'Discord',
+        type: 'checkbox',
+        val: config.get('shareModeInfo', true),
+        restart: false,
+        default: true,
+    },
+    shareClassInfo: {
+        id: 'shareClassInfo',
+        title: langPack.settings.shareClassInfo,
+        cat: 'Discord',
+        type: 'checkbox',
+        val: config.get('shareClassInfo', true),
+        restart: false,
+        default: true,
+    },
+    shareTimerInfo: {
+        id: 'shareTimerInfo',
+        title: langPack.settings.shareTimerInfo,
+        cat: 'Discord',
+        type: 'checkbox',
+        val: config.get('shareTimerInfo', true),
         restart: false,
         default: true,
     },

app/lang/en_US.js

@@ -81,6 +81,10 @@ module.exports = {
         joinMatchOCustom: 'Official Custom Games',
         enableGA: 'Google Analytics',
         openDiscord: 'Join to Discord Server',
+        shareMapInfo: 'Share map info',
+        shareModeInfo: 'Share gamemode info',
+        shareClassInfo: 'Share class info',
+        shareTimerInfo: 'Share timer info',
     },
     misc: {
         noJoinableGames: 'There are no joinable games',

app/lang/ja_JP.js

@@ -81,6 +81,10 @@ module.exports = {
         joinMatchOCustom: '公式カスタムマッチ',
         enableGA: 'Google Analytics',
         openDiscord: 'Discordサーバーに参加する',
+        shareMapInfo: 'プレイ中のマップを表示',
+        shareModeInfo: 'プレイ中のモードを表示',
+        shareClassInfo: '使用中のクラスを表示',
+        shareTimerInfo: '試合の残り時間を表示',
     },
     misc: {
         noJoinableGames: '参加可能なゲームがありません',

app/main.js

@@ -239,15 +239,13 @@ DiscordRPC.register(ClientID);
 const rpc = new DiscordRPC.Client({ transport: 'ipc' });
 
 /* イベントハンドラー */
-// DiscordRPC
-let isDiscordAlive;
+// DiscordRPC`
 rpc.on('ready', () => {
-    isDiscordAlive = true;
     log.info('Discord RPC Ready');
 });
 
 ipcMain.handle('RPC_SEND', (e, d) => {
-    if (isDiscordAlive) {
+    if (rpc.user) {
         rpc.setActivity(d);
     }
 });
@@ -438,7 +436,7 @@ app.on('ready', () => {
             rpc.login({ clientId: ClientID });
             loggedIn = true;
         }
- catch (e) {
+        catch (e) {
             console.error(e);
         }
         if (loggedIn) {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "laf",
-    "version": "5.4.6",
+    "version": "5.4.7",
     "description": "Lite and Fast Krunker Client",
     "main": "app/main.js",
     "scripts": {