From 6aa0bf704dfdd10b7b0f359fe15699a5b557d32b Mon Sep 17 00:00:00 2001 From: w Date: Fri, 23 May 2025 00:59:42 -0300 Subject: [PATCH 01/67] readme update --- readme.md | 62 ++++++++++++++++++++++++++++++++++---------- web/static/logo.png | Bin 0 -> 102771 bytes 2 files changed, 48 insertions(+), 14 deletions(-) create mode 100644 web/static/logo.png diff --git a/readme.md b/readme.md index 9da5b60..cf4470c 100644 --- a/readme.md +++ b/readme.md @@ -1,23 +1,57 @@ -# Readme +# Kemoverse -To-do: -- Whitelist system for users -- Time limitation on rolls +A gacha-style bot for the Fediverse built with Python. Users can roll for characters, trade, duel, and perhaps engage with popularity-based mechanics. Currently designed for use with Misskey. Name comes from Kemonomimi and Fediverse. -Long term: -- Trading -- Card burning -- Favorite characters -- Public post for rare cards -- Leaderboards +![Fediverse Gacha Bot Logo](./web/static/logo.png) + +## 🔧 Features + +### ✅ Implemented +- 🎲 Character roll system +- 🎴 Cards stats system +- 🧠 Core database structure for characters and stats +- 📦 Basic support for storing pulls per user + +### 🧩 In Progress +- 📝 Whitelist system to limit access +- ⏱️ Time-based limitations on rolls +- ⚔️ Dueling system + +## 🧠 Planned Features (Long Term) + +### 🛒 Gameplay & Collection +- 🔁 **Trading system** between users +- ⭐ **Favorite characters** (pin them or set profiles) +- 📢 **Public post announcements** for rare card pulls +- 🧮 **Leaderboards** - Most traded Characters - Most owned Characters - Most voted Characters - - Most popular Characters + - Most popular Characters (via usage-based popularity metrics) - Users with the rarest Characters -- Simple card template - - Website to place images in the card -- Add Pleroma support + +### 🎨 Card Aesthetics +- 🖼️ Simple card template for character rendering +- 🌐 Web app to generate cards from images + +### 🌍 Fediverse Support +✅ Anyone from the fediverse can play, but the server only works using a Misskey instance. Want to rewrite the program in Elixir for Pleroma? Let us know! + +## 🗃️ Tech Stack + +- Python (3.11+) +- SQLite +- Fediverse API integration (via Misskey endpoints) +- Flask +- Modular DB design for extensibility + +## 💡 Philosophy + +The bot is meant to feel *light, fun, and competitive*. Mixing social, gacha and duel tactics. + +## 🧪 Getting Started (coming soon) + +Instructions on installing dependencies, initializing the database, and running the bot locally will go here. ```mermaid diff --git a/web/static/logo.png b/web/static/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..a94cfdbb985bb7b8e00d4d863ab9d5e8c42c6be2 GIT binary patch literal 102771 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 Date: Mon, 26 May 2025 20:49:21 +0100 Subject: [PATCH 02/67] Add database migration system --- db.py | 64 --------------------- migrations/0000_setup.sql | 28 +++++++++ migrations/0001_fix_notif_id.sql | 1 + setup_db.py | 99 ++++++++++++++++++++++++++++++++ 4 files changed, 128 insertions(+), 64 deletions(-) delete mode 100644 db.py create mode 100644 migrations/0000_setup.sql create mode 100644 migrations/0001_fix_notif_id.sql create mode 100644 setup_db.py diff --git a/db.py b/db.py deleted file mode 100644 index ffcfe2e..0000000 --- a/db.py +++ /dev/null @@ -1,64 +0,0 @@ -import sqlite3 - -# Connect to SQLite database (or create it if it doesn't exist) -conn = sqlite3.connect('gacha_game.db') -cursor = conn.cursor() - -# Create tables -cursor.execute(''' -CREATE TABLE IF NOT EXISTS users ( - id INTEGER PRIMARY KEY AUTOINCREMENT, - username TEXT UNIQUE NOT NULL, - has_rolled BOOLEAN NOT NULL DEFAULT 0 -) -''') - -cursor.execute(''' -CREATE TABLE IF NOT EXISTS characters ( - id INTEGER PRIMARY KEY AUTOINCREMENT, - name TEXT NOT NULL, - rarity INTEGER NOT NULL, - weight REAL NOT NULL, - file_id TEXT NOT NULL -) -''') - -cursor.execute(''' -CREATE TABLE IF NOT EXISTS pulls ( - id INTEGER PRIMARY KEY AUTOINCREMENT, - user_id INTEGER, - character_id INTEGER, - timestamp DATETIME DEFAULT CURRENT_TIMESTAMP, - FOREIGN KEY (user_id) REFERENCES users(id), - FOREIGN KEY (character_id) REFERENCES characters(id) -) -''') - -cursor.execute(""" - CREATE TABLE IF NOT EXISTS config ( - key TEXT PRIMARY KEY, - value TEXT - ) - """) - -# Initialize essential config key -cursor.execute('INSERT INTO config VALUES ("last_seen_notif_id", 0)') - -""" # Insert example characters into the database if they don't already exist -characters = [ - ('Murakami-san', 1, 0.35), - ('Mastodon-kun', 2, 0.25), - ('Pleroma-tan', 3, 0.2), - ('Misskey-tan', 4, 0.15), - ('Syuilo-mama', 5, 0.05) -] - - -cursor.executemany(''' -INSERT OR IGNORE INTO characters (name, rarity, weight) VALUES (?, ?, ?) -''', characters) -""" - -# Commit changes and close -conn.commit() -conn.close() diff --git a/migrations/0000_setup.sql b/migrations/0000_setup.sql new file mode 100644 index 0000000..4dcbc64 --- /dev/null +++ b/migrations/0000_setup.sql @@ -0,0 +1,28 @@ +CREATE TABLE IF NOT EXISTS users ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + username TEXT UNIQUE NOT NULL, + has_rolled BOOLEAN NOT NULL DEFAULT 0 +); + +CREATE TABLE IF NOT EXISTS characters ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + name TEXT NOT NULL, + rarity INTEGER NOT NULL, + weight REAL NOT NULL, + file_id TEXT NOT NULL +); + +CREATE TABLE IF NOT EXISTS pulls ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + user_id INTEGER, + character_id INTEGER, + timestamp DATETIME DEFAULT CURRENT_TIMESTAMP, + FOREIGN KEY (user_id) REFERENCES users(id), + FOREIGN KEY (character_id) REFERENCES characters(id) +); + +CREATE TABLE IF NOT EXISTS config ( + key TEXT PRIMARY KEY, + value TEXT +); +INSERT OR IGNORE INTO config VALUES ("schema_version", 0); diff --git a/migrations/0001_fix_notif_id.sql b/migrations/0001_fix_notif_id.sql new file mode 100644 index 0000000..3494d6e --- /dev/null +++ b/migrations/0001_fix_notif_id.sql @@ -0,0 +1 @@ +INSERT OR IGNORE INTO config VALUES ("last_seen_notif_id", 0); diff --git a/setup_db.py b/setup_db.py new file mode 100644 index 0000000..e247386 --- /dev/null +++ b/setup_db.py @@ -0,0 +1,99 @@ +import sqlite3 +import os +import argparse +from configparser import ConfigParser +from typing import List, Tuple + +class DBNotFoundError(Exception): + pass + +class InvalidMigrationError(Exception): + pass + +def get_migrations() -> List[Tuple[int, str]] | InvalidMigrationError: + '''Returns a list of migration files in numeric order.''' + # Store transaction id and filename separately + sql_files: List[Tuple[int, str]] = [] + migrations_dir = 'migrations' + + for filename in os.listdir(migrations_dir): + joined_path = os.path.join(migrations_dir, filename) + + # Ignore anything that isn't a .sql file + if not (os.path.isfile(joined_path) and filename.endswith('.sql')): + print(f'{filename} is not a .sql file, ignoring...') + continue + + parts = filename.split('_', 1) + + # Invalid filename format + if len(parts) < 2 or not parts[0].isdigit(): + raise InvalidMigrationError(f'Invalid migration file: {filename}') + + sql_files.append((int(parts[0]), joined_path)) + + # Get sorted list of files by migration number + sql_files.sort(key=lambda x: x[0]) + return sql_files + +def perform_migration(cursor: sqlite3.Cursor, migration: tuple[int, str]) -> None: + '''Performs a migration on the DB''' + print(f'Performing migration {migration[1]}...') + + # Open and execute the sql script + with open(migration[1], encoding='utf-8') as file: + script = file.read() + cursor.executescript(script) + # Update the schema version + cursor.execute('UPDATE config SET value = ? WHERE key = "schema_version"', (migration[0],)) + +def get_db_path() -> str | DBNotFoundError: + '''Gets the DB path from config.ini''' + config = ConfigParser() + config.read('config.ini') + db_path = config['application']['DatabaseLocation'] + if not db_path: + raise DBNotFoundError + return db_path + +def get_current_migration(cursor: sqlite3.Cursor) -> int: + '''Gets the current schema version of the database''' + try: + cursor.execute('SELECT value FROM config WHERE key = ?', ('schema_version',)) + version = cursor.fetchone() + return -1 if not version else int(version[0]) + except sqlite3.Error: + print('Error getting schema version') + # Database has not been initialized yet + return -1 + +def main(): + '''Does the thing''' + # Connect to the DB + db_path = get_db_path() + conn = sqlite3.connect(db_path, autocommit=False) + conn.row_factory = sqlite3.Row + cursor = conn.cursor() + + # Obtain list of migrations to run + migrations = get_migrations() + # Determine schema version + current_migration = get_current_migration(cursor) + print(f'Current schema version: {current_migration}') + + # Run any migrations newer than current schema + for migration in migrations: + if migration[0] <= current_migration: + print(f'Migration already up: {migration[1]}') + continue + try: + perform_migration(cursor, migration) + conn.commit() + except Exception as ex: + print(f'An error occurred while applying migration: {ex}, aborting...') + conn.rollback() + break + conn.close() + +if __name__ == '__main__': + main() From 6912758a440d921587b0b542fffc25b058780f99 Mon Sep 17 00:00:00 2001 From: VD15 Date: Mon, 26 May 2025 20:53:04 +0100 Subject: [PATCH 03/67] Update exceptions --- setup_db.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup_db.py b/setup_db.py index e247386..075c3cf 100644 --- a/setup_db.py +++ b/setup_db.py @@ -1,14 +1,15 @@ import sqlite3 +import traceback import os import argparse from configparser import ConfigParser from typing import List, Tuple class DBNotFoundError(Exception): - pass + '''Could not find the database location''' class InvalidMigrationError(Exception): - pass + '''Migration file has an invalid name''' def get_migrations() -> List[Tuple[int, str]] | InvalidMigrationError: '''Returns a list of migration files in numeric order.''' @@ -91,6 +92,7 @@ def main(): conn.commit() except Exception as ex: print(f'An error occurred while applying migration: {ex}, aborting...') + print(traceback.format_exc()) conn.rollback() break conn.close() From f3a32f1176de69e2f69cd43aec2036643a593cf1 Mon Sep 17 00:00:00 2001 From: VD15 Date: Mon, 26 May 2025 20:54:52 +0100 Subject: [PATCH 04/67] Update exceptions again --- setup_db.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup_db.py b/setup_db.py index 075c3cf..fbb264e 100644 --- a/setup_db.py +++ b/setup_db.py @@ -91,7 +91,7 @@ def main(): perform_migration(cursor, migration) conn.commit() except Exception as ex: - print(f'An error occurred while applying migration: {ex}, aborting...') + print(f'An error occurred while applying {migration[1]}: {ex}, aborting...') print(traceback.format_exc()) conn.rollback() break From 37ac7dbb0cfd2077af42b353584465607d6f307d Mon Sep 17 00:00:00 2001 From: VD15 Date: Thu, 29 May 2025 13:27:56 +0100 Subject: [PATCH 05/67] Add multi-env support --- .gitignore | 5 +-- bot/config.py | 21 ++++++++++- readme.md | 99 +++++++++++++++++++++++++++++++++++++++++++++++---- setup_db.py | 34 ++++++++++++++++-- 4 files changed, 147 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 960a84d..5b5cba0 100644 --- a/.gitignore +++ b/.gitignore @@ -181,5 +181,6 @@ cython_debug/ .cursorindexingignore # Custom stuff -gacha_game.db -config.ini +gacha_game*.db +gacha_game*.db.* +config*.ini diff --git a/bot/config.py b/bot/config.py index 643aeb1..16b2f1f 100644 --- a/bot/config.py +++ b/bot/config.py @@ -1,7 +1,26 @@ '''Essentials for the bot to function''' import configparser +from os import environ, path + +class ConfigError(Exception): + '''Could not find config file''' + +def get_config_file() -> str: + '''Gets the path to the config file in the current environment''' + env: str | None = environ.get('KEMOVERSE_ENV') + if not env: + raise ConfigError('Error: KEMOVERSE_ENV is unset') + if not (env in ['prod', 'dev']): + raise ConfigError(f'Error: Invalid environment: {env}') + + config_path: str = f'config_{env}.ini' + + if not path.isfile(config_path): + raise ConfigError(f'Could not find {config_path}') + return config_path + config = configparser.ConfigParser() -config.read('config.ini') +config.read(get_config_file()) # Username for the bot USER = config['credentials']['User'] diff --git a/readme.md b/readme.md index cf4470c..68a5985 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,10 @@ # Kemoverse A gacha-style bot for the Fediverse built with Python. Users can roll for characters, trade, duel, and perhaps engage with popularity-based mechanics. Currently designed for use with Misskey. Name comes from Kemonomimi and Fediverse. +======= +## Installation + +## Roadmap ![Fediverse Gacha Bot Logo](./web/static/logo.png) @@ -11,18 +15,23 @@ A gacha-style bot for the Fediverse built with Python. Users can roll for charac - 🎴 Cards stats system - 🧠 Core database structure for characters and stats - 📦 Basic support for storing pulls per user +- ⏱️ Time-based limitations on rolls ### 🧩 In Progress - 📝 Whitelist system to limit access -- ⏱️ Time-based limitations on rolls -- ⚔️ Dueling system +- ⚠️ Explicit account creation/deletion -## 🧠 Planned Features (Long Term) +## 🧠 Roadmap + +[See our v2.0 board for more details](https://git.waifuism.life/waifu/kemoverse/projects/3) ### 🛒 Gameplay & Collection - 🔁 **Trading system** between users - ⭐ **Favorite characters** (pin them or set profiles) - 📢 **Public post announcements** for rare card pulls +- 📊 **Stats** for cards +- 🎮 **Games** to play + - ⚔️ Dueling - 🧮 **Leaderboards** - Most traded Characters - Most owned Characters @@ -39,7 +48,7 @@ A gacha-style bot for the Fediverse built with Python. Users can roll for charac ## 🗃️ Tech Stack -- Python (3.11+) +- Python (3.12+) - SQLite - Fediverse API integration (via Misskey endpoints) - Flask @@ -49,10 +58,88 @@ A gacha-style bot for the Fediverse built with Python. Users can roll for charac The bot is meant to feel *light, fun, and competitive*. Mixing social, gacha and duel tactics. -## 🧪 Getting Started (coming soon) +## 🧪 Installation -Instructions on installing dependencies, initializing the database, and running the bot locally will go here. +1. Download and install dependencies +Clone the repo + +```sh +git clone https://git.waifuism.life/waifu/kemoverse.git +cd kemoverse +``` + +Setup a virtual environment (Optional, recommended) + +```sh +python3 -m venv venv +source venv/bin/activate +``` + +Install project dependencies via pip + +```sh +python3 -m pip install -r requirements.txt +``` + +2. Setup config file + +A sample config file is included with the project as a template: `example_config.ini` + +Create a copy of this file and replace its' values with your own. Consult the +template for more information about individual config values and their meaning. + +Config files are environment-specific. Use `config_dev.ini` for development and +`config_prod.ini` for production. Switch between environments using the +`KEMOVERSE_ENV` environment variable. + +```sh +cp example_config.ini config_dev.ini +# Edit config_dev.ini +``` + +4. Setup database + +To set up the database, run: + +```sh +KEMOVERSE_ENV=dev python3 setup_db.py +``` + +5. Run the bot + +```sh +KEMOVERSE_ENV=dev ./startup.sh +``` + +If all goes well, you should now be able to interact with the bot. + +6. Running in production + +To run the the in a production environment, use `KEMOVERSE_ENV=prod`. You will +also need to create a `config_prod.ini` file and run the database setup step +again if pointing prod to a different database. (you are pointing dev and prod +to different databases, right? 🤨) + +7. Updating + +To update the bot, first pull new changes from upstream: + +```sh +git pull +``` + +Then run any database migrations. We recommend testing in dev beforehand to +make sure nothing breaks in the update process. + +**Always backup your prod database before running any migrations!** + +```sh +# Backup database file +cp gacha_game_dev.db gacha_game_dev.db.bak +# Run migrations +KEMOVERSE_ENV=dev python3 setup_db.py +``` ```mermaid flowchart TD diff --git a/setup_db.py b/setup_db.py index fbb264e..241bb4e 100644 --- a/setup_db.py +++ b/setup_db.py @@ -11,6 +11,12 @@ class DBNotFoundError(Exception): class InvalidMigrationError(Exception): '''Migration file has an invalid name''' +class KemoverseEnvUnset(Exception): + '''KEMOVERSE_ENV is not set or has an invalid value''' + +class ConfigError(Exception): + '''Could not find the config file for the current environment''' + def get_migrations() -> List[Tuple[int, str]] | InvalidMigrationError: '''Returns a list of migration files in numeric order.''' # Store transaction id and filename separately @@ -50,11 +56,22 @@ def perform_migration(cursor: sqlite3.Cursor, migration: tuple[int, str]) -> Non def get_db_path() -> str | DBNotFoundError: '''Gets the DB path from config.ini''' + env = os.environ.get('KEMOVERSE_ENV') + if not (env and env in ['prod', 'dev']): + raise KemoverseEnvUnset + + print(f'Running in "{env}" mode') + + config_path = f'config_{env}.ini' + + if not os.path.isfile(config_path): + raise ConfigError(f'Could not find {config_path}') + config = ConfigParser() - config.read('config.ini') + config.read(config_path) db_path = config['application']['DatabaseLocation'] if not db_path: - raise DBNotFoundError + raise DBNotFoundError() return db_path def get_current_migration(cursor: sqlite3.Cursor) -> int: @@ -71,7 +88,18 @@ def get_current_migration(cursor: sqlite3.Cursor) -> int: def main(): '''Does the thing''' # Connect to the DB - db_path = get_db_path() + db_path = '' + try: + db_path = get_db_path() + except ConfigError as ex: + print(ex) + return + except KemoverseEnvUnset: + print('Error: KEMOVERSE_ENV is either not set or has an invalid value.') + print('Please set KEMOVERSE_ENV to either "dev" or "prod" before running.') + print(traceback.format_exc()) + return + conn = sqlite3.connect(db_path, autocommit=False) conn.row_factory = sqlite3.Row cursor = conn.cursor() From 8fb91f77543b8df97db655e2ad1642040c1cec0f Mon Sep 17 00:00:00 2001 From: VD15 Date: Thu, 29 May 2025 13:32:26 +0100 Subject: [PATCH 06/67] Fix spacing in readme --- readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/readme.md b/readme.md index 68a5985..f7b9a38 100644 --- a/readme.md +++ b/readme.md @@ -1,7 +1,9 @@ # Kemoverse A gacha-style bot for the Fediverse built with Python. Users can roll for characters, trade, duel, and perhaps engage with popularity-based mechanics. Currently designed for use with Misskey. Name comes from Kemonomimi and Fediverse. + ======= + ## Installation ## Roadmap From 4f853df32c61eeb008eab061bde5d5948e6c1db8 Mon Sep 17 00:00:00 2001 From: VD15 Date: Thu, 29 May 2025 13:32:48 +0100 Subject: [PATCH 07/67] Fix spacing in readme again --- readme.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/readme.md b/readme.md index f7b9a38..3b04aa7 100644 --- a/readme.md +++ b/readme.md @@ -2,8 +2,6 @@ A gacha-style bot for the Fediverse built with Python. Users can roll for characters, trade, duel, and perhaps engage with popularity-based mechanics. Currently designed for use with Misskey. Name comes from Kemonomimi and Fediverse. -======= - ## Installation ## Roadmap From 846130771e780829e8431858584dd9abe6cb040a Mon Sep 17 00:00:00 2001 From: VD15 Date: Thu, 29 May 2025 13:34:39 +0100 Subject: [PATCH 08/67] Update vocabulary --- readme.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/readme.md b/readme.md index 3b04aa7..3f2cbc0 100644 --- a/readme.md +++ b/readme.md @@ -12,9 +12,8 @@ A gacha-style bot for the Fediverse built with Python. Users can roll for charac ### ✅ Implemented - 🎲 Character roll system -- 🎴 Cards stats system -- 🧠 Core database structure for characters and stats -- 📦 Basic support for storing pulls per user +- 🧠 Core database structure for cards +- 📦 Basic support for storing pulls per player - ⏱️ Time-based limitations on rolls ### 🧩 In Progress @@ -26,18 +25,18 @@ A gacha-style bot for the Fediverse built with Python. Users can roll for charac [See our v2.0 board for more details](https://git.waifuism.life/waifu/kemoverse/projects/3) ### 🛒 Gameplay & Collection -- 🔁 **Trading system** between users +- 🔁 **Trading system** between players - ⭐ **Favorite characters** (pin them or set profiles) - 📢 **Public post announcements** for rare card pulls - 📊 **Stats** for cards - 🎮 **Games** to play - ⚔️ Dueling - 🧮 **Leaderboards** - - Most traded Characters - - Most owned Characters - - Most voted Characters - - Most popular Characters (via usage-based popularity metrics) - - Users with the rarest Characters + - Most traded cards + - Most owned cards + - Most voted cards + - Most popular cards (via usage-based popularity metrics) + - Users with the rarest cards ### 🎨 Card Aesthetics - 🖼️ Simple card template for character rendering From de7670204adb8594cd8df2e9c576bfe9c0a22140 Mon Sep 17 00:00:00 2001 From: VD15 Date: Thu, 29 May 2025 13:36:30 +0100 Subject: [PATCH 09/67] Replace numbered list with h3 --- readme.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/readme.md b/readme.md index 3f2cbc0..40d723d 100644 --- a/readme.md +++ b/readme.md @@ -59,7 +59,7 @@ The bot is meant to feel *light, fun, and competitive*. Mixing social, gacha and ## 🧪 Installation -1. Download and install dependencies +### Download and install dependencies Clone the repo @@ -81,7 +81,7 @@ Install project dependencies via pip python3 -m pip install -r requirements.txt ``` -2. Setup config file +### Setup config file A sample config file is included with the project as a template: `example_config.ini` @@ -97,7 +97,7 @@ cp example_config.ini config_dev.ini # Edit config_dev.ini ``` -4. Setup database +### Setup database To set up the database, run: @@ -105,7 +105,7 @@ To set up the database, run: KEMOVERSE_ENV=dev python3 setup_db.py ``` -5. Run the bot +### Run the bot ```sh KEMOVERSE_ENV=dev ./startup.sh @@ -113,14 +113,14 @@ KEMOVERSE_ENV=dev ./startup.sh If all goes well, you should now be able to interact with the bot. -6. Running in production +### Running in production To run the the in a production environment, use `KEMOVERSE_ENV=prod`. You will also need to create a `config_prod.ini` file and run the database setup step again if pointing prod to a different database. (you are pointing dev and prod to different databases, right? 🤨) -7. Updating +### Updating To update the bot, first pull new changes from upstream: From eaa630890635e1a9770b2712ce2e610dcc48b776 Mon Sep 17 00:00:00 2001 From: VD15 Date: Sat, 31 May 2025 22:54:04 +0100 Subject: [PATCH 10/67] Fix case sensitivity for bot username --- bot/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bot/config.py b/bot/config.py index 16b2f1f..89cffac 100644 --- a/bot/config.py +++ b/bot/config.py @@ -23,11 +23,11 @@ config = configparser.ConfigParser() config.read(get_config_file()) # Username for the bot -USER = config['credentials']['User'] +USER = config['credentials']['User'].lower() # API key for the bot KEY = config['credentials']['Token'] # Bot's Misskey instance URL -INSTANCE = config['credentials']['Instance'] +INSTANCE = config['credentials']['Instance'].lower() # TODO: move this to db # Fedi handles in the traditional 'user@domain.tld' style, allows these users From 7b9a5cf428114d6a76582e16e445073866e25c7b Mon Sep 17 00:00:00 2001 From: VD15 Date: Sun, 1 Jun 2025 12:24:53 +0100 Subject: [PATCH 11/67] Reduce reliance on tuples --- .gitignore | 1 + bot/add_character.py | 46 ++++++++----- bot/client.py | 3 +- bot/config.py | 13 ++-- bot/custom_types.py | 21 ++++++ bot/db_utils.py | 53 ++++++++++----- bot/notification.py | 55 +++++++++------- bot/parsing.py | 27 +++++--- bot/response.py | 149 +++++++++++++++++++++++++++++++++---------- 9 files changed, 263 insertions(+), 105 deletions(-) create mode 100644 bot/custom_types.py diff --git a/.gitignore b/.gitignore index 5b5cba0..11530b5 100644 --- a/.gitignore +++ b/.gitignore @@ -147,6 +147,7 @@ venv.bak/ /site # mypy +.mypy.ini .mypy_cache/ .dmypy.json dmypy.json diff --git a/bot/add_character.py b/bot/add_character.py index e17a4c4..e8d078b 100644 --- a/bot/add_character.py +++ b/bot/add_character.py @@ -2,9 +2,15 @@ import requests from misskey.exceptions import MisskeyAPIException from client import client_connection from db_utils import insert_character +from custom_types import Character -def add_character(name: str, rarity: int, weight: float, image_url: str) -> tuple[int, str]: - """ + +def add_character( + name: str, + rarity: int, + weight: float, + image_url: str) -> tuple[int, str]: + ''' Adds a character to the database, uploading the image from a public URL to the bot's Misskey Drive. @@ -12,7 +18,8 @@ def add_character(name: str, rarity: int, weight: float, image_url: str) -> tupl name (str): Character name. rarity (int): Character rarity (e.g., 1-5). weight (float): Pull weight (e.g., 0.02). - image_url (str): Public URL of the image from the post (e.g., from note['files'][i]['url']). + image_url (str): Public URL of the image from the post (e.g., from + note['files'][i]['url']). Returns: tuple[int, str]: Character ID and bot's Drive file_id. @@ -20,30 +27,39 @@ def add_character(name: str, rarity: int, weight: float, image_url: str) -> tupl Raises: ValueError: If inputs are invalid. RuntimeError: If image download/upload or database operation fails. - """ + ''' + + stripped_name = name.strip() + # Validate inputs - if not name or not name.strip(): - raise ValueError("Character name cannot be empty.") - if not isinstance(rarity, int) or rarity < 1: - raise ValueError("Rarity must be a positive integer.") - if not isinstance(weight, (int, float)) or weight <= 0: - raise ValueError("Weight must be a positive number.") + if not stripped_name: + raise ValueError('Character name cannot be empty.') + if rarity < 1: + raise ValueError('Rarity must be a positive integer.') + if weight <= 0: + raise ValueError('Weight must be a positive number.') if not image_url: - raise ValueError("Image URL must be provided.") + raise ValueError('Image URL must be provided.') # Download image response = requests.get(image_url, stream=True, timeout=30) if response.status_code != 200: - raise RuntimeError(f"Failed to download image from {image_url}") + raise RuntimeError(f'Failed to download image from {image_url}') # Upload to bot's Drive mk = client_connection() try: media = mk.drive_files_create(response.raw) - file_id = media["id"] + file_id = media['id'] except MisskeyAPIException as e: - raise RuntimeError(f"Failed to upload image to bot's Drive: {e}") from e + raise RuntimeError(f'Failed to upload image to bot\'s Drive: {e}')\ + from e # Insert into database - character_id = insert_character(name.strip(), rarity, float(weight), file_id) + character_id = insert_character( + stripped_name, + rarity, + float(weight), + file_id + ) return character_id, file_id diff --git a/bot/client.py b/bot/client.py index 2413226..57f9f4e 100644 --- a/bot/client.py +++ b/bot/client.py @@ -1,5 +1,6 @@ import misskey import config -def client_connection(): + +def client_connection() -> misskey.Misskey: return misskey.Misskey(address=config.INSTANCE, i=config.KEY) diff --git a/bot/config.py b/bot/config.py index 89cffac..3621103 100644 --- a/bot/config.py +++ b/bot/config.py @@ -2,9 +2,11 @@ import configparser from os import environ, path + class ConfigError(Exception): '''Could not find config file''' + def get_config_file() -> str: '''Gets the path to the config file in the current environment''' env: str | None = environ.get('KEMOVERSE_ENV') @@ -19,24 +21,25 @@ def get_config_file() -> str: raise ConfigError(f'Could not find {config_path}') return config_path + config = configparser.ConfigParser() config.read(get_config_file()) # Username for the bot -USER = config['credentials']['User'].lower() +USER = config['credentials']['User'].lower() # API key for the bot -KEY = config['credentials']['Token'] +KEY = config['credentials']['Token'] # Bot's Misskey instance URL INSTANCE = config['credentials']['Instance'].lower() # TODO: move this to db # Fedi handles in the traditional 'user@domain.tld' style, allows these users # to use extra admin exclusive commands with the bot -ADMINS = config['application']['DefaultAdmins'] +ADMINS = config['application']['DefaultAdmins'] # SQLite Database location -DB_PATH = config['application']['DatabaseLocation'] +DB_PATH = config['application']['DatabaseLocation'] NOTIFICATION_POLL_INTERVAL = int(config['notification']['PollInterval']) -NOTIFICATION_BATCH_SIZE = int(config['notification']['BatchSize']) +NOTIFICATION_BATCH_SIZE = int(config['notification']['BatchSize']) GACHA_ROLL_INTERVAL = int(config['gacha']['RollInterval']) diff --git a/bot/custom_types.py b/bot/custom_types.py new file mode 100644 index 0000000..0c23cb6 --- /dev/null +++ b/bot/custom_types.py @@ -0,0 +1,21 @@ +from typing import TypedDict, List, Dict, Any + +BotResponse = TypedDict('BotResponse', { + 'message': str, + 'attachment_urls': List[str] | None +}) + +Character = TypedDict('Character', { + 'id': int, + 'name': str, + 'rarity': int, + 'weight': float, + 'image_url': str +}) + +ParsedNotification = TypedDict('ParsedNotification', { + 'author': str, + 'command': str | None, + 'arguments': List[str], + 'note_obj': Dict[str, Any] +}) diff --git a/bot/db_utils.py b/bot/db_utils.py index daff8c5..6f8ae28 100644 --- a/bot/db_utils.py +++ b/bot/db_utils.py @@ -1,11 +1,13 @@ from random import choices import sqlite3 import config +from custom_types import Character DB_PATH = config.DB_PATH CONNECTION: sqlite3.Connection CURSOR: sqlite3.Cursor + def connect() -> None: '''Creates a connection to the database''' print('Connecting to the database...') @@ -15,26 +17,34 @@ def connect() -> None: CONNECTION.row_factory = sqlite3.Row CURSOR = CONNECTION.cursor() -def get_random_character(): + +def get_random_character() -> Character | None: ''' Gets a random character from the database''' CURSOR.execute('SELECT * FROM characters') characters = CURSOR.fetchall() if not characters: - return None, None, None, None + return None weights = [c['weight'] for c in characters] chosen = choices(characters, weights=weights, k=1)[0] - return chosen['id'], chosen['name'], chosen['file_id'], chosen['rarity'] + return { + 'id': chosen['id'], + 'name': chosen['name'], + 'rarity': chosen['rarity'], + 'weight': chosen['weight'], + 'image_url': chosen['file_id'] + } -def get_or_create_user(username): + +def get_or_create_user(username: str) -> int: '''Retrieves an ID for a given user, if the user does not exist, it will be created.''' CURSOR.execute('SELECT id FROM users WHERE username = ?', (username,)) user = CURSOR.fetchone() if user: - return user[0] + return int(user[0]) # New user starts with has_rolled = False CURSOR.execute( @@ -42,38 +52,47 @@ def get_or_create_user(username): (username, False) ) user_id = CURSOR.lastrowid - return user_id + return user_id if user_id else 0 -def insert_character(name: str, rarity: int, weight: float, file_id: str) -> int: + +def insert_character( + name: str, rarity: int, weight: float, file_id: str) -> int: '''Inserts a character''' CURSOR.execute( - 'INSERT INTO characters (name, rarity, weight, file_id) VALUES (?, ?, ?, ?)', + 'INSERT INTO characters (name, rarity, weight, file_id) VALUES \ +(?, ?, ?, ?)', (name, rarity, weight, file_id) ) character_id = CURSOR.lastrowid return character_id if character_id else 0 -def insert_pull(user_id, character_id): + +def insert_pull(user_id: int, character_id: int) -> None: '''Creates a pull in the database''' CURSOR.execute( 'INSERT INTO pulls (user_id, character_id) VALUES (?, ?)', (user_id, character_id) ) -def get_last_rolled_at(user_id): + +def get_last_rolled_at(user_id: int) -> int: '''Gets the timestamp when the user last rolled''' - CURSOR.execute("SELECT timestamp FROM pulls WHERE user_id = ? ORDER BY timestamp DESC", \ - (user_id,)) + CURSOR.execute( + "SELECT timestamp FROM pulls WHERE user_id = ? ORDER BY timestamp \ +DESC", + (user_id,)) row = CURSOR.fetchone() - return row[0] if row else None + return row[0] if row else 0 -def get_config(key): +def get_config(key: str) -> str: '''Reads the value for a specified config key from the db''' CURSOR.execute("SELECT value FROM config WHERE key = ?", (key,)) row = CURSOR.fetchone() - return row[0] if row else None + return row[0] if row else '' -def set_config(key, value): + +def set_config(key: str, value: str) -> None: '''Writes the value for a specified config key to the db''' - CURSOR.execute("INSERT OR REPLACE INTO config (key, value) VALUES (?, ?)", (key, value)) + CURSOR.execute("INSERT OR REPLACE INTO config (key, value) VALUES (?, ?)", + (key, value)) diff --git a/bot/notification.py b/bot/notification.py index e0ae020..9427dbf 100644 --- a/bot/notification.py +++ b/bot/notification.py @@ -1,16 +1,23 @@ import traceback +from typing import Dict, Any + +import misskey from misskey.exceptions import MisskeyAPIException from config import NOTIFICATION_BATCH_SIZE from parsing import parse_notification from db_utils import get_config, set_config from response import generate_response +from custom_types import BotResponse # Define your whitelist # TODO: move to config WHITELISTED_INSTANCES: list[str] = [] -def process_notification(client, notification): + +def process_notification( + client: misskey.Misskey, + notification: Dict[str, Any]) -> None: '''Processes an individual notification''' user = notification.get('user', {}) username = user.get('username', 'unknown') @@ -32,33 +39,32 @@ def process_notification(client, notification): print(f'📨 <{notif_id}> [{notif_type}] from @{username}@{instance}') # 🧠 Send to the parser - parsed_command = parse_notification(notification, client) + parsed_notification = parse_notification(notification, client) + + if not parsed_notification: + return # Get the note Id to reply to note_id = notification.get('note', {}).get('id') # Get the response - # TODO: Formalize exactly *what* is returned by this. Ideally just want to - # handle two cases here: either we have a response, or we don't. - # TODO: Return dictionaries instead of tuples. They handle multiple - # elements a lot better as they're not position dependent - response = generate_response(parsed_command) - if isinstance(response, str): - client.notes_create( - text=response, - reply_id=note_id, - visibility=visibility - ) - elif response: - client.notes_create( - text=response[0], - reply_id=note_id, - visibility=visibility, - file_ids=response[1] - #visible_user_ids=[] #todo: write actual visible users ids so pleromers can use the bot privately - ) + response: BotResponse | None = generate_response(parsed_notification) -def process_notifications(client): + if not response: + return + + client.notes_create( + text=response['message'], + reply_id=note_id, + visibility=visibility, + file_ids=response['attachment_urls'] + # TODO: write actual visible users ids so pleromers can use the bot + # privately + # visible_user_ids=[] + ) + + +def process_notifications(client: misskey.Misskey) -> bool: '''Processes a batch of unread notifications. Returns False if there are no more notifications to process.''' @@ -87,7 +93,7 @@ def process_notifications(client): for notification in notifications: try: # Skip if we've processed already - notif_id = notification.get('id') + notif_id = notification.get('id', '') if notif_id <= last_seen_id: continue @@ -96,7 +102,8 @@ def process_notifications(client): process_notification(client, notification) except Exception as e: - print(f'An exception has occured while processing a notification: {e}') + print(f'An exception has occured while processing a \ +notification: {e}') print(traceback.format_exc()) # If we got as many notifications as we requested, there are probably diff --git a/bot/parsing.py b/bot/parsing.py index bbefe70..eece077 100644 --- a/bot/parsing.py +++ b/bot/parsing.py @@ -1,11 +1,16 @@ -import random, re +import re +from typing import Dict, Any + +import misskey + import config +from custom_types import ParsedNotification -def parse_notification(notification,client): - '''Parses any notifications received by the bot and sends any commands to - gacha_response()''' - +def parse_notification( + notification: Dict[str, Any], + client: misskey.Misskey) -> ParsedNotification | None: + '''Parses any notifications received by the bot''' # Get the full Activitypub ID of the user user = notification.get("user", {}) @@ -28,14 +33,20 @@ def parse_notification(notification,client): # Make sure the notification text explicitly mentions the bot if not any(variant in note for variant in username_variants): - return + return None # Find command and arguments after the mention - # Removes all mentions (regex = mentions that start with @ and may contain @domain) + # Removes all mentions + # regex = mentions that start with @ and may contain @domain cleaned_text = re.sub(r"@\w+(?:@\S+)?", "", note).strip() parts = cleaned_text.split() command = parts[0].lower() if parts else None arguments = parts[1:] if len(parts) > 1 else [] - return [command,full_user, arguments, note_obj] + return { + 'author': full_user, + 'command': command, + 'arguments': arguments, + 'note_obj': note_obj + } diff --git a/bot/response.py b/bot/response.py index ea0abe5..567962d 100644 --- a/bot/response.py +++ b/bot/response.py @@ -1,9 +1,13 @@ from datetime import datetime, timedelta, timezone -from db_utils import get_or_create_user, insert_pull, get_last_rolled_at, get_random_character +from typing import TypedDict, Any, List, Dict +from db_utils import get_or_create_user, insert_pull, get_last_rolled_at, \ + get_random_character from add_character import add_character from config import GACHA_ROLL_INTERVAL +from custom_types import BotResponse, ParsedNotification -def do_roll(full_user): + +def do_roll(full_user: str) -> BotResponse: '''Determines whether the user can roll, then pulls a random character''' user_id = get_or_create_user(full_user) @@ -14,7 +18,7 @@ def do_roll(full_user): if date: # SQLite timestamps returned by the DB are always in UTC # Below timestamps are to be converted to UTC - prev = datetime.strptime(date + '+0000', '%Y-%m-%d %H:%M:%S%z') + prev = datetime.strptime(str(date) + '+0000', '%Y-%m-%d %H:%M:%S%z') now = datetime.now(timezone.utc) time_since_last_roll = now - prev @@ -31,19 +35,31 @@ def do_roll(full_user): else: remaining_duration = f'{duration.seconds} seconds' - return f'{full_user} ⏱️ Please wait another {remaining_duration} before rolling again.' + return { + 'message': f'{full_user} ⏱️ Please wait another \ +{remaining_duration} before rolling again.', + 'attachment_urls': None + } - character_id, character_name, file_id, rarity = get_random_character() + character = get_random_character() - if not character_id: - return f'{full_user} Uwaaa... something went wrong! No characters found. 😿' + if not character: + return { + 'message': f'{full_user} Uwaaa... something went wrong! No \ +characters found. 😿', + 'attachment_urls': None + } - insert_pull(user_id,character_id) - stars = '⭐️' * rarity - return([f"@{full_user} 🎲 Congrats! You rolled {stars} **{character_name}**\n\ - She's all yours now~ 💖✨",[file_id]]) + insert_pull(user_id, character['id']) + stars = '⭐️' * character['rarity'] + return { + 'message': f'@{full_user} 🎲 Congrats! You rolled {stars} \ +**{character['name']}**\nShe\'s all yours now~ 💖✨', + 'attachment_urls': [character['image_url']] + } -def is_float(val): + +def is_float(val: Any) -> bool: '''Returns true if `val` can be converted to a float''' try: float(val) @@ -51,23 +67,42 @@ def is_float(val): except ValueError: return False -def do_create(full_user, arguments, note_obj): + +def do_create( + full_user: str, + arguments: List[str], + note_obj: Dict[str, Any]) -> BotResponse: '''Creates a character''' # Example call from bot logic - image_url = note_obj.get('files', [{}])[0].get('url') if note_obj.get('files') else None + image_url = note_obj.get('files', [{}])[0].get('url') \ + if note_obj.get('files') else None + if not image_url: - return f'{full_user}{full_user} You need an image to create a character, dumbass.' + return { + 'message': f'{full_user} You need an image to create a character, \ +dumbass.', + 'attachment_urls': None + } if len(arguments) != 3: - return '{full_user}Please specify the following attributes in order: \ - name, rarity, drop weighting' + return { + 'message': f'{full_user} Please specify the following attributes \ +in order: name, rarity, drop weighting', + 'attachment_urls': None + } if not (arguments[1].isnumeric() and 1 <= int(arguments[1]) <= 5): - return f'{full_user}Invalid rarity: \'{arguments[1]}\' must be a number between 1 and 5' - + return { + 'message': f'{full_user} Invalid rarity: \'{arguments[1]}\' must \ +be a number between 1 and 5', + 'attachment_urls': None + } if not (is_float(arguments[2]) and 0.0 < float(arguments[2]) <= 1.0): - return f'{full_user}Invalid drop weight: \'{arguments[2]}\' \ - must be a decimal value between 0.0 and 1.0' + return { + 'message': f'{full_user} Invalid drop weight: \'{arguments[2]}\' \ +must be a decimal value between 0.0 and 1.0', + 'attachment_urls': None + } character_id, file_id = add_character( name=arguments[0], @@ -75,26 +110,70 @@ def do_create(full_user, arguments, note_obj): weight=float(arguments[2]), image_url=image_url ) - return([f'{full_user}Added {arguments[0]}, ID {character_id}.',[file_id]]) + return { + 'message': f'{full_user} Added {arguments[0]}, ID {character_id}.', + 'attachment_urls': [file_id] + } -def do_help(full_user): + +def do_help(author: str) -> BotResponse: '''Provides a list of commands that the bot can do.''' - return f'{full_user} Here\'s what I can do:\n \ - - `roll` Pulls a random character.\ - - `create ` Creates a character using a given image.\ - - `help` Shows this message' + return { + 'message': f'{author} Here\'s what I can do:\n\ +- `roll` Pulls a random character.\n\ +- `create ` Creates a character using a given image.\n\ +- `help` Shows this message.', + 'attachment_urls': None + } -def generate_response(parsed_command): + +def do_signup() -> BotResponse: + return { + 'message': '', + 'attachment_urls': None + } + + +def generate_response(notification: ParsedNotification) -> BotResponse | None: '''Given a command with arguments, processes the game state and returns a response''' - command, full_user, arguments, note_obj = parsed_command + # Temporary response variable + res: BotResponse | None = None + # TODO: Check if the user has an account + author = notification['author'] + user_id = get_or_create_user(author) + command = notification['command'] + # Check if the user is an administrator + # user_is_administrator = user_is_administrator() + + # Unrestricted commands match command: - case 'roll': - return do_roll(full_user) - case 'create': - return do_create(full_user, arguments, note_obj) + case 'signup': + res = do_signup() case 'help': - return do_help(command) + res = do_help(author) case _: - return None + pass + + if not user_id: + return res + + # User commands + match command: + case 'delete_account': + pass + case 'roll': + res = do_roll(author) + case 'create': + res = do_create( + author, + notification['arguments'], + notification['note_obj'] + ) + case _: + pass + # if not user_is_administrator: + return res + + # Administrator commands go here From da2ca4cfec1039861e952b750fad01122a85dbd5 Mon Sep 17 00:00:00 2001 From: w Date: Sun, 1 Jun 2025 18:08:51 -0300 Subject: [PATCH 12/67] Split get_or_create_user --- bot/db_utils.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/bot/db_utils.py b/bot/db_utils.py index daff8c5..6f94cc8 100644 --- a/bot/db_utils.py +++ b/bot/db_utils.py @@ -28,21 +28,19 @@ def get_random_character(): return chosen['id'], chosen['name'], chosen['file_id'], chosen['rarity'] -def get_or_create_user(username): - '''Retrieves an ID for a given user, if the user does not exist, it will be - created.''' +def get_player(username): + '''Retrieve a player ID by username, or return None if not found.''' CURSOR.execute('SELECT id FROM users WHERE username = ?', (username,)) user = CURSOR.fetchone() - if user: - return user[0] + return user[0] if user else None - # New user starts with has_rolled = False +def insert_player(username): + '''Insert a new player with default has_rolled = False and return their user ID.''' CURSOR.execute( 'INSERT INTO users (username, has_rolled) VALUES (?, ?)', (username, False) ) - user_id = CURSOR.lastrowid - return user_id + return CURSOR.lastrowid def insert_character(name: str, rarity: int, weight: float, file_id: str) -> int: '''Inserts a character''' From a0ed6ded41c0ef242040d6dda40b5c220d98d15f Mon Sep 17 00:00:00 2001 From: w Date: Sun, 1 Jun 2025 22:03:37 -0300 Subject: [PATCH 13/67] adding signup command --- bot/response.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/bot/response.py b/bot/response.py index ea0abe5..3d0a348 100644 --- a/bot/response.py +++ b/bot/response.py @@ -1,12 +1,14 @@ from datetime import datetime, timedelta, timezone -from db_utils import get_or_create_user, insert_pull, get_last_rolled_at, get_random_character +from db_utils import get_player, insert_player, insert_pull, get_last_rolled_at, get_random_character from add_character import add_character from config import GACHA_ROLL_INTERVAL def do_roll(full_user): '''Determines whether the user can roll, then pulls a random character''' - user_id = get_or_create_user(full_user) + user_id = get_player(full_user) + if not user_id: + return f'@{full_user} 🛑 You haven’t signed up yet! Use the `signup` command to start playing.' # Get date of user's last roll date = get_last_rolled_at(user_id) @@ -43,6 +45,16 @@ def do_roll(full_user): return([f"@{full_user} 🎲 Congrats! You rolled {stars} **{character_name}**\n\ She's all yours now~ 💖✨",[file_id]]) +def do_signup(full_user): + '''Registers a new user if they haven’t signed up yet.''' + user_id = get_player(full_user) + + if user_id: + return f'@{full_user} 👀 You’re already signed up! Let the rolling begin~ 🎲' + + new_user_id = insert_player(full_user) + return f'@{full_user} ✅ Signed up successfully! Your gacha destiny begins now... ✨ Use the roll command to start!' + def is_float(val): '''Returns true if `val` can be converted to a float''' try: @@ -96,5 +108,7 @@ def generate_response(parsed_command): return do_create(full_user, arguments, note_obj) case 'help': return do_help(command) + case 'signup': + return do_signup(full_user) case _: return None From dce2c9072b3187c7fa4ce88fa3036a6fe07ae612 Mon Sep 17 00:00:00 2001 From: w Date: Sun, 1 Jun 2025 23:25:18 -0300 Subject: [PATCH 14/67] account deletion --- bot/db_utils.py | 28 ++++++++++++++++++++++++++++ bot/response.py | 24 +++++++++++++++++++++++- 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/bot/db_utils.py b/bot/db_utils.py index 6f94cc8..a9f3f06 100644 --- a/bot/db_utils.py +++ b/bot/db_utils.py @@ -42,6 +42,34 @@ def insert_player(username): ) return CURSOR.lastrowid +def delete_player(username): + '''Permanently deletes a user and all their pulls.''' + CURSOR.execute( + 'SELECT id FROM users WHERE username = ?', + (username,) + ) + user = CURSOR.fetchone() + + if not user: + return False # No such user + + user_id = user[0] + + # Delete pulls + CURSOR.execute( + 'DELETE FROM pulls WHERE user_id = ?', + (user_id,) + ) + + # Delete user + CURSOR.execute( + 'DELETE FROM users WHERE id = ?', + (user_id,) + ) + + return True + + def insert_character(name: str, rarity: int, weight: float, file_id: str) -> int: '''Inserts a character''' CURSOR.execute( diff --git a/bot/response.py b/bot/response.py index 3d0a348..85a4073 100644 --- a/bot/response.py +++ b/bot/response.py @@ -1,5 +1,5 @@ from datetime import datetime, timedelta, timezone -from db_utils import get_player, insert_player, insert_pull, get_last_rolled_at, get_random_character +from db_utils import get_player, insert_player, delete_player, insert_pull, get_last_rolled_at, get_random_character from add_character import add_character from config import GACHA_ROLL_INTERVAL @@ -94,7 +94,25 @@ def do_help(full_user): return f'{full_user} Here\'s what I can do:\n \ - `roll` Pulls a random character.\ - `create ` Creates a character using a given image.\ + - `signup` Registers your account.\ + - `delete_account` Deletes your account.\ - `help` Shows this message' + +def delete_account(full_user): + return ( + f'@{full_user} ⚠️ This will permanently delete your account and all your cards.\n' + 'If you’re sure, reply with `confirm_delete` to proceed.\n\n' + '**There is no undo.** Your gacha luck will be lost to the void... 💀✨' + ) + +def confirm_delete(full_user): + success = delete_player(full_user) + + if not success: + return f'@{full_user} ❌ No account found to delete. Maybe it’s already gone?' + + return f'@{full_user} 🧼 Your account and all your cards have been deleted. RIP your gacha history 🕊️✨' + def generate_response(parsed_command): '''Given a command with arguments, processes the game state and @@ -110,5 +128,9 @@ def generate_response(parsed_command): return do_help(command) case 'signup': return do_signup(full_user) + case 'delete_account': + return delete_account(full_user) + case 'confirm_delete': + return confirm_delete(full_user) case _: return None From b7d82d9117330ba9a303d5b13d5a4d5e032d3972 Mon Sep 17 00:00:00 2001 From: w Date: Mon, 2 Jun 2025 00:37:39 -0300 Subject: [PATCH 15/67] fix --- bot/db_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bot/db_utils.py b/bot/db_utils.py index 88660d9..5597bc5 100644 --- a/bot/db_utils.py +++ b/bot/db_utils.py @@ -44,7 +44,7 @@ def get_player(username: str) -> int: if user: return int(user[0]) -def insert_player(username): +def insert_player(username: str) -> int: '''Insert a new player with default has_rolled = False and return their user ID.''' CURSOR.execute( 'INSERT INTO users (username, has_rolled) VALUES (?, ?)', @@ -52,7 +52,7 @@ def insert_player(username): ) return CURSOR.lastrowid -def delete_player(username): +def delete_player(username: str) -> bool: '''Permanently deletes a user and all their pulls.''' CURSOR.execute( 'SELECT id FROM users WHERE username = ?', From 3a09b481e520dcb3271729de626a41a0bb82edfa Mon Sep 17 00:00:00 2001 From: w Date: Mon, 2 Jun 2025 01:03:06 -0300 Subject: [PATCH 16/67] more fixes --- bot/response.py | 50 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/bot/response.py b/bot/response.py index 17a12dd..6966d1e 100644 --- a/bot/response.py +++ b/bot/response.py @@ -7,12 +7,14 @@ from config import GACHA_ROLL_INTERVAL from custom_types import BotResponse, ParsedNotification -def do_roll(full_user: str) -> BotResponse: +def do_roll(author: str) -> BotResponse: '''Determines whether the user can roll, then pulls a random character''' - user_id = get_player(full_user) - + user_id = get_player(author) if not user_id: - return f'@{full_user} 🛑 You haven’t signed up yet! Use the `signup` command to start playing.' + return { + 'message':f'{author} 🛑 You haven’t signed up yet! Use the `signup` command to start playing.', + 'attachment_urls': None + } # Get date of user's last roll date = get_last_rolled_at(user_id) @@ -38,7 +40,7 @@ def do_roll(full_user: str) -> BotResponse: remaining_duration = f'{duration.seconds} seconds' return { - 'message': f'{full_user} ⏱️ Please wait another \ + 'message': f'{author} ⏱️ Please wait another \ {remaining_duration} before rolling again.', 'attachment_urls': None } @@ -47,7 +49,7 @@ def do_roll(full_user: str) -> BotResponse: if not character: return { - 'message': f'{full_user} Uwaaa... something went wrong! No \ + 'message': f'{author} Uwaaa... something went wrong! No \ characters found. 😿', 'attachment_urls': None } @@ -55,7 +57,7 @@ characters found. 😿', insert_pull(user_id, character['id']) stars = '⭐️' * character['rarity'] return { - 'message': f'@{full_user} 🎲 Congrats! You rolled {stars} \ + 'message': f'{author} 🎲 Congrats! You rolled {stars} \ **{character['name']}**\nShe\'s all yours now~ 💖✨', 'attachment_urls': [character['image_url']] } @@ -66,13 +68,13 @@ def do_signup(author: str) -> BotResponse: if user_id: return { - f'@{author} 👀 You’re already signed up! Let the rolling begin~ 🎲', + 'message':f'{author} 👀 You’re already signed up! Let the rolling begin~ 🎲', 'attachment_urls': None } new_user_id = insert_player(author) return { - 'message': f'@{author} ✅ Signed up successfully! Your gacha destiny begins now... ✨ Use the roll command to start!', + 'message': f'{author} ✅ Signed up successfully! Your gacha destiny begins now... ✨ Use the roll command to start!', 'attachment_urls': None } @@ -86,7 +88,7 @@ def is_float(val: Any) -> bool: def do_create( - full_user: str, + author: str, arguments: List[str], note_obj: Dict[str, Any]) -> BotResponse: '''Creates a character''' @@ -96,27 +98,27 @@ def do_create( if not image_url: return { - 'message': f'{full_user} You need an image to create a character, \ + 'message': f'{author} You need an image to create a character, \ dumbass.', 'attachment_urls': None } if len(arguments) != 3: return { - 'message': f'{full_user} Please specify the following attributes \ + 'message': f'{author} Please specify the following attributes \ in order: name, rarity, drop weighting', 'attachment_urls': None } if not (arguments[1].isnumeric() and 1 <= int(arguments[1]) <= 5): return { - 'message': f'{full_user} Invalid rarity: \'{arguments[1]}\' must \ + 'message': f'{author} Invalid rarity: \'{arguments[1]}\' must \ be a number between 1 and 5', 'attachment_urls': None } if not (is_float(arguments[2]) and 0.0 < float(arguments[2]) <= 1.0): return { - 'message': f'{full_user} Invalid drop weight: \'{arguments[2]}\' \ + 'message': f'{author} Invalid drop weight: \'{arguments[2]}\' \ must be a decimal value between 0.0 and 1.0', 'attachment_urls': None } @@ -128,7 +130,7 @@ must be a decimal value between 0.0 and 1.0', image_url=image_url ) return { - 'message': f'{full_user} Added {arguments[0]}, ID {character_id}.', + 'message': f'{author} Added {arguments[0]}, ID {character_id}.', 'attachment_urls': [file_id] } @@ -136,7 +138,7 @@ must be a decimal value between 0.0 and 1.0', def do_help(author: str) -> BotResponse: '''Provides a list of commands that the bot can do.''' return { - 'message':f'{full_user} Here\'s what I can do:\n \ + 'message':f'{author} Here\'s what I can do:\n \ - `roll` Pulls a random character.\ - `create ` Creates a character using a given image.\ - `signup` Registers your account.\ @@ -147,7 +149,7 @@ def do_help(author: str) -> BotResponse: def delete_account(author: str) -> BotResponse: return { - 'message':f'@{author} ⚠️ This will permanently delete your account and all your cards.\n' + 'message':f'{author} ⚠️ This will permanently delete your account and all your cards.\n' 'If you’re sure, reply with `confirm_delete` to proceed.\n\n' '**There is no undo.** Your gacha luck will be lost to the void... 💀✨', 'attachment_urls': None @@ -164,7 +166,7 @@ def confirm_delete(author: str) -> BotResponse: } return { - 'message':f'@{author} 🧼 Your account and all your cards have been deleted. RIP your gacha history 🕊️✨', + 'message':f'{author} 🧼 Your account and all your cards have been deleted. RIP your gacha history 🕊️✨', 'attachment_urls': None } @@ -177,7 +179,7 @@ def generate_response(notification: ParsedNotification) -> BotResponse | None: res: BotResponse | None = None # TODO: Check if the user has an account author = notification['author'] - user_id = get_or_create_user(author) + user_id = get_player(author) command = notification['command'] # Check if the user is an administrator # user_is_administrator = user_is_administrator() @@ -185,11 +187,11 @@ def generate_response(notification: ParsedNotification) -> BotResponse | None: # Unrestricted commands match command: case 'signup': - res = do_signup() + res = do_signup(author) case 'help': res = do_help(author) - - + case 'roll': + res = do_roll(author) case _: pass @@ -198,10 +200,6 @@ def generate_response(notification: ParsedNotification) -> BotResponse | None: # User commands match command: - case 'delete_account': - pass - case 'roll': - res = do_roll(author) case 'create': res = do_create( author, From c2fd4356225607c45a162370ec229662a1d5c871 Mon Sep 17 00:00:00 2001 From: w Date: Tue, 3 Jun 2025 22:53:10 -0300 Subject: [PATCH 17/67] weighing migration --- migrations/0002_weigh_infer.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 migrations/0002_weigh_infer.sql diff --git a/migrations/0002_weigh_infer.sql b/migrations/0002_weigh_infer.sql new file mode 100644 index 0000000..28a1002 --- /dev/null +++ b/migrations/0002_weigh_infer.sql @@ -0,0 +1 @@ +ALTER TABLE characters DROP COLUMN weight; From 0c2e3754da7f5e47cb9d094eaabac7af372777c2 Mon Sep 17 00:00:00 2001 From: w Date: Tue, 3 Jun 2025 22:54:25 -0300 Subject: [PATCH 18/67] weigh response --- bot/response.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/bot/response.py b/bot/response.py index 567962d..1911c29 100644 --- a/bot/response.py +++ b/bot/response.py @@ -84,10 +84,10 @@ dumbass.', 'attachment_urls': None } - if len(arguments) != 3: + if len(arguments) != 2: return { 'message': f'{full_user} Please specify the following attributes \ -in order: name, rarity, drop weighting', +in order: name, rarity', 'attachment_urls': None } @@ -97,17 +97,10 @@ in order: name, rarity, drop weighting', be a number between 1 and 5', 'attachment_urls': None } - if not (is_float(arguments[2]) and 0.0 < float(arguments[2]) <= 1.0): - return { - 'message': f'{full_user} Invalid drop weight: \'{arguments[2]}\' \ -must be a decimal value between 0.0 and 1.0', - 'attachment_urls': None - } character_id, file_id = add_character( name=arguments[0], rarity=int(arguments[1]), - weight=float(arguments[2]), image_url=image_url ) return { @@ -121,7 +114,7 @@ def do_help(author: str) -> BotResponse: return { 'message': f'{author} Here\'s what I can do:\n\ - `roll` Pulls a random character.\n\ -- `create ` Creates a character using a given image.\n\ +- `create ` Creates a character using a given image.\n\ - `help` Shows this message.', 'attachment_urls': None } From 4c2b3f589f9e7a6b518e942b5e59952e99a29044 Mon Sep 17 00:00:00 2001 From: w Date: Tue, 3 Jun 2025 22:55:08 -0300 Subject: [PATCH 19/67] db_utils weigh change test --- bot/db_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bot/db_utils.py b/bot/db_utils.py index 6f8ae28..6159129 100644 --- a/bot/db_utils.py +++ b/bot/db_utils.py @@ -26,14 +26,14 @@ def get_random_character() -> Character | None: if not characters: return None - weights = [c['weight'] for c in characters] + weights = [config.RARITY_TO_WEIGHT[c['rarity']] for c in characters] chosen = choices(characters, weights=weights, k=1)[0] return { 'id': chosen['id'], 'name': chosen['name'], 'rarity': chosen['rarity'], - 'weight': chosen['weight'], + 'weight': config.RARITY_TO_WEIGHT[chosen['rarity']], 'image_url': chosen['file_id'] } From 9f9c0344618f6bf734505292000c297e3cd9ec4b Mon Sep 17 00:00:00 2001 From: w Date: Tue, 3 Jun 2025 22:55:39 -0300 Subject: [PATCH 20/67] weight config --- bot/config.py | 11 +++++++++++ example_config.ini | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/bot/config.py b/bot/config.py index 3621103..fb34223 100644 --- a/bot/config.py +++ b/bot/config.py @@ -21,6 +21,15 @@ def get_config_file() -> str: raise ConfigError(f'Could not find {config_path}') return config_path +def get_rarity_to_weight(config_section): + """Parses Rarity_X keys from config and returns a {rarity: weight} dict.""" + rarity_weights = {} + for key, value in config_section.items(): + if key.startswith("Rarity_"): + rarity = int(key.removeprefix("Rarity_")) + rarity_weights[rarity] = float(value) + return rarity_weights + config = configparser.ConfigParser() config.read(get_config_file()) @@ -43,3 +52,5 @@ NOTIFICATION_POLL_INTERVAL = int(config['notification']['PollInterval']) NOTIFICATION_BATCH_SIZE = int(config['notification']['BatchSize']) GACHA_ROLL_INTERVAL = int(config['gacha']['RollInterval']) + +RARITY_TO_WEIGHT = get_rarity_to_weight(config['gacha']) \ No newline at end of file diff --git a/example_config.ini b/example_config.ini index d7f1c14..5f897cb 100644 --- a/example_config.ini +++ b/example_config.ini @@ -9,6 +9,13 @@ DatabaseLocation = ./gacha_game.db [gacha] ; Number of seconds players have to wait between rolls RollInterval = 72000 +; Rarity drop weights (1 to 5 stars) +; Format: rarity=weight per line +Rarity_1 = 0.7 ; common +Rarity_2 = 0.2 ; uncommon +Rarity_3 = 0.08 ; rare +Rarity_4 = 0.015 ; epic +Rarity_5 = 0.005 ; legendary [notification] ; Number of seconds to sleep while awaiting new notifications From 3de6a9ac3dd47bcf4c3e99f080149784066587e6 Mon Sep 17 00:00:00 2001 From: w Date: Tue, 3 Jun 2025 23:23:42 -0300 Subject: [PATCH 21/67] remove unused parts of the code --- bot/db_utils.py | 3 --- bot/response.py | 9 ++------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/bot/db_utils.py b/bot/db_utils.py index 5597bc5..bf4b25f 100644 --- a/bot/db_utils.py +++ b/bot/db_utils.py @@ -60,9 +60,6 @@ def delete_player(username: str) -> bool: ) user = CURSOR.fetchone() - if not user: - return False # No such user - user_id = user[0] # Delete pulls diff --git a/bot/response.py b/bot/response.py index 6966d1e..bd56f20 100644 --- a/bot/response.py +++ b/bot/response.py @@ -157,13 +157,8 @@ def delete_account(author: str) -> BotResponse: } def confirm_delete(author: str) -> BotResponse: - success = delete_player(author) - - if not success: - return { - 'message':f'@{author} ❌ No account found to delete. Maybe it’s already gone?', - 'attachment_urls': None - } + + delete_player(author) return { 'message':f'{author} 🧼 Your account and all your cards have been deleted. RIP your gacha history 🕊️✨', From cbdbefb5fc10ad3b6c7311bd259db020e8f524c5 Mon Sep 17 00:00:00 2001 From: w Date: Tue, 3 Jun 2025 23:08:15 -0300 Subject: [PATCH 22/67] weight add_character change --- bot/add_character.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/bot/add_character.py b/bot/add_character.py index e8d078b..18b0f98 100644 --- a/bot/add_character.py +++ b/bot/add_character.py @@ -3,12 +3,12 @@ from misskey.exceptions import MisskeyAPIException from client import client_connection from db_utils import insert_character from custom_types import Character +from config import RARITY_TO_WEIGHT def add_character( name: str, rarity: int, - weight: float, image_url: str) -> tuple[int, str]: ''' Adds a character to the database, uploading the image from a public URL to @@ -17,7 +17,6 @@ def add_character( Args: name (str): Character name. rarity (int): Character rarity (e.g., 1-5). - weight (float): Pull weight (e.g., 0.02). image_url (str): Public URL of the image from the post (e.g., from note['files'][i]['url']). @@ -36,8 +35,8 @@ def add_character( raise ValueError('Character name cannot be empty.') if rarity < 1: raise ValueError('Rarity must be a positive integer.') - if weight <= 0: - raise ValueError('Weight must be a positive number.') + if rarity not in RARITY_TO_WEIGHT.keys(): + raise ValueError(f'Invalid rarity: {rarity}') if not image_url: raise ValueError('Image URL must be provided.') @@ -59,7 +58,7 @@ def add_character( character_id = insert_character( stripped_name, rarity, - float(weight), + RARITY_TO_WEIGHT[rarity], file_id ) return character_id, file_id From 956d5927cd2265c0ce99cc4663c48125c290d6af Mon Sep 17 00:00:00 2001 From: w Date: Sat, 7 Jun 2025 01:01:06 -0300 Subject: [PATCH 23/67] small config fix --- bot/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bot/config.py b/bot/config.py index fb34223..227f949 100644 --- a/bot/config.py +++ b/bot/config.py @@ -25,8 +25,8 @@ def get_rarity_to_weight(config_section): """Parses Rarity_X keys from config and returns a {rarity: weight} dict.""" rarity_weights = {} for key, value in config_section.items(): - if key.startswith("Rarity_"): - rarity = int(key.removeprefix("Rarity_")) + if key.startswith("rarity_"): + rarity = int(key.removeprefix("rarity_")) rarity_weights[rarity] = float(value) return rarity_weights From 8569f28f3c0ff683445205a4e9cae0a7c7eef072 Mon Sep 17 00:00:00 2001 From: w Date: Sat, 7 Jun 2025 01:42:30 -0300 Subject: [PATCH 24/67] example config fix --- example_config.ini | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/example_config.ini b/example_config.ini index 5f897cb..af7e0f2 100644 --- a/example_config.ini +++ b/example_config.ini @@ -11,11 +11,12 @@ DatabaseLocation = ./gacha_game.db RollInterval = 72000 ; Rarity drop weights (1 to 5 stars) ; Format: rarity=weight per line -Rarity_1 = 0.7 ; common -Rarity_2 = 0.2 ; uncommon -Rarity_3 = 0.08 ; rare -Rarity_4 = 0.015 ; epic -Rarity_5 = 0.005 ; legendary +; In order: common, uncommon, rare, epic and legendary (Example values below) +Rarity_1 = 0.7 +Rarity_2 = 0.2 +Rarity_3 = 0.08 +Rarity_4 = 0.015 +Rarity_5 = 0.005 [notification] ; Number of seconds to sleep while awaiting new notifications From fde6e1167a8143a7ebfda9bab09c8fa70c1cc751 Mon Sep 17 00:00:00 2001 From: VD15 Date: Sat, 7 Jun 2025 19:23:17 +0100 Subject: [PATCH 25/67] Add administrators --- bot/{add_character.py => add_card.py} | 20 ++-- bot/bot_app.py | 3 + bot/config.py | 10 +- bot/custom_types.py | 2 +- bot/db_utils.py | 128 ++++++++++++++++--------- bot/response.py | 105 +++++++++++--------- example_config.ini | 2 +- migrations/0003_rename_tables.sql | 4 + migrations/0004_add_administrators.sql | 1 + 9 files changed, 171 insertions(+), 104 deletions(-) rename bot/{add_character.py => add_card.py} (76%) create mode 100644 migrations/0003_rename_tables.sql create mode 100644 migrations/0004_add_administrators.sql diff --git a/bot/add_character.py b/bot/add_card.py similarity index 76% rename from bot/add_character.py rename to bot/add_card.py index 18b0f98..fcaab43 100644 --- a/bot/add_character.py +++ b/bot/add_card.py @@ -1,27 +1,27 @@ import requests from misskey.exceptions import MisskeyAPIException from client import client_connection -from db_utils import insert_character -from custom_types import Character +from db_utils import insert_card +from custom_types import Card from config import RARITY_TO_WEIGHT -def add_character( +def add_card( name: str, rarity: int, image_url: str) -> tuple[int, str]: ''' - Adds a character to the database, uploading the image from a public URL to + Adds a card to the database, uploading the image from a public URL to the bot's Misskey Drive. Args: - name (str): Character name. - rarity (int): Character rarity (e.g., 1-5). + name (str): Card name. + rarity (int): Card rarity (e.g., 1-5). image_url (str): Public URL of the image from the post (e.g., from note['files'][i]['url']). Returns: - tuple[int, str]: Character ID and bot's Drive file_id. + tuple[int, str]: Card ID and bot's Drive file_id. Raises: ValueError: If inputs are invalid. @@ -32,7 +32,7 @@ def add_character( # Validate inputs if not stripped_name: - raise ValueError('Character name cannot be empty.') + raise ValueError('Card name cannot be empty.') if rarity < 1: raise ValueError('Rarity must be a positive integer.') if rarity not in RARITY_TO_WEIGHT.keys(): @@ -55,10 +55,10 @@ def add_character( from e # Insert into database - character_id = insert_character( + card_id = insert_card( stripped_name, rarity, RARITY_TO_WEIGHT[rarity], file_id ) - return character_id, file_id + return card_id, file_id diff --git a/bot/bot_app.py b/bot/bot_app.py index 825695e..ed2772b 100644 --- a/bot/bot_app.py +++ b/bot/bot_app.py @@ -12,6 +12,9 @@ if __name__ == '__main__': # Connect to DB db.connect() + # Setup default administrators + db.setup_administrators() + print('Listening for notifications...') while True: if not process_notifications(client): diff --git a/bot/config.py b/bot/config.py index 227f949..af806f9 100644 --- a/bot/config.py +++ b/bot/config.py @@ -1,5 +1,6 @@ '''Essentials for the bot to function''' import configparser +import json from os import environ, path @@ -21,7 +22,9 @@ def get_config_file() -> str: raise ConfigError(f'Could not find {config_path}') return config_path -def get_rarity_to_weight(config_section): + +def get_rarity_to_weight( + config_section: configparser.SectionProxy) -> dict[int, float]: """Parses Rarity_X keys from config and returns a {rarity: weight} dict.""" rarity_weights = {} for key, value in config_section.items(): @@ -41,10 +44,9 @@ KEY = config['credentials']['Token'] # Bot's Misskey instance URL INSTANCE = config['credentials']['Instance'].lower() -# TODO: move this to db # Fedi handles in the traditional 'user@domain.tld' style, allows these users # to use extra admin exclusive commands with the bot -ADMINS = config['application']['DefaultAdmins'] +ADMINS = json.loads(config['application']['DefaultAdmins']) # SQLite Database location DB_PATH = config['application']['DatabaseLocation'] @@ -53,4 +55,4 @@ NOTIFICATION_BATCH_SIZE = int(config['notification']['BatchSize']) GACHA_ROLL_INTERVAL = int(config['gacha']['RollInterval']) -RARITY_TO_WEIGHT = get_rarity_to_weight(config['gacha']) \ No newline at end of file +RARITY_TO_WEIGHT = get_rarity_to_weight(config['gacha']) diff --git a/bot/custom_types.py b/bot/custom_types.py index 0c23cb6..7fc7885 100644 --- a/bot/custom_types.py +++ b/bot/custom_types.py @@ -5,7 +5,7 @@ BotResponse = TypedDict('BotResponse', { 'attachment_urls': List[str] | None }) -Character = TypedDict('Character', { +Card = TypedDict('Card', { 'id': int, 'name': str, 'rarity': int, diff --git a/bot/db_utils.py b/bot/db_utils.py index 68409be..f7edd83 100644 --- a/bot/db_utils.py +++ b/bot/db_utils.py @@ -1,7 +1,7 @@ from random import choices import sqlite3 import config -from custom_types import Character +from custom_types import Card DB_PATH = config.DB_PATH CONNECTION: sqlite3.Connection @@ -18,16 +18,38 @@ def connect() -> None: CURSOR = CONNECTION.cursor() -def get_random_character() -> Character | None: - ''' Gets a random character from the database''' - CURSOR.execute('SELECT * FROM characters') - characters = CURSOR.fetchall() +def setup_administrators() -> None: + '''Creates administrator players for each handle in the config file''' + # Get default admins from config + for username in config.ADMINS: + player_id = get_player(username) + if player_id == 0: + # Create player if not exists + print(f'Creating administrator player: {username}') + CURSOR.execute( + 'INSERT INTO players (username, has_rolled, is_administrator) \ + VALUES (?, ?, ?)', + (username, False, True) + ) + else: + # Update is_administrator if exists + print(f'Granting administrator to player: {username}') + CURSOR.execute( + 'UPDATE players SET is_administrator = 1 WHERE id = ?', + (player_id,) + ) - if not characters: + +def get_random_card() -> Card | None: + ''' Gets a random card from the database''' + CURSOR.execute('SELECT * FROM cards') + cards = CURSOR.fetchall() + + if not cards: return None - weights = [config.RARITY_TO_WEIGHT[c['rarity']] for c in characters] - chosen = choices(characters, weights=weights, k=1)[0] + weights = [config.RARITY_TO_WEIGHT[c['rarity']] for c in cards] + chosen = choices(cards, weights=weights, k=1)[0] return { 'id': chosen['id'], @@ -37,73 +59,89 @@ def get_random_character() -> Character | None: 'image_url': chosen['file_id'] } + def get_player(username: str) -> int: '''Retrieve a player ID by username, or return None if not found.''' - CURSOR.execute('SELECT id FROM users WHERE username = ?', (username,)) - user = CURSOR.fetchone() - if user: - return int(user[0]) - -def insert_player(username: str) -> int: - '''Insert a new player with default has_rolled = False and return their user ID.''' CURSOR.execute( - 'INSERT INTO users (username, has_rolled) VALUES (?, ?)', - (username, False) - ) - return CURSOR.lastrowid - -def delete_player(username: str) -> bool: - '''Permanently deletes a user and all their pulls.''' - CURSOR.execute( - 'SELECT id FROM users WHERE username = ?', + 'SELECT id FROM players WHERE username = ?', (username,) ) - user = CURSOR.fetchone() + player = CURSOR.fetchone() + if player: + return int(player[0]) + return 0 - user_id = user[0] + +def insert_player(username: str) -> int: + '''Insert a new player with default has_rolled = False and return their + player ID.''' + CURSOR.execute( + 'INSERT INTO players (username, has_rolled) VALUES (?, ?)', + (username, False) + ) + return CURSOR.lastrowid if CURSOR.lastrowid else 0 + + +def delete_player(username: str) -> bool: + '''Permanently deletes a player and all their pulls.''' + CURSOR.execute( + 'SELECT id FROM players WHERE username = ?', + (username,) + ) + player = CURSOR.fetchone() + + player_id = player[0] # Delete pulls CURSOR.execute( - 'DELETE FROM pulls WHERE user_id = ?', - (user_id,) + 'DELETE FROM pulls WHERE player_id = ?', + (player_id,) ) - # Delete user + # Delete player CURSOR.execute( - 'DELETE FROM users WHERE id = ?', - (user_id,) + 'DELETE FROM players WHERE id = ?', + (player_id,) ) return True - -def insert_character( - name: str, rarity: int, weight: float, file_id: str) -> int: - '''Inserts a character''' +def is_player_administrator(player_id: int) -> bool: CURSOR.execute( - 'INSERT INTO characters (name, rarity, weight, file_id) VALUES \ + 'SELECT is_administrator FROM PLAYERS WHERE id = ? LIMIT 1', + (player_id,) + ) + row = CURSOR.fetchone() + return row[0] if row else False + + +def insert_card( + name: str, rarity: int, weight: float, file_id: str) -> int: + '''Inserts a card''' + CURSOR.execute( + 'INSERT INTO cards (name, rarity, weight, file_id) VALUES \ (?, ?, ?, ?)', (name, rarity, weight, file_id) ) - character_id = CURSOR.lastrowid - return character_id if character_id else 0 + card_id = CURSOR.lastrowid + return card_id if card_id else 0 -def insert_pull(user_id: int, character_id: int) -> None: +def insert_pull(player_id: int, card_id: int) -> None: '''Creates a pull in the database''' CURSOR.execute( - 'INSERT INTO pulls (user_id, character_id) VALUES (?, ?)', - (user_id, character_id) + 'INSERT INTO pulls (player_id, card_id) VALUES (?, ?)', + (player_id, card_id) ) -def get_last_rolled_at(user_id: int) -> int: - '''Gets the timestamp when the user last rolled''' +def get_last_rolled_at(player_id: int) -> int: + '''Gets the timestamp when the player last rolled''' CURSOR.execute( - "SELECT timestamp FROM pulls WHERE user_id = ? ORDER BY timestamp \ + "SELECT timestamp FROM pulls WHERE player_id = ? ORDER BY timestamp \ DESC", - (user_id,)) + (player_id,)) row = CURSOR.fetchone() return row[0] if row else 0 diff --git a/bot/response.py b/bot/response.py index 3fde3ed..aa7b8b7 100644 --- a/bot/response.py +++ b/bot/response.py @@ -1,19 +1,20 @@ from datetime import datetime, timedelta, timezone from typing import TypedDict, Any, List, Dict -from db_utils import get_player, insert_player, delete_player, insert_pull, get_last_rolled_at, \ - get_random_character -from add_character import add_character +from db_utils import get_player, insert_player, delete_player, insert_pull, \ + get_last_rolled_at, get_random_card, is_player_administrator +from add_card import add_card from config import GACHA_ROLL_INTERVAL from custom_types import BotResponse, ParsedNotification def do_roll(author: str) -> BotResponse: - '''Determines whether the user can roll, then pulls a random character''' + '''Determines whether the user can roll, then pulls a random card''' user_id = get_player(author) if not user_id: return { - 'message':f'{author} 🛑 You haven’t signed up yet! Use the `signup` command to start playing.', - 'attachment_urls': None + 'message': f'{author} 🛑 You haven’t signed up yet! Use the \ +`signup` command to start playing.', + 'attachment_urls': None } # Get date of user's last roll date = get_last_rolled_at(user_id) @@ -45,39 +46,43 @@ def do_roll(author: str) -> BotResponse: 'attachment_urls': None } - character = get_random_character() + card = get_random_card() - if not character: + if not card: return { 'message': f'{author} Uwaaa... something went wrong! No \ -characters found. 😿', +cards found. 😿', 'attachment_urls': None } - insert_pull(user_id, character['id']) - stars = '⭐️' * character['rarity'] + insert_pull(user_id, card['id']) + stars = '⭐️' * card['rarity'] return { 'message': f'{author} 🎲 Congrats! You rolled {stars} \ -**{character['name']}**\nShe\'s all yours now~ 💖✨', - 'attachment_urls': [character['image_url']] +**{card['name']}**\nShe\'s all yours now~ 💖✨', + 'attachment_urls': [card['image_url']] } + def do_signup(author: str) -> BotResponse: '''Registers a new user if they haven’t signed up yet.''' user_id = get_player(author) if user_id: return { - 'message':f'{author} 👀 You’re already signed up! Let the rolling begin~ 🎲', + 'message': f'{author} 👀 You’re already signed up! Let the rolling \ +begin~ 🎲', 'attachment_urls': None } new_user_id = insert_player(author) return { - 'message': f'{author} ✅ Signed up successfully! Your gacha destiny begins now... ✨ Use the roll command to start!', + 'message': f'{author} ✅ Signed up successfully! Your gacha \ +destiny begins now... ✨ Use the roll command to start!', 'attachment_urls': None } + def is_float(val: Any) -> bool: '''Returns true if `val` can be converted to a float''' try: @@ -91,14 +96,14 @@ def do_create( author: str, arguments: List[str], note_obj: Dict[str, Any]) -> BotResponse: - '''Creates a character''' + '''Creates a card''' # Example call from bot logic image_url = note_obj.get('files', [{}])[0].get('url') \ if note_obj.get('files') else None if not image_url: return { - 'message': f'{author} You need an image to create a character, \ + 'message': f'{author} You need an image to create a card, \ dumbass.', 'attachment_urls': None } @@ -123,13 +128,13 @@ must be a decimal value between 0.0 and 1.0', 'attachment_urls': None } - character_id, file_id = add_character( + card_id, file_id = add_card( name=arguments[0], rarity=int(arguments[1]), image_url=image_url ) return { - 'message': f'{author} Added {arguments[0]}, ID {character_id}.', + 'message': f'{author} Added {arguments[0]}, ID {card_id}.', 'attachment_urls': [file_id] } @@ -137,30 +142,43 @@ must be a decimal value between 0.0 and 1.0', def do_help(author: str) -> BotResponse: '''Provides a list of commands that the bot can do.''' return { - 'message':f'{author} Here\'s what I can do:\n \ - - `roll` Pulls a random character.\ - - `create ` Creates a character using a given image.\ - - `signup` Registers your account.\ - - `delete_account` Deletes your account.\ - - `help` Shows this message', - 'attachment_urls': None + 'message': f'{author} Here\'s what I can do:\n\ +- `roll` Pulls a random card.\n\ +- `create ` Creates a card using a given image.\n\ +- `signup` Registers your account.\n\ +- `delete_account` Deletes your account.\n\ +- `help` Shows this message', + 'attachment_urls': None } - + + def delete_account(author: str) -> BotResponse: return { - 'message':f'{author} ⚠️ This will permanently delete your account and all your cards.\n' - 'If you’re sure, reply with `confirm_delete` to proceed.\n\n' + 'message': f'{author} ⚠️ This will permanently delete your account \ +and all your cards.\n' + 'If you’re sure, reply with `confirm_delete_account` to proceed.\n\n' '**There is no undo.** Your gacha luck will be lost to the void... 💀✨', 'attachment_urls': None } + def confirm_delete(author: str) -> BotResponse: - delete_player(author) return { - 'message':f'{author} 🧼 Your account and all your cards have been deleted. RIP your gacha history 🕊️✨', + 'message': f'{author} 🧼 Your account and all your cards have been \ +deleted. RIP your gacha history 🕊️✨', + 'attachment_urls': None + } + + +def do_admin_test(author: str) -> BotResponse: + player_id = get_player(author) + is_admin = is_player_administrator(player_id) + return { + 'message': f'{author} You are {"not " if not is_admin else ""}an \ +admin.', 'attachment_urls': None } @@ -171,25 +189,23 @@ def generate_response(notification: ParsedNotification) -> BotResponse | None: # Temporary response variable res: BotResponse | None = None - # TODO: Check if the user has an account author = notification['author'] - user_id = get_player(author) + player_id = get_player(author) command = notification['command'] - # Check if the user is an administrator - # user_is_administrator = user_is_administrator() # Unrestricted commands match command: + case 'roll': + res = do_roll(author) case 'signup': res = do_signup(author) case 'help': res = do_help(author) - case 'roll': - res = do_roll(author) case _: pass - if not user_id: + # Commands beyond this point require the user to have an account + if not player_id: return res # User commands @@ -200,15 +216,18 @@ def generate_response(notification: ParsedNotification) -> BotResponse | None: notification['arguments'], notification['note_obj'] ) - case 'signup': - res = do_signup(author) case 'delete_account': res = delete_account(author) - case 'confirm_delete': + case 'confirm_delete_account': res = confirm_delete(author) + case 'admin_test': + res = do_admin_test(author) case _: pass - # if not user_is_administrator: - return res + + # Commands beyond this point require the user to be an administrator + if not is_player_administrator(player_id): + return res # Administrator commands go here + return res diff --git a/example_config.ini b/example_config.ini index af7e0f2..25402e4 100644 --- a/example_config.ini +++ b/example_config.ini @@ -2,7 +2,7 @@ [application] ; Comma separated list of fedi handles for any administrator users ; More can be added through the application -DefaultAdmins = ['admin@example.tld'] +DefaultAdmins = ["@localadmin", "remoteadmin@example.tld"] ; SQLite Database location DatabaseLocation = ./gacha_game.db diff --git a/migrations/0003_rename_tables.sql b/migrations/0003_rename_tables.sql new file mode 100644 index 0000000..a3ba3a7 --- /dev/null +++ b/migrations/0003_rename_tables.sql @@ -0,0 +1,4 @@ +ALTER TABLE users RENAME TO players; +ALTER TABLE characters RENAME TO cards; +ALTER TABLE pulls RENAME user_id TO player_id; +ALTER TABLE pulls RENAME character_id TO card_id; diff --git a/migrations/0004_add_administrators.sql b/migrations/0004_add_administrators.sql new file mode 100644 index 0000000..7503e21 --- /dev/null +++ b/migrations/0004_add_administrators.sql @@ -0,0 +1 @@ +ALTER TABLE players ADD COLUMN is_administrator BOOLEAN NOT NULL DEFAULT 0; From 8ae6e25b95bca5643055d72d336c1b66c58de426 Mon Sep 17 00:00:00 2001 From: VD15 Date: Sat, 7 Jun 2025 20:40:27 +0100 Subject: [PATCH 26/67] Add instance whitelist --- bot/config.py | 2 ++ bot/db_utils.py | 29 ++++++++++++++++ bot/notification.py | 6 ++-- bot/response.py | 81 +++++++++++++++++++++++++++++++++------------ example_config.ini | 5 ++- 5 files changed, 98 insertions(+), 25 deletions(-) diff --git a/bot/config.py b/bot/config.py index af806f9..9737608 100644 --- a/bot/config.py +++ b/bot/config.py @@ -49,6 +49,8 @@ INSTANCE = config['credentials']['Instance'].lower() ADMINS = json.loads(config['application']['DefaultAdmins']) # SQLite Database location DB_PATH = config['application']['DatabaseLocation'] +# Whether to enable the instance whitelist +USE_WHITELIST = config['application']['UseWhitelist'] NOTIFICATION_POLL_INTERVAL = int(config['notification']['PollInterval']) NOTIFICATION_BATCH_SIZE = int(config['notification']['BatchSize']) diff --git a/bot/db_utils.py b/bot/db_utils.py index f7edd83..802e3f0 100644 --- a/bot/db_utils.py +++ b/bot/db_utils.py @@ -146,6 +146,35 @@ DESC", return row[0] if row else 0 +def add_to_whitelist(instance: str) -> bool: + '''Adds an instance to the whitelist, returns false if instance was already + present''' + try: + CURSOR.execute( + 'INSERT INTO instance_whitelist (tld) VALUES (?)', (instance,)) + return True + except sqlite3.IntegrityError: + return False + + +def remove_from_whitelist(instance: str) -> bool: + '''Removes an instance to the whitelist, returns false if instance was not + present''' + CURSOR.execute( + 'DELETE FROM instance_whitelist WHERE tld = ?', (instance,)) + return CURSOR.rowcount > 0 + + +def is_whitelisted(instance: str) -> bool: + '''Checks whether an instance is in the whitelist''' + if instance == 'local': + return True + CURSOR.execute( + 'SELECT * FROM instance_whitelist WHERE tld = ?', (instance,)) + row = CURSOR.fetchone() + return row is not None + + def get_config(key: str) -> str: '''Reads the value for a specified config key from the db''' CURSOR.execute("SELECT value FROM config WHERE key = ?", (key,)) diff --git a/bot/notification.py b/bot/notification.py index 9427dbf..faac1d3 100644 --- a/bot/notification.py +++ b/bot/notification.py @@ -4,9 +4,9 @@ from typing import Dict, Any import misskey from misskey.exceptions import MisskeyAPIException -from config import NOTIFICATION_BATCH_SIZE +from config import NOTIFICATION_BATCH_SIZE, USE_WHITELIST from parsing import parse_notification -from db_utils import get_config, set_config +from db_utils import get_config, set_config, is_whitelisted from response import generate_response from custom_types import BotResponse @@ -24,7 +24,7 @@ def process_notification( host = user.get('host') # None if local user instance = host if host else 'local' - if not (instance in WHITELISTED_INSTANCES or instance == 'local'): + if USE_WHITELIST and not is_whitelisted(instance): print(f'⚠️ Blocked notification from untrusted instance: {instance}') return diff --git a/bot/response.py b/bot/response.py index aa7b8b7..16bd05e 100644 --- a/bot/response.py +++ b/bot/response.py @@ -1,7 +1,6 @@ from datetime import datetime, timedelta, timezone from typing import TypedDict, Any, List, Dict -from db_utils import get_player, insert_player, delete_player, insert_pull, \ - get_last_rolled_at, get_random_card, is_player_administrator +import db_utils as db from add_card import add_card from config import GACHA_ROLL_INTERVAL from custom_types import BotResponse, ParsedNotification @@ -9,7 +8,7 @@ from custom_types import BotResponse, ParsedNotification def do_roll(author: str) -> BotResponse: '''Determines whether the user can roll, then pulls a random card''' - user_id = get_player(author) + user_id = db.get_player(author) if not user_id: return { 'message': f'{author} 🛑 You haven’t signed up yet! Use the \ @@ -17,7 +16,7 @@ def do_roll(author: str) -> BotResponse: 'attachment_urls': None } # Get date of user's last roll - date = get_last_rolled_at(user_id) + date = db.get_last_rolled_at(user_id) # No date means it's users first roll if date: @@ -46,7 +45,7 @@ def do_roll(author: str) -> BotResponse: 'attachment_urls': None } - card = get_random_card() + card = db.get_random_card() if not card: return { @@ -55,7 +54,7 @@ cards found. 😿', 'attachment_urls': None } - insert_pull(user_id, card['id']) + db.insert_pull(user_id, card['id']) stars = '⭐️' * card['rarity'] return { 'message': f'{author} 🎲 Congrats! You rolled {stars} \ @@ -66,7 +65,7 @@ cards found. 😿', def do_signup(author: str) -> BotResponse: '''Registers a new user if they haven’t signed up yet.''' - user_id = get_player(author) + user_id = db.get_player(author) if user_id: return { @@ -75,7 +74,7 @@ begin~ 🎲', 'attachment_urls': None } - new_user_id = insert_player(author) + new_user_id = db.insert_player(author) return { 'message': f'{author} ✅ Signed up successfully! Your gacha \ destiny begins now... ✨ Use the roll command to start!', @@ -164,7 +163,7 @@ and all your cards.\n' def confirm_delete(author: str) -> BotResponse: - delete_player(author) + db.delete_player(author) return { 'message': f'{author} 🧼 Your account and all your cards have been \ @@ -173,14 +172,43 @@ deleted. RIP your gacha history 🕊️✨', } -def do_admin_test(author: str) -> BotResponse: - player_id = get_player(author) - is_admin = is_player_administrator(player_id) - return { - 'message': f'{author} You are {"not " if not is_admin else ""}an \ -admin.', - 'attachment_urls': None - } +def do_whitelist(author: str, args: list[str]) -> BotResponse: + if len(args) == 0: + return { + 'message': f'{author} Please specify an instance to whitelist', + 'attachment_urls': None + } + + if db.add_to_whitelist(args[0]): + return { + 'message': f'{author} Whitelisted instance: {args[0]}', + 'attachment_urls': None + } + else: + return { + 'message': f'{author} Instance already whitelisted: {args[0]}', + 'attachment_urls': None + } + + +def do_unwhitelist(author: str, args: list[str]) -> BotResponse: + if len(args) == 0: + return { + 'message': f'{author} Please specify an instance to remove from \ +the whitelist', + 'attachment_urls': None + } + + if db.remove_from_whitelist(args[0]): + return { + 'message': f'{author} Unwhitelisted instance: {args[0]}', + 'attachment_urls': None + } + else: + return { + 'message': f'{author} Instance not whitelisted: {args[0]}', + 'attachment_urls': None + } def generate_response(notification: ParsedNotification) -> BotResponse | None: @@ -190,7 +218,7 @@ def generate_response(notification: ParsedNotification) -> BotResponse | None: # Temporary response variable res: BotResponse | None = None author = notification['author'] - player_id = get_player(author) + player_id = db.get_player(author) command = notification['command'] # Unrestricted commands @@ -220,14 +248,25 @@ def generate_response(notification: ParsedNotification) -> BotResponse | None: res = delete_account(author) case 'confirm_delete_account': res = confirm_delete(author) - case 'admin_test': - res = do_admin_test(author) case _: pass # Commands beyond this point require the user to be an administrator - if not is_player_administrator(player_id): + if not db.is_player_administrator(player_id): return res + # Admin commands + match command: + case 'whitelist': + res = do_whitelist(author, notification['arguments']) + case 'unwhitelist': + res = do_unwhitelist(author, notification['arguments']) + # case 'ban': + # res = do_ban(author, notification['arguments']) + # case 'unban': + # res = do_unban(author, notification['arguments']) + case _: + pass + # Administrator commands go here return res diff --git a/example_config.ini b/example_config.ini index 25402e4..0ea2422 100644 --- a/example_config.ini +++ b/example_config.ini @@ -2,9 +2,12 @@ [application] ; Comma separated list of fedi handles for any administrator users ; More can be added through the application -DefaultAdmins = ["@localadmin", "remoteadmin@example.tld"] +DefaultAdmins = ["@localadmin", "@remoteadmin@example.tld"] ; SQLite Database location DatabaseLocation = ./gacha_game.db +; Whether to lmit access to the bot via an instance whitelist +; The whitelist can be adjusted via the application +UseWhitelist = False [gacha] ; Number of seconds players have to wait between rolls From e41c965538e1b8231c0b74fc4796a8cad256aef7 Mon Sep 17 00:00:00 2001 From: w Date: Sat, 7 Jun 2025 17:26:51 -0300 Subject: [PATCH 27/67] Added the pwm patch --- .gitignore | 2 + web/app.py | 14 ++++- web/static/style.css | 92 ++++++++++++++++++++++++++++ web/templates/_base.html | 30 ++++++++++ web/templates/_error.html | 8 +++ web/templates/about.html | 12 ++-- web/templates/index.html | 122 +++----------------------------------- web/templates/submit.html | 12 ++-- web/templates/user.html | 60 +------------------ 9 files changed, 163 insertions(+), 189 deletions(-) create mode 100644 web/static/style.css create mode 100644 web/templates/_base.html create mode 100644 web/templates/_error.html diff --git a/.gitignore b/.gitignore index 11530b5..e5543ec 100644 --- a/.gitignore +++ b/.gitignore @@ -185,3 +185,5 @@ cython_debug/ gacha_game*.db gacha_game*.db.* config*.ini + +.idea \ No newline at end of file diff --git a/web/app.py b/web/app.py index f68084c..61ed38f 100644 --- a/web/app.py +++ b/web/app.py @@ -1,6 +1,8 @@ -from flask import Flask, render_template import sqlite3 +from flask import Flask, render_template, abort +from werkzeug.exceptions import HTTPException + app = Flask(__name__) DB_PATH = "./gacha_game.db" # Adjust path if needed @@ -9,6 +11,14 @@ def get_db_connection(): conn.row_factory = sqlite3.Row return conn +@app.errorhandler(HTTPException) +def handle_exception(error): + return render_template("_error.html", error=error), error.code + +@app.route("/i404") +def i404(): + return abort(404) + @app.route('/') def index(): conn = get_db_connection() @@ -33,6 +43,8 @@ def user_profile(user_id): cursor.execute('SELECT * FROM users WHERE id = ?', (user_id,)) user = cursor.fetchone() + if user is None: + abort(404) cursor.execute(''' SELECT pulls.timestamp, characters.name as character_name, characters.rarity diff --git a/web/static/style.css b/web/static/style.css new file mode 100644 index 0000000..74231c1 --- /dev/null +++ b/web/static/style.css @@ -0,0 +1,92 @@ +body { + font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif; + background-color: #f4f6fa; + color: #333; + margin: 0; + padding: 0; + } + + header { + background-color: #7289da; + color: white; + padding: 20px; + text-align: center; + } + + header h1 { + margin: 0; + font-size: 2.5em; + } + + header p { + margin-top: 5px; + font-size: 1.1em; + } + + .container { + max-width: 800px; + margin: 30px auto; + padding: 20px; + background-color: #ffffff; + border-radius: 10px; + box-shadow: 0 3px 10px rgba(0, 0, 0, 0.07); + } + + h2 { + border-bottom: 1px solid #ccc; + padding-bottom: 8px; + margin-top: 30px; + } + + ul { + list-style-type: none; + padding-left: 0; + } + + li { + margin: 10px 0; + } + + a { + text-decoration: none; + color: #2c3e50; + font-weight: bold; + background-color: #e3eaf3; + padding: 8px 12px; + border-radius: 6px; + display: inline-block; + transition: background-color 0.2s; + } + + a:hover { + background-color: #cdd8e6; + } + + .leaderboard-entry { + margin-bottom: 8px; + padding: 6px 10px; + background: #f9fafc; + border-left: 4px solid #7289da; + border-radius: 5px; + } + + footer { + text-align: center; + margin-top: 40px; + font-size: 0.9em; + color: #888; + } + + .note { + background: #fcfcf0; + border: 1px dashed #bbb; + padding: 10px; + border-radius: 8px; + margin-top: 30px; + font-size: 0.95em; + color: #666; + } + + .footer-link { + margin: 0 10px; + } \ No newline at end of file diff --git a/web/templates/_base.html b/web/templates/_base.html new file mode 100644 index 0000000..a1f1b22 --- /dev/null +++ b/web/templates/_base.html @@ -0,0 +1,30 @@ + + + + + + + {% if title %} + {{ title }} + {% else %} + {% block title %}{% endblock %} + {% endif %} +  | Kemoverse + + + +

+ {% block header %}{% endblock %} +
+ +
+ {% block content %}{% endblock %} +
+ + + + diff --git a/web/templates/_error.html b/web/templates/_error.html new file mode 100644 index 0000000..defc5d8 --- /dev/null +++ b/web/templates/_error.html @@ -0,0 +1,8 @@ +{% extends "_base.html" %} +{% block title %} + {{ error.code }} +{% endblock %} +{% block content %} +

{{ error.code }} - {{ error.name }}

+

{{ error.description }}

+{% endblock %} \ No newline at end of file diff --git a/web/templates/about.html b/web/templates/about.html index 89519db..184fde9 100644 --- a/web/templates/about.html +++ b/web/templates/about.html @@ -1,13 +1,9 @@ - - - - About - Misskey Gacha Center - - +{% extends "_base.html" %} + +{% block content %}

About This Gacha

This is a playful Misskey-themed gacha tracker made with Flask and SQLite.

All rolls are stored, stats are tracked, and characters are added manually for now.

Built with love, chaos, and way too much caffeine ☕.

← Back to Home - - +{% endblock %} \ No newline at end of file diff --git a/web/templates/index.html b/web/templates/index.html index e9b1680..f9bf7a0 100644 --- a/web/templates/index.html +++ b/web/templates/index.html @@ -1,110 +1,11 @@ - - - - Misskey Gacha Center - - - - -
-

Misskey Gacha Center

-

Track your luck. Compare your pulls. Compete with friends.

-
- -
+{% block content %}

🎖️ Leaderboard: Most Rolls

{% for user in top_users %} @@ -125,13 +26,4 @@
🚀 This is a fun little gacha tracker! More features coming soon. Want to help shape it?
- -
- - - - - +{% endblock %} \ No newline at end of file diff --git a/web/templates/submit.html b/web/templates/submit.html index 5dc5ac9..d0424b8 100644 --- a/web/templates/submit.html +++ b/web/templates/submit.html @@ -1,12 +1,8 @@ - - - - Submit a Character - Misskey Gacha Center - - +{% extends "_base.html" %} + +{% block content %}

Submit a Character

Want to add a new character to the gacha pool?

This feature will be available soon. Stay tuned!

← Back to Home - - +{% endblock %} \ No newline at end of file diff --git a/web/templates/user.html b/web/templates/user.html index 0004052..8010538 100644 --- a/web/templates/user.html +++ b/web/templates/user.html @@ -1,57 +1,5 @@ - - - - {{ user['username'] }}'s Rolls - - - - +{% extends "_base.html" %} +{% block content %}

{{ user['username'] }}'s Gacha Rolls

User ID: {{ user['id'] }}

@@ -72,6 +20,4 @@
← Back to Users - - - +{% endblock %} \ No newline at end of file From 97b30c79f44ef28dc72f945a1bfbf3a555c673d6 Mon Sep 17 00:00:00 2001 From: VD15 Date: Sat, 7 Jun 2025 23:18:39 +0100 Subject: [PATCH 28/67] Add admin commands --- bot/db_utils.py | 42 ++++++++++++++++++++--- bot/notification.py | 7 +++- bot/parsing.py | 18 +++++----- bot/response.py | 56 ++++++++++++++++++++++++++++--- migrations/0005_add_whitelist.sql | 7 ++++ 5 files changed, 111 insertions(+), 19 deletions(-) create mode 100644 migrations/0005_add_whitelist.sql diff --git a/bot/db_utils.py b/bot/db_utils.py index 802e3f0..94e915e 100644 --- a/bot/db_utils.py +++ b/bot/db_utils.py @@ -90,6 +90,9 @@ def delete_player(username: str) -> bool: ) player = CURSOR.fetchone() + if not player: + return False + player_id = player[0] # Delete pulls @@ -107,10 +110,40 @@ def delete_player(username: str) -> bool: return True -def is_player_administrator(player_id: int) -> bool: +def ban_player(username: str) -> bool: + '''Adds a player to the ban list.''' + try: + CURSOR.execute( + 'INSERT INTO banned_players (handle) VALUES (?)', + (username,) + ) + return True + except sqlite3.IntegrityError: + return False + + +def unban_player(username: str) -> bool: + '''Removes a player from the ban list.''' CURSOR.execute( - 'SELECT is_administrator FROM PLAYERS WHERE id = ? LIMIT 1', - (player_id,) + 'DELETE FROM banned_players WHERE handle = ?', + (username,) + ) + return CURSOR.rowcount > 0 + + +def is_player_banned(username: str) -> bool: + CURSOR.execute( + 'SELECT * FROM banned_players WHERE handle = ?', + (username,) + ) + row = CURSOR.fetchone() + return row is not None + + +def is_player_administrator(username: str) -> bool: + CURSOR.execute( + 'SELECT is_administrator FROM players WHERE username = ? LIMIT 1', + (username,) ) row = CURSOR.fetchone() return row[0] if row else False @@ -151,7 +184,8 @@ def add_to_whitelist(instance: str) -> bool: present''' try: CURSOR.execute( - 'INSERT INTO instance_whitelist (tld) VALUES (?)', (instance,)) + 'INSERT INTO instance_whitelist (tld) VALUES (?)', (instance,) + ) return True except sqlite3.IntegrityError: return False diff --git a/bot/notification.py b/bot/notification.py index faac1d3..deb8ec6 100644 --- a/bot/notification.py +++ b/bot/notification.py @@ -6,7 +6,7 @@ from misskey.exceptions import MisskeyAPIException from config import NOTIFICATION_BATCH_SIZE, USE_WHITELIST from parsing import parse_notification -from db_utils import get_config, set_config, is_whitelisted +from db_utils import get_config, set_config, is_whitelisted, is_player_banned from response import generate_response from custom_types import BotResponse @@ -44,6 +44,11 @@ def process_notification( if not parsed_notification: return + author = parsed_notification['author'] + if is_player_banned(author): + print(f'⚠️ Blocked notification from banned player: {author}') + return + # Get the note Id to reply to note_id = notification.get('note', {}).get('id') diff --git a/bot/parsing.py b/bot/parsing.py index eece077..e1e8583 100644 --- a/bot/parsing.py +++ b/bot/parsing.py @@ -24,6 +24,8 @@ def parse_notification( note_id = note_obj.get("id") note = note_text.strip().lower() if note_text else "" + # Split words into tokens + parts = note.split() # Check for both short and fully-qualified name mentions username_variants = [ @@ -31,18 +33,16 @@ def parse_notification( f'@{config.USER.split("@")[1]}' ] - # Make sure the notification text explicitly mentions the bot - if not any(variant in note for variant in username_variants): + # Notifs must consist of the initial mention and at least one other token + if len(parts) <= 1: return None - # Find command and arguments after the mention - # Removes all mentions - # regex = mentions that start with @ and may contain @domain - cleaned_text = re.sub(r"@\w+(?:@\S+)?", "", note).strip() - parts = cleaned_text.split() + # Make sure the first token is a mention to the bot + if not parts[0] in username_variants: + return None - command = parts[0].lower() if parts else None - arguments = parts[1:] if len(parts) > 1 else [] + command = parts[1].lower() + arguments = parts[2:] if len(parts) > 2 else [] return { 'author': full_user, diff --git a/bot/response.py b/bot/response.py index 16bd05e..f21d7b0 100644 --- a/bot/response.py +++ b/bot/response.py @@ -211,6 +211,52 @@ the whitelist', } +def do_ban(author: str, args: list[str]) -> BotResponse: + if len(args) == 0: + return { + 'message': f'{author} Please specify a user to ban', + 'attachment_urls': None + } + + if db.is_player_administrator(args[0]): + return { + 'message': f'{author} Cannot ban other administrators.', + 'attachment_urls': None + } + + if db.ban_player(args[0]): + # Delete banned player's account + db.delete_player(args[0]) + return { + 'message': f'{author} 🔨 **BONK!** Get banned, {args[0]}!', + 'attachment_urls': None + } + else: + return { + 'message': f'{author} Player is already banned: {args[0]}', + 'attachment_urls': None + } + + +def do_unban(author: str, args: list[str]) -> BotResponse: + if len(args) == 0: + return { + 'message': f'{author} Please specify a user to unban', + 'attachment_urls': None + } + + if db.unban_player(args[0]): + return { + 'message': f'{author} Player unbanned: {args[0]}!', + 'attachment_urls': None + } + else: + return { + 'message': f'{author} Player was not banned: {args[0]}', + 'attachment_urls': None + } + + def generate_response(notification: ParsedNotification) -> BotResponse | None: '''Given a command with arguments, processes the game state and returns a response''' @@ -252,7 +298,7 @@ def generate_response(notification: ParsedNotification) -> BotResponse | None: pass # Commands beyond this point require the user to be an administrator - if not db.is_player_administrator(player_id): + if not db.is_player_administrator(author): return res # Admin commands @@ -261,10 +307,10 @@ def generate_response(notification: ParsedNotification) -> BotResponse | None: res = do_whitelist(author, notification['arguments']) case 'unwhitelist': res = do_unwhitelist(author, notification['arguments']) - # case 'ban': - # res = do_ban(author, notification['arguments']) - # case 'unban': - # res = do_unban(author, notification['arguments']) + case 'ban': + res = do_ban(author, notification['arguments']) + case 'unban': + res = do_unban(author, notification['arguments']) case _: pass diff --git a/migrations/0005_add_whitelist.sql b/migrations/0005_add_whitelist.sql new file mode 100644 index 0000000..d24f2e3 --- /dev/null +++ b/migrations/0005_add_whitelist.sql @@ -0,0 +1,7 @@ +CREATE TABLE IF NOT EXISTS instance_whitelist ( + tld TEXT UNIQUE PRIMARY KEY +); + +CREATE TABLE IF NOT EXISTS banned_players ( + handle TEXT UNIQUE PRIMARY KEY +); From 4b1b8a53c7d691bfd2eda1d76d038298173b6ecf Mon Sep 17 00:00:00 2001 From: VD15 Date: Sat, 7 Jun 2025 23:25:48 +0100 Subject: [PATCH 29/67] Fix nonstandard apostrophe --- bot/response.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/response.py b/bot/response.py index f21d7b0..b49de1e 100644 --- a/bot/response.py +++ b/bot/response.py @@ -155,7 +155,7 @@ def delete_account(author: str) -> BotResponse: return { 'message': f'{author} ⚠️ This will permanently delete your account \ and all your cards.\n' - 'If you’re sure, reply with `confirm_delete_account` to proceed.\n\n' + 'If you\'re sure, reply with `confirm_delete_account` to proceed.\n\n' '**There is no undo.** Your gacha luck will be lost to the void... 💀✨', 'attachment_urls': None From 59915be66170ffcf5596a9d30d384c7d7e899646 Mon Sep 17 00:00:00 2001 From: VD15 Date: Sat, 7 Jun 2025 23:59:07 +0100 Subject: [PATCH 30/67] Enable WAL for DB connections --- .gitignore | 4 ++-- bot/db_utils.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e5543ec..b0a1050 100644 --- a/.gitignore +++ b/.gitignore @@ -183,7 +183,7 @@ cython_debug/ # Custom stuff gacha_game*.db -gacha_game*.db.* +gacha_game*.db* config*.ini -.idea \ No newline at end of file +.idea diff --git a/bot/db_utils.py b/bot/db_utils.py index 94e915e..72b431f 100644 --- a/bot/db_utils.py +++ b/bot/db_utils.py @@ -16,6 +16,7 @@ def connect() -> None: CONNECTION = sqlite3.connect(DB_PATH, autocommit=True) CONNECTION.row_factory = sqlite3.Row CURSOR = CONNECTION.cursor() + CURSOR.execute('pragma journal_mode=wal') def setup_administrators() -> None: From 1368c907a222d02387c23d956b50005501315a65 Mon Sep 17 00:00:00 2001 From: VD15 Date: Sun, 8 Jun 2025 00:09:02 +0100 Subject: [PATCH 31/67] Revert "Enable WAL for DB connections" This reverts commit 59915be66170ffcf5596a9d30d384c7d7e899646. --- .gitignore | 4 ++-- bot/db_utils.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b0a1050..e5543ec 100644 --- a/.gitignore +++ b/.gitignore @@ -183,7 +183,7 @@ cython_debug/ # Custom stuff gacha_game*.db -gacha_game*.db* +gacha_game*.db.* config*.ini -.idea +.idea \ No newline at end of file diff --git a/bot/db_utils.py b/bot/db_utils.py index 72b431f..94e915e 100644 --- a/bot/db_utils.py +++ b/bot/db_utils.py @@ -16,7 +16,6 @@ def connect() -> None: CONNECTION = sqlite3.connect(DB_PATH, autocommit=True) CONNECTION.row_factory = sqlite3.Row CURSOR = CONNECTION.cursor() - CURSOR.execute('pragma journal_mode=wal') def setup_administrators() -> None: From bad06c4f231fa31b938613c875fdf9aa00530cbf Mon Sep 17 00:00:00 2001 From: w Date: Mon, 9 Jun 2025 23:40:37 -0300 Subject: [PATCH 32/67] docs index --- docs/index.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 docs/index.md diff --git a/docs/index.md b/docs/index.md new file mode 100644 index 0000000..42cc59c --- /dev/null +++ b/docs/index.md @@ -0,0 +1,21 @@ +# 🎲 Kemoverse Gacha Game Documentation + +Welcome to the developer documentation for **Kemoverse**, a gacha trading card game in the Fediverse! +Features collectible cards, rarity-based pulls, and integration with Misskey. +Name comes from Kemonomimi and Fediverse. +--- + +## 📁 Table of Contents + +- [Installation](./install.md) +- [Game Design](./design.md) +- [Bot Architecture](./bot.md) +- [Database Structure](./database.md) +- [Card System](./cards.md) +- [Web UI](./web.md) +- [Theming and Assets](./theme.md) +- [Contributing](./contributing.md) +- [FAQ](./faq.md) + +--- + From 3626949020839ce5392f6b852dfafc0e6d218050 Mon Sep 17 00:00:00 2001 From: w Date: Mon, 9 Jun 2025 23:59:12 -0300 Subject: [PATCH 33/67] cleaned readme --- docs/index.md | 3 ++ docs/install.md | 83 ++++++++++++++++++++++++++++++++++++++++++++ readme.md | 92 ++----------------------------------------------- 3 files changed, 89 insertions(+), 89 deletions(-) create mode 100644 docs/install.md diff --git a/docs/index.md b/docs/index.md index 42cc59c..3b6683c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,8 +1,11 @@ # 🎲 Kemoverse Gacha Game Documentation Welcome to the developer documentation for **Kemoverse**, a gacha trading card game in the Fediverse! + Features collectible cards, rarity-based pulls, and integration with Misskey. + Name comes from Kemonomimi and Fediverse. + --- ## 📁 Table of Contents diff --git a/docs/install.md b/docs/install.md new file mode 100644 index 0000000..e5f8658 --- /dev/null +++ b/docs/install.md @@ -0,0 +1,83 @@ + +## 🧪 Installation + +### Download and install dependencies + +Clone the repo + +```sh +git clone https://git.waifuism.life/waifu/kemoverse.git +cd kemoverse +``` + +Setup a virtual environment (Optional, recommended) + +```sh +python3 -m venv venv +source venv/bin/activate +``` + +Install project dependencies via pip + +```sh +python3 -m pip install -r requirements.txt +``` + +### Setup config file + +A sample config file is included with the project as a template: `example_config.ini` + +Create a copy of this file and replace its' values with your own. Consult the +template for more information about individual config values and their meaning. + +Config files are environment-specific. Use `config_dev.ini` for development and +`config_prod.ini` for production. Switch between environments using the +`KEMOVERSE_ENV` environment variable. + +```sh +cp example_config.ini config_dev.ini +# Edit config_dev.ini +``` + +### Setup database + +To set up the database, run: + +```sh +KEMOVERSE_ENV=dev python3 setup_db.py +``` + +### Run the bot + +```sh +KEMOVERSE_ENV=dev ./startup.sh +``` + +If all goes well, you should now be able to interact with the bot. + +### Running in production + +To run the the in a production environment, use `KEMOVERSE_ENV=prod`. You will +also need to create a `config_prod.ini` file and run the database setup step +again if pointing prod to a different database. (you are pointing dev and prod +to different databases, right? 🤨) + +### Updating + +To update the bot, first pull new changes from upstream: + +```sh +git pull +``` + +Then run any database migrations. We recommend testing in dev beforehand to +make sure nothing breaks in the update process. + +**Always backup your prod database before running any migrations!** + +```sh +# Backup database file +cp gacha_game_dev.db gacha_game_dev.db.bak +# Run migrations +KEMOVERSE_ENV=dev python3 setup_db.py +``` diff --git a/readme.md b/readme.md index 40d723d..37b9849 100644 --- a/readme.md +++ b/readme.md @@ -1,12 +1,9 @@ # Kemoverse A gacha-style bot for the Fediverse built with Python. Users can roll for characters, trade, duel, and perhaps engage with popularity-based mechanics. Currently designed for use with Misskey. Name comes from Kemonomimi and Fediverse. - -## Installation - -## Roadmap - -![Fediverse Gacha Bot Logo](./web/static/logo.png) +

+ Fediverse Gacha Bot Logo +

## 🔧 Features @@ -57,89 +54,6 @@ A gacha-style bot for the Fediverse built with Python. Users can roll for charac The bot is meant to feel *light, fun, and competitive*. Mixing social, gacha and duel tactics. -## 🧪 Installation - -### Download and install dependencies - -Clone the repo - -```sh -git clone https://git.waifuism.life/waifu/kemoverse.git -cd kemoverse -``` - -Setup a virtual environment (Optional, recommended) - -```sh -python3 -m venv venv -source venv/bin/activate -``` - -Install project dependencies via pip - -```sh -python3 -m pip install -r requirements.txt -``` - -### Setup config file - -A sample config file is included with the project as a template: `example_config.ini` - -Create a copy of this file and replace its' values with your own. Consult the -template for more information about individual config values and their meaning. - -Config files are environment-specific. Use `config_dev.ini` for development and -`config_prod.ini` for production. Switch between environments using the -`KEMOVERSE_ENV` environment variable. - -```sh -cp example_config.ini config_dev.ini -# Edit config_dev.ini -``` - -### Setup database - -To set up the database, run: - -```sh -KEMOVERSE_ENV=dev python3 setup_db.py -``` - -### Run the bot - -```sh -KEMOVERSE_ENV=dev ./startup.sh -``` - -If all goes well, you should now be able to interact with the bot. - -### Running in production - -To run the the in a production environment, use `KEMOVERSE_ENV=prod`. You will -also need to create a `config_prod.ini` file and run the database setup step -again if pointing prod to a different database. (you are pointing dev and prod -to different databases, right? 🤨) - -### Updating - -To update the bot, first pull new changes from upstream: - -```sh -git pull -``` - -Then run any database migrations. We recommend testing in dev beforehand to -make sure nothing breaks in the update process. - -**Always backup your prod database before running any migrations!** - -```sh -# Backup database file -cp gacha_game_dev.db gacha_game_dev.db.bak -# Run migrations -KEMOVERSE_ENV=dev python3 setup_db.py -``` - ```mermaid flowchart TD From 62cc80033db95a4df7f7b7e78c8158f0a1c95726 Mon Sep 17 00:00:00 2001 From: w Date: Tue, 10 Jun 2025 00:23:28 -0300 Subject: [PATCH 34/67] docs --- docs/index.md | 2 +- readme.md | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/index.md b/docs/index.md index 3b6683c..292d673 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -# 🎲 Kemoverse Gacha Game Documentation +# 🎲 Kemoverse Documentation Welcome to the developer documentation for **Kemoverse**, a gacha trading card game in the Fediverse! diff --git a/readme.md b/readme.md index 37b9849..437b09f 100644 --- a/readme.md +++ b/readme.md @@ -5,6 +5,12 @@ A gacha-style bot for the Fediverse built with Python. Users can roll for charac Fediverse Gacha Bot Logo

+## 📝 Docs + +👉 [**Start reading the docs**](./docs/index.md) + +🤌 [**Install instructions for those in a rush**](docs/install.md) + ## 🔧 Features ### ✅ Implemented @@ -12,10 +18,11 @@ A gacha-style bot for the Fediverse built with Python. Users can roll for charac - 🧠 Core database structure for cards - 📦 Basic support for storing pulls per player - ⏱️ Time-based limitations on rolls +- ⚠️ Explicit account creation/deletion ### 🧩 In Progress - 📝 Whitelist system to limit access -- ⚠️ Explicit account creation/deletion + ## 🧠 Roadmap From fa21ce201dfed12814bde078025ab78139e07de0 Mon Sep 17 00:00:00 2001 From: w Date: Tue, 10 Jun 2025 00:32:53 -0300 Subject: [PATCH 35/67] Theme and visual identity --- docs/theme.md | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 docs/theme.md diff --git a/docs/theme.md b/docs/theme.md new file mode 100644 index 0000000..69e9ed3 --- /dev/null +++ b/docs/theme.md @@ -0,0 +1,33 @@ +Welcome to the **Visual Identity** guide for the Kemoverse. This page contains the standard colors, logos, and graphic elements used across the game (cards, UI, web presence, bots, etc). Please follow these guidelines to ensure consistency. + +--- + +## 🟢 Primary Color Palette + +| Color Name | Hex Code | Usage | +|----------------|------------|--------------------------------------| +| Green | `#5aa02c` | Main buttons, links, headers | +| Midnight Black | `#1A1A1A` | Backgrounds, dark mode | +| Misty White | `#FAFAFA` | Default backgrounds, light text bg | +| Soft Gray | `#CCCCCC` | Borders, placeholders, separators | +| Highlight Green | `#8dd35f` | Alerts, emphasis, icons | +| Rarity Gold | `#FFD700` | Special rare cards, SSR outlines | +| Rarity Silver | `#C0C0C0` | Rare card text, stat glow effects | + +> ✅ Use `Green` and `Misty White` for the standard UI. Avoid mixing in extra palettes unless explicitly needed. + +--- + +## 🖼 Logos + +### Main Logo + +

+ Fediverse Gacha Bot Logo +

+ +- File: `web/static/logo.png` +- Usage: Website header, favicon, bot avatar, watermark + + +--- \ No newline at end of file From 81c890a83dcd5720165eb413d785057705518a7e Mon Sep 17 00:00:00 2001 From: w Date: Wed, 11 Jun 2025 22:06:17 -0300 Subject: [PATCH 36/67] license change --- LICENSE | 722 +++++++++++++++++++++++++++----------------------------- 1 file changed, 354 insertions(+), 368 deletions(-) diff --git a/LICENSE b/LICENSE index f288702..c6f01c6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,200 +1,192 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 +# GNU AFFERO GENERAL PUBLIC LICENSE - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. +Version 3, 19 November 2007 - Preamble +Copyright (C) 2007 Free Software Foundation, Inc. + - The GNU General Public License is a free, copyleft license for -software and other kinds of works. +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +## Preamble - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you +The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + +The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains +free software for all its users. + +When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. +Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. +A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. +The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. +An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing +under this license. - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and +The precise terms and conditions for copying, distribution and modification follow. - TERMS AND CONDITIONS +## TERMS AND CONDITIONS - 0. Definitions. +### 0. Definitions. - "This License" refers to version 3 of the GNU General Public License. +"This License" refers to version 3 of the GNU Affero General Public +License. - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. +"Copyright" also means copyright-like laws that apply to other kinds +of works, such as semiconductor masks. - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and +"The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. +To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of +an exact copy. The resulting work is called a "modified version" of +the earlier work or a work "based on" the earlier work. - A "covered work" means either the unmodified Program or a work based +A "covered work" means either the unmodified Program or a work based on the Program. - To "propagate" a work means to do anything with it that, without +To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, +computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. +To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user +through a computer network, with no transfer of a copy, is not +conveying. - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible +An interactive user interface displays "Appropriate Legal Notices" to +the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If +work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. - 1. Source Code. +### 1. Source Code. - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. +The "source code" for a work means the preferred form of the work for +making modifications to it. "Object code" means any non-source form of +a work. - A "Standard Interface" means an interface that either is an official +A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. - The "System Libraries" of an executable work include anything, other +The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A +implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. - The "Corresponding Source" for a work in object code form means all +The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's +control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source +which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. +The Corresponding Source need not include anything that users can +regenerate automatically from other parts of the Corresponding Source. - The Corresponding Source for a work in source code form is that -same work. +The Corresponding Source for a work in source code form is that same +work. - 2. Basic Permissions. +### 2. Basic Permissions. - All rights granted under this License are granted for the term of +All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your +content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. +You may make, run and propagate covered works that you do not convey, +without conditions so long as your license otherwise remains in force. +You may convey covered works to others for the sole purpose of having +them make modifications exclusively for you, or provide you with +facilities for running those works, provided that you comply with the +terms of this License in conveying all material for which you do not +control copyright. Those thus making or running the covered works for +you must do so exclusively on your behalf, under your direction and +control, on terms that prohibit them from making any copies of your +copyrighted material outside their relationship with you. - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. +Conveying under any other circumstances is permitted solely under the +conditions stated below. Sublicensing is not allowed; section 10 makes +it unnecessary. - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. +### 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - No covered work shall be deemed part of an effective technological +No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. +When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such +circumvention is effected by exercising rights under this License with +respect to the covered work, and you disclaim any intention to limit +operation or modification of the work as a means of enforcing, against +the work's users, your or third parties' legal rights to forbid +circumvention of technological measures. - 4. Conveying Verbatim Copies. +### 4. Conveying Verbatim Copies. - You may convey verbatim copies of the Program's source code as you +You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any @@ -202,59 +194,56 @@ non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. - You may charge any price or no price for each copy that you convey, +You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. - 5. Conveying Modified Source Versions. +### 5. Conveying Modified Source Versions. - You may convey a work based on the Program, or the modifications to +You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: +terms of section 4, provided that you also meet all of these +conditions: - a) The work must carry prominent notices stating that you modified +- a) The work must carry prominent notices stating that you modified it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This +- b) The work must carry prominent notices stating that it is + released under this License and any conditions added under + section 7. This requirement modifies the requirement in section 4 + to "keep intact all notices". +- c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no + regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display +- d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. - A compilation of a covered work with other separate and independent +A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work +beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. - 6. Conveying Non-Source Forms. +### 6. Conveying Non-Source Forms. - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: +You may convey a covered work in object code form under the terms of +sections 4 and 5, provided that you also convey the machine-readable +Corresponding Source under the terms of this License, in one of these +ways: - a) Convey the object code in, or embodied in, a physical product +- a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product +- b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product @@ -263,196 +252,190 @@ in one of these ways: product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This + conveying of source, or (2) access to copy the Corresponding + Source from a network server at no charge. +- c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. - - d) Convey the object code by offering access from a designated +- d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the + Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. +- e) Convey the object code using peer-to-peer transmission, + provided you inform other peers where the object code and + Corresponding Source of the work are being offered to the general + public at no charge under subsection 6d. - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded +A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. +A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, +family, or household purposes, or (2) anything designed or sold for +incorporation into a dwelling. In determining whether a product is a +consumer product, doubtful cases shall be resolved in favor of +coverage. For a particular product received by a particular user, +"normally used" refers to a typical or common use of that class of +product, regardless of the status of the particular user or of the way +in which the particular user actually uses, or expects or is expected +to use, the product. A product is a consumer product regardless of +whether the product has substantial commercial, industrial or +non-consumer uses, unless such uses represent the only significant +mode of use of the product. - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. +"Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to +install and execute modified versions of a covered work in that User +Product from a modified version of its Corresponding Source. The +information must suffice to ensure that the continued functioning of +the modified object code is in no case prevented or interfered with +solely because modification has been made. - If you convey an object code work under this section in, or with, or +If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply +by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. +The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or +updates for a work that has been modified or installed by the +recipient, or for the User Product in which it has been modified or +installed. Access to a network may be denied when the modification +itself materially and adversely affects the operation of the network +or violates the rules and protocols for communication across the +network. - Corresponding Source conveyed, and Installation Information provided, +Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. - 7. Additional Terms. +### 7. Additional Terms. - "Additional permissions" are terms that supplement the terms of this +"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions +that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. - When you convey a copy of a covered work, you may at your option +When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: +Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders +of that material) supplement the terms of this License with terms: - a) Disclaiming warranty or limiting liability differently from the +- a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or +- b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in +- c) Prohibiting misrepresentation of the origin of that material, + or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some +- d) Limiting the use for publicity purposes of names of licensors + or authors of the material; or +- e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or +- f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions + of it) with contractual assumptions of liability to the recipient, + for any liability that these contractual assumptions directly + impose on those licensors and authors. - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you +All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains +restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. - If you add terms to a covered work in accord with this section, you +If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. +Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; the +above requirements apply either way. - 8. Termination. +### 8. Termination. - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or +You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. +However, if you cease all violation of this License, then your license +from a particular copyright holder is reinstated (a) provisionally, +unless and until the copyright holder explicitly and finally +terminates your license, and (b) permanently, if the copyright holder +fails to notify you of the violation by some reasonable means prior to +60 days after the cessation. - Moreover, your license from a particular copyright holder is +Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. - Termination of your rights under this section does not terminate the +Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently +this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. - 9. Acceptance Not Required for Having Copies. +### 9. Acceptance Not Required for Having Copies. - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work +You are not required to accept this License in order to receive or run +a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, +to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. - 10. Automatic Licensing of Downstream Recipients. +### 10. Automatic Licensing of Downstream Recipients. - Each time you convey a covered work, the recipient automatically +Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible +propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. - An "entity transaction" is a transaction transferring control of an +An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered +organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could @@ -460,43 +443,43 @@ give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may +You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. - 11. Patents. +### 11. Patents. - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The +A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or +A contributor's "essential patent claims" are all patent claims owned +or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For +consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. - Each contributor grants you a non-exclusive, worldwide, royalty-free +Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. - In the following three paragraphs, a "patent license" is any express +In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a +sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. - If you convey a covered work, knowingly relying on a patent license, +If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, @@ -504,13 +487,13 @@ then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have +license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - If, pursuant to or in connection with a single transaction or +If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify @@ -518,157 +501,160 @@ or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. +A patent license is "discriminatory" if it does not include within the +scope of its coverage, prohibits the exercise of, or is conditioned on +the non-exercise of one or more of the rights that are specifically +granted under this License. You may not convey a covered work if you +are a party to an arrangement with a third party that is in the +business of distributing software, under which you make payment to the +third party based on the extent of your activity of conveying the +work, and under which the third party grants, to any of the parties +who would receive the covered work from you, a discriminatory patent +license (a) in connection with copies of the covered work conveyed by +you (or copies made from those copies), or (b) primarily for and in +connection with specific products or compilations that contain the +covered work, unless you entered into that arrangement, or that patent +license was granted, prior to 28 March 2007. - Nothing in this License shall be construed as excluding or limiting +Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. - 12. No Surrender of Others' Freedom. +### 12. No Surrender of Others' Freedom. - If conditions are imposed on you (whether by court order, agreement or +If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under +this License and any other pertinent obligations, then as a +consequence you may not convey it at all. For example, if you agree to +terms that obligate you to collect a royalty for further conveying +from those to whom you convey the Program, the only way you could +satisfy both those terms and this License would be to refrain entirely +from conveying the Program. - 13. Use with the GNU Affero General Public License. +### 13. Remote Network Interaction; Use with the GNU General Public License. - Notwithstanding any other provision of this License, you have +Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your +version supports such interaction) an opportunity to receive the +Corresponding Source of your version by providing access to the +Corresponding Source from a network server at no charge, through some +standard or customary means of facilitating copying of software. This +Corresponding Source shall include the Corresponding Source for any +work covered by version 3 of the GNU General Public License that is +incorporated pursuant to the following paragraph. + +Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. - 14. Revised Versions of this License. +### 14. Revised Versions of this License. - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. +The Free Software Foundation may publish revised and/or new versions +of the GNU Affero General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General +Each version is given a distinguishing version number. If the Program +specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever +published by the Free Software Foundation. - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's +If the Program specifies that a proxy can decide which future versions +of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any +Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. - 15. Disclaimer of Warranty. +### 15. Disclaimer of Warranty. - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT +WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE +DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR +CORRECTION. - 16. Limitation of Liability. +### 16. Limitation of Liability. - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR +CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT +NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR +LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM +TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER +PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - 17. Interpretation of Sections 15 and 16. +### 17. Interpretation of Sections 15 and 16. - If the disclaimer of warranty and limitation of liability provided +If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - END OF TERMS AND CONDITIONS +END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Programs +## How to Apply These Terms to Your New Programs - If you develop a new program, and you want it to be of the greatest +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. +free software which everyone can redistribute and change under these +terms. - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. +To do so, attach the following notices to the program. It is safest to +attach them to the start of each source file to most effectively state +the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. - - Copyright (C) + + Copyright (C) - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see . + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . -Also add information on how to contact you by electronic and paper mail. +Also add information on how to contact you by electronic and paper +mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: +If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for +the specific requirements. - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. +You should also get your employer (if you work as a programmer) or +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. For more information on this, and how to apply and follow +the GNU AGPL, see . From df76fb91311939d34c0b5e5fe40649e2679b98b8 Mon Sep 17 00:00:00 2001 From: w Date: Wed, 11 Jun 2025 22:29:06 -0300 Subject: [PATCH 37/67] adding license to main files --- bot/bot_app.py | 16 ++++++++++++++++ setup_db.py | 16 ++++++++++++++++ startup.sh | 16 ++++++++++++++++ web/app.py | 16 ++++++++++++++++ 4 files changed, 64 insertions(+) diff --git a/bot/bot_app.py b/bot/bot_app.py index 825695e..38ac5d6 100644 --- a/bot/bot_app.py +++ b/bot/bot_app.py @@ -1,3 +1,19 @@ +#Kemoverse - a gacha-style bot for the Fediverse. +#Copyright © 2025 Waifu +# +#This program is free software: you can redistribute it and/or modify +#it under the terms of the GNU Affero General Public License as +#published by the Free Software Foundation, either version 3 of the +#License, or (at your option) any later version. +# +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#GNU Affero General Public License for more details. +# +#You should have received a copy of the GNU Affero General Public License +#along with this program. If not, see https://www.gnu.org/licenses/. + import time import misskey as misskey from client import client_connection diff --git a/setup_db.py b/setup_db.py index 241bb4e..8cb5196 100644 --- a/setup_db.py +++ b/setup_db.py @@ -1,3 +1,19 @@ +#Kemoverse - a gacha-style bot for the Fediverse. +#Copyright © 2025 Waifu +# +#This program is free software: you can redistribute it and/or modify +#it under the terms of the GNU Affero General Public License as +#published by the Free Software Foundation, either version 3 of the +#License, or (at your option) any later version. +# +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#GNU Affero General Public License for more details. +# +#You should have received a copy of the GNU Affero General Public License +#along with this program. If not, see https://www.gnu.org/licenses/. + import sqlite3 import traceback import os diff --git a/startup.sh b/startup.sh index 7c216b6..e8c3bed 100755 --- a/startup.sh +++ b/startup.sh @@ -1,5 +1,21 @@ #!/bin/bash +#Kemoverse - a gacha-style bot for the Fediverse. +#Copyright © 2025 Waifu +# +#This program is free software: you can redistribute it and/or modify +#it under the terms of the GNU Affero General Public License as +#published by the Free Software Foundation, either version 3 of the +#License, or (at your option) any later version. +# +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#GNU Affero General Public License for more details. +# +#You should have received a copy of the GNU Affero General Public License +#along with this program. If not, see https://www.gnu.org/licenses/. + # Navigate to the project directory (optional) cd "$(dirname "$0")" diff --git a/web/app.py b/web/app.py index 61ed38f..9ede0e4 100644 --- a/web/app.py +++ b/web/app.py @@ -1,3 +1,19 @@ +#Kemoverse - a gacha-style bot for the Fediverse. +#Copyright © 2025 Waifu +# +#This program is free software: you can redistribute it and/or modify +#it under the terms of the GNU Affero General Public License as +#published by the Free Software Foundation, either version 3 of the +#License, or (at your option) any later version. +# +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#GNU Affero General Public License for more details. +# +#You should have received a copy of the GNU Affero General Public License +#along with this program. If not, see https://www.gnu.org/licenses/. + import sqlite3 from flask import Flask, render_template, abort From 2b194f3c9edf1868a25a50f951ab955a3a7685bb Mon Sep 17 00:00:00 2001 From: w Date: Wed, 11 Jun 2025 22:42:57 -0300 Subject: [PATCH 38/67] readme changes for license --- readme.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/readme.md b/readme.md index 437b09f..ed33ec4 100644 --- a/readme.md +++ b/readme.md @@ -61,6 +61,23 @@ A gacha-style bot for the Fediverse built with Python. Users can roll for charac The bot is meant to feel *light, fun, and competitive*. Mixing social, gacha and duel tactics. +## 📝 License + +This project is licensed under the GNU Affero General Public License v3.0 (AGPL-3.0). + +This means: + +- You are free to use, modify, and redistribute this software under the same license. + +- If you modify and deploy the software (for example, as part of a web service), you must also make the source code of your modified version available to users of that service. + +You should have received a copy of the GNU Affero General Public License along with this program. If not, see https://www.gnu.org/licenses/. +The full license text can be found here: https://www.gnu.org/licenses/agpl-3.0.html + +The AGPL is designed to ensure that software freedom is preserved, especially in networked environments. If you improve this project or build something on top of it, please give back to the community by sharing your changes too. + +Unless another license is listed, every file in the project is licensed under the GNU General Public License version 3 (or at your option), any later version. + ```mermaid flowchart TD From e0cf42f8f60f7b6c933894d89ec7388708ef8b6c Mon Sep 17 00:00:00 2001 From: Moon Date: Thu, 12 Jun 2025 11:03:12 +0900 Subject: [PATCH 39/67] baseline fedi abstraction stuff. --- .tool-versions | 1 + CLAUDE.md | 31 ++++++++ bot/config.py | 14 +++- bot/fediverse_factory.py | 31 ++++++++ bot/fediverse_service.py | 57 ++++++++++++++ bot/fediverse_types.py | 73 ++++++++++++++++++ bot/misskey_service.py | 141 +++++++++++++++++++++++++++++++++++ bot/pleroma_service.py | 155 +++++++++++++++++++++++++++++++++++++++ requirements.txt | 1 + 9 files changed, 503 insertions(+), 1 deletion(-) create mode 100644 .tool-versions create mode 100644 CLAUDE.md create mode 100644 bot/fediverse_factory.py create mode 100644 bot/fediverse_service.py create mode 100644 bot/fediverse_types.py create mode 100644 bot/misskey_service.py create mode 100644 bot/pleroma_service.py diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000..45e4b9f --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +nodejs 23.4.0 diff --git a/CLAUDE.md b/CLAUDE.md new file mode 100644 index 0000000..2e60baf --- /dev/null +++ b/CLAUDE.md @@ -0,0 +1,31 @@ +# Kemoverse - Fediverse Gacha Bot + +A Python-based gacha-style bot for the Fediverse that interfaces with either Misskey or Pleroma instances. + +## Project Overview +- **Language**: Python 3.11+ +- **Framework**: Flask for web interface +- **Database**: SQLite +- **Fediverse Support**: Configurable for Misskey or Pleroma instances +- **API Integration**: Uses Misskey.py library for Fediverse API communication + +## Key Components +- `bot/` - Core bot functionality including gacha mechanics, character management, and API interactions +- `web/` - Flask web application for user interface and card management +- `db.py` - Database utilities and schema management +- `config.ini` - Instance configuration (API keys, instance URL, admin users) + +## Configuration +The bot is configured via `config.ini` to connect to either a Misskey or Pleroma Fediverse instance. Key settings include: +- Instance URL and API credentials +- Bot user account details +- Administrator user permissions +- Database location + +## Development Commands +- Install dependencies: `pip install -r requirements.txt` +- Run bot: `python dev_runner.py` +- Start web interface: `python web/app.py` + +## Testing +Run tests with appropriate Python testing framework (check for pytest, unittest, or similar in project). \ No newline at end of file diff --git a/bot/config.py b/bot/config.py index 227f949..5b5848f 100644 --- a/bot/config.py +++ b/bot/config.py @@ -38,9 +38,21 @@ config.read(get_config_file()) USER = config['credentials']['User'].lower() # API key for the bot KEY = config['credentials']['Token'] -# Bot's Misskey instance URL +# Bot's Misskey/Pleroma instance URL INSTANCE = config['credentials']['Instance'].lower() +# Instance type validation +if 'InstanceType' not in config['application']: + raise ValueError("InstanceType must be specified in config.ini") + +instance_type = config['application']['InstanceType'].lower() +if instance_type not in ('misskey', 'pleroma'): + raise ValueError("InstanceType must be either 'misskey' or 'pleroma'") + +INSTANCE_TYPE = instance_type + +# Extra stuff for control of the bot + # TODO: move this to db # Fedi handles in the traditional 'user@domain.tld' style, allows these users # to use extra admin exclusive commands with the bot diff --git a/bot/fediverse_factory.py b/bot/fediverse_factory.py new file mode 100644 index 0000000..f2a9017 --- /dev/null +++ b/bot/fediverse_factory.py @@ -0,0 +1,31 @@ +from fediverse_service import FediverseService +from misskey_service import MisskeyService +from pleroma_service import PleromaService +import config + + +class FediverseServiceFactory: + """Factory for creating FediverseService implementations based on configuration""" + + @staticmethod + def create_service() -> FediverseService: + """ + Create a FediverseService implementation based on the configured instance type. + + Returns: + FediverseService implementation (MisskeyService or PleromaService) + + Raises: + ValueError: If the instance type is not supported + """ + if config.INSTANCE_TYPE == "misskey": + return MisskeyService() + elif config.INSTANCE_TYPE == "pleroma": + return PleromaService() + else: + raise ValueError(f"Unsupported instance type: {config.INSTANCE_TYPE}") + + +def get_fediverse_service() -> FediverseService: + """Convenience function to get a FediverseService instance""" + return FediverseServiceFactory.create_service() \ No newline at end of file diff --git a/bot/fediverse_service.py b/bot/fediverse_service.py new file mode 100644 index 0000000..2d12d89 --- /dev/null +++ b/bot/fediverse_service.py @@ -0,0 +1,57 @@ +from abc import ABC, abstractmethod +from typing import List, Optional +from fediverse_types import FediverseNotification, FediversePost, Visibility + + +class FediverseService(ABC): + """Abstract interface for Fediverse platform services (Misskey, Pleroma, etc.)""" + + @abstractmethod + def get_notifications(self, since_id: Optional[str] = None) -> List[FediverseNotification]: + """ + Retrieve notifications from the Fediverse instance. + + Args: + since_id: Optional ID to get notifications newer than this ID + + Returns: + List of FediverseNotification objects + """ + pass + + @abstractmethod + def create_post( + self, + text: str, + reply_to_id: Optional[str] = None, + visibility: Visibility = Visibility.HOME, + file_ids: Optional[List[str]] = None, + visible_user_ids: Optional[List[str]] = None + ) -> str: + """ + Create a new post on the Fediverse instance. + + Args: + text: The text content of the post + reply_to_id: Optional ID of post to reply to + visibility: Visibility level for the post + file_ids: Optional list of file IDs to attach + visible_user_ids: Optional list of user IDs who can see the post (for specified visibility) + + Returns: + ID of the created post + """ + pass + + @abstractmethod + def get_post_by_id(self, post_id: str) -> Optional[FediversePost]: + """ + Retrieve a specific post by its ID. + + Args: + post_id: The ID of the post to retrieve + + Returns: + FediversePost object if found, None otherwise + """ + pass \ No newline at end of file diff --git a/bot/fediverse_types.py b/bot/fediverse_types.py new file mode 100644 index 0000000..c1580b6 --- /dev/null +++ b/bot/fediverse_types.py @@ -0,0 +1,73 @@ +from dataclasses import dataclass +from typing import Optional, List, Dict, Any +from enum import Enum + + +class NotificationType(Enum): + MENTION = "mention" + REPLY = "reply" + FOLLOW = "follow" + FAVOURITE = "favourite" + REBLOG = "reblog" + POLL = "poll" + OTHER = "other" + + +class Visibility(Enum): + PUBLIC = "public" + UNLISTED = "unlisted" + HOME = "home" + FOLLOWERS = "followers" + SPECIFIED = "specified" + DIRECT = "direct" + + +@dataclass +class FediverseUser: + """Common user representation across Fediverse platforms""" + id: str + username: str + host: Optional[str] = None # None for local users + display_name: Optional[str] = None + + @property + def full_handle(self) -> str: + """Returns the full fediverse handle (@user@domain or @user for local)""" + if self.host: + return f"@{self.username}@{self.host}" + return f"@{self.username}" + + +@dataclass +class FediverseFile: + """Common file/attachment representation""" + id: str + url: str + type: Optional[str] = None + name: Optional[str] = None + + +@dataclass +class FediversePost: + """Common post representation across Fediverse platforms""" + id: str + text: Optional[str] + user: FediverseUser + visibility: Visibility + created_at: Optional[str] = None + files: List[FediverseFile] = None + reply_to_id: Optional[str] = None + + def __post_init__(self): + if self.files is None: + self.files = [] + + +@dataclass +class FediverseNotification: + """Common notification representation across Fediverse platforms""" + id: str + type: NotificationType + user: FediverseUser + post: Optional[FediversePost] = None + created_at: Optional[str] = None \ No newline at end of file diff --git a/bot/misskey_service.py b/bot/misskey_service.py new file mode 100644 index 0000000..845ed27 --- /dev/null +++ b/bot/misskey_service.py @@ -0,0 +1,141 @@ +import misskey +from typing import List, Optional, Dict, Any +from fediverse_service import FediverseService +from fediverse_types import ( + FediverseNotification, FediversePost, FediverseUser, FediverseFile, + NotificationType, Visibility +) +import config + + +class MisskeyService(FediverseService): + """Misskey implementation of FediverseService""" + + def __init__(self): + self.client = misskey.Misskey(address=config.INSTANCE, i=config.KEY) + + def _convert_misskey_user(self, user_data: Dict[str, Any]) -> FediverseUser: + """Convert Misskey user data to FediverseUser""" + return FediverseUser( + id=user_data.get("id", ""), + username=user_data.get("username", "unknown"), + host=user_data.get("host"), + display_name=user_data.get("name") + ) + + def _convert_misskey_file(self, file_data: Dict[str, Any]) -> FediverseFile: + """Convert Misskey file data to FediverseFile""" + return FediverseFile( + id=file_data.get("id", ""), + url=file_data.get("url", ""), + type=file_data.get("type"), + name=file_data.get("name") + ) + + def _convert_misskey_visibility(self, visibility: str) -> Visibility: + """Convert Misskey visibility to our enum""" + visibility_map = { + "public": Visibility.PUBLIC, + "unlisted": Visibility.UNLISTED, + "home": Visibility.HOME, + "followers": Visibility.FOLLOWERS, + "specified": Visibility.SPECIFIED + } + return visibility_map.get(visibility, Visibility.HOME) + + def _convert_to_misskey_visibility(self, visibility: Visibility) -> str: + """Convert our visibility enum to Misskey visibility""" + visibility_map = { + Visibility.PUBLIC: "public", + Visibility.UNLISTED: "unlisted", + Visibility.HOME: "home", + Visibility.FOLLOWERS: "followers", + Visibility.SPECIFIED: "specified", + Visibility.DIRECT: "specified" # Map direct to specified for Misskey + } + return visibility_map.get(visibility, "home") + + def _convert_misskey_notification_type(self, notif_type: str) -> NotificationType: + """Convert Misskey notification type to our enum""" + type_map = { + "mention": NotificationType.MENTION, + "reply": NotificationType.REPLY, + "follow": NotificationType.FOLLOW, + "favourite": NotificationType.FAVOURITE, + "reblog": NotificationType.REBLOG, + "poll": NotificationType.POLL + } + return type_map.get(notif_type, NotificationType.OTHER) + + def _convert_misskey_post(self, note_data: Dict[str, Any]) -> FediversePost: + """Convert Misskey note data to FediversePost""" + files = [] + if note_data.get("files"): + files = [self._convert_misskey_file(f) for f in note_data["files"]] + + return FediversePost( + id=note_data.get("id", ""), + text=note_data.get("text"), + user=self._convert_misskey_user(note_data.get("user", {})), + visibility=self._convert_misskey_visibility(note_data.get("visibility", "home")), + created_at=note_data.get("createdAt"), + files=files, + reply_to_id=note_data.get("replyId") + ) + + def _convert_misskey_notification(self, notification_data: Dict[str, Any]) -> FediverseNotification: + """Convert Misskey notification data to FediverseNotification""" + post = None + if notification_data.get("note"): + post = self._convert_misskey_post(notification_data["note"]) + + return FediverseNotification( + id=notification_data.get("id", ""), + type=self._convert_misskey_notification_type(notification_data.get("type", "")), + user=self._convert_misskey_user(notification_data.get("user", {})), + post=post, + created_at=notification_data.get("createdAt") + ) + + def get_notifications(self, since_id: Optional[str] = None) -> List[FediverseNotification]: + """Get notifications from Misskey instance""" + params = {} + if since_id: + params["sinceId"] = since_id + + notifications = self.client.i_notifications(**params) + return [self._convert_misskey_notification(notif) for notif in notifications] + + def create_post( + self, + text: str, + reply_to_id: Optional[str] = None, + visibility: Visibility = Visibility.HOME, + file_ids: Optional[List[str]] = None, + visible_user_ids: Optional[List[str]] = None + ) -> str: + """Create a post on Misskey instance""" + params = { + "text": text, + "visibility": self._convert_to_misskey_visibility(visibility) + } + + if reply_to_id: + params["replyId"] = reply_to_id + + if file_ids: + params["fileIds"] = file_ids + + if visible_user_ids and visibility == Visibility.SPECIFIED: + params["visibleUserIds"] = visible_user_ids + + response = self.client.notes_create(**params) + return response.get("createdNote", {}).get("id", "") + + def get_post_by_id(self, post_id: str) -> Optional[FediversePost]: + """Get a specific post by ID from Misskey instance""" + try: + note = self.client.notes_show(noteId=post_id) + return self._convert_misskey_post(note) + except Exception: + return None \ No newline at end of file diff --git a/bot/pleroma_service.py b/bot/pleroma_service.py new file mode 100644 index 0000000..1e53cd7 --- /dev/null +++ b/bot/pleroma_service.py @@ -0,0 +1,155 @@ +from mastodon import Mastodon +from typing import List, Optional, Dict, Any +from fediverse_service import FediverseService +from fediverse_types import ( + FediverseNotification, FediversePost, FediverseUser, FediverseFile, + NotificationType, Visibility +) +import config + + +class PleromaService(FediverseService): + """Pleroma implementation of FediverseService using Mastodon.py""" + + def __init__(self): + self.client = Mastodon( + access_token=config.KEY, + api_base_url=config.INSTANCE + ) + + def _convert_mastodon_user(self, user_data: Dict[str, Any]) -> FediverseUser: + """Convert Mastodon/Pleroma user data to FediverseUser""" + acct = user_data.get("acct", "") + if "@" in acct: + username, host = acct.split("@", 1) + else: + username = acct + host = None + + return FediverseUser( + id=str(user_data.get("id", "")), + username=username, + host=host, + display_name=user_data.get("display_name") + ) + + def _convert_mastodon_file(self, file_data: Dict[str, Any]) -> FediverseFile: + """Convert Mastodon/Pleroma media attachment to FediverseFile""" + return FediverseFile( + id=str(file_data.get("id", "")), + url=file_data.get("url", ""), + type=file_data.get("type"), + name=file_data.get("description") + ) + + def _convert_mastodon_visibility(self, visibility: str) -> Visibility: + """Convert Mastodon/Pleroma visibility to our enum""" + visibility_map = { + "public": Visibility.PUBLIC, + "unlisted": Visibility.UNLISTED, + "private": Visibility.FOLLOWERS, + "direct": Visibility.DIRECT + } + return visibility_map.get(visibility, Visibility.PUBLIC) + + def _convert_to_mastodon_visibility(self, visibility: Visibility) -> str: + """Convert our visibility enum to Mastodon/Pleroma visibility""" + visibility_map = { + Visibility.PUBLIC: "public", + Visibility.UNLISTED: "unlisted", + Visibility.HOME: "unlisted", # Map home to unlisted for Pleroma + Visibility.FOLLOWERS: "private", + Visibility.SPECIFIED: "direct", # Map specified to direct for Pleroma + Visibility.DIRECT: "direct" + } + return visibility_map.get(visibility, "public") + + def _convert_mastodon_notification_type(self, notif_type: str) -> NotificationType: + """Convert Mastodon/Pleroma notification type to our enum""" + type_map = { + "mention": NotificationType.MENTION, + "follow": NotificationType.FOLLOW, + "favourite": NotificationType.FAVOURITE, + "reblog": NotificationType.REBLOG, + "poll": NotificationType.POLL + } + return type_map.get(notif_type, NotificationType.OTHER) + + def _convert_mastodon_status(self, status_data: Dict[str, Any]) -> FediversePost: + """Convert Mastodon/Pleroma status data to FediversePost""" + files = [] + if status_data.get("media_attachments"): + files = [self._convert_mastodon_file(f) for f in status_data["media_attachments"]] + + # Extract plain text from HTML content + content = status_data.get("content", "") + # Basic HTML stripping - in production you might want to use a proper HTML parser + import re + plain_text = re.sub(r'<[^>]+>', '', content) if content else None + + return FediversePost( + id=str(status_data.get("id", "")), + text=plain_text, + user=self._convert_mastodon_user(status_data.get("account", {})), + visibility=self._convert_mastodon_visibility(status_data.get("visibility", "public")), + created_at=status_data.get("created_at"), + files=files, + reply_to_id=str(status_data["in_reply_to_id"]) if status_data.get("in_reply_to_id") else None + ) + + def _convert_mastodon_notification(self, notification_data: Dict[str, Any]) -> FediverseNotification: + """Convert Mastodon/Pleroma notification data to FediverseNotification""" + post = None + if notification_data.get("status"): + post = self._convert_mastodon_status(notification_data["status"]) + + return FediverseNotification( + id=str(notification_data.get("id", "")), + type=self._convert_mastodon_notification_type(notification_data.get("type", "")), + user=self._convert_mastodon_user(notification_data.get("account", {})), + post=post, + created_at=notification_data.get("created_at") + ) + + def get_notifications(self, since_id: Optional[str] = None) -> List[FediverseNotification]: + """Get notifications from Pleroma instance""" + params = {} + if since_id: + params["since_id"] = since_id + + notifications = self.client.notifications(**params) + return [self._convert_mastodon_notification(notif) for notif in notifications] + + def create_post( + self, + text: str, + reply_to_id: Optional[str] = None, + visibility: Visibility = Visibility.HOME, + file_ids: Optional[List[str]] = None, + visible_user_ids: Optional[List[str]] = None + ) -> str: + """Create a post on Pleroma instance""" + params = { + "status": text, + "visibility": self._convert_to_mastodon_visibility(visibility) + } + + if reply_to_id: + params["in_reply_to_id"] = reply_to_id + + if file_ids: + params["media_ids"] = file_ids + + # Note: Pleroma/Mastodon doesn't have direct equivalent to visible_user_ids + # For direct messages, you typically mention users in the status text + + response = self.client.status_post(**params) + return str(response.get("id", "")) + + def get_post_by_id(self, post_id: str) -> Optional[FediversePost]: + """Get a specific post by ID from Pleroma instance""" + try: + status = self.client.status(post_id) + return self._convert_mastodon_status(status) + except Exception: + return None \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 1db6f9b..3d237b4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,3 +6,4 @@ Jinja2==3.1.6 MarkupSafe==3.0.2 Werkzeug==3.1.3 Misskey.py==4.1.0 +Mastodon.py==1.8.1 From a47530180d3c074131a644015e2df1a6a11dafed Mon Sep 17 00:00:00 2001 From: Moon Date: Thu, 12 Jun 2025 11:08:00 +0900 Subject: [PATCH 40/67] first whack at file upload --- bot/fediverse_service.py | 19 ++++++++++++++++++- bot/misskey_service.py | 16 ++++++++++++++-- bot/pleroma_service.py | 12 ++++++++++-- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/bot/fediverse_service.py b/bot/fediverse_service.py index 2d12d89..d4e32fe 100644 --- a/bot/fediverse_service.py +++ b/bot/fediverse_service.py @@ -1,5 +1,5 @@ from abc import ABC, abstractmethod -from typing import List, Optional +from typing import List, Optional, Union, BinaryIO from fediverse_types import FediverseNotification, FediversePost, Visibility @@ -54,4 +54,21 @@ class FediverseService(ABC): Returns: FediversePost object if found, None otherwise """ + pass + + @abstractmethod + def upload_file(self, file_data: Union[BinaryIO, bytes], filename: Optional[str] = None) -> str: + """ + Upload a file to the Fediverse instance. + + Args: + file_data: File data as binary stream or bytes + filename: Optional filename for the uploaded file + + Returns: + File ID that can be used in posts + + Raises: + RuntimeError: If file upload fails + """ pass \ No newline at end of file diff --git a/bot/misskey_service.py b/bot/misskey_service.py index 845ed27..e8bd396 100644 --- a/bot/misskey_service.py +++ b/bot/misskey_service.py @@ -1,5 +1,5 @@ import misskey -from typing import List, Optional, Dict, Any +from typing import List, Optional, Dict, Any, Union, BinaryIO from fediverse_service import FediverseService from fediverse_types import ( FediverseNotification, FediversePost, FediverseUser, FediverseFile, @@ -138,4 +138,16 @@ class MisskeyService(FediverseService): note = self.client.notes_show(noteId=post_id) return self._convert_misskey_post(note) except Exception: - return None \ No newline at end of file + return None + + def upload_file(self, file_data: Union[BinaryIO, bytes], filename: Optional[str] = None) -> str: + """Upload a file to Misskey Drive""" + try: + from misskey.exceptions import MisskeyAPIException + + media = self.client.drive_files_create(file_data) + return media["id"] + except MisskeyAPIException as e: + raise RuntimeError(f"Failed to upload file to Misskey Drive: {e}") from e + except Exception as e: + raise RuntimeError(f"Unexpected error during file upload: {e}") from e \ No newline at end of file diff --git a/bot/pleroma_service.py b/bot/pleroma_service.py index 1e53cd7..7333df0 100644 --- a/bot/pleroma_service.py +++ b/bot/pleroma_service.py @@ -1,5 +1,5 @@ from mastodon import Mastodon -from typing import List, Optional, Dict, Any +from typing import List, Optional, Dict, Any, Union, BinaryIO from fediverse_service import FediverseService from fediverse_types import ( FediverseNotification, FediversePost, FediverseUser, FediverseFile, @@ -152,4 +152,12 @@ class PleromaService(FediverseService): status = self.client.status(post_id) return self._convert_mastodon_status(status) except Exception: - return None \ No newline at end of file + return None + + def upload_file(self, file_data: Union[BinaryIO, bytes], filename: Optional[str] = None) -> str: + """Upload a file to Pleroma instance""" + try: + media = self.client.media_post(file_data, mime_type=None, description=filename) + return str(media["id"]) + except Exception as e: + raise RuntimeError(f"Failed to upload file to Pleroma: {e}") from e \ No newline at end of file From fe8e7d246f35f4a632662daea016027530188b3a Mon Sep 17 00:00:00 2001 From: Moon Date: Thu, 12 Jun 2025 11:10:18 +0900 Subject: [PATCH 41/67] actually use the abstracted type not just the id --- bot/fediverse_service.py | 6 +++--- bot/misskey_service.py | 4 ++-- bot/pleroma_service.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bot/fediverse_service.py b/bot/fediverse_service.py index d4e32fe..1292d63 100644 --- a/bot/fediverse_service.py +++ b/bot/fediverse_service.py @@ -1,6 +1,6 @@ from abc import ABC, abstractmethod from typing import List, Optional, Union, BinaryIO -from fediverse_types import FediverseNotification, FediversePost, Visibility +from fediverse_types import FediverseNotification, FediversePost, FediverseFile, Visibility class FediverseService(ABC): @@ -57,7 +57,7 @@ class FediverseService(ABC): pass @abstractmethod - def upload_file(self, file_data: Union[BinaryIO, bytes], filename: Optional[str] = None) -> str: + def upload_file(self, file_data: Union[BinaryIO, bytes], filename: Optional[str] = None) -> FediverseFile: """ Upload a file to the Fediverse instance. @@ -66,7 +66,7 @@ class FediverseService(ABC): filename: Optional filename for the uploaded file Returns: - File ID that can be used in posts + FediverseFile object with ID, URL, and other metadata Raises: RuntimeError: If file upload fails diff --git a/bot/misskey_service.py b/bot/misskey_service.py index e8bd396..3a16cd4 100644 --- a/bot/misskey_service.py +++ b/bot/misskey_service.py @@ -140,13 +140,13 @@ class MisskeyService(FediverseService): except Exception: return None - def upload_file(self, file_data: Union[BinaryIO, bytes], filename: Optional[str] = None) -> str: + def upload_file(self, file_data: Union[BinaryIO, bytes], filename: Optional[str] = None) -> FediverseFile: """Upload a file to Misskey Drive""" try: from misskey.exceptions import MisskeyAPIException media = self.client.drive_files_create(file_data) - return media["id"] + return self._convert_misskey_file(media) except MisskeyAPIException as e: raise RuntimeError(f"Failed to upload file to Misskey Drive: {e}") from e except Exception as e: diff --git a/bot/pleroma_service.py b/bot/pleroma_service.py index 7333df0..753b1dc 100644 --- a/bot/pleroma_service.py +++ b/bot/pleroma_service.py @@ -154,10 +154,10 @@ class PleromaService(FediverseService): except Exception: return None - def upload_file(self, file_data: Union[BinaryIO, bytes], filename: Optional[str] = None) -> str: + def upload_file(self, file_data: Union[BinaryIO, bytes], filename: Optional[str] = None) -> FediverseFile: """Upload a file to Pleroma instance""" try: media = self.client.media_post(file_data, mime_type=None, description=filename) - return str(media["id"]) + return self._convert_mastodon_file(media) except Exception as e: raise RuntimeError(f"Failed to upload file to Pleroma: {e}") from e \ No newline at end of file From dac05a3ed81b8fe01d6ea1231b2e174d03566886 Mon Sep 17 00:00:00 2001 From: Moon Date: Thu, 12 Jun 2025 11:22:20 +0900 Subject: [PATCH 42/67] completely untested refactor. bug fixes to come later. --- bot/add_character.py | 74 ++++++++++++++++++++++--------------------- bot/bot_app.py | 75 ++++++++++++++++++++++++++++++++++++-------- bot/parsing.py | 68 ++++++++++++++++++++++++++++----------- bot/response.py | 5 +-- 4 files changed, 153 insertions(+), 69 deletions(-) diff --git a/bot/add_character.py b/bot/add_character.py index 18b0f98..7590c1b 100644 --- a/bot/add_character.py +++ b/bot/add_character.py @@ -1,32 +1,25 @@ import requests -from misskey.exceptions import MisskeyAPIException -from client import client_connection -from db_utils import insert_character -from custom_types import Character +from fediverse_factory import get_fediverse_service +from db_utils import get_db_connection from config import RARITY_TO_WEIGHT - -def add_character( - name: str, - rarity: int, - image_url: str) -> tuple[int, str]: - ''' - Adds a character to the database, uploading the image from a public URL to - the bot's Misskey Drive. +def add_character(name: str, rarity: int, weight: float, image_url: str) -> tuple[int, str]: + """ + Adds a character to the database, uploading the image from a public URL to the Fediverse instance. Args: name (str): Character name. rarity (int): Character rarity (e.g., 1-5). - image_url (str): Public URL of the image from the post (e.g., from - note['files'][i]['url']). + weight (float): Pull weight (e.g., 0.02). + image_url (str): Public URL of the image from the post. Returns: - tuple[int, str]: Character ID and bot's Drive file_id. + tuple[int, str]: Character ID and file_id. Raises: ValueError: If inputs are invalid. RuntimeError: If image download/upload or database operation fails. - ''' + """ stripped_name = name.strip() @@ -40,25 +33,34 @@ def add_character( if not image_url: raise ValueError('Image URL must be provided.') - # Download image - response = requests.get(image_url, stream=True, timeout=30) - if response.status_code != 200: - raise RuntimeError(f'Failed to download image from {image_url}') - - # Upload to bot's Drive - mk = client_connection() try: - media = mk.drive_files_create(response.raw) - file_id = media['id'] - except MisskeyAPIException as e: - raise RuntimeError(f'Failed to upload image to bot\'s Drive: {e}')\ - from e + # Download image + response = requests.get(image_url, stream=True, timeout=30) + if response.status_code != 200: + raise RuntimeError(f"Failed to download image from {image_url}") - # Insert into database - character_id = insert_character( - stripped_name, - rarity, - RARITY_TO_WEIGHT[rarity], - file_id - ) - return character_id, file_id + # Upload to Fediverse instance + fediverse_service = get_fediverse_service() + try: + uploaded_file = fediverse_service.upload_file(response.raw) + file_id = uploaded_file.id + except RuntimeError as e: + raise RuntimeError(f"Failed to upload image: {e}") from e + + # Insert into database + conn = get_db_connection() + cur = conn.cursor() + cur.execute( + 'INSERT INTO characters (name, rarity, weight, file_id) VALUES (?, ?, ?, ?)', + (stripped_name, rarity, float(weight), file_id) + ) + conn.commit() + character_id = cur.lastrowid + + return character_id, file_id + + except Exception as e: + raise + finally: + if 'conn' in locals(): + conn.close() diff --git a/bot/bot_app.py b/bot/bot_app.py index 825695e..fc8a66a 100644 --- a/bot/bot_app.py +++ b/bot/bot_app.py @@ -1,18 +1,67 @@ import time -import misskey as misskey -from client import client_connection -import db_utils as db +import traceback +from parsing import parse_notification +from db_utils import get_config, set_config +from fediverse_factory import get_fediverse_service +import config -from config import NOTIFICATION_POLL_INTERVAL -from notification import process_notifications - -if __name__ == '__main__': - # Initialize the Misskey client - client = client_connection() - # Connect to DB - db.connect() +def stream_notifications(): + # Initialize the Fediverse service + fediverse_service = get_fediverse_service() + + # Get the last seen notification ID from the database + last_seen_id = get_config("last_seen_notif_id") + whitelisted_instances = getattr(config, 'WHITELISTED_INSTANCES', []) print('Listening for notifications...') while True: - if not process_notifications(client): - time.sleep(NOTIFICATION_POLL_INTERVAL) + try: + # Get notifications from the fediverse service + notifications = fediverse_service.get_notifications(since_id=last_seen_id) + + if notifications: + new_last_seen_id = last_seen_id + + for notification in notifications: + notif_id = notification.id + + # Skip old or same ID notifications + if last_seen_id is not None and notif_id <= last_seen_id: + continue + + username = notification.user.username + host = notification.user.host + + instance = host if host else "local" + + if instance in whitelisted_instances or instance == "local": + note = notification.post.text if notification.post else "" + notif_type = notification.type.value + + print(f"📨 [{notif_type}] from @{username}@{instance}") + print(f"💬 {note}") + print("-" * 30) + + # 🧠 Send to the parser + parse_notification(notification, fediverse_service) + + else: + print(f"⚠️ Blocked notification from untrusted instance: {host}") + + # Update only if this notif_id is greater + if new_last_seen_id is None or notif_id > new_last_seen_id: + new_last_seen_id = notif_id + + # Save the latest seen ID + if new_last_seen_id and new_last_seen_id != last_seen_id: + set_config("last_seen_notif_id", new_last_seen_id) + last_seen_id = new_last_seen_id + + time.sleep(5) + + except Exception as e: + print(f"An exception has occured: {e}\n{traceback.format_exc()}") + time.sleep(5) + +if __name__ == "__main__": + stream_notifications() diff --git a/bot/parsing.py b/bot/parsing.py index eece077..66d6ed8 100644 --- a/bot/parsing.py +++ b/bot/parsing.py @@ -1,27 +1,38 @@ import re -from typing import Dict, Any - -import misskey - import config +from response import generate_response +from fediverse_factory import get_fediverse_service +from fediverse_types import FediverseNotification, NotificationType, Visibility from custom_types import ParsedNotification +def parse_notification(notification: FediverseNotification, fediverse_service=None): + '''Parses any notifications received by the bot and sends any commands to + generate_response()''' + + if fediverse_service is None: + fediverse_service = get_fediverse_service() -def parse_notification( - notification: Dict[str, Any], - client: misskey.Misskey) -> ParsedNotification | None: - '''Parses any notifications received by the bot''' + # We get the type of notification to filter the ones that we actually want + # to parse + if notification.type not in (NotificationType.MENTION, NotificationType.REPLY): + return # Ignore anything that isn't a mention + + # Return early if no post attached + if not notification.post: + return + + # We want the visibility to be related to the type that was received (so if + # people don't want to dump a bunch of notes on home they don't have to) + if notification.post.visibility != Visibility.SPECIFIED: + visibility = Visibility.HOME + else: + visibility = Visibility.SPECIFIED # Get the full Activitypub ID of the user - user = notification.get("user", {}) - username = user.get("username", "unknown") - host = user.get("host") - # Local users may not have a hostname attached - full_user = f"@{username}" if not host else f"@{username}@{host}" + full_user = notification.user.full_handle - note_obj = notification.get("note", {}) - note_text = note_obj.get("text") - note_id = note_obj.get("id") + note_text = notification.post.text + note_id = notification.post.id note = note_text.strip().lower() if note_text else "" @@ -44,9 +55,30 @@ def parse_notification( command = parts[0].lower() if parts else None arguments = parts[1:] if len(parts) > 1 else [] - return { + # Create ParsedNotification object for the new response system + parsed_notification: ParsedNotification = { 'author': full_user, 'command': command, 'arguments': arguments, - 'note_obj': note_obj + 'note_obj': { + 'id': note_id, + 'text': note_text, + 'files': [{'url': f.url} for f in notification.post.files] if notification.post.files else [] + } } + + # Generate response using the new system + response = generate_response(parsed_notification) + if not response: + return + + # Handle attachment URLs (convert to file IDs if needed) + file_ids = response['attachment_urls'] if response['attachment_urls'] else None + + fediverse_service.create_post( + text=response['message'], + reply_to_id=note_id, + visibility=visibility, + file_ids=file_ids + #visible_user_ids=[] #todo: write actual visible users ids so pleromers can use the bot privately + ) diff --git a/bot/response.py b/bot/response.py index 3fde3ed..5632e2e 100644 --- a/bot/response.py +++ b/bot/response.py @@ -103,10 +103,10 @@ dumbass.', 'attachment_urls': None } - if len(arguments) != 2: + if len(arguments) != 3: return { 'message': f'{author} Please specify the following attributes \ -in order: name, rarity', +in order: name, rarity, weight', 'attachment_urls': None } @@ -126,6 +126,7 @@ must be a decimal value between 0.0 and 1.0', character_id, file_id = add_character( name=arguments[0], rarity=int(arguments[1]), + weight=float(arguments[2]), image_url=image_url ) return { From b2ca6dd59ad83f85018dfd416c0efd43845931f5 Mon Sep 17 00:00:00 2001 From: Moon Date: Thu, 12 Jun 2025 11:26:10 +0900 Subject: [PATCH 43/67] documentation update for configurable backends --- example_config.ini | 2 ++ readme.md | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/example_config.ini b/example_config.ini index af7e0f2..d4ba8bf 100644 --- a/example_config.ini +++ b/example_config.ini @@ -33,3 +33,5 @@ User = @bot@example.tld ; Generate one by going to Settings > API > Generate access token Token = abcdefghijklmnopqrstuvwxyz012345 +; Instance type - either "misskey" or "pleroma" +InstanceType = misskey diff --git a/readme.md b/readme.md index 437b09f..6ae910c 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ # Kemoverse -A gacha-style bot for the Fediverse built with Python. Users can roll for characters, trade, duel, and perhaps engage with popularity-based mechanics. Currently designed for use with Misskey. Name comes from Kemonomimi and Fediverse. +A gacha-style bot for the Fediverse built with Python. Users can roll for characters, trade, duel, and perhaps engage with popularity-based mechanics. Supports both Misskey and Pleroma instances. Name comes from Kemonomimi and Fediverse.

Fediverse Gacha Bot Logo

@@ -47,13 +47,13 @@ A gacha-style bot for the Fediverse built with Python. Users can roll for charac - 🌐 Web app to generate cards from images ### 🌍 Fediverse Support -✅ Anyone from the fediverse can play, but the server only works using a Misskey instance. Want to rewrite the program in Elixir for Pleroma? Let us know! +✅ Anyone from the fediverse can play! The bot supports both Misskey and Pleroma instances through configurable backends. ## 🗃️ Tech Stack - Python (3.12+) - SQLite -- Fediverse API integration (via Misskey endpoints) +- Fediverse API integration (Misskey and Pleroma support) - Flask - Modular DB design for extensibility @@ -65,12 +65,12 @@ The bot is meant to feel *light, fun, and competitive*. Mixing social, gacha and flowchart TD subgraph Player Interaction - A1[Misskey bot] + A1[Fediverse bot] A2[Web] end - subgraph Misskey - B1[Misskey instance] + subgraph Fediverse + B1[Fediverse instance] end subgraph Bot @@ -78,7 +78,7 @@ flowchart TD C2[Notification parser] C3[Gacha roll logic] C4[Database interface] - C5[Misskey API poster] + C5[Fediverse API poster] end subgraph Website From 91376c0ebaad1338d4ffaee37915549e9331d7e5 Mon Sep 17 00:00:00 2001 From: Moon Date: Thu, 12 Jun 2025 12:43:42 +0900 Subject: [PATCH 44/67] works now but may need to revert file upload change --- bot/config.py | 3 ++ bot/pleroma_service.py | 66 ++++++++++++++++++++++++++++++++++++++++-- example_config.ini | 3 ++ web/app.py | 10 +++++-- 4 files changed, 78 insertions(+), 4 deletions(-) diff --git a/bot/config.py b/bot/config.py index 5b5848f..2f9f4a3 100644 --- a/bot/config.py +++ b/bot/config.py @@ -51,6 +51,9 @@ if instance_type not in ('misskey', 'pleroma'): INSTANCE_TYPE = instance_type +# Web server port +WEB_PORT = config['application'].getint('WebPort', 5000) + # Extra stuff for control of the bot # TODO: move this to db diff --git a/bot/pleroma_service.py b/bot/pleroma_service.py index 753b1dc..4ec3496 100644 --- a/bot/pleroma_service.py +++ b/bot/pleroma_service.py @@ -1,5 +1,7 @@ from mastodon import Mastodon from typing import List, Optional, Dict, Any, Union, BinaryIO +import mimetypes +import io from fediverse_service import FediverseService from fediverse_types import ( FediverseNotification, FediversePost, FediverseUser, FediverseFile, @@ -157,7 +159,67 @@ class PleromaService(FediverseService): def upload_file(self, file_data: Union[BinaryIO, bytes], filename: Optional[str] = None) -> FediverseFile: """Upload a file to Pleroma instance""" try: - media = self.client.media_post(file_data, mime_type=None, description=filename) - return self._convert_mastodon_file(media) + import requests + + # Convert file_data to bytes if it's a stream + if hasattr(file_data, 'read'): + file_bytes = file_data.read() + else: + file_bytes = file_data + + # Determine mime type from file header + mime_type = 'image/jpeg' # default + if file_bytes.startswith(b'\xff\xd8\xff'): + mime_type = 'image/jpeg' + ext = '.jpg' + elif file_bytes.startswith(b'\x89PNG\r\n\x1a\n'): + mime_type = 'image/png' + ext = '.png' + elif file_bytes.startswith(b'GIF8'): + mime_type = 'image/gif' + ext = '.gif' + elif file_bytes.startswith(b'RIFF') and b'WEBP' in file_bytes[:12]: + mime_type = 'image/webp' + ext = '.webp' + else: + ext = '.jpg' + + # Create a filename if none provided + if not filename: + filename = f"upload{ext}" + + # Direct HTTP POST to /api/v1/media with headers matching browser behavior + headers = { + 'Authorization': f'Bearer {self.client.access_token}', + 'Accept': '*/*', + 'Cache-Control': 'no-cache', + 'Pragma': 'no-cache', + 'User-Agent': 'Kemoverse-Bot/1.0' + } + + # Use files parameter to let requests handle multipart/form-data and content-type + files = { + 'file': (filename, file_bytes, mime_type) + } + + url = f"{self.client.api_base_url}/api/v1/media" + + # Debug logging + print(f"DEBUG: Making POST request to: {url}") + print(f"DEBUG: Headers: {headers}") + print(f"DEBUG: Files keys: {list(files.keys())}") + + response = requests.post(url, headers=headers, files=files) + + print(f"DEBUG: Response status: {response.status_code}") + print(f"DEBUG: Response headers: {dict(response.headers)}") + print(f"DEBUG: Request method was: {response.request.method}") + + if response.status_code in (200, 201): + media = response.json() + return self._convert_mastodon_file(media) + else: + raise Exception(f"Upload failed with {response.status_code}: {response.text}") + except Exception as e: raise RuntimeError(f"Failed to upload file to Pleroma: {e}") from e \ No newline at end of file diff --git a/example_config.ini b/example_config.ini index d4ba8bf..ec57058 100644 --- a/example_config.ini +++ b/example_config.ini @@ -35,3 +35,6 @@ Token = abcdefghijklmnopqrstuvwxyz012345 ; Instance type - either "misskey" or "pleroma" InstanceType = misskey + +; Web server port (default: 5000) +WebPort = 5000 diff --git a/web/app.py b/web/app.py index 61ed38f..9837741 100644 --- a/web/app.py +++ b/web/app.py @@ -1,10 +1,16 @@ import sqlite3 +import sys +import os + +# Add bot directory to path to import config +sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'bot')) +import config from flask import Flask, render_template, abort from werkzeug.exceptions import HTTPException app = Flask(__name__) -DB_PATH = "./gacha_game.db" # Adjust path if needed +DB_PATH = config.DB_PATH def get_db_connection(): conn = sqlite3.connect(DB_PATH) @@ -68,4 +74,4 @@ def submit_character(): if __name__ == '__main__': - app.run(host='0.0.0.0', port=5000, debug=True) + app.run(host='0.0.0.0', port=config.WEB_PORT, debug=True) From 89ae8a7290b1bdb82a1a27a1def489a50c4d2f70 Mon Sep 17 00:00:00 2001 From: Moon Date: Thu, 12 Jun 2025 12:47:51 +0900 Subject: [PATCH 45/67] back to using mastodon.py --- bot/pleroma_service.py | 72 ++++++++++++------------------------------ 1 file changed, 20 insertions(+), 52 deletions(-) diff --git a/bot/pleroma_service.py b/bot/pleroma_service.py index 4ec3496..d7c52b6 100644 --- a/bot/pleroma_service.py +++ b/bot/pleroma_service.py @@ -159,67 +159,35 @@ class PleromaService(FediverseService): def upload_file(self, file_data: Union[BinaryIO, bytes], filename: Optional[str] = None) -> FediverseFile: """Upload a file to Pleroma instance""" try: - import requests - - # Convert file_data to bytes if it's a stream + # Convert file_data to bytes if it's a stream for MIME detection if hasattr(file_data, 'read'): - file_bytes = file_data.read() + # Check if we can seek back + try: + current_pos = file_data.tell() + header = file_data.read(8) + file_data.seek(current_pos) + except (io.UnsupportedOperation, OSError): + # Non-seekable stream, read all data + remaining_data = file_data.read() + file_bytes = header + remaining_data + file_data = io.BytesIO(file_bytes) + header = file_bytes[:8] else: - file_bytes = file_data + header = file_data[:8] if len(file_data) >= 8 else file_data # Determine mime type from file header - mime_type = 'image/jpeg' # default - if file_bytes.startswith(b'\xff\xd8\xff'): + if header.startswith(b'\xff\xd8\xff'): mime_type = 'image/jpeg' - ext = '.jpg' - elif file_bytes.startswith(b'\x89PNG\r\n\x1a\n'): + elif header.startswith(b'\x89PNG\r\n\x1a\n'): mime_type = 'image/png' - ext = '.png' - elif file_bytes.startswith(b'GIF8'): + elif header.startswith(b'GIF8'): mime_type = 'image/gif' - ext = '.gif' - elif file_bytes.startswith(b'RIFF') and b'WEBP' in file_bytes[:12]: + elif header.startswith(b'RIFF') and len(header) >= 8 and b'WEBP' in header: mime_type = 'image/webp' - ext = '.webp' else: - ext = '.jpg' + mime_type = 'image/jpeg' # Default fallback - # Create a filename if none provided - if not filename: - filename = f"upload{ext}" - - # Direct HTTP POST to /api/v1/media with headers matching browser behavior - headers = { - 'Authorization': f'Bearer {self.client.access_token}', - 'Accept': '*/*', - 'Cache-Control': 'no-cache', - 'Pragma': 'no-cache', - 'User-Agent': 'Kemoverse-Bot/1.0' - } - - # Use files parameter to let requests handle multipart/form-data and content-type - files = { - 'file': (filename, file_bytes, mime_type) - } - - url = f"{self.client.api_base_url}/api/v1/media" - - # Debug logging - print(f"DEBUG: Making POST request to: {url}") - print(f"DEBUG: Headers: {headers}") - print(f"DEBUG: Files keys: {list(files.keys())}") - - response = requests.post(url, headers=headers, files=files) - - print(f"DEBUG: Response status: {response.status_code}") - print(f"DEBUG: Response headers: {dict(response.headers)}") - print(f"DEBUG: Request method was: {response.request.method}") - - if response.status_code in (200, 201): - media = response.json() - return self._convert_mastodon_file(media) - else: - raise Exception(f"Upload failed with {response.status_code}: {response.text}") - + media = self.client.media_post(file_data, mime_type=mime_type, description=filename) + return self._convert_mastodon_file(media) except Exception as e: raise RuntimeError(f"Failed to upload file to Pleroma: {e}") from e \ No newline at end of file From 67b4d949fdee156a0529ae717d8d105b869e99b2 Mon Sep 17 00:00:00 2001 From: Moon Date: Thu, 12 Jun 2025 12:53:37 +0900 Subject: [PATCH 46/67] use a library for content type detection instead of handrolled --- bot/pleroma_service.py | 33 ++++++++++++++------------------- requirements.txt | 1 + 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/bot/pleroma_service.py b/bot/pleroma_service.py index d7c52b6..21320d1 100644 --- a/bot/pleroma_service.py +++ b/bot/pleroma_service.py @@ -1,7 +1,7 @@ from mastodon import Mastodon from typing import List, Optional, Dict, Any, Union, BinaryIO -import mimetypes import io +import filetype from fediverse_service import FediverseService from fediverse_types import ( FediverseNotification, FediversePost, FediverseUser, FediverseFile, @@ -159,33 +159,28 @@ class PleromaService(FediverseService): def upload_file(self, file_data: Union[BinaryIO, bytes], filename: Optional[str] = None) -> FediverseFile: """Upload a file to Pleroma instance""" try: - # Convert file_data to bytes if it's a stream for MIME detection + # Convert file_data to bytes for MIME detection if hasattr(file_data, 'read'): # Check if we can seek back try: current_pos = file_data.tell() - header = file_data.read(8) + file_bytes = file_data.read() file_data.seek(current_pos) - except (io.UnsupportedOperation, OSError): - # Non-seekable stream, read all data - remaining_data = file_data.read() - file_bytes = header + remaining_data file_data = io.BytesIO(file_bytes) - header = file_bytes[:8] + except (io.UnsupportedOperation, OSError): + # Non-seekable stream, already read all data + file_data = io.BytesIO(file_bytes) else: - header = file_data[:8] if len(file_data) >= 8 else file_data + file_bytes = file_data + file_data = io.BytesIO(file_bytes) - # Determine mime type from file header - if header.startswith(b'\xff\xd8\xff'): - mime_type = 'image/jpeg' - elif header.startswith(b'\x89PNG\r\n\x1a\n'): - mime_type = 'image/png' - elif header.startswith(b'GIF8'): - mime_type = 'image/gif' - elif header.startswith(b'RIFF') and len(header) >= 8 and b'WEBP' in header: - mime_type = 'image/webp' + # Use filetype library for robust MIME detection + kind = filetype.guess(file_bytes) + if kind is not None: + mime_type = kind.mime else: - mime_type = 'image/jpeg' # Default fallback + # Fallback to image/jpeg if detection fails + mime_type = 'image/jpeg' media = self.client.media_post(file_data, mime_type=mime_type, description=filename) return self._convert_mastodon_file(media) diff --git a/requirements.txt b/requirements.txt index 3d237b4..4a749b2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,3 +7,4 @@ MarkupSafe==3.0.2 Werkzeug==3.1.3 Misskey.py==4.1.0 Mastodon.py==1.8.1 +filetype==1.2.0 From 8918b5205da5b6bc4c5d257950db5279c161d69f Mon Sep 17 00:00:00 2001 From: Moon Date: Thu, 12 Jun 2025 13:25:04 +0900 Subject: [PATCH 47/67] named some damn properties wrong --- .gitignore | 2 +- bot/bot_app.py | 2 +- bot/config.py | 4 ++++ bot/misskey_service.py | 13 ++++++++----- example_config.ini | 4 ++++ 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index e5543ec..a05fd62 100644 --- a/.gitignore +++ b/.gitignore @@ -186,4 +186,4 @@ gacha_game*.db gacha_game*.db.* config*.ini -.idea \ No newline at end of file +.idea diff --git a/bot/bot_app.py b/bot/bot_app.py index fc8a66a..f4bc1e0 100644 --- a/bot/bot_app.py +++ b/bot/bot_app.py @@ -11,7 +11,7 @@ def stream_notifications(): # Get the last seen notification ID from the database last_seen_id = get_config("last_seen_notif_id") - whitelisted_instances = getattr(config, 'WHITELISTED_INSTANCES', []) + whitelisted_instances = getattr(config, 'TRUSTED_INSTANCES', []) print('Listening for notifications...') while True: diff --git a/bot/config.py b/bot/config.py index 2f9f4a3..29a23a2 100644 --- a/bot/config.py +++ b/bot/config.py @@ -54,6 +54,10 @@ INSTANCE_TYPE = instance_type # Web server port WEB_PORT = config['application'].getint('WebPort', 5000) +# Trusted instances +trusted_instances_str = config['application'].get('TrustedInstances', '') +TRUSTED_INSTANCES = [instance.strip() for instance in trusted_instances_str.split(',') if instance.strip()] + # Extra stuff for control of the bot # TODO: move this to db diff --git a/bot/misskey_service.py b/bot/misskey_service.py index 3a16cd4..510b32b 100644 --- a/bot/misskey_service.py +++ b/bot/misskey_service.py @@ -99,9 +99,12 @@ class MisskeyService(FediverseService): def get_notifications(self, since_id: Optional[str] = None) -> List[FediverseNotification]: """Get notifications from Misskey instance""" - params = {} + params = { + 'include_types': ['mention', 'reply'], + 'limit': 50 + } if since_id: - params["sinceId"] = since_id + params["since_id"] = since_id notifications = self.client.i_notifications(**params) return [self._convert_misskey_notification(notif) for notif in notifications] @@ -121,13 +124,13 @@ class MisskeyService(FediverseService): } if reply_to_id: - params["replyId"] = reply_to_id + params["reply_id"] = reply_to_id if file_ids: - params["fileIds"] = file_ids + params["file_ids"] = file_ids if visible_user_ids and visibility == Visibility.SPECIFIED: - params["visibleUserIds"] = visible_user_ids + params["visible_user_ids"] = visible_user_ids response = self.client.notes_create(**params) return response.get("createdNote", {}).get("id", "") diff --git a/example_config.ini b/example_config.ini index ec57058..58cf483 100644 --- a/example_config.ini +++ b/example_config.ini @@ -38,3 +38,7 @@ InstanceType = misskey ; Web server port (default: 5000) WebPort = 5000 + +; Comma-separated list of trusted fediverse instances (leave empty to allow only local users) +; Example: TrustedInstances = mastodon.social,misskey.io,pleroma.example.com +TrustedInstances = From 298d7fda72773ec7735c4bb3473584673bd1c2da Mon Sep 17 00:00:00 2001 From: Moon Date: Thu, 12 Jun 2025 13:29:12 +0900 Subject: [PATCH 48/67] rm needless file --- CLAUDE.md | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 CLAUDE.md diff --git a/CLAUDE.md b/CLAUDE.md deleted file mode 100644 index 2e60baf..0000000 --- a/CLAUDE.md +++ /dev/null @@ -1,31 +0,0 @@ -# Kemoverse - Fediverse Gacha Bot - -A Python-based gacha-style bot for the Fediverse that interfaces with either Misskey or Pleroma instances. - -## Project Overview -- **Language**: Python 3.11+ -- **Framework**: Flask for web interface -- **Database**: SQLite -- **Fediverse Support**: Configurable for Misskey or Pleroma instances -- **API Integration**: Uses Misskey.py library for Fediverse API communication - -## Key Components -- `bot/` - Core bot functionality including gacha mechanics, character management, and API interactions -- `web/` - Flask web application for user interface and card management -- `db.py` - Database utilities and schema management -- `config.ini` - Instance configuration (API keys, instance URL, admin users) - -## Configuration -The bot is configured via `config.ini` to connect to either a Misskey or Pleroma Fediverse instance. Key settings include: -- Instance URL and API credentials -- Bot user account details -- Administrator user permissions -- Database location - -## Development Commands -- Install dependencies: `pip install -r requirements.txt` -- Run bot: `python dev_runner.py` -- Start web interface: `python web/app.py` - -## Testing -Run tests with appropriate Python testing framework (check for pytest, unittest, or similar in project). \ No newline at end of file From f70b2147cda9cbe0022bb7571e097e95af654f7d Mon Sep 17 00:00:00 2001 From: Moon Date: Fri, 13 Jun 2025 10:57:33 +0900 Subject: [PATCH 49/67] Remove legacy files that bypass FediverseService abstraction - Remove bot/client.py (replaced by fediverse factory) - Remove bot/notification.py (replaced by bot_app.py) - All functionality now properly uses FediverseService abstraction --- bot/client.py | 6 --- bot/notification.py | 122 -------------------------------------------- 2 files changed, 128 deletions(-) delete mode 100644 bot/client.py delete mode 100644 bot/notification.py diff --git a/bot/client.py b/bot/client.py deleted file mode 100644 index 57f9f4e..0000000 --- a/bot/client.py +++ /dev/null @@ -1,6 +0,0 @@ -import misskey -import config - - -def client_connection() -> misskey.Misskey: - return misskey.Misskey(address=config.INSTANCE, i=config.KEY) diff --git a/bot/notification.py b/bot/notification.py deleted file mode 100644 index 9427dbf..0000000 --- a/bot/notification.py +++ /dev/null @@ -1,122 +0,0 @@ -import traceback -from typing import Dict, Any - -import misskey -from misskey.exceptions import MisskeyAPIException - -from config import NOTIFICATION_BATCH_SIZE -from parsing import parse_notification -from db_utils import get_config, set_config -from response import generate_response -from custom_types import BotResponse - -# Define your whitelist -# TODO: move to config -WHITELISTED_INSTANCES: list[str] = [] - - -def process_notification( - client: misskey.Misskey, - notification: Dict[str, Any]) -> None: - '''Processes an individual notification''' - user = notification.get('user', {}) - username = user.get('username', 'unknown') - host = user.get('host') # None if local user - instance = host if host else 'local' - - if not (instance in WHITELISTED_INSTANCES or instance == 'local'): - print(f'⚠️ Blocked notification from untrusted instance: {instance}') - return - - # Copy visibility of the post that was received when replying (so if people - # don't want to dump a bunch of notes on home they don't have to) - visibility = notification['note']['visibility'] - if visibility != 'specified': - visibility = 'home' - - notif_type = notification.get('type', 'unknown') - notif_id = notification.get('id') - print(f'📨 <{notif_id}> [{notif_type}] from @{username}@{instance}') - - # 🧠 Send to the parser - parsed_notification = parse_notification(notification, client) - - if not parsed_notification: - return - - # Get the note Id to reply to - note_id = notification.get('note', {}).get('id') - - # Get the response - response: BotResponse | None = generate_response(parsed_notification) - - if not response: - return - - client.notes_create( - text=response['message'], - reply_id=note_id, - visibility=visibility, - file_ids=response['attachment_urls'] - # TODO: write actual visible users ids so pleromers can use the bot - # privately - # visible_user_ids=[] - ) - - -def process_notifications(client: misskey.Misskey) -> bool: - '''Processes a batch of unread notifications. Returns False if there are - no more notifications to process.''' - - last_seen_id = get_config('last_seen_notif_id') - # process_notification writes to last_seen_id, so make a copy - new_last_seen_id = last_seen_id - - try: - notifications = client.i_notifications( - # Fetch notifications we haven't seen yet. This option is a bit - # tempermental, sometimes it'll include since_id, sometimes it - # won't. We need to keep track of what notifications we've - # already processed. - since_id=last_seen_id, - # Let misskey handle the filtering - include_types=['mention', 'reply'], - # And handle the batch size while we're at it - limit=NOTIFICATION_BATCH_SIZE - ) - - # No notifications. Wait the poll period. - if not notifications: - return False - - # Iterate oldest to newest - for notification in notifications: - try: - # Skip if we've processed already - notif_id = notification.get('id', '') - if notif_id <= last_seen_id: - continue - - # Update new_last_seen_id and process - new_last_seen_id = notif_id - process_notification(client, notification) - - except Exception as e: - print(f'An exception has occured while processing a \ -notification: {e}') - print(traceback.format_exc()) - - # If we got as many notifications as we requested, there are probably - # more in the queue - return len(notifications) == NOTIFICATION_BATCH_SIZE - - except MisskeyAPIException as e: - print(f'An exception has occured while reading notifications: {e}\n') - print(traceback.format_exc()) - finally: - # Quality jank right here, but finally lets us update the last_seen_id - # even if we hit an exception or return early - if new_last_seen_id > last_seen_id: - set_config('last_seen_notif_id', new_last_seen_id) - - return False From 7b32ee7fcf42c2e5d6c9048664df7b26dee3c1bc Mon Sep 17 00:00:00 2001 From: Moon Date: Fri, 13 Jun 2025 11:23:34 +0900 Subject: [PATCH 50/67] had to change some things to get cursor for db working. --- bot/add_character.py | 14 ++++---------- bot/bot_app.py | 5 ++++- example_config.ini | 17 +++++++---------- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/bot/add_character.py b/bot/add_character.py index 7590c1b..55089fe 100644 --- a/bot/add_character.py +++ b/bot/add_character.py @@ -1,6 +1,6 @@ import requests from fediverse_factory import get_fediverse_service -from db_utils import get_db_connection +import db_utils from config import RARITY_TO_WEIGHT def add_character(name: str, rarity: int, weight: float, image_url: str) -> tuple[int, str]: @@ -47,20 +47,14 @@ def add_character(name: str, rarity: int, weight: float, image_url: str) -> tupl except RuntimeError as e: raise RuntimeError(f"Failed to upload image: {e}") from e - # Insert into database - conn = get_db_connection() - cur = conn.cursor() - cur.execute( + # Insert into database using the global connection pattern + db_utils.CURSOR.execute( 'INSERT INTO characters (name, rarity, weight, file_id) VALUES (?, ?, ?, ?)', (stripped_name, rarity, float(weight), file_id) ) - conn.commit() - character_id = cur.lastrowid + character_id = db_utils.CURSOR.lastrowid return character_id, file_id except Exception as e: raise - finally: - if 'conn' in locals(): - conn.close() diff --git a/bot/bot_app.py b/bot/bot_app.py index f4bc1e0..b4a95c8 100644 --- a/bot/bot_app.py +++ b/bot/bot_app.py @@ -1,11 +1,14 @@ import time import traceback from parsing import parse_notification -from db_utils import get_config, set_config +from db_utils import get_config, set_config, connect from fediverse_factory import get_fediverse_service import config def stream_notifications(): + # Initialize database connection + connect() + # Initialize the Fediverse service fediverse_service = get_fediverse_service() diff --git a/example_config.ini b/example_config.ini index 58cf483..cb9aa89 100644 --- a/example_config.ini +++ b/example_config.ini @@ -5,6 +5,13 @@ DefaultAdmins = ['admin@example.tld'] ; SQLite Database location DatabaseLocation = ./gacha_game.db +; Instance type - either "misskey" or "pleroma" +InstanceType = misskey +; Web server port (default: 5000) +WebPort = 5000 +; Comma-separated list of trusted fediverse instances (leave empty to allow only local users) +; Example: TrustedInstances = mastodon.social,misskey.io,pleroma.example.com +TrustedInstances = [gacha] ; Number of seconds players have to wait between rolls @@ -32,13 +39,3 @@ User = @bot@example.tld ; API key for the bot ; Generate one by going to Settings > API > Generate access token Token = abcdefghijklmnopqrstuvwxyz012345 - -; Instance type - either "misskey" or "pleroma" -InstanceType = misskey - -; Web server port (default: 5000) -WebPort = 5000 - -; Comma-separated list of trusted fediverse instances (leave empty to allow only local users) -; Example: TrustedInstances = mastodon.social,misskey.io,pleroma.example.com -TrustedInstances = From 7161712f154ec37d4e7015691481b1bb91debd80 Mon Sep 17 00:00:00 2001 From: Moon Date: Fri, 13 Jun 2025 13:26:01 +0900 Subject: [PATCH 51/67] rm unused function that bypassed server abstraction --- bot/notification.py | 65 ++------------------------------------------- 1 file changed, 2 insertions(+), 63 deletions(-) diff --git a/bot/notification.py b/bot/notification.py index b69a496..ea544e2 100644 --- a/bot/notification.py +++ b/bot/notification.py @@ -1,9 +1,6 @@ -import traceback -from typing import Dict, Any - -from config import NOTIFICATION_BATCH_SIZE, USE_WHITELIST +from config import USE_WHITELIST from parsing import parse_notification -from db_utils import get_config, set_config, is_whitelisted, is_player_banned +from db_utils import is_whitelisted, is_player_banned from response import generate_response from custom_types import BotResponse from fediverse_factory import get_fediverse_service @@ -71,61 +68,3 @@ def process_fediverse_notification(notification: FediverseNotification, fedivers file_ids=file_ids # visible_user_ids=[] # TODO: write actual visible users ids so pleromers can use the bot privately ) - - -def process_notifications(client: misskey.Misskey) -> bool: - '''Processes a batch of unread notifications. Returns False if there are - no more notifications to process.''' - - last_seen_id = get_config('last_seen_notif_id') - # process_notification writes to last_seen_id, so make a copy - new_last_seen_id = last_seen_id - - try: - notifications = client.i_notifications( - # Fetch notifications we haven't seen yet. This option is a bit - # tempermental, sometimes it'll include since_id, sometimes it - # won't. We need to keep track of what notifications we've - # already processed. - since_id=last_seen_id, - # Let misskey handle the filtering - include_types=['mention', 'reply'], - # And handle the batch size while we're at it - limit=NOTIFICATION_BATCH_SIZE - ) - - # No notifications. Wait the poll period. - if not notifications: - return False - - # Iterate oldest to newest - for notification in notifications: - try: - # Skip if we've processed already - notif_id = notification.get('id', '') - if notif_id <= last_seen_id: - continue - - # Update new_last_seen_id and process - new_last_seen_id = notif_id - process_notification(client, notification) - - except Exception as e: - print(f'An exception has occured while processing a \ -notification: {e}') - print(traceback.format_exc()) - - # If we got as many notifications as we requested, there are probably - # more in the queue - return len(notifications) == NOTIFICATION_BATCH_SIZE - - except MisskeyAPIException as e: - print(f'An exception has occured while reading notifications: {e}\n') - print(traceback.format_exc()) - finally: - # Quality jank right here, but finally lets us update the last_seen_id - # even if we hit an exception or return early - if new_last_seen_id > last_seen_id: - set_config('last_seen_notif_id', new_last_seen_id) - - return False From a516a9b55a014fe41faaba2eaae85c053ccfec63 Mon Sep 17 00:00:00 2001 From: Moon Date: Fri, 13 Jun 2025 13:36:38 +0900 Subject: [PATCH 52/67] minor change to make testing easier. --- bot/fediverse_factory.py | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/bot/fediverse_factory.py b/bot/fediverse_factory.py index f2a9017..bee5f73 100644 --- a/bot/fediverse_factory.py +++ b/bot/fediverse_factory.py @@ -8,9 +8,13 @@ class FediverseServiceFactory: """Factory for creating FediverseService implementations based on configuration""" @staticmethod - def create_service() -> FediverseService: + def create_service(instance_type: str = None) -> FediverseService: """ - Create a FediverseService implementation based on the configured instance type. + Create a FediverseService implementation based on the instance type. + + Args: + instance_type: The type of instance ("misskey" or "pleroma"). + If None, reads from config.INSTANCE_TYPE Returns: FediverseService implementation (MisskeyService or PleromaService) @@ -18,14 +22,24 @@ class FediverseServiceFactory: Raises: ValueError: If the instance type is not supported """ - if config.INSTANCE_TYPE == "misskey": + if instance_type is None: + instance_type = config.INSTANCE_TYPE + + instance_type = instance_type.lower() + + if instance_type == "misskey": return MisskeyService() - elif config.INSTANCE_TYPE == "pleroma": + elif instance_type == "pleroma": return PleromaService() else: - raise ValueError(f"Unsupported instance type: {config.INSTANCE_TYPE}") + raise ValueError(f"Unsupported instance type: {instance_type}") -def get_fediverse_service() -> FediverseService: - """Convenience function to get a FediverseService instance""" - return FediverseServiceFactory.create_service() \ No newline at end of file +def get_fediverse_service(instance_type: str = None) -> FediverseService: + """ + Convenience function to get a FediverseService instance + + Args: + instance_type: Optional instance type override for testing + """ + return FediverseServiceFactory.create_service(instance_type) \ No newline at end of file From 40f018a83b3d7ab9224c0623c4f7f78ade677d59 Mon Sep 17 00:00:00 2001 From: Moon Date: Fri, 13 Jun 2025 13:53:41 +0900 Subject: [PATCH 53/67] make instantiation explicit so easier to test. --- bot/add_card.py | 6 +-- bot/bot_app.py | 3 +- bot/fediverse_factory.py | 15 +++---- bot/mock_fediverse_service.py | 74 +++++++++++++++++++++++++++++++++++ bot/notification.py | 6 +-- bot/parsing.py | 2 +- 6 files changed, 88 insertions(+), 18 deletions(-) create mode 100644 bot/mock_fediverse_service.py diff --git a/bot/add_card.py b/bot/add_card.py index ffa1120..2c91618 100644 --- a/bot/add_card.py +++ b/bot/add_card.py @@ -1,7 +1,7 @@ import requests +import config from fediverse_factory import get_fediverse_service import db_utils -from config import RARITY_TO_WEIGHT def add_card(name: str, rarity: int, weight: float, image_url: str) -> tuple[int, str]: """ @@ -28,7 +28,7 @@ def add_card(name: str, rarity: int, weight: float, image_url: str) -> tuple[int raise ValueError('Card name cannot be empty.') if rarity < 1: raise ValueError('Rarity must be a positive integer.') - if rarity not in RARITY_TO_WEIGHT.keys(): + if rarity not in config.RARITY_TO_WEIGHT.keys(): raise ValueError(f'Invalid rarity: {rarity}') if not image_url: raise ValueError('Image URL must be provided.') @@ -40,7 +40,7 @@ def add_card(name: str, rarity: int, weight: float, image_url: str) -> tuple[int raise RuntimeError(f"Failed to download image from {image_url}") # Upload to Fediverse instance - fediverse_service = get_fediverse_service() + fediverse_service = get_fediverse_service(config.INSTANCE_TYPE) try: uploaded_file = fediverse_service.upload_file(response.raw) file_id = uploaded_file.id diff --git a/bot/bot_app.py b/bot/bot_app.py index dabc219..2609a1b 100644 --- a/bot/bot_app.py +++ b/bot/bot_app.py @@ -1,5 +1,6 @@ import time import traceback +import config from notification import process_fediverse_notification from db_utils import get_config, set_config, connect, setup_administrators from fediverse_factory import get_fediverse_service @@ -12,7 +13,7 @@ def stream_notifications(): setup_administrators() # Initialize the Fediverse service - fediverse_service = get_fediverse_service() + fediverse_service = get_fediverse_service(config.INSTANCE_TYPE) # Get the last seen notification ID from the database last_seen_id = get_config("last_seen_notif_id") diff --git a/bot/fediverse_factory.py b/bot/fediverse_factory.py index bee5f73..fe501db 100644 --- a/bot/fediverse_factory.py +++ b/bot/fediverse_factory.py @@ -1,20 +1,18 @@ from fediverse_service import FediverseService from misskey_service import MisskeyService from pleroma_service import PleromaService -import config class FediverseServiceFactory: - """Factory for creating FediverseService implementations based on configuration""" + """Factory for creating FediverseService implementations""" @staticmethod - def create_service(instance_type: str = None) -> FediverseService: + def create_service(instance_type: str) -> FediverseService: """ Create a FediverseService implementation based on the instance type. Args: - instance_type: The type of instance ("misskey" or "pleroma"). - If None, reads from config.INSTANCE_TYPE + instance_type: The type of instance ("misskey" or "pleroma") Returns: FediverseService implementation (MisskeyService or PleromaService) @@ -22,9 +20,6 @@ class FediverseServiceFactory: Raises: ValueError: If the instance type is not supported """ - if instance_type is None: - instance_type = config.INSTANCE_TYPE - instance_type = instance_type.lower() if instance_type == "misskey": @@ -35,11 +30,11 @@ class FediverseServiceFactory: raise ValueError(f"Unsupported instance type: {instance_type}") -def get_fediverse_service(instance_type: str = None) -> FediverseService: +def get_fediverse_service(instance_type: str) -> FediverseService: """ Convenience function to get a FediverseService instance Args: - instance_type: Optional instance type override for testing + instance_type: The instance type ("misskey" or "pleroma") """ return FediverseServiceFactory.create_service(instance_type) \ No newline at end of file diff --git a/bot/mock_fediverse_service.py b/bot/mock_fediverse_service.py new file mode 100644 index 0000000..34a1c0c --- /dev/null +++ b/bot/mock_fediverse_service.py @@ -0,0 +1,74 @@ +"""Mock FediverseService for testing purposes""" + +from typing import List, Optional, Union, BinaryIO +from fediverse_service import FediverseService +from fediverse_types import FediverseNotification, FediversePost, FediverseFile, Visibility + + +class MockFediverseService(FediverseService): + """Mock implementation of FediverseService for testing""" + + def __init__(self): + self.notifications = [] + self.created_posts = [] + self.uploaded_files = [] + + def get_notifications(self, since_id: Optional[str] = None) -> List[FediverseNotification]: + """Return mock notifications, optionally filtered by since_id""" + if since_id is None: + return self.notifications + + # Filter notifications newer than since_id + filtered = [] + for notif in self.notifications: + if notif.id > since_id: + filtered.append(notif) + return filtered + + def create_post( + self, + text: str, + reply_to_id: Optional[str] = None, + visibility: Visibility = Visibility.HOME, + file_ids: Optional[List[str]] = None, + visible_user_ids: Optional[List[str]] = None + ) -> str: + """Mock post creation, returns fake post ID""" + post_id = f"mock_post_{len(self.created_posts)}" + + # Store the post for assertions + self.created_posts.append({ + 'id': post_id, + 'text': text, + 'reply_to_id': reply_to_id, + 'visibility': visibility, + 'file_ids': file_ids, + 'visible_user_ids': visible_user_ids + }) + + return post_id + + def upload_file(self, file_data: Union[BinaryIO, bytes]) -> FediverseFile: + """Mock file upload, returns fake file""" + file_id = f"mock_file_{len(self.uploaded_files)}" + + mock_file = FediverseFile( + id=file_id, + url=f"https://example.com/files/{file_id}", + type="image/png", + name="test_file.png" + ) + + self.uploaded_files.append(mock_file) + return mock_file + + # Helper methods for testing + def add_mock_notification(self, notification: FediverseNotification): + """Add a mock notification for testing""" + self.notifications.append(notification) + + def clear_all(self): + """Clear all mock data""" + self.notifications.clear() + self.created_posts.clear() + self.uploaded_files.clear() \ No newline at end of file diff --git a/bot/notification.py b/bot/notification.py index ea544e2..f264718 100644 --- a/bot/notification.py +++ b/bot/notification.py @@ -1,4 +1,4 @@ -from config import USE_WHITELIST +import config from parsing import parse_notification from db_utils import is_whitelisted, is_player_banned from response import generate_response @@ -10,7 +10,7 @@ from fediverse_types import FediverseNotification, NotificationType, Visibility def process_fediverse_notification(notification: FediverseNotification, fediverse_service=None) -> None: '''Processes an individual fediverse notification using the abstraction''' if fediverse_service is None: - fediverse_service = get_fediverse_service() + fediverse_service = get_fediverse_service(config.INSTANCE_TYPE) # Get user and instance info username = notification.user.username @@ -18,7 +18,7 @@ def process_fediverse_notification(notification: FediverseNotification, fedivers instance = host if host else 'local' # Check whitelist - if USE_WHITELIST and not is_whitelisted(instance): + if config.USE_WHITELIST and not is_whitelisted(instance): print(f'⚠️ Blocked notification from untrusted instance: {instance}') return diff --git a/bot/parsing.py b/bot/parsing.py index 476e774..d625980 100644 --- a/bot/parsing.py +++ b/bot/parsing.py @@ -10,7 +10,7 @@ def parse_notification(notification: FediverseNotification, fediverse_service=No generate_response()''' if fediverse_service is None: - fediverse_service = get_fediverse_service() + fediverse_service = get_fediverse_service(config.INSTANCE_TYPE) # We get the type of notification to filter the ones that we actually want # to parse From bd287b096ab6de4e3947e611b9517cd6767abdaa Mon Sep 17 00:00:00 2001 From: Moon Date: Fri, 13 Jun 2025 18:47:54 +0900 Subject: [PATCH 54/67] rm reference to weight column. --- bot/add_card.py | 1 - bot/db_utils.py | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/bot/add_card.py b/bot/add_card.py index fcaab43..16834a9 100644 --- a/bot/add_card.py +++ b/bot/add_card.py @@ -58,7 +58,6 @@ def add_card( card_id = insert_card( stripped_name, rarity, - RARITY_TO_WEIGHT[rarity], file_id ) return card_id, file_id diff --git a/bot/db_utils.py b/bot/db_utils.py index 94e915e..bdbd0d8 100644 --- a/bot/db_utils.py +++ b/bot/db_utils.py @@ -150,12 +150,11 @@ def is_player_administrator(username: str) -> bool: def insert_card( - name: str, rarity: int, weight: float, file_id: str) -> int: + name: str, rarity: int, file_id: str) -> int: '''Inserts a card''' CURSOR.execute( - 'INSERT INTO cards (name, rarity, weight, file_id) VALUES \ -(?, ?, ?, ?)', - (name, rarity, weight, file_id) + 'INSERT INTO cards (name, rarity, file_id) VALUES (?, ?, ?)', + (name, rarity, file_id) ) card_id = CURSOR.lastrowid return card_id if card_id else 0 From 77d4fa13bb44ca9b5322eaf8b12bb71cfb9a6cd8 Mon Sep 17 00:00:00 2001 From: Moon Date: Fri, 13 Jun 2025 19:31:23 +0900 Subject: [PATCH 55/67] rm validation of removed weight --- bot/response.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/bot/response.py b/bot/response.py index b49de1e..e661bbf 100644 --- a/bot/response.py +++ b/bot/response.py @@ -120,12 +120,6 @@ in order: name, rarity', be a number between 1 and 5', 'attachment_urls': None } - if not (is_float(arguments[2]) and 0.0 < float(arguments[2]) <= 1.0): - return { - 'message': f'{author} Invalid drop weight: \'{arguments[2]}\' \ -must be a decimal value between 0.0 and 1.0', - 'attachment_urls': None - } card_id, file_id = add_card( name=arguments[0], From 3ad4edbc45e64689d9263f6108fa9f9b537a17d8 Mon Sep 17 00:00:00 2001 From: Moon Date: Sat, 14 Jun 2025 04:10:16 +0900 Subject: [PATCH 56/67] ignore custom startup script --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a05fd62..2df4c91 100644 --- a/.gitignore +++ b/.gitignore @@ -185,5 +185,6 @@ cython_debug/ gacha_game*.db gacha_game*.db.* config*.ini +run.sh .idea From 337a9896715f6f3f11c9354463e6e2af3a6e20f6 Mon Sep 17 00:00:00 2001 From: Moon Date: Sat, 14 Jun 2025 04:34:20 +0900 Subject: [PATCH 57/67] rm vestigial trusted instances config. --- bot/config.py | 4 ---- example_config.ini | 3 --- 2 files changed, 7 deletions(-) diff --git a/bot/config.py b/bot/config.py index 11541cd..4f1f907 100644 --- a/bot/config.py +++ b/bot/config.py @@ -57,10 +57,6 @@ INSTANCE_TYPE = instance_type # Web server port WEB_PORT = config['application'].getint('WebPort', 5000) -# Trusted instances -trusted_instances_str = config['application'].get('TrustedInstances', '') -TRUSTED_INSTANCES = [instance.strip() for instance in trusted_instances_str.split(',') if instance.strip()] - # Fedi handles in the traditional 'user@domain.tld' style, allows these users # to use extra admin exclusive commands with the bot ADMINS = json.loads(config['application']['DefaultAdmins']) diff --git a/example_config.ini b/example_config.ini index 516d552..ab866fe 100644 --- a/example_config.ini +++ b/example_config.ini @@ -9,9 +9,6 @@ DatabaseLocation = ./gacha_game.db InstanceType = misskey ; Web server port (default: 5000) WebPort = 5000 -; Comma-separated list of trusted fediverse instances (leave empty to allow only local users) -; Example: TrustedInstances = mastodon.social,misskey.io,pleroma.example.com -TrustedInstances = ; Whether to limit access to the bot via an instance whitelist ; The whitelist can be adjusted via the application UseWhitelist = False From fdf21b3f5f71edafd9d41428ac5eb8e7adcab4a3 Mon Sep 17 00:00:00 2001 From: Moon Date: Sat, 14 Jun 2025 04:43:43 +0900 Subject: [PATCH 58/67] rm check for env dev or prod so any can be used --- bot/config.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/bot/config.py b/bot/config.py index 9737608..54689f3 100644 --- a/bot/config.py +++ b/bot/config.py @@ -13,8 +13,6 @@ def get_config_file() -> str: env: str | None = environ.get('KEMOVERSE_ENV') if not env: raise ConfigError('Error: KEMOVERSE_ENV is unset') - if not (env in ['prod', 'dev']): - raise ConfigError(f'Error: Invalid environment: {env}') config_path: str = f'config_{env}.ini' From 2ef70801c70c30219ba0db12de277873c8a5f32a Mon Sep 17 00:00:00 2001 From: Moon Date: Sat, 14 Jun 2025 05:08:59 +0900 Subject: [PATCH 59/67] fix config module ref --- bot/config.py | 56 ++++++++++++++++++++++++++++++++++++++++++++-- example_config.ini | 5 +++++ web/app.py | 9 ++++++-- 3 files changed, 66 insertions(+), 4 deletions(-) diff --git a/bot/config.py b/bot/config.py index 54689f3..e30d505 100644 --- a/bot/config.py +++ b/bot/config.py @@ -1,6 +1,7 @@ '''Essentials for the bot to function''' import configparser import json +import re from os import environ, path @@ -21,6 +22,50 @@ def get_config_file() -> str: return config_path +def normalize_user(user_string: str) -> str: + """ + Normalizes a user string to the format @user@domain.tld where domain is lowercase and user is case-sensitive + + Args: + user_string: User string in various formats + + Returns: + Normalized user string + + Raises: + ValueError: If the user string is invalid or domain is malformed + """ + if not user_string or not user_string.strip(): + raise ValueError("User string cannot be empty") + + user_string = user_string.strip() + + # Add leading @ if missing + if not user_string.startswith('@'): + user_string = '@' + user_string + + # Split into user and domain parts + parts = user_string[1:].split('@', 1) # Remove leading @ and split + if len(parts) != 2: + raise ValueError(f"Invalid user format: {user_string}. Expected @user@domain.tld") + + username, domain = parts + + if not username: + raise ValueError("Username cannot be empty") + + if not domain: + raise ValueError("Domain cannot be empty") + + # Validate domain format (basic check for valid domain structure) + domain_pattern = r'^[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$' + if not re.match(domain_pattern, domain): + raise ValueError(f"Invalid domain format: {domain}") + + # Return normalized format: @user@domain.tld (domain lowercase, user case-sensitive) + return f"@{username}@{domain.lower()}" + + def get_rarity_to_weight( config_section: configparser.SectionProxy) -> dict[int, float]: """Parses Rarity_X keys from config and returns a {rarity: weight} dict.""" @@ -36,17 +81,24 @@ config = configparser.ConfigParser() config.read(get_config_file()) # Username for the bot -USER = config['credentials']['User'].lower() +if 'User' not in config['credentials'] or not config['credentials']['User'].strip(): + raise ConfigError("User must be specified in config.ini under [credentials]") + +USER = normalize_user(config['credentials']['User']) # API key for the bot KEY = config['credentials']['Token'] # Bot's Misskey instance URL INSTANCE = config['credentials']['Instance'].lower() +# Web server port +WEB_PORT = config['application'].getint('WebPort', 5000) +BIND_ADDRESS = config['application'].get('BindAddress', '127.0.0.1') + # Fedi handles in the traditional 'user@domain.tld' style, allows these users # to use extra admin exclusive commands with the bot ADMINS = json.loads(config['application']['DefaultAdmins']) # SQLite Database location -DB_PATH = config['application']['DatabaseLocation'] +DB_PATH = config['application'].get('DatabaseLocation', './gacha_game.db') # Whether to enable the instance whitelist USE_WHITELIST = config['application']['UseWhitelist'] diff --git a/example_config.ini b/example_config.ini index 0ea2422..8c18c28 100644 --- a/example_config.ini +++ b/example_config.ini @@ -5,6 +5,11 @@ DefaultAdmins = ["@localadmin", "@remoteadmin@example.tld"] ; SQLite Database location DatabaseLocation = ./gacha_game.db +; Web server port (default: 5000) +WebPort = 5000 +; Web server bind address (default: 127.0.0.1, set to 0.0.0.0 to listen on all interfaces) +BindAddress = 127.0.0.1 + ; Whether to lmit access to the bot via an instance whitelist ; The whitelist can be adjusted via the application UseWhitelist = False diff --git a/web/app.py b/web/app.py index 61ed38f..fcd67a1 100644 --- a/web/app.py +++ b/web/app.py @@ -1,10 +1,15 @@ import sqlite3 +import sys +from pathlib import Path +# Add parent directory to Python path so we can import from bot/ +sys.path.append(str(Path(__file__).parent.parent)) + +from bot.config import WEB_PORT, BIND_ADDRESS, DB_PATH from flask import Flask, render_template, abort from werkzeug.exceptions import HTTPException app = Flask(__name__) -DB_PATH = "./gacha_game.db" # Adjust path if needed def get_db_connection(): conn = sqlite3.connect(DB_PATH) @@ -68,4 +73,4 @@ def submit_character(): if __name__ == '__main__': - app.run(host='0.0.0.0', port=5000, debug=True) + app.run(host=BIND_ADDRESS, port=WEB_PORT, debug=True) From f4f847e5770a130271a1ed206bb36578236015b3 Mon Sep 17 00:00:00 2001 From: Moon Date: Sat, 14 Jun 2025 05:14:40 +0900 Subject: [PATCH 60/67] make sure UseWhitelist is a boolean, default to True --- bot/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/config.py b/bot/config.py index e30d505..5a1046d 100644 --- a/bot/config.py +++ b/bot/config.py @@ -100,7 +100,7 @@ ADMINS = json.loads(config['application']['DefaultAdmins']) # SQLite Database location DB_PATH = config['application'].get('DatabaseLocation', './gacha_game.db') # Whether to enable the instance whitelist -USE_WHITELIST = config['application']['UseWhitelist'] +USE_WHITELIST = config['application'].getboolean('UseWhitelist', True) NOTIFICATION_POLL_INTERVAL = int(config['notification']['PollInterval']) NOTIFICATION_BATCH_SIZE = int(config['notification']['BatchSize']) From 7fd4d5db25e670704026f5cacbb8f9bd152f838c Mon Sep 17 00:00:00 2001 From: Moon Date: Sat, 14 Jun 2025 05:17:39 +0900 Subject: [PATCH 61/67] indicate on startup if whitelisting is enabled. --- bot/bot_app.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bot/bot_app.py b/bot/bot_app.py index ed2772b..54b70c8 100644 --- a/bot/bot_app.py +++ b/bot/bot_app.py @@ -3,7 +3,7 @@ import misskey as misskey from client import client_connection import db_utils as db -from config import NOTIFICATION_POLL_INTERVAL +from config import NOTIFICATION_POLL_INTERVAL, USE_WHITELIST from notification import process_notifications if __name__ == '__main__': @@ -15,6 +15,10 @@ if __name__ == '__main__': # Setup default administrators db.setup_administrators() + # Show whitelist status + whitelist_status = "enabled" if USE_WHITELIST else "disabled" + print(f'Instance whitelisting: {whitelist_status}') + print('Listening for notifications...') while True: if not process_notifications(client): From d416ae1b2da2dfe89c8145ac9d59f67121a34ab5 Mon Sep 17 00:00:00 2001 From: Moon Date: Sat, 14 Jun 2025 05:47:43 +0900 Subject: [PATCH 62/67] rm limitation on KEMOVERSE_ENV from another place. --- setup_db.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/setup_db.py b/setup_db.py index 241bb4e..ae73c03 100644 --- a/setup_db.py +++ b/setup_db.py @@ -57,16 +57,14 @@ def perform_migration(cursor: sqlite3.Cursor, migration: tuple[int, str]) -> Non def get_db_path() -> str | DBNotFoundError: '''Gets the DB path from config.ini''' env = os.environ.get('KEMOVERSE_ENV') - if not (env and env in ['prod', 'dev']): - raise KemoverseEnvUnset - - print(f'Running in "{env}" mode') config_path = f'config_{env}.ini' if not os.path.isfile(config_path): raise ConfigError(f'Could not find {config_path}') + print(f'Running in "{env}" mode') + config = ConfigParser() config.read(config_path) db_path = config['application']['DatabaseLocation'] From 1a35750d0a1e843693aff22f9cdca5aff0231906 Mon Sep 17 00:00:00 2001 From: Moon Date: Sat, 14 Jun 2025 05:51:49 +0900 Subject: [PATCH 63/67] restrict characters in KEMOVERSE_ENV --- bot/config.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bot/config.py b/bot/config.py index 5a1046d..57cbfa9 100644 --- a/bot/config.py +++ b/bot/config.py @@ -14,6 +14,10 @@ def get_config_file() -> str: env: str | None = environ.get('KEMOVERSE_ENV') if not env: raise ConfigError('Error: KEMOVERSE_ENV is unset') + + # Validate environment name contains only alphanumeric, dash, and underscore + if not re.match(r'^[a-zA-Z0-9_-]+$', env): + raise ValueError(f'KEMOVERSE_ENV "{env}" contains invalid characters. Only alphanumeric, dash (-), and underscore (_) are allowed.') config_path: str = f'config_{env}.ini' From 24bfe88dc1e6887d5b8189718ece33bf720a64f4 Mon Sep 17 00:00:00 2001 From: Moon Date: Sat, 14 Jun 2025 05:57:01 +0900 Subject: [PATCH 64/67] rm obsolete print --- setup_db.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup_db.py b/setup_db.py index ae73c03..f1e9085 100644 --- a/setup_db.py +++ b/setup_db.py @@ -64,7 +64,7 @@ def get_db_path() -> str | DBNotFoundError: raise ConfigError(f'Could not find {config_path}') print(f'Running in "{env}" mode') - + config = ConfigParser() config.read(config_path) db_path = config['application']['DatabaseLocation'] @@ -94,7 +94,6 @@ def main(): return except KemoverseEnvUnset: print('Error: KEMOVERSE_ENV is either not set or has an invalid value.') - print('Please set KEMOVERSE_ENV to either "dev" or "prod" before running.') print(traceback.format_exc()) return From 6494ac4909afada0f4147ad24448d31d4ea9ba6e Mon Sep 17 00:00:00 2001 From: w Date: Sun, 15 Jun 2025 16:50:27 -0300 Subject: [PATCH 65/67] Typo that saves the west --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index ed33ec4..7a939cc 100644 --- a/readme.md +++ b/readme.md @@ -76,7 +76,7 @@ The full license text can be found here: https://www.gnu.org/licenses/agpl-3.0.h The AGPL is designed to ensure that software freedom is preserved, especially in networked environments. If you improve this project or build something on top of it, please give back to the community by sharing your changes too. -Unless another license is listed, every file in the project is licensed under the GNU General Public License version 3 (or at your option), any later version. +Unless another license is listed, every file in the project is licensed under the GNU Affero General Public License version 3 (or at your option), any later version. ```mermaid flowchart TD From 42180f4139e62358b3ae7c4aad6da462a32eec98 Mon Sep 17 00:00:00 2001 From: w Date: Tue, 17 Jun 2025 23:54:55 -0300 Subject: [PATCH 66/67] Added copyright notice --- .gitignore | 16 +++++++++ bot/add_card.py | 16 +++++++++ bot/bot_app.py | 30 ++++++++-------- bot/config.py | 16 +++++++++ bot/custom_types.py | 16 +++++++++ bot/db_utils.py | 16 +++++++++ bot/fediverse_factory.py | 16 +++++++++ bot/fediverse_service.py | 16 +++++++++ bot/fediverse_types.py | 16 +++++++++ bot/misskey_service.py | 16 +++++++++ bot/mock_fediverse_service.py | 16 +++++++++ bot/notification.py | 16 +++++++++ bot/parsing.py | 16 +++++++++ bot/pleroma_service.py | 16 +++++++++ bot/response.py | 16 +++++++++ contributing.md | 49 ++++++++++++++++++++++++++ dev_runner.py | 16 +++++++++ docs/index.md | 17 +++++++++ docs/install.md | 17 +++++++++ docs/theme.md | 17 +++++++++ example_config.ini | 17 +++++++++ migrations/0000_setup.sql | 17 +++++++++ migrations/0001_fix_notif_id.sql | 17 +++++++++ migrations/0002_weigh_infer.sql | 18 ++++++++++ migrations/0003_rename_tables.sql | 18 ++++++++++ migrations/0004_add_administrators.sql | 18 ++++++++++ migrations/0005_add_whitelist.sql | 18 ++++++++++ readme.md | 20 ++++++++++- requirements.txt | 16 +++++++++ startup.sh | 30 ++++++++-------- web/static/style.css | 21 +++++++++-- web/templates/_base.html | 17 +++++++++ web/templates/_error.html | 17 +++++++++ web/templates/about.html | 17 +++++++++ web/templates/index.html | 18 ++++++++++ web/templates/submit.html | 17 +++++++++ web/templates/user.html | 17 +++++++++ 37 files changed, 650 insertions(+), 33 deletions(-) create mode 100644 contributing.md diff --git a/.gitignore b/.gitignore index 2df4c91..7e6735c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,19 @@ +# Kemoverse - a gacha-style bot for the Fediverse. +# Copyright © 2025 Waifu + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see https://www.gnu.org/licenses/. + # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] diff --git a/bot/add_card.py b/bot/add_card.py index ffa9601..39a1393 100644 --- a/bot/add_card.py +++ b/bot/add_card.py @@ -1,3 +1,19 @@ +# Kemoverse - a gacha-style bot for the Fediverse. +# Copyright © 2025 Waifu + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see https://www.gnu.org/licenses/. + import requests import config from fediverse_factory import get_fediverse_service diff --git a/bot/bot_app.py b/bot/bot_app.py index ffbd413..2f448dc 100644 --- a/bot/bot_app.py +++ b/bot/bot_app.py @@ -1,18 +1,18 @@ -#Kemoverse - a gacha-style bot for the Fediverse. -#Copyright © 2025 Waifu -# -#This program is free software: you can redistribute it and/or modify -#it under the terms of the GNU Affero General Public License as -#published by the Free Software Foundation, either version 3 of the -#License, or (at your option) any later version. -# -#This program is distributed in the hope that it will be useful, -#but WITHOUT ANY WARRANTY; without even the implied warranty of -#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -#GNU Affero General Public License for more details. -# -#You should have received a copy of the GNU Affero General Public License -#along with this program. If not, see https://www.gnu.org/licenses/. +# Kemoverse - a gacha-style bot for the Fediverse. +# Copyright © 2025 Waifu VD15 + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see https://www.gnu.org/licenses/. import time import traceback diff --git a/bot/config.py b/bot/config.py index 36177f9..5519ad9 100644 --- a/bot/config.py +++ b/bot/config.py @@ -1,3 +1,19 @@ +# Kemoverse - a gacha-style bot for the Fediverse. +# Copyright © 2025 Waifu + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see https://www.gnu.org/licenses/. + '''Essentials for the bot to function''' import configparser import json diff --git a/bot/custom_types.py b/bot/custom_types.py index 7fc7885..61fc632 100644 --- a/bot/custom_types.py +++ b/bot/custom_types.py @@ -1,3 +1,19 @@ +# Kemoverse - a gacha-style bot for the Fediverse. +# Copyright © 2025 Waifu + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see https://www.gnu.org/licenses/. + from typing import TypedDict, List, Dict, Any BotResponse = TypedDict('BotResponse', { diff --git a/bot/db_utils.py b/bot/db_utils.py index bdbd0d8..7ce2f82 100644 --- a/bot/db_utils.py +++ b/bot/db_utils.py @@ -1,3 +1,19 @@ +# Kemoverse - a gacha-style bot for the Fediverse. +# Copyright © 2025 Waifu + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see https://www.gnu.org/licenses/. + from random import choices import sqlite3 import config diff --git a/bot/fediverse_factory.py b/bot/fediverse_factory.py index fe501db..3ed9561 100644 --- a/bot/fediverse_factory.py +++ b/bot/fediverse_factory.py @@ -1,3 +1,19 @@ +# Kemoverse - a gacha-style bot for the Fediverse. +# Copyright © 2025 Waifu + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see https://www.gnu.org/licenses/. + from fediverse_service import FediverseService from misskey_service import MisskeyService from pleroma_service import PleromaService diff --git a/bot/fediverse_service.py b/bot/fediverse_service.py index 1292d63..5395841 100644 --- a/bot/fediverse_service.py +++ b/bot/fediverse_service.py @@ -1,3 +1,19 @@ +# Kemoverse - a gacha-style bot for the Fediverse. +# Copyright © 2025 Waifu + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see https://www.gnu.org/licenses/. + from abc import ABC, abstractmethod from typing import List, Optional, Union, BinaryIO from fediverse_types import FediverseNotification, FediversePost, FediverseFile, Visibility diff --git a/bot/fediverse_types.py b/bot/fediverse_types.py index c1580b6..0218490 100644 --- a/bot/fediverse_types.py +++ b/bot/fediverse_types.py @@ -1,3 +1,19 @@ +# Kemoverse - a gacha-style bot for the Fediverse. +# Copyright © 2025 Waifu + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see https://www.gnu.org/licenses/. + from dataclasses import dataclass from typing import Optional, List, Dict, Any from enum import Enum diff --git a/bot/misskey_service.py b/bot/misskey_service.py index 510b32b..50cf6fc 100644 --- a/bot/misskey_service.py +++ b/bot/misskey_service.py @@ -1,3 +1,19 @@ +# Kemoverse - a gacha-style bot for the Fediverse. +# Copyright © 2025 Moon + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see https://www.gnu.org/licenses/. + import misskey from typing import List, Optional, Dict, Any, Union, BinaryIO from fediverse_service import FediverseService diff --git a/bot/mock_fediverse_service.py b/bot/mock_fediverse_service.py index 34a1c0c..7121ccf 100644 --- a/bot/mock_fediverse_service.py +++ b/bot/mock_fediverse_service.py @@ -1,3 +1,19 @@ +# Kemoverse - a gacha-style bot for the Fediverse. +# Copyright © 2025 Moon + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see https://www.gnu.org/licenses/. + """Mock FediverseService for testing purposes""" from typing import List, Optional, Union, BinaryIO diff --git a/bot/notification.py b/bot/notification.py index f264718..2c4d9ad 100644 --- a/bot/notification.py +++ b/bot/notification.py @@ -1,3 +1,19 @@ +# Kemoverse - a gacha-style bot for the Fediverse. +# Copyright © 2025 Waifu + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see https://www.gnu.org/licenses/. + import config from parsing import parse_notification from db_utils import is_whitelisted, is_player_banned diff --git a/bot/parsing.py b/bot/parsing.py index d625980..9365b58 100644 --- a/bot/parsing.py +++ b/bot/parsing.py @@ -1,3 +1,19 @@ +# Kemoverse - a gacha-style bot for the Fediverse. +# Copyright © 2025 Waifu + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see https://www.gnu.org/licenses/. + import re import config from response import generate_response diff --git a/bot/pleroma_service.py b/bot/pleroma_service.py index 21320d1..a870ca5 100644 --- a/bot/pleroma_service.py +++ b/bot/pleroma_service.py @@ -1,3 +1,19 @@ +# Kemoverse - a gacha-style bot for the Fediverse. +# Copyright © 2025 Moon + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see https://www.gnu.org/licenses/. + from mastodon import Mastodon from typing import List, Optional, Dict, Any, Union, BinaryIO import io diff --git a/bot/response.py b/bot/response.py index e661bbf..ab81faa 100644 --- a/bot/response.py +++ b/bot/response.py @@ -1,3 +1,19 @@ +#Kemoverse - a gacha-style bot for the Fediverse. +#Copyright © 2025 Waifu and VD-15 +# +#This program is free software: you can redistribute it and/or modify +#it under the terms of the GNU Affero General Public License as +#published by the Free Software Foundation, either version 3 of the +#License, or (at your option) any later version. +# +#This program is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#GNU Affero General Public License for more details. +# +#You should have received a copy of the GNU Affero General Public License +#along with this program. If not, see https://www.gnu.org/licenses/. + from datetime import datetime, timedelta, timezone from typing import TypedDict, Any, List, Dict import db_utils as db diff --git a/contributing.md b/contributing.md new file mode 100644 index 0000000..5858d9e --- /dev/null +++ b/contributing.md @@ -0,0 +1,49 @@ + + +# Contributing to Kemoverse + +Contributions are welcome with the following requirements: + +## Licensing + +- All contributions must be licensed under the **AGPLv3-or-later** or a compatible license. +- If you include code from another project (e.g., MIT Expat), please **list the license and copyright holders** clearly. +- If your contribution introduces code under a different license, you **must clarify this**, so the project can remain license-compliant. + +## Attribution + +- Please **add your name** to the license header of any file where you’ve made a **nontrivial change**. +- Nontrivial changes include: + - New features + - Logic changes + - Major refactoring or structure changes + - Not: typo fixes or simple reformatting + +## Commit Messages (optional but appreciated) + +- Try to write clear, descriptive commit messages. + +## Communication + +- If you're planning a major change or feature, please open an issue or contact the maintainers first. +- This helps avoid duplicated work and makes collaboration easier. + +--- + +Thank you for helping grow the Kemoverse 💫 \ No newline at end of file diff --git a/dev_runner.py b/dev_runner.py index b39a434..92fd0aa 100644 --- a/dev_runner.py +++ b/dev_runner.py @@ -1,3 +1,19 @@ +# Kemoverse - a gacha-style bot for the Fediverse. +# Copyright © 2025 Waifu + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see https://www.gnu.org/licenses/. + import subprocess import os from watchdog.observers import Observer diff --git a/docs/index.md b/docs/index.md index 292d673..ad9ec67 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,3 +1,20 @@ + # 🎲 Kemoverse Documentation Welcome to the developer documentation for **Kemoverse**, a gacha trading card game in the Fediverse! diff --git a/docs/install.md b/docs/install.md index e5f8658..82e37c1 100644 --- a/docs/install.md +++ b/docs/install.md @@ -1,3 +1,20 @@ + ## 🧪 Installation diff --git a/docs/theme.md b/docs/theme.md index 69e9ed3..929b673 100644 --- a/docs/theme.md +++ b/docs/theme.md @@ -1,3 +1,20 @@ + Welcome to the **Visual Identity** guide for the Kemoverse. This page contains the standard colors, logos, and graphic elements used across the game (cards, UI, web presence, bots, etc). Please follow these guidelines to ensure consistency. --- diff --git a/example_config.ini b/example_config.ini index 1dd738e..b147f34 100644 --- a/example_config.ini +++ b/example_config.ini @@ -1,3 +1,20 @@ +; Kemoverse - a gacha-style bot for the Fediverse. +; Copyright © 2025 Waifu and VD15 + +; This program is free software: you can redistribute it and/or modify +; it under the terms of the GNU Affero General Public License as +; published by the Free Software Foundation, either version 3 of the +; License, or (at your option) any later version. + +; This program is distributed in the hope that it will be useful, +; but WITHOUT ANY WARRANTY; without even the implied warranty of +; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +; GNU Affero General Public License for more details. + +; You should have received a copy of the GNU Affero General Public License +; along with this program. If not, see https://www.gnu.org/licenses/. + + ; Rename me to config.ini and put your values in here [application] ; Comma separated list of fedi handles for any administrator users diff --git a/migrations/0000_setup.sql b/migrations/0000_setup.sql index 4dcbc64..de62501 100644 --- a/migrations/0000_setup.sql +++ b/migrations/0000_setup.sql @@ -1,3 +1,20 @@ +/* +Kemoverse - a gacha-style bot for the Fediverse. +Copyright © 2025 VD15 + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see https://www.gnu.org/licenses/. +*/ CREATE TABLE IF NOT EXISTS users ( id INTEGER PRIMARY KEY AUTOINCREMENT, username TEXT UNIQUE NOT NULL, diff --git a/migrations/0001_fix_notif_id.sql b/migrations/0001_fix_notif_id.sql index 3494d6e..d15db89 100644 --- a/migrations/0001_fix_notif_id.sql +++ b/migrations/0001_fix_notif_id.sql @@ -1 +1,18 @@ +/* +Kemoverse - a gacha-style bot for the Fediverse. +Copyright © 2025 VD15 + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see https://www.gnu.org/licenses/. +*/ INSERT OR IGNORE INTO config VALUES ("last_seen_notif_id", 0); diff --git a/migrations/0002_weigh_infer.sql b/migrations/0002_weigh_infer.sql index 28a1002..77f619e 100644 --- a/migrations/0002_weigh_infer.sql +++ b/migrations/0002_weigh_infer.sql @@ -1 +1,19 @@ +/* +Kemoverse - a gacha-style bot for the Fediverse. +Copyright © 2025 Waifu + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see https://www.gnu.org/licenses/. +*/ + ALTER TABLE characters DROP COLUMN weight; diff --git a/migrations/0003_rename_tables.sql b/migrations/0003_rename_tables.sql index a3ba3a7..0ca0d85 100644 --- a/migrations/0003_rename_tables.sql +++ b/migrations/0003_rename_tables.sql @@ -1,3 +1,21 @@ +/* +Kemoverse - a gacha-style bot for the Fediverse. +Copyright © 2025 VD15 + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see https://www.gnu.org/licenses/. +*/ + ALTER TABLE users RENAME TO players; ALTER TABLE characters RENAME TO cards; ALTER TABLE pulls RENAME user_id TO player_id; diff --git a/migrations/0004_add_administrators.sql b/migrations/0004_add_administrators.sql index 7503e21..51bef49 100644 --- a/migrations/0004_add_administrators.sql +++ b/migrations/0004_add_administrators.sql @@ -1 +1,19 @@ +/* +Kemoverse - a gacha-style bot for the Fediverse. +Copyright © 2025 VD15 + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see https://www.gnu.org/licenses/. +*/ + ALTER TABLE players ADD COLUMN is_administrator BOOLEAN NOT NULL DEFAULT 0; diff --git a/migrations/0005_add_whitelist.sql b/migrations/0005_add_whitelist.sql index d24f2e3..7769253 100644 --- a/migrations/0005_add_whitelist.sql +++ b/migrations/0005_add_whitelist.sql @@ -1,3 +1,21 @@ +/* +Kemoverse - a gacha-style bot for the Fediverse. +Copyright © 2025 VD15 + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see https://www.gnu.org/licenses/. +*/ + CREATE TABLE IF NOT EXISTS instance_whitelist ( tld TEXT UNIQUE PRIMARY KEY ); diff --git a/readme.md b/readme.md index 7bedcea..43cb272 100644 --- a/readme.md +++ b/readme.md @@ -1,3 +1,21 @@ + + # Kemoverse A gacha-style bot for the Fediverse built with Python. Users can roll for characters, trade, duel, and perhaps engage with popularity-based mechanics. Supports both Misskey and Pleroma instances. Name comes from Kemonomimi and Fediverse. @@ -63,7 +81,7 @@ The bot is meant to feel *light, fun, and competitive*. Mixing social, gacha and ## 📝 License -This project is licensed under the GNU Affero General Public License v3.0 (AGPL-3.0). +This project is licensed under the GNU Affero General Public License v3.0 (AGPL-3.0-or-later). This means: diff --git a/requirements.txt b/requirements.txt index 4a749b2..d747e71 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,19 @@ +# Kemoverse - a gacha-style bot for the Fediverse. +# Copyright © 2025 Waifu + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see https://www.gnu.org/licenses/. + blinker==1.9.0 click==8.1.8 Flask==3.1.0 diff --git a/startup.sh b/startup.sh index e8c3bed..3741e71 100755 --- a/startup.sh +++ b/startup.sh @@ -1,20 +1,20 @@ #!/bin/bash -#Kemoverse - a gacha-style bot for the Fediverse. -#Copyright © 2025 Waifu -# -#This program is free software: you can redistribute it and/or modify -#it under the terms of the GNU Affero General Public License as -#published by the Free Software Foundation, either version 3 of the -#License, or (at your option) any later version. -# -#This program is distributed in the hope that it will be useful, -#but WITHOUT ANY WARRANTY; without even the implied warranty of -#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -#GNU Affero General Public License for more details. -# -#You should have received a copy of the GNU Affero General Public License -#along with this program. If not, see https://www.gnu.org/licenses/. +# Kemoverse - a gacha-style bot for the Fediverse. +# Copyright © 2025 Waifu and VD15 + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see https://www.gnu.org/licenses/. # Navigate to the project directory (optional) cd "$(dirname "$0")" diff --git a/web/static/style.css b/web/static/style.css index 74231c1..95380a8 100644 --- a/web/static/style.css +++ b/web/static/style.css @@ -1,13 +1,30 @@ +/* +Kemoverse - a gacha-style bot for the Fediverse. +Copyright © 2025 Waifu + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see https://www.gnu.org/licenses/. + */ body { font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif; - background-color: #f4f6fa; + background-color: #FAFAFA; color: #333; margin: 0; padding: 0; } header { - background-color: #7289da; + background-color: #5aa02c; color: white; padding: 20px; text-align: center; diff --git a/web/templates/_base.html b/web/templates/_base.html index a1f1b22..f025c75 100644 --- a/web/templates/_base.html +++ b/web/templates/_base.html @@ -1,3 +1,20 @@ + diff --git a/web/templates/_error.html b/web/templates/_error.html index defc5d8..6d18f04 100644 --- a/web/templates/_error.html +++ b/web/templates/_error.html @@ -1,3 +1,20 @@ + {% extends "_base.html" %} {% block title %} {{ error.code }} diff --git a/web/templates/about.html b/web/templates/about.html index 184fde9..b704664 100644 --- a/web/templates/about.html +++ b/web/templates/about.html @@ -1,3 +1,20 @@ + {% extends "_base.html" %} {% block content %} diff --git a/web/templates/index.html b/web/templates/index.html index f9bf7a0..6f2351d 100644 --- a/web/templates/index.html +++ b/web/templates/index.html @@ -1,3 +1,21 @@ + + {% extends "_base.html" %} {% block header %} diff --git a/web/templates/submit.html b/web/templates/submit.html index d0424b8..ad36de4 100644 --- a/web/templates/submit.html +++ b/web/templates/submit.html @@ -1,3 +1,20 @@ + {% extends "_base.html" %} {% block content %} diff --git a/web/templates/user.html b/web/templates/user.html index 8010538..1ccb447 100644 --- a/web/templates/user.html +++ b/web/templates/user.html @@ -1,3 +1,20 @@ + {% extends "_base.html" %} {% block content %}
From 7f3e0e0f8b6f481a9f9124335d3c4a5510171ca6 Mon Sep 17 00:00:00 2001 From: w Date: Wed, 18 Jun 2025 00:21:56 -0300 Subject: [PATCH 67/67] Update copyright notices to include all contributors in various files --- .gitignore | 2 +- bot/add_card.py | 2 +- bot/bot_app.py | 2 +- bot/config.py | 2 +- bot/custom_types.py | 2 +- bot/db_utils.py | 2 +- bot/fediverse_factory.py | 2 +- bot/fediverse_service.py | 2 +- bot/fediverse_types.py | 2 +- bot/misskey_service.py | 2 +- bot/mock_fediverse_service.py | 2 +- bot/notification.py | 2 +- bot/parsing.py | 2 +- bot/pleroma_service.py | 2 +- bot/response.py | 2 +- docs/index.md | 2 +- docs/install.md | 2 +- docs/theme.md | 2 +- migrations/0000_setup.sql | 2 +- migrations/0001_fix_notif_id.sql | 2 +- migrations/0002_weigh_infer.sql | 2 +- migrations/0003_rename_tables.sql | 2 +- readme.md | 27 ++++++++++++++++++--------- 23 files changed, 40 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 7e6735c..2ccf20c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ # Kemoverse - a gacha-style bot for the Fediverse. -# Copyright © 2025 Waifu +# Copyright © 2025 Waifu, VD15 and contributors. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/bot/add_card.py b/bot/add_card.py index 39a1393..def64f6 100644 --- a/bot/add_card.py +++ b/bot/add_card.py @@ -1,5 +1,5 @@ # Kemoverse - a gacha-style bot for the Fediverse. -# Copyright © 2025 Waifu +# Copyright © 2025 Waifu, Moon, VD15 and contributors. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/bot/bot_app.py b/bot/bot_app.py index 2f448dc..9070415 100644 --- a/bot/bot_app.py +++ b/bot/bot_app.py @@ -1,5 +1,5 @@ # Kemoverse - a gacha-style bot for the Fediverse. -# Copyright © 2025 Waifu VD15 +# Copyright © 2025 Waifu, VD15, Moon and contributors. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/bot/config.py b/bot/config.py index 5519ad9..f226d45 100644 --- a/bot/config.py +++ b/bot/config.py @@ -1,5 +1,5 @@ # Kemoverse - a gacha-style bot for the Fediverse. -# Copyright © 2025 Waifu +# Copyright © 2025 Waifu, VD15, Moon and contributors. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/bot/custom_types.py b/bot/custom_types.py index 61fc632..6aad962 100644 --- a/bot/custom_types.py +++ b/bot/custom_types.py @@ -1,5 +1,5 @@ # Kemoverse - a gacha-style bot for the Fediverse. -# Copyright © 2025 Waifu +# Copyright © 2025 VD15 and contributors. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/bot/db_utils.py b/bot/db_utils.py index 7ce2f82..18e705f 100644 --- a/bot/db_utils.py +++ b/bot/db_utils.py @@ -1,5 +1,5 @@ # Kemoverse - a gacha-style bot for the Fediverse. -# Copyright © 2025 Waifu +# Copyright © 2025 Waifu VD15, Moon, and contributors. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/bot/fediverse_factory.py b/bot/fediverse_factory.py index 3ed9561..d7d61b5 100644 --- a/bot/fediverse_factory.py +++ b/bot/fediverse_factory.py @@ -1,5 +1,5 @@ # Kemoverse - a gacha-style bot for the Fediverse. -# Copyright © 2025 Waifu +# Copyright © 2025 Moon and contributors. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/bot/fediverse_service.py b/bot/fediverse_service.py index 5395841..4bb4169 100644 --- a/bot/fediverse_service.py +++ b/bot/fediverse_service.py @@ -1,5 +1,5 @@ # Kemoverse - a gacha-style bot for the Fediverse. -# Copyright © 2025 Waifu +# Copyright © 2025 Moon and contributors. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/bot/fediverse_types.py b/bot/fediverse_types.py index 0218490..99d58ce 100644 --- a/bot/fediverse_types.py +++ b/bot/fediverse_types.py @@ -1,5 +1,5 @@ # Kemoverse - a gacha-style bot for the Fediverse. -# Copyright © 2025 Waifu +# Copyright © 2025 Moon and contributors. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/bot/misskey_service.py b/bot/misskey_service.py index 50cf6fc..aad3944 100644 --- a/bot/misskey_service.py +++ b/bot/misskey_service.py @@ -1,5 +1,5 @@ # Kemoverse - a gacha-style bot for the Fediverse. -# Copyright © 2025 Moon +# Copyright © 2025 Moon and contributors. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/bot/mock_fediverse_service.py b/bot/mock_fediverse_service.py index 7121ccf..bc6546d 100644 --- a/bot/mock_fediverse_service.py +++ b/bot/mock_fediverse_service.py @@ -1,5 +1,5 @@ # Kemoverse - a gacha-style bot for the Fediverse. -# Copyright © 2025 Moon +# Copyright © 2025 Moon and contributors. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/bot/notification.py b/bot/notification.py index 2c4d9ad..95a3292 100644 --- a/bot/notification.py +++ b/bot/notification.py @@ -1,5 +1,5 @@ # Kemoverse - a gacha-style bot for the Fediverse. -# Copyright © 2025 Waifu +# Copyright © 2025 Waifu, Moon, VD15, and contributors. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/bot/parsing.py b/bot/parsing.py index 9365b58..7cadd79 100644 --- a/bot/parsing.py +++ b/bot/parsing.py @@ -1,5 +1,5 @@ # Kemoverse - a gacha-style bot for the Fediverse. -# Copyright © 2025 Waifu +# Copyright © 2025 Waifu, Moon, VD15, and contributors. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/bot/pleroma_service.py b/bot/pleroma_service.py index a870ca5..4886c90 100644 --- a/bot/pleroma_service.py +++ b/bot/pleroma_service.py @@ -1,5 +1,5 @@ # Kemoverse - a gacha-style bot for the Fediverse. -# Copyright © 2025 Moon +# Copyright © 2025 Moon and contributors. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/bot/response.py b/bot/response.py index ab81faa..93cf614 100644 --- a/bot/response.py +++ b/bot/response.py @@ -1,5 +1,5 @@ #Kemoverse - a gacha-style bot for the Fediverse. -#Copyright © 2025 Waifu and VD-15 +#Copyright © 2025 Waifu, VD15 and contributors. # #This program is free software: you can redistribute it and/or modify #it under the terms of the GNU Affero General Public License as diff --git a/docs/index.md b/docs/index.md index ad9ec67..f6ad524 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,6 +1,6 @@