WhatTheMike
/
Fox-V3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

v3 conversion beginning

Browse Source
fight-fixes
Bobloy 7 years ago
parent b5927ddc5a
commit ba80fb8d6b
3 changed files with 196 additions and 105 deletions
Show Stats Download Patch File Download Diff File

5
ccrole/__init__.py
Unescape View File

@ -0,0 +1,5 @@
from .ccrole import CCRole
def setup(bot):
bot.add_cog(CCRole(bot))

281
ccrole/ccrole.py
Unescape View File

@ -1,5 +1,10 @@
import discord
import asyncio
from discord.ext import commands from discord.ext import commands
from .utils.dataIO import dataIO
from redbot.core import Config
from .utils import checks from .utils import checks
from .utils.chat_formatting import pagify, box from .utils.chat_formatting import pagify, box
import os import os
@ -7,8 +12,10 @@ import re
class CCRole: class CCRole:
"""Custom commands """
Creates commands used to display text""" Custom commands
Creates commands used to display text and adjust roles
"""
def __init__(self, bot): def __init__(self, bot):
self.bot = bot self.bot = bot
@ -25,71 +32,116 @@ class CCRole:
@checks.mod_or_permissions(administrator=True) @checks.mod_or_permissions(administrator=True)
async def ccrole_add(self, ctx, command : str): async def ccrole_add(self, ctx, command : str):
"""Adds a custom command with roles""" """Adds a custom command with roles"""
server = ctx.message.server
author = ctx.message.author
msg = 'What roles should it add? (Must be comma separated) Example:\n\n'
for c, m in enumerate(self.settings[server.id]["GREETING"]):
msg += " {}. {}\n".format(c, m)
for page in pagify(msg, ['\n', ' '], shorten_by=20):
await self.bot.say("```\n{}\n```".format(page))
answer = await self.bot.wait_for_message(timeout=120, author=author)
try:
num = int(answer.content)
choice = self.settings[server.id]["GREETING"].pop(num)
except:
await self.bot.say("That's not a number in the list :/")
return
server = ctx.message.server
command = command.lower() command = command.lower()
if command in self.bot.commands: if command in self.bot.commands:
await self.bot.say("That command is already a standard command.") await self.bot.say("That command is already a standard command.")
return return
server = ctx.message.server
author = ctx.message.author
if server.id not in self.c_commands: if server.id not in self.c_commands:
self.c_commands[server.id] = {} self.c_commands[server.id] = {}
cmdlist = self.c_commands[server.id] cmdlist = self.c_commands[server.id]
if command not in cmdlist: if command in cmdlist:
cmdlist[command] = text await self.bot.say("This command already exists. Delete"
self.c_commands[server.id] = cmdlist "`it with {}ccrole delete` first."
dataIO.save_json(self.file_path, self.c_commands)
await self.bot.say("Custom command successfully added.")
else:
await self.bot.say("This command already exists. Use "
"`{}customcom edit` to edit it."
"".format(ctx.prefix)) "".format(ctx.prefix))
return
@customcom.command(name="edit", pass_context=True) # Roles to add
@checks.mod_or_permissions(administrator=True) await self.bot.say('What roles should it add? (Must be comma separated)\nSay `None` to skip adding roles')
async def cc_edit(self, ctx, command : str, *, text):
"""Edits a custom command answer = await self.bot.wait_for_message(timeout=120, author=author)
Example: if not answer:
[p]customcom edit yourcommand Text you want await self.bot.say("Timed out, canceling")
""" return
server = ctx.message.server arole_list = []
command = command.lower() if answer.content.upper()!="NONE":
if server.id in self.c_commands: arole_list = answer.content.split(",")
cmdlist = self.c_commands[server.id]
if command in cmdlist: try:
cmdlist[command] = text arole_list = [discord.utils.get(server.roles, name=role.strip(' ')).id for role in arole_list]
self.c_commands[server.id] = cmdlist except:
dataIO.save_json(self.file_path, self.c_commands) await self.bot.say("Invalid answer, canceling")
await self.bot.say("Custom command successfully edited.") return
else:
await self.bot.say("That command doesn't exist. Use " # Roles to remove
"`{}customcom add` to add it." await self.bot.say('What roles should it remove? (Must be comma separated)\nSay `None` to skip removing roles')
"".format(ctx.prefix))
answer = await self.bot.wait_for_message(timeout=120, author=author)
if not answer:
await self.bot.say("Timed out, canceling")
return
rrole_list = []
if answer.content.upper()!="NONE":
rrole_list = answer.content.split(",")
try:
rrole_list = [discord.utils.get(server.roles, name=role.strip(' ')).id for role in rrole_list]
except:
await self.bot.say("Invalid answer, canceling")
return
# Roles to use
await self.bot.say('What roles are allowed to use this command? (Must be comma separated)\nSay `None` to allow all roles')
answer = await self.bot.wait_for_message(timeout=120, author=author)
if not answer:
await self.bot.say("Timed out, canceling")
return
prole_list = []
if answer.content.upper()!="NONE":
prole_list = answer.content.split(",")
try:
prole_list = [discord.utils.get(server.roles, name=role.strip(' ')).id for role in prole_list]
except:
await self.bot.say("Invalid answer, canceling")
return
# Selfrole
await self.bot.say('Is this a targeted command?(yes/no)\nNo will make this a selfrole command')
answer = await self.bot.wait_for_message(timeout=120, author=author)
if not answer:
await self.bot.say("Timed out, canceling")
return
if answer.content.upper() in ["Y", "YES"]:
targeted = True
await self.bot.say("This command will be targeted")
else: else:
await self.bot.say("There are no custom commands in this server." targeted = False
" Use `{}customcom add` to start adding some." await self.bot.say("This command will be selfrole")
"".format(ctx.prefix))
# Message to send
await self.bot.say('What message should the bot send?\nSay `None` to send the default `Success!` message')
answer = await self.bot.wait_for_message(timeout=120, author=author)
if not answer:
await self.bot.say("Timed out, canceling")
return
text = "Success!"
if answer.content.upper()!="NONE":
text = answer.content
# Save the command
cmdlist[command] = {'text': text, 'aroles': arole_list, 'rroles': rrole_list, "proles": prole_list, "targeted": targeted}
self.c_commands[server.id] = cmdlist
dataIO.save_json(self.file_path, self.c_commands)
await self.bot.say("Custom command successfully added.")
@customcom.command(name="delete", pass_context=True) @ccrole.command(name="delete", pass_context=True)
@checks.mod_or_permissions(administrator=True) @checks.mod_or_permissions(administrator=True)
async def cc_delete(self, ctx, command : str): async def ccrole_delete(self, ctx, command : str):
"""Deletes a custom command """Deletes a custom command
Example: Example:
[p]customcom delete yourcommand""" [p]ccrole delete yourcommand"""
server = ctx.message.server server = ctx.message.server
command = command.lower() command = command.lower()
if server.id in self.c_commands: if server.id in self.c_commands:
@ -103,22 +155,22 @@ class CCRole:
await self.bot.say("That command doesn't exist.") await self.bot.say("That command doesn't exist.")
else: else:
await self.bot.say("There are no custom commands in this server." await self.bot.say("There are no custom commands in this server."
" Use `{}customcom add` to start adding some." " Use `{}ccrole add` to start adding some."
"".format(ctx.prefix)) "".format(ctx.prefix))
@customcom.command(name="list", pass_context=True) @ccrole.command(name="list", pass_context=True)
async def cc_list(self, ctx): async def ccrole_list(self, ctx):
"""Shows custom commands list""" """Shows custom commands list"""
server = ctx.message.server server = ctx.message.server
commands = self.c_commands.get(server.id, {}) commands = self.c_commands.get(server.id, {})
if not commands: if not commands:
await self.bot.say("There are no custom commands in this server." await self.bot.say("There are no custom commands in this server."
" Use `{}customcom add` to start adding some." " Use `{}ccrole add` to start adding some."
"".format(ctx.prefix)) "".format(ctx.prefix))
return return
commands = ", ".join([ctx.prefix + c for c in sorted(commands)]) commands = ", ".join([ctx.prefix + c for c in sorted(commands.keys())])
commands = "Custom commands:\n\n" + commands commands = "Custom commands:\n\n" + commands
if len(commands) < 1500: if len(commands) < 1500:
@ -139,62 +191,95 @@ class CCRole:
if server.id in self.c_commands and self.bot.user_allowed(message): if server.id in self.c_commands and self.bot.user_allowed(message):
cmdlist = self.c_commands[server.id] cmdlist = self.c_commands[server.id]
cmd = message.content[len(prefix):] cmd = message.content[len(prefix):].split()[0]
if cmd in cmdlist: if cmd in cmdlist:
cmd = cmdlist[cmd] cmd = cmdlist[cmd]
cmd = self.format_cc(cmd, message) await self.eval_cc(cmd, message)
await self.bot.send_message(message.channel, cmd)
elif cmd.lower() in cmdlist: elif cmd.lower() in cmdlist:
cmd = cmdlist[cmd.lower()] cmd = cmdlist[cmd.lower()]
cmd = self.format_cc(cmd, message) await self.eval_cc(cmd, message)
await self.bot.send_message(message.channel, cmd)
def get_prefix(self, message): def get_prefix(self, message):
for p in self.bot.settings.get_prefixes(message.server): for p in self.bot.settings.get_prefixes(message.server):
if message.content.startswith(p): if message.content.startswith(p):
return p return p
return False return False
def format_cc(self, command, message): async def eval_cc(self, cmd, message):
results = re.findall("\{([^}]+)\}", command) if cmd['proles'] and not (set(role.id for role in message.author.roles) & set(cmd['proles'])):
for result in results: return # Not authorized, do nothing
param = self.transform_parameter(result, message)
command = command.replace("{" + result + "}", param) if cmd['targeted']:
return command try:
target = discord.utils.get(message.server.members, mention=message.content.split()[1])
def transform_parameter(self, result, message): except:
""" target = None
For security reasons only specific objects are allowed
Internals are ignored if not target:
""" out_message = "This command is targeted! @mention a target\n`{} <target>`".format(message.content.split()[0])
raw_result = "{" + result + "}"
objects = { await self.bot.send_message(message.channel, out_message)
"message" : message,
"author" : message.author, return
"channel" : message.channel,
"server" : message.server
}
if result in objects:
return str(objects[result])
try:
first, second = result.split(".")
except ValueError:
return raw_result
if first in objects and not second.startswith("_"):
first = objects[first]
else: else:
return raw_result target = message.author
return str(getattr(first, second, raw_result))
if cmd['aroles']:
arole_list = [discord.utils.get(message.server.roles, id=roleid) for roleid in cmd['aroles']]
# await self.bot.send_message(message.channel, "Adding: "+str([str(arole) for arole in arole_list]))
await self.bot.add_roles(target, *arole_list)
await asyncio.sleep(1)
if cmd['rroles']:
rrole_list = [discord.utils.get(message.server.roles, id=roleid) for roleid in cmd['rroles']]
# await self.bot.send_message(message.channel, "Removing: "+str([str(rrole) for rrole in rrole_list]))
await self.bot.remove_roles(target, *rrole_list)
await self.bot.send_message(message.channel, cmd['text'])
# {'text': text, 'aroles': arole_list, 'rroles': rrole_list, "proles", prole_list, "targeted": targeted}
# def format_cc(self, command, message):
# results = re.findall("\{([^}]+)\}", command)
# for result in results:
# param = self.transform_parameter(result, message)
# command = command.replace("{" + result + "}", param)
# return command
# def transform_parameter(self, result, message):
# """
# For security reasons only specific objects are allowed
# Internals are ignored
# """
# raw_result = "{" + result + "}"
# objects = {
# "message" : message,
# "author" : message.author,
# "channel" : message.channel,
# "server" : message.server
# }
# if result in objects:
# return str(objects[result])
# try:
# first, second = result.split(".")
# except ValueError:
# return raw_result
# if first in objects and not second.startswith("_"):
# first = objects[first]
# else:
# return raw_result
# return str(getattr(first, second, raw_result))
def check_folders(): def check_folders():
if not os.path.exists("data/customcom"): if not os.path.exists("data/ccrole"):
print("Creating data/customcom folder...") print("Creating data/ccrole folder...")
os.makedirs("data/customcom") os.makedirs("data/ccrole")
def check_files(): def check_files():
f = "data/customcom/commands.json" f = "data/ccrole/commands.json"
if not dataIO.is_valid_json(f): if not dataIO.is_valid_json(f):
print("Creating empty commands.json...") print("Creating empty commands.json...")
dataIO.save_json(f, {}) dataIO.save_json(f, {})

15
ccrole/info.json
Unescape View File

@ -1,9 +1,10 @@
{ {
"AUTHOR" : "Bobloy", "author" : ["Bobloy"],
"INSTALL_MSG" : "Thank you for installing Custom Commands w/ Roles", "bot_version" : [3,0,0],
"NAME" : "CCRole", "description" : "[Incomplete] Creates custom commands to adjust roles and send custom messages",
"SHORT" : "Creates commands that adjust roles", "hidden" : false,
"DESCRIPTION" : "Creates custom commands to adjust roles and send custom messages", "install_msg" : "Thank you for installing Custom Commands w/ Roles.",
"TAGS" : ["fox", "bobloy", "utilities", "tools", "roles"], "requirements" : [],
"HIDDEN" : false "short" : "[Incomplete] Creates commands that adjust roles",
"tags" : ["fox", "bobloy", "utility", "tools", "roles"]
} }
Write Preview
Loading…
Cancel
Save