Date: Tue, 14 Mar 2023 16:15:09 +0000
To: ~sircmpwn/sr.ht-dev@lists.sr.ht
From: Simon Ser <contact@emersion.fr>
Subject: [PATCH lists.sr.ht 2/2] Make thread block parsing errors non-fatal
Message-ID: <20230314161502.414711-2-contact@emersion.fr>
In-Reply-To: <20230314161502.414711-1-contact@emersion.fr>
References: <20230314161502.414711-1-contact@emersion.fr>
Feedback-ID: 1358184:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

---
 listssrht/blueprints/patches.py | 47 +++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/listssrht/blueprints/patches.py b/listssrht/blueprints/patches=
.py
index cf6de0d428a5..bfb9aebe279d 100644
--- a/listssrht/blueprints/patches.py
+++ b/listssrht/blueprints/patches.py
@@ -13,7 +13,7 @@ from listssrht.types import Subscription, PatchsetTool, T=
oolIcon
 from sqlalchemy import or_
 from srht.database import db
 from srht.flask import paginate_query
-from srht.graphql import exec_gql
+from srht.graphql import exec_gql, GraphQLError
 from srht.markdown import markdown
 from srht.oauth import current_user, loginrequired
 from srht.validation import Validation
@@ -155,29 +155,36 @@ def patchset(owner_name, list_name, patchset_id):
         messages_by_id[msg.id] =3D msg
=20
     feedback =3D dict()
-    resp =3D exec_gql(current_app.site, """
-        query GetPatchsetThreadBlocks($patchset: Int!) {
-            patchset(id: $patchset) {
-                thread {
-                    blocks {
-                        key
-                        source {
-                            id
-                        }
-                        sourceRange {
-                            start
-                            end
-                        }
-                        parentRange {
-                            start
-                            end
+    try:
+        resp =3D exec_gql(current_app.site, """
+            query GetPatchsetThreadBlocks($patchset: Int!) {
+                patchset(id: $patchset) {
+                    thread {
+                        blocks {
+                            key
+                            source {
+                                id
+                            }
+                            sourceRange {
+                                start
+                                end
+                            }
+                            parentRange {
+                                start
+                                end
+                            }
                         }
                     }
                 }
             }
-        }
-    """, user=3Downer, patchset=3Dpatchset_id)
-    blocks =3D resp["patchset"]["thread"]["blocks"]
+        """, user=3Downer, patchset=3Dpatchset_id)
+        blocks =3D resp["patchset"]["thread"]["blocks"]
+    except GraphQLError as err:
+        # Can happen when an email in the thread is a bad apple
+        # TODO: grab partial result from GraphQLError.data (gqlgen doesn't
+        # support this yet)
+        print(f"Warning: failed to parse blocks from thread {thread.id}: {=
err.errors}")
+        blocks =3D []
     for block in blocks:
         source_email =3D messages_by_id[block["source"]["id"]]
=20
--=20
2.39.2