Merge pull request #41 from Lacentix/master

dumpyara: properly store initial message ID

Author: ant14181

dumpyarabot/handlers.py

@@ -111,13 +111,26 @@ async def dump(
                 message_id=initial_message.message_id,
             )
 
+        initial_msg = await context.bot.send_message(
+            chat_id=chat.id,
+            reply_to_message_id=None if use_privdump else message.message_id,
+            text=f"{dump_args.url.unicode_string()} dump started",
+        )
+
+        dump_args.initial_message_id = initial_msg.message_id
+
         console.print("[blue]Calling Jenkins to start build...[/blue]")
         response_text = await utils.call_jenkins(dump_args)
         console.print(f"[green]Jenkins response: {response_text}[/green]")
 
     except ValidationError:
         console.print(f"[red]Invalid URL provided: {url}[/red]")
         response_text = "Invalid URL"
+        await context.bot.send_message(
+            chat_id=chat.id,
+            reply_to_message_id=None if use_privdump else message.message_id,
+            text=response_text,
+        )
     except Exception:
         console.print("[red]Unexpected error occurred:[/red]")
         console.print_exception()

dumpyarabot/schemas.py

@@ -14,3 +14,4 @@ class DumpArguments(BaseModel):
     use_alt_dumper: bool
     add_blacklist: bool
     use_privdump: bool
+    initial_message_id: Optional[int] = None

dumpyarabot/utils.py

@@ -110,6 +110,7 @@ async def call_jenkins(args: schemas.DumpArguments) -> str:
                     "URL": args.url.unicode_string(),
                     "USE_ALT_DUMPER": args.use_alt_dumper,
                     "ADD_BLACKLIST": args.add_blacklist,
+                    "INITIAL_MESSAGE_ID": args.initial_message_id,
                 },
                 auth=(settings.JENKINS_USER_NAME, settings.JENKINS_USER_TOKEN),
             )

extract_and_push.sh

@@ -7,6 +7,8 @@
 
 CHAT_ID="-1001412293127"
 
+[[ -z ${INITIAL_MESSAGE_ID} ]] && START_MESSAGE_ID="" || START_MESSAGE_ID="${INITIAL_MESSAGE_ID}"
+
 # usage: normal - sendTg normal "message to send"
 #        reply  - sendTg reply message_id "reply to send"
 #        edit   - sendTg edit message_id "new message" ( new message must be different )