Added Statistic Tracking
This commit is contained in:
22
.env.example
22
.env.example
@@ -1,24 +1,24 @@
|
||||
#Jellycord version 1.0.9
|
||||
# Jellycord version 1.1.0
|
||||
|
||||
# Discord
|
||||
# |Discord|
|
||||
DISCORD_TOKEN=your_discord_bot_token
|
||||
PREFIX=!
|
||||
GUILD_IDS=123456789012345678,123456789012345678
|
||||
ADMIN_ROLE_IDS=111111111111111111,222222222222222222
|
||||
REQUIRED_ROLE_IDS=333333333333333333,444444444444444444
|
||||
|
||||
# Jellyfin
|
||||
# |Jellyfin|
|
||||
JELLYFIN_URL=http://127.0.0.1:8096
|
||||
JELLYFIN_API_KEY=your_jellyfin_api_key
|
||||
ENABLE_TRIAL_ACCOUNTS=false
|
||||
TRIAL_TIME=24 # In hours
|
||||
|
||||
# Jellyseerr
|
||||
# |Jellyseerr|
|
||||
JELLYSEERR_ENABLED=false
|
||||
JELLYSEERR_URL=http://localhost:5055
|
||||
JELLYSEERR_API_KEY=your_api_key_here
|
||||
|
||||
# JFA-Go
|
||||
# |JFA-Go|
|
||||
ENABLE_JFA=false
|
||||
JFA_URL=http://localhost:8056
|
||||
JFA_USERNAME=yourusername
|
||||
@@ -26,13 +26,13 @@ JFA_PASSWORD=yourpassword
|
||||
JFA_API_KEY=your_api_key_here
|
||||
JFA_TOKEN=
|
||||
|
||||
# QBittorrent
|
||||
# |QBittorrent|
|
||||
ENABLE_QBITTORRENT=false
|
||||
QBIT_HOST=http://localhost:8080
|
||||
QBIT_USERNAME=your_username
|
||||
QBIT_PASSWORD=your_password
|
||||
|
||||
# Proxmox
|
||||
# |Proxmox|
|
||||
ENABLE_PROXMOX=false
|
||||
PROXMOX_HOST=https://your-proxmox-server:8006
|
||||
PROXMOX_TOKEN_NAME=root@pam!yourtokenname
|
||||
@@ -43,15 +43,17 @@ PROXMOX_VM_ID=
|
||||
# Proxmox type can be "qemu" for VM, "lxc" for container
|
||||
PROXMOX_TYPE=
|
||||
|
||||
# MySQL
|
||||
# |MySQL|
|
||||
DB_HOST=localhost
|
||||
DB_USER=root
|
||||
DB_PASSWORD=password
|
||||
DB_NAME=jellyfin_bot
|
||||
|
||||
# Time Settings
|
||||
# |General Settings|
|
||||
TIMEZONE=America/Chicago
|
||||
# Tracking only reports limited information about your instance for development reasons. (Tracking enabled Instance & Enabled Features)
|
||||
TRACKING_ENABLED=true
|
||||
|
||||
# Logs
|
||||
# |Logs|
|
||||
SYNC_LOG_CHANNEL_ID=555555555555555555
|
||||
EVENT_LOGGING=false
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
# 1.1.0
|
||||
|
||||
- The bot now sends limited info stats to a public frontend for development insight. (Reports enabled features and bot instance only | Jellyseerr, Proxmox, JFA, qBittorrent)
|
||||
|
||||
# 1.0.9
|
||||
|
||||
- You can now configure trial account duration
|
||||
|
||||
26
README.md
26
README.md
@@ -1,6 +1,11 @@
|
||||
# Jellycord
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
[](https://discord.gg/EdPJAhrDq8)
|
||||
|
||||
@@ -13,7 +18,24 @@ 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
|
||||
# 🛑 Disclaimer (Please Read) 🛑
|
||||
|
||||
This bot collects limited amounts of information, it is enabled by default and can be disabled in your environment file. Information Collected is limited to:
|
||||
|
||||
- Bot Instances
|
||||
- Enabled Features
|
||||
|
||||
We do **not** and will **never** collect nor store:
|
||||
|
||||
- IP Address's.
|
||||
- System Information.
|
||||
- Information about Jellyfin or any related services.
|
||||
|
||||
## Why do we do this?
|
||||
|
||||
Adding these simply allows me to see what features users are interested in, allowing me to focus on improving/fixing highly used features.
|
||||
|
||||
# Features
|
||||
|
||||
- Automatic Account Cleanup
|
||||
- Creating Accounts
|
||||
@@ -24,7 +46,7 @@ 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.**
|
||||
|
||||
|
||||
46
app.py
46
app.py
@@ -18,6 +18,7 @@ from pathlib import Path
|
||||
import tempfile
|
||||
import shutil
|
||||
import pymysql
|
||||
import json
|
||||
|
||||
# =====================
|
||||
# ENV + VALIDATION
|
||||
@@ -84,6 +85,15 @@ VERSION_URL = "https://raw.githubusercontent.com/PenguCCN/Jellycord/main/version
|
||||
RELEASES_URL = "https://github.com/PenguCCN/Jellycord/releases"
|
||||
CHANGELOG_URL = "https://raw.githubusercontent.com/PenguCCN/Jellycord/refs/heads/main/CHANGELOG.md"
|
||||
|
||||
TRACKING_ENABLED = os.getenv("TRACKING_ENABLED", "False").lower() == "true"
|
||||
POST_ENDPOINTS = {
|
||||
"botinstance": "https://jellycordstats.pengucc.com/api/instance",
|
||||
"jellyseerr": "https://jellycordstats.pengucc.com/api/jellyseerr",
|
||||
"proxmox": "https://jellycordstats.pengucc.com/api/proxmox",
|
||||
"jfa": "https://jellycordstats.pengucc.com/api/jfa",
|
||||
"qbittorrent": "https://jellycordstats.pengucc.com/api/qbittorrent"
|
||||
}
|
||||
|
||||
# =====================
|
||||
# EVENT LOGGING
|
||||
# =====================
|
||||
@@ -284,6 +294,7 @@ def delete_account(discord_id):
|
||||
# =====================
|
||||
# JELLYFIN HELPERS
|
||||
# =====================
|
||||
|
||||
def create_jellyfin_user(username, password):
|
||||
headers = {"X-Emby-Token": JELLYFIN_API_KEY}
|
||||
data = {"Name": username, "Password": password}
|
||||
@@ -671,6 +682,8 @@ def restart_bot():
|
||||
"""Replace current process with a new one."""
|
||||
os.execv(sys.executable, [sys.executable] + sys.argv)
|
||||
|
||||
def build_payload(enabled: bool):
|
||||
return {"value": 1 if enabled else 0}
|
||||
|
||||
# =====================
|
||||
# EVENTS
|
||||
@@ -2337,6 +2350,33 @@ async def cleanup_task():
|
||||
except Exception as e:
|
||||
print(f"[Cleanup] Failed to send removed message to sync channel: {e}")
|
||||
|
||||
@tasks.loop(seconds=15)
|
||||
async def periodic_post_task():
|
||||
if not TRACKING_ENABLED:
|
||||
return
|
||||
|
||||
features = {
|
||||
"botinstance": TRACKING_ENABLED,
|
||||
"jellyseerr": JELLYSEERR_ENABLED,
|
||||
"proxmox": ENABLE_PROXMOX,
|
||||
"jfa": ENABLE_JFA,
|
||||
"qbittorrent": ENABLE_QBITTORRENT
|
||||
}
|
||||
|
||||
for feature, enabled in features.items():
|
||||
url = POST_ENDPOINTS.get(feature)
|
||||
if not url:
|
||||
print(f"[POST LOOP] No endpoint for: {feature}")
|
||||
continue
|
||||
|
||||
payload = build_payload(enabled)
|
||||
|
||||
try:
|
||||
response = requests.post(url, json=payload, timeout=10)
|
||||
print(f"[POST LOOP] Sent {feature} → {response.status_code} | Payload: {payload}")
|
||||
except Exception as e:
|
||||
print(f"[POST LOOP] Error sending POST for {feature}: {e}")
|
||||
|
||||
# =====================
|
||||
# JFA-Go Scheduled Token Refresh
|
||||
# =====================
|
||||
@@ -2413,6 +2453,12 @@ async def on_ready():
|
||||
if not check_for_updates.is_running():
|
||||
check_for_updates.start()
|
||||
|
||||
if TRACKING_ENABLED:
|
||||
print("Tracking enabled — starting.")
|
||||
periodic_post_task.start()
|
||||
else:
|
||||
print("Tracking disabled via .env")
|
||||
|
||||
await bot.change_presence(
|
||||
activity=discord.Activity(type=discord.ActivityType.watching, name=f"{PREFIX}help")
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user