Compare commits
1 Commits
bdb0f3cd8b
...
feat/issue
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f7503ecd14 |
@@ -8,12 +8,12 @@ from telegram.ext import Application, CommandHandler, MessageHandler, filters
|
|||||||
|
|
||||||
from commands import (
|
from commands import (
|
||||||
cmd_add,
|
cmd_add,
|
||||||
|
cmd_admin,
|
||||||
cmd_bounty,
|
cmd_bounty,
|
||||||
cmd_delete,
|
cmd_delete,
|
||||||
cmd_edit,
|
cmd_edit,
|
||||||
cmd_help,
|
cmd_help,
|
||||||
cmd_my,
|
cmd_my,
|
||||||
cmd_show,
|
|
||||||
cmd_start,
|
cmd_start,
|
||||||
cmd_track,
|
cmd_track,
|
||||||
cmd_untrack,
|
cmd_untrack,
|
||||||
@@ -42,7 +42,7 @@ def build_app() -> Application:
|
|||||||
app.add_handler(CommandHandler("delete", cmd_delete))
|
app.add_handler(CommandHandler("delete", cmd_delete))
|
||||||
app.add_handler(CommandHandler("track", cmd_track))
|
app.add_handler(CommandHandler("track", cmd_track))
|
||||||
app.add_handler(CommandHandler("untrack", cmd_untrack))
|
app.add_handler(CommandHandler("untrack", cmd_untrack))
|
||||||
app.add_handler(CommandHandler("show", cmd_show))
|
app.add_handler(CommandHandler("admin", cmd_admin))
|
||||||
|
|
||||||
app.add_handler(MessageHandler(filters.COMMAND, cmd_help))
|
app.add_handler(MessageHandler(filters.COMMAND, cmd_help))
|
||||||
|
|
||||||
@@ -58,7 +58,7 @@ async def post_init(app: Application) -> None:
|
|||||||
("edit", "Edit a bounty"),
|
("edit", "Edit a bounty"),
|
||||||
("track", "Track a bounty"),
|
("track", "Track a bounty"),
|
||||||
("untrack", "Stop tracking"),
|
("untrack", "Stop tracking"),
|
||||||
("show", "Show bounty details"),
|
("admin", "List room admins"),
|
||||||
("help", "Show help"),
|
("help", "Show help"),
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ TRACKING_SERVICE = TrackingService(TRACKING_STORAGE, ROOM_STORAGE)
|
|||||||
TELEGRAM_BOT_USERNAME = "your_bot_username"
|
TELEGRAM_BOT_USERNAME = "your_bot_username"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def extract_args(text: str) -> list[str]:
|
def extract_args(text: str) -> list[str]:
|
||||||
if not text:
|
if not text:
|
||||||
return []
|
return []
|
||||||
@@ -27,62 +26,26 @@ def extract_args(text: str) -> list[str]:
|
|||||||
return tokens[1:] if len(tokens) > 1 else []
|
return tokens[1:] if len(tokens) > 1 else []
|
||||||
|
|
||||||
|
|
||||||
def parse_args(
|
def parse_args(args: list[str]) -> tuple[Optional[str], Optional[str], Optional[int]]:
|
||||||
args: list[str],
|
|
||||||
) -> tuple[Optional[str], Optional[str], Optional[int], bool, bool]:
|
|
||||||
text = None
|
text = None
|
||||||
link = None
|
link = None
|
||||||
due_date_ts = None
|
due_date_ts = None
|
||||||
clear_link = False
|
|
||||||
clear_date = False
|
|
||||||
|
|
||||||
i = 0
|
remaining = []
|
||||||
while i < len(args):
|
for arg in args:
|
||||||
arg = args[i]
|
if not link and (arg.startswith("http://") or arg.startswith("https://")):
|
||||||
|
|
||||||
if arg == "-link":
|
|
||||||
if i + 1 < len(args) and (
|
|
||||||
args[i + 1].startswith("http://") or args[i + 1].startswith("https://")
|
|
||||||
):
|
|
||||||
link = args[i + 1]
|
|
||||||
i += 2
|
|
||||||
else:
|
|
||||||
clear_link = True
|
|
||||||
i += 1
|
|
||||||
elif arg == "-date":
|
|
||||||
if i + 1 < len(args):
|
|
||||||
parsed = dateparser.parse(args[i + 1])
|
|
||||||
if parsed:
|
|
||||||
due_date_ts = int(parsed.timestamp())
|
|
||||||
i += 2
|
|
||||||
else:
|
|
||||||
clear_date = True
|
|
||||||
i += 1
|
|
||||||
else:
|
|
||||||
clear_date = True
|
|
||||||
i += 1
|
|
||||||
elif not link and (arg.startswith("http://") or arg.startswith("https://")):
|
|
||||||
link = arg
|
link = arg
|
||||||
i += 1
|
|
||||||
elif due_date_ts is None:
|
elif due_date_ts is None:
|
||||||
parsed = dateparser.parse(arg)
|
parsed = dateparser.parse(arg)
|
||||||
if parsed:
|
if parsed:
|
||||||
due_date_ts = int(parsed.timestamp())
|
due_date_ts = int(parsed.timestamp())
|
||||||
i += 1
|
|
||||||
else:
|
else:
|
||||||
i += 1
|
remaining.append(arg)
|
||||||
if text is None:
|
|
||||||
text = arg
|
|
||||||
else:
|
|
||||||
text = text + " " + arg
|
|
||||||
else:
|
else:
|
||||||
i += 1
|
remaining.append(arg)
|
||||||
if text is None:
|
|
||||||
text = arg
|
|
||||||
else:
|
|
||||||
text = text + " " + arg
|
|
||||||
|
|
||||||
return text, link, due_date_ts, clear_link, clear_date
|
text = " ".join(remaining) if remaining else None
|
||||||
|
return text, link, due_date_ts
|
||||||
|
|
||||||
|
|
||||||
def format_bounty(b, show_id: bool = True) -> str:
|
def format_bounty(b, show_id: bool = True) -> str:
|
||||||
@@ -148,7 +111,6 @@ async def cmd_my(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
if is_group(update):
|
if is_group(update):
|
||||||
group_id = get_group_id(update)
|
group_id = get_group_id(update)
|
||||||
bounties = TRACKING_SERVICE.get_tracked_bounties(group_id, user_id)
|
bounties = TRACKING_SERVICE.get_tracked_bounties(group_id, user_id)
|
||||||
room_id = group_id
|
|
||||||
else:
|
else:
|
||||||
room_id = get_room_id(update)
|
room_id = get_room_id(update)
|
||||||
bounties = BOUNTY_SERVICE.list_bounties(room_id)
|
bounties = BOUNTY_SERVICE.list_bounties(room_id)
|
||||||
@@ -175,7 +137,7 @@ async def cmd_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
text, link, due_date_ts, _, _ = parse_args(args)
|
text, link, due_date_ts = parse_args(args)
|
||||||
if not text and not link:
|
if not text and not link:
|
||||||
await update.message.reply_text("A bounty needs at least text or a link.")
|
await update.message.reply_text("A bounty needs at least text or a link.")
|
||||||
return
|
return
|
||||||
@@ -193,9 +155,8 @@ async def cmd_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
|
|
||||||
due_str = ""
|
due_str = ""
|
||||||
if due_date_ts:
|
if due_date_ts:
|
||||||
due_str = ""
|
due_str = f" | Due: {time.strftime('%Y-%m-%d', time.localtime(due_date_ts))}"
|
||||||
if due_date_ts:
|
|
||||||
due_str = f" | Due: {time.strftime("%Y-%m-%d", time.localtime(due_date_ts))}"
|
|
||||||
await update.message.reply_text(
|
await update.message.reply_text(
|
||||||
f"✅ Bounty added (#{bounty.id}){due_str}",
|
f"✅ Bounty added (#{bounty.id}){due_str}",
|
||||||
disable_web_page_preview=True,
|
disable_web_page_preview=True,
|
||||||
@@ -206,14 +167,7 @@ async def cmd_update(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
args = extract_args(update.message.text)
|
args = extract_args(update.message.text)
|
||||||
if len(args) < 1:
|
if len(args) < 1:
|
||||||
await update.message.reply_text(
|
await update.message.reply_text(
|
||||||
"Usage: /update <bounty_id> [text] [link] [due_date]\n"
|
"Usage: /update <bounty_id> [text] [link] [due_date]"
|
||||||
" /update <bounty_id> -link [<url>] - clear or set link\n"
|
|
||||||
" /update <bounty_id> -date [<date>] - clear or set date\n"
|
|
||||||
"Examples:\n"
|
|
||||||
" /update 1 new text - update text only\n"
|
|
||||||
" /update 1 -link - clear link\n"
|
|
||||||
" /update 1 -link https://... - set link\n"
|
|
||||||
" /update 1 -link -date - clear both link and date"
|
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -223,14 +177,8 @@ async def cmd_update(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
await update.message.reply_text("Invalid bounty ID.")
|
await update.message.reply_text("Invalid bounty ID.")
|
||||||
return
|
return
|
||||||
|
|
||||||
text, link, due_date_ts, clear_link, clear_date = parse_args(args[1:])
|
text, link, due_date_ts = parse_args(args[1:])
|
||||||
if (
|
if not text and not link and due_date_ts is None:
|
||||||
not text
|
|
||||||
and not link
|
|
||||||
and due_date_ts is None
|
|
||||||
and not clear_link
|
|
||||||
and not clear_date
|
|
||||||
):
|
|
||||||
await update.message.reply_text("Nothing to update.")
|
await update.message.reply_text("Nothing to update.")
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -245,15 +193,10 @@ async def cmd_update(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
text=text,
|
text=text,
|
||||||
link=link,
|
link=link,
|
||||||
due_date_ts=due_date_ts,
|
due_date_ts=due_date_ts,
|
||||||
clear_link=clear_link,
|
|
||||||
clear_due=clear_date,
|
|
||||||
)
|
)
|
||||||
except PermissionError as e:
|
except PermissionError as e:
|
||||||
await update.message.reply_text(f"⛔ {e}")
|
await update.message.reply_text(f"⛔ {e}")
|
||||||
return
|
return
|
||||||
except ValueError as e:
|
|
||||||
await update.message.reply_text(f"⛔ {e}")
|
|
||||||
return
|
|
||||||
|
|
||||||
if success:
|
if success:
|
||||||
await update.message.reply_text(f"✅ Bounty #{bounty_id} updated.")
|
await update.message.reply_text(f"✅ Bounty #{bounty_id} updated.")
|
||||||
@@ -368,65 +311,33 @@ async def cmd_start(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
async def cmd_show(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
|
||||||
args = extract_args(update.message.text)
|
|
||||||
if not args:
|
|
||||||
await update.message.reply_text("Usage: /show <bounty_id>")
|
|
||||||
return
|
|
||||||
|
|
||||||
try:
|
|
||||||
bounty_id = int(args[0])
|
|
||||||
except ValueError:
|
|
||||||
await update.message.reply_text("Invalid bounty ID.")
|
|
||||||
return
|
|
||||||
|
|
||||||
room_id = get_room_id(update)
|
|
||||||
bounty = BOUNTY_SERVICE.get_bounty(room_id, bounty_id)
|
|
||||||
|
|
||||||
if not bounty:
|
|
||||||
await update.message.reply_text("Bounty not found.")
|
|
||||||
return
|
|
||||||
|
|
||||||
timezone = BOUNTY_SERVICE.get_timezone(room_id)
|
|
||||||
|
|
||||||
lines = []
|
|
||||||
|
|
||||||
title = bounty.text or "(no text)"
|
|
||||||
lines.append(f"[#{bounty.id}] {title}")
|
|
||||||
|
|
||||||
if bounty.link:
|
|
||||||
lines.append(f"🔗 {bounty.link}")
|
|
||||||
|
|
||||||
if bounty.due_date_ts:
|
|
||||||
due_str = time.strftime("%d %B %Y %H:%M", time.localtime(bounty.due_date_ts))
|
|
||||||
lines.append(f"📅 {due_str} ({timezone})")
|
|
||||||
|
|
||||||
username = bounty.created_by_username or f"user#{bounty.created_by_user_id}"
|
|
||||||
lines.append(f"👤 @{username}")
|
|
||||||
|
|
||||||
created_str = time.strftime("%Y-%m-%d %H:%M", time.localtime(bounty.created_at))
|
|
||||||
lines.append(f"📌 Created: {created_str}")
|
|
||||||
|
|
||||||
await update.message.reply_text("\n".join(lines), disable_web_page_preview=True)
|
|
||||||
|
|
||||||
|
|
||||||
async def cmd_help(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
async def cmd_help(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||||
await update.message.reply_text(
|
await update.message.reply_text(
|
||||||
"👻 JIGAIDO Commands:\n\n"
|
"👻 JIGAIDO Commands:\n\n"
|
||||||
"/bounty — list all bounties\n"
|
"/bounty — list all bounties\n"
|
||||||
"/my — bounties you're tracking\n"
|
"/my — bounties you're tracking\n"
|
||||||
"/add <text> [link] [due] — add bounty\n"
|
"/add <text> [link] [due] — add bounty\n"
|
||||||
"/update <id> [text] [link] [due] — update bounty\n"
|
"/update <id> [text> [link] [due] — update bounty\n"
|
||||||
"/edit <id> [text] [link] [due] — edit bounty (same as update)\n"
|
"/delete <id> — delete bounty\n"
|
||||||
" /edit <id> -link [<url>] — clear or set link\n"
|
|
||||||
" /edit <id> -date [<date>] — clear or set date\n"
|
|
||||||
"/delete <id> — delete bounty (admin only)\n"
|
|
||||||
"/track <id> — track a bounty (groups only)\n"
|
"/track <id> — track a bounty (groups only)\n"
|
||||||
"/untrack <id> — stop tracking (groups only)\n"
|
"/untrack <id> — stop tracking (groups only)\n"
|
||||||
"/show <id> — show bounty details\n"
|
"/admin — list room admins\n"
|
||||||
"/start — re-initialize\n"
|
"/start — re-initialize\n"
|
||||||
"/help — this message",
|
"/help — this message",
|
||||||
disable_web_page_preview=True,
|
disable_web_page_preview=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
async def cmd_admin(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
|
||||||
|
room_id = get_room_id(update)
|
||||||
|
admin_ids = BOUNTY_SERVICE.list_admins(room_id)
|
||||||
|
|
||||||
|
if not admin_ids:
|
||||||
|
await update.message.reply_text("No admins configured for this room.")
|
||||||
|
return
|
||||||
|
|
||||||
|
lines = [f"Room Admins:"]
|
||||||
|
for admin_id in admin_ids:
|
||||||
|
lines.append(f"- @{admin_id}")
|
||||||
|
|
||||||
|
await update.message.reply_text("\n".join(lines))
|
||||||
|
|||||||
Reference in New Issue
Block a user