Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
amadejkastelic committed Jul 14, 2024
1 parent ae505f2 commit 9acb7e3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion bot/integrations/discord/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ async def silence_user(self, interaction: discord.Interaction, member: discord.M
service.change_server_member_banned_status(
server_vendor=constants.ServerVendor.DISCORD,
server_uid=interaction.guild.id,
user_uid=member.id,
member_uid=member.id,
banned=not unban,
)
response = 'User {display_name} {banned}banned.'
Expand Down
6 changes: 3 additions & 3 deletions bot/repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,17 +240,17 @@ def save_server_post(
def is_member_banned_from_server(
server_vendor: constants.ServerVendor,
server_uid: str,
user_uid: str,
member_uid: str,
) -> bool:
cache_key = f'{server_vendor.value}_{server_uid}_{user_uid}'
cache_key = f'{server_vendor.value}_{server_uid}_{member_uid}'
banned = cache.get(store=cache.Store.SERVER_USER_BANNED, key=cache_key)
if banned != cache.NO_HIT:
return banned is True

server_user = models.ServerMember.objects.filter(
server__vendor=server_vendor,
server__vendor_uid=server_uid,
vendor_uid=user_uid,
vendor_uid=member_uid,
).first()

banned = server_user.banned if server_user else False
Expand Down
6 changes: 5 additions & 1 deletion bot/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,11 @@ async def get_post(
raise Exception('Not allowed to post. Upgrade your tier.')

# Check if user is banned
if repository.is_member_banned_from_server(server_vendor=server_vendor, server_uid=server_uid, user_uid=author_uid):
if repository.is_member_banned_from_server(
server_vendor=server_vendor,
server_uid=server_uid,
member_uid=author_uid,
):
logging.warning(f'User {author_uid} banned from server [{server_vendor.value} - {server_uid}]')
raise Exception('Not allowed to post, you were banned')

Expand Down

0 comments on commit 9acb7e3

Please sign in to comment.