status: Add member role removal functionality for discord bot

amfoss · May 24, 2021 · 411a756 · 411a756
1 parent 1984674
commit 411a756
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/members/admin.py b/members/admin.py
@@ -195,7 +195,7 @@ class GroupAdmin(ImportExportModelAdmin, ExportActionMixin, admin.ModelAdmin):
             'fields': (('telegramBot', 'telegramGroup'),)
         }),
         ('Discord Integration', {
-            'fields': (('discordBot', 'discordGroup', 'discordChannel'),)
+            'fields': (('discordBot', 'discordGroup', 'discordChannel', 'discordMemberRole'),)
         }),
     )
     search_fields = ['name', 'members']

diff --git a/members/models.py b/members/models.py
@@ -244,6 +244,7 @@ class Group(models.Model):
     discordBot = models.CharField(max_length=500, null=True, blank=True, verbose_name="Discord Bot Token")
     discordGroup = models.CharField(max_length=250, null=True, blank=True, verbose_name="Discord Group ID")
     discordChannel = models.CharField(max_length=500, null=True, blank=True, verbose_name="Discord Channel ID")
+    discordMemberRole = models.CharField(max_length=500, null=True, blank=True, verbose_name="Discord Member Role ID")
 
     class Meta:
         verbose_name_plural = "Groups"

diff --git a/status/discord.py b/status/discord.py
@@ -33,6 +33,11 @@ def kickMember(self):
         baseURL = "guilds/{}/members/{}".format(self.obj[1], self.userID)
         if self.checkIfUserExists():
             re = fetch(baseURL, token=self.obj[0], delete=True)
+
+    def removeMemberRole(self):
+        baseURL = "guilds/{}/members/{}/roles/{}".format(self.obj[1], self.userID, self.obj[3])
+        if self.checkIfUserExists():
+            re = fetch(baseURL, token=self.obj[0], delete=True)
 
     def checkIfUserExists(self):
         baseURL = "guilds/{}/members/{}".format(self.obj[1], self.userID)

diff --git a/status/management/commands/get_job.py b/status/management/commands/get_job.py
@@ -117,7 +117,7 @@ def kickMembersFromGroup(thread, telegram_kick=False, discord_kick=False):
     discordAgents = []
     groups = Group.objects.filter(thread_id=thread.id, statusUpdateEnabled=True)
     for group in groups:
-        discord_obj = [group.discordBot, group.discordGroup, group.discordChannel]
+        discord_obj = [group.discordBot, group.discordGroup, group.discordChannel, group.discordMemberRole]
         obj = [group.telegramBot, group.telegramGroup]
         if obj not in telegramAgents:
             telegramAgents.append(obj)
@@ -144,7 +144,7 @@ def kickMembersFromGroup(thread, telegram_kick=False, discord_kick=False):
                 profile = Profile.objects.get(user=user)
                 try:
                     discord_client = Discord(obj=discord_obj, userID=profile.discord_id)
-                    discord_client.kickMember()
+                    discord_client.removeMemberRole()
 
                 except:
                     pass