-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #23 from PantomInach/testing
- Loading branch information
Showing
12 changed files
with
472 additions
and
525 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,22 @@ | ||
| { | ||
| "token": "Your Token", | ||
| "token": "Your token", | ||
| "command_prefix": "+", | ||
| "log": "False", | ||
| "logchannel": "", | ||
| "levelchannel":"", | ||
| "spamchannel":"", | ||
| "infochannel":"", | ||
| "loginchannel":"", | ||
| "levelchannel": "", | ||
| "owner": "", | ||
| "textCooldown": "", | ||
| "textCooldown": "75", | ||
| "privilege": { | ||
|
|
||
| "Your ID": "2", | ||
| "Lower rank ID": "1" | ||
| }, | ||
| "server": "", | ||
| "guilde": "Your guilde ID", | ||
| "serverVoiceBlacklist": [ | ||
| "0", | ||
| "0" | ||
| ], | ||
| "serverTextWhitelist": [ | ||
| "0", | ||
| "0" | ||
| ], | ||
| "roles": [ | ||
|
|
||
| ], | ||
| "rolesXPNeed": [ | ||
|
|
||
| ] | ||
| "roles": [], | ||
| "rolesXPNeed": [] | ||
| } |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,85 +1,74 @@ | ||
| import discord | ||
| from discord.utils import get | ||
| from discord.ext import commands | ||
| from .textban import Textban | ||
| from .jsonhandel import Jsonhandel | ||
| from .helpfunc import Helpfunc | ||
| from .counter import Counter | ||
| from .decorators import * | ||
| import asyncio | ||
|
|
||
| def hasAnyRole(*items): | ||
| """ | ||
| commands.has_any_role() does not work in DM since a users can't have roles. | ||
| This on pulls the roles from the conffigured guilde and makes the same check as commands.has_any_role(). | ||
| """ | ||
| def predicate(ctx): | ||
| return Commandmodserver.helpf.hasOneRole(ctx.author.id, [role for role in items]) | ||
| return commands.check(predicate) | ||
|
|
||
| class Commandmodserver(commands.Cog, name='Server Mod Commands'): | ||
| """docstring for Commandmodserver""" | ||
|
|
||
| helpf = None | ||
|
|
||
| def __init__(self, bot, helpf, tban, counter, jh): | ||
| super(Commandmodserver, self).__init__() | ||
| self.bot = bot | ||
| self.tban = tban | ||
| self.jh = jh | ||
| self.helpf = helpf | ||
|
|
||
| #Checks if cahnnel is a PM channel | ||
| def isDM(self, ctx): | ||
| return isinstance(ctx.channel, discord.channel.DMChannel) | ||
|
|
||
| def hasRights(self, ctx): | ||
| #Checks if author has member, admin or mod rigths | ||
| return self.helpf.hasOneRole(ctx.author.id, ["CEO", "COO"]) | ||
| Commandmodserver.helpf = helpf | ||
|
|
||
| @commands.command(name='textban', brief='Textbans a user.', description='You need to be a \'Administrator\' or \'moderator\' to use this command. Can only be used in a private channel and \'log\'.\nAdds a user to the textban-list. The users text-messages will be deletet upon posting them. You can not change the ban time, only unban with \'+textunban\'.\nTo use this command you need the userID, which you can get be rigth-clicking on the person. Also a time is requiered. The time you input will be in seconds. Also a reason is requiered. The reason must be in \"\", otherwise the command wont work.') | ||
| @isDM() | ||
| @hasAnyRole("CEO","COO") | ||
| async def textban(self, ctx, userID, time, reason): | ||
| dm = self.isDM(ctx) | ||
| logID = self.jh.getFromConfig("logchannel") | ||
| if dm or ctx.channel.id == int(logID): | ||
| if self.hasRights(ctx): | ||
| if not self.tban.hasTextBan(userID): | ||
| bantime = 0 | ||
| try: | ||
| bantime = float(time) | ||
| except ValueError: | ||
| bantime = -1 | ||
| if bantime >= 0.1: | ||
| user = self.bot.get_user(int(userID)) | ||
| guilde = self.bot.get_guild(int(self.jh.getFromConfig("server"))) | ||
| member = guilde.get_member(int(userID)) | ||
| if user != None: | ||
| logchannel = self.bot.get_channel(int(logID)) | ||
| if not dm: | ||
| await ctx.message.delete() | ||
| await self.helpf.log(f"User {ctx.author.mention} textbaned {user.mention} for {time} h. Reason:\n{reason}",2) | ||
| await logchannel.send(f"{user.mention} was textbaned for {time} h.\n**Reason**: {reason}") | ||
| await user.send(content=f"You received a textban for {time} h.\n**Reason**: {reason}") | ||
| await self.helpf.sendServerModMessage(f"{member.nick} ({user.name}) was textbaned by {server.get_member(int(ctx.author.id)).nick} ({ctx.author.name}) for {time} h.\n**Reason**: {reason}") | ||
| await self.tban.addTextBan(userID, int(bantime*3600.0)) | ||
| #Textban over | ||
| await user.send("Your Textban is over. Pay more attention to your behavior in the future.") | ||
| else: | ||
| await ctx.send(content="ERROR: User does not exist.", delete_after=3600) | ||
| else: | ||
| await ctx.send(content="ERROR: time is not valid.", delete_after=3600) | ||
| if not self.tban.hasTextBan(userID): | ||
| bantime = 0 | ||
| try: | ||
| bantime = float(time) | ||
| except ValueError: | ||
| bantime = -1 | ||
| if bantime >= 0.1: | ||
| user = self.bot.get_user(int(userID)) | ||
| guilde = self.bot.get_guild(int(self.jh.getFromConfig("server"))) | ||
| member = guilde.get_member(int(userID)) | ||
| if user != None: | ||
| logchannel = self.bot.get_channel(int(self.jh.getFromConfig("logchannel"))) | ||
| await self.helpf.log(f"User {ctx.author.mention} textbaned {user.mention} for {time} h. Reason:\n{reason}",2) | ||
| await logchannel.send(f"{user.mention} was textbaned for {time} h.\n**Reason**: {reason}") | ||
| await user.send(content=f"You received a textban for {time} h.\n**Reason**: {reason}") | ||
| await self.helpf.sendServerModMessage(f"{member.nick} ({user.name}) was textbaned by {guilde.get_member(int(ctx.author.id)).nick} ({ctx.author.name}) for {time} h.\n**Reason**: {reason}") | ||
| await self.tban.addTextBan(userID, int(bantime*3600.0)) | ||
| #Textban over | ||
| await user.send("Your Textban is over. Pay more attention to your behavior in the future.") | ||
| else: | ||
| await ctx.send(content="ERROR: User has already a textban.", delete_after=3600) | ||
| elif not dm: | ||
| await ctx.message.delete() | ||
| if not dm: | ||
| await ctx.message.delete() | ||
| await ctx.send(content="ERROR: User does not exist.", delete_after=3600) | ||
| else: | ||
| await ctx.send(content="ERROR: time is not valid.", delete_after=3600) | ||
| else: | ||
| await ctx.send(content="ERROR: User has already a textban.", delete_after=3600) | ||
|
|
||
|
|
||
| @commands.command(name='textunban', brief='Removes textban from user.', description='You need to be a \'Administrator\' or \'moderator\' to use this command. Can only be used in a private channel and \'log\'.\nThis command will remnove a person from the textban-list and the messages from the person wont be removed anymore.\nTo use this command you need the userID, which you can get be rigth-clicking on the person.') | ||
| @isDM() | ||
| @hasAnyRole("CEO","COO") | ||
| async def textunban(self, ctx, userID): | ||
| dm = self.isDM(ctx) | ||
| logID = self.jh.getFromConfig("logchannel") | ||
| if dm or ctx.channel.id == logID: | ||
| if self.hasRights(ctx) and not self.tban.hasTextBan(ctx.author.id): | ||
| if self.tban.removeTextBan(userID): | ||
| logchannel = self.bot.get_channel(int(logID)) | ||
| user = self.bot.get_user(int(userID)) | ||
| await self.helpf.log(f"User {ctx.author.mention} textunbaned {user.mention}",2) | ||
| await logchannel.send(f"User {ctx.author.mention} textunbaned {user.mention}") | ||
| else: | ||
| await ctx.send(content="ERROR: User has no textban.", delete_after=3600) | ||
| elif not dm: | ||
| await ctx.message.delete() | ||
| if not dm: | ||
| await ctx.message.delete() | ||
| if not self.tban.hasTextBan(ctx.author.id): | ||
| if self.tban.removeTextBan(userID): | ||
| logchannel = self.bot.get_channel(int(self.jh.getFromConfig("logchannel"))) | ||
| user = self.bot.get_user(int(userID)) | ||
| await self.helpf.log(f"User {ctx.author.mention} textunbaned {user.mention}",2) | ||
| await logchannel.send(f"User {ctx.author.mention} textunbaned {user.mention}") | ||
| else: | ||
| await ctx.send(content="ERROR: User has no textban.", delete_after=3600) | ||
|
|
||
| def setup(bot, helpf, tban, jh): | ||
| bot.add_cog(Commandpoll(bot, helpf, tban, jh)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.