Browse Source

cleaned a few things up so that it isn't so inefficent due to some of the features already being provided or useless code.

tags/v1.4.0
roxie 6 years ago
parent
commit
d7c9b6a11d
2 changed files with 21 additions and 21 deletions
  1. +8
    -7
      config/settings.py
  2. +13
    -14
      main.py

+ 8
- 7
config/settings.py View File

from config.server_config import ServerConfig from config.server_config import ServerConfig


import discord import discord
from discord.ext.commands import bot, group
from discord.ext.commands import bot, group, is_owner




class Settings: class Settings:
return await ctx.send('{} user(s) have been removed from the blacklist'.format(blacklist_amount)) return await ctx.send('{} user(s) have been removed from the blacklist'.format(blacklist_amount))


@bot.command(pass_context=True, hidden=True, aliases=["setava", "setavatar"]) @bot.command(pass_context=True, hidden=True, aliases=["setava", "setavatar"])
@checks.is_bot_owner()
@is_owner()
async def changeavatar(self, ctx, url=None): async def changeavatar(self, ctx, url=None):
""" """
Usage: Usage:
return await ctx.send(":ok_hand:") return await ctx.send(":ok_hand:")


@bot.command(pass_context=True, hidden=True, aliases=["nick"]) @bot.command(pass_context=True, hidden=True, aliases=["nick"])
@checks.is_bot_owner()
@is_owner()
async def changenickname(self, ctx, *nick): async def changenickname(self, ctx, *nick):
if ctx.message.channel.permissions_for(ctx.message.server.me).change_nickname: if ctx.message.channel.permissions_for(ctx.message.server.me).change_nickname:
await self.bot.change_nickname(ctx.message.server.me, ' '.join(nick)) await self.bot.change_nickname(ctx.message.server.me, ' '.join(nick))
return await ctx.send("I don't have permission to do that :sob:", delete_after=self.con.delete_after) return await ctx.send("I don't have permission to do that :sob:", delete_after=self.con.delete_after)


@bot.command(pass_context=True, hidden=True, aliases=["setgame", "game"]) @bot.command(pass_context=True, hidden=True, aliases=["setgame", "game"])
@checks.is_bot_owner()
@is_owner()
async def changegame(self, ctx, *, game: str): async def changegame(self, ctx, *, game: str):
if game.lower() == "none": if game.lower() == "none":
game_name = None game_name = None
return await ctx.send(":ok_hand: Game set to {}".format(str(game_name))) return await ctx.send(":ok_hand: Game set to {}".format(str(game_name)))


@bot.command(pass_context=True, hidden=True, aliases=["status"]) @bot.command(pass_context=True, hidden=True, aliases=["status"])
@checks.is_bot_owner()
@is_owner()
async def changestatus(self, ctx, status: str): async def changestatus(self, ctx, status: str):
status = status.lower() status = status.lower()
if status == 'offline' or status == 'invisible': if status == 'offline' or status == 'invisible':
await ctx.send("**:ok:** Status set to {}".format(discordStatus)) await ctx.send("**:ok:** Status set to {}".format(discordStatus))


@bot.command(hidden=True) @bot.command(hidden=True)
@checks.is_bot_owner()
@is_owner()
async def restart(self): async def restart(self):
await self.bot.logout() await self.bot.logout()
return os.execl(sys.executable, sys.executable, *sys.argv) return os.execl(sys.executable, sys.executable, *sys.argv)


@bot.command(hidden=True) @bot.command(hidden=True)
@checks.is_bot_owner()
@is_owner()
async def shutdown(self): async def shutdown(self):
await self.bot.logout() await self.bot.logout()
return exit(0) return exit(0)
return await ctx.send(embed=em) return await ctx.send(embed=em)


@group(pass_context=True) @group(pass_context=True)
@checks.is_admin_or_mod()
async def settings(self, ctx): async def settings(self, ctx):
if ctx.invoked_subcommand is None: if ctx.invoked_subcommand is None:
return await ctx.send('Missing Argument') return await ctx.send('Missing Argument')

+ 13
- 14
main.py View File

from config.server_config import ServerConfig from config.server_config import ServerConfig




if not os.path.isfile("settings/preferences.ini"):
print(
"PREFERENCE FILE MISSING. Something has gone wrong. Please make sure there is a file called 'preferences.ini' in the settings folder")
exit(0)

if not os.path.isfile("config/servers.json"):
with open("config/servers.json", "w+") as fp:
fp.write("{}")

start_time = time.time()

# Sets up Logging that discord.py does on its own # Sets up Logging that discord.py does on its own
logger = logging.getLogger('discord') logger = logging.getLogger('discord')
logger.setLevel(logging.WARN) logger.setLevel(logging.WARN)
""" """
Outputs info about RoxBot, showing uptime, what settings where set in prefs.ini and credits. Outputs info about RoxBot, showing uptime, what settings where set in prefs.ini and credits.
""" """
user = await bot.get_user_info(load_config.owner)
ownername = user.name + "#" + user.discriminator
ownername = await bot.get_user_info(load_config.owner)
em = discord.Embed(title="About Roxbot", colour=load_config.embedcolour, description=load_config.__description__) em = discord.Embed(title="About Roxbot", colour=load_config.embedcolour, description=load_config.__description__)
em.set_thumbnail(url=bot.user.avatar_url) em.set_thumbnail(url=bot.user.avatar_url)
em.add_field(name="Command Prefix", value=load_config.command_prefix) em.add_field(name="Command Prefix", value=load_config.command_prefix)
em.add_field(name="Owner", value=ownername)
em.add_field(name="Owner", value=str(ownername))
em.add_field(name="Owner ID", value=load_config.owner) em.add_field(name="Owner ID", value=load_config.owner)
em.add_field(name="Bot Version", value=load_config.__version__) em.add_field(name="Bot Version", value=load_config.__version__)
em.add_field(name="Author", value=load_config.__author__) em.add_field(name="Author", value=load_config.__author__)




if __name__ == "__main__": if __name__ == "__main__":
# Pre-Boot checks
if not os.path.isfile("settings/preferences.ini"):
print(
"PREFERENCE FILE MISSING. Something has gone wrong. Please make sure there is a file called 'preferences.ini' in the settings folder")
exit(0)

if not os.path.isfile("config/servers.json"):
with open("config/servers.json", "w+") as fp:
fp.write("{}")

start_time = time.time()
bot.load_extension("config.settings") bot.load_extension("config.settings")
#bot.load_extension("err_handle") #bot.load_extension("err_handle")
bot.run(load_config.token) bot.run(load_config.token)

Loading…
Cancel
Save