Merge pull request #104 from macarooni-man/dev

More v2.2.4 fixes
macarooni-man · Nov 14, 2024 · 1a6876a · 1a6876a
2 parents a4bfcf1 + cf70bfa
commit 1a6876a
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 3 deletions.
diff --git a/source/constants.py b/source/constants.py
@@ -5945,6 +5945,7 @@ def _init_defaults():
         defaults.locale = None
         defaults.sponsor_reminder = None
         defaults.discord_presence = True
+        defaults.prompt_feedback = True
         defaults.telepath_settings = {
             'enable-api': False,
             'api-host': "0.0.0.0",

diff --git a/source/locales.json b/source/locales.json
diff --git a/source/menu.py b/source/menu.py
@@ -8577,6 +8577,13 @@ def on_touch_down(self, touch):
 
     # Show popup; popup_type can be "info", "warning", "query"
     def show_popup(self, popup_type, title, content, callback=None, *args):
+
+        # Ignore if a pop-up is already on-screen
+        if self.popup_widget:
+            return
+
+
+        # If not, process pop-up
         popup_types = (
             "info", "warning", "query", "warning_query", "controls", "addon",
             "script", "file", "error_log"
@@ -17493,6 +17500,29 @@ def start_timer(*_):
         threading.Timer(0, start_timer).start()
 
 
+        # Show pop-up to ask user for initial user feedback
+        try:
+            if constants.app_config.prompt_feedback and constants.app_online:
+                constants.app_config.prompt_feedback = False
+
+                def open_feedback(*a):
+                    url = "https://www.auto-mcs.com/feedback"
+                    webbrowser.open_new_tab(url)
+
+                Clock.schedule_once(
+                    functools.partial(
+                        screen_manager.current_screen.show_popup,
+                        "query",
+                        "Share Your Feedback",
+                        "Thanks for using $auto-mcs$!\n\nWhile your server is launching, please take a moment to leave us your feedback",
+                        (None, threading.Timer(0, open_feedback).start)
+                    ),
+                    1
+                )
+        except:
+            pass
+
+
     # Stop server
     def stop_server(self, *args):
         if self.run_data:

diff --git a/source/svrmgr.py b/source/svrmgr.py
@@ -2044,7 +2044,7 @@ def open_remote_server(self, name):
                 if constants.debug:
                     print(vars(self.remote_server))
 
-                return None
+                return bool(self.remote_server)
 
         except AttributeError:
             pass

diff --git a/source/wrapper.py b/source/wrapper.py
@@ -270,12 +270,13 @@ def get_versions(*a):
 
                 # Check for network changes in the background
                 connect_counter += 1
-                if (connect_counter == 10 and not constants.app_online) or (connect_counter == 60 and constants.app_online):
+                if (connect_counter == 10 and not constants.app_online) or (connect_counter == 3600 and constants.app_online):
                     try:
                         constants.check_app_updates()
                     except Exception as e:
                         if constants.debug:
                             print(e)
+
                     connect_counter = 0
 
                 time.sleep(1)