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

feat: generate and validate config.ini
All checks were successful
Build / Upload to production (push) Successful in 1m38s
Details

Browse source 
Signed-off-by: mctaylors <cantsendmails@mctaylors.ru>
This commit is contained in:
Macintxsh 2025-06-09 01:19:06 +03:00
parent c64075f84d
commit d0357ff7c9
Signed by: mctaylors
GPG key ID: 4EEF4F949A266EE2
7 changed files with 113 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

72
commands.py
View file

@ -8,8 +8,8 @@ from telegram.constants import ParseMode
from telegram.ext import ContextTypes
import html_parser
import config
from datetime import datetime, timedelta
from config import general, app
from extensions import get_json, format_rating, format_status, humanize_filesize
@ -43,8 +43,8 @@ async def help_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
async def about_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
reply_markup = None
if general.sourceurl is not None:
keyboard = [[InlineKeyboardButton(f"source code", url=general.sourceurl)]]
if config.general.sourceurl is not None:
keyboard = [[InlineKeyboardButton(f"source code", url=config.general.sourceurl)]]
reply_markup = InlineKeyboardMarkup(keyboard)
await update.message.reply_text(
@ -54,7 +54,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 (or other similar services).\n",
html_parser.bold("currently configured instance:"),
f"{html_parser.italic(app.name)} ({app.hostname})",
f"{html_parser.italic(config.app.name)} ({config.app.hostname})",
]
),
parse_mode=ParseMode.HTML,
@ -85,8 +85,8 @@ async def info_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
keyboard = [
[
InlineKeyboardButton(
f"Open in {app.name}",
url=f"{app.protocol}://{app.hostname}/posts/{post_id}",
f"Open in {config.app.name}",
url=f"{config.app.protocol}://{config.app.hostname}/posts/{post_id}",
)
]
]
@ -99,11 +99,11 @@ async def info_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
"Uploader:",
html_parser.hyperlink(
uploader_data["name"],
f"{app.protocol}://{app.hostname}/users/{post_data['uploader_id']}",
f"{config.app.protocol}://{config.app.hostname}/users/{post_data['uploader_id']}",
),
html_parser.hyperlink(
"»",
f"{app.protocol}://{app.hostname}/posts?tags=user:{uploader_data['name']}",
f"{config.app.protocol}://{config.app.hostname}/posts?tags=user:{uploader_data['name']}",
),
]
),
@ -115,7 +115,7 @@ async def info_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
"Date:",
html_parser.hyperlink(
created_at.strftime("%Y-%m-%d %X (%z)"),
f"{app.protocol}://{app.hostname}/posts?tags=date:{created_at.strftime("%Y-%m-%d")}",
f"{config.app.protocol}://{config.app.hostname}/posts?tags=date:{created_at.strftime("%Y-%m-%d")}",
),
]
)
@ -128,11 +128,11 @@ async def info_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
"Approver:",
html_parser.hyperlink(
approver_data["name"],
f"{app.protocol}://{app.hostname}/users/{post_data['approver_id']}",
f"{config.app.protocol}://{config.app.hostname}/users/{post_data['approver_id']}",
),
html_parser.hyperlink(
"»",
f"{app.protocol}://{app.hostname}/posts?tags=approver:{approver_data['name']}",
f"{config.app.protocol}://{config.app.hostname}/posts?tags=approver:{approver_data['name']}",
),
]
)
@ -148,7 +148,7 @@ async def info_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
f"({post_data['media_asset']['image_width']}x{post_data['media_asset']['image_height']})",
html_parser.hyperlink(
"»",
f"{app.protocol}://{app.hostname}/media_assets/{post_data['media_asset']['id']}",
f"{config.app.protocol}://{config.app.hostname}/media_assets/{post_data['media_asset']['id']}",
),
]
)
@ -165,7 +165,7 @@ async def info_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
"Score:",
html_parser.hyperlink(
post_data["score"],
f"{app.protocol}://{app.hostname}/post_votes?search[post_id]={post_data['id']}&variant=compact",
f"{config.app.protocol}://{config.app.hostname}/post_votes?search[post_id]={post_data['id']}&variant=compact",
),
f"(+{post_data['up_score']} / -{post_data['down_score']})",
]
@ -177,7 +177,7 @@ async def info_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
"Favorites:",
html_parser.hyperlink(
post_data["fav_count"],
f"{app.protocol}://{app.hostname}/posts/{post_data['id']}/favorites",
f"{config.app.protocol}://{config.app.hostname}/posts/{post_data['id']}/favorites",
),
]
)
@ -228,8 +228,8 @@ async def user_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
keyboard = [
[
InlineKeyboardButton(
f"Open in {app.name}",
url=f"{app.protocol}://{app.hostname}/users/{user_id}",
f"Open in {config.app.name}",
url=f"{config.app.protocol}://{config.app.hostname}/users/{user_id}",
)
]
]
@ -245,7 +245,7 @@ async def user_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
"Uploads:",
html_parser.hyperlink(
user_data["post_upload_count"],
f"{app.protocol}://{app.hostname}/posts?tags=user:{user_data['name']}",
f"{config.app.protocol}://{config.app.hostname}/posts?tags=user:{user_data['name']}",
),
]
)
@ -270,7 +270,7 @@ async def user_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
"Favorites:",
html_parser.hyperlink(
fav_post_count,
f"{app.protocol}://{app.hostname}/posts?tags=ordfav:{user_data['name']}",
f"{config.app.protocol}://{config.app.hostname}/posts?tags=ordfav:{user_data['name']}",
),
]
)
@ -288,16 +288,16 @@ async def user_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
"Post Votes:",
html_parser.hyperlink(
vote_post_count,
f"{app.protocol}://{app.hostname}/post_votes?search[user_name]={user_data['name']}",
f"{config.app.protocol}://{config.app.hostname}/post_votes?search[user_name]={user_data['name']}",
),
f"({' '.join([
html_parser.hyperlink(
f"up:{upvote_post_count}",
f"{app.protocol}://{app.hostname}/post_votes?search[user_name]={user_data['name']}&search[score]=1",
f"{config.app.protocol}://{config.app.hostname}/post_votes?search[user_name]={user_data['name']}&search[score]=1",
),
html_parser.hyperlink(
f"down:{downvote_post_count}",
f"{app.protocol}://{app.hostname}/post_votes?search[user_name]={user_data['name']}&search[score]=-1",
f"{config.app.protocol}://{config.app.hostname}/post_votes?search[user_name]={user_data['name']}&search[score]=-1",
),
])})",
]
@ -309,7 +309,7 @@ async def user_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
"Favorite Groups:",
html_parser.hyperlink(
user_data["favorite_group_count"],
f"{app.protocol}://{app.hostname}/favorite_groups?search[creator_name]={user_data['name']}",
f"{config.app.protocol}://{config.app.hostname}/favorite_groups?search[creator_name]={user_data['name']}",
),
]
)
@ -320,7 +320,7 @@ async def user_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
"Post Changes:",
html_parser.hyperlink(
user_data["post_update_count"],
f"{app.protocol}://{app.hostname}/post_versions?search[updater_name]={user_data['name']}",
f"{config.app.protocol}://{config.app.hostname}/post_versions?search[updater_name]={user_data['name']}",
),
]
)
@ -334,12 +334,12 @@ async def user_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
"Note Changes:",
html_parser.hyperlink(
user_data["note_update_count"],
f"{app.protocol}://{app.hostname}/note_versions?search[updater_name]={user_data['name']}",
f"{config.app.protocol}://{config.app.hostname}/note_versions?search[updater_name]={user_data['name']}",
),
"in",
html_parser.hyperlink(
noteupdater_post_count,
f"{app.protocol}://{app.hostname}/posts?tags=noteupdater:{user_data['name']}+order:note",
f"{config.app.protocol}://{config.app.hostname}/posts?tags=noteupdater:{user_data['name']}+order:note",
),
"posts",
]
@ -351,7 +351,7 @@ async def user_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
"Wiki Page Changes:",
html_parser.hyperlink(
user_data["wiki_page_version_count"],
f"{app.protocol}://{app.hostname}/wiki_page_versions?search[updater_name]={user_data['name']}",
f"{config.app.protocol}://{config.app.hostname}/wiki_page_versions?search[updater_name]={user_data['name']}",
),
]
)
@ -362,7 +362,7 @@ async def user_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
"Artist Changes:",
html_parser.hyperlink(
user_data["artist_version_count"],
f"{app.protocol}://{app.hostname}/artist_versions?search[updater_name]={user_data['name']}",
f"{config.app.protocol}://{config.app.hostname}/artist_versions?search[updater_name]={user_data['name']}",
),
]
)
@ -373,7 +373,7 @@ async def user_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
"Commentary Changes:",
html_parser.hyperlink(
user_data["artist_commentary_version_count"],
f"{app.protocol}://{app.hostname}/artist_commentary_versions?search[updater_name]={user_data['name']}",
f"{config.app.protocol}://{config.app.hostname}/artist_commentary_versions?search[updater_name]={user_data['name']}",
),
]
)
@ -384,7 +384,7 @@ async def user_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
"Forum Posts:",
html_parser.hyperlink(
user_data["forum_post_count"],
f"{app.protocol}://{app.hostname}/forum_posts?search[creator_name]={user_data['name']}",
f"{config.app.protocol}://{config.app.hostname}/forum_posts?search[creator_name]={user_data['name']}",
),
]
)
@ -398,12 +398,12 @@ async def user_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
"Comments:",
html_parser.hyperlink(
user_data["comment_count"],
f"{app.protocol}://{app.hostname}/comments?group_by=comment&search[creator_name]={user_data['name']}",
f"{config.app.protocol}://{config.app.hostname}/comments?group_by=comment&search[creator_name]={user_data['name']}",
),
"in",
html_parser.hyperlink(
commenter_post_count,
f"{app.protocol}://{app.hostname}/posts?tags=commenter:{user_data['name']}+order:comment_bumped",
f"{config.app.protocol}://{config.app.hostname}/posts?tags=commenter:{user_data['name']}+order:comment_bumped",
),
"posts",
]
@ -415,7 +415,7 @@ async def user_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
"Appeals:",
html_parser.hyperlink(
user_data["appeal_count"],
f"{app.protocol}://{app.hostname}/post_appeals?search[creator_name]={user_data['name']}",
f"{config.app.protocol}://{config.app.hostname}/post_appeals?search[creator_name]={user_data['name']}",
),
]
)
@ -431,20 +431,20 @@ async def user_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
"Feedback:",
html_parser.hyperlink(
total_feedback_count,
f"{app.protocol}://{app.hostname}/user_feedbacks?search[user_name]={user_data['name']}",
f"{config.app.protocol}://{config.app.hostname}/user_feedbacks?search[user_name]={user_data['name']}",
),
f"({' '.join([
html_parser.hyperlink(
f"positive:{user_data['positive_feedback_count']}",
f"{app.protocol}://{app.hostname}/user_feedbacks?search[user_name]={user_data['name']}&search[category]=positive",
f"{config.app.protocol}://{config.app.hostname}/user_feedbacks?search[user_name]={user_data['name']}&search[category]=positive",
),
html_parser.hyperlink(
f"neutral:{user_data['neutral_feedback_count']}",
f"{app.protocol}://{app.hostname}/user_feedbacks?search[user_name]={user_data['name']}&search[category]=neutral",
f"{config.app.protocol}://{config.app.hostname}/user_feedbacks?search[user_name]={user_data['name']}&search[category]=neutral",
),
html_parser.hyperlink(
f"negative:{user_data['negative_feedback_count']}",
f"{app.protocol}://{app.hostname}/user_feedbacks?search[user_name]={user_data['name']}&search[category]=negative",
f"{config.app.protocol}://{config.app.hostname}/user_feedbacks?search[user_name]={user_data['name']}&search[category]=negative",
),
])})"
]