From d363fa9afd7dc41346d6c91d7a4ab45edcfebd21 Mon Sep 17 00:00:00 2001
From: mctaylors <cantsendmails@mctaylors.ru>
Date: Wed, 26 Mar 2025 14:18:41 +0300
Subject: [PATCH] fix: use App.HostName (if set) in /about

oh yeah and we're also moving that strange ternary to main.py

Signed-off-by: mctaylors <cantsendmails@mctaylors.ru>
---
 commands.py     | 3 ++-
 inline_query.py | 5 ++---
 main.py         | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/commands.py b/commands.py
index 20d498b..567f1e2 100644
--- a/commands.py
+++ b/commands.py
@@ -26,6 +26,7 @@ async def help_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
 
 
 async def about_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
+    import main
     from main import config
     reply_markup = None
     source_url = config.get('General', 'SourceUrl')
@@ -42,7 +43,7 @@ async def about_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> N
         f"{context.bot.first_name} is an inline image grabber written in python that grabs images from Danbooru "
         f"(or other similar services).\n\n"
         f"{html_parser.bold("currently configured instance:")}\n"
-        f"{html_parser.italic(config.get('App', 'Name'))}  ({config.get('App', 'Host')})",
+        f"{html_parser.italic(config.get('App', 'Name'))}  ({main.hostname})",
         parse_mode=ParseMode.HTML,
         reply_markup=reply_markup
     )
diff --git a/inline_query.py b/inline_query.py
index c940ad7..489624b 100644
--- a/inline_query.py
+++ b/inline_query.py
@@ -34,16 +34,15 @@ async def inline_query(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
 
 async def answer_query(update: Update, query: str,
                        config: ConfigParser, data) -> None:
+    import main
     characters = humanize_tags_from_json(data['tag_string_character'], "no characters")
     copyrights = humanize_tags_from_json(data['tag_string_copyright'], "unknown copyright")
     artists = humanize_tags_from_json(data['tag_string_artist'], "unknown artist")
     rating = format_rating(data['rating'])
-    hostname = config.get('App', 'HostName')
-    hostname = hostname if hostname != "" else config.get('App', 'Host')
     keyboard = [
         [
             InlineKeyboardButton(f"Open in {config.get('App', 'Name')}",
-                                 url=f"https://{hostname}/posts/{query}"),
+                                 url=f"https://{main.hostname}/posts/{query}"),
             InlineKeyboardButton("View original", url=data['file_url'])
         ]
     ]
diff --git a/main.py b/main.py
index 9d7f581..5f1685d 100644
--- a/main.py
+++ b/main.py
@@ -19,6 +19,8 @@ logger = logging.getLogger(__name__)
 config = configparser.ConfigParser()
 config.read("config.ini")
 
+hostname = config.get('App', 'HostName')
+hostname = hostname if hostname != "" else config.get('App', 'Host')
 
 def main() -> None:
     validate_config()