Refactoring

pull/21833/head
Steffen Kolmer 2020-10-21 13:56:58 +02:00
parent 1c6d28b861
commit d4ec1dd775
4 changed files with 18 additions and 7 deletions

View File

@ -815,7 +815,7 @@ export default class RoomView extends React.Component<IProps, IState> {
private handleConfetti = (ev) => { private handleConfetti = (ev) => {
if (this.state.room.getUnreadNotificationCount() === 0) return; if (this.state.room.getUnreadNotificationCount() === 0) return;
if (this.state.matrixClientIsReady) { if (this.state.matrixClientIsReady) {
effects.map(effect => { effects.forEach(effect => {
if (containsEmoji(ev.getContent(), effect.emojis) || ev.getContent().msgtype === effect.msgType) { if (containsEmoji(ev.getContent(), effect.emojis) || ev.getContent().msgtype === effect.msgType) {
dis.dispatch({action: `effects.${effect.command}`}); dis.dispatch({action: `effects.${effect.command}`});
} }

View File

@ -94,7 +94,6 @@ export default class Confetti implements ICanvasEffect {
public stop = async () => { public stop = async () => {
this.isRunning = false; this.isRunning = false;
// this.particles = [];
} }
private resetParticle = (particle: ConfettiParticle, width: number, height: number): ConfettiParticle => { private resetParticle = (particle: ConfettiParticle, width: number, height: number): ConfettiParticle => {

View File

@ -1,6 +1,14 @@
import {_t, _td} from "../../../../languageHandler"; 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: ['🎊', '🎉'], emojis: ['🎊', '🎉'],
msgType: 'nic.custom.confetti', msgType: 'nic.custom.confetti',
@ -8,4 +16,8 @@ export default [
description: () => _td("Sends the given message with confetti"), description: () => _td("Sends the given message with confetti"),
fallbackMessage: () => _t("sends confetti") + " 🎉", fallbackMessage: () => _t("sends confetti") + " 🎉",
}, },
] ];
export default effects;

View File

@ -318,7 +318,7 @@ export default class SendMessageComposer extends React.Component {
}); });
} }
dis.dispatch({action: "message_sent"}); dis.dispatch({action: "message_sent"});
effects.map( (effect) => { effects.forEach((effect) => {
if (containsEmoji(content, effect.emojis)) { if (containsEmoji(content, effect.emojis)) {
dis.dispatch({action: `effects.${effect.command}`}); dis.dispatch({action: `effects.${effect.command}`});
} }