cleanup

Code4GovTech · Jan 29, 2024 · f2c9288 · f2c9288
1 parent 51e67b8
commit f2c9288
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 154 deletions.
diff --git a/cogs/badges.py b/cogs/badges.py
@@ -160,10 +160,10 @@ def get_user_badges(self, discord_id):
             github_id = contributorData[0]["github_id"]
             prData = {
                 "raised": SupabaseClient().read(
-                    table="pull_requests", query_key="raised_by", query_value=github_id
+                    table="connected_prs", query_key="raised_by", query_value=github_id
                 ),
-                "merged": SupabaseClient(table="pull_requests").read(
-                    table="pull_requests", query_key="merged_by", query_value=github_id
+                "merged": SupabaseClient(table="connected_prs").read(
+                    table="connected_prs", query_key="merged_by", query_value=github_id
                 ),
             }
             points = 0

diff --git a/cogs/serverManagement.py b/cogs/serverManagement.py
@@ -27,6 +27,16 @@ async def getServerData(self, ctx):
         # add all chapters
         chapterRoles = []
         guild = self.bot.get_guild(serverConfig.SERVER)
+        ## Clear Error
+        oldRole = guild.get_role(973852365188907048)
+        print("started")
+        print(f"{len(oldRole.members)} have the old contributor role")
+        for member in oldRole.members:
+            print(member.joined_at)
+            if member.joined_at.timestamp() > datetime(2022, 12, 25).timestamp():
+                await member.remove_roles(oldRole, reason="mistakenly given")
+                print("Member removed")
+
         for role in guild.roles:
             if role.name.startswith("College:"):
                 orgName = role.name[len("College: ") :]
@@ -43,23 +53,17 @@ async def getServerData(self, ctx):
         contributorsDiscord = SupabaseClient().read_all("contributors_discord")
 
         ## Give contributor role
-        print(1)
         contributorIds = [
             contributor["discord_id"] for contributor in contributorsGithub
         ]
-        print(2)
         contributorRole = guild.get_role(serverConfig.Roles.CONTRIBUTOR_ROLE)
-        print(3)
         count = [0, 0, 0]
         for member in guild.members:
             count[0] += 1
             if member.id in contributorIds:
                 count[1] += 1
                 if contributorRole not in member.roles:
-                    print(contributorRole)
-                    print(member.roles)
                     count[2] += 1
-                    print(4)
                     await member.add_roles(contributorRole)
 
         print(count)
@@ -68,8 +72,10 @@ async def getServerData(self, ctx):
         recordedMembers = [
             contributor["discord_id"] for contributor in contributorsDiscord
         ]
+        print(f"{len(recordedMembers)} have their data saved")
         currentMembers = [member.id for member in guild.members]
         membersWhoLeft = list(set(recordedMembers) - set(currentMembers))
+        print(f"{len(membersWhoLeft)} members left")
         SupabaseClient().deleteContributorDiscord(membersWhoLeft)
         print("Updated Contributors")
 

diff --git a/cogs/userInteractions.py b/cogs/userInteractions.py
@@ -332,18 +332,6 @@ async def github_profile(self, ctx):
 ```[![C4GTGithubDisplay](https://kcavhjwafgtoqkqbbqrd.supabase.co/storage/v1/object/public/c4gt-github-profile/{ctx.author.id}githubdisplay.jpg)](https://github.com/Code4GovTech)
 Know more about: Code For GovTech ([Website](https://www.codeforgovtech.in) | [GitHub](https://github.com/Code4GovTech/C4GT/wiki)) | [Digital Public Goods (DPGs)](https://digitalpublicgoods.net/digital-public-goods/) | [India & DPGs](https://government.economictimes.indiatimes.com/blog/digital-public-goods-digital-public-infrastructure-an-evolving-india-story/99532036)```"""
                     )
-            # githubProfileInfoEmbed.set_footer(text="Respond with 🏆 to get the link")
-            # message = await ctx.send(embed=githubProfileInfoEmbed)
-            # await message.add_reaction("🏆")
-            # def check(reaction, user):
-            #     return user == ctx.message.author and str(reaction.emoji) in ['🏆']
-            # try:
-            #     reaction, user = await self.bot.wait_for('reaction_add', timeout=60.0, check=check)
-            # except asyncio.TimeoutError:
-            #     await ctx.send("You took too long to respond.")
-            # else:
-            #     if str(reaction.emoji) == '🏆':
-            #         await ctx.send(f'[![C4GTGithubDisplay](https://kcavhjwafgtoqkqbbqrd.supabase.co/storage/v1/object/public/c4gt-github-profile/{ctx.author.id}githubdisplay.jpg?maxAge=10)](https://github.com/Code4GovTech)')
 
     @update_contributors.before_loop
     async def before_update_loop(self):
@@ -406,10 +394,10 @@ async def get_points(self, ctx):
             print(contributor)
             github_id = contributor[0]["github_id"]
             prs_raised = SupabaseClient().read(
-                table="pull_requests", query_key="raised_by", query_value=github_id
+                table="connected_prs", query_key="raised_by", query_value=github_id
             )
             prs_merged = SupabaseClient().read(
-                table="pull_requests", query_key="merged_by", query_value=github_id
+                table="connected_prs", query_key="merged_by", query_value=github_id
             )
             raise_points = 0
             merge_points = 0

diff --git a/models/__init__.py b/models/__init__.py
diff --git a/models/product.py b/models/product.py
diff --git a/models/project.py b/models/project.py
diff --git a/models/user.py b/models/user.py