michael/cinny
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity

Add reason in command

Browse source
This commit is contained in:
Ajay Bura 2022-08-29 20:46:14 +05:30
parent 180b908bd0
commit dc3c1a6be3
2 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/app/organisms/room/commands.jsx
View file

@ -14,6 +14,23 @@ const ROOM_ID_ALIAS_REG = /^(#|!)\S+:\S+$/;
const ROOM_ID_REG = /^!\S+:\S+$/; const ROOM_ID_REG = /^!\S+:\S+$/;
const MXC_REG = /^mxc:\/\/\S+$/; const MXC_REG = /^mxc:\/\/\S+$/;
export function processMxidAndReason(data) {
let reason;
let idData = data;
const reasonMatch = data.match(/\s-r\s/);
if (reasonMatch) {
idData = data.slice(0, reasonMatch.index);
reason = data.slice(reasonMatch.index + reasonMatch[0].length);
if (reason.trim() === '') reason = undefined;
}
const rawIds = idData.split(' ');
const userIds = rawIds.filter((id) => id.match(MXID_REG));
return {
userIds,
reason,
};
}
const commands = { const commands = {
me: { me: {
name: 'me', name: 'me',
@ -40,7 +57,7 @@ const commands = {
}, },
startdm: { startdm: {
name: 'startdm', name: 'startdm',
description: 'Start DM with user. Example: /startdm @johndoe.matrix.org (Accept multiple MXID)', description: 'Start DM with user. Example: /startdm userId1 userId2',
exe: async (roomId, data) => { exe: async (roomId, data) => {
const mx = initMatrix.matrixClient; const mx = initMatrix.matrixClient;
const rawIds = data.split(' '); const rawIds = data.split(' ');
@ -61,7 +78,7 @@ const commands = {
}, },
join: { join: {
name: 'join', name: 'join',
description: 'Join room with alias. Example: /join #cinny:matrix.org (Accept multiple alias)', description: 'Join room with alias. Example: /join alias1 alias2',
exe: (roomId, data) => { exe: (roomId, data) => {
const rawIds = data.split(' '); const rawIds = data.split(' ');
const roomIds = rawIds.filter((id) => id.match(ROOM_ID_ALIAS_REG)); const roomIds = rawIds.filter((id) => id.match(ROOM_ID_ALIAS_REG));
@ -83,43 +100,39 @@ const commands = {
}, },
invite: { invite: {
name: 'invite', name: 'invite',
description: 'Invite user to room. Example: /invite @johndoe:matrix.org (Accept multiple MXID)', description: 'Invite user to room. Example: /invite userId1 userId2 [-r reason]',
exe: (roomId, data) => { exe: (roomId, data) => {
const rawIds = data.split(' '); const { userIds, reason } = processMxidAndReason(data);
const userIds = rawIds.filter((id) => id.match(MXID_REG)); userIds.map((id) => roomActions.invite(roomId, id, reason));
userIds.map((id) => roomActions.invite(roomId, id));
}, },
}, },
disinvite: { disinvite: {
name: 'disinvite', name: 'disinvite',
description: 'Disinvite user to room. Example: /disinvite @johndoe:matrix.org (Accept multiple MXID)', description: 'Disinvite user to room. Example: /disinvite userId1 userId2 [-r reason]',
exe: (roomId, data) => { exe: (roomId, data) => {
const rawIds = data.split(' '); const { userIds, reason } = processMxidAndReason(data);
const userIds = rawIds.filter((id) => id.match(MXID_REG)); userIds.map((id) => roomActions.kick(roomId, id, reason));
userIds.map((id) => roomActions.kick(roomId, id));
}, },
}, },
kick: { kick: {
name: 'kick', name: 'kick',
description: 'Kick user from room. Example: /kick @johndoe:matrix.org (Accept multiple MXID)', description: 'Kick user from room. Example: /kick userId1 userId2 [-r reason]',
exe: (roomId, data) => { exe: (roomId, data) => {
const rawIds = data.split(' '); const { userIds, reason } = processMxidAndReason(data);
const userIds = rawIds.filter((id) => id.match(MXID_REG)); userIds.map((id) => roomActions.kick(roomId, id, reason));
userIds.map((id) => roomActions.kick(roomId, id));
}, },
}, },
ban: { ban: {
name: 'ban', name: 'ban',
description: 'Ban user from room. Example: /ban @johndoe:matrix.org (Accept multiple MXID)', description: 'Ban user from room. Example: /ban userId1 userId2 [-r reason]',
exe: (roomId, data) => { exe: (roomId, data) => {
const rawIds = data.split(' '); const { userIds, reason } = processMxidAndReason(data);
const userIds = rawIds.filter((id) => id.match(MXID_REG)); userIds.map((id) => roomActions.ban(roomId, id, reason));
userIds.map((id) => roomActions.ban(roomId, id));
}, },
}, },
unban: { unban: {
name: 'unban', name: 'unban',
description: 'Unban user from room. Example: /unban @johndoe:matrix.org (Accept multiple MXID)', description: 'Unban user from room. Example: /unban userId1 userId2',
exe: (roomId, data) => { exe: (roomId, data) => {
const rawIds = data.split(' '); const rawIds = data.split(' ');
const userIds = rawIds.filter((id) => id.match(MXID_REG)); const userIds = rawIds.filter((id) => id.match(MXID_REG));
@ -128,7 +141,7 @@ const commands = {
}, },
ignore: { ignore: {
name: 'ignore', name: 'ignore',
description: 'Ignore user. Example: /ignore @johndoe:matrix.org (Accept multiple MXID)', description: 'Ignore user. Example: /ignore userId1 userId2',
exe: (roomId, data) => { exe: (roomId, data) => {
const rawIds = data.split(' '); const rawIds = data.split(' ');
const userIds = rawIds.filter((id) => id.match(MXID_REG)); const userIds = rawIds.filter((id) => id.match(MXID_REG));
@ -137,7 +150,7 @@ const commands = {
}, },
unignore: { unignore: {
name: 'unignore', name: 'unignore',
description: 'Unignore user. Example: /unignore @johndoe:matrix.org (Accept multiple MXID)', description: 'Unignore user. Example: /unignore userId1 userId2',
exe: (roomId, data) => { exe: (roomId, data) => {
const rawIds = data.split(' '); const rawIds = data.split(' ');
const userIds = rawIds.filter((id) => id.match(MXID_REG)); const userIds = rawIds.filter((id) => id.match(MXID_REG));

4
src/client/action/room.js
View file

@ -272,10 +272,10 @@ async function createRoom(opts) {
return result; return result;
} }
async function invite(roomId, userId) { async function invite(roomId, userId, reason) {
const mx = initMatrix.matrixClient; const mx = initMatrix.matrixClient;
const result = await mx.invite(roomId, userId); const result = await mx.invite(roomId, userId, undefined, reason);
return result; return result;
} }