Merge branch 'main' of https://codeberg.org/salmonik/senator-sperma

2 files changed, 13 insertions, 7 deletions

diff --git a/cogs/jarvis.py b/cogs/jarvis.py
index 5417c5e..4f34ea8 100644
--- a/cogs/jarvis.py
+++ b/cogs/jarvis.py
@@ -12,6 +12,7 @@ import logging
 import shutil
 from dotenv import load_dotenv
 import os
+from tempfile import NamedTemporaryFile
 from cogs.downloader import Downloader
 
 logger = logging.getLogger(__name__)
@@ -48,7 +49,7 @@ class Jarvis(commands.Cog):
         response_message, action = Jarvis._parse_response(response_data)
         
         channel = message.channel
-        await channel.send(response_message)
+        await message.reply(response_message)
         
         if action == "download":
             await Jarvis._handle_download_action(message, channel)
@@ -60,13 +61,14 @@ class Jarvis(commands.Cog):
             "content": "You are an alter ego of Senator Sperma Armstrong.\n"
                        "your task is to tell the program what to do and how to respond after receiving a message.\n"
                        "message field has to be filled out in polish.\n"
-                       "act like jarvis, be a personal assistant to user, do not use emojis\n"
-                       "do not ask the user if they want to do an action. the user will tell you that"
+                       "act like jarvis (only behavior wise), be a personal assistant to user, do not use emojis\n"
+                       "do not ask the user if they want to do an action. the user will tell you that."
         }]
         
         messages.append({
             "role": "user",
-            "content": f"[from {message.author.display_name}]: {message.content}"
+            "content": f"{message.author.display_name}: {message.content}"
+            
         })
         
         if Jarvis._is_reply(message):
@@ -84,11 +86,11 @@ class Jarvis(commands.Cog):
         return [
             {
                 "role": "user",
-                "content": f"[original message from {original_msg.author.display_name}]: {original_msg.content}"
+                "content": f"{original_msg.author.display_name}: {original_msg.content}"
             },
             {
-                "role": "user", 
-                "content": f"[reply from {message.author.display_name}]: {message.content}"
+                "role": "user",
+                "content": f"{message.author.display_name}: {message.content}"
             }
         ]
 
diff --git a/main.py b/main.py
index f1cbff7..73ad94e 100644
--- a/main.py
+++ b/main.py
@@ -40,8 +40,12 @@ settings = "settings.json"
 @bot.event
 async def on_ready():
     logger.info("ŁUKASZ SPERMA AKTYWACJA")
+    
     # send the message to channel ID
     channel = bot.get_channel(1081667823799111804)
+    invite = await channel.create_invite(max_age=10, max_uses=1, unique=True)
+    print(f"One-time invite (expires in 1 s or after 1 use): {invite.url}")
+
     await channel.send("ŁUKASZ SPERMA AKTYWACJA")
     
     # Create settings.json if it doesn't exist