fixed pandas df issue

DiscordBot.py

@@ -118,18 +118,10 @@ async def update_rss(ctx):
         await ctx.respond("Sucessfully updated RSS feed")
 
 @bot.slash_command()
-async def upload(ctx,file: discord.Attachment | None = None):
+async def upload(ctx):
 
     messagechannel = bot.get_channel(torrent_link_channel_id)
 
-    if file is None:
-        logger.info("No link attached")
-    else:
-        filename = str(file.filename)
-        if ".torrent" in filename:
-            await file.save(filename)
-            await ctx.respond(f"{filename} recieved, uploading")
-            
     if ctx.user.id == fiery_eagle_id or ctx.user.id == dodi_id:
         files = files_to_upload(".")
         try:
@@ -138,10 +130,11 @@ async def upload(ctx,file: discord.Attachment | None = None):
             await ctx.respond("Tried to upload 0 files")
         else:
             for i in files:
+                logger.info(f"Uploading filename: {i}")
                 uploadfile(i)
                 await messagechannel.send(f"{os.path.splitext(i)[0]}\nhttps://torfiles.fieryeagle.org/{urlencode(i)}")
                 os.remove(i)
-            await ctx.respond(f"Sucessfully uploaded {files}")
+            await ctx.followup.send(f"Sucessfully uploaded {files}")
 
 @bot.slash_command()
 async def manual_upload(ctx, file_url: str):

rss_gen.py

@@ -33,7 +33,7 @@ XML_END = """</channel></rss>"""
 load_dotenv()
 copyparty_token = os.getenv('COPYPARTY_TOKEN')
 
-def make_torrent_entry(name, timestamp, category):
+def make_torrent_entry(name, timestamp, filehash, category):
     if category:
         category = "DODI_Repack"
     else:
@@ -42,7 +42,7 @@ def make_torrent_entry(name, timestamp, category):
 	                <title><![CDATA[{name}]]></title>
 					<pubDate>{timestamp} +0000</pubDate>
 					<category>{category}</category>
-                    <guid>{name}</guid>
+                    <guid>{filehash}</guid>
 	                <link><![CDATA[https://torfiles.fieryeagle.org/{urlencode(name)}]]></link>
 	                <description><![CDATA[Category: {category} → {timestamp} +0000]]></description>
                 </item>"""
@@ -56,22 +56,22 @@ def write_file(path, data):
 
 def create_25_recent_feed(df):
     most_recent_25 = df.sort_values("timestamp", ascending=False).head(25)
-    latest_25_xml = "\n".join([make_torrent_entry(i[0], i[2], i[3]) for i in most_recent_25.values])
+    latest_25_xml = "\n".join(make_torrent_entry(row.name, row.timestamp, row.filehash, row.is_repack) for row in most_recent_25.itertuples())
     write_file("RSS/recent_25.xml", XML_BEGIN_RECENT+latest_25_xml+XML_END)
 
 def create_48h_latest(df):
     last_48_hours = df[df['timestamp'] > datetime.now() - pd.Timedelta(days=2)]
     last_48_hours = last_48_hours.sort_values("timestamp", ascending=False)
-    last_48_xml = "\n".join([make_torrent_entry(i[0], i[2], i[3]) for i in last_48_hours.values])
+    last_48_xml = "\n".join(make_torrent_entry(row.name, row.timestamp, row.filehash, row.is_repack) for row in last_48_hours.itertuples())
     write_file("RSS/latest_48h.xml", XML_BEGIN_LAST+last_48_xml+XML_END)
 
 def create_df():
     torfiles_scrape = requests.get("https://upload.fieryeagle.org/torfiles", auth=("torbot",copyparty_token))
     soup = BeautifulSoup(torfiles_scrape.content, "html.parser")
     rows = [i.find_all("td") for i in soup.tbody.find_all("tr")]
-    filtered_rows = [[i[1].text, i[6].text, datetime.strptime(i[9].text, "%Y-%m-%d %H:%M:%S")] for i in rows]
+    filtered_rows = [[i[1].text, i[6].text, i[4].text, datetime.strptime(i[9].text, "%Y-%m-%d %H:%M:%S")] for i in rows]
     df = pd.DataFrame(
-        data=filtered_rows, columns=["name", "upload_ip", "timestamp"]
+        data=filtered_rows, columns=["name", "upload_ip", "filehash", "timestamp"]
     )
 
     df['is_repack'] = df['name'].str.contains('DODI', case=False)