mirror of
https://github.com/PHIDIAS0303/ClusterChatSync.git
synced 2026-11-11 15:14:52 +09:00
Update controller.ts
This commit is contained in:
1 parent
d57bde9e22
commit
9f2c7d05e0
1 file changed
+6
-8
+6
-8
@@ -107,14 +107,14 @@ export default async function(context: ControllerPluginContext) {
|
||||
};
|
||||
|
||||
controller.handle(ChatEvent, async (request: ChatEvent) => {
|
||||
const {instanceName, action, content} = request;
|
||||
const {instance, action, content} = request;
|
||||
|
||||
if (action === 'CHAT' || action === 'SHOUT') {
|
||||
const nrc = content.replace(/\[special-item=.*?\]/g, '<blueprint>').replace(/<@/g, '<@\u200c>');
|
||||
const index = nrc.indexOf(':');
|
||||
const username = index === -1 ? nrc.trim() : nrc.slice(0, index);
|
||||
const msg = index === -1 ? '' : nrc.slice(index + 1).trim();
|
||||
await sendMessage(instanceName, `**\`${username}\`**: ${msg}`);
|
||||
await sendMessage(instance.name, `**\`${username}\`**: ${msg}`);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -122,7 +122,7 @@ export default async function(context: ControllerPluginContext) {
|
||||
const text = content.trim();
|
||||
|
||||
if (!verb) {
|
||||
await sendMessage(instanceName, `unknown action ${action} **\`${text}\`**`);
|
||||
await sendMessage(instance.name, `unknown action ${action} **\`${text}\`**`);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -130,21 +130,19 @@ export default async function(context: ControllerPluginContext) {
|
||||
? text.slice(0, -verb.length).trim()
|
||||
: text;
|
||||
|
||||
const instance = [...controller.instances.values()].find(i => i.config.get('instance.name') === instanceName);
|
||||
|
||||
if (!instance) {
|
||||
await sendMessage(instanceName, `**\`${name}\`** ${verb}`);
|
||||
await sendMessage(instance.name, `**\`${name}\`** ${verb}`);
|
||||
return;
|
||||
}
|
||||
|
||||
let pc = '';
|
||||
|
||||
try {
|
||||
pc = String(await instance.sendRcon('/_rcon return #game.connected_players', false, instanceName)).trim();
|
||||
pc = String(await instance.sendRcon('/_rcon return #game.connected_players', false, instance.name)).trim();
|
||||
} catch {
|
||||
}
|
||||
|
||||
await sendMessage(instanceName, `**\`${name}\`** ${verb}${pc ? ` (${pc})` : ''}`);
|
||||
await sendMessage(instance.name, `**\`${name}\`** ${verb}${pc ? ` (${pc})` : ''}`);
|
||||
});
|
||||
|
||||
controller.config.on('fieldChanged', (field) => {
|
||||
|
||||
Reference in new issue
Block a user