revert premerge

app.py

@@ -100,7 +100,6 @@ def update_google_sheet():
         name = "levelbot"
         #worksheet = gspread_bot.open(name).sheet1
         global_df['discord_user_id'] = global_df['discord_user_id'].astype(str)
-        global_df['discord_exp'] = global_df['discord_exp'].astype(str)
         # could just do this / format
         set_with_dataframe(worksheet, global_df)
         timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@@ -128,7 +127,7 @@ processed_users = set()
 
 async def periodic_api_test(): # needs rewrite, can do same thing and interact with csv -> push to google sheets
     try:
-        # this should be gspread type function (do not mix with discord at all
+        # this should be gspread type function (do not mix with discord at all)
         global worksheet2_df
         # get 
         for index, user in enumerate(worksheet2_df['hf_user_name']):
@@ -220,7 +219,6 @@ async def add_exp(member_id):
 
         print("test1")
         # discord_user_id column
-        # iterate over items of first column (discord_user_id)
         for index, cell_value in global_df.iloc[:, 0].items():
             # print("test2")
             # remove L (read, so no need to replace)
@@ -241,79 +239,35 @@ async def add_exp(member_id):
             
                     # increment the old experience value (better not to replace outright)
                     old_xp = global_df.loc[index, 'discord_exp']
-
-
-
-
-                    # add to discord exp (this is input)
-                    # add discord exp and hub exp to total_exp
-                    # set level based on total_exp (this is output)
-
-                    
-                    
                     # remove L (write, so we replace)
                     old_xp = str(old_xp)
                     if old_xp.startswith("L") and old_xp.endswith("L"):  
                         old_xp = old_xp[1:-1]
-
-                    # set old level; use this for more accurate logging and jumping multiple levels at once (for example, verifying)
-                    old_level = calculate_level(int(old_xp))
-                        
-                    # str -> int temporarily for adding
+                    # str -> int temporarily
                     new_xp = int(old_xp) + XP_PER_MESSAGE
-
-                    # ----------------------------------------------------
-                    total_exp = global_df.loc[index, 'total_exp']
-                    hub_xp = global_df.loc[index, 'hub_exp']
-                    
-                    total_exp = str(total_exp)
-                    hub_xp = str(hub_xp)
-                    
-                    if total_exp.startswith("L") and total_exp.endswith("L"):  
-                        total_exp = total_exp[1:-1]
-                    if hub_xp.startswith("L") and hub_xp.endswith("L"):  
-                        hub_xp = hub_xp[1:-1]   
-
-                    old_total_xp = int(total_exp)
-
-                    # check if hub exp not empty
-                    if hub_xp.strip():  
-                        total_exp = int(new_xp) + int(hub_xp)
-                    else:
-                        total_exp = int(new_xp)                    
-     
-                    # ----------------------------------------------------
-                    
-                    # total v
-                    current_level = calculate_level(total_exp) 
-
-                    # convert back to string + google sheet proofing
+                    # check + convert back to string + google sheet proofing
+                    current_level = calculate_level(new_xp) 
                     new_xp = str(new_xp)
                     if not new_xp.startswith("L") and not new_xp.endswith("L"): 
                         new_xp = f"L" + str(new_xp) + f"L"
-                    global_df.loc[index, 'discord_exp'] = new_xp # do not change column name
 
-                    # after
-                    total_exp = str(total_exp)
-                    if not total_exp.startswith("L") and not total_exp.endswith("L"): 
-                        total_exp = f"L" + str(total_exp) + f"L" 
-                    
                     # add back to dataframe in memory after checking redundantly; 
-                    if total_exp.startswith("L") and total_exp.endswith("L"): 
+                    if new_xp.startswith("L") and new_xp.endswith("L"): 
                         print("test5")
-                        global_df.loc[index, 'total_exp'] = total_exp # do not change column name 
-                        print(f"Record for {member} updated from {old_total_xp} to {global_df.loc[index, 'total_exp']} (+{XP_PER_MESSAGE}) ")
+                        global_df.loc[index, 'discord_exp'] = new_xp # do not change column name
+                        print(f"Record for {member} updated from {old_xp} to {global_df.loc[index, 'discord_exp']} (+{XP_PER_MESSAGE}) ")
                   
                         # level up
+                        
                         verified_role = guild.get_role(900063512829755413)
                         
                         print(f"Current_level for {member}: {current_level}")
                         if current_level >= 2 and current_level <=30:
                             print("test6")
                             current_role = lvls[current_level]
-                            if current_role not in member.roles: # if we need to level up / update role
+                            if current_role not in member.roles: # if we leveled up
         
-                                # finding leaderboard rank + excluding huggingfolks (still need exclusion)
+                                # finding leaderboard rank + excluding huggingfolks 
                                 try:
                                     # cell_value = L1234567890L
                                     # make copy
@@ -321,12 +275,12 @@ async def add_exp(member_id):
                                     # do calculations
                                     copy_df = global_df.copy()
                                     copy_df['discord_user_id'] = copy_df['discord_user_id'].str.strip('L').astype(str)
-                                    copy_df['total_exp'] = copy_df['total_exp'].str.strip('L').astype(int)
+                                    copy_df['discord_exp'] = copy_df['discord_exp'].str.strip('L').astype(int)
                                     row = copy_df[copy_df['discord_user_id'] == str(member_id)]
                                     print(f"Row found for {member_id}!")
-                                    target_exp = row['total_exp'].values[0]
-                                    rank = (copy_df['total_exp'] > target_exp).sum() + 1
-                                    print(f"The rank for discord_id {member_id} based on total_exp is: {rank}")
+                                    target_exp = row['discord_exp'].values[0]
+                                    rank = (copy_df['discord_exp'] > target_exp).sum() + 1
+                                    print(f"The rank for discord_id {member_id} based on discord_exp is: {rank}")
                                 except Exception as e:
                                     print(f"Discord ID {member_id} not found in the DataFrame.") 
                                     rank = "🤗"
@@ -337,15 +291,15 @@ async def add_exp(member_id):
                                     if verified_role not in member.roles:     
 
 
-                                        # L12345L -> `12345` -> 12345
-                                        total_exp = total_exp[1:-1]
-                                        total_exp = int(total_exp)
+                                        # XP has L; remove, calculate
+                                        new_xp = new_xp[1:-1]
+                                        new_xp = int(new_xp)
                                         
-                                        if total_exp % 10 == 0: # staggers messages so we don't send one every time exp is earned
+                                        if new_xp % 10 == 0: # staggers messages so we don't send one every time exp is earned
                                             # claim exp (-30 for level 3, but +100 as bonus exp. This scales infinitely until the member verifies,
                                             # so they can continue earning exp, it just won't translate to levels and the leaderboard.
                                             # This way they can claim at any time and get a big boost in levels!
-                                            claim_exp = total_exp + 70
+                                            claim_exp = new_xp + 70
                                                                  
                                             # send embed 
                                             embed = Embed(color=Color.red())
@@ -363,20 +317,19 @@ async def add_exp(member_id):
                                             embed.set_image(url='https://cdn.discordapp.com/attachments/1150399343912833024/1205537451242688573/download_1.png?ex=65d8bb3e&is=65c6463e&hm=042fe7dd3521887db0bd48eeb846de1cc7c75194f9e95215c23512ff61ea3475&')
                                             
                                             lunar = bot.get_user(811235357663297546)
-                                            #await member.send(embed=embed)  
-                                            await lunar.send(embed=embed)  
+                                            await member.send(embed=embed)  
                                             print(f"Sent verification cap embed to {member}")
                                             return
                                     
                                     
                                 # increment the old level value (better to replace outright)
-                                # only increment level column if you are lvl2 or 3+ with verified role (this may make some members not appear)
+                                # only increment level column if you are lvl2 or 3+ with verified role
                                 global_df.loc[index, 'discord_level'] = current_level # do not change column name  
                                 
                                 await member.add_roles(current_role)
                                 print(f"Level Up! Gave {member} {current_role}")
-                                await member.remove_roles(lvls[old_level])
-                                print(f"Removed {lvls[old_level]} from {member}")  
+                                await member.remove_roles(lvls[current_level-1])
+                                print(f"Removed {lvls[current_level-1]} from {member}")  
                                 #print(f"{member} Level up! {current_level-1} -> {current_level}!")
                                 if current_role in member.roles: # needs update; reference exp reward for verification
                                     #await member.send(f"Level up! {current_level-1} -> {current_level}!")  
@@ -403,8 +356,7 @@ async def add_exp(member_id):
                                     embed.add_field(name="Verify Here:", value=verification_link, inline=True)
         
                                     lunar = bot.get_user(811235357663297546)
-                                    #await member.send(embed=embed)
-                                    await lunar.send(embed=embed)  
+                                    await member.send(embed=embed)                           
                                     print(f"Sent levelup embed to {member}")
                                     #You can verify your account to earn 100 points! To verify, do A.                            
 
@@ -479,16 +431,17 @@ async def remove_huggingfolks():
         # make a copy while discord id column still exists -> use for rank in discord embeds
         community_global_df_with_id = community_global_df_with_id.copy()
 
+
+
+
+
         # drop first column (discord id -> this is so we can display the important stuff in the leaderboard)
         community_global_df.drop(community_global_df.columns[0], axis=1, inplace=True)
-        community_global_df.drop(community_global_df.columns[1], axis=1, inplace=True)
-        community_global_df.drop(community_global_df.columns[2], axis=1, inplace=True)
-        community_global_df.drop(community_global_df.columns[2], axis=1, inplace=True)
-        community_global_df['total_exp'] = community_global_df['total_exp'].str.strip('L').astype(int)
-        community_global_df['total_exp'] = pd.to_numeric(community_global_df['total_exp'])
-        community_global_df = community_global_df.nlargest(len(community_global_df), 'total_exp')        
+        community_global_df['discord_exp'] = community_global_df['discord_exp'].str.strip('L').astype(int)
+        community_global_df['discord_exp'] = pd.to_numeric(community_global_df['discord_exp'])
+        community_global_df = community_global_df.nlargest(len(community_global_df), 'discord_exp')        
         
-        top_30_exp = community_global_df.nlargest(30, 'total_exp')
+        top_30_exp = community_global_df.nlargest(30, 'discord_exp')
         
         top_30_exp['D'] = ['🥇','🥈','🥉','','','','','','','','','','','','','','','','','','','','','','','','','','','']
         top_30_rows = top_30_exp.values.tolist()
@@ -589,4 +542,4 @@ with demo:
             #with gr.TabItem("📈 Hub-only leaderboard", elem_id="hub-table", id=2):
     except Exception as e:
         print(f"on_message Error: {e}")
-demo.queue().launch()       
+demo.queue().launch()