Moderation-related fixes

scripts/deploy.py

@@ -1,9 +1,8 @@
 #!/usr/bin/env python
-import sys
 import subprocess
+import sys
 from pathlib import Path
 
-
 PROGRAM = Path(sys.argv[0]).name
 ENVS = {
     "dev": "zenodo-rdm-dev",
@@ -17,11 +16,12 @@
     "worker-low": ["worker-low"],
     "worker-spam": ["worker-spam"],
     "worker-beat": ["worker-beat"],
-    "terminal": ["terminal"],
     "worker-beat-custom": ["worker-beat-custom"],
+    "terminal": ["terminal"],
 }
 deployment_names = ", ".join(DEPLOYMENTS.keys())
 
+
 def _abort(message):
     print(message)
     sys.exit(1)

site/zenodo_rdm/cli.py

@@ -377,7 +377,7 @@ def domains_cli():
 
 
 @domains_cli.command("add")
-@click.option("-d", "--domain", required=True, help="The domain to add.")
+@click.option("-d", "--domain", help="The domain to add.")
 @click.option("-n", "--notes", help="Additional notes for the domain.")
 @click.option(
     "-s",
@@ -396,6 +396,7 @@ def domains_cli():
 @with_appcontext
 def add_domain(domain, notes, status, score, file):
     """Command to add a moderated links domain."""
+    assert domain or file, "You must provide either a single domain or a CSV file."
     if file:
         _add_domains_from_csv(file)
     else:

site/zenodo_rdm/moderation/handlers.py

@@ -231,6 +231,9 @@ def __init__(self):
 
     def _run(self, identity, record, uow):
         """Run the moderation scoring."""
+        # Skip moderation for system actions (e.g. subcommunity inclusion actions)
+        if identity == system_identity:
+            return
         user = UserAggregate.get_record(identity.id)
 
         # Perform the moderation checks asynchronously for verified users