From 121f4a424c43e1d23daa64e5a2ec42aee891996a Mon Sep 17 00:00:00 2001
From: krawieck <fil.krawczyk@gmail.com>
Date: Thu, 24 Sep 2020 15:38:54 +0200
Subject: [PATCH] support for actual urls

---
 lib/pages/add_instance.dart | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/lib/pages/add_instance.dart b/lib/pages/add_instance.dart
index 6e45729..9404f5d 100644
--- a/lib/pages/add_instance.dart
+++ b/lib/pages/add_instance.dart
@@ -24,14 +24,14 @@ class AddInstancePage extends HookWidget {
     final prevInput = usePrevious(instanceController.text);
     final debounce = useDebounce(() async {
       if (prevInput == instanceController.text) return;
-      if (instanceController.text.isEmpty) {
+
+      final inst = _fixInstanceUrl(instanceController.text);
+      if (inst.isEmpty) {
         isSite.value = null;
         return;
       }
-
       try {
-        icon.value =
-            (await LemmyApi(instanceController.text).v1.getSite()).site.icon;
+        icon.value = (await LemmyApi(inst).v1.getSite()).site.icon;
         isSite.value = true;
         // ignore: avoid_catches_without_on_clauses
       } catch (e) {
@@ -50,7 +50,8 @@ class AddInstancePage extends HookWidget {
 
     handleOnAdd() async {
       try {
-        await accountsStore.addInstance(instanceController.text,
+        await accountsStore.addInstance(
+            _fixInstanceUrl(instanceController.text),
             assumeValid: true);
         Navigator.of(context).pop(instanceController.text);
       } on Exception catch (err) {
@@ -146,3 +147,17 @@ class AddInstancePage extends HookWidget {
     );
   }
 }
+
+String _fixInstanceUrl(String inst) {
+  if (inst.startsWith('https://')) {
+    inst = inst.substring(8);
+  }
+
+  if (inst.startsWith('http://')) {
+    inst = inst.substring(7);
+  }
+
+  if (inst.endsWith('/')) inst = inst.substring(0, inst.length - 1);
+
+  return inst;
+}