Skip to content

Commit 75000b5

Browse files
committed
BUGFIX:
- utils.get_squadron() must not be async
1 parent f1b12f5 commit 75000b5

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

core/utils/discord.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,17 +1069,16 @@ async def squadron_autocomplete(interaction: discord.Interaction, current: str)
10691069
return choices[:25]
10701070

10711071

1072-
async def get_squadron(node: Node, *, name: Optional[str] = None,
1073-
squadron_id: Optional[int] = None) -> Optional[dict]:
1072+
def get_squadron(node: Node, *, name: Optional[str] = None, squadron_id: Optional[int] = None) -> Optional[dict]:
10741073
sql = "SELECT * FROM squadrons"
10751074
if name:
10761075
sql += " WHERE name = %(name)s"
10771076
elif squadron_id:
10781077
sql += " WHERE id = %(squadron_id)s"
1079-
async with node.apool.connection() as conn:
1080-
async with conn.cursor(row_factory=dict_row) as cursor:
1081-
await cursor.execute(sql, {"name": name, "squadron_id": squadron_id})
1082-
return await cursor.fetchone()
1078+
with node.pool.connection() as conn:
1079+
with conn.cursor(row_factory=dict_row) as cursor:
1080+
cursor.execute(sql, {"name": name, "squadron_id": squadron_id})
1081+
return cursor.fetchone()
10831082

10841083

10851084
class UserTransformer(app_commands.Transformer):

plugins/greenieboard/listener.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ async def update_greenieboard(self, server: Server):
8585
squadrons = config.get('squadrons', [])
8686
if squadrons:
8787
for squadron in squadrons:
88-
row = await utils.get_squadron(self.node, name=squadron['name'])
88+
row = utils.get_squadron(self.node, name=squadron['name'])
8989
if not row:
9090
self.log.warning(f"Squadron {squadron['name']} not found!")
9191
continue

0 commit comments

Comments
 (0)