Browse Source

Various bug fixes (twitch shilling, config issues with greets and goodbyes. naming issue in admin.py) some small changes to ux and some extra todos.

tags/v0.3.4
roxie 7 years ago
parent
commit
e633c53c57
6 changed files with 17 additions and 17 deletions
  1. +1
    -1
      cogs/Admin.py
  2. +8
    -9
      cogs/Twitch.py
  3. +2
    -1
      cogs/selfAssign.py
  4. +1
    -1
      config/config.json
  5. +1
    -0
      config/config.py
  6. +4
    -5
      main.py

+ 1
- 1
cogs/Admin.py View File

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]["twitch_shilling"]["twitch-channel"] = channel.id
self.con.serverconfig[ctx.message.server.id]["twitch"]["twitch-channel"] = channel.id
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))



+ 8
- 9
cogs/Twitch.py View File

# Twitch Shilling Part # Twitch Shilling Part
if blacklisted(member_b): if blacklisted(member_b):
return return
ts_enabled = self.con.serverconfig[member_a.server.id]["twitch"]["enabled"]
if ts_enabled:
if not self.con.serverconfig[member_a.server.id]["twitch"]["whitelist"][
"enabled"] or member_a.id in \
self.con.serverconfig[member_a.server.id]["twitch"]["whitelist"]["list"]:
if member_a.game:
if member_a.game.type:
channel = discord.Object(
self.con.serverconfig[member_a.server.id]["twitch"]["twitch-channel"])
if member_a.game:
if member_a.game.type and not member_b.game.type:
ts_enabled = self.con.serverconfig[member_a.server.id]["twitch"]["enabled"]
ts_whitelist = self.con.serverconfig[member_a.server.id]["twitch"]["whitelist"]["enabled"]
if ts_enabled:
if not ts_whitelist or member_a.id in \
self.con.serverconfig[member_a.server.id]["twitch"]["whitelist"]["list"]:
channel = discord.Object(self.con.serverconfig[member_a.server.id]["twitch"]["twitch-channel"])
return await self.bot.send_message(channel, return await self.bot.send_message(channel,
content=":video_game:** {} is live!** :video_game:\n {}\n{}".format( content=":video_game:** {} is live!** :video_game:\n {}\n{}".format(
member_a.name, member_a.game.name, member_a.game.url)) member_a.name, member_a.game.name, member_a.game.url))

+ 2
- 1
cogs/selfAssign.py View File

for serverrole in ctx.message.server.roles: for serverrole in ctx.message.server.roles:
if role == serverrole.id: if role == serverrole.id:
roles.append(serverrole.name) roles.append(serverrole.name)
return await self.bot.say(roles)
return await self.bot.say(str(roles).strip("[]'"))



@bot.command(pass_context=True) @bot.command(pass_context=True)
async def iam(self, ctx, role: discord.Role = None): async def iam(self, ctx, role: discord.Role = None):

+ 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": 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": []}}}}
{"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": 1, "twitch-channel": "304048071963312130", "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
- 0
config/config.py View File



class Config(): class Config():
def __init__(self, bot): def __init__(self, bot):
# TODO: Move default message into settings.ini
self.serverconfig_template = { self.serverconfig_template = {
"example": { "example": {
"greets": { "greets": {

+ 4
- 5
main.py View File

con.config_errorcheck() con.config_errorcheck()
print("Discord.py version: "+discord.__version__) print("Discord.py version: "+discord.__version__)
print("Client logged in\n") print("Client logged in\n")
await bot.change_presence(game=discord.Game(name=__version__), afk=False)
await bot.change_presence(game=discord.Game(name="v"+__version__), afk=False)
print("Cods loaded:") print("Cods loaded:")
for cog in cogs: for cog in cogs:
bot.load_extension(cog) bot.load_extension(cog)
async def on_member_join(member): async def on_member_join(member):
""" """
Greets users when they join a server. Greets users when they join a server.
:param member:
:return:
""" """
print(con.serverconfig[member.server.id]["greets"]["enabled"])
# TODO: Move these to a cog cause they suck in main
con.load_config()
if not con.serverconfig[member.server.id]["greets"]["enabled"]: if not con.serverconfig[member.server.id]["greets"]["enabled"]:
return return
if con.serverconfig[member.server.id]["greets"]["custom-message"]: if con.serverconfig[member.server.id]["greets"]["custom-message"]:


@bot.event @bot.event
async def on_member_remove(member): async def on_member_remove(member):
con.load_config()
if not con.serverconfig[member.server.id]["goodbyes"]["enabled"]: if not con.serverconfig[member.server.id]["goodbyes"]["enabled"]:
return return
else: else:

Loading…
Cancel
Save