Bump 1.0.3

- Fixed: ValueError: too many values to unpack (expected 2)
- Cleanup will now delete Jellyseerr accounts as well

.env

@@ -8,6 +8,7 @@ REQUIRED_ROLE_IDS=333333333333333333,444444444444444444
 # Jellyfin
 JELLYFIN_URL=http://127.0.0.1:8096
 JELLYFIN_API_KEY=your_jellyfin_api_key
+ENABLE_TRIAL_ACCOUNTS=false
 
 # Jellyseerr
 JELLYSEERR_ENABLED=false

CHANGELOG.md

@@ -0,0 +1,22 @@
+# 1.0.3
+
+- Fixed: `ValueError: too many values to unpack (expected 2)`
+- Cleanup will now delete Jellyseerr accounts as well
+- Added Trial Jellyfin account support (enable in .env). Will not create a Jellyseerr account, lasts 24 hours, one time use.
+
+# 1.0.2
+
+- Fixed Jellyseerr support breaking linking, unlinking, and deletion
+- Added the ability to link Jellyseerr accounts when linking Jellyfin
+- Added event logging support for console (Can be toggled in .env or with commands)
+- Reformatted the updates message
+- Running a command without any values will now show you the proper command usage
+
+# 1.0.1
+
+- Added Jellyseerr Support
+
+# 1.0.0
+
+- Bot can now track update releases
+- Restrict prefixes to non-alphanumeric symbols

README.md

@@ -1,4 +1,10 @@
-# Jellyfin-Discord
+# Jellycord
+
+![image](https://cdn.pengucc.com/images/projects/jellycord/readme/BannerRound.png)
+
+[![Online Members](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fdiscordapp.com%2Fapi%2Finvites%2FEdPJAhrDq8%3Fwith_counts%3Dtrue&query=approximate_presence_count&style=for-the-badge&logo=discord&logoColor=white&label=ONLINE%20MEMBERS&labelColor=grey&color=239eda)](https://discord.gg/EdPJAhrDq8)
+![Latest Version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2FPenguCCN%2FJellycord%2Fmain%2Fversion.json&query=%24.version&style=for-the-badge&logo=python&logoColor=white&label=Latest%20Version%3A&color=239eda)
+
 Allow the creation and management of Jellyfin users via Discord
 
 Join my [Discord](https://discord.com/invite/zJMUNCPtPy) for help, and keeping an eye out for updates!
@@ -7,7 +13,7 @@ This is a very simple and lightweight Jellyfin Discord bot for managing users. I
 
 Fill out values in the .env and you're good to go!
 
-# Features
+## Features
 
 - Automatic Account Cleanup
 - Creating Accounts
@@ -18,30 +24,31 @@ Fill out values in the .env and you're good to go!
 - Change bot prefix live
 - Checks for new releases
 
-# Command Overview
+## Command Overview
 
 **Pinging the bot will show you the necessary commands to create your account.**
 
 **PLEASE NOTE BEFORE USING. THIS BOT IS MEANT TO USE REQUIRED ROLES IN ORDER TO WHITELIST USERS FOR JELLYFIN. TAKING A USERS ROLE AWAY WILL DELETE THEIR JELLYFIN ACCOUNT WHEN THE BOT RUNS ITS CLEANUP (24 Hour Schedule or Admin Forced)**
 
-![image](https://cdn.pengucc.com/images/projects/jellyfin-bot/ping.png)
+![image](https://cdn.pengucc.com/images/projects/jellycord/readme/ping.png)
 
 **There are protections in place to stop users from creating an account where people can see. If a user sends the account creation or reset in a guild, the bot will delete it.**
 
-![image](https://cdn.pengucc.com/images/projects/jellyfin-bot/account-deny.png)
+![image](https://cdn.pengucc.com/images/projects/jellycord/readme/account-deny.png)
 
 **If a user already has a linked Jellyfin account, the bot will not allow them to create another account.**
 
-![image](https://cdn.pengucc.com/images/projects/jellyfin-bot/account-limit.png)
+![image](https://cdn.pengucc.com/images/projects/jellycord/readme/account-limit.png)
 
 **In order to create an account, you must have the required roles specified in the .env**
 
-![image](https://cdn.pengucc.com/images/projects/jellyfin-bot/role-required.png)
+![image](https://cdn.pengucc.com/images/projects/jellycord/readme/role-required.png)
 
 ***User Commands***
 - `!createaccount` <username> <password> - Create your Jellyfin account
 - `!recoveraccount` <username> <newpassword> - Reset your password
 - `!deleteaccount` <username> - Delete your Jellyfin account
+- `!trialaccount` <username> <password> - Create a 24-hour trial Jellyfin account. Only if ENABLE_TRIAL_ACCOUNTS=True
 
 ***Admin Commands***
 - `!cleanup` - Remove Jellyfin accounts from users without roles

app.py

@@ -29,6 +29,7 @@ SYNC_LOG_CHANNEL_ID = get_env_var("SYNC_LOG_CHANNEL_ID", int)
 
 JELLYFIN_URL = get_env_var("JELLYFIN_URL")
 JELLYFIN_API_KEY = get_env_var("JELLYFIN_API_KEY")
+ENABLE_TRIAL_ACCOUNTS = os.getenv("ENABLE_TRIAL_ACCOUNTS", "False").lower() == "true"
 
 JELLYSEERR_ENABLED = os.getenv("JELLYSEERR_ENABLED", "false").lower() == "true"
 JELLYSEERR_URL = os.getenv("JELLYSEERR_URL", "").rstrip("/")
@@ -39,9 +40,9 @@ DB_USER = get_env_var("DB_USER")
 DB_PASSWORD = get_env_var("DB_PASSWORD")
 DB_NAME = get_env_var("DB_NAME")
 
-BOT_VERSION = "1.0.2"
-VERSION_URL = "https://raw.githubusercontent.com/PenguCCN/Jellyfin-Discord/main/version.txt"
-RELEASES_URL = "https://github.com/PenguCCN/Jellyfin-Discord/releases"
+BOT_VERSION = "1.0.3"
+VERSION_URL = "https://raw.githubusercontent.com/PenguCCN/Jellycord/main/version.txt"
+RELEASES_URL = "https://github.com/PenguCCN/Jellycord/releases"
 
 # =====================
 # EVENT LOGGING
@@ -65,25 +66,27 @@ bot = commands.Bot(command_prefix=PREFIX, intents=intents, help_command=None)
 # =====================
 def init_db():
     log_event(f"Initiating Database...")
-    # Create database if it doesn't exist
-    conn = mysql.connector.connect(host=DB_HOST, user=DB_USER, password=DB_PASSWORD)
+    conn = mysql.connector.connect(
+        host=DB_HOST, user=DB_USER, password=DB_PASSWORD
+    )
     cur = conn.cursor()
     cur.execute(f"CREATE DATABASE IF NOT EXISTS `{DB_NAME}`")
     conn.commit()
     cur.close()
     conn.close()
 
-    # Connect to the database
-    conn = mysql.connector.connect(host=DB_HOST, user=DB_USER, password=DB_PASSWORD, database=DB_NAME)
+    conn = mysql.connector.connect(
+        host=DB_HOST, user=DB_USER, password=DB_PASSWORD, database=DB_NAME
+    )
     cur = conn.cursor()
 
-    # Create accounts table if it doesn't exist
+    # Normal accounts table
     cur.execute("""
         CREATE TABLE IF NOT EXISTS accounts (
             discord_id BIGINT PRIMARY KEY,
             jellyfin_username VARCHAR(255) NOT NULL,
             jellyfin_id VARCHAR(255) NOT NULL,
-            jellyseerr_id VARCHAR(255) DEFAULT NULL
+            jellyseerr_id VARCHAR(255)
         )
     """)
 
@@ -99,7 +102,18 @@ def init_db():
         cur.execute("ALTER TABLE accounts ADD COLUMN jellyseerr_id VARCHAR(255) DEFAULT NULL")
         print("[DB] Added missing column 'jellyseerr_id' to accounts table.")
 
-    # Create bot_metadata table if it doesn't exist
+    # Trial accounts table (persistent history, one-time only)
+    cur.execute("""
+        CREATE TABLE IF NOT EXISTS trial_accounts (
+            id INT AUTO_INCREMENT PRIMARY KEY,
+            discord_id BIGINT NOT NULL UNIQUE,
+            jellyfin_username VARCHAR(255),
+            jellyfin_id VARCHAR(255),
+            trial_created_at DATETIME NOT NULL,
+            expired BOOLEAN DEFAULT 0
+        )
+    """)
+    
     cur.execute("""
         CREATE TABLE IF NOT EXISTS bot_metadata (
             key_name VARCHAR(255) PRIMARY KEY,
@@ -107,6 +121,14 @@ def init_db():
         )
     """)
 
+    # Cleanup logs table
+    cur.execute("""
+        CREATE TABLE IF NOT EXISTS cleanup_logs (
+            id INT AUTO_INCREMENT PRIMARY KEY,
+            run_at DATETIME NOT NULL
+        )
+    """)
+
     conn.commit()
     cur.close()
     conn.close()
@@ -125,6 +147,26 @@ def add_account(discord_id, username, jf_id, js_id=None):
     cur.close()
     conn.close()
 
+def init_trial_accounts_table():
+    conn = mysql.connector.connect(
+        host=DB_HOST, user=DB_USER, password=DB_PASSWORD, database=DB_NAME
+    )
+    cur = conn.cursor()
+    # Persistent trial accounts table
+    cur.execute("""
+        CREATE TABLE IF NOT EXISTS trial_accounts (
+            id INT AUTO_INCREMENT PRIMARY KEY,
+            discord_id BIGINT NOT NULL UNIQUE,
+            jellyfin_username VARCHAR(255) NOT NULL,
+            jellyfin_id VARCHAR(255) NOT NULL,
+            trial_created_at DATETIME NOT NULL,
+            expired BOOLEAN DEFAULT 0
+        )
+    """)
+    conn.commit()
+    cur.close()
+    conn.close()
+
 
 def get_accounts():
     conn = mysql.connector.connect(
@@ -302,6 +344,33 @@ def get_metadata(key):
     conn.close()
     return row[0] if row else None
 
+def create_trial_jellyfin_user(username, password):
+    payload = {
+        "Name": username,
+        "Password": password,
+        "Policy": {
+            "EnableDownloads": False,
+            "EnableSyncTranscoding": False,
+            "EnableRemoteControlOfOtherUsers": False,
+            "EnableLiveTvAccess": False,
+            "IsAdministrator": False,
+            "IsHidden": False,
+            "IsDisabled": False
+        }
+    }
+    headers = {
+        "X-Emby-Token": JELLYFIN_API_KEY,
+        "Content-Type": "application/json"
+    }
+    response = requests.post(f"{JELLYFIN_URL}/Users/New", json=payload, headers=headers)
+
+    if response.status_code == 200:
+        return response.json().get("Id")
+    else:
+        print(f"[Jellyfin] Trial user creation failed. Status: {response.status_code}, Response: {response.text}")
+        return None
+
+
 # =====================
 # EVENTS
 # =====================
@@ -381,6 +450,79 @@ async def createaccount(ctx, username: str = None, password: str = None):
     else:
         await ctx.send(f"❌ Failed to create Jellyfin account **{username}**. It may already exist.")
 
+@bot.command()
+async def trialaccount(ctx, username: str = None, password: str = None):
+    """Create a 24-hour trial Jellyfin account. DM-only, one-time per user."""
+    log_event(f"trialaccount invoked by {ctx.author}")
+
+    # Ensure trial accounts are enabled
+    if not ENABLE_TRIAL_ACCOUNTS:
+        await ctx.send("❌ Trial accounts are currently disabled.")
+        return
+
+    # Ensure it's a DM
+    if not isinstance(ctx.channel, discord.DMChannel):
+        try:
+            await ctx.message.delete()
+        except discord.Forbidden:
+            pass
+        await ctx.send(f"{ctx.author.mention} ❌ Please DM me to create a trial account.")
+        return
+
+    # Ensure required arguments
+    if username is None or password is None:
+        await ctx.send(command_usage(f"{PREFIX}trialaccount", ["<username>", "<password>"]))
+        return
+
+    guild = bot.get_guild(GUILD_ID)
+    member = guild.get_member(ctx.author.id) if guild else None
+
+    # Check required server role
+    if not member or not has_required_role(member):
+        await ctx.send(f"❌ {ctx.author.mention}, you don’t have the required role.")
+        return
+
+    # Check if user already has a normal Jellyfin account
+    if get_account_by_discord(ctx.author.id):
+        await ctx.send(f"❌ {ctx.author.mention}, you already have a Jellyfin account.")
+        return
+
+    # Check if user already had a trial account (one-time)
+    conn = mysql.connector.connect(
+        host=DB_HOST, user=DB_USER, password=DB_PASSWORD, database=DB_NAME
+    )
+    cur = conn.cursor()
+    cur.execute("SELECT * FROM trial_accounts WHERE discord_id=%s", (ctx.author.id,))
+    existing_trial = cur.fetchone()
+    if existing_trial:
+        cur.close()
+        conn.close()
+        await ctx.send(f"❌ {ctx.author.mention}, you have already used your trial account. You cannot create another.")
+        return
+
+    # Create Jellyfin trial user
+    if create_jellyfin_user(username, password):
+        jf_id = get_jellyfin_user(username)
+        if not jf_id:
+            await ctx.send(f"❌ Failed to fetch Jellyfin ID for **{username}**. Please contact an admin.")
+            return
+
+        # Store trial account info in separate persistent table
+        cur.execute("""
+            INSERT INTO trial_accounts (discord_id, jellyfin_username, jellyfin_id, trial_created_at, expired)
+            VALUES (%s, %s, %s, NOW(), 0)
+        """, (ctx.author.id, username, jf_id))
+        conn.commit()
+        cur.close()
+        conn.close()
+
+        await ctx.send(f"✅ Trial Jellyfin account **{username}** created! It will expire in 24 hours.\n🌐 Login here: {JELLYFIN_URL}")
+        log_event(f"Trial account created for {ctx.author} ({username})")
+    else:
+        cur.close()
+        conn.close()
+        await ctx.send(f"❌ Failed to create trial account **{username}**. It may already exist.")
+
 
 @bot.command()
 async def recoveraccount(ctx, new_password: str = None):
@@ -445,11 +587,27 @@ async def cleanup(ctx):
     log_event(f"cleanup invoked by {ctx.author}")
     guild = bot.get_guild(GUILD_ID)
     removed = []
-    for discord_id, jf_username in get_accounts():
+
+    for row in get_accounts():
+        discord_id = row[0]
+        jf_username = row[1]
+        jf_id = row[2] if len(row) > 2 else None
+        js_id = row[3] if len(row) > 3 else None
+
         m = guild.get_member(discord_id)
         if m is None or not has_required_role(m):
             if delete_jellyfin_user(jf_username):
                 delete_account(discord_id)
+
+                if JELLYSEERR_ENABLED and js_id:
+                    try:
+                        headers = {"X-Api-Key": JELLYSEERR_API_KEY}
+                        dr = requests.delete(f"{JELLYSEERR_URL}/api/v1/user/{js_id}", headers=headers, timeout=10)
+                        if dr.status_code in (200, 204):
+                            print(f"[Jellyseerr] User {js_id} removed successfully.")
+                    except Exception as e:
+                        print(f"[Jellyseerr] Failed to delete user {js_id}: {e}")
+
                 removed.append(jf_username)
 
     log_channel = bot.get_channel(SYNC_LOG_CHANNEL_ID)
@@ -663,12 +821,20 @@ async def help_command(ctx):
         color=discord.Color.blue()
     )
 
-    embed.add_field(name="User Commands", value=(
-        f"`{PREFIX}createaccount <username> <password>` - Create your Jellyfin account\n"
-        f"`{PREFIX}recoveraccount <newpassword>` - Reset your password\n"
-        f"`{PREFIX}deleteaccount <username>` - Delete your Jellyfin account\n"
-    ), inline=False)
+    # User commands
+    user_cmds = [
+        f"`{PREFIX}createaccount <username> <password>` - Create your Jellyfin account",
+        f"`{PREFIX}recoveraccount <newpassword>` - Reset your password",
+        f"`{PREFIX}deleteaccount <username>` - Delete your Jellyfin account"
+    ]
 
+    # Only show trialaccount if enabled
+    if ENABLE_TRIAL_ACCOUNTS:
+        user_cmds.append(f"`{PREFIX}trialaccount <username> <password>` - Create a 24-hour trial Jellyfin account")
+
+    embed.add_field(name="User Commands", value="\n".join(user_cmds), inline=False)
+
+    # Admin commands
     if is_admin:
         embed.add_field(name="Admin Commands", value=(
             f"`{PREFIX}cleanup` - Remove Jellyfin accounts from users without roles\n"
@@ -680,7 +846,7 @@ async def help_command(ctx):
             f"`{PREFIX}unlink @user` - Manually unlink accounts\n"
         ), inline=False)
         embed.add_field(name="Admin Bot Commands", value=(
-            f"`{PREFIX}setprefix` - Change the bots command prefix\n"
+            f"`{PREFIX}setprefix` - Change the bot's command prefix\n"
             f"`{PREFIX}updates` - Manually check for bot updates\n"
             f"`{PREFIX}logging` - Enable/Disable Console Event Logging\n"
         ), inline=False)
@@ -697,19 +863,49 @@ async def daily_check():
     guild = bot.get_guild(GUILD_ID)
     removed = []
 
-    for discord_id, jf_username in get_accounts():
+    # Normal accounts cleanup
+    for discord_id, jf_username, jf_id, js_id in get_accounts():
         m = guild.get_member(discord_id)
         if m is None or not has_required_role(m):
             if delete_jellyfin_user(jf_username):
                 delete_account(discord_id)
                 removed.append(jf_username)
 
-    if removed:
-        print(f"Daily cleanup: removed {len(removed)} accounts: {removed}")
+    # Trial accounts cleanup
+    conn = mysql.connector.connect(
+        host=DB_HOST, user=DB_USER, password=DB_PASSWORD, database=DB_NAME
+    )
+    cur = conn.cursor(dictionary=True)
+    cur.execute("SELECT * FROM trial_accounts WHERE expired=0")
+    trials = cur.fetchall()
+
+    for trial in trials:
+        created_at = trial["trial_created_at"]
+        if created_at and datetime.datetime.utcnow() > created_at + datetime.timedelta(hours=24):
+            # Delete from Jellyfin
+            delete_jellyfin_user(trial["jellyfin_username"])
+            # Mark trial as expired
+            cur.execute("UPDATE trial_accounts SET expired=1 WHERE discord_id=%s", (trial["discord_id"],))
+            conn.commit()
+            removed.append(f"{trial['jellyfin_username']} (trial)")
+
+
+    cur.close()
+    conn.close()
+
+    # Record cleanup run
+    conn = mysql.connector.connect(
+        host=DB_HOST, user=DB_USER, password=DB_PASSWORD, database=DB_NAME
+    )
+    cur = conn.cursor()
+    cur.execute("INSERT INTO cleanup_logs (run_at) VALUES (%s)", (datetime.datetime.utcnow(),))
+    conn.commit()
+    cur.close()
+    conn.close()
+
+    if removed:
+        print(f"Cleanup removed {len(removed)} accounts: {removed}")
 
-    # Log last run timestamp
-    set_metadata("last_cleanup", datetime.datetime.utcnow().isoformat())
-    log_event(f"Daily cleanup: removed {len(removed)} accounts: {removed}")
 
 @tasks.loop(hours=1)
 async def check_for_updates():

version.json

@@ -0,0 +1 @@
+{ "version": "1.0.3" }

version.txt

@@ -1 +1 @@
-1.0.2
+1.0.3