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

fix: use http protocols and app.hostname

Browse source
This commit is contained in:
Macintxsh 2025-05-21 03:54:25 +03:00
parent 10c2d58efb
commit bd957e2bd2
Signed by: mctaylors
GPG key ID: 4EEF4F949A266EE2
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
commands.py
View file

@ -68,7 +68,7 @@ async def info_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
keyboard = [
[
InlineKeyboardButton(f"Open in {app.name}",
url=f"https://{app.hostname}/posts/{post_id}")
url=f"http://{app.hostname}/posts/{post_id}")
]
]
reply_markup = InlineKeyboardMarkup(keyboard)
@ -77,29 +77,29 @@ async def info_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
m = []
m.append(f"ID: {html_parser.code(post_data['id'])}")
m.append(f"Uploader: {html_parser.hyperlink(uploader_data['name'],
f"http://{app.host}/users/{post_data['uploader_id']}")} "
f"{html_parser.hyperlink("»", f"http://{app.host}/posts?tags=user:{uploader_data['name']}")}")
f"http://{app.hostname}/users/{post_data['uploader_id']}")} "
f"{html_parser.hyperlink("»", f"http://{app.hostname}/posts?tags=user:{uploader_data['name']}")}")
created_at = datetime.fromisoformat(post_data['created_at'])
m.append(f"Date: {html_parser.hyperlink(
f"{created_at.strftime("%Y-%m-%d %X (%z)")}",
f"http://{app.host}/posts?tags=date:{created_at.strftime("%Y-%m-%d")}")}")
f"http://{app.hostname}/posts?tags=date:{created_at.strftime("%Y-%m-%d")}")}")
if post_data['approver_id'] is not None:
approver_data = get_json(f"users/{post_data['approver_id']}")
m.append(f"Approver: {html_parser.hyperlink(approver_data['name'],
f"http://{app.host}/users/{post_data['approver_id']}")} "
f"{html_parser.hyperlink("»", f"http://{app.host}/posts?tags=approver:{approver_data['name']}")}")
f"http://{app.hostname}/users/{post_data['approver_id']}")} "
f"{html_parser.hyperlink("»", f"http://{app.hostname}/posts?tags=approver:{approver_data['name']}")}")
m.append(f"Size: {html_parser.hyperlink(
f"{humanize_filesize(post_data['media_asset']['file_size'])} .{post_data['media_asset']['file_ext']}",
post_data['file_url'])} "
f"({post_data['media_asset']['image_width']}x{post_data['media_asset']['image_height']}) "
f"{html_parser.hyperlink("»", f"http://{app.host}/media_assets/{post_data['media_asset']['id']}")}")
f"{html_parser.hyperlink("»", f"http://{app.hostname}/media_assets/{post_data['media_asset']['id']}")}")
m.append(f"Source: {post_data['source'] if post_data['source'] != "" else "🚫"}")
m.append(f"Rating: {format_rating(post_data['rating'])}")
m.append(f"Score: {html_parser.hyperlink(post_data['score'],
f"http://{app.host}/post_votes?search[post_id]={post_data['id']}&variant=compact")} "
f"http://{app.hostname}/post_votes?search[post_id]={post_data['id']}&variant=compact")} "
f"(+{post_data['up_score']} / -{post_data['down_score']})")
m.append(f"Favorites: {html_parser.hyperlink(post_data['fav_count'],
f"http://{app.host}/posts/{post_data['id']}/favorites")}")
f"http://{app.hostname}/posts/{post_data['id']}/favorites")}")
m.append(f"Status: {format_status(post_data)}")
link_preview_options = LinkPreviewOptions(True)

2
inline_query.py
View file

@ -53,7 +53,7 @@ async def answer_query(update: Update, query: str, data) -> None:
keyboard = [
[
InlineKeyboardButton(f"Open in {app.name}",
url=f"https://{app.hostname}/posts/{query}"),
url=f"http://{app.hostname}/posts/{query}"),
InlineKeyboardButton("View original", url=data['file_url'])
]
]