From 3e02cbb3537092720addd4e78f82f19704f3d545 Mon Sep 17 00:00:00 2001
From: _Bastler <_Bastler@bstly.de>
Date: Sat, 17 Apr 2021 12:37:11 +0200
Subject: [PATCH] fix moderationStarts issues

---
 src/app/pages/jitsi/jitsi.component.ts | 2 +-
 src/assets/i18n/de-informal.json       | 1 +
 src/assets/i18n/en.json                | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/pages/jitsi/jitsi.component.ts b/src/app/pages/jitsi/jitsi.component.ts
index c3ddcf9..bf890fc 100644
--- a/src/app/pages/jitsi/jitsi.component.ts
+++ b/src/app/pages/jitsi/jitsi.component.ts
@@ -138,7 +138,7 @@ export class JitsiComponent implements OnInit {
   }
 
   open(jitsiRoom: any, moderation: boolean) {
-    return (moderation || !jitsiRoom.starts || Date.parse(jitsiRoom.starts) < new Date().getTime()) && (!jitsiRoom.expires || Date.parse(jitsiRoom.expires) > new Date().getTime()) && (!moderation || (jitsiRoom.moderationStarts != null && Date.parse(jitsiRoom.moderationStarts) < new Date().getTime()));
+    return (moderation && jitsiRoom.moderationStarts != null || !jitsiRoom.starts || Date.parse(jitsiRoom.starts) < new Date().getTime()) && (!moderation || jitsiRoom.moderationStarts == null || Date.parse(jitsiRoom.moderationStarts) < new Date().getTime());
   }
 }
 
diff --git a/src/assets/i18n/de-informal.json b/src/assets/i18n/de-informal.json
index 30b67be..aa006ba 100644
--- a/src/assets/i18n/de-informal.json
+++ b/src/assets/i18n/de-informal.json
@@ -35,6 +35,7 @@
       "delete": "Löschen",
       "error": {
         "expires": "Ungültiges Ende.",
+        "moderationStarts" : "Ungültiger Beginn Moderation. Moderation muss vor Beginn liegen.",
         "room": "Bitte gebe einen anderen Namen an. Der Name ist schon vergeben oder enthält ungültige Zeichen. Erlaubt sind nur Buchstaben und Zahlen.",
         "starts": "Ungültiger Beginn."
       },
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index bff89c0..0bd04bc 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -35,6 +35,7 @@
       "delete": "Delete",
       "error": {
         "expires": "Invalid expiry.",
+        "moderationStarts" : "Invalid moderation starts. Moderation have to start before conference starts",
         "room": "Please choose a different name. The name is already taken or contains invalid characters. Only letters and numbers are allowed.",
         "starts": "Invalid start."
       },