diff --git a/commands.py b/commands.py
index 61b2485..71bf461 100644
--- a/commands.py
+++ b/commands.py
@@ -1,9 +1,4 @@
-from telegram import (
- Update,
- InlineKeyboardButton,
- InlineKeyboardMarkup,
- LinkPreviewOptions,
-)
+from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup, LinkPreviewOptions
from telegram.constants import ParseMode
from telegram.ext import ContextTypes
@@ -17,7 +12,7 @@ async def start_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> N
await update.message.reply_text(
f"hello, i'm {html_parser.bold(context.bot.first_name)}, an inline image grabber.\n\n"
f"to get help, use /help",
- parse_mode=ParseMode.HTML,
+ parse_mode=ParseMode.HTML
)
@@ -29,14 +24,18 @@ async def help_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
f"2. click on the box that has popped up\n"
f"3. ???\n"
f"4. done!",
- parse_mode=ParseMode.HTML,
+ parse_mode=ParseMode.HTML
)
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)]]
+ keyboard = [
+ [
+ InlineKeyboardButton(f"source code", url=general.sourceurl)
+ ]
+ ]
reply_markup = InlineKeyboardMarkup(keyboard)
await update.message.reply_text(
@@ -46,33 +45,30 @@ async def about_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> N
f"{html_parser.bold("currently configured instance:")}\n"
f"{html_parser.italic(app.name)} ({app.hostname})",
parse_mode=ParseMode.HTML,
- reply_markup=reply_markup,
+ reply_markup=reply_markup
)
async def info_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
try:
post_id = context.args[0]
- message = await context.bot.send_message(
- update.effective_chat.id,
- f"{html_parser.bold("Information")}\n" f"Fetching...",
- parse_mode=ParseMode.HTML,
- )
+ message = await context.bot.send_message(update.effective_chat.id,
+ f"{html_parser.bold("Information")}\n"
+ f"Fetching...",
+ parse_mode=ParseMode.HTML)
post_data = get_json(f"posts/{post_id}")
if post_data is None:
await update.message.reply_text(
f"{html_parser.bold("Error")}: That record was not found.",
- parse_mode=ParseMode.HTML,
- )
+ parse_mode=ParseMode.HTML)
return
uploader_data = get_json(f"users/{post_data['uploader_id']}")
# well, we could check the uploader, but why would we do that?
keyboard = [
[
- InlineKeyboardButton(
- f"Open in {app.name}", url=f"http://{app.hostname}/posts/{post_id}"
- )
+ InlineKeyboardButton(f"Open in {app.name}",
+ url=f"http://{app.hostname}/posts/{post_id}")
]
]
reply_markup = InlineKeyboardMarkup(keyboard)
@@ -80,60 +76,41 @@ async def info_command(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
# noinspection PyListCreation
m = []
m.append(f"ID: {html_parser.code(post_data['id'])}")
- m.append(
- f"Uploader: {html_parser.hyperlink(uploader_data['name'],
+ 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']}")}"
- )
- created_at = datetime.fromisoformat(post_data["created_at"])
- m.append(
- f"Date: {html_parser.hyperlink(
+ 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.hostname}/posts?tags=date:{created_at.strftime("%Y-%m-%d")}")}"
- )
- if post_data["approver_id"] is not None:
+ 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'],
+ 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']}")}"
- )
- m.append(
- f"Size: {html_parser.hyperlink(
+ 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']}",
- "" 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']}")}"
- )
- m.append(
- f"Source: {post_data['source'] if post_data['source'] is not "" 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']}")}")
+ 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'],
+ 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"(+{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"(+{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")}")
m.append(f"Status: {format_status(post_data)}")
link_preview_options = LinkPreviewOptions(True)
- if not post_data["is_banned"]:
- link_preview_options = LinkPreviewOptions(url=post_data["large_file_url"])
+ if not post_data['is_banned']:
+ link_preview_options = LinkPreviewOptions(url=post_data['large_file_url'])
await context.bot.edit_message_text(
f"{html_parser.bold("Information")}\n" + "\n".join(m),
- update.effective_chat.id,
- message.message_id,
- parse_mode=ParseMode.HTML,
- reply_markup=reply_markup,
- link_preview_options=link_preview_options,
- )
+ update.effective_chat.id, message.message_id,
+ parse_mode=ParseMode.HTML, reply_markup=reply_markup, link_preview_options=link_preview_options)
except (IndexError, ValueError):
await update.message.reply_text(
f"{html_parser.bold("Usage")}: {html_parser.code(f"/info <post ID>")}",
- parse_mode=ParseMode.HTML,
- )
+ parse_mode=ParseMode.HTML)
diff --git a/config.py b/config.py
index 021c5e9..c6c1a8b 100644
--- a/config.py
+++ b/config.py
@@ -12,11 +12,9 @@ class _General:
sourceurl: Optional[str]
def __init__(self):
- self.token = _c.get("General", "Token")
- self.sourceurl = _c.get("General", "SourceUrl")
- if not self.sourceurl.startswith("http://") and not self.sourceurl.startswith(
- "https://"
- ):
+ self.token = _c.get('General', 'Token')
+ self.sourceurl = _c.get('General', 'SourceUrl')
+ if not self.sourceurl.startswith("http://") and not self.sourceurl.startswith("https://"):
self.sourceurl = None
@@ -26,8 +24,8 @@ class _App:
hostname: str
def __init__(self):
- self.name = _c.get("App", "Name")
- self.host = _c.get("App", "Host")
+ self.name = _c.get('App', 'Name')
+ self.host = _c.get('App', 'Host')
# noinspection PyBroadException
try:
response = requests.get(f"http://{self.host}/status.json")
@@ -36,7 +34,7 @@ class _App:
except:
print("Unable validate App.Host in config.ini.")
exit(1)
- self.hostname = _c.get("App", "HostName")
+ self.hostname = _c.get('App', 'HostName')
if not self.hostname:
self.hostname = self.host
diff --git a/extensions.py b/extensions.py
index 6081ab0..8ee8db9 100644
--- a/extensions.py
+++ b/extensions.py
@@ -6,14 +6,14 @@ from config import app
def humanize_tags_from_json(value: str, default: str) -> str:
- if value is not "":
- return ", ".join([re.sub("_\\(.*", "", t) for t in value.split()])
+ if value != "":
+ return ", ".join([re.sub('_\\(.*', '', t) for t in value.split()])
return default
def humanize_filesize(value: int) -> str:
- for unit in ["B", "KiB", "MiB", "GiB"]:
- if value < 1024 or unit is "GiB":
+ for unit in ['B', 'KiB', 'MiB', 'GiB']:
+ if value < 1024 or unit == 'GiB':
break
value /= 1024
return f"{value:.2f} {unit}"
@@ -38,10 +38,10 @@ def format_rating(value: str) -> str | None:
def format_status(data) -> str:
is_active = True
- is_pending = data["is_pending"]
- is_flagged = data["is_flagged"]
- is_deleted = data["is_deleted"]
- is_banned = data["is_banned"]
+ is_pending = data['is_pending']
+ is_flagged = data['is_flagged']
+ is_deleted = data['is_deleted']
+ is_banned = data['is_banned']
if is_pending | is_flagged | is_deleted:
is_active = False
diff --git a/html_parser.py b/html_parser.py
index 841c4b5..65b62c6 100644
--- a/html_parser.py
+++ b/html_parser.py
@@ -1,18 +1,14 @@
def bold(s: str) -> str:
return f"{s}"
-
def italic(s: str) -> str:
return f"{s}"
-
def strikethrough(s: str) -> str:
return f"{s}"
-
def hyperlink(s: str, href: str) -> str:
return f"{s}"
-
def code(s: str) -> str:
- return f"{s}"
+ return f"{s}"
\ No newline at end of file
diff --git a/main.py b/main.py
index 515ca85..2cf568d 100644
--- a/main.py
+++ b/main.py
@@ -35,7 +35,7 @@ def get_token() -> str:
if os.getenv("BOT_TOKEN") is not None:
return os.getenv("BOT_TOKEN")
- if general.token is not "":
+ if general.token != "":
return general.token
print(