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

{aa_bb-3.2.3 → aa_bb-3.2.4}/.gitignore

@@ -14,3 +14,4 @@ __pycache__
 .coverage
 /coverage.xml
 alliance_auth.sqlite3
+.output.txt

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aa_bb
-Version: 3.2.3
+Version: 3.2.4
 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.2
+pip install aa-bb==3.2.4
 ```
 ```bash
 vi myauth/settings/local.py

{aa_bb-3.2.3 → aa_bb-3.2.4}/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.2
+pip install aa-bb==3.2.4
 ```
 ```bash
 vi myauth/settings/local.py

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

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

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

@@ -29,8 +29,7 @@ from .models import (
     PapCompliance,
     LeaveRequest,
     ComplianceTicket,
-    BigBrotherRedditSettings,
-    BigBrotherRedditMessage
+    EveItemPrice,
 )
 
 @admin.register(BigBrotherConfig)
@@ -64,15 +63,58 @@ class BB_ConfigAdmin(SingletonModelAdmin):
                     "cyno_notify",
                     "sp_inject_notify",
                     "clone_notify",
+                    "clone_state_notify",
                     "asset_notify",
                     "contact_notify",
                     "contract_notify",
                     "mail_notify",
                     "transaction_notify",
+                    "show_market_transactions",
                     "new_user_notify",
                 ),
             },
         ),
+        (
+            "Update Performance",
+            {
+                "fields": (
+                    "clone_state_always_recheck",
+                    "update_stagger_seconds",
+                    "update_cache_ttl_hours",
+                    "update_maintenance_window_start",
+                    "update_maintenance_window_end",
+                    "update_backlog_threshold",
+                    "update_backlog_notify",
+                ),
+            },
+        ),
+        (
+            "Market Transaction Settings",
+            {
+                "classes": ("market-transaction-settings-fieldset",),
+                "fields": (
+                    "market_transactions_show_major_hubs",
+                    "market_transactions_show_secondary_hubs",
+                    "market_transactions_excluded_systems",
+                    "market_transactions_threshold_alert",
+                    "market_transactions_threshold_percent",
+                    "market_transactions_price_method",
+                    "market_transactions_janice_api_key",
+                    "market_transactions_fuzzwork_station_id",
+                    "market_transactions_price_instant",
+                    "market_transactions_price_max_age",
+                )
+            },
+        ),
+        (
+            "Blacklist Settings",
+            {
+                "fields": (
+                    "alliance_blacklist_url",
+                    "external_blacklist_url",
+                )
+            },
+        ),
         (
             "Ping / Messaging Roles",
             {
@@ -98,6 +140,8 @@ class BB_ConfigAdmin(SingletonModelAdmin):
                     "optwebhook3",
                     "optwebhook4",
                     "optwebhook5",
+                    "user_compliance_webhook",
+                    "corp_compliance_webhook",
                     "stats_webhook",
                 )
             },
@@ -120,6 +164,7 @@ class BB_ConfigAdmin(SingletonModelAdmin):
             "User State & Membership",
             {
                 "fields": (
+                    "limit_to_main_corp",
                     "bb_guest_states",
                     "bb_member_states",
                     "member_corporations",
@@ -147,6 +192,7 @@ class BB_ConfigAdmin(SingletonModelAdmin):
                         (
                             "auto_import_contacts_enabled",
                             "contacts_source_alliances",
+                            "contacts_source_corporations",
                             "contacts_handle_neutrals",
                         )
                         if AA_CONTACTS_INSTALLED
@@ -184,6 +230,7 @@ class BB_ConfigAdmin(SingletonModelAdmin):
         "main_corporation_id",
         "main_alliance_id",
         "is_active",
+        "update_last_dispatch_count",
     )
     filter_horizontal = (
         "pingrole1_messages",
@@ -194,12 +241,15 @@ class BB_ConfigAdmin(SingletonModelAdmin):
         "bb_member_states",
         # aa-contacts M2M (only if installed)
         *(
-            ("contacts_source_alliances",)
+            ("contacts_source_alliances", "contacts_source_corporations")
             if AA_CONTACTS_INSTALLED
             else ()
         ),
     )
 
+    class Media:
+        js = ("aa_bb/js/admin_market_toggle.js",)
+
     def has_add_permission(self, request):
         """Prevent duplicate singleton rows."""
         if BigBrotherConfig.objects.exists():  # Disallow when a config already exists.
@@ -241,7 +291,7 @@ class TicketToolConfigAdmin(SingletonModelAdmin):
 
     def has_add_permission(self, request):
         """Prevent duplicate ticket config entries."""
-        if PapsConfig.objects.exists():  # Ticket config should remain singleton.
+        if TicketToolConfig.objects.exists():  # Ticket config should remain singleton.
             return False
         return super().has_add_permission(request)
 
@@ -250,41 +300,12 @@ class TicketToolConfigAdmin(SingletonModelAdmin):
         return True
 
 
-@admin.register(BigBrotherRedditSettings)
-class BigBrotherRedditSettingsAdmin(SingletonModelAdmin):
-    """OAuth tokens + scheduling info for the Reddit autoposter."""
-    exclude = (
-        "reddit_access_token",
-        "reddit_refresh_token",
-        "reddit_token_type",
-        "last_submission_id",
-        "last_submission_permalink",
-        "reddit_account_name",
-    )
-    readonly_fields = (
-        "reddit_token_obtained",
-        "last_submission_at",
-        "last_reply_checked_at",
-        "reddit_account_name",
-    )
-
-    def has_add_permission(self, request):
-        """Limit the settings model to a single row."""
-        if BigBrotherRedditSettings.objects.exists():  # Disallow duplicate settings.
-            return False
-        return super().has_add_permission(request)
-
-    def has_delete_permission(self, request, obj=None):
-        """Never allow deleting the Reddit credentials row."""
-        return False
 
 
-@admin.register(BigBrotherRedditMessage)
-class BigBrotherRedditMessageAdmin(admin.ModelAdmin):
-    """Manage the pool of canned Reddit ads."""
-    list_display = ("title", "used_in_cycle", "created")
-    list_filter = ("used_in_cycle",)
-    search_fields = ("title", "content")
+@admin.register(EveItemPrice)
+class EveItemPriceAdmin(admin.ModelAdmin):
+    list_display = ("eve_type_id", "buy", "sell", "updated")
+    search_fields = ("eve_type_id",)
 
 
 @admin.register(Messages)
@@ -413,28 +434,39 @@ if not afat_active():
             pass
 
 _PAP_OBJECT_NAMES = {"PapsConfig", "PapCompliance"}
+_MARKET_OBJECT_NAMES = {"EveItemPrice", "ProcessedTransaction", "SusTransactionNote"}
 _ORIG_GET_APP_LIST = admin.site.get_app_list
 
 
 def _filtered_get_app_list(request, app_label=None):
     app_list = _ORIG_GET_APP_LIST(request, app_label)
 
-    if afat_active():
-        return app_list
+    is_afat = afat_active()
+    config = BigBrotherConfig.get_solo()
+    show_market = getattr(config, "show_market_transactions", False)
 
     filtered = []
     for app in app_list:
+        label = app.get("app_label")
+
         # Exclude AFAT's own admin section if present.
-        if app.get("app_label") == "afat":
+        if not is_afat and label == "afat":
             continue
 
-        # PAP models (in this project) are under aa_bb, so remove them when AFAT is not active.
-        if app.get("app_label") == "aa_bb":
+        # Filter models within our app
+        if label == "aa_bb":
             models = app.get("models", [])
-            models = [m for m in models if m.get("object_name") not in _PAP_OBJECT_NAMES]
+            if not is_afat:
+                models = [
+                    m for m in models if m.get("object_name") not in _PAP_OBJECT_NAMES
+                ]
+            if not show_market:
+                models = [
+                    m for m in models if m.get("object_name") not in _MARKET_OBJECT_NAMES
+                ]
             app = {**app, "models": models}
 
-        # Drop empty app groups so the menu section disappears entirely.
+        # Drop empty app groups
         if app.get("models"):
             filtered.append(app)