From 6a1ab5dee67c96d127dd3d9450661721ee7d12b1 Mon Sep 17 00:00:00 2001
From: majakomel <maja.komel@gmail.com>
Date: Sat, 11 Jul 2026 23:15:40 +0200
Subject: [PATCH 1/3] Add structured data for findings

---
 components/StructuredData.js |  4 +-
 lib/findingStructuredData.js | 96 ++++++++++++++++++++++++++++++++++++
 lib/structuredData.js        |  4 +-
 pages/findings/[id].js       | 13 +++++
 4 files changed, 113 insertions(+), 4 deletions(-)
 create mode 100644 lib/findingStructuredData.js

diff --git a/components/StructuredData.js b/components/StructuredData.js
index b85fc5dc..c65fae11 100644
--- a/components/StructuredData.js
+++ b/components/StructuredData.js
@@ -1,10 +1,10 @@
 import { structuredData } from 'lib/structuredData'
 
-const StructuredData = () => (
+const StructuredData = ({ data = structuredData }) => (
   <script
     type="application/ld+json"
     dangerouslySetInnerHTML={{
-      __html: JSON.stringify(structuredData),
+      __html: JSON.stringify(data).replace(/</g, '\\u003c'),
     }}
   />
 )
diff --git a/lib/findingStructuredData.js b/lib/findingStructuredData.js
new file mode 100644
index 00000000..cbfd89d8
--- /dev/null
+++ b/lib/findingStructuredData.js
@@ -0,0 +1,96 @@
+import { EXPLORER_BASE_URL, ORGANIZATION_ID } from 'lib/structuredData'
+
+const getAuthorEntry = (name) => {
+  const trimmedName = name?.trim()
+
+  if (!trimmedName) {
+    return null
+  }
+
+  if (trimmedName.toLowerCase() === 'ooni') {
+    return { '@id': ORGANIZATION_ID }
+  }
+
+  return {
+    '@type': 'Person',
+    name: trimmedName,
+  }
+}
+
+const parseReportedBy = (reportedBy) => {
+  if (!reportedBy) {
+    return []
+  }
+
+  return (
+    reportedBy
+      .match(/[^,(]+(?:\([^)]*\))?/g)
+      ?.map((name) => name.trim())
+      .filter(Boolean) ?? []
+  )
+}
+
+const getAuthor = (reportedBy) => {
+  const authors = parseReportedBy(reportedBy)
+    .map(getAuthorEntry)
+    .filter(Boolean)
+
+  if (!authors.length) {
+    return { '@id': ORGANIZATION_ID }
+  }
+
+  return authors
+}
+
+const getKeywords = (incident) => {
+  const keywords = new Set()
+
+  for (const tag of incident.tags ?? []) {
+    keywords.add(tag.startsWith('theme-') ? tag.replace('theme-', '') : tag)
+  }
+
+  for (const theme of incident.themes ?? []) {
+    keywords.add(theme.replace('_', ' '))
+  }
+
+  return [...keywords]
+}
+
+export const getFindingStructuredData = (incident, canonicalUrl) => {
+  const keywords = getKeywords(incident)
+  const schema = {
+    '@context': 'https://schema.org',
+    '@type': 'Article',
+    '@id': `${canonicalUrl}#article`,
+    headline: incident.title,
+    description: incident.short_description,
+    url: canonicalUrl,
+    datePublished: incident.create_time,
+    author: getAuthor(incident.reported_by),
+    publisher: {
+      '@id': ORGANIZATION_ID,
+    },
+    mainEntityOfPage: {
+      '@type': 'WebPage',
+      '@id': canonicalUrl,
+    },
+    isPartOf: {
+      '@id': `${EXPLORER_BASE_URL}/#website`,
+    },
+    inLanguage: 'en',
+  }
+
+  if (incident.text) {
+    schema.articleBody = incident.text
+  }
+
+  if (incident.update_time) {
+    schema.dateModified = incident.update_time
+  }
+
+  if (keywords.length) {
+    schema.keywords = keywords.join(', ')
+  }
+
+  return schema
+}
diff --git a/lib/structuredData.js b/lib/structuredData.js
index f3bfc28b..2183429e 100644
--- a/lib/structuredData.js
+++ b/lib/structuredData.js
@@ -1,5 +1,5 @@
-const EXPLORER_BASE_URL = 'https://explorer.ooni.org'
-const ORGANIZATION_ID = 'https://ooni.org/#organization'
+export const EXPLORER_BASE_URL = 'https://explorer.ooni.org'
+export const ORGANIZATION_ID = 'https://ooni.org/#organization'
 
 const SUPPORTED_LANGUAGES = [
   'en',
diff --git a/pages/findings/[id].js b/pages/findings/[id].js
index de5339e8..6caada43 100644
--- a/pages/findings/[id].js
+++ b/pages/findings/[id].js
@@ -3,6 +3,8 @@ import { apiEndpoints, fetcher } from 'lib/api'
 
 import NotFound from 'components/NotFound'
 import FindingDisplay from 'components/findings/FindingDisplay'
+import StructuredData from 'components/StructuredData'
+import { getFindingStructuredData } from 'lib/findingStructuredData'
 import { useMemo } from 'react'
 import { useIntl } from 'react-intl'
 
@@ -26,6 +28,14 @@ const ReportView = ({ data, canonicalUrl }) => {
   const metaTitle = `${!!data?.incident?.title && `${data?.incident?.title} | `}${intl.formatMessage({ id: 'General.OoniExplorer' })}`
   const metaDescription = data?.incident?.short_description
 
+  const findingStructuredData = useMemo(() => {
+    if (!data?.incident) {
+      return null
+    }
+
+    return getFindingStructuredData(data.incident, canonicalUrl)
+  }, [canonicalUrl, data?.incident])
+
   return (
     <>
       <Head>
@@ -44,6 +54,9 @@ const ReportView = ({ data, canonicalUrl }) => {
           content={metaDescription}
         />
         <link rel="canonical" key="canonical" href={canonicalUrl} />
+        {findingStructuredData && (
+          <StructuredData data={findingStructuredData} />
+        )}
       </Head>
       <div className="container">
         {data ? (

From 5d98e79b3bd46f797693a7a162b00daa285ea595 Mon Sep 17 00:00:00 2001
From: majakomel <maja.komel@gmail.com>
Date: Sun, 12 Jul 2026 11:47:31 +0200
Subject: [PATCH 2/3] Remove articleBody from structured data

---
 lib/findingStructuredData.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/findingStructuredData.js b/lib/findingStructuredData.js
index cbfd89d8..a82a9208 100644
--- a/lib/findingStructuredData.js
+++ b/lib/findingStructuredData.js
@@ -80,9 +80,6 @@ export const getFindingStructuredData = (incident, canonicalUrl) => {
     inLanguage: 'en',
   }
 
-  if (incident.text) {
-    schema.articleBody = incident.text
-  }
 
   if (incident.update_time) {
     schema.dateModified = incident.update_time

From 02eaf2946feee48a2c2d4e5211e76aff7899a273 Mon Sep 17 00:00:00 2001
From: majakomel <maja.komel@gmail.com>
Date: Sun, 12 Jul 2026 11:56:46 +0200
Subject: [PATCH 3/3] Refactor author handling in structured data

---
 lib/findingStructuredData.js | 45 ++++++++++++++----------------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/lib/findingStructuredData.js b/lib/findingStructuredData.js
index a82a9208..c80c4708 100644
--- a/lib/findingStructuredData.js
+++ b/lib/findingStructuredData.js
@@ -1,39 +1,28 @@
 import { EXPLORER_BASE_URL, ORGANIZATION_ID } from 'lib/structuredData'
 
-const getAuthorEntry = (name) => {
-  const trimmedName = name?.trim()
-
-  if (!trimmedName) {
-    return null
-  }
-
-  if (trimmedName.toLowerCase() === 'ooni') {
+const getAuthor = (reportedBy) => {
+  if (!reportedBy) {
     return { '@id': ORGANIZATION_ID }
   }
 
-  return {
-    '@type': 'Person',
-    name: trimmedName,
-  }
-}
+  const authors = (reportedBy.match(/[^,(]+(?:\([^)]*\))?/g) ?? []).reduce(
+    (names, part) => {
+      const trimmed = part.trim()
 
-const parseReportedBy = (reportedBy) => {
-  if (!reportedBy) {
-    return []
-  }
+      if (trimmed === '') {
+        return names
+      }
 
-  return (
-    reportedBy
-      .match(/[^,(]+(?:\([^)]*\))?/g)
-      ?.map((name) => name.trim())
-      .filter(Boolean) ?? []
-  )
-}
+      if (trimmed.toLowerCase() === 'ooni') {
+        names.push({ '@id': ORGANIZATION_ID })
+      } else {
+        names.push({ '@type': 'Person', name: trimmed })
+      }
 
-const getAuthor = (reportedBy) => {
-  const authors = parseReportedBy(reportedBy)
-    .map(getAuthorEntry)
-    .filter(Boolean)
+      return names
+    },
+    [],
+  )
 
   if (!authors.length) {
     return { '@id': ORGANIZATION_ID }