Updated some files
This commit is contained in:
davfsa
@@ -1,10 +1,9 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
import asyncio
|
||||
|
||||
from discord.ext import commands
|
||||
import discord
|
||||
|
||||
import asyncio
|
||||
|
||||
class BasicCommands:
|
||||
def __init__(self, bot):
|
||||
@@ -12,83 +11,58 @@ class BasicCommands:
|
||||
|
||||
@commands.command()
|
||||
async def tutorial(self, ctx):
|
||||
await ctx.send(
|
||||
f"Hello, {ctx.author.display_name}. Welcome to Sebi's Bot Tutorials. \nFirst off, would you like a quick walkthrough on the server channels?"
|
||||
)
|
||||
await ctx.send(f"Hello, {ctx.author.display_name}. Welcome to Sebi's Bot Tutorials. \nFirst off, would you like a quick walkthrough on the server channels?")
|
||||
|
||||
channel_list = {'channel-1' : self.bot.get_channel(333149949883842561).mention,
|
||||
'd.py-rewrite-start' : self.bot.get_channel(386419285439938560).mention,
|
||||
'js-klasa-start' : self.bot.get_channel(341816240186064897).mention,
|
||||
'async2rewrite-start' : self.bot.get_channel(392223495389577217).mention,
|
||||
'd.js' : self.bot.get_channel(436771798303113217).mention}
|
||||
|
||||
channel_list = {
|
||||
"channel-1": self.bot.get_channel(333149949883842561).mention,
|
||||
"d.py-rewrite-start": self.bot.get_channel(386419285439938560).mention,
|
||||
"js-klasa-start": self.bot.get_channel(341816240186064897).mention,
|
||||
"d.js": self.bot.get_channel(436771798303113217).mention,
|
||||
}
|
||||
bots_channels = (self.bot.get_channel(339112602867204097).mention,
|
||||
self.bot.get_channel(411586546551095296).mention)
|
||||
|
||||
bots_channels = (
|
||||
self.bot.get_channel(339112602867204097).mention,
|
||||
self.bot.get_channel(411586546551095296).mention,
|
||||
)
|
||||
|
||||
help_channels = (
|
||||
self.bot.get_channel(425315253153300488).mention,
|
||||
self.bot.get_channel(392215236612194305).mention,
|
||||
self.bot.get_channel(351034776985141250).mention,
|
||||
)
|
||||
help_channels = (self.bot.get_channel(425315253153300488).mention,
|
||||
self.bot.get_channel(392215236612194305).mention,
|
||||
self.bot.get_channel(351034776985141250).mention)
|
||||
|
||||
def check(m):
|
||||
return (
|
||||
True
|
||||
if m.author.id == ctx.author.id and m.channel.id == ctx.channel.id
|
||||
else False
|
||||
)
|
||||
return True if m.author.id == ctx.author.id and m.channel.id == ctx.channel.id else False
|
||||
|
||||
msg = await self.bot.wait_for('message', check = check, timeout = 15)
|
||||
|
||||
msg = await self.bot.wait_for("message", check=check, timeout=15)
|
||||
|
||||
agree = ("yes", "yep", "yesn't", "ya", "ye")
|
||||
agree = ("yes", "yep", "non't", "ya", "ye", "yup", "ok", "why not")
|
||||
|
||||
if msg is None:
|
||||
await ctx.send(
|
||||
"Sorry, {ctx.author.mention}, you didn't reply on time. You can run the command again when you're free :)"
|
||||
)
|
||||
await ctx.send("Sorry, {ctx.author.mention}, you didn't reply on time. You can run the command again when you're free :)")
|
||||
else:
|
||||
if msg.content.lower() in agree:
|
||||
async with ctx.typing():
|
||||
await ctx.send("Alrighty-Roo... Check your DMs!")
|
||||
await ctx.author.send("Alrighty-Roo...")
|
||||
|
||||
await ctx.author.send(
|
||||
f"To start making your bot from scratch, you first need to head over to {channel_list['channel-1']}"
|
||||
" (Regardless of the language you're gonna use)."
|
||||
)
|
||||
|
||||
await ctx.author.send(f"To start making your bot from scratch, you first need to head over to {channel_list['channel-1']}"
|
||||
" (Regardless of the language you're gonna use).")
|
||||
|
||||
await asyncio.sleep(0.5)
|
||||
await ctx.author.send(
|
||||
f"After you have a bot account, you can either continue with {channel_list['d.py-rewrite-start']}"
|
||||
f"if you want to make a bot in discord.py rewrite __or__ go to {channel_list['js-klasa-start']} or "
|
||||
f"{channel_list['d.js']} for making a bot in JavaScript."
|
||||
)
|
||||
|
||||
await ctx.author.send(
|
||||
"...Read all the tutorials and still need help? You have two ways to get help."
|
||||
)
|
||||
await ctx.author.send(f"After you have a bot account, you can either continue with {channel_list['d.py-rewrite-start']} "
|
||||
f"if you want to make a bot in discord.py rewrite __or__ go to {channel_list['js-klasa-start']} or "
|
||||
f"{channel_list['d.js']} for making a bot in JavaScript."
|
||||
f"If you already have old Discord.py async code and you want to use it with the new Rewrite versions, head to {channel_list['async2rewrite-start']}")
|
||||
|
||||
await ctx.author.send("...Read all the tutorials and still need help? You have two ways to get help.")
|
||||
await asyncio.sleep(1.5)
|
||||
await ctx.author.send(
|
||||
"**Method-1**\nThis is the best method of getting help. You help yourself.\n"
|
||||
f"To do so, head over to a bots dedicated channel (either {bots_channels[0]} or {bots_channels[1]})"
|
||||
" and type `?rtfm rewrite thing_you_want_help_with`.\nThis will trigger the bot R.Danny Bot and will"
|
||||
"give you links on your query on the official discord.py rewrite docs. *PS: Let the page completely load*"
|
||||
)
|
||||
|
||||
await ctx.author.send("**Method-1**\nThis is the best method of getting help. You help yourself.\n"
|
||||
f"To do so, head over to a bots dedicated channel (either {bots_channels[0]} or {bots_channels[1]})"
|
||||
" and type `?rtfm rewrite thing_you_want_help_with`.\nThis will trigger the bot R.Danny Bot and will "
|
||||
"give you links on your query on the official discord.py rewrite docs. *PS: Let the page completely load*")
|
||||
|
||||
await asyncio.sleep(5)
|
||||
await ctx.author.send(
|
||||
"**Method-2**\nIf you haven't found anything useful with Method-1, feel free to ask your question "
|
||||
f"in any of the related help channels. ({', '.join(help_channels)})\nMay the force be with you!!"
|
||||
)
|
||||
|
||||
await ctx.author.send("**Method-2**\nIf you haven't found anything useful with Method-1, feel free to ask your question "
|
||||
f"in any of the related help channels. ({', '.join(help_channels)})\nMay the force be with you!!")
|
||||
|
||||
else:
|
||||
return await ctx.send(
|
||||
"Session terminated. You can run this command again whenever you want."
|
||||
)
|
||||
|
||||
return await ctx.send("Session terminated. You can run this command again whenever you want.")
|
||||
|
||||
def setup(bot):
|
||||
bot.add_cog(BasicCommands(bot))
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import discord
|
||||
from discord.ext import commands
|
||||
|
||||
|
||||
|
||||
class BotManager:
|
||||
def __init__(self, bot):
|
||||
self.bot = bot
|
||||
@@ -12,88 +11,76 @@ class BotManager:
|
||||
return
|
||||
else:
|
||||
# The member is a bot
|
||||
await member.add_roles(discord.utils.get(member.guild.roles, name="Bots"))
|
||||
bot_owner = member.guild.get_member((await self.bot.db_con.fetchval('select owner from bots where id = $1', member.id))
|
||||
await bot_owner.add_roles(discord.utils.get(member.guild.roles, name='Bot Developers'))
|
||||
|
||||
await member.add_roles(discord.utils.get(member.guild.roles, name='Bots'))
|
||||
try:
|
||||
await member.edit(
|
||||
nick="["
|
||||
+ await self.bot.db_con.fetch(
|
||||
"select prefix from bots where id = $1", member.id
|
||||
)
|
||||
+ "] "
|
||||
+ member.name
|
||||
)
|
||||
await member.edit(nick='[' + await self.bot.db_con.fetchval('select prefix from bots where id = $1', member.id)
|
||||
+ '] ' + member.name)
|
||||
except:
|
||||
pass
|
||||
|
||||
|
||||
async def on_member_remove(self, member):
|
||||
# If the member is not a bot
|
||||
if member.bot is False:
|
||||
return
|
||||
else:
|
||||
# The member is a bot
|
||||
await self.bot.db_con.execute("DELETE FROM bots WHERE id = $1", member.id)
|
||||
await self.bot.db_con.execute('DELETE FROM bots WHERE id = $1', member.id)
|
||||
|
||||
async def on_member_ban(self, guild, user):
|
||||
if member.bot is True:
|
||||
return
|
||||
else:
|
||||
# I need to finish this
|
||||
pass
|
||||
|
||||
@commands.command()
|
||||
async def invite(self, ctx, bot=None, prefix=None):
|
||||
bot = await ctx.bot.get_user_info(bot)
|
||||
if not bot:
|
||||
raise Warning(
|
||||
"You must include the id of the bot you are trying to invite... Be exact."
|
||||
)
|
||||
raise Warning('You must include the id of the bot you are trying to invite... Be exact.')
|
||||
if not bot.bot:
|
||||
raise Warning("You can only invite bots.")
|
||||
raise Warning('You can only invite bots.')
|
||||
if not prefix:
|
||||
raise Warning("Please provide a prefix")
|
||||
raise Warning('Please provide a prefix')
|
||||
|
||||
# Make sure that the bot has not been invited already and it is not being tested
|
||||
if (
|
||||
await self.bot.db_con.fetch(
|
||||
"select count(*) from bots where id = $1", bot.id
|
||||
)
|
||||
== 1
|
||||
):
|
||||
raise Warning("The bot has already been invited or is being tested")
|
||||
if await self.bot.db_con.fetch('select count(*) from bots where id = $1', bot.id) == 1:
|
||||
raise Warning('The bot has already been invited or is being tested')
|
||||
|
||||
await self.bot.db_con.execute(
|
||||
"insert into bots (id, owner, prefix) values ($1, $2, $3)",
|
||||
bot.id,
|
||||
ctx.author.id,
|
||||
prefix,
|
||||
)
|
||||
await self.bot.db_con.execute('insert into bots (id, owner, prefix) values ($1, $2, $3)',
|
||||
bot.id, ctx.author.id, prefix)
|
||||
|
||||
em = discord.Embed(colour=self.bot.embed_color)
|
||||
em.title = "Hello {},".format(ctx.author.name)
|
||||
em.description = "Thanks for inviting your bot! It will be tested and invited shortly. " "Please open your DMs if they are not already so the bot can contact " "you to inform you about the progress of the bot!"
|
||||
em.description = "Thanks for inviting your bot! It will be tested and invited shortly. " \
|
||||
"Please open your DMs if they are not already so the bot can contact " \
|
||||
"you to inform you about the progress of the bot!"
|
||||
await ctx.send(embed=em)
|
||||
|
||||
|
||||
em = discord.Embed(title="Bot invite", colour=discord.Color(0x363941))
|
||||
em.description = discord.utils.oauth_url(client_id, permissions=None, guild=ctx.guild))
|
||||
em.set_thumbnail(url=bot.avatar_url)
|
||||
em.add_field(name="Bot name", value=bot.name)
|
||||
em.add_field(name="Bot id", value="`" + str(bot.id) + "`")
|
||||
em.add_field(name="Bot owner", value=ctx.author.mention)
|
||||
em.add_field(name="Bot prefix", value="`" + prefix + "`")
|
||||
await ctx.bot.get_channel(448803675574370304).send(embed=em)
|
||||
await ctx.bot.get_channel(459280759945953300).send(embed=em)
|
||||
|
||||
@commands.command(name="claim", aliases=["makemine", "gimme"])
|
||||
@commands.command(name='claim', aliases=['makemine', 'gimme'])
|
||||
@commands.cooldown(1, 5, commands.BucketType.user)
|
||||
async def _claim_bot(
|
||||
self,
|
||||
ctx,
|
||||
bot: discord.Member = None,
|
||||
prefix: str = None,
|
||||
owner: discord.Member = None,
|
||||
):
|
||||
async def _claim_bot(self, ctx, bot: discord.Member = None, prefix: str = None, owner: discord.Member = None):
|
||||
if not bot:
|
||||
raise Warning(
|
||||
"You must include the name of the bot you are trying to claim... Be exact."
|
||||
)
|
||||
raise Warning('You must include the name of the bot you are trying to claim... Be exact.')
|
||||
if not bot.bot:
|
||||
raise Warning("You can only claim bots.")
|
||||
raise Warning('You can only claim bots.')
|
||||
if not prefix:
|
||||
if bot.display_name.startswith("["):
|
||||
prefix = bot.display_name.split("]")[0].strip("[")
|
||||
if bot.display_name.startswith('['):
|
||||
prefix = bot.display_name.split(']')[0].strip('[')
|
||||
else:
|
||||
raise Warning("Prefix not provided and can't be found in bot nick.")
|
||||
raise Warning('Prefix not provided and can\'t be found in bot nick.')
|
||||
|
||||
if owner is not None and ctx.author.guild_permissions.manage_roles:
|
||||
author_id = owner.id
|
||||
@@ -102,126 +89,100 @@ class BotManager:
|
||||
|
||||
em = discord.Embed()
|
||||
|
||||
if (
|
||||
await self.bot.db_con.fetchval(
|
||||
"select count(*) from bots where owner = $1", author_id
|
||||
)
|
||||
>= 10
|
||||
):
|
||||
if await self.bot.db_con.fetchval('select count(*) from bots where owner = $1', author_id) >= 10:
|
||||
em.colour = self.bot.error_color
|
||||
em.title = "Too Many Bots Claimed"
|
||||
em.description = "Each person is limited to claiming 10 bots as that is how " "many bots are allowed by the Discord API per user."
|
||||
em.title = 'Too Many Bots Claimed'
|
||||
em.description = 'Each person is limited to claiming 10 bots as that is how ' \
|
||||
'many bots are allowed by the Discord API per user.'
|
||||
return await ctx.send(embed=em)
|
||||
existing = await self.bot.db_con.fetchrow(
|
||||
"select * from bots where id = $1", bot.id
|
||||
)
|
||||
existing = await self.bot.db_con.fetchrow('select * from bots where id = $1', bot.id)
|
||||
if not existing:
|
||||
await self.bot.db_con.execute(
|
||||
"insert into bots (id, owner, prefix) values ($1, $2, $3)",
|
||||
bot.id,
|
||||
author_id,
|
||||
prefix,
|
||||
)
|
||||
await self.bot.db_con.execute('insert into bots (id, owner, prefix) values ($1, $2, $3)',
|
||||
bot.id, author_id, prefix)
|
||||
em.colour = self.bot.embed_color
|
||||
em.title = "Bot Claimed"
|
||||
em.description = f"You have claimed {bot.display_name} with a prefix of {prefix}\n" f"If there is an error please run command again to correct the prefix,\n" f"or {ctx.prefix}unclaim {bot.mention} to unclaim the bot."
|
||||
elif existing["owner"] and existing["owner"] != author_id:
|
||||
em.title = 'Bot Claimed'
|
||||
em.description = f'You have claimed {bot.display_name} with a prefix of {prefix}\n' \
|
||||
f'If there is an error please run command again to correct the prefix,\n' \
|
||||
f'or {ctx.prefix}unclaim {bot.mention} to unclaim the bot.'
|
||||
elif existing['owner'] and existing['owner'] != author_id:
|
||||
em.colour = self.bot.error_color
|
||||
em.title = "Bot Already Claimed"
|
||||
em.description = "This bot has already been claimed by someone else.\n" "If this is actually your bot please let the guild Administrators know."
|
||||
elif existing["owner"] and existing["owner"] == author_id:
|
||||
em.title = 'Bot Already Claimed'
|
||||
em.description = 'This bot has already been claimed by someone else.\n' \
|
||||
'If this is actually your bot please let the guild Administrators know.'
|
||||
elif existing['owner'] and existing['owner'] == author_id:
|
||||
em.colour = self.bot.embed_color
|
||||
em.title = "Bot Already Claimed"
|
||||
em.description = "You have already claimed this bot.\n" "If the prefix you provided is different from what is already in the database" " it will be updated for you."
|
||||
if existing["prefix"] != prefix:
|
||||
await self.bot.db_con.execute(
|
||||
"update bots set prefix = $1 where id = $2", prefix, bot.id
|
||||
)
|
||||
elif not existing["owner"]:
|
||||
await self.bot.db_con.execute(
|
||||
"update bots set owner = $1, prefix = $2 where id = $3",
|
||||
author_id,
|
||||
prefix,
|
||||
bot.id,
|
||||
)
|
||||
em.title = 'Bot Already Claimed'
|
||||
em.description = 'You have already claimed this bot.\n' \
|
||||
'If the prefix you provided is different from what is already in the database' \
|
||||
' it will be updated for you.'
|
||||
if existing['prefix'] != prefix:
|
||||
await self.bot.db_con.execute("update bots set prefix = $1 where id = $2", prefix, bot.id)
|
||||
elif not existing['owner']:
|
||||
await self.bot.db_con.execute('update bots set owner = $1, prefix = $2 where id = $3',
|
||||
author_id, prefix, bot.id)
|
||||
em.colour = self.bot.embed_color
|
||||
em.title = "Bot Claimed"
|
||||
em.description = f"You have claimed {bot.display_name} with a prefix of {prefix}\n" f"If there is an error please run command again to correct the prefix,\n" f"or {ctx.prefix}unclaim {bot.mention} to unclaim the bot."
|
||||
em.title = 'Bot Claimed'
|
||||
em.description = f'You have claimed {bot.display_name} with a prefix of {prefix}\n' \
|
||||
f'If there is an error please run command again to correct the prefix,\n' \
|
||||
f'or {ctx.prefix}unclaim {bot.mention} to unclaim the bot.'
|
||||
else:
|
||||
em.colour = self.bot.error_color
|
||||
em.title = "Something Went Wrong..."
|
||||
em.title = 'Something Went Wrong...'
|
||||
await ctx.send(embed=em)
|
||||
|
||||
@commands.command(name="unclaim")
|
||||
@commands.command(name='unclaim')
|
||||
@commands.cooldown(1, 5, commands.BucketType.user)
|
||||
async def _unclaim_bot(self, ctx, bot: discord.Member = None):
|
||||
if not bot:
|
||||
raise Warning(
|
||||
"You must include the name of the bot you are trying to claim... Be exact."
|
||||
)
|
||||
raise Warning('You must include the name of the bot you are trying to claim... Be exact.')
|
||||
if not bot.bot:
|
||||
raise Warning("You can only unclaim bots.")
|
||||
raise Warning('You can only unclaim bots.')
|
||||
|
||||
em = discord.Embed()
|
||||
|
||||
existing = await self.bot.db_con.fetchrow(
|
||||
"select * from bots where id = $1", bot.id
|
||||
)
|
||||
if not existing or not existing["owner"]:
|
||||
existing = await self.bot.db_con.fetchrow('select * from bots where id = $1', bot.id)
|
||||
if not existing or not existing['owner']:
|
||||
em.colour = self.bot.error_color
|
||||
em.title = "Bot Not Found"
|
||||
em.description = "That bot is not claimed"
|
||||
elif (
|
||||
existing["owner"] != ctx.author.id
|
||||
and not ctx.author.guild_permissions.manage_roles
|
||||
):
|
||||
em.title = 'Bot Not Found'
|
||||
em.description = 'That bot is not claimed'
|
||||
elif existing['owner'] != ctx.author.id and not ctx.author.guild_permissions.manage_roles:
|
||||
em.colour = self.bot.error_color
|
||||
em.title = "Not Claimed By You"
|
||||
em.description = "That bot is claimed by someone else.\n" "You can't unclaim someone else's bot"
|
||||
em.title = 'Not Claimed By You'
|
||||
em.description = 'That bot is claimed by someone else.\n' \
|
||||
'You can\'t unclaim someone else\'s bot'
|
||||
else:
|
||||
await self.bot.db_con.execute(
|
||||
"update bots set owner = null where id = $1", bot.id
|
||||
)
|
||||
await self.bot.db_con.execute('update bots set owner = null where id = $1', bot.id)
|
||||
em.colour = self.bot.embed_color
|
||||
em.title = "Bot Unclaimed"
|
||||
em.description = f"You have unclaimed {bot.display_name}\n" f"If this is an error please reclaim using\n" f'{ctx.prefix}claim {bot.mention} {existing["prefix"]}'
|
||||
em.title = 'Bot Unclaimed'
|
||||
em.description = f'You have unclaimed {bot.display_name}\n' \
|
||||
f'If this is an error please reclaim using\n' \
|
||||
f'{ctx.prefix}claim {bot.mention} {existing["prefix"]}'
|
||||
await ctx.send(embed=em)
|
||||
|
||||
@commands.command(name="listclaims", aliases=["claimed", "mybots"])
|
||||
@commands.command(name='listclaims', aliases=['claimed', 'mybots'])
|
||||
@commands.cooldown(1, 5, commands.BucketType.user)
|
||||
async def _claimed_bots(self, ctx, usr: discord.Member = None):
|
||||
if usr is None:
|
||||
usr = ctx.author
|
||||
bots = await self.bot.db_con.fetch(
|
||||
"select * from bots where owner = $1", usr.id
|
||||
)
|
||||
bots = await self.bot.db_con.fetch('select * from bots where owner = $1', usr.id)
|
||||
if bots:
|
||||
em = discord.Embed(
|
||||
title=f"{usr.display_name} has claimed the following bots:",
|
||||
colour=self.bot.embed_color,
|
||||
)
|
||||
em = discord.Embed(title=f'{usr.display_name} has claimed the following bots:',
|
||||
colour=self.bot.embed_color)
|
||||
for bot in bots:
|
||||
member = ctx.guild.get_member(int(bot["id"]))
|
||||
em.add_field(
|
||||
name=member.display_name,
|
||||
value=f'Stored Prefix: {bot["prefix"]}',
|
||||
inline=False,
|
||||
)
|
||||
member = ctx.guild.get_member(int(bot['id']))
|
||||
em.add_field(name=member.display_name, value=f'Stored Prefix: {bot["prefix"]}', inline=False)
|
||||
else:
|
||||
em = discord.Embed(
|
||||
title="You have not claimed any bots.", colour=self.bot.embed_color
|
||||
)
|
||||
em = discord.Embed(title='You have not claimed any bots.',
|
||||
colour=self.bot.embed_color)
|
||||
await ctx.send(embed=em)
|
||||
|
||||
@commands.command(name="whowns")
|
||||
@commands.command(name='whowns')
|
||||
async def _whowns(self, ctx, bot: discord.Member):
|
||||
if not bot.bot:
|
||||
await ctx.send("this commands only for bots")
|
||||
await ctx.send('this commands only for bots')
|
||||
else:
|
||||
owner = await self.bot.db_con.fetchrow(
|
||||
"select * from bots where id = $1", bot.id
|
||||
)
|
||||
await ctx.send(ctx.guild.get_member(owner["owner"]).display_name)
|
||||
owner = await self.bot.db_con.fetchrow('select * from bots where id = $1', bot.id)
|
||||
await ctx.send(ctx.guild.get_member(owner['owner']).display_name)
|
||||
|
||||
|
||||
def setup(bot):
|
||||
|
||||
Reference in New Issue
Block a user