koishi-plugin-steam-info-check 1.0.0 → 1.0.2

package/dist/database.d.ts

@@ -10,6 +10,8 @@ export interface SteamChannel {
     enable: boolean;
     name?: string;
     avatar?: string;
+    platform?: string;
+    assignee?: string;
 }
 declare module 'koishi' {
     interface Tables {

package/dist/index.js

@@ -1,12 +1,16 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logger = exports.Config = exports.inject = exports.name = void 0;
 exports.apply = apply;
 const koishi_1 = require("koishi");
 const service_1 = require("./service");
 const drawer_1 = require("./drawer");
+const zh_CN_1 = __importDefault(require("./locales/zh-CN"));
 exports.name = 'steam-info';
-exports.inject = ['model', 'http', 'puppeteer', 'database'];
+exports.inject = ['model', 'http', 'puppeteer', 'database', 'steam', 'drawer'];
 exports.Config = koishi_1.Schema.object({
     steamApiKey: koishi_1.Schema.array(String).required().description('Steam API Key (supports multiple)'),
     proxy: koishi_1.Schema.string().description('Proxy URL (e.g., http://127.0.0.1:7890)'),
@@ -32,7 +36,7 @@ exports.Config = koishi_1.Schema.object({
 exports.logger = new koishi_1.Logger('steam-info');
 function apply(ctx, config) {
     // Localization
-    ctx.i18n.define('zh-CN', require('./locales/zh-CN'));
+    ctx.i18n.define('zh-CN', zh_CN_1.default);
     // Services
     ctx.plugin(service_1.SteamService, config);
     ctx.plugin(drawer_1.DrawService, config);
@@ -52,6 +56,8 @@ function apply(ctx, config) {
         enable: 'boolean',
         name: 'string',
         avatar: 'string',
+        platform: 'string',
+        assignee: 'string',
     }, {
         primary: 'id',
     });
@@ -92,60 +98,81 @@ function apply(ctx, config) {
         .action(async ({ session }, target) => {
         if (!session)
             return;
-        let steamId = null;
-        if (target) {
-            // Check if target is mention
-            const [platform, userId] = session.resolve(target);
-            if (userId) {
-                const bind = await ctx.database.get('steam_bind', { userId, channelId: session.channelId });
+        try {
+            let steamId = null;
+            if (target) {
+                try {
+                    const [, userId] = session.resolve(target);
+                    if (userId) {
+                        const bind = await ctx.database.get('steam_bind', { userId, channelId: session.channelId });
+                        if (bind.length)
+                            steamId = bind[0].steamId;
+                    }
+                }
+                catch {
+                    /* ignore resolve errors */
+                }
+                if (!steamId && /^\d+$/.test(target)) {
+                    steamId = await ctx.steam.getSteamId(target);
+                }
+            }
+            else {
+                const bind = await ctx.database.get('steam_bind', { userId: session.userId, channelId: session.channelId });
                 if (bind.length)
                     steamId = bind[0].steamId;
             }
-            else if (/^\d+$/.test(target)) {
-                steamId = await ctx.steam.getSteamId(target);
-            }
+            if (!steamId)
+                return session.text('.user_not_found');
+            const profile = await ctx.steam.getUserData(steamId);
+            const image = await ctx.drawer.drawPlayerStatus(profile, steamId);
+            if (typeof image === 'string')
+                return session.send(image);
+            return session.send(koishi_1.h.image(image, 'image/png'));
         }
-        else {
-            const bind = await ctx.database.get('steam_bind', { userId: session.userId, channelId: session.channelId });
-            if (bind.length)
-                steamId = bind[0].steamId;
+        catch (err) {
+            exports.logger.error(err);
+            return session.text('.error');
         }
-        if (!steamId)
-            return session.text('.user_not_found');
-        const profile = await ctx.steam.getUserData(steamId);
-        const image = await ctx.drawer.drawPlayerStatus(profile, steamId);
-        if (typeof image === 'string')
-            return session.send(image);
-        return session.send(koishi_1.h.image(image, 'image/png'));
     });
     ctx.command('steam.check', 'Check Friends Status', { authority: config.commandAuthority.check })
         .alias('steamcheck', '查看steam', '查steam')
         .action(async ({ session }) => {
         if (!session)
             return;
-        const binds = await ctx.database.get('steam_bind', { channelId: session.channelId });
-        if (binds.length === 0)
-            return session.text('.no_binds');
-        const steamIds = binds.map(b => b.steamId);
-        const summaries = await ctx.steam.getPlayerSummaries(steamIds);
-        if (summaries.length === 0)
-            return session.text('.api_error');
-        const channelInfo = await ctx.database.get('steam_channel', { id: session.channelId });
-        const parentAvatar = channelInfo[0]?.avatar
-            ? Buffer.from(channelInfo[0].avatar, 'base64')
-            : await ctx.drawer.getDefaultAvatar();
-        const parentName = channelInfo[0]?.name || session.channelId || 'Unknown';
-        const image = await ctx.drawer.drawFriendsStatus(parentAvatar, parentName, summaries, binds);
-        if (typeof image === 'string')
-            return session.send(image);
-        return session.send(koishi_1.h.image(image, 'image/png'));
+        try {
+            const binds = await ctx.database.get('steam_bind', { channelId: session.channelId });
+            if (binds.length === 0)
+                return session.text('.no_binds');
+            const steamIds = binds.map(b => b.steamId);
+            const summaries = await ctx.steam.getPlayerSummaries(steamIds);
+            if (summaries.length === 0)
+                return session.text('.api_error');
+            const channelInfo = await ctx.database.get('steam_channel', { id: session.channelId });
+            const parentAvatar = channelInfo[0]?.avatar
+                ? Buffer.from(channelInfo[0].avatar, 'base64')
+                : await ctx.drawer.getDefaultAvatar();
+            const parentName = channelInfo[0]?.name || session.channelId || 'Unknown';
+            const image = await ctx.drawer.drawFriendsStatus(parentAvatar, parentName, summaries, binds);
+            if (typeof image === 'string')
+                return session.send(image);
+            return session.send(koishi_1.h.image(image, 'image/png'));
+        }
+        catch (err) {
+            exports.logger.error(err);
+            return session.text('.error');
+        }
     });
     ctx.command('steam.enable', 'Enable Broadcast', { authority: config.commandAuthority.enable })
         .alias('steamenable', '启用steam')
         .action(async ({ session }) => {
         if (!session)
             return;
-        await ctx.database.upsert('steam_channel', [{ id: session.channelId, enable: true }]);
+        await ctx.database.upsert('steam_channel', [{
+                id: session.channelId,
+                enable: true,
+                platform: session.platform,
+                assignee: session.selfId,
+            }]);
         return session.text('.enable_success');
     });
     ctx.command('steam.disable', 'Disable Broadcast', { authority: config.commandAuthority.disable })
@@ -153,7 +180,12 @@ function apply(ctx, config) {
         .action(async ({ session }) => {
         if (!session)
             return;
-        await ctx.database.upsert('steam_channel', [{ id: session.channelId, enable: false }]);
+        await ctx.database.upsert('steam_channel', [{
+                id: session.channelId,
+                enable: false,
+                platform: session.platform,
+                assignee: session.selfId,
+            }]);
         return session.text('.disable_success');
     });
     ctx.command('steam.update [name:string] [avatar:image]', 'Update Group Info', { authority: config.commandAuthority.update })
@@ -170,7 +202,7 @@ function apply(ctx, config) {
         }
         if (!name && !avatarBase64)
             return session.text('.args_missing');
-        const update = { id: session.channelId };
+        const update = { id: session.channelId, platform: session.platform, assignee: session.selfId };
         if (name)
             update.name = name;
         if (avatarBase64)
@@ -190,13 +222,29 @@ function apply(ctx, config) {
         return session.text('.nickname_set', [nickname]);
     });
     // Scheduler
+    let skipFirstBroadcast = config.steamDisableBroadcastOnStartup;
     ctx.setInterval(async () => {
-        await broadcast(ctx);
+        if (skipFirstBroadcast) {
+            await seedStatusCache(ctx);
+            skipFirstBroadcast = false;
+            return;
+        }
+        await broadcast(ctx, config);
     }, config.steamRequestInterval * 1000);
 }
 // Broadcast Logic
 const statusCache = new Map();
-async function broadcast(ctx) {
+async function seedStatusCache(ctx) {
+    const binds = await ctx.database.get('steam_bind', {});
+    if (!binds.length)
+        return;
+    const steamIds = [...new Set(binds.map(b => b.steamId))];
+    const summaries = await ctx.steam.getPlayerSummaries(steamIds);
+    for (const player of summaries) {
+        statusCache.set(player.steamid, player);
+    }
+}
+async function broadcast(ctx, config) {
     const channels = await ctx.database.get('steam_channel', { enable: true });
     if (channels.length === 0)
         return;
@@ -233,13 +281,14 @@ async function broadcast(ctx) {
             }
         }
         if (msgs.length > 0) {
-            const bot = ctx.bots[0];
+            const botKey = channel.platform && channel.assignee ? `${channel.platform}:${channel.assignee}` : undefined;
+            const bot = botKey ? ctx.bots[botKey] : Object.values(ctx.bots)[0];
             if (!bot)
                 continue;
-            if (ctx.config.steamBroadcastType === 'none') {
+            if (config.steamBroadcastType === 'none') {
                 await bot.sendMessage(channel.id, msgs.join('\n'));
             }
-            else if (ctx.config.steamBroadcastType === 'part') {
+            else if (config.steamBroadcastType === 'part') {
                 if (startGamingPlayers.length > 0) {
                     const images = await Promise.all(startGamingPlayers.map(p => ctx.drawer.drawStartGaming(p, p.nickname)));
                     const combined = await ctx.drawer.concatImages(images);
@@ -250,7 +299,7 @@ async function broadcast(ctx) {
                     await bot.sendMessage(channel.id, msgs.join('\n'));
                 }
             }
-            else if (ctx.config.steamBroadcastType === 'all') {
+            else if (config.steamBroadcastType === 'all') {
                 const channelPlayers = channelBinds.map(b => currentMap.get(b.steamId)).filter(Boolean);
                 const parentAvatar = channel.avatar ? Buffer.from(channel.avatar, 'base64') : await ctx.drawer.getDefaultAvatar();
                 const image = await ctx.drawer.drawFriendsStatus(parentAvatar, channel.name || channel.id, channelPlayers, channelBinds);

package/dist/locales/zh-CN.d.ts

@@ -0,0 +1,61 @@
+declare const _default: {
+    commands: {
+        steam: {
+            bind: {
+                messages: {
+                    invalid_id: string;
+                    id_not_found: string;
+                    bind_success: string;
+                    error: string;
+                };
+            };
+            unbind: {
+                messages: {
+                    unbind_success: string;
+                    not_bound: string;
+                    error: string;
+                };
+            };
+            info: {
+                messages: {
+                    user_not_found: string;
+                    error: string;
+                };
+            };
+            check: {
+                messages: {
+                    no_binds: string;
+                    api_error: string;
+                    error: string;
+                };
+            };
+            enable: {
+                messages: {
+                    enable_success: string;
+                    error: string;
+                };
+            };
+            disable: {
+                messages: {
+                    disable_success: string;
+                    error: string;
+                };
+            };
+            update: {
+                messages: {
+                    args_missing: string;
+                    update_success: string;
+                    error: string;
+                };
+            };
+            nickname: {
+                messages: {
+                    not_bound: string;
+                    nickname_set: string;
+                    error: string;
+                };
+            };
+        };
+    };
+};
+export default _default;

package/dist/locales/zh-CN.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    commands: {
+        steam: {
+            bind: {
+                messages: {
+                    invalid_id: '请输入有效的 Steam ID。',
+                    id_not_found: '无法找到该 Steam ID。',
+                    bind_success: '绑定成功！Steam ID: {0}',
+                    error: '发生错误。',
+                },
+            },
+            unbind: {
+                messages: {
+                    unbind_success: '解绑成功。',
+                    not_bound: '你还没有绑定 Steam ID。',
+                    error: '发生错误。',
+                },
+            },
+            info: {
+                messages: {
+                    user_not_found: '未找到用户信息。',
+                    error: '发生错误。',
+                },
+            },
+            check: {
+                messages: {
+                    no_binds: '本群尚无绑定用户。',
+                    api_error: '连接 Steam API 失败。',
+                    error: '发生错误。',
+                },
+            },
+            enable: {
+                messages: {
+                    enable_success: '已开启本群播报。',
+                    error: '发生错误。',
+                },
+            },
+            disable: {
+                messages: {
+                    disable_success: '已关闭本群播报。',
+                    error: '发生错误。',
+                },
+            },
+            update: {
+                messages: {
+                    args_missing: '参数缺失。',
+                    update_success: '更新群信息成功。',
+                    error: '发生错误。',
+                },
+            },
+            nickname: {
+                messages: {
+                    not_bound: '你还没有绑定 Steam ID。',
+                    nickname_set: '昵称已设置为 {0}。',
+                    error: '发生错误。',
+                },
+            },
+        },
+    },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-steam-info-check",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Steam friends status broadcast plugin for Koishi",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -53,4 +53,4 @@
     "typescript": "^5.0.0",
     "koishi": "^4.16.0"
   }
-}
+}

package/src/database.ts

@@ -11,6 +11,8 @@ export interface SteamChannel {
   enable: boolean
   name?: string
   avatar?: string
+  platform?: string
+  assignee?: string
 }
 
 declare module 'koishi' {

package/src/index.ts

@@ -2,9 +2,10 @@ import { Context, Schema, Logger, Service, Session, h } from 'koishi'
 import { SteamService } from './service'
 import { DrawService } from './drawer'
 import { SteamBind, SteamChannel } from './database'
+import zhCN from './locales/zh-CN'
 
 export const name = 'steam-info'
-export const inject = ['model', 'http', 'puppeteer', 'database']
+export const inject = ['model', 'http', 'puppeteer', 'database', 'steam', 'drawer']
 
 export interface Config {
   steamApiKey: string[]
@@ -63,7 +64,7 @@ declare module 'koishi' {
 
 export function apply(ctx: Context, config: Config) {
   // Localization
-  ctx.i18n.define('zh-CN', require('./locales/zh-CN'))
+  ctx.i18n.define('zh-CN', zhCN)
 
   // Services
   ctx.plugin(SteamService, config)
@@ -86,6 +87,8 @@ export function apply(ctx: Context, config: Config) {
     enable: 'boolean',
     name: 'string',
     avatar: 'string',
+    platform: 'string',
+    assignee: 'string',
   }, {
     primary: 'id',
   })
@@ -128,57 +131,77 @@ export function apply(ctx: Context, config: Config) {
     .alias('steaminfo', 'steam信息')
     .action(async ({ session }, target) => {
       if (!session) return
-      let steamId: string | null = null
-      if (target) {
-        // Check if target is mention
-        const [platform, userId] = session.resolve(target)
-        if (userId) {
-           const bind = await ctx.database.get('steam_bind', { userId, channelId: session.channelId })
-           if (bind.length) steamId = bind[0].steamId
-        } else if (/^\d+$/.test(target)) {
-           steamId = await ctx.steam.getSteamId(target)
+      try {
+        let steamId: string | null = null
+        if (target) {
+          try {
+            const [, userId] = session.resolve(target)
+            if (userId) {
+              const bind = await ctx.database.get('steam_bind', { userId, channelId: session.channelId })
+              if (bind.length) steamId = bind[0].steamId
+            }
+          } catch {
+            /* ignore resolve errors */
+          }
+
+          if (!steamId && /^\d+$/.test(target)) {
+            steamId = await ctx.steam.getSteamId(target)
+          }
+        } else {
+          const bind = await ctx.database.get('steam_bind', { userId: session.userId, channelId: session.channelId })
+          if (bind.length) steamId = bind[0].steamId
         }
-      } else {
-        const bind = await ctx.database.get('steam_bind', { userId: session.userId, channelId: session.channelId })
-        if (bind.length) steamId = bind[0].steamId
-      }
 
-      if (!steamId) return session.text('.user_not_found')
+        if (!steamId) return session.text('.user_not_found')
 
-      const profile = await ctx.steam.getUserData(steamId)
-      const image = await ctx.drawer.drawPlayerStatus(profile, steamId)
-      if (typeof image === 'string') return session.send(image)
-      return session.send(h.image(image, 'image/png'))
+        const profile = await ctx.steam.getUserData(steamId)
+        const image = await ctx.drawer.drawPlayerStatus(profile, steamId)
+        if (typeof image === 'string') return session.send(image)
+        return session.send(h.image(image, 'image/png'))
+      } catch (err) {
+        logger.error(err)
+        return session.text('.error')
+      }
     })
 
   ctx.command('steam.check', 'Check Friends Status', { authority: config.commandAuthority.check })
     .alias('steamcheck', '查看steam', '查steam')
     .action(async ({ session }) => {
       if (!session) return
-      const binds = await ctx.database.get('steam_bind', { channelId: session.channelId })
-      if (binds.length === 0) return session.text('.no_binds')
+      try {
+        const binds = await ctx.database.get('steam_bind', { channelId: session.channelId })
+        if (binds.length === 0) return session.text('.no_binds')
 
-      const steamIds = binds.map(b => b.steamId)
-      const summaries = await ctx.steam.getPlayerSummaries(steamIds)
-      
-      if (summaries.length === 0) return session.text('.api_error')
-
-      const channelInfo = await ctx.database.get('steam_channel', { id: session.channelId })
-      const parentAvatar = channelInfo[0]?.avatar 
-        ? Buffer.from(channelInfo[0].avatar, 'base64') 
-        : await ctx.drawer.getDefaultAvatar()
-      const parentName = channelInfo[0]?.name || session.channelId || 'Unknown'
-
-      const image = await ctx.drawer.drawFriendsStatus(parentAvatar, parentName, summaries, binds)
-      if (typeof image === 'string') return session.send(image)
-      return session.send(h.image(image, 'image/png'))
+        const steamIds = binds.map(b => b.steamId)
+        const summaries = await ctx.steam.getPlayerSummaries(steamIds)
+        
+        if (summaries.length === 0) return session.text('.api_error')
+
+        const channelInfo = await ctx.database.get('steam_channel', { id: session.channelId })
+        const parentAvatar = channelInfo[0]?.avatar 
+          ? Buffer.from(channelInfo[0].avatar, 'base64') 
+          : await ctx.drawer.getDefaultAvatar()
+        const parentName = channelInfo[0]?.name || session.channelId || 'Unknown'
+
+        const image = await ctx.drawer.drawFriendsStatus(parentAvatar, parentName, summaries, binds)
+        if (typeof image === 'string') return session.send(image)
+        return session.send(h.image(image, 'image/png'))
+      } catch (err) {
+        logger.error(err)
+        return session.text('.error')
+      }
     })
 
   ctx.command('steam.enable', 'Enable Broadcast', { authority: config.commandAuthority.enable })
     .alias('steamenable', '启用steam')
     .action(async ({ session }) => {
       if (!session) return
-      await ctx.database.upsert('steam_channel', [{ id: session.channelId, enable: true }])
+      await ctx.database.upsert('steam_channel', [{
+        id: session.channelId,
+        enable: true,
+        platform: session.platform,
+        assignee: session.selfId,
+      }])
       return session.text('.enable_success')
     })
 
@@ -186,7 +209,12 @@ export function apply(ctx: Context, config: Config) {
     .alias('steamdisable', '禁用steam')
     .action(async ({ session }) => {
       if (!session) return
-      await ctx.database.upsert('steam_channel', [{ id: session.channelId, enable: false }])
+      await ctx.database.upsert('steam_channel', [{
+        id: session.channelId,
+        enable: false,
+        platform: session.platform,
+        assignee: session.selfId,
+      }])
       return session.text('.disable_success')
     })
   
@@ -205,7 +233,7 @@ export function apply(ctx: Context, config: Config) {
 
         if (!name && !avatarBase64) return session.text('.args_missing')
 
-        const update: any = { id: session.channelId }
+        const update: any = { id: session.channelId, platform: session.platform, assignee: session.selfId }
         if (name) update.name = name
         if (avatarBase64) update.avatar = avatarBase64
         
@@ -225,15 +253,31 @@ export function apply(ctx: Context, config: Config) {
     })
 
   // Scheduler
+  let skipFirstBroadcast = config.steamDisableBroadcastOnStartup
   ctx.setInterval(async () => {
-    await broadcast(ctx)
+    if (skipFirstBroadcast) {
+      await seedStatusCache(ctx)
+      skipFirstBroadcast = false
+      return
+    }
+    await broadcast(ctx, config)
   }, config.steamRequestInterval * 1000)
 }
 
 // Broadcast Logic
 const statusCache = new Map<string, any>()
 
-async function broadcast(ctx: Context) {
+async function seedStatusCache(ctx: Context) {
+  const binds = await ctx.database.get('steam_bind', {})
+  if (!binds.length) return
+  const steamIds = [...new Set(binds.map(b => b.steamId))]
+  const summaries = await ctx.steam.getPlayerSummaries(steamIds)
+  for (const player of summaries) {
+    statusCache.set(player.steamid, player)
+  }
+}
+
+async function broadcast(ctx: Context, config: Config) {
   const channels = await ctx.database.get('steam_channel', { enable: true })
   if (channels.length === 0) return
 
@@ -274,12 +318,13 @@ async function broadcast(ctx: Context) {
     }
 
     if (msgs.length > 0) {
-        const bot = ctx.bots[0]
+      const botKey = channel.platform && channel.assignee ? `${channel.platform}:${channel.assignee}` : undefined
+      const bot = botKey ? ctx.bots[botKey] : Object.values(ctx.bots)[0]
         if (!bot) continue
 
-        if (ctx.config.steamBroadcastType === 'none') {
+      if (config.steamBroadcastType === 'none') {
             await bot.sendMessage(channel.id, msgs.join('\n'))
-        } else if (ctx.config.steamBroadcastType === 'part') {
+      } else if (config.steamBroadcastType === 'part') {
             if (startGamingPlayers.length > 0) {
                 const images = await Promise.all(startGamingPlayers.map(p => ctx.drawer.drawStartGaming(p, p.nickname)))
                 const combined = await ctx.drawer.concatImages(images)
@@ -288,7 +333,7 @@ async function broadcast(ctx: Context) {
             } else {
                 await bot.sendMessage(channel.id, msgs.join('\n'))
             }
-        } else if (ctx.config.steamBroadcastType === 'all') {
+      } else if (config.steamBroadcastType === 'all') {
             const channelPlayers = channelBinds.map(b => currentMap.get(b.steamId)).filter(Boolean) as any[]
             const parentAvatar = channel.avatar ? Buffer.from(channel.avatar, 'base64') : await ctx.drawer.getDefaultAvatar()
             const image = await ctx.drawer.drawFriendsStatus(parentAvatar, channel.name || channel.id, channelPlayers, channelBinds)

package/src/locales/zh-CN.ts

@@ -0,0 +1,60 @@
+export default {
+  commands: {
+    steam: {
+      bind: {
+        messages: {
+          invalid_id: '请输入有效的 Steam ID。',
+          id_not_found: '无法找到该 Steam ID。',
+          bind_success: '绑定成功！Steam ID: {0}',
+          error: '发生错误。',
+        },
+      },
+      unbind: {
+        messages: {
+          unbind_success: '解绑成功。',
+          not_bound: '你还没有绑定 Steam ID。',
+          error: '发生错误。',
+        },
+      },
+      info: {
+        messages: {
+          user_not_found: '未找到用户信息。',
+          error: '发生错误。',
+        },
+      },
+      check: {
+        messages: {
+          no_binds: '本群尚无绑定用户。',
+          api_error: '连接 Steam API 失败。',
+          error: '发生错误。',
+        },
+      },
+      enable: {
+        messages: {
+          enable_success: '已开启本群播报。',
+          error: '发生错误。',
+        },
+      },
+      disable: {
+        messages: {
+          disable_success: '已关闭本群播报。',
+          error: '发生错误。',
+        },
+      },
+      update: {
+        messages: {
+          args_missing: '参数缺失。',
+          update_success: '更新群信息成功。',
+          error: '发生错误。',
+        },
+      },
+      nickname: {
+        messages: {
+          not_bound: '你还没有绑定 Steam ID。',
+          nickname_set: '昵称已设置为 {0}。',
+          error: '发生错误。',
+        },
+      },
+    },
+  },
+}