velvox
/
litecord
mirror of https://gitlab.com/litecord/litecord.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

guilds: remove app_ param from delete_guild()

This commit is contained in:
Luna 2019-10-25 10:24:20 -03:00
parent 420646e76f
commit 2780ca4175
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
litecord/blueprints/guilds.py
View File

@ -393,11 +393,9 @@ async def _update_guild(guild_id):
return jsonify(guild) return jsonify(guild)
async def delete_guild(guild_id: int, *, app_=None): async def delete_guild(guild_id: int):
"""Delete a single guild.""" """Delete a single guild."""
app_ = app_ or app await app.db.execute(
await app_.db.execute(
""" """
DELETE FROM guilds DELETE FROM guilds
WHERE guilds.id = $1 WHERE guilds.id = $1
@ -406,7 +404,7 @@ async def delete_guild(guild_id: int, *, app_=None):
) )
# Discord's client expects IDs being string # Discord's client expects IDs being string
await app_.dispatcher.dispatch( await app.dispatcher.dispatch(
"guild", "guild",
guild_id, guild_id,
"GUILD_DELETE", "GUILD_DELETE",
@ -420,7 +418,7 @@ async def delete_guild(guild_id: int, *, app_=None):
# remove from the dispatcher so nobody # remove from the dispatcher so nobody
# becomes the little memer that tries to fuck up with # becomes the little memer that tries to fuck up with
# everybody's gateway # everybody's gateway
await app_.dispatcher.remove("guild", guild_id) await app.dispatcher.remove("guild", guild_id)
@bp.route("/<int:guild_id>", methods=["DELETE"]) @bp.route("/<int:guild_id>", methods=["DELETE"])

11
tests/test_admin_api/test_guilds.py
View File

@ -54,6 +54,11 @@ async def _fetch_guild(test_cli_staff, guild_id, *, ret_early=False):
return rjson return rjson
async def _delete_guild(test_cli, guild_id: int):
async with test_cli.app.app_context():
await delete_guild(int(guild_id))
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_guild_fetch(test_cli_staff): async def test_guild_fetch(test_cli_staff):
"""Test the creation and fetching of a guild via the Admin API.""" """Test the creation and fetching of a guild via the Admin API."""
@ -63,7 +68,7 @@ async def test_guild_fetch(test_cli_staff):
try: try:
await _fetch_guild(test_cli_staff, guild_id) await _fetch_guild(test_cli_staff, guild_id)
finally: finally:
await delete_guild(int(guild_id), app_=test_cli_staff.app) await _delete_guild(test_cli_staff, int(guild_id))
@pytest.mark.asyncio @pytest.mark.asyncio
@ -91,7 +96,7 @@ async def test_guild_update(test_cli_staff):
rjson = await _fetch_guild(test_cli_staff, guild_id) rjson = await _fetch_guild(test_cli_staff, guild_id)
assert rjson["unavailable"] assert rjson["unavailable"]
finally: finally:
await delete_guild(int(guild_id), app_=test_cli_staff.app) await _delete_guild(test_cli_staff, int(guild_id))
@pytest.mark.asyncio @pytest.mark.asyncio
@ -113,4 +118,4 @@ async def test_guild_delete(test_cli_staff):
assert rjson["error"] assert rjson["error"]
assert rjson["code"] == GuildNotFound.error_code assert rjson["code"] == GuildNotFound.error_code
finally: finally:
await delete_guild(int(guild_id), app_=test_cli_staff.app) await _delete_guild(test_cli_staff, int(guild_id))