mctaylors/danbooru-bot
mctaylors/danbooru-bot
1
0
Fork 0
Code Issues Pull requests Activity

fix: use App.HostName (if set) in /about

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

Signed-off-by: mctaylors <cantsendmails@mctaylors.ru>
This commit is contained in:
Macintxsh 2025-03-26 14:18:41 +03:00
parent a41417ee84
commit d363fa9afd
Signed by: mctaylors
GPG key ID: 4EEF4F949A266EE2
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
commands.py
View file

@ -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: async def about_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
import main
from main import config from main import config
reply_markup = None reply_markup = None
source_url = config.get('General', 'SourceUrl') 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"{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"(or other similar services).\n\n"
f"{html_parser.bold("currently configured instance:")}\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, parse_mode=ParseMode.HTML,
reply_markup=reply_markup reply_markup=reply_markup
) )

5
inline_query.py
View file

@ -34,16 +34,15 @@ async def inline_query(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
async def answer_query(update: Update, query: str, async def answer_query(update: Update, query: str,
config: ConfigParser, data) -> None: config: ConfigParser, data) -> None:
import main
characters = humanize_tags_from_json(data['tag_string_character'], "no characters") characters = humanize_tags_from_json(data['tag_string_character'], "no characters")
copyrights = humanize_tags_from_json(data['tag_string_copyright'], "unknown copyright") copyrights = humanize_tags_from_json(data['tag_string_copyright'], "unknown copyright")
artists = humanize_tags_from_json(data['tag_string_artist'], "unknown artist") artists = humanize_tags_from_json(data['tag_string_artist'], "unknown artist")
rating = format_rating(data['rating']) rating = format_rating(data['rating'])
hostname = config.get('App', 'HostName')
hostname = hostname if hostname != "" else config.get('App', 'Host')
keyboard = [ keyboard = [
[ [
InlineKeyboardButton(f"Open in {config.get('App', 'Name')}", 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']) InlineKeyboardButton("View original", url=data['file_url'])
] ]
] ]

2
main.py
View file

@ -19,6 +19,8 @@ logger = logging.getLogger(__name__)
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.read("config.ini") config.read("config.ini")
hostname = config.get('App', 'HostName')
hostname = hostname if hostname != "" else config.get('App', 'Host')
def main() -> None: def main() -> None:
validate_config() validate_config()