Merge pull request #77 from imayushsaini/dev

Dev

dist/ba_root/mods/changelogs.json

@@ -50,6 +50,10 @@
        "78": {
               "log": "security update: auto handle server queue, fake accounts protection, allow owner to join housefull server. And other bug fixes. ",
               "time": "28 May 2023"
+       },
+       "79": {
+              "log": "added bcs server manager, mute ban system now have duration",
+              "time": "28 June 2023"
        }
 
 }

dist/ba_root/mods/custom_hooks.py

@@ -72,11 +72,13 @@ class modSetup(ba.Plugin):
             ba.internal.sign_in_v1('Local')
         ba.timer(60, playlist.flush_playlists)
 
-    def on_app_shutdown(self):  # TODO not working, fix this, also dump server logs
+    # it works sometimes , but it blocks shutdown so server raise runtime exception,   also dump server logs
+    def on_app_shutdown(self):
         print("Server shutting down , lets save cache")
-        pdata.dump_cache()
-        notification_manager.dump_cache()
-        print("Done dumping memory")
+        # lets try  threading here
+        # _thread.start_new_thread(pdata.dump_cache, ())
+        # _thread.start_new_thread(notification_manager.dump_cache, ())
+        # print("Done dumping memory")
 
 
 def score_screen_on_begin(_stats: ba.Stats) -> None:
@@ -118,7 +120,7 @@ def bootstraping():
         color_explosion.enable()
     if settings["ballistica_web"]["enable"]:
         from plugins import bcs_plugin
-        bcs_plugin.enable()
+        bcs_plugin.enable(settings["ballistica_web"]["server_password"])
     if settings["character_chooser"]["enable"]:
         from plugins import CharacterChooser
         CharacterChooser.enable()
@@ -132,6 +134,7 @@ def bootstraping():
     try:
         pass
         # from tools import healthcheck
+        # healthcheck.main()
     except Exception as e:
         print(e)
         try:

dist/ba_root/mods/plugins/bombsquad_service.py

@@ -139,7 +139,8 @@ def get_roles():
 
 def get_perks():
     # TODO wire with spaz_effects to fetch list of effects.
-    return {"perks": pdata.get_custom_perks(), "availableEffects": ["spark", "glow", "fairydust"]}
+    return {"perks": pdata.get_custom_perks(), "availableEffects": ["spark", "glow", "fairydust", "sparkground", "sweat", "sweatground", "distortion", "shine", "highlightshine", "scorch", "ice", "iceground",
+                                                                    "slime", "metal",  "splinter",  "rainbow"]}
 
 
 def update_perks(custom):
@@ -175,11 +176,15 @@ def search_player_profile(search_key: str, db: str):
         selectedDB = pdata.get_old_profiles(db)
 
     matching_objects = {}
+    count = 0
     for key in selectedDB.keys():
         if (search_key == key or
            any(search_key.lower() in s.lower() for s in selectedDB[key].get("display_string", [])) or
                 search_key.lower() in selectedDB[key].get("name", "").lower()):
             matching_objects[key] = selectedDB[key]
+            count += 1
+            if count > 50:
+                break
     return matching_objects
 
 

dist/ba_root/mods/spazmod/spaz_effects.py

@@ -75,7 +75,10 @@ class NewPlayerSpaz(PlayerSpaz):
         ba._asyncio._asyncio_event_loop.create_task(self.set_effects())
 
     async def set_effects(self):
-        account_id = self._player._sessionplayer.get_v1_account_id()
+        try:
+            account_id = self._player._sessionplayer.get_v1_account_id()
+        except:
+            return
         custom_effects = pdata.get_custom()['customeffects']
 
         if account_id  in custom_effects:

dist/ba_root/mods/tools/ServerUpdate.py

@@ -6,7 +6,7 @@ from efro.terminal import Clr
 import json
 import requests
 import _ba
-VERSION=78
+VERSION=79
 
 def check():