mirror of
https://github.com/Cog-Creators/Red-DiscordBot.git
synced 2025-11-07 19:58:54 -05:00
[Core] CLI flags, env vars login, revamped setup, in. selfbot support, etc (#513)
Startup flags: can be started and configured without ever doing the interactive setup Changed default settings format so that all unset values are None Removed new cogs prompt Removed `LOGIN_TYPE` from settings.json. It now defaults to token and fallbacks to email/password Smarter initial setup: only asks for the settings that are actually missing For the first installation all default cogs are loaded Startup flag that allows settings to be memory-only Initial selfbot support Only reset login credentials (on confirmation) instead of deleting the whole file in case of login failure Revamped main screen Made sure that nothing blows up when you run Red on Windows without `chcp 65001` Possibility of setting credentials in the environment variables `RED_TOKEN` / `RED_EMAIL` `RED_PASSWORD`. They will take priority over the configuration stored on disk.
This commit is contained in:
parent
8d83a5ae3a
commit
27bdce7f32
@ -1378,7 +1378,7 @@ def setup(bot):
|
|||||||
global logger
|
global logger
|
||||||
check_folders()
|
check_folders()
|
||||||
check_files()
|
check_files()
|
||||||
logger = logging.getLogger("mod")
|
logger = logging.getLogger("red.mod")
|
||||||
# Prevents the logger from being loaded again in case of module reload
|
# Prevents the logger from being loaded again in case of module reload
|
||||||
if logger.level == 0:
|
if logger.level == 0:
|
||||||
logger.setLevel(logging.INFO)
|
logger.setLevel(logging.INFO)
|
||||||
|
|||||||
@ -225,10 +225,13 @@ class Owner:
|
|||||||
result = str(result)
|
result = str(result)
|
||||||
|
|
||||||
if not ctx.message.channel.is_private:
|
if not ctx.message.channel.is_private:
|
||||||
censor = (self.bot.settings.email, self.bot.settings.password)
|
censor = (self.bot.settings.email,
|
||||||
|
self.bot.settings.password,
|
||||||
|
self.bot.settings.token)
|
||||||
r = "[EXPUNGED]"
|
r = "[EXPUNGED]"
|
||||||
for w in censor:
|
for w in censor:
|
||||||
if w != "":
|
if w is None or w == "":
|
||||||
|
continue
|
||||||
result = result.replace(w, r)
|
result = result.replace(w, r)
|
||||||
result = result.replace(w.lower(), r)
|
result = result.replace(w.lower(), r)
|
||||||
result = result.replace(w.upper(), r)
|
result = result.replace(w.upper(), r)
|
||||||
@ -263,11 +266,16 @@ class Owner:
|
|||||||
@_set.command(pass_context=True)
|
@_set.command(pass_context=True)
|
||||||
async def owner(self, ctx):
|
async def owner(self, ctx):
|
||||||
"""Sets owner"""
|
"""Sets owner"""
|
||||||
|
if self.bot.settings.no_prompt is True:
|
||||||
|
await self.bot.say("Console interaction is disabled. Start Red "
|
||||||
|
"without the `--no-prompt` flag to use this "
|
||||||
|
"command.")
|
||||||
|
return
|
||||||
if self.setowner_lock:
|
if self.setowner_lock:
|
||||||
await self.bot.say("A set owner command is already pending.")
|
await self.bot.say("A set owner command is already pending.")
|
||||||
return
|
return
|
||||||
|
|
||||||
if self.bot.settings.owner != "id_here":
|
if self.bot.settings.owner is not None:
|
||||||
await self.bot.say(
|
await self.bot.say(
|
||||||
"The owner is already set. Remember that setting the owner "
|
"The owner is already set. Remember that setting the owner "
|
||||||
"to someone else other than who hosts the bot has security "
|
"to someone else other than who hosts the bot has security "
|
||||||
@ -294,6 +302,7 @@ class Owner:
|
|||||||
return
|
return
|
||||||
|
|
||||||
self.bot.settings.prefixes = sorted(prefixes, reverse=True)
|
self.bot.settings.prefixes = sorted(prefixes, reverse=True)
|
||||||
|
self.bot.settings.save_settings()
|
||||||
log.debug("Setting global prefixes to:\n\t{}"
|
log.debug("Setting global prefixes to:\n\t{}"
|
||||||
"".format(self.bot.settings.prefixes))
|
"".format(self.bot.settings.prefixes))
|
||||||
|
|
||||||
@ -315,6 +324,7 @@ class Owner:
|
|||||||
|
|
||||||
if prefixes == ():
|
if prefixes == ():
|
||||||
self.bot.settings.set_server_prefixes(server, [])
|
self.bot.settings.set_server_prefixes(server, [])
|
||||||
|
self.bot.settings.save_settings()
|
||||||
current_p = ", ".join(self.bot.settings.prefixes)
|
current_p = ", ".join(self.bot.settings.prefixes)
|
||||||
await self.bot.say("Server prefixes reset. Current prefixes: "
|
await self.bot.say("Server prefixes reset. Current prefixes: "
|
||||||
"`{}`".format(current_p))
|
"`{}`".format(current_p))
|
||||||
@ -322,6 +332,7 @@ class Owner:
|
|||||||
|
|
||||||
prefixes = sorted(prefixes, reverse=True)
|
prefixes = sorted(prefixes, reverse=True)
|
||||||
self.bot.settings.set_server_prefixes(server, prefixes)
|
self.bot.settings.set_server_prefixes(server, prefixes)
|
||||||
|
self.bot.settings.save_settings()
|
||||||
log.debug("Setting server's {} prefixes to:\n\t{}"
|
log.debug("Setting server's {} prefixes to:\n\t{}"
|
||||||
"".format(server.id, self.bot.settings.prefixes))
|
"".format(server.id, self.bot.settings.prefixes))
|
||||||
|
|
||||||
@ -472,9 +483,8 @@ class Owner:
|
|||||||
if len(token) < 50:
|
if len(token) < 50:
|
||||||
await self.bot.say("Invalid token.")
|
await self.bot.say("Invalid token.")
|
||||||
else:
|
else:
|
||||||
self.bot.settings.login_type = "token"
|
self.bot.settings.token = token
|
||||||
self.bot.settings.email = token
|
self.bot.settings.save_settings()
|
||||||
self.bot.settings.password = ""
|
|
||||||
await self.bot.say("Token set. Restart me.")
|
await self.bot.say("Token set. Restart me.")
|
||||||
log.debug("Token changed.")
|
log.debug("Token changed.")
|
||||||
|
|
||||||
@ -645,7 +655,7 @@ class Owner:
|
|||||||
@commands.command(pass_context=True)
|
@commands.command(pass_context=True)
|
||||||
async def contact(self, ctx, *, message : str):
|
async def contact(self, ctx, *, message : str):
|
||||||
"""Sends message to the owner"""
|
"""Sends message to the owner"""
|
||||||
if self.bot.settings.owner == "id_here":
|
if self.bot.settings.owner is None:
|
||||||
await self.bot.say("I have no owner set.")
|
await self.bot.say("I have no owner set.")
|
||||||
return
|
return
|
||||||
owner = discord.utils.get(self.bot.get_all_members(),
|
owner = discord.utils.get(self.bot.get_all_members(),
|
||||||
@ -684,7 +694,7 @@ class Owner:
|
|||||||
py_version = "[{}.{}.{}]({})".format(*os.sys.version_info[:3],
|
py_version = "[{}.{}.{}]({})".format(*os.sys.version_info[:3],
|
||||||
python_url)
|
python_url)
|
||||||
|
|
||||||
owner_set = self.bot.settings.owner != "id_here"
|
owner_set = self.bot.settings.owner is not None
|
||||||
owner = self.bot.settings.owner if owner_set else None
|
owner = self.bot.settings.owner if owner_set else None
|
||||||
if owner:
|
if owner:
|
||||||
owner = discord.utils.get(self.bot.get_all_members(), id=owner)
|
owner = discord.utils.get(self.bot.get_all_members(), id=owner)
|
||||||
@ -782,6 +792,7 @@ class Owner:
|
|||||||
|
|
||||||
if choice == "yes":
|
if choice == "yes":
|
||||||
self.bot.settings.owner = author.id
|
self.bot.settings.owner = author.id
|
||||||
|
self.bot.settings.save_settings()
|
||||||
print(author.name + " has been set as owner.")
|
print(author.name + " has been set as owner.")
|
||||||
self.setowner_lock = False
|
self.setowner_lock = False
|
||||||
self.owner.hidden = True
|
self.owner.hidden = True
|
||||||
|
|||||||
@ -1,6 +1,9 @@
|
|||||||
from .dataIO import dataIO
|
from .dataIO import dataIO
|
||||||
|
from copy import deepcopy
|
||||||
import discord
|
import discord
|
||||||
import os
|
import os
|
||||||
|
import argparse
|
||||||
|
|
||||||
|
|
||||||
default_path = "data/red/settings.json"
|
default_path = "data/red/settings.json"
|
||||||
|
|
||||||
@ -11,14 +14,19 @@ class Settings:
|
|||||||
self.path = path
|
self.path = path
|
||||||
self.check_folders()
|
self.check_folders()
|
||||||
self.default_settings = {
|
self.default_settings = {
|
||||||
"EMAIL": "EmailHere", "PASSWORD": "", "OWNER": "id_here",
|
"TOKEN": None,
|
||||||
|
"EMAIL": None,
|
||||||
|
"PASSWORD": None,
|
||||||
|
"OWNER": None,
|
||||||
"PREFIXES": [],
|
"PREFIXES": [],
|
||||||
"default": {"ADMIN_ROLE": "Transistor",
|
"default": {"ADMIN_ROLE": "Transistor",
|
||||||
"MOD_ROLE": "Process",
|
"MOD_ROLE": "Process",
|
||||||
"PREFIXES": []},
|
"PREFIXES": []}
|
||||||
"LOGIN_TYPE": "email"}
|
}
|
||||||
|
self.memory_only = False
|
||||||
|
|
||||||
if not dataIO.is_valid_json(self.path):
|
if not dataIO.is_valid_json(self.path):
|
||||||
self.bot_settings = self.default_settings
|
self.bot_settings = deepcopy(self.default_settings)
|
||||||
self.save_settings()
|
self.save_settings()
|
||||||
else:
|
else:
|
||||||
current = dataIO.load_json(self.path)
|
current = dataIO.load_json(self.path)
|
||||||
@ -30,8 +38,58 @@ class Settings:
|
|||||||
" field to red settings.json")
|
" field to red settings.json")
|
||||||
dataIO.save_json(self.path, current)
|
dataIO.save_json(self.path, current)
|
||||||
self.bot_settings = dataIO.load_json(self.path)
|
self.bot_settings = dataIO.load_json(self.path)
|
||||||
|
|
||||||
if "default" not in self.bot_settings:
|
if "default" not in self.bot_settings:
|
||||||
self.update_old_settings()
|
self.update_old_settings_v1()
|
||||||
|
|
||||||
|
if "LOGIN_TYPE" in self.bot_settings:
|
||||||
|
self.update_old_settings_v2()
|
||||||
|
|
||||||
|
self.parse_cmd_arguments()
|
||||||
|
|
||||||
|
def parse_cmd_arguments(self):
|
||||||
|
parser = argparse.ArgumentParser(description="Red - Discord Bot")
|
||||||
|
parser.add_argument("--owner", help="ID of the owner. Only who hosts "
|
||||||
|
"Red should be owner, this has "
|
||||||
|
"security implications")
|
||||||
|
parser.add_argument("--prefix", "-p", action="append",
|
||||||
|
help="Global prefix. Can be multiple")
|
||||||
|
parser.add_argument("--admin-role", help="Role seen as admin role by "
|
||||||
|
"Red")
|
||||||
|
parser.add_argument("--mod-role", help="Role seen as mod role by Red")
|
||||||
|
parser.add_argument("--no-prompt",
|
||||||
|
action="store_true",
|
||||||
|
help="Disables console inputs. Features requiring "
|
||||||
|
"console interaction could be disabled as a "
|
||||||
|
"result")
|
||||||
|
parser.add_argument("--self-bot",
|
||||||
|
action='store_true',
|
||||||
|
help="Specifies if Red should log in as selfbot")
|
||||||
|
parser.add_argument("--memory-only",
|
||||||
|
action="store_true",
|
||||||
|
help="Arguments passed and future edits to the "
|
||||||
|
"settings will not be saved to disk")
|
||||||
|
parser.add_argument("--debug",
|
||||||
|
action="store_true",
|
||||||
|
help="Enables debug mode")
|
||||||
|
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
if args.owner:
|
||||||
|
self.owner = args.owner
|
||||||
|
if args.prefix:
|
||||||
|
self.prefixes = sorted(args.prefix, reverse=True)
|
||||||
|
if args.admin_role:
|
||||||
|
self.default_admin = args.admin_role
|
||||||
|
if args.mod_role:
|
||||||
|
self.default_mod = args.mod_role
|
||||||
|
|
||||||
|
self.no_prompt = args.no_prompt
|
||||||
|
self.self_bot = args.self_bot
|
||||||
|
self.memory_only = args.memory_only
|
||||||
|
self.debug = args.debug
|
||||||
|
|
||||||
|
self.save_settings()
|
||||||
|
|
||||||
def check_folders(self):
|
def check_folders(self):
|
||||||
folders = ("data", os.path.dirname(self.path), "cogs", "cogs/utils")
|
folders = ("data", os.path.dirname(self.path), "cogs", "cogs/utils")
|
||||||
@ -41,16 +99,35 @@ class Settings:
|
|||||||
os.makedirs(folder)
|
os.makedirs(folder)
|
||||||
|
|
||||||
def save_settings(self):
|
def save_settings(self):
|
||||||
|
if not self.memory_only:
|
||||||
dataIO.save_json(self.path, self.bot_settings)
|
dataIO.save_json(self.path, self.bot_settings)
|
||||||
|
|
||||||
def update_old_settings(self):
|
def update_old_settings_v1(self):
|
||||||
|
# This converts the old settings format
|
||||||
mod = self.bot_settings["MOD_ROLE"]
|
mod = self.bot_settings["MOD_ROLE"]
|
||||||
admin = self.bot_settings["ADMIN_ROLE"]
|
admin = self.bot_settings["ADMIN_ROLE"]
|
||||||
del self.bot_settings["MOD_ROLE"]
|
del self.bot_settings["MOD_ROLE"]
|
||||||
del self.bot_settings["ADMIN_ROLE"]
|
del self.bot_settings["ADMIN_ROLE"]
|
||||||
self.bot_settings["default"] = {"MOD_ROLE": mod,
|
self.bot_settings["default"] = {"MOD_ROLE": mod,
|
||||||
"ADMIN_ROLE": admin,
|
"ADMIN_ROLE": admin,
|
||||||
"PREFIXES" : []}
|
"PREFIXES": []
|
||||||
|
}
|
||||||
|
self.save_settings()
|
||||||
|
|
||||||
|
def update_old_settings_v2(self):
|
||||||
|
# The joys of backwards compatibility
|
||||||
|
settings = self.bot_settings
|
||||||
|
if settings["EMAIL"] == "EmailHere":
|
||||||
|
settings["EMAIL"] = None
|
||||||
|
if settings["PASSWORD"] == "":
|
||||||
|
settings["PASSWORD"] = None
|
||||||
|
if settings["LOGIN_TYPE"] == "token":
|
||||||
|
settings["TOKEN"] = settings["EMAIL"]
|
||||||
|
settings["EMAIL"] = None
|
||||||
|
settings["PASSWORD"] = None
|
||||||
|
else:
|
||||||
|
settings["TOKEN"] = None
|
||||||
|
del settings["LOGIN_TYPE"]
|
||||||
self.save_settings()
|
self.save_settings()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
@ -60,25 +137,42 @@ class Settings:
|
|||||||
@owner.setter
|
@owner.setter
|
||||||
def owner(self, value):
|
def owner(self, value):
|
||||||
self.bot_settings["OWNER"] = value
|
self.bot_settings["OWNER"] = value
|
||||||
self.save_settings()
|
|
||||||
|
@property
|
||||||
|
def token(self):
|
||||||
|
return os.environ.get("RED_TOKEN", self.bot_settings["TOKEN"])
|
||||||
|
|
||||||
|
@token.setter
|
||||||
|
def token(self, value):
|
||||||
|
self.bot_settings["TOKEN"] = value
|
||||||
|
self.bot_settings["EMAIL"] = None
|
||||||
|
self.bot_settings["PASSWORD"] = None
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def email(self):
|
def email(self):
|
||||||
return self.bot_settings["EMAIL"]
|
return os.environ.get("RED_EMAIL", self.bot_settings["EMAIL"])
|
||||||
|
|
||||||
@email.setter
|
@email.setter
|
||||||
def email(self, value):
|
def email(self, value):
|
||||||
self.bot_settings["EMAIL"] = value
|
self.bot_settings["EMAIL"] = value
|
||||||
self.save_settings()
|
self.bot_settings["TOKEN"] = None
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def password(self):
|
def password(self):
|
||||||
return self.bot_settings["PASSWORD"]
|
return os.environ.get("RED_PASSWORD", self.bot_settings["PASSWORD"])
|
||||||
|
|
||||||
@password.setter
|
@password.setter
|
||||||
def password(self, value):
|
def password(self, value):
|
||||||
self.bot_settings["PASSWORD"] = value
|
self.bot_settings["PASSWORD"] = value
|
||||||
self.save_settings()
|
|
||||||
|
@property
|
||||||
|
def login_credentials(self):
|
||||||
|
if self.token:
|
||||||
|
return (self.token,)
|
||||||
|
elif self.email and self.password:
|
||||||
|
return (self.email, self.password)
|
||||||
|
else:
|
||||||
|
return tuple()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def prefixes(self):
|
def prefixes(self):
|
||||||
@ -88,7 +182,6 @@ class Settings:
|
|||||||
def prefixes(self, value):
|
def prefixes(self, value):
|
||||||
assert isinstance(value, list)
|
assert isinstance(value, list)
|
||||||
self.bot_settings["PREFIXES"] = value
|
self.bot_settings["PREFIXES"] = value
|
||||||
self.save_settings()
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def default_admin(self):
|
def default_admin(self):
|
||||||
@ -101,20 +194,18 @@ class Settings:
|
|||||||
if "default" not in self.bot_settings:
|
if "default" not in self.bot_settings:
|
||||||
self.update_old_settings()
|
self.update_old_settings()
|
||||||
self.bot_settings["default"]["ADMIN_ROLE"] = value
|
self.bot_settings["default"]["ADMIN_ROLE"] = value
|
||||||
self.save_settings()
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def default_mod(self):
|
def default_mod(self):
|
||||||
if "default" not in self.bot_settings:
|
if "default" not in self.bot_settings:
|
||||||
self.update_old_settings()
|
self.update_old_settings_v1()
|
||||||
return self.bot_settings["default"].get("MOD_ROLE", "")
|
return self.bot_settings["default"].get("MOD_ROLE", "")
|
||||||
|
|
||||||
@default_mod.setter
|
@default_mod.setter
|
||||||
def default_mod(self, value):
|
def default_mod(self, value):
|
||||||
if "default" not in self.bot_settings:
|
if "default" not in self.bot_settings:
|
||||||
self.update_old_settings()
|
self.update_old_settings_v1()
|
||||||
self.bot_settings["default"]["MOD_ROLE"] = value
|
self.bot_settings["default"]["MOD_ROLE"] = value
|
||||||
self.save_settings()
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def servers(self):
|
def servers(self):
|
||||||
@ -125,15 +216,6 @@ class Settings:
|
|||||||
ret.update({server: self.bot_settings[server]})
|
ret.update({server: self.bot_settings[server]})
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
@property
|
|
||||||
def login_type(self):
|
|
||||||
return self.bot_settings["LOGIN_TYPE"]
|
|
||||||
|
|
||||||
@login_type.setter
|
|
||||||
def login_type(self, value):
|
|
||||||
self.bot_settings["LOGIN_TYPE"] = value
|
|
||||||
self.save_settings()
|
|
||||||
|
|
||||||
def get_server(self, server):
|
def get_server(self, server):
|
||||||
if server is None:
|
if server is None:
|
||||||
return self.bot_settings["default"].copy()
|
return self.bot_settings["default"].copy()
|
||||||
|
|||||||
281
red.py
281
red.py
@ -1,10 +1,8 @@
|
|||||||
import asyncio
|
import asyncio
|
||||||
import os
|
import os
|
||||||
import time
|
|
||||||
import sys
|
import sys
|
||||||
import logging
|
import logging
|
||||||
import logging.handlers
|
import logging.handlers
|
||||||
import shutil
|
|
||||||
import traceback
|
import traceback
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
@ -29,6 +27,7 @@ from cogs.utils.settings import Settings
|
|||||||
from cogs.utils.dataIO import dataIO
|
from cogs.utils.dataIO import dataIO
|
||||||
from cogs.utils.chat_formatting import inline
|
from cogs.utils.chat_formatting import inline
|
||||||
from collections import Counter
|
from collections import Counter
|
||||||
|
from io import TextIOWrapper
|
||||||
|
|
||||||
#
|
#
|
||||||
# Red, a Discord bot by Twentysix, based on discord.py and its command
|
# Red, a Discord bot by Twentysix, based on discord.py and its command
|
||||||
@ -61,9 +60,11 @@ class Bot(commands.Bot):
|
|||||||
return bot.settings.get_prefixes(message.server)
|
return bot.settings.get_prefixes(message.server)
|
||||||
|
|
||||||
self.counter = Counter()
|
self.counter = Counter()
|
||||||
self.uptime = datetime.datetime.now()
|
self.uptime = datetime.datetime.now() # Will be refreshed before login
|
||||||
self._message_modifiers = []
|
self._message_modifiers = []
|
||||||
self.settings = Settings()
|
self.settings = Settings()
|
||||||
|
self._intro_displayed = False
|
||||||
|
kwargs["self_bot"] = self.settings.self_bot
|
||||||
super().__init__(*args, command_prefix=prefix_manager, **kwargs)
|
super().__init__(*args, command_prefix=prefix_manager, **kwargs)
|
||||||
|
|
||||||
async def send_message(self, *args, **kwargs):
|
async def send_message(self, *args, **kwargs):
|
||||||
@ -119,20 +120,23 @@ class Bot(commands.Bot):
|
|||||||
|
|
||||||
async def send_cmd_help(self, ctx):
|
async def send_cmd_help(self, ctx):
|
||||||
if ctx.invoked_subcommand:
|
if ctx.invoked_subcommand:
|
||||||
pages = bot.formatter.format_help_for(ctx, ctx.invoked_subcommand)
|
pages = self.formatter.format_help_for(ctx, ctx.invoked_subcommand)
|
||||||
for page in pages:
|
for page in pages:
|
||||||
await bot.send_message(ctx.message.channel, page)
|
await self.send_message(ctx.message.channel, page)
|
||||||
else:
|
else:
|
||||||
pages = bot.formatter.format_help_for(ctx, ctx.command)
|
pages = self.formatter.format_help_for(ctx, ctx.command)
|
||||||
for page in pages:
|
for page in pages:
|
||||||
await bot.send_message(ctx.message.channel, page)
|
await self.send_message(ctx.message.channel, page)
|
||||||
|
|
||||||
def user_allowed(self, message):
|
def user_allowed(self, message):
|
||||||
author = message.author
|
author = message.author
|
||||||
|
|
||||||
if author.bot or author == self.user:
|
if author.bot:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
if author == self.user:
|
||||||
|
return self.settings.self_bot
|
||||||
|
|
||||||
mod = self.get_cog('Mod')
|
mod = self.get_cog('Mod')
|
||||||
|
|
||||||
if mod is not None:
|
if mod is not None:
|
||||||
@ -195,34 +199,62 @@ settings = bot.settings
|
|||||||
|
|
||||||
@bot.event
|
@bot.event
|
||||||
async def on_ready():
|
async def on_ready():
|
||||||
|
if bot._intro_displayed:
|
||||||
|
return
|
||||||
|
bot._intro_displayed = True
|
||||||
|
|
||||||
owner_cog = bot.get_cog('Owner')
|
owner_cog = bot.get_cog('Owner')
|
||||||
total_cogs = len(owner_cog._list_cogs())
|
total_cogs = len(owner_cog._list_cogs())
|
||||||
users = len(set(bot.get_all_members()))
|
users = len(set(bot.get_all_members()))
|
||||||
servers = len(bot.servers)
|
servers = len(bot.servers)
|
||||||
channels = len([c for c in bot.get_all_channels()])
|
channels = len([c for c in bot.get_all_channels()])
|
||||||
if settings.login_type == "token" and settings.owner == "id_here":
|
|
||||||
await set_bot_owner()
|
login_time = datetime.datetime.now() - bot.uptime
|
||||||
print('------')
|
login_time = login_time.seconds + login_time.microseconds/1E6
|
||||||
print("{} is now online.".format(bot.user.name))
|
|
||||||
print('------')
|
print("Login successful. ({}ms)\n".format(login_time))
|
||||||
print("Connected to:")
|
|
||||||
|
owner = await set_bot_owner()
|
||||||
|
|
||||||
|
print("-----------------")
|
||||||
|
print("Red - Discord Bot")
|
||||||
|
print("-----------------")
|
||||||
|
print(str(bot.user))
|
||||||
|
print("\nConnected to:")
|
||||||
print("{} servers".format(servers))
|
print("{} servers".format(servers))
|
||||||
print("{} channels".format(channels))
|
print("{} channels".format(channels))
|
||||||
print("{} users".format(users))
|
print("{} users\n".format(users))
|
||||||
print("\n{}/{} active cogs with {} commands".format(
|
|
||||||
len(bot.cogs), total_cogs, len(bot.commands)))
|
|
||||||
prefix_label = "Prefixes:" if len(settings.prefixes) > 1 else "Prefix:"
|
prefix_label = "Prefixes:" if len(settings.prefixes) > 1 else "Prefix:"
|
||||||
print("{} {}\n".format(prefix_label, " ".join(settings.prefixes)))
|
print("{} {}".format(prefix_label, " ".join(settings.prefixes)))
|
||||||
if settings.login_type == "token":
|
print("Owner: " + str(owner))
|
||||||
print("------")
|
print("{}/{} active cogs with {} commands".format(
|
||||||
print("Use this url to bring your bot to a server:")
|
len(bot.cogs), total_cogs, len(bot.commands)))
|
||||||
|
print("-----------------")
|
||||||
|
|
||||||
|
if settings.token and not settings.self_bot:
|
||||||
|
print("\nUse this url to bring your bot to a server:")
|
||||||
url = await get_oauth_url()
|
url = await get_oauth_url()
|
||||||
bot.oauth_url = url
|
bot.oauth_url = url
|
||||||
print(url)
|
print(url)
|
||||||
print("------")
|
|
||||||
|
print("\nOfficial server: https://discord.me/Red-DiscordBot")
|
||||||
|
|
||||||
|
if os.name == "nt" and os.path.isfile("update.bat"):
|
||||||
|
print("\nMake sure to keep your bot updated by running the file "
|
||||||
|
"update.bat")
|
||||||
|
else:
|
||||||
|
print("\nMake sure to keep your bot updated by using: git pull")
|
||||||
|
print("and: pip3 install -U git+https://github.com/Rapptz/"
|
||||||
|
"discord.py@master#egg=discord.py[voice]")
|
||||||
|
|
||||||
await bot.get_cog('Owner').disable_commands()
|
await bot.get_cog('Owner').disable_commands()
|
||||||
|
|
||||||
|
|
||||||
|
@bot.event
|
||||||
|
async def on_resumed():
|
||||||
|
bot.counter["session_resumed"] += 1
|
||||||
|
|
||||||
|
|
||||||
@bot.event
|
@bot.event
|
||||||
async def on_command(command, ctx):
|
async def on_command(command, ctx):
|
||||||
bot.counter["processed_commands"] += 1
|
bot.counter["processed_commands"] += 1
|
||||||
@ -271,13 +303,34 @@ async def get_oauth_url():
|
|||||||
|
|
||||||
|
|
||||||
async def set_bot_owner():
|
async def set_bot_owner():
|
||||||
|
if settings.self_bot:
|
||||||
|
settings.owner = bot.user.id
|
||||||
|
return "[Selfbot mode]"
|
||||||
|
|
||||||
|
if bot.settings.owner:
|
||||||
|
owner = discord.utils.get(bot.get_all_members(),
|
||||||
|
id=bot.settings.owner)
|
||||||
|
if not owner:
|
||||||
|
try:
|
||||||
|
owner = await bot.get_user_info(bot.settings.owner)
|
||||||
|
except:
|
||||||
|
owner = None
|
||||||
|
else:
|
||||||
|
owner = bot.settings.owner # Just the ID then
|
||||||
|
return owner
|
||||||
|
|
||||||
|
how_to = "Do `[p]set owner` in chat to set it"
|
||||||
|
|
||||||
|
if bot.user.bot: # Can fetch owner
|
||||||
try:
|
try:
|
||||||
data = await bot.application_info()
|
data = await bot.application_info()
|
||||||
settings.owner = data.owner.id
|
settings.owner = data.owner.id
|
||||||
except Exception as e:
|
settings.save_settings()
|
||||||
print("Couldn't retrieve owner's ID. Error: {}".format(e))
|
return data.owner
|
||||||
return
|
except:
|
||||||
print("{} has been recognized and set as owner.".format(data.owner.name))
|
return "Failed to fetch owner. " + how_to
|
||||||
|
else:
|
||||||
|
return "Yet to be set. " + how_to
|
||||||
|
|
||||||
|
|
||||||
def check_folders():
|
def check_folders():
|
||||||
@ -288,30 +341,30 @@ def check_folders():
|
|||||||
os.makedirs(folder)
|
os.makedirs(folder)
|
||||||
|
|
||||||
|
|
||||||
def check_configs():
|
def interactive_setup():
|
||||||
if settings.bot_settings == settings.default_settings:
|
first_run = settings.bot_settings == settings.default_settings
|
||||||
|
|
||||||
|
if first_run:
|
||||||
print("Red - First run configuration\n")
|
print("Red - First run configuration\n")
|
||||||
print("If you haven't already, create a new account:\n"
|
print("If you haven't already, create a new account:\n"
|
||||||
"https://twentysix26.github.io/Red-Docs/red_guide_bot_accounts/"
|
"https://twentysix26.github.io/Red-Docs/red_guide_bot_accounts/"
|
||||||
"#creating-a-new-bot-account")
|
"#creating-a-new-bot-account")
|
||||||
print("and obtain your bot's token like described.")
|
print("and obtain your bot's token like described.")
|
||||||
|
|
||||||
|
if not settings.login_credentials:
|
||||||
print("\nInsert your bot's token:")
|
print("\nInsert your bot's token:")
|
||||||
|
while settings.token is None and settings.email is None:
|
||||||
choice = input("> ")
|
choice = input("> ")
|
||||||
|
|
||||||
if "@" not in choice and len(choice) >= 50: # Assuming token
|
if "@" not in choice and len(choice) >= 50: # Assuming token
|
||||||
settings.login_type = "token"
|
settings.token = choice
|
||||||
settings.email = choice
|
|
||||||
elif "@" in choice:
|
elif "@" in choice:
|
||||||
settings.login_type = "email"
|
|
||||||
settings.email = choice
|
settings.email = choice
|
||||||
settings.password = input("\nPassword> ")
|
settings.password = input("\nPassword> ")
|
||||||
else:
|
else:
|
||||||
os.remove('data/red/settings.json')
|
print("That doesn't look like a valid token.")
|
||||||
input("Invalid input. Restart Red and repeat the configuration "
|
settings.save_settings()
|
||||||
"process.")
|
|
||||||
exit(1)
|
|
||||||
|
|
||||||
|
if not settings.prefixes:
|
||||||
print("\nChoose a prefix. A prefix is what you type before a command."
|
print("\nChoose a prefix. A prefix is what you type before a command."
|
||||||
"\nA typical prefix would be the exclamation mark.\n"
|
"\nA typical prefix would be the exclamation mark.\n"
|
||||||
"Can be multiple characters. You will be able to change it "
|
"Can be multiple characters. You will be able to change it "
|
||||||
@ -324,30 +377,17 @@ def check_configs():
|
|||||||
"\nType yes to confirm or no to change it".format(
|
"\nType yes to confirm or no to change it".format(
|
||||||
new_prefix))
|
new_prefix))
|
||||||
confirmation = get_answer()
|
confirmation = get_answer()
|
||||||
|
|
||||||
settings.prefixes = [new_prefix]
|
settings.prefixes = [new_prefix]
|
||||||
if settings.login_type == "email":
|
settings.save_settings()
|
||||||
print("\nOnce you're done with the configuration, you will have to"
|
|
||||||
" type '{}set owner' *in Discord's chat*\nto set yourself as"
|
|
||||||
" owner.\nPress enter to continue".format(new_prefix))
|
|
||||||
settings.owner = input("") # Shh, they will never know it's here
|
|
||||||
if settings.owner == "":
|
|
||||||
settings.owner = "id_here"
|
|
||||||
if not settings.owner.isdigit() or len(settings.owner) < 17:
|
|
||||||
if settings.owner != "id_here":
|
|
||||||
print("\nERROR: What you entered is not a valid ID. Set "
|
|
||||||
"yourself as owner later with {}set owner".format(
|
|
||||||
new_prefix))
|
|
||||||
settings.owner = "id_here"
|
|
||||||
else:
|
|
||||||
settings.owner = "id_here"
|
|
||||||
|
|
||||||
|
if first_run:
|
||||||
print("\nInput the admin role's name. Anyone with this role in Discord"
|
print("\nInput the admin role's name. Anyone with this role in Discord"
|
||||||
" will be able to use the bot's admin commands")
|
" will be able to use the bot's admin commands")
|
||||||
print("Leave blank for default name (Transistor)")
|
print("Leave blank for default name (Transistor)")
|
||||||
settings.default_admin = input("\nAdmin role> ")
|
settings.default_admin = input("\nAdmin role> ")
|
||||||
if settings.default_admin == "":
|
if settings.default_admin == "":
|
||||||
settings.default_admin = "Transistor"
|
settings.default_admin = "Transistor"
|
||||||
|
settings.save_settings()
|
||||||
|
|
||||||
print("\nInput the moderator role's name. Anyone with this role in"
|
print("\nInput the moderator role's name. Anyone with this role in"
|
||||||
" Discord will be able to use the bot's mod commands")
|
" Discord will be able to use the bot's mod commands")
|
||||||
@ -355,29 +395,19 @@ def check_configs():
|
|||||||
settings.default_mod = input("\nModerator role> ")
|
settings.default_mod = input("\nModerator role> ")
|
||||||
if settings.default_mod == "":
|
if settings.default_mod == "":
|
||||||
settings.default_mod = "Process"
|
settings.default_mod = "Process"
|
||||||
|
settings.save_settings()
|
||||||
|
|
||||||
print("\nThe configuration is done. Leave this window always open to"
|
print("\nThe configuration is done. Leave this window always open to"
|
||||||
" keep Red online.\nAll commands will have to be issued through"
|
" keep Red online.\nAll commands will have to be issued through"
|
||||||
" Discord's chat, *this window will now be read only*.\nPress"
|
" Discord's chat, *this window will now be read only*.\n"
|
||||||
" enter to continue")
|
"Please read this guide for a good overview on how Red works:\n"
|
||||||
|
"https://twentysix26.github.io/Red-Docs/red_getting_started/\n"
|
||||||
|
"Press enter to continue")
|
||||||
input("\n")
|
input("\n")
|
||||||
|
|
||||||
if not os.path.isfile("data/red/cogs.json"):
|
|
||||||
print("Creating new cogs.json...")
|
|
||||||
dataIO.save_json("data/red/cogs.json", {})
|
|
||||||
|
|
||||||
|
|
||||||
def set_logger():
|
def set_logger():
|
||||||
global logger
|
global logger
|
||||||
logger = logging.getLogger("discord")
|
|
||||||
logger.setLevel(logging.WARNING)
|
|
||||||
handler = logging.FileHandler(
|
|
||||||
filename='data/red/discord.log', encoding='utf-8', mode='a')
|
|
||||||
handler.setFormatter(logging.Formatter(
|
|
||||||
'%(asctime)s %(levelname)s %(module)s %(funcName)s %(lineno)d: '
|
|
||||||
'%(message)s',
|
|
||||||
datefmt="[%d/%m/%Y %H:%M]"))
|
|
||||||
logger.addHandler(handler)
|
|
||||||
|
|
||||||
logger = logging.getLogger("red")
|
logger = logging.getLogger("red")
|
||||||
logger.setLevel(logging.INFO)
|
logger.setLevel(logging.INFO)
|
||||||
@ -389,7 +419,12 @@ def set_logger():
|
|||||||
|
|
||||||
stdout_handler = logging.StreamHandler(sys.stdout)
|
stdout_handler = logging.StreamHandler(sys.stdout)
|
||||||
stdout_handler.setFormatter(red_format)
|
stdout_handler.setFormatter(red_format)
|
||||||
|
if settings.debug:
|
||||||
|
stdout_handler.setLevel(logging.DEBUG)
|
||||||
|
logger.setLevel(logging.DEBUG)
|
||||||
|
else:
|
||||||
stdout_handler.setLevel(logging.INFO)
|
stdout_handler.setLevel(logging.INFO)
|
||||||
|
logger.setLevel(logging.INFO)
|
||||||
|
|
||||||
fhandler = logging.handlers.RotatingFileHandler(
|
fhandler = logging.handlers.RotatingFileHandler(
|
||||||
filename='data/red/red.log', encoding='utf-8', mode='a',
|
filename='data/red/red.log', encoding='utf-8', mode='a',
|
||||||
@ -399,6 +434,19 @@ def set_logger():
|
|||||||
logger.addHandler(fhandler)
|
logger.addHandler(fhandler)
|
||||||
logger.addHandler(stdout_handler)
|
logger.addHandler(stdout_handler)
|
||||||
|
|
||||||
|
dpy_logger = logging.getLogger("discord")
|
||||||
|
if settings.debug:
|
||||||
|
dpy_logger.setLevel(logging.DEBUG)
|
||||||
|
else:
|
||||||
|
dpy_logger.setLevel(logging.WARNING)
|
||||||
|
handler = logging.FileHandler(
|
||||||
|
filename='data/red/discord.log', encoding='utf-8', mode='a')
|
||||||
|
handler.setFormatter(logging.Formatter(
|
||||||
|
'%(asctime)s %(levelname)s %(module)s %(funcName)s %(lineno)d: '
|
||||||
|
'%(message)s',
|
||||||
|
datefmt="[%d/%m/%Y %H:%M]"))
|
||||||
|
dpy_logger.addHandler(handler)
|
||||||
|
|
||||||
|
|
||||||
def ensure_reply(msg):
|
def ensure_reply(msg):
|
||||||
choice = ""
|
choice = ""
|
||||||
@ -425,7 +473,8 @@ def set_cog(cog, value):
|
|||||||
|
|
||||||
|
|
||||||
def load_cogs():
|
def load_cogs():
|
||||||
no_prompt = "--no-prompt" in sys.argv[1:]
|
defaults = ("alias", "audio", "customcom", "downloader", "economy",
|
||||||
|
"general", "image", "mod", "streams", "trivia")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
registry = dataIO.load_json("data/red/cogs.json")
|
registry = dataIO.load_json("data/red/cogs.json")
|
||||||
@ -435,32 +484,22 @@ def load_cogs():
|
|||||||
bot.load_extension('cogs.owner')
|
bot.load_extension('cogs.owner')
|
||||||
owner_cog = bot.get_cog('Owner')
|
owner_cog = bot.get_cog('Owner')
|
||||||
if owner_cog is None:
|
if owner_cog is None:
|
||||||
print("You got rid of the damn OWNER cog, it has special functions"
|
print("The owner cog is missing. It contains core functions without "
|
||||||
" that I require to run.\n\n"
|
"which Red cannot function. Reinstall.")
|
||||||
"I can't start without it!")
|
|
||||||
print()
|
|
||||||
print("Go here to find a new copy:\n{}".format(
|
|
||||||
"https://github.com/Twentysix26/Red-DiscordBot"))
|
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
failed = []
|
failed = []
|
||||||
extensions = owner_cog._list_cogs()
|
extensions = owner_cog._list_cogs()
|
||||||
|
|
||||||
|
if not registry: # All default cogs enabled by default
|
||||||
|
for ext in defaults:
|
||||||
|
registry["cogs." + ext] = True
|
||||||
|
|
||||||
for extension in extensions:
|
for extension in extensions:
|
||||||
if extension.lower() == "cogs.owner":
|
if extension.lower() == "cogs.owner":
|
||||||
continue
|
continue
|
||||||
in_reg = extension in registry
|
to_load = registry.get(extension, False)
|
||||||
if in_reg is False:
|
if to_load:
|
||||||
if no_prompt is True:
|
|
||||||
registry[extension] = False
|
|
||||||
continue
|
|
||||||
print("\nNew extension: {}".format(extension))
|
|
||||||
print("Load it?(y/n)")
|
|
||||||
if not get_answer():
|
|
||||||
registry[extension] = False
|
|
||||||
continue
|
|
||||||
registry[extension] = True
|
|
||||||
if not registry[extension]:
|
|
||||||
continue
|
|
||||||
try:
|
try:
|
||||||
owner_cog._load_cog(extension)
|
owner_cog._load_cog(extension)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
@ -469,53 +508,35 @@ def load_cogs():
|
|||||||
failed.append(extension)
|
failed.append(extension)
|
||||||
registry[extension] = False
|
registry[extension] = False
|
||||||
|
|
||||||
if extensions:
|
|
||||||
dataIO.save_json("data/red/cogs.json", registry)
|
dataIO.save_json("data/red/cogs.json", registry)
|
||||||
|
|
||||||
if failed:
|
if failed:
|
||||||
print("\nFailed to load: ", end="")
|
print("\nFailed to load: {}\n".format(" ".join(failed)))
|
||||||
for m in failed:
|
|
||||||
print(m + " ", end="")
|
|
||||||
print("\n")
|
|
||||||
|
|
||||||
return owner_cog
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
global settings
|
|
||||||
|
|
||||||
check_folders()
|
check_folders()
|
||||||
check_configs()
|
if not settings.no_prompt:
|
||||||
set_logger()
|
interactive_setup()
|
||||||
owner_cog = load_cogs()
|
load_cogs()
|
||||||
if settings.prefixes == []:
|
|
||||||
print("No prefix set. Defaulting to !")
|
print("Logging into Discord...")
|
||||||
settings.prefixes = ["!"]
|
bot.uptime = datetime.datetime.now()
|
||||||
if settings.owner != "id_here":
|
|
||||||
print("Use !set prefix to set it.")
|
if settings.login_credentials:
|
||||||
|
yield from bot.login(*settings.login_credentials,
|
||||||
|
bot=not settings.self_bot)
|
||||||
else:
|
else:
|
||||||
print("Once you're owner use !set prefix to set it.")
|
print("No credentials available to login.")
|
||||||
if settings.owner == "id_here" and settings.login_type == "email":
|
raise RuntimeError()
|
||||||
print("Owner has not been set yet. Do '{}set owner' in chat to set "
|
|
||||||
"yourself as owner.".format(settings.prefixes[0]))
|
|
||||||
else:
|
|
||||||
owner_cog.owner.hidden = True # Hides the set owner command from help
|
|
||||||
print("-- Logging in.. --")
|
|
||||||
if os.name == "nt" and os.path.isfile("update.bat"):
|
|
||||||
print("Make sure to keep your bot updated by running the file "
|
|
||||||
"update.bat")
|
|
||||||
else:
|
|
||||||
print("Make sure to keep your bot updated by using: git pull")
|
|
||||||
print("and: pip3 install -U git+https://github.com/Rapptz/"
|
|
||||||
"discord.py@master#egg=discord.py[voice]")
|
|
||||||
print("Official server: https://discord.me/Red-DiscordBot")
|
|
||||||
if settings.login_type == "token":
|
|
||||||
yield from bot.login(settings.email)
|
|
||||||
else:
|
|
||||||
yield from bot.login(settings.email, settings.password)
|
|
||||||
yield from bot.connect()
|
yield from bot.connect()
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
sys.stdout = TextIOWrapper(sys.stdout.detach(),
|
||||||
|
encoding=sys.stdout.encoding,
|
||||||
|
errors="replace",
|
||||||
|
line_buffering=True)
|
||||||
|
set_logger()
|
||||||
error = False
|
error = False
|
||||||
loop = asyncio.get_event_loop()
|
loop = asyncio.get_event_loop()
|
||||||
try:
|
try:
|
||||||
@ -523,16 +544,18 @@ if __name__ == '__main__':
|
|||||||
except discord.LoginFailure:
|
except discord.LoginFailure:
|
||||||
error = True
|
error = True
|
||||||
logger.error(traceback.format_exc())
|
logger.error(traceback.format_exc())
|
||||||
|
if not settings.no_prompt:
|
||||||
choice = input("Invalid login credentials. "
|
choice = input("Invalid login credentials. "
|
||||||
"If they worked before Discord might be having temporary "
|
"If they worked before Discord might be having temporary "
|
||||||
"technical issues.\nIn this case, press enter and "
|
"technical issues.\nIn this case, press enter and "
|
||||||
"try again later.\nOtherwise you can type 'reset' to "
|
"try again later.\nOtherwise you can type 'reset' to "
|
||||||
"delete the current configuration and redo the setup process "
|
"reset the current credentials and set them "
|
||||||
"again the next start.\n> ")
|
"again the next start.\n> ")
|
||||||
if choice.strip() == "reset":
|
if choice.lower().strip() == "reset":
|
||||||
shutil.copy('data/red/settings.json',
|
settings.token = None
|
||||||
'data/red/settings-{}.bak'.format(int(time.time())))
|
settings.email = None
|
||||||
os.remove('data/red/settings.json')
|
settings.password = None
|
||||||
|
settings.save_settings()
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
loop.run_until_complete(bot.logout())
|
loop.run_until_complete(bot.logout())
|
||||||
except:
|
except:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user