From 97f4312a5eee90962280885b2d79eb891e7a9a08 Mon Sep 17 00:00:00 2001 From: db0 Date: Sun, 5 Nov 2023 22:55:04 +0100 Subject: [PATCH] fix: censures/hesitations returning only the first reasons Closes #59 --- fediseer/apis/v1/censures.py | 8 ++++---- fediseer/apis/v1/hesitations.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fediseer/apis/v1/censures.py b/fediseer/apis/v1/censures.py index def1e29..c161c01 100644 --- a/fediseer/apis/v1/censures.py +++ b/fediseer/apis/v1/censures.py @@ -162,11 +162,11 @@ class Censures(Resource): censures = database.get_all_censure_reasons_for_censured_id(instance.id, [c.id for c in instances]) rebuttals = database.get_all_rebuttals_from_source_instance_id(instance.id,[c.id for c in instances]) for c_instance in instances: - censures = [c for c in censures if c.reason is not None and c.censuring_id == c_instance.id] + censures_filtered = [c for c in censures if c.reason is not None and c.censuring_id == c_instance.id] c_instance_details = c_instance.get_details() - if len(censures) > 0: - c_instance_details["censure_reasons"] = [censure.reason for censure in censures] - c_instance_details["censure_evidence"] = [censure.evidence for censure in censures if censure.evidence is not None] + if len(censures_filtered) > 0: + c_instance_details["censure_reasons"] = [censure.reason for censure in censures_filtered] + c_instance_details["censure_evidence"] = [censure.evidence for censure in censures_filtered if censure.evidence is not None] rebuttals = [r.rebuttal for r in rebuttals if r.target_id == c_instance.id] if len(rebuttals) > 0 and not database.instance_has_flag(c_instance.id,enums.InstanceFlags.MUTED): c_instance_details["rebuttal"] = rebuttals diff --git a/fediseer/apis/v1/hesitations.py b/fediseer/apis/v1/hesitations.py index 6d3b1bf..73dda18 100644 --- a/fediseer/apis/v1/hesitations.py +++ b/fediseer/apis/v1/hesitations.py @@ -147,11 +147,11 @@ class Hesitations(Resource): hesitations = database.get_all_hesitation_reasons_for_dubious_id(instance.id, [c.id for c in instances]) rebuttals = database.get_all_rebuttals_from_source_instance_id(instance.id,[c.id for c in instances]) for c_instance in instances: - hesitations = [c for c in hesitations if c.reason is not None and c.hesitant_id == c_instance.id] + hesitations_filtered = [c for c in hesitations if c.reason is not None and c.hesitant_id == c_instance.id] c_instance_details = c_instance.get_details() - if len(hesitations) > 0: - c_instance_details["hesitation_reasons"] = [hesitation.reason for hesitation in hesitations] - c_instance_details["hesitation_evidence"] = [hesitation.evidence for hesitation in hesitations if hesitation.evidence is not None] + if len(hesitations_filtered) > 0: + c_instance_details["hesitation_reasons"] = [hesitation.reason for hesitation in hesitations_filtered] + c_instance_details["hesitation_evidence"] = [hesitation.evidence for hesitation in hesitations_filtered if hesitation.evidence is not None] c_instance_details["rebuttal"] = [r.rebuttal for r in rebuttals if r.target_id == c_instance.id] instance_details.append(c_instance_details) if self.args.csv: