@@ -123,13 +123,13 @@ class Admin(): | |||
self.con.updateconfig() | |||
return await self.bot.say("{} has been set as the twitch shilling channel!".format(channel.mention)) | |||
@bot.command(pass_context=True, visible=False) | |||
@bot.command(pass_context=True, hidden=True) | |||
async def set_customwelcomemessage(self, ctx, *, message: str): | |||
if not owner(ctx): | |||
return await self.bot.reply(self.con.no_perms_reponse, delete_after=self.con.delete_after) | |||
else: | |||
self.con.serverconfig = self.con.load_config() | |||
self.con.serverconfig[ctx.message.server.id]["greets"]["custom_message"] = message | |||
self.con.serverconfig[ctx.message.server.id]["greets"]["custom-message"] = message | |||
self.con.updateconfig() | |||
return await self.bot.say("Custom message set to '{}'".format(message)) | |||
@@ -240,8 +240,10 @@ class Admin(): | |||
if not owner(ctx): | |||
return await self.bot.reply(self.con.no_perms_reponse, delete_after=self.con.delete_after) | |||
else: | |||
# TODO: Make colour top level role colour | |||
# TODO: Custom message for annoucement footer | |||
embed = discord.Embed(title="RoxBot Announcement", colour=discord.Colour(0x306f99), description=' '.join(announcement)) | |||
embed.set_footer(text="This message has be automatically generated by a QT Roxie", | |||
embed.set_footer(text="This message has be automatically generated by a cute ass Roxie", | |||
icon_url=self.bot.user.avatar_url) | |||
for server in self.bot.servers: | |||
await self.bot.send_message(server, embed=embed) |
@@ -25,7 +25,7 @@ class Fun(): | |||
multiplier = int(die[0]) | |||
else: | |||
multiplier = 1 | |||
if die[1].lower() != "d": | |||
if die[1].lower() != "d" and die[0].lower() != "d": | |||
return await self.bot.say("Use the format 'ndx'.") | |||
options = (4, 6, 8, 10, 12, 20, 100) | |||
for option in options: |
@@ -1 +1 @@ | |||
{"175285455204384768": {"greets": {"enabled": 0, "welcome-channel": "", "member-role": "", "custom-message": "", "default-message:": "Be sure to read the rules."}, "goodbyes": {"enabled": 0, "goodbye-channel": ""}, "selfAssign": {"enabled": 0, "roles": []}, "twitch": {"enabled": 0, "twitch-channel": "", "whitelist": {"enabled": 0, "list": []}}}, "304048071963312130": {"greets": {"enabled": 0, "welcome-channel": "", "member-role": "", "custom-message": "", "default-message:": "Be sure to read the rules."}, "goodbyes": {"enabled": 0, "goodbye-channel": ""}, "selfAssign": {"enabled": 0, "roles": []}, "twitch": {"enabled": 0, "twitch-channel": "", "whitelist": {"enabled": 0, "list": []}}}} | |||
{"175285455204384768": {"greets": {"enabled": 0, "welcome-channel": "", "member-role": "", "custom-message": "", "default-message:": "Be sure to read the rules."}, "goodbyes": {"enabled": 0, "goodbye-channel": ""}, "selfAssign": {"enabled": 0, "roles": []}, "twitch": {"enabled": 0, "twitch-channel": "", "whitelist": {"enabled": 0, "list": []}}}, "304048071963312130": {"greets": {"enabled": 1, "welcome-channel": "304048071963312130", "member-role": "", "custom-message": "", "default-message": "Be sure to read the rules."}, "goodbyes": {"enabled": 0, "goodbye-channel": ""}, "selfAssign": {"enabled": 1, "roles": ["307330606348632064", "308082456743903233", "308083509866659850"]}, "twitch": {"enabled": 0, "twitch-channel": "", "whitelist": {"enabled": 0, "list": []}}}, "325593726384734210": {"greets": {"enabled": 0, "welcome-channel": "", "member-role": "", "custom-message": "", "default-message:": "Be sure to read the rules."}, "goodbyes": {"enabled": 0, "goodbye-channel": ""}, "selfAssign": {"enabled": 0, "roles": []}, "twitch": {"enabled": 0, "twitch-channel": "", "whitelist": {"enabled": 0, "list": []}}}} |
@@ -10,7 +10,7 @@ class Config(): | |||
"welcome-channel": "", | |||
"member-role": "", | |||
"custom-message": "", | |||
"default-message:": "Be sure to read the rules." | |||
"default-message": "Be sure to read the rules." | |||
}, | |||
"goodbyes": { | |||
"enabled": 0, |
@@ -1,6 +1,6 @@ | |||
[Credentials] | |||
; Put your token here. | |||
Token = | |||
Token =MzA4MDc3ODg3MDYyNTQwMjg5.DFGnhg.4nNkVXMoKvnI2agJgtAg0x8auk0 | |||
[RoxBot] | |||
OwnerID = 142735312626515979 |
@@ -1,24 +1,5 @@ | |||
#!/usr/env python | |||
############## | |||
# To-do List # | |||
############## | |||
# High Priority # | |||
# TODO: Fix Config Bug | |||
# Mid Priority # | |||
# TODO: Move away from using ID's for everything. Maybe replace list with dict | |||
# TODO: Admin tools - For commands already in and things like purge a chat | |||
# TODO: On member role assign, welcome member using on_member_update | |||
# Low Priority # | |||
# TODO: Command Review, look at all commands and flesh them out. Make sure user experience feels nice | |||
# TODO: Better help menu- AutoGen using <command>.help | |||
# TODO: Overwatch stats - Using Overwatch-API lib | |||
# TODO: Add check for no channel id when a module is enabled | |||
# TODO: Maybe some randomised dialogue so that not every command has only one response. | |||
import configparser | |||
import discord | |||
@@ -27,7 +8,7 @@ from discord.ext.commands import Bot | |||
from config.config import Config | |||
from cogs import cogs | |||
__version__ = '0.3.2' | |||
__version__ = '0.3.3' | |||
settings = configparser.ConfigParser() | |||
settings.read('config/settings.ini') | |||
@@ -82,14 +63,14 @@ async def on_member_join(member): | |||
:param member: | |||
:return: | |||
""" | |||
print(con.serverconfig[member.server.id]["greets"]["enabled"]) | |||
if not con.serverconfig[member.server.id]["greets"]["enabled"]: | |||
return | |||
print("Passes Enabled Check") | |||
if con.serverconfig[member.server.id]["greets"]["custom-message"]: | |||
message = con.serverconfig[member.server.id]["greets"]["custom-message"] | |||
else: | |||
message = con.serverconfig[member.server.id]["greets"]["default-message"] | |||
print("passed message check") | |||
# TODO: Maybe thumbnail for the embed | |||
em = discord.Embed( | |||
title="Welcome to {}!".format(member.server), | |||
description='Hey {}! Welcome to **{}**! {}'.format(member.mention, member.server, message), | |||
@@ -99,7 +80,6 @@ async def on_member_join(member): | |||
channel = discord.Object(con.serverconfig[member.server.id]["greets"]["welcome-channel"]) | |||
else: | |||
channel = member.server.default_channel | |||
print("passed channel getting") | |||
return await bot.send_message(channel,embed=em) | |||