undo accidental changes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>pull/21833/head
parent
c6d69f3d3f
commit
559b8e174b
|
@ -269,7 +269,7 @@ export const Commands = [
|
||||||
const ev = cli.getRoom(roomId).currentState.getStateEvents('m.room.member', cli.getUserId());
|
const ev = cli.getRoom(roomId).currentState.getStateEvents('m.room.member', cli.getUserId());
|
||||||
const content = {
|
const content = {
|
||||||
...ev ? ev.getContent() : { membership: 'join' },
|
...ev ? ev.getContent() : { membership: 'join' },
|
||||||
displaycommand: args,
|
displayname: args,
|
||||||
};
|
};
|
||||||
return success(cli.sendStateEvent(roomId, 'm.room.member', content, cli.getUserId()));
|
return success(cli.sendStateEvent(roomId, 'm.room.member', content, cli.getUserId()));
|
||||||
}
|
}
|
||||||
|
@ -887,6 +887,24 @@ export const Commands = [
|
||||||
},
|
},
|
||||||
category: CommandCategories.advanced,
|
category: CommandCategories.advanced,
|
||||||
}),
|
}),
|
||||||
|
new Command({
|
||||||
|
command: "whois",
|
||||||
|
description: _td("Displays information about a user"),
|
||||||
|
args: "<user-id>",
|
||||||
|
runFn: function (roomId, userId) {
|
||||||
|
if (!userId || !userId.startsWith("@") || !userId.includes(":")) {
|
||||||
|
return reject(this.getUsage());
|
||||||
|
}
|
||||||
|
|
||||||
|
const member = MatrixClientPeg.get().getRoom(roomId).getMember(userId);
|
||||||
|
dis.dispatch({
|
||||||
|
action: 'view_user',
|
||||||
|
member: member || {userId},
|
||||||
|
});
|
||||||
|
return success();
|
||||||
|
},
|
||||||
|
category: CommandCategories.advanced,
|
||||||
|
}),
|
||||||
|
|
||||||
// Command definitions for autocompletion ONLY:
|
// Command definitions for autocompletion ONLY:
|
||||||
// /me is special because its not handled by SlashCommands.js and is instead done inside the Composer classes
|
// /me is special because its not handled by SlashCommands.js and is instead done inside the Composer classes
|
||||||
|
|
|
@ -197,12 +197,12 @@
|
||||||
"WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!",
|
"WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and session %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!",
|
||||||
"Verified key": "Verified key",
|
"Verified key": "Verified key",
|
||||||
"The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.",
|
"The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.": "The signing key you provided matches the signing key you received from %(userId)s's session %(deviceId)s. Session marked as verified.",
|
||||||
"Displays action": "Displays action",
|
|
||||||
"Forces the current outbound group session in an encrypted room to be discarded": "Forces the current outbound group session in an encrypted room to be discarded",
|
"Forces the current outbound group session in an encrypted room to be discarded": "Forces the current outbound group session in an encrypted room to be discarded",
|
||||||
"Sends the given message coloured as a rainbow": "Sends the given message coloured as a rainbow",
|
"Sends the given message coloured as a rainbow": "Sends the given message coloured as a rainbow",
|
||||||
"Sends the given emote coloured as a rainbow": "Sends the given emote coloured as a rainbow",
|
"Sends the given emote coloured as a rainbow": "Sends the given emote coloured as a rainbow",
|
||||||
"Displays list of commands with usages and descriptions": "Displays list of commands with usages and descriptions",
|
"Displays list of commands with usages and descriptions": "Displays list of commands with usages and descriptions",
|
||||||
"Displays information about a user": "Displays information about a user",
|
"Displays information about a user": "Displays information about a user",
|
||||||
|
"Displays action": "Displays action",
|
||||||
"Reason": "Reason",
|
"Reason": "Reason",
|
||||||
"%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
|
"%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
|
||||||
"%(targetName)s accepted an invitation.": "%(targetName)s accepted an invitation.",
|
"%(targetName)s accepted an invitation.": "%(targetName)s accepted an invitation.",
|
||||||
|
|
Loading…
Reference in New Issue