From 78b1ebfa91506e8cd567a0f484103d8322526253 Mon Sep 17 00:00:00 2001 From: db0 Date: Fri, 8 Sep 2023 14:05:33 +0200 Subject: [PATCH] fix: include null reasons in censures list --- fediseer/apis/v1/censures.py | 4 +++- fediseer/database/functions.py | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fediseer/apis/v1/censures.py b/fediseer/apis/v1/censures.py index 3916406..494b8f8 100644 --- a/fediseer/apis/v1/censures.py +++ b/fediseer/apis/v1/censures.py @@ -27,8 +27,9 @@ class CensuresGiven(Resource): instance_details = [] for c_instance in database.get_all_censured_instances_by_censuring_id([instance.id for instance in instances]): censures = database.get_all_censure_reasons_for_censured_id(c_instance.id, [instance.id for instance in instances]) - c_instance_details = c_instance.get_details() censure_count = len(censures) + censures = [c for c in censures if c.reason is not None] + c_instance_details = c_instance.get_details() skip_instance = False if self.args.reasons_csv: reasons_filter = [r.strip().lower() for r in self.args.reasons_csv.split(',')] @@ -73,6 +74,7 @@ class Censures(Resource): instance_details = [] for c_instance in database.get_all_censuring_instances_by_censured_id(instance.id): censures = database.get_all_censure_reasons_for_censured_id(instance.id, [c_instance.id]) + censures = [c for c in censures if c.reason is not None] c_instance_details = c_instance.get_details() if len(censures) > 0: c_instance_details["censure_reasons"] = [censure.reason for censure in censures] diff --git a/fediseer/database/functions.py b/fediseer/database/functions.py index 2a59c31..5530d91 100644 --- a/fediseer/database/functions.py +++ b/fediseer/database/functions.py @@ -96,7 +96,6 @@ def get_all_censure_reasons_for_censured_id(censured_id, censuring_ids): and_( Censure.censured_id == censured_id, Censure.censuring_id.in_(censuring_ids), - Censure.reason != None ) ).with_entities(Censure.reason) return query.all()