feat: update version number to 0.5.1

README.md

@@ -4,12 +4,15 @@ A bot for Fluxer which posts a post from ich_iel every hour.
 
 ## Installation:
 
+Clone repo:
 ```
 git clone https://git.scrunkly.cat/Michelle/ich_iel-Bot.git
 ```
 
+Check .env file and add your FLUXER_TOKEN.
+
+Then start the container:
 ```
-docker compose build
 docker compose up -d
 ```
 

compose.yml

@@ -1,6 +1,7 @@
 services:
   ich_iel-bot:
-    build: .
+    image: git.scrunkly.cat/michelle/ich_iel-bot:latest
+    restart: unless-stopped
     volumes:
       - ./data:/app/data
     env_file: ".env"

main.py

@@ -1,7 +1,9 @@
+import aiohttp
 import fluxer
 import requests
 import json
 import asyncio
+import base64
 from dotenv import load_dotenv
 import sqlite3
 import os
@@ -62,7 +64,7 @@ async def get_latest_post(subreddit):
                     for child in data["data"]["children"]:
                         post = child["data"]
                         if post.get("post_hint") == "image" and post.get("url", "").endswith((".jpg", ".png", ".jpeg", ".gif")):
-                            logging.info(f"Found image post: {post['title']} - {post['url']}")
+                            logging.debug(f"Found image post: {post['title']} - {post['url']}")
                             posts.append((post["title"], post["url"]))
                 return posts
             except (KeyError, json.JSONDecodeError):
@@ -118,7 +120,7 @@ async def setChannel(message):
 
 @bot.command()
 async def version(message):
-    await message.channel.send("Version 0.4 is running")
+    await message.channel.send("Version 0.5.1 is running\nSource code: https://github.com/michelleDeko/ich_iel-bot")
 
 # the cat bot died, so i wanted to add this command to this bot
 @bot.command()
@@ -133,6 +135,46 @@ async def cat(message):
     else:
         await message.channel.send("Failed to fetch cat image")
 
+# i thought dogs and foxes would be nice to have too
+@bot.command()
+async def dog(message):
+    response = requests.get("https://dog.ceo/api/breeds/image/random")
+    if response.status_code == 200:
+        data = response.json()
+        if data and isinstance(data, dict) and "message" in data:
+            await message.channel.send(data["message"])
+        else:
+            await message.channel.send("Could not fetch dog image")
+    else:
+        await message.channel.send("Failed to fetch dog image")
+
+@bot.command()
+async def fox(message):
+    response = requests.get("https://randomfox.ca/floof/")
+    if response.status_code == 200:
+        data = response.json()
+        if data and isinstance(data, dict) and "image" in data:
+            await message.channel.send(data["image"])
+        else:
+            await message.channel.send("Could not fetch fox image")
+    else:
+        await message.channel.send("Failed to fetch fox image")
+
+# time for racoons
+@bot.command()
+async def racoon(message):
+    urls = random.choice([
+        "https://api.mapach.es/v1/meme",
+        "https://api.mapach.es/v1/coon"
+    ])
+    async with aiohttp.ClientSession() as session:
+        async with session.get(urls) as response:
+            image_bytes = await response.read()
+    if response.status != 200:
+        await message.channel.send("Failed to fetch racoon image")
+        return
+    await message.channel.send(file=fluxer.File(image_bytes, filename="racoon.jpg"))
+
 async def post_reddit():
     subreddit = os.getenv("SUBREDDIT", "ich_iel")
     posts = await get_latest_post(subreddit)
@@ -156,7 +198,7 @@ async def post_reddit():
                 post_id = post_id_match.group(1)
                 is_posted = cur.execute("SELECT post_id FROM posted WHERE guild_id = ? AND post_id = ?", (guild_id, post_id)).fetchone()
                 if is_posted:
-                    logging.info(f"Post {post_id} already posted in guild {guild_id}, skipping.")
+                    logging.debug(f"Post {post_id} already posted in guild {guild_id}, skipping.")
                     continue
                 try:
                     channel = await bot.fetch_channel(int(channel_id))
@@ -170,13 +212,14 @@ async def post_reddit():
                         else:
                             logging.warning(f"Bot is not in guild {guild_id}, removing guild from database")
                             cur.execute("DELETE FROM channels WHERE guild_id = ?", (guild_id,))
+                            cur.execute("DELETE FROM posted WHERE guild_id = ?", (guild_id,))
                             con.commit()
                             break
                     else:
                         logging.warning(f"Channel {channel_id} not found for guild {guild_id}")
                 except Exception as e:
                     logging.error(f"Error sending to channel {channel_id}: {e}")
-            logging.info("All posts processed.")
+            logging.debug("All posts processed.")
     except sqlite3.Error as e:
         logging.error(f"Database error: {e}")
 
@@ -201,27 +244,6 @@ async def check_guild(guild_id):
         logging.warning(f"Bot doesn't have access to guild {guild_id}")
         return False
 
-@bot.event
-async def on_guild_remove(guild):
-    if isinstance(guild, fluxer.Guild):
-        guild_id = guild.id
-        logging.info(f"Removed from guild: {guild.name} (ID: {guild_id}), removing from database")
-    else:
-        if guild.get("unavailable"):
-            logging.info(f"Guild {guild.get('id')} is temporarily unavailable, ignoring")
-            return
-        guild_id = int(guild["id"])
-        logging.info(f"Removed from guild {guild_id}, removing from database")
-    try:
-        con = sqlite3.connect('data/ich_iel-bot.db')
-        cur = con.cursor()
-        cur.execute("DELETE FROM channels WHERE guild_id = ?", (guild_id,))
-        cur.execute("DELETE FROM posted WHERE guild_id = ?", (guild_id,))
-        con.commit()
-        logging.info(f"Guild {guild_id} removed from database successfully")
-    except sqlite3.Error as e:
-        logging.error(f"Database error while removing guild {guild_id}: {e}")
-
 if __name__ == "__main__":
     logging.info("Starting bot...")
     asyncio.run(init_db())

requirements.txt

@@ -1,4 +1,5 @@
 fluxer.py
 requests
 asyncio
-dotenv
+dotenv
+aiohttp