Stop adding Max as an extra author

owid · Jan 8, 2025 · e9d0253 · e9d0253
1 parent c8cf78e
commit e9d0253
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 46 deletions.
diff --git a/adminSiteServer/apiRouter.ts b/adminSiteServer/apiRouter.ts
@@ -3467,7 +3467,7 @@ getRouteWithROTransaction(apiRouter, "/all-work", async (req, res, trx) => {
     >
     type GdocRecord = Pick<DbRawPostGdoc, "id" | "publishedAt">
 
-    const author = req.query.author || "Max Roser"
+    const author = req.query.author
     const gdocs = await db.knexRaw<GdocRecord>(
         trx,
         `-- sql

diff --git a/db/migrateWpPostsToArchieMl.ts b/db/migrateWpPostsToArchieMl.ts
@@ -20,7 +20,7 @@ import {
     adjustHeadingLevels,
     findMinimumHeadingLevel,
 } from "./model/Gdoc/htmlToEnriched.js"
-import { getPostRelatedCharts, isPostSlugCitable } from "./model/Post.js"
+import { getPostRelatedCharts } from "./model/Post.js"
 import { enrichedBlocksToMarkdown } from "./model/Gdoc/enrichedToMarkdown.js"
 
 // slugs from all the linear entries we want to migrate from @edomt
@@ -131,15 +131,6 @@ const migrate = async (trx: db.KnexReadWriteTransaction): Promise<void> => {
                 relatedCharts = await getPostRelatedCharts(trx, post.id)
             }
 
-            const shouldIncludeMaxAsAuthor = isPostSlugCitable(post.slug)
-            if (
-                shouldIncludeMaxAsAuthor &&
-                post.authors &&
-                !post.authors.includes("Max Roser")
-            ) {
-                post.authors.push("Max Roser")
-            }
-
             // We don't get the first and last nodes if they are comments.
             // This can cause issues with the wp:components so here we wrap
             // everything in a div

diff --git a/packages/@ourworldindata/utils/src/metadataHelpers.ts b/packages/@ourworldindata/utils/src/metadataHelpers.ts
@@ -73,16 +73,11 @@ export const getETLPathComponents = (path: string): ETLPathComponents => {
 
 export const formatAuthors = ({
     authors,
-    requireMax,
     forBibtex,
 }: {
     authors: string[]
-    requireMax?: boolean
     forBibtex?: boolean
 }): string => {
-    if (requireMax && !authors.includes("Max Roser"))
-        authors = [...authors, "Max Roser"]
-
     let authorsText = authors.slice(0, -1).join(forBibtex ? " and " : ", ")
     if (authorsText.length === 0) authorsText = authors[0]
     else authorsText += ` and ${last(authors)}`

diff --git a/site/Byline.tsx b/site/Byline.tsx
@@ -2,11 +2,9 @@ import { formatAuthors } from "./clientFormatting.js"
 
 export const Byline = ({
     authors,
-    withMax,
     override,
 }: {
     authors: string[]
-    withMax: boolean
     override?: string
 }) => {
     return (
@@ -20,7 +18,6 @@ export const Byline = ({
             ) : (
                 <a href="/team">{`by ${formatAuthors({
                     authors,
-                    requireMax: withMax,
                 })}`}</a>
             )}
         </div>

diff --git a/site/CitationMeta.tsx b/site/CitationMeta.tsx
@@ -8,12 +8,7 @@ export const CitationMeta = (props: {
     date: Date
     canonicalUrl: string
 }) => {
-    const { title, date, canonicalUrl } = props
-    let { authors } = props
-
-    if (authors.indexOf("Max Roser") === -1)
-        authors = authors.concat(["Max Roser"])
-
+    const { authors, title, date, canonicalUrl } = props
     return (
         <Fragment>
             <meta name="citation_title" content={title} />

diff --git a/site/LongFormPage.tsx b/site/LongFormPage.tsx
@@ -95,13 +95,11 @@ export const LongFormPage = (props: {
 
     const citationText = `${formatAuthors({
         authors: citationAuthors,
-        requireMax: true,
     })} (${citationPublishedYear}) - "${citationTitle}". Published online at OurWorldinData.org. Retrieved from: '${citationCanonicalUrl}' [Online Resource]`
 
     const bibtex = `@article{owid${citationSlug.replace(/-/g, "")},
     author = {${formatAuthors({
         authors: citationAuthors,
-        requireMax: true,
         forBibtex: true,
     })}},
     title = {${citationTitle}},
@@ -169,7 +167,6 @@ export const LongFormPage = (props: {
                                         {!formattingOptions.hideAuthors && (
                                             <Byline
                                                 authors={post.authors}
-                                                withMax={withCitation}
                                                 override={post.byline}
                                             />
                                         )}

diff --git a/site/clientFormatting.tsx b/site/clientFormatting.tsx
@@ -2,16 +2,11 @@ import { last } from "@ourworldindata/utils"
 
 export const formatAuthors = ({
     authors,
-    requireMax,
     forBibtex,
 }: {
     authors: string[]
-    requireMax?: boolean
     forBibtex?: boolean
 }) => {
-    if (requireMax && !authors.includes("Max Roser"))
-        authors = [...authors, "Max Roser"]
-
     let authorsText = authors.slice(0, -1).join(forBibtex ? " and " : ", ")
     if (authorsText.length === 0) authorsText = authors[0]
     else authorsText += ` and ${last(authors)}`

diff --git a/site/formatting.test.ts b/site/formatting.test.ts
@@ -162,17 +162,9 @@ describe(formatAuthors, () => {
             "Author 1, Author 2 and Author 3"
         )
 
-        expect(formatAuthors({ authors, requireMax: true })).toEqual(
-            "Author 1, Author 2, Author 3 and Max Roser"
-        )
-
         expect(formatAuthors({ authors: ["Author 1"] })).toEqual("Author 1")
         expect(formatAuthors({ authors: ["Author 1", "Author 2"] })).toEqual(
             "Author 1 and Author 2"
         )
-
-        expect(
-            formatAuthors({ authors, requireMax: true, forBibtex: true })
-        ).toEqual("Author 1 and Author 2 and Author 3 and Max Roser")
     })
 })
diff --git a/site/formatting.tsx b/site/formatting.tsx
@@ -336,11 +336,7 @@ const addPostHeader = (cheerioEl: CheerioStatic, post: FormattedPost) => {
         ReactDOMServer.renderToStaticMarkup(
             <div className="article-meta">
                 {post.excerpt && <div className="excerpt">{post.excerpt}</div>}
-                <Byline
-                    authors={post.authors}
-                    withMax={false}
-                    override={post.byline}
-                />
+                <Byline authors={post.authors} override={post.byline} />
 
                 <div className="published-updated">
                     <time>{publishedDate}</time>