Browse Source

Quick welcome message fix.

tags/v0.3.3
roxie 7 years ago
parent
commit
c987ba4593
6 changed files with 12 additions and 30 deletions
  1. +5
    -3
      cogs/Admin.py
  2. +1
    -1
      cogs/Fun.py
  3. +1
    -1
      config/config.json
  4. +1
    -1
      config/config.py
  5. +1
    -1
      config/settings.ini
  6. +3
    -23
      main.py

+ 5
- 3
cogs/Admin.py View File

self.con.updateconfig() self.con.updateconfig()
return await self.bot.say("{} has been set as the twitch shilling channel!".format(channel.mention)) 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): async def set_customwelcomemessage(self, ctx, *, message: str):
if not owner(ctx): if not owner(ctx):
return await self.bot.reply(self.con.no_perms_reponse, delete_after=self.con.delete_after) return await self.bot.reply(self.con.no_perms_reponse, delete_after=self.con.delete_after)
else: else:
self.con.serverconfig = self.con.load_config() 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() self.con.updateconfig()
return await self.bot.say("Custom message set to '{}'".format(message)) return await self.bot.say("Custom message set to '{}'".format(message))


if not owner(ctx): if not owner(ctx):
return await self.bot.reply(self.con.no_perms_reponse, delete_after=self.con.delete_after) return await self.bot.reply(self.con.no_perms_reponse, delete_after=self.con.delete_after)
else: 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 = 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) icon_url=self.bot.user.avatar_url)
for server in self.bot.servers: for server in self.bot.servers:
await self.bot.send_message(server, embed=embed) await self.bot.send_message(server, embed=embed)

+ 1
- 1
cogs/Fun.py View File

multiplier = int(die[0]) multiplier = int(die[0])
else: else:
multiplier = 1 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'.") return await self.bot.say("Use the format 'ndx'.")
options = (4, 6, 8, 10, 12, 20, 100) options = (4, 6, 8, 10, 12, 20, 100)
for option in options: for option in options:

+ 1
- 1
config/config.json View File

{"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": []}}}}

+ 1
- 1
config/config.py View File

"welcome-channel": "", "welcome-channel": "",
"member-role": "", "member-role": "",
"custom-message": "", "custom-message": "",
"default-message:": "Be sure to read the rules."
"default-message": "Be sure to read the rules."
}, },
"goodbyes": { "goodbyes": {
"enabled": 0, "enabled": 0,

+ 1
- 1
config/settings.ini View File

[Credentials] [Credentials]
; Put your token here. ; Put your token here.
Token =
Token =MzA4MDc3ODg3MDYyNTQwMjg5.DFGnhg.4nNkVXMoKvnI2agJgtAg0x8auk0


[RoxBot] [RoxBot]
OwnerID = 142735312626515979 OwnerID = 142735312626515979

+ 3
- 23
main.py View File

#!/usr/env python #!/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 configparser


import discord import discord
from config.config import Config from config.config import Config
from cogs import cogs from cogs import cogs


__version__ = '0.3.2'
__version__ = '0.3.3'


settings = configparser.ConfigParser() settings = configparser.ConfigParser()
settings.read('config/settings.ini') settings.read('config/settings.ini')
:param member: :param member:
:return: :return:
""" """
print(con.serverconfig[member.server.id]["greets"]["enabled"])
if not con.serverconfig[member.server.id]["greets"]["enabled"]: if not con.serverconfig[member.server.id]["greets"]["enabled"]:
return return
print("Passes Enabled Check")
if con.serverconfig[member.server.id]["greets"]["custom-message"]: if con.serverconfig[member.server.id]["greets"]["custom-message"]:
message = con.serverconfig[member.server.id]["greets"]["custom-message"] message = con.serverconfig[member.server.id]["greets"]["custom-message"]
else: else:
message = con.serverconfig[member.server.id]["greets"]["default-message"] message = con.serverconfig[member.server.id]["greets"]["default-message"]
print("passed message check")
# TODO: Maybe thumbnail for the embed
em = discord.Embed( em = discord.Embed(
title="Welcome to {}!".format(member.server), title="Welcome to {}!".format(member.server),
description='Hey {}! Welcome to **{}**! {}'.format(member.mention, member.server, message), description='Hey {}! Welcome to **{}**! {}'.format(member.mention, member.server, message),
channel = discord.Object(con.serverconfig[member.server.id]["greets"]["welcome-channel"]) channel = discord.Object(con.serverconfig[member.server.id]["greets"]["welcome-channel"])
else: else:
channel = member.server.default_channel channel = member.server.default_channel
print("passed channel getting")
return await bot.send_message(channel,embed=em) return await bot.send_message(channel,embed=em)





Loading…
Cancel
Save