staging into master #69

Merged
corbz merged 38 commits from staging into master 2024-10-14 22:34:03 +00:00
Showing only changes of commit fd25deeea2 - Show all commits

View File

@ -429,7 +429,10 @@ class GuildSettings_ListView(generics.ListCreateAPIView):
if self.request.user.is_superuser:
return GuildSettings.objects.all()
return GuildSettings.objects.filter(added_by=self.request.user)
saved_guilds = SavedGuilds.objects.filter(added_by=self.request.user)
guild_ids = [guild.guild_id for guild in saved_guilds]
return GuildSettings.objects.filter(guild_id__in=guild_ids)
def post(self, request):
saved_guilds = SavedGuilds.objects.filter(added_by=request.user)