aa-bb 3.2.2__tar.gz → 3.2.3__tar.gz

{aa_bb-3.2.2 → aa_bb-3.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aa_bb
-Version: 3.2.2
+Version: 3.2.3
 Summary: BigBrother
 Project-URL: Changelog, https://github.com/BroodLK/aa_bb/blob/main/CHANGELOG.md
 Project-URL: Issue / Bug Reports, https://github.com/BroodLK/aa_bb/issues
@@ -98,7 +98,7 @@ After making sure to add the above prerequisite applications.
 source /home/allianceserver/venv/auth/bin/activate && cd /home/allianceserver/myauth/
 ```
 ```bash
-pip install aa-bb==3.2.1
+pip install aa-bb==3.2.2
 ```
 ```bash
 vi myauth/settings/local.py

{aa_bb-3.2.2 → aa_bb-3.2.3}/README.md

@@ -58,7 +58,7 @@ After making sure to add the above prerequisite applications.
 source /home/allianceserver/venv/auth/bin/activate && cd /home/allianceserver/myauth/
 ```
 ```bash
-pip install aa-bb==3.2.1
+pip install aa-bb==3.2.2
 ```
 ```bash
 vi myauth/settings/local.py

{aa_bb-3.2.2 → aa_bb-3.2.3}/aa_bb/__init__.py

@@ -1,4 +1,4 @@
 """Initialize the app"""
 
-__version__ = "3.2.2"
+__version__ = "3.2.3"
 __title__ = "BigBrother"

{aa_bb-3.2.2 → aa_bb-3.2.3}/aa_bb/admin.py

@@ -424,11 +424,11 @@ def _filtered_get_app_list(request, app_label=None):
 
     filtered = []
     for app in app_list:
-        # If AFAT itself has an admin section, drop it.
+        # Exclude AFAT's own admin section if present.
         if app.get("app_label") == "afat":
             continue
 
-        # PAP models (in this project) show under aa_bb, so remove them there.
+        # PAP models (in this project) are under aa_bb, so remove them when AFAT is not active.
         if app.get("app_label") == "aa_bb":
             models = app.get("models", [])
             models = [m for m in models if m.get("object_name") not in _PAP_OBJECT_NAMES]

{aa_bb-3.2.2 → aa_bb-3.2.3}/aa_bb/app_settings.py

@@ -47,8 +47,8 @@ VERBOSE_WEBHOOK_LOGGING = True
 
 def esi_tenant_kwargs(datasource: str | None):
     """
-    Translate the legacy datasource argument into the new X-Tenant header expected by
-    the aiopenapi3-powered ESI client.
+    Translates the datasource argument into the X-Tenant header required by
+    the ESI client.
     """
     tenant = datasource or DATASOURCE
     return {"X_Tenant": tenant} if tenant else {}
@@ -192,7 +192,6 @@ def get_eve_entity_type(
     # 1. Cache lookup
     try:
         record = id_types.objects.get(pk=eve_id)
-        # mark last access time without touching freshness timestamp
         try:
             record.last_accessed = timezone.now()
             record.save(update_fields=["last_accessed"])
@@ -329,7 +328,8 @@ def get_entity_info(entity_id: int, as_of: timezone.datetime) -> Dict:
       }
     Caches the result in the DB for 2 hours.
     """
-    if entity_id is None:  # Replace missing IDs with placeholder to avoid crashing downstream.
+    if entity_id is None:
+        # Default placeholder ID if input is missing.
         entity_id = 342545170
         errent = True
     else:
@@ -406,7 +406,8 @@ def get_entity_info(entity_id: int, as_of: timezone.datetime) -> Dict:
                 continue
             raise
 
-    if errent:  # Flag placeholder lookups so downstream consumers know input was missing.
+    if errent:
+        # Indicate lookup error for missing ID.
         errmsg = "Error: entity id provided is None "
         info = {
             "name":      errmsg,
@@ -1030,7 +1031,8 @@ def is_player_structure(location_id):
     return location_id >= 1_000_000_000_000
 
 def is_ship(type_id):
-    return False # Placeholder logic will be inline or enhanced if needed.
+    """Checks if a type_id belongs to a ship."""
+    return False
 
 def get_safe_entities():
     """

{aa_bb-3.2.2 → aa_bb-3.2.3}/aa_bb/auth_hooks.py

@@ -165,15 +165,18 @@ class PapsMenuItem(MenuItemHook):
             navactive=["paps:"],
     )
     def render(self, request):
-        """Only show when users have permission."""
+        """Only show when users have permission and AFAT is active."""
+        if not afat_active():
+            return ""
         if request.user.has_perm("aa_bb.can_access_paps"):  # Only show for PAP viewers.
             return super().render(request)
         return ""
 
-@hooks.register("menu_item_hook")
-def register_paps_menu():
-    """Register the PAP stats sidebar entry."""
-    return PapsMenuItem()
+if afat_active():
+    @hooks.register("menu_item_hook")
+    def register_paps_menu():
+        """Register the PAP stats sidebar entry if AFAT is active."""
+        return PapsMenuItem()
 
 if afat_active():
     @hooks.register("url_hook")

{aa_bb-3.2.2 → aa_bb-3.2.3}/aa_bb/checks/clone_state.py

@@ -84,7 +84,7 @@ def determine_character_state(user_id, save: bool = False):
     all_char_ids = get_user_characters(user_id)  # iterates keys if dict
     result = {}
 
-    # If corptools isn't available, mark unknown quickly
+    # If corptools is not available, default to unknown status.
     if CharacterAudit is None or Skill is None:
         for char_id in all_char_ids:
             db_record = char_db_records.get(char_id)
@@ -115,7 +115,7 @@ def determine_character_state(user_id, save: bool = False):
     for char_id in char_ids:
         db_record = char_db_records.get(char_id)
 
-        # Reuse cached state unless it's been 24 hours since last
+        # Use cached state if it's within 24 hours and inside the update window.
         now = timezone.now()
         if db_record and db_record.last_checked_at and (now - db_record.last_checked_at) < MAX_CACHE_AGE and in_utc_update_window(now):
             result[char_id] = {

aa_bb-3.2.3/aa_bb/checks/coalition_blacklist.py

@@ -0,0 +1,9 @@
+"""
+Helpers for constructing links against shared blacklist tools.
+"""
+
+def generate_blacklist_links():
+    """
+    Returns an empty string. Placeholder for future coalition blacklist integration.
+    """
+    return ""

{aa_bb-3.2.2 → aa_bb-3.2.3}/aa_bb/checks/corp_blacklist.py

@@ -58,9 +58,9 @@ def get_corp_blacklist_html(
             "allianceauth-blacklist/tree/main'>install blacklist</a> first"
         )
 
-    # Reverse the correct namespaced POST URL:
-    action_url = reverse("BigBrother:add_blacklist")
-    # Generate a real CSRF token:
+    # Determine the URL for the blacklist action:
+    action_url = reverse("aa_bb:add_blacklist")
+    # Generate CSRF token for the form:
     token = get_token(request)
 
     status_map = check_corp_bl(target_user_id)

{aa_bb-3.2.2 → aa_bb-3.2.3}/aa_bb/checks/hostile_assets.py

@@ -68,13 +68,9 @@ def get_asset_locations(user_id: int) -> Dict[int, dict]:
             key = getattr(system_obj, "pk", None)
             sys_name = system_obj.name
         elif location_id:
-            # Fallback if system object isn't available but we have a location ID
-            # For now, assuming we only care if we can map to a system,
-            # but to support "Unknown Location" groups properly we can use negative ID or similar if needed.
-            # Current logic requires key to be set.
-            # Use location_id as key if system unavailable?
-            # But return type says Dict[int, dict] where int is system ID.
-            # If we have no system, we can't check sovereignty easily.
+            # If the system ID is not available, we can't accurately check sovereignty
+            # or determine if the location is hostile based on system-level rules.
+            # We skip these records for now.
             pass
 
         if not key:

{aa_bb-3.2.2 → aa_bb-3.2.3}/aa_bb/urls.py

@@ -35,8 +35,8 @@ urlpatterns = [
     ),  # Handle the Reddit OAuth callback and persist tokens.
     path("manual/faq/", views_faq.manual_faq, name="manual_faq"),  # General FAQ/guide landing page.
 
-    # Bulk loader (not used by paginated SUS_CONTR but retained)
-    path("load_cards/", views.load_cards, name="load_cards"),  # Legacy endpoint to generate all SUS cards at once.
+    # Bulk loader
+    path("load_cards/", views.load_cards, name="load_cards"),  # Legacy endpoint.
 
     # Single card AJAX fetch (all cards except paging for SUS_CONTR)
     path("load_card/", views.load_card, name="load_card"),  # Fetch one card’s HTML payload on-demand.

{aa_bb-3.2.2 → aa_bb-3.2.3}/aa_bb/urls_cb.py

@@ -9,7 +9,7 @@ urlpatterns = [
     # Main index view
     path("",                 views.index,                  name="index"),  # CorpBrother dashboard root.
 
-    # Bulk loader (not used by paginated SUS_CONTR but retained)
+    # Bulk loader
     path("load_cards/",      views.load_cards,             name="load_cards"),  # Legacy full-card refresh endpoint.
 
     # Single card AJAX fetch (all cards except paging for SUS_CONTR)

{aa_bb-3.2.2 → aa_bb-3.2.3}/aa_bb/views.py

@@ -227,20 +227,21 @@ def warm_entity_cache_task(self, user_id):
     except WarmProgress.DoesNotExist:
         progress = None
 
-    if progress and progress.total > 0:  # Another warm job is in-flight for this pilot.
+    # Determine if an existing warm job is currently making progress.
+    if progress and progress.total > 0:
         first_current = progress.current
         logger.info(f"[{user_main}] detected in-progress run (current={first_current}); probing…")
         time.sleep(20)
 
-        # re-fetch to see if it's moved
+        # Re-fetch progress record to see if current count has increased.
         try:
             progress = WarmProgress.objects.get(user_main=user_main)
             second_current = progress.current
         except WarmProgress.DoesNotExist:
             second_current = None
 
-        # Now *abort* if there *was* progress; otherwise continue
-        if second_current != first_current:  # Existing job advanced, so bail out to avoid duplicate work.
+        # Abort if progress was detected; otherwise continue with the new task.
+        if second_current != first_current:
             logger.info(
                 f"[{user_main}] progress advanced from {first_current} to {second_current}; aborting new task."
             )

{aa_bb-3.2.2 → aa_bb-3.2.3}/aa_bb/views_paps.py

@@ -167,6 +167,8 @@ def index(request):
 @permission_required("aa_bb.can_access_paps")
 def history(request):
     """Show previously generated PAP charts (if they exist)."""
+    if not afat_active():
+        return render(request, "paps/disabled.html")
     cfg = BigBrotherConfig.get_solo()
     if not cfg.is_paps_active:  # Respect module toggle.
         return render(request, "paps/disabled.html")
@@ -197,6 +199,8 @@ def history(request):
 @permission_required("aa_bb.can_generate_paps")
 def generate_pap_chart(request):
     """Process the submitted PAP form and produce a stacked contribution chart."""
+    if not afat_active():
+        return render(request, "paps/disabled.html")
     month = int(request.POST.get("month"))
     year = int(request.POST.get("year"))
 

aa_bb-3.2.2/aa_bb/checks/coalition_blacklist.py

@@ -1,42 +0,0 @@
-"""
-Helpers for constructing links against Imperium's shared blacklist tools.
-"""
-
-from allianceauth.authentication.models import CharacterOwnership
-import urllib.parse
-
-# def generate_blacklist_links(user_id, base_url="https://gice.goonfleet.com/Blacklist", max_url_length=2000):
-#     """
-#     Batch character names into multiple links to avoid exceeding the
-#     URL length limit enforced by the external blacklist service.
-#     """
-#     characters = CharacterOwnership.objects.filter(user__id=user_id)
-#     names = [str(char.character) for char in characters]
-#
-#     links = []
-#     current_names = []
-#
-#     for name in names:
-#         test_list = current_names + [name]
-#         query_string = urllib.parse.quote(",".join(test_list))  # URL-encode
-#         url = f"{base_url}?q={query_string}"
-#
-#         if len(url) >= max_url_length:  # Push current batch if adding name would exceed service limit.
-#             links.append(current_names)
-#             current_names = [name]
-#         else:
-#             current_names = test_list
-#
-#     if current_names:  # Append final batch after loop.
-#         links.append(current_names)
-#
-#     formatted_links = []
-#     for i, chunk in enumerate(links):
-#         link_text = "Click here" if i == 0 else "and here"
-#         query = urllib.parse.quote(",".join(chunk))  # URL-encode
-#         formatted_links.append(f"<a href='{base_url}?q={query}'>{link_text}</a>")
-#
-#     return formatted_links
-
-def generate_blacklist_links():
-    return ""