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

feat: add PreferSecureProtocol in config.ini

Browse source
This commit is contained in:
Macintxsh 2025-05-21 05:06:45 +03:00
parent b266a1a2df
commit d4d460a2a0
Signed by: mctaylors
GPG key ID: 4EEF4F949A266EE2
4 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
commands.py
View file

@ -71,7 +71,8 @@ async def info_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
keyboard = [
[
InlineKeyboardButton(
f"Open in {app.name}", url=f"http://{app.hostname}/posts/{post_id}"
f"Open in {app.name}",
url=f"{app.protocol}://{app.hostname}/posts/{post_id}",
)
]
]
@ -82,28 +83,28 @@ async def info_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
m.append(f"ID: {html_parser.code(post_data['id'])}")
m.append(
f"Uploader: {html_parser.hyperlink(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']}")}"
f"{app.protocol}://{app.hostname}/users/{post_data['uploader_id']}")} "
f"{html_parser.hyperlink("»", f"{app.protocol}://{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.hostname}/posts?tags=date:{created_at.strftime("%Y-%m-%d")}")}"
f"{app.protocol}://{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.hostname}/users/{post_data['approver_id']}")} "
f"{html_parser.hyperlink("»", f"http://{app.hostname}/posts?tags=approver:{approver_data['name']}")}"
f"{app.protocol}://{app.hostname}/users/{post_data['approver_id']}")} "
f"{html_parser.hyperlink("»", f"{app.protocol}://{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']}",
"" if post_data['is_banned'] else 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.hostname}/media_assets/{post_data['media_asset']['id']}")}"
f"{html_parser.hyperlink("»", f"{app.protocol}://{app.hostname}/media_assets/{post_data['media_asset']['id']}")}"
)
m.append(
f"Source: {post_data['source'] if post_data['source'] != "" else "🚫"}"
@ -111,12 +112,12 @@ async def info_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
m.append(f"Rating: {format_rating(post_data['rating'])}")
m.append(
f"Score: {html_parser.hyperlink(post_data['score'],
f"http://{app.hostname}/post_votes?search[post_id]={post_data['id']}&variant=compact")} "
f"{app.protocol}://{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.hostname}/posts/{post_data['id']}/favorites")}"
f"{app.protocol}://{app.hostname}/posts/{post_data['id']}/favorites")}"
)
m.append(f"Status: {format_status(post_data)}")