From 5753c964317ab20b1682874416d00cdf9e6c5820 Mon Sep 17 00:00:00 2001
From: nurjinn jafar <nurjin.jafar@nordeck.net>
Date: Tue, 25 Aug 2020 16:39:57 +0200
Subject: [PATCH] a workaround to make ocnfetti work on recipient side. changed
 the implementation of on.Event.decrypted function

---
 src/SlashCommands.tsx                 | 13 +++++++------
 src/components/structures/RoomView.js | 13 ++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index abd4f5449b..03aec46e46 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -1029,15 +1029,16 @@ export const Commands = [
         args: '<message>',
         runFn: function(roomId, args) {
             return success((async () => {
-                const cli = MatrixClientPeg.get();
-                const userId = cli.getUserId();
-                const userName = userId.slice(1).split(":").slice(0, 1);
                 const isChatEffectsDisabled = SettingsStore.getValue('dontShowChatEffects');
                 if ((!args) || (!args && isChatEffectsDisabled)) {
-                    args = _t("* %(userName)s sends confetti", {userName});
+                    args = _t("sends confetti");
+                    MatrixClientPeg.get().sendEmoteMessage(roomId, args);
+                } else {
+                    MatrixClientPeg.get().sendHtmlMessage(roomId, args);
+                }
+                if (!isChatEffectsDisabled) {
+                    dis.dispatch({action: 'confetti'});
                 }
-                cli.sendHtmlMessage(roomId, args,
-                    dis.dispatch({action: 'confetti'}));
             })());
         },
         category: CommandCategories.actions,
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index dfc92526c7..d5ccbf1c8c 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -511,7 +511,6 @@ export default createReactClass({
             this.context.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
             this.context.removeListener("userTrustStatusChanged", this.onUserVerificationChanged);
             this.context.removeListener("crossSigning.keysChanged", this.onCrossSigningKeysChanged);
-            this.context.removeListener("Event.decrypted", this.onEventDecrypted);
         }
 
         window.removeEventListener('beforeunload', this.onPageUnload);
@@ -753,16 +752,16 @@ export default createReactClass({
             }
         }
         if (!SettingsStore.getValue('dontShowChatEffects')) {
-            this.context.on('Event.decrypted', this.onEventDecrypted);
+            this.context.on("Event.decrypted", (ev) => {
+                if (ev.isBeingDecrypted() || ev.isDecryptionFailure()) return;
+                this.handleConfetti(ev);
+            });
         }
     },
-     onEventDecrypted(ev) {
-         if (ev.isBeingDecrypted() || ev.isDecryptionFailure()) return;
-         this.handleConfetti(ev);
-     },
     handleConfetti(ev) {
         if (this.context.isInitialSyncComplete()) {
-            if (isConfettiEmoji(ev.getContent())) {
+            const messageBody = _t('sends confetti');
+            if (isConfettiEmoji(ev.getContent()) || ev.getContent().body === messageBody) {
                 dis.dispatch({action: 'confetti'});
             }
         }