dandri/Draupnir
1
0
Fork 0
mirror of https://github.com/the-draupnir-project/Draupnir.git synced 2026-06-04 06:41:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use similar logic from main command handler in appservice command handler to make it more reliable with displaynames

Browse Source
This commit is contained in:
MTRNord
2023-09-09 16:08:40 +02:00
parent f2fe0b984c
commit 96177b113f
1 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/appservice/bot/AppserviceCommandHandler.ts
+35 -17
View File
@@ -56,24 +56,42 @@ export class AppserviceCommandHandler {
}
const body = typeof mxEvent.content['body'] === 'string' ? mxEvent.content['body'] : '';
const ownUserId = this.appservice.bridge.getBot().getUserId();
const localpart = ownUserId.split(":")[0].substring(1);
const ownProfile = await this.appservice.bridge.getBot().getClient().getUserProfile(ownUserId);
if (body.startsWith(ownUserId) || (ownProfile && body.startsWith(ownProfile['displayname']))) {
console.log("Got admin command");
const readItems = readCommand(body).slice(1); // remove "!mjolnir"
const argumentStream = new ArgumentStream(readItems);
const command = this.commandTable.findAMatchingCommand(argumentStream);
if (command) {
const adaptor = findMatrixInterfaceAdaptor(command);
const context: AppserviceContext = {
appservice: this.appservice,
roomId: mxEvent.room_id,
event: mxEvent,
client: this.appservice.bridge.getBot().getClient(),
emitter: new AppserviceBotEmitter(),
};
await adaptor.invoke(context, context, ...argumentStream.rest());
return;
}
const prefixes = [
localpart + ":",
ownUserId + ":",
localpart + " ",
ownUserId + " "
];
if (ownProfile) {
prefixes.push(...[
ownProfile['displayname'] + ".",
ownProfile['displayname'] + " "
])
}
const prefixUsed = prefixes.find(p => body.toLowerCase().startsWith(p.toLowerCase()));
if (!prefixUsed) return;
console.log("Got admin command");
let restOfBody = body.substring(prefixUsed.length);
const readItems = readCommand(restOfBody)
const argumentStream = new ArgumentStream(readItems);
const command = this.commandTable.findAMatchingCommand(argumentStream);
if (command) {
const adaptor = findMatrixInterfaceAdaptor(command);
const context: AppserviceContext = {
appservice: this.appservice,
roomId: mxEvent.room_id,
event: mxEvent,
client: this.appservice.bridge.getBot().getClient(),
emitter: new AppserviceBotEmitter(),
};
await adaptor.invoke(context, context, ...argumentStream.rest());
return;
}
}
}