From 78c4c67a6cf57452d482f6e1eb550e10256e5cc5 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 18 Aug 2021 14:05:10 +0530 Subject: [PATCH] implemented #63 : non kick leave msgs --- src/app/organisms/channel/common.jsx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app/organisms/channel/common.jsx b/src/app/organisms/channel/common.jsx index 5749872..183f2d8 100644 --- a/src/app/organisms/channel/common.jsx +++ b/src/app/organisms/channel/common.jsx @@ -12,11 +12,13 @@ function getTimelineJSXMessages() { ); }, - leave(user) { + leave(user, reason) { + const reasonMsg = (typeof reason === 'string') ? `: ${reason}` : ''; return ( <> {user} {' left the channel'} + {reasonMsg} ); }, @@ -48,7 +50,7 @@ function getTimelineJSXMessages() { ); }, kick(actor, user, reason) { - const reasonMsg = (typeof reason === 'string') ? ` for ${reason}` : ''; + const reasonMsg = (typeof reason === 'string') ? `: ${reason}` : ''; return ( <> {actor} @@ -59,7 +61,7 @@ function getTimelineJSXMessages() { ); }, ban(actor, user, reason) { - const reasonMsg = (typeof reason === 'string') ? ` for ${reason}` : ''; + const reasonMsg = (typeof reason === 'string') ? `: ${reason}` : ''; return ( <> {actor} @@ -209,7 +211,7 @@ function parseTimelineChange(mEvent) { if (sender === mEvent.getStateKey()) { switch (prevContent.membership) { case 'invite': return makeReturnObj('invite-cancel', tJSXMsgs.rejectInvite(senderName)); - default: return makeReturnObj('leave', tJSXMsgs.leave(senderName)); + default: return makeReturnObj('leave', tJSXMsgs.leave(senderName, content.reason)); } } switch (prevContent.membership) {