Ree6 Egg update (#2300)

Update Ree6 for V3

---------

Co-authored-by: Quinten <67589015+QuintenQVD0@users.noreply.github.com>

bots/discord/ree6/config.yml

@@ -8,8 +8,8 @@
 
 # Do not change this!
 config:
-  version: 2.4.3
+  version: 3.0.0
-  creation: 1681169485237
+  creation: 1686731674683
 
 # HikariCP Configuration
 hikari:
@@ -24,21 +24,79 @@ hikari:
   
   # Misc Configuration
   misc:
-    storage: sqlite
+    storage: sqlite # Possible entries: sqlite, mariadb, postgresql, h2, h2-server
     storageFile: storage/Ree6.db
+    createEmbeddedServer: false # Should an instance of an embedded Server be created? Only used for H2-Server.
     poolSize: 10
 
+# Discord Application and overall Bot Configuration, used for OAuth, Bot Authentication and customization.
+bot:
+  tokens:
+    release: ReleaseTokenhere # Token used when set to release build.
+    beta: BetaTokenhere # Token used when set to beta build.
+    dev: DevTokenhere # Token used when set to dev build.
+  
+  # Configuration for the Bot itself.
+  misc:
+    status: ree6.de | %guilds% Servers. (%shard%) # The Status of the Bot.
+    feedbackChannelId: 0 # The Channel used for Feedback.
+    ownerId: 321580743488831490 # The ID of the Bot Owner. Change this to yours!
+    predefineInformation: | # Predefined Information for the AI.
+      You are Ree6 a Discord bot.
+    invite: https://invite.ree6.de # The Invite Link of the Bot.
+    support: https://support.ree6.de # The Support Server Link of the Bot.
+    github: https://github.ree6.de # The GitHub Link of the Bot.
+    website: https://ree6.de # The Website Link of the Bot.
+    webinterface: https://cp.ree6.de # The Webinterface Link of the Bot.
+    recording: https://cp.ree6.de/external/recording # The Recording Link of the Bot.
+    twitchAuth: https://cp.ree6.de/external/twitch # The Twitch Authentication Link of the Bot.
+    advertisement: powered by Tube-hosting # The Advertisement in Embed Footers and the rest.
+    name: Ree6 # The Name of the Bot.
+    shards: 1 # The shard amount of the Bot. Check out https://anidiots.guide/understanding/sharding/#sharding for more information.
+    
+    # Customize the active modules in Ree6.
+    modules:
+      moderation: true # Enable the moderation module.
+      music: true # Enable the music module.
+      fun: true # Enable the fun commands.
+      community: true # Enable the community commands.
+      economy: true # Enable the economy commands.
+      level: true # Enable the level module.
+      nsfw: true # Enable the nsfw module.
+      info: true # Enable the info commands.
+      hidden: true # Enable the hidden commands.
+      logging: true # Enable the logging module.
+      notifier: true # Enable the notifier module.
+      streamtools: true # Enable the Stream-tools module.
+      temporalvoice: true # Enable the Temporal-voice module.
+      tickets: true # Enable the Tickets module.
+      suggestions: true # Enable the suggestions module.
+      customcommands: true # Enable the custom Commands module.
+      customevents: true # Enable the custom Events module.
+      ai: true # Enable the AI module.
+      addons: false # Enable the Addons module.
+      news: true # Enable the news command/module.
+      games: true # Enable the Games module.
+      reactionroles: true # Enable the reaction-roles module.
+      slashcommands: true # Enable the slash-commands support.
+      messagecommands: true # Enable the message-commands support.
+
 # Heartbeat Configuration, for status reporting
 heartbeat:
   url: none # The URL to the Heartbeat-Server
   interval: 60
 
 dagpi:
-  apitoken: yourdagpixyztokenhere # Your Dagpi.xyz API-Token, for tweet image generation!
+  apitoken: DAGPI.xyz API-Token # Your Dagpi.xyz API-Token, for tweet image generation!
 
 amari:
   apitoken: Amari API-Token # Your Amari API-Token, for Amari Level imports!
 
+openai:
+  apiToken: OpenAI API-Token # Your OpenAI API-Token, for ChatGPT!
+  apiUrl: https://api.openai.com/v1/chat/completions # The URL to the OpenAI API.
+  model: gpt-3.5-turbo-0301 # The Model used for the OpenAI API.
+
 sentry:
   dsn: yourSentryDSNHere # Your Sentry DSN, for error reporting!
 
@@ -56,12 +114,7 @@ twitch:
 
 # Twitter Application Configuration, used for the Twitter Notifications.
 twitter:
-  consumer:
+  bearer: yourTwitterBearerToken
-    key: yourTwitterConsumerKey
-    secret: yourTwitterConsumerSecret
-  access:
-    key: yourTwitterAccessKey
-    secret: yourTwitterAccessSecret
 
 # Reddit Application Configuration, used for the Reddit Notification.
 reddit:
@@ -73,10 +126,3 @@ reddit:
 instagram:
   username: yourInstagramUsername
   password: yourInstagramPassword
-
-# Discord Application Configuration, used for OAuth and Bot Authentication.
-bot:
-  tokens:
-    release: ReleaseTokenhere # Token used when set to release build.
-    beta: BetaTokenhere # Token used when set to beta build.
-    dev: DevTokenhere # Token used when set to dev build.

bots/discord/ree6/egg-ree6.json

@@ -4,7 +4,7 @@
         "version": "PTDL_v2",
         "update_url": null
     },
-    "exported_at": "2023-04-22T20:23:22+02:00",
+    "exported_at": "2023-06-14T13:03:27+02:00",
     "name": "Ree6",
     "author": "presti@presti.me",
     "description": "All-in-one, open source and 100% free Discord Bot!",
@@ -15,7 +15,7 @@
     "file_denylist": [],
     "startup": "java -Dnogui=true -jar Ree6.jar",
     "config": {
-        "files": "{\r\n    \"config.yml\": {\r\n        \"parser\": \"yaml\",\r\n        \"find\": {\r\n            \"hikari.sql.user\": \"{{server.build.env.DATABASE_USER}}\",\r\n            \"hikari.sql.db\": \"{{server.build.env.DATABASE_DB}}\",\r\n            \"hikari.sql.pw\": \"{{server.build.env.DATABASE_PW}}\",\r\n            \"hikari.sql.host\": \"{{server.build.env.DATABASE_HOST}}\",\r\n            \"hikari.sql.port\": \"{{server.build.env.DATABASE_PORT}}\",\r\n            \"hikari.misc.storage\": \"{{server.build.env.DATABASE_TYP}}\",\r\n            \"hikari.misc.storageFile\": \"{{server.build.env.DATABASE_FILE}}\",\r\n            \"hikari.misc.poolSize\": \"{{server.build.env.DATABASE_POOL}}\",\r\n            \"heartbeat.url\": \"{{server.build.env.HEARTBEAT_URL}}\",\r\n            \"heartbeat.interval\": \"{{server.build.env.HEARTBEAT_INTERVAL}}\",\r\n            \"dagpi.apitoken\": \"{{server.build.env.DAGPI_TOKEN}}\",\r\n            \"amari.apitoken\": \"{{server.build.env.AMARI_TOKEN}}\",\r\n            \"sentry.dsn\": \"{{server.build.env.SENTRY_DSN}}\",\r\n            \"spotify.client.id\": \"{{server.build.env.SPOTIFY_CLIENT_ID}}\",\r\n            \"spotify.client.secret\": \"{{server.build.env.SPOTIFY_CLIENT_SECRET}}\",\r\n            \"twitch.client.id\": \"{{server.build.env.TWITCH_CLIENT_ID}}\",\r\n            \"twitch.client.secret\": \"{{server.build.env.TWITCH_CLIENT_SECRET}}\",\r\n            \"twitter.consumer.key\": \"{{server.build.env.TWITTER_CONSUMER_ID}}\",\r\n            \"twitter.consumer.secret\": \"{{server.build.env.TWITTER_CONSUMER_SECRET}}\",\r\n            \"twitter.access.key\": \"{{server.build.env.TWITTER_ACCESS_ID}}\",\r\n            \"twitter.access.secret\": \"{{server.build.env.TWITTER_ACCESS_SECRET}}\",\r\n            \"reddit.client.id\": \"{{server.build.env.REDDIT_CLIENT_ID}}\",\r\n            \"reddit.client.secret\": \"{{server.build.env.REDDIT_CLIENT_SECRET}}\",\r\n            \"instagram.username\": \"{{server.build.env.INSTAGRAM_USERNAME}}\",\r\n            \"instagram.password\": \"{{server.build.env.INSTAGRAM_PASSWORD}}\",\r\n            \"bot.tokens.release\": \"{{server.build.env.BOT_TOKEN}}\"\r\n        }\r\n    }\r\n}",
+        "files": "{\r\n    \"config.yml\": {\r\n        \"parser\": \"yaml\",\r\n        \"find\": {\r\n            \"hikari.sql.user\": \"{{server.build.env.DATABASE_USER}}\",\r\n            \"hikari.sql.db\": \"{{server.build.env.DATABASE_DB}}\",\r\n            \"hikari.sql.pw\": \"{{server.build.env.DATABASE_PW}}\",\r\n            \"hikari.sql.host\": \"{{server.build.env.DATABASE_HOST}}\",\r\n            \"hikari.sql.port\": \"{{server.build.env.DATABASE_PORT}}\",\r\n            \"hikari.misc.storage\": \"{{server.build.env.DATABASE_TYP}}\",\r\n            \"hikari.misc.storageFile\": \"{{server.build.env.DATABASE_FILE}}\",\r\n            \"hikari.misc.poolSize\": \"{{server.build.env.DATABASE_POOL}}\",\r\n            \"hikari.misc.createEmbeddedServer\": \"{{server.build.env.DATABASE_EMBEDDED}}\",\r\n            \"heartbeat.url\": \"{{server.build.env.HEARTBEAT_URL}}\",\r\n            \"heartbeat.interval\": \"{{server.build.env.HEARTBEAT_INTERVAL}}\",\r\n            \"dagpi.apitoken\": \"{{server.build.env.DAGPI_TOKEN}}\",\r\n            \"amari.apitoken\": \"{{server.build.env.AMARI_TOKEN}}\",\r\n            \"sentry.dsn\": \"{{server.build.env.SENTRY_DSN}}\",\r\n            \"spotify.client.id\": \"{{server.build.env.SPOTIFY_CLIENT_ID}}\",\r\n            \"spotify.client.secret\": \"{{server.build.env.SPOTIFY_CLIENT_SECRET}}\",\r\n            \"twitch.client.id\": \"{{server.build.env.TWITCH_CLIENT_ID}}\",\r\n            \"twitch.client.secret\": \"{{server.build.env.TWITCH_CLIENT_SECRET}}\",\r\n            \"twitter.consumer.key\": \"{{server.build.env.TWITTER_CONSUMER_ID}}\",\r\n            \"twitter.consumer.secret\": \"{{server.build.env.TWITTER_CONSUMER_SECRET}}\",\r\n            \"twitter.access.key\": \"{{server.build.env.TWITTER_ACCESS_ID}}\",\r\n            \"twitter.access.secret\": \"{{server.build.env.TWITTER_ACCESS_SECRET}}\",\r\n            \"reddit.client.id\": \"{{server.build.env.REDDIT_CLIENT_ID}}\",\r\n            \"reddit.client.secret\": \"{{server.build.env.REDDIT_CLIENT_SECRET}}\",\r\n            \"instagram.username\": \"{{server.build.env.INSTAGRAM_USERNAME}}\",\r\n            \"instagram.password\": \"{{server.build.env.INSTAGRAM_PASSWORD}}\",\r\n            \"bot.tokens.release\": \"{{server.build.env.BOT_TOKEN}}\",\r\n            \"openai.apiToken\": \"{{server.build.env.AI_TOKEN}}\",\r\n            \"openai.apiUrl\": \"{{server.build.env.AI_URL}}\",\r\n            \"openai.model\": \"{{server.build.env.AI_MODEL}}\",\r\n            \"bot.misc.status\": \"{{server.build.env.MISC_STATUS}}\",\r\n            \"bot.misc.feedbackChannelId\": \"{{server.build.env.MISC_FEEDBACK}}\",\r\n            \"bot.misc.ownerId\": \"{{server.build.env.MISC_OWNER}}\",\r\n            \"bot.misc.predefineInformation\": \"{{server.build.env.MISC_PREDEF}}\",\r\n            \"bot.misc.invite\": \"{{server.build.env.MISC_INVITE}}\",\r\n            \"bot.misc.support\": \"{{server.build.env.MISC_SUPPORT}}\",\r\n            \"bot.misc.website\": \"{{server.build.env.MISC_WEB}}\",\r\n            \"bot.misc.webinterface\": \"{{server.build.env.MISC_INTERFACE}}\",\r\n            \"bot.misc.record\": \"{{server.build.env.MISC_RECORD}}\",\r\n            \"bot.misc.twitchAuth\": \"{{server.build.env.MISC_TWITCH}}\",\r\n            \"bot.misc.advertisement\": \"{{server.build.env.MISC_ADV}}\",\r\n            \"bot.misc.name\": \"{{server.build.env.MISC_NAME}}\",\r\n            \"bot.misc.shards\": \"{{server.build.env.MISC_SHARD}}\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \"Finished Loading\"\r\n}",
         "logs": "{}",
         "stop": "^C"
@@ -129,39 +129,9 @@
             "field_type": "text"
         },
         {
-            "name": "Twitter Consumer Key",
+            "name": "Twitter Bearer Key",
             "description": "Twitter Application Configuration, used for the Twitter Notifications.",
-            "env_variable": "TWITTER_CONSUMER_KEY",
+            "env_variable": "TWITTER_BEARER",
-            "default_value": "",
-            "user_viewable": true,
-            "user_editable": true,
-            "rules": "nullable|string|max:128",
-            "field_type": "text"
-        },
-        {
-            "name": "Twitter Consumer Secret",
-            "description": "Twitter Application Configuration, used for the Twitter Notifications.",
-            "env_variable": "TWITTER_CONSUMER_SECRET",
-            "default_value": "",
-            "user_viewable": true,
-            "user_editable": true,
-            "rules": "nullable|string|max:128",
-            "field_type": "text"
-        },
-        {
-            "name": "Twitter Access Key",
-            "description": "Twitter Application Configuration, used for the Twitter Notifications.",
-            "env_variable": "TWITTER_ACCESS_KEY",
-            "default_value": "",
-            "user_viewable": true,
-            "user_editable": true,
-            "rules": "nullable|string|max:128",
-            "field_type": "text"
-        },
-        {
-            "name": "Twitter Access Secret",
-            "description": "Twitter Application Configuration, used for the Twitter Notifications.",
-            "env_variable": "TWITTER_ACCESS_SECRET",
             "default_value": "",
             "user_viewable": true,
             "user_editable": true,
@@ -211,7 +181,7 @@
         {
             "name": "SQL Username",
             "description": "Username for the SQL connection.",
-            "env_variable": "SQL_USER",
+            "env_variable": "DATABASE_USER",
             "default_value": "root",
             "user_viewable": true,
             "user_editable": true,
@@ -221,7 +191,7 @@
         {
             "name": "SQL Database",
             "description": "Database for the SQL Connection",
-            "env_variable": "SQL_DB",
+            "env_variable": "DATABASE_DB",
             "default_value": "root",
             "user_viewable": true,
             "user_editable": true,
@@ -231,7 +201,7 @@
         {
             "name": "SQL Password",
             "description": "Password for the SQL connection.",
-            "env_variable": "SQL_PW",
+            "env_variable": "DATABASE_PW",
             "default_value": "",
             "user_viewable": true,
             "user_editable": true,
@@ -241,7 +211,7 @@
         {
             "name": "SQL Port",
             "description": "Port for the SQL connection.",
-            "env_variable": "SQL_PORT",
+            "env_variable": "DATABASE_PORT",
             "default_value": "3306",
             "user_viewable": true,
             "user_editable": true,
@@ -250,12 +220,12 @@
         },
         {
             "name": "Database Typ",
-            "description": "The Typ of the Database Ree6 should use!\r\nPossible typs:\r\n- mariadb\r\n- sqlite",
+            "description": "The Typ of the Database Ree6 should use!\r\nPossible typs:\r\n- mariadb\r\n- sqlite\r\n- h2\r\n- postgres",
             "env_variable": "DATABASE_TYP",
             "default_value": "sqlite",
             "user_viewable": true,
             "user_editable": true,
-            "rules": "required|string|in:mariadb,sqlite",
+            "rules": "required|string|in:mariadb,sqlite,postgres,postregsql,h2",
             "field_type": "text"
         },
         {
@@ -287,6 +257,166 @@
             "user_editable": true,
             "rules": "nullable|string|max:128",
             "field_type": "text"
+        },
+        {
+            "name": "OpenAI Token",
+            "description": "Your Authentication token that should be used in the AI API calls.",
+            "env_variable": "AI_TOKEN",
+            "default_value": "OpenAI API-Token",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "nullable|string|max:128",
+            "field_type": "text"
+        },
+        {
+            "name": "OpenAI Url",
+            "description": "The URL that should receive the API calls.",
+            "env_variable": "AI_URL",
+            "default_value": "https:\/\/api.openai.com\/v1\/chat\/completions",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "nullable|string|max:128",
+            "field_type": "text"
+        },
+        {
+            "name": "OpenAI Model",
+            "description": "The AI model that should be used in the API calls.",
+            "env_variable": "AI_MODEL",
+            "default_value": "gpt-3.5-turbo-0301",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "nullable|string|max:32",
+            "field_type": "text"
+        },
+        {
+            "name": "Activity Status",
+            "description": "The Activity status of the Bot that will be shown.",
+            "env_variable": "MISC_STATUS",
+            "default_value": "ree6.de | %guilds% Servers. (%shard%)",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "nullable|string|max:128",
+            "field_type": "text"
+        },
+        {
+            "name": "Feedback Channel",
+            "description": "The Channel Id of the Feedback channel.",
+            "env_variable": "MISC_FEEDBACK",
+            "default_value": "0",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "integer",
+            "field_type": "text"
+        },
+        {
+            "name": "[DEVELOPER-STUFF] Bot Owner Id",
+            "description": "The ID of the Bot Owner, this will be used internally on some checks.",
+            "env_variable": "MISC_OWNER",
+            "default_value": "321580743488831490",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|integer",
+            "field_type": "text"
+        },
+        {
+            "name": "Invite Link",
+            "description": "The Invite link to invite the Bot.",
+            "env_variable": "MISC_INVITE",
+            "default_value": "https:\/\/invite.ree6.de",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "nullable|string|max:128",
+            "field_type": "text"
+        },
+        {
+            "name": "Predefined Information for AI",
+            "description": "The Information for the AI.",
+            "env_variable": "MISC_PREDEF",
+            "default_value": "You are Ree6 a Discord bot.",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "nullable|string|max:128",
+            "field_type": "text"
+        },
+        {
+            "name": "Support Link",
+            "description": "The Url link for users to receive support.",
+            "env_variable": "MISC_SUPPORT",
+            "default_value": "https:\/\/support.ree6.de",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "nullable|string|max:128",
+            "field_type": "text"
+        },
+        {
+            "name": "Website",
+            "description": "The Url to the Website of the Bot.",
+            "env_variable": "MISC_WEB",
+            "default_value": "https:\/\/ree6.de",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "nullable|string|max:128",
+            "field_type": "text"
+        },
+        {
+            "name": "Webinterface",
+            "description": "The Url to the Webinterface.",
+            "env_variable": "MISC_INTERFACE",
+            "default_value": "https:\/\/cp.ree6.de",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "nullable|string|max:128",
+            "field_type": "text"
+        },
+        {
+            "name": "Record Url",
+            "description": "The Url that uses can access to get their recording.",
+            "env_variable": "MISC_RECORD",
+            "default_value": "https:\/\/cp.ree6.de\/external\/recording",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "nullable|string|max:128",
+            "field_type": "text"
+        },
+        {
+            "name": "Twitch Url",
+            "description": "The Url used to connect a Twitch Account with the Ree6 System.",
+            "env_variable": "MISC_TWITCH",
+            "default_value": "https:\/\/cp.ree6.de\/external\/twitch",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "nullable|string|max:128",
+            "field_type": "text"
+        },
+        {
+            "name": "Advertisment",
+            "description": "The Advertisement in Embed Footers and the rest.",
+            "env_variable": "MISC_ADV",
+            "default_value": "powered by Tube-hosting",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "nullable|string|max:128",
+            "field_type": "text"
+        },
+        {
+            "name": "Name",
+            "description": "The Name of the Bot.",
+            "env_variable": "MISC_NAME",
+            "default_value": "Ree6",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|max:20",
+            "field_type": "text"
+        },
+        {
+            "name": "Shards",
+            "description": "The amount of shards that should be created.",
+            "env_variable": "MISC_SHARD",
+            "default_value": "1",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|integer",
+            "field_type": "text"
         }
     ]
-}
+}