MERGE V2.0 - A complete rewrite.

V2.0 - A complete rewrite.

.env.example

@@ -1,149 +1,172 @@
-
-# Discord
-LIVE_BOT_TOKEN=
-TEST_BOT_TOKEN=
+# +======+
+# +LEGEND+
+# +======+
+# BG = BIAS GAME
+# BJ = BLACKJACK
+# BOATS = Discord Boats
+# CID = CHANNEL ID
+# DB = Database Server
+# DD = DataDog
+# DIR = Directories
+# DM = DATA MOD
+# EM = EMOJI
+# FM = LASTFM
+# LIM = LIMIT
+# LYR = KSoftAPI Lyrics
+# OX = Oxford Dictionary
+# PAT = PATREON
+# PR = PROOFREADER
+# PRT = PORT
+# RID = ROLE ID
+# RMD = REMINDER
+# SPO = SPOTIFY
+# TL = TRANSLATOR
+# TNR = Tenor
+# TOP = TOP.GG
+# TWCH = TWITCH
+# TWT = TWITTER
+# URB = Urban Dictionary
+# WL = Wavelink Server
+# +======+
+# +LEGEND+
+# +======+
+
+
+# Bot Info
+PROD_BOT_TOKEN=
+DEV_BOT_TOKEN=
 BOT_ID=
-OWNER_ID=
-
-# Split Bot Mods by commas
-MODS_LIST=
-
-BOT_INVITE_LINK=
-SUPPORT_SERVER_ID=
-SUPPORT_SERVER_LINK=
-BOT_NAME="Irene"
-BOT_PREFIX="%"
-BOT_WEBSITE=https://irenebot.com/
-IMAGE_HOST=https://images.irenebot.com/
-REPORT_CHANNEL_ID=
-SUGGEST_CHANNEL_ID=
-DEAD_IMAGE_CHANNEL_ID=
-ADD_IDOL_CHANNEL_ID=
-ADD_GROUP_CHANNEL_ID=
-TWITTER_CHANNEL_ID=
-IDOL_POST_LIMIT=40
-IDOL_NO_VOTE_LIMIT=5
-REMINDER_LIMIT=30
-IDOL_SEND_LIMIT=2
-TWITTER_UPDATE_LIMIT=2
-CURRENCY_NAME="Dollar"
-ICON_URL="https://cdn.discordapp.com/emojis/693392862611767336.gif?v=1"
-FOOTER_URL="https://cdn.discordapp.com/emojis/683932986818822174.gif?v=1"
-
-# Reactions/Emotes - Accepts xxxxxxxx and discord supported emojis (never include the U at the start) 
-TRASH_EMOJI=0001f5d1
-CHECK_MARK_EMOJI=00002705
-RELOAD_IMAGE_EMOJI=<:ReloadImage:694109526491922463>
-DEAD_LINK_EMOJI=<:DeadLink:695787733460844645>
-PREVIOUS_EMOJI=00002b05
-NEXT_EMOJI=000027a1
-
-# Twitter
-TWITTER_ACCOUNT_ID=
-TWITTER_USERNAME=
-TWITTER_CONSUMER_KEY=
-TWITTER_CONSUMER_SECRET=
-TWITTER_ACCESS_KEY=
-TWITTER_ACCESS_SECRET=
-
-
-# Spotify
-SPOTIFY_CLIENT_ID=
-SPOTIFY_CLIENT_SECRET=
-
-
-# Oxford
-OXFORD_APP_ID=
-OXFORD_APP_KEY=
-
-# Urban
-URBAN_HOST=mashape-community-urban-dictionary.p.rapidapi.com
-URBAN_KEY=
-
-# Tenor
-TENOR_KEY=
-
-# Top.gg
-TOP_GG_KEY=
-TOP_GG_WEBHOOK=
-
-# Discord Boats
-DISCORD_BOATS_KEY=
-
-# Postgres
-POSTGRES_HOST=localhost
-POSTGRES_DATABASE=postgres
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=password
-
-# Wavelink
-WAVELINK_HOST="127.0.0.1"
-WAVELINK_PORT=2333
-WAVELINK_URI="http://127.0.0.1:2333"
-WAVELINK_PASSWORD=
-
-# Papago
-PAPAGO_CLIENT_ID=
-PAPAGO_CLIENT_SECRET=
-
-# LastFM
-LAST_API_KEY=
-LAST_SHARED_SECRET=
-LAST_ROOT_URL=http://ws.audioscrobbler.com/2.0/
-LAST_USER_AGENT=
-
-# Patreon
-PATREON_LINK=
-PATREON_ROLE_ID=
-PATREON_SUPER_ROLE_ID=
-
-# Translator/Proofreader/DataMod
-TRANSLATOR_ROLE_ID=
-PROOFREADER_ROLE_ID=
-DATAMOD_ROLE_ID=
-DATAMOD_LOG_CHANNEL_ID=
+BOT_OWNER_ID=
+BOT_NAME=
+BOT_DEFAULT_PREFIX=
+
+# Database Server (DB) (Preferred PostgreSQL)
+DB_HOST=
+DB_NAME=
+DB_USER=
+DB_PASS=
+
+# Support Server
+SUPPORT_SERVER_ID=703549827044343858
+BOT_OWNER_ONLY_SERVERS=703549827044343858,689682763246469129
+
+# URLS
+BOT_INVITE_URL=
+BOT_WEBSITE_URL=
+BOT_IMAGE_HOST_URL=
+SUPPORT_SERVER_INVITE_URL=
+EMBED_ICON_URL=
+EMBED_FOOTER_URL=
+API_URL=localhost
+
+# Channel IDS (CID)
+ADD_IDOL_CID=
+ADD_GROUP_CID=
+TWITTER_CID=
+DM_LOG_CID=
+BUG_CID=
+SUGGEST_CID=
+
+# PORTS
+PRT_DB=
+PRT_SITE=
+PRT_API=
+PRT_WL=
+
+# Role IDS (RID)
+RID_PAT=
+RID_SUPER_PAT=
+RID_TL=
+RID_PR=
+RID_DM=
+
+# Directories (DIR) (Include / at end)
+DIR_AVATARS=
+DIR_BANNERS=
+DIR_BG=
+DIR_BJ=
+
+# Restrictions (LIM = LIMIT) (TWT = Twitter) (RMD=REMINDER)
+LIM_POST=
+LIM_NO_VOTE=
+LIM_AUTO_SEND=
+LIM_TWT_UPDATE=
+LIM_RMD=
+
+# Reactions/Emotes - Accepts xxxxxxxx and discord supported emojis (never include the U at the start)
+TRASH_EM=
+CHECKMARK_EM=
+F_EM=
+CAUTION_EM=
+PREVIOUS_EM=
+NEXT_EM=
+
+# Twitter (TWT) Bot Information
+TWT_ACCOUNT_ID=
+TWT_USERNAME=
+TWT_CONSUMER_KEY=
+TWT_CONSUMER_SECRET=
+TWT_ACCESS_KEY=
+TWT_ACCESS_SECRET=
+
+# Spotify (SPO)
+SPO_ID
+SPO_SECRET=
+
+# Oxford Dictionary (OX)
+OX_ID=
+OX_KEY=
+
+# Urban Dictionary (URB)
+URB_HOST=
+URB_KEY=
+
+# Tenor (TNR)
+TNR_KEY=
+
+# Top.gg (TOP)
+TOP_KEY=
+TOP_WEBHOOK_KEY=
+
+# Discord Boats (BOATS)
+BOATS_KEY=
+
+# Wavelink Server (WL)
+WL_HOST
+WL_URI
+WL_PASS
+
+# Papago (PAP)
+PAP_ID=
+PAP_SECRET=
+
+# LastFM (FM)
+FM_KEY=
+FM_SECRET=
+FM_URL=
+FM_AGENT=
+
+# Patreon (PAT)
+PAT_LINK=
 
 # Wolfram
-WOLFRAM_APP_ID=
-
-# Lyrics API KEY - https://github.com/KSoft-Si/ksoftapi.py
-LYRICS_API_KEY =
-
-# Idol Avatar Location (include / at the end)
-IDOL_AVATAR_LOCATION="Photos/avatar/"
-
-# Idol Banner Location (include / at the end)
-IDOL_BANNER_LOCATION="Photos/banner/"
+WOLFRAM_ID=
 
-# Bias Game Folder Location (include / at the end)
-BIAS_GAME_LOCATION="Photos/bias_game/"
+# KSoftAPI Lyrics (LYR)
+LYR_KEY=
 
-# DataDog - DO NOT CHANGE NAMES OF THESE ENV VARIABLES - https://github.com/DataDog/datadogpy
-DATADOG_API_KEY=
-DATADOG_APP_KEY=
+# DataDog (DD)
+DD_API_KEY=
+DD_APP_KEY=
 
-# Twitch
-TWITCH_CLIENT_ID=
-TWITCH_CLIENT_SECRET=
+# Twitch (TWCH)
+TWCH_ID=
+TWCH_SECRET=
 
-# Vlive
-VLIVE_BASE_URL=http://api.vfan.vlive.tv/vproxy/channelplus
-VLIVE_APP_ID=8c6cc7b45d2568fb668be6e05b6e5a3b
+# IreneAPI
+API_TOKEN=test
 
-# BlackJack Card Location
-CARD_LOCATION="Photos/cards/"
+# Weverse Implementation moved to https://github.com/MujyKun/Weverse
+# UCube Implementation in https://github.com/MujyKun/united-cube
 
-# API
-API_PORT=5454
-# Private Keys are separated by commas
-PRIVATE_KEYS=
-FOLDER_LOCATION=
-REDIRECT_LOGIN=
-DISCORD_SCOPES=
-DISCORD_ENDPOINT_TOKEN=
-DISCORD_ENDPOINT_AUTHORIZE=
-DISCORD_CLIENT_ID=
-DISCORD_CLIENT_SECRET=
 
-# MAIN SITE
-SITE_PORT=4848

.gitignore

@@ -11,4 +11,5 @@ venv/
 API/
 bias_game/
 idol/
-languages/IreneBot (translations).zip
+languages/IreneBot (translations).zip
+.env_real

.pre-commit-config.yaml

@@ -0,0 +1,5 @@
+repos:
+  - repo: https://github.com/psf/black
+    rev: 21.12b0
+    hooks:
+    -   id: black