From 6111cb2d17da53e8e5f28eae26ea7757702114ca Mon Sep 17 00:00:00 2001
From: Vincent <vincent@loki.network>
Date: Wed, 8 Jul 2020 11:10:22 +1000
Subject: [PATCH] server-regex-tighten

---
 ts/components/session/LeftPaneMessageSection.tsx |  6 ------
 ts/session/types/OpenGroup.ts                    | 10 ++--------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/ts/components/session/LeftPaneMessageSection.tsx b/ts/components/session/LeftPaneMessageSection.tsx
index 4c2d690ee..4a3d3ade3 100644
--- a/ts/components/session/LeftPaneMessageSection.tsx
+++ b/ts/components/session/LeftPaneMessageSection.tsx
@@ -448,12 +448,6 @@ export class LeftPaneMessageSection extends React.Component<Props, State> {
 
     // Server URL entered?
     if (serverUrl.length === 0) {
-      window.pushToast({
-        title: window.i18n('noServerURL'),
-        type: 'error',
-        id: 'connectToServerFail',
-      });
-
       return;
     }
 
diff --git a/ts/session/types/OpenGroup.ts b/ts/session/types/OpenGroup.ts
index 4b679bf18..45c4f31d1 100644
--- a/ts/session/types/OpenGroup.ts
+++ b/ts/session/types/OpenGroup.ts
@@ -1,7 +1,5 @@
 // This is the Open Group equivalent to the PubKey type.
 
-import { LokiPublicChatFactoryInterface } from "../../../js/modules/loki_public_chat_api";
-
 interface OpenGroupParams {
   server: string;
   channel: number;
@@ -12,7 +10,7 @@ export class OpenGroup {
   // Matches prefixes https:// http:// plus no prefix.
   // Servers without prefix default to https://
   private static readonly serverRegex = new RegExp(
-    '^(https?:\\/\\/){0,1}([\\w-]{2,}.){1,2}[\\w-]{2,}$'
+    '^((https?:\\/\\/){0,1})([\\w-]{2,}\\.){1,2}[\\w-]{2,}$'
   );
   private static readonly groupIdRegex = new RegExp(
     '^publicChat:[0-9]*@([\\w-]{2,}.){1,2}[\\w-]{2,}$'
@@ -38,11 +36,7 @@ export class OpenGroup {
   }
 
   public static validate(serverUrl: string): boolean {
-    if (this.serverRegex.test(serverUrl)) {
-      return true;
-    }
-
-    return false;
+    return this.serverRegex.test(serverUrl);
   }
 
   public static from(