Browse Source

Fixed a bug which literally made all of the roxbots guild objects and made the ID's strs.

tags/v1.4.1
Roxie Gibson 6 years ago
parent
commit
be0e4b78fe
3 changed files with 10 additions and 11 deletions
  1. +1
    -1
      cogs/gss.py
  2. +7
    -7
      config/server_config.py
  3. +2
    -3
      main.py

+ 1
- 1
cogs/gss.py View File

@@ -8,7 +8,7 @@ from config.server_config import ServerConfig


def is_gss():
return commands.check(lambda ctx: ctx.guild.id == str(393764974444675073))
return commands.check(lambda ctx: ctx.guild.id == 393764974444675073)

def is_not_nsfw_disabled():
def predicate(ctx):

+ 7
- 7
config/server_config.py View File

@@ -64,25 +64,25 @@ class ServerConfig():
def error_check(self, servers):
for server in servers:
# Server ID needs to be made a string for this statement because keys have to be strings in JSON. Which is annoying now we use int for ids.
server.id = str(server.id)
if str(server.id) not in self.servers:
self.servers[server.id] = self.servers_template["example"]
server_id = str(server.id)
if str(server_id) not in self.servers:
self.servers[server_id] = self.servers_template["example"]
self.update_config(self.servers)
print(
"WARNING: The config file for {} was not found. A template has been loaded and saved. All cogs are turned off by default.".format(
server.name.upper()))
else:
for cog_setting in self.servers_template["example"]:
if cog_setting not in self.servers[server.id]:
self.servers[server.id][cog_setting] = self.servers_template["example"][
if cog_setting not in self.servers[server_id]:
self.servers[server_id][cog_setting] = self.servers_template["example"][
cog_setting]
self.update_config(self.servers)
print(
"WARNING: The config file for {} was missing the {} cog. This has been fixed with the template version. It is disabled by default.".format(
server.name.upper(), cog_setting.upper()))
for setting in self.servers_template["example"][cog_setting]:
if setting not in self.servers[server.id][cog_setting]:
self.servers[server.id][cog_setting][setting] = self.servers_template["example"][
if setting not in self.servers[server_id][cog_setting]:
self.servers[server_id][cog_setting][setting] = self.servers_template["example"][
cog_setting][setting]
self.update_config(self.servers)
print(

+ 2
- 3
main.py View File

@@ -53,14 +53,14 @@ async def on_ready():
@bot.event
async def on_server_join(server):
server_config.servers = server_config.load_config()
server_config.servers[server.id] = server_config.servers_template["example"]
server_config.servers[str(server.id)] = server_config.servers_template["example"]
server_config.update_config(server_config.servers)


@bot.event
async def on_server_remove(server):
server_config.servers = server_config.load_config()
server_config.servers.pop(server.id)
server_config.servers.pop(str(server.id))
server_config.update_config(server_config.servers)


@@ -70,7 +70,6 @@ async def on_message(message):
return
return await bot.process_commands(message)


@bot.command()
async def about(ctx):
"""

Loading…
Cancel
Save