Correct how to check settings
This commit is contained in:
parent
867fea273b
commit
2035b963eb
|
@ -73,25 +73,25 @@ class StatsUpdate:
|
||||||
SELECT
|
SELECT
|
||||||
COALESCE(welcome_alerts, default_alerts) AS channel,
|
COALESCE(welcome_alerts, default_alerts) AS channel,
|
||||||
welcome_msg AS msg,
|
welcome_msg AS msg,
|
||||||
join_role as role
|
join_role as role,
|
||||||
|
welcome_notifications as notify
|
||||||
FROM
|
FROM
|
||||||
guilds
|
guilds
|
||||||
WHERE
|
WHERE
|
||||||
welcome_notifications = True
|
|
||||||
AND
|
|
||||||
id = $1
|
id = $1
|
||||||
"""
|
"""
|
||||||
settings = await self.bot.db.fetchrow(query, member.guild.id)
|
settings = await self.bot.db.fetchrow(query, member.guild.id)
|
||||||
if settings:
|
if settings:
|
||||||
message = settings['msg'] or "Welcome to the '{server}' server {member}!"
|
message = settings['msg'] or "Welcome to the '{server}' server {member}!"
|
||||||
try:
|
if settings["notify"]:
|
||||||
channel = member.guild.get_channel(settings['channel'])
|
try:
|
||||||
await channel.send(message.format(server=member.guild.name, member=member.mention))
|
channel = member.guild.get_channel(settings['channel'])
|
||||||
# Forbidden for if the channel has send messages perms off
|
await channel.send(message.format(server=member.guild.name, member=member.mention))
|
||||||
# HTTP Exception to catch any weird happenings
|
# Forbidden for if the channel has send messages perms off
|
||||||
# Attribute Error catches when a channel is set, but that channel doesn't exist any more
|
# HTTP Exception to catch any weird happenings
|
||||||
except (discord.Forbidden, discord.HTTPException, AttributeError):
|
# Attribute Error catches when a channel is set, but that channel doesn't exist any more
|
||||||
pass
|
except (discord.Forbidden, discord.HTTPException, AttributeError):
|
||||||
|
pass
|
||||||
|
|
||||||
try:
|
try:
|
||||||
role = member.guild.get_role(settings['role'])
|
role = member.guild.get_role(settings['role'])
|
||||||
|
@ -107,7 +107,7 @@ SELECT
|
||||||
FROM
|
FROM
|
||||||
guilds
|
guilds
|
||||||
WHERE
|
WHERE
|
||||||
welcome_notifications = True
|
goodbye_notifications = True
|
||||||
AND
|
AND
|
||||||
id = $1
|
id = $1
|
||||||
AND
|
AND
|
||||||
|
|
Loading…
Reference in a new issue