From d4ec1dd7750f5a901eaf079a7b5fd8153701aed3 Mon Sep 17 00:00:00 2001
From: Steffen Kolmer <steffen@kolmer.net>
Date: Wed, 21 Oct 2020 13:56:58 +0200
Subject: [PATCH] Refactoring

---
 src/components/structures/RoomView.tsx           |  2 +-
 .../views/elements/effects/confetti/index.ts     |  1 -
 src/components/views/elements/effects/index.ts   | 16 ++++++++++++++--
 .../views/rooms/SendMessageComposer.js           |  6 +++---
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 0b7aa08288..c84a3bf783 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -815,7 +815,7 @@ export default class RoomView extends React.Component<IProps, IState> {
     private handleConfetti = (ev) => {
         if (this.state.room.getUnreadNotificationCount() === 0) return;
         if (this.state.matrixClientIsReady) {
-            effects.map(effect => {
+            effects.forEach(effect => {
                 if (containsEmoji(ev.getContent(), effect.emojis) || ev.getContent().msgtype === effect.msgType) {
                     dis.dispatch({action: `effects.${effect.command}`});
                 }
diff --git a/src/components/views/elements/effects/confetti/index.ts b/src/components/views/elements/effects/confetti/index.ts
index c5874311c5..e8a139387b 100644
--- a/src/components/views/elements/effects/confetti/index.ts
+++ b/src/components/views/elements/effects/confetti/index.ts
@@ -94,7 +94,6 @@ export default class Confetti implements ICanvasEffect {
 
     public stop = async () => {
         this.isRunning = false;
-       // this.particles = [];
     }
 
     private resetParticle = (particle: ConfettiParticle, width: number, height: number): ConfettiParticle => {
diff --git a/src/components/views/elements/effects/index.ts b/src/components/views/elements/effects/index.ts
index d4c12fa7ce..6311135c1e 100644
--- a/src/components/views/elements/effects/index.ts
+++ b/src/components/views/elements/effects/index.ts
@@ -1,6 +1,14 @@
 import {_t, _td} from "../../../../languageHandler";
 
-export default [
+type Effect = {
+    emojis: Array<string>;
+    msgType: string;
+    command: string;
+    description: () => string;
+    fallbackMessage: () => string;
+}
+
+const effects: Array<Effect> = [
     {
         emojis: ['🎊', '🎉'],
         msgType: 'nic.custom.confetti',
@@ -8,4 +16,8 @@ export default [
         description: () => _td("Sends the given message with confetti"),
         fallbackMessage: () => _t("sends confetti") + " 🎉",
     },
-]
+];
+
+export default effects;
+
+
diff --git a/src/components/views/rooms/SendMessageComposer.js b/src/components/views/rooms/SendMessageComposer.js
index 94ad934067..a413a9917c 100644
--- a/src/components/views/rooms/SendMessageComposer.js
+++ b/src/components/views/rooms/SendMessageComposer.js
@@ -318,10 +318,10 @@ export default class SendMessageComposer extends React.Component {
                 });
             }
             dis.dispatch({action: "message_sent"});
-            effects.map( (effect) => {
+            effects.forEach((effect) => {
                 if (containsEmoji(content, effect.emojis)) {
-                dis.dispatch({action: `effects.${effect.command}`});
-            }
+                    dis.dispatch({action: `effects.${effect.command}`});
+                }
             });
         }