commit f65134eab925dee88168af543a1b460f7edac7b4 · veryroundbird.house/fixao3

+13 -5

src/app/works/[workId]/chapters/[chapterId]/page.js

···

       1
       1
        
       import { getWork } from "@fujocoded/ao3.js"

     

       2
       2
        
       import DOM from "fauxdom"

     

       3
       3
       +
       import siteMap from "@/lib/siteMap.js"

     

       3
       4
        
       

     

       4
       5
        
       export async function generateMetadata({ params, _searchParams }, _parent) {

     

       5
       6
        
         // read route params

     

       6
       7
        
         const { workId, chapterId } = await params

     

       7
       7
       -
         const work = await getWork({workId: workId, chapterId: chapterId})

     

       8
       8
       +
         const parentData = await parent;

     

       9
       9
       +
         const base = parentData.metadataBase.replace('https://', '').replace('/', '')

     

       10
       10
       +
         const subdomain = base.split(".").length > 0 ? base.split(".")[0] : null

     

       11
       11
       +
         const archive = subdomain && Object.keys(siteMap).includes(subdomain) ? siteMap[subdomain] : null

     

       12
       12
       +
         const domainParam = archive ? `?archive=https://${archive}` : ''

     

       13
       13
       +
         const data = await fetch(`/api/works/${workId}/chapters/${chapterId}${domainParam}`)

     

       14
       14
       +
         const work = await data.json()

     

       8
       15
        
         if (work.locked) {

     

       9
       16
        
           return {

     

       10
       17
        
             title: 'Locked Work',

     

       11
       18
        
             description: 'This work is locked to the public. Log in to see it!',

     

       12
       12
       -
             metadataBase: new URL('https://'+process.env.DOMAIN)

     

       19
       19
       +
             metadataBase: new URL('https://'+archive)

     

       13
       20
        
           }

     

       14
       21
        
         }

     

       15
       15
       -
         const parentWork = await getWork({workId: workId})

     

       22
       22
       +
         const parentWorkData = await fetch(`/api/works/${workId}`)

     

       23
       23
       +
         const parentWork = await data.json()

     

       16
       24
        
         const authors = work.authors.map((a) => {

     

       17
       25
        
           if (a.anonymous) {

     

       18
       26
        
             return "Anonymous"

     
···

       36
       44
        
         return {

     

       37
       45
        
           title: title,

     

       38
       46
        
           description: description, 

     

       39
       39
       -
           metadataBase: new URL('https://'+process.env.DOMAIN)

     

       47
       47
       +
           metadataBase: new URL('https://'+base)

     

       40
       48
        
         }

     

       41
       49
        
       }

     

       42
       50
        
        

     
···

       44
       52
        
         const { workId, chapterId } = await params

     

       45
       53
        
         return (

     

       46
       54
        
           <div dangerouslySetInnerHTML={{__html: `<script type="text/javascript">

     

       47
       47
       -
                 window.location.replace("https://archiveofourown.org/works/${workId}/chapters/${chapterId}");

     

       55
       55
       +
                 window.location.replace("https://archiveofourown.org/works/${workId}");

     

       48
       56
        
               </script>`}}></div>

     

       49
       57
        
         )

     

       50
       58
        
       }

+5 -3

src/app/works/[workId]/page.js

···

       1
       1
        
       import { getWork } from "@fujocoded/ao3.js"

     

       2
       2
        
       import DOM from "fauxdom"

     

       3
       3
        
       

     

       4
       4
       -
       export async function generateMetadata({ params, _searchParams }, _parent) {

     

       4
       4
       +
       export async function generateMetadata({ params, _searchParams }, parent) {

     

       5
       5
        
         // read route params

     

       6
       6
        
         const { workId, chapterId } = await params

     

       7
       7
        
         const work = await getWork({workId: workId, chapterId: chapterId})

     
···

       31
       31
        
           "",

     

       32
       32
        
         )

     

       33
       33
        
         const addr = `works/${workId}`

     

       34
       34
       +
         const parentData = await parent;

     

       35
       35
       +
         const base = parentData.metadataBase.replace('https://', '').replace('/', '')

     

       34
       36
        
         

     

       35
       37
        
         return {

     

       36
       38
        
           title: title ? title : 'Locked Work',

     

       37
       39
        
           description: description ? description : 'This but this work is locked to the public. Log in to see it!', 

     

       38
       38
       -
           metadataBase: new URL('https://'+process.env.DOMAIN)

     

       40
       40
       +
           metadataBase: new URL('https://'+base)

     

       39
       41
        
         }

     

       40
       42
        
       }

     

       41
       43
        
        

     
···

       43
       45
        
         const { workId, chapterId } = await params

     

       44
       46
        
         return (

     

       45
       47
        
           <div dangerouslySetInnerHTML={{__html: `<script type="text/javascript">

     

       46
       46
       -
                 window.location.replace("https://archiveofourown.org/works/${workId}");

     

       48
       48
       +
                 window.location.replace("https://archiveofourown.org/works/${workId}/chapters/${chapterId}");

     

       47
       49
        
               </script>`}}></div>

     

       48
       50
        
         )

     

       49
       51
        
       }

+18 -18

src/lib/ogimage.js

···

       61
       61
        
                     gap: 10

     

       62
       62
        
                   }}  

     

       63
       63
        
                 >

     

       64
       64
       -
                   {image.props.rating && image.rating === 'E' && (<Explicit fg={theme.accentColor} bg={theme.accent} width={28} height={28} />)}

     

       65
       65
       -
                   {image.props.rating && image.rating === 'M' && (<Mature fg={theme.accentColor} bg={theme.accent} width={28} height={28} />)}

     

       66
       66
       -
                   {image.props.rating && image.rating === 'T' && (<Teen fg={theme.accentColor} bg={theme.accent} width={28} height={28} />)}

     

       67
       67
       -
                   {image.props.rating && image.rating === 'G' && (<General fg={theme.accentColor} bg={theme.accent} width={28} height={28} />)}

     

       68
       68
       -
                   {image.props.rating && image.rating === 'NR' && (<NotRated fg={theme.accentColor} bg={theme.accent} width={28} height={28} />)}

     

       64
       64
       +
                   {image.props.get('rating') && image.rating === 'E' && (<Explicit fg={theme.accentColor} bg={theme.accent} width={28} height={28} />)}

     

       65
       65
       +
                   {image.props.get('rating') && image.rating === 'M' && (<Mature fg={theme.accentColor} bg={theme.accent} width={28} height={28} />)}

     

       66
       66
       +
                   {image.props.get('rating') && image.rating === 'T' && (<Teen fg={theme.accentColor} bg={theme.accent} width={28} height={28} />)}

     

       67
       67
       +
                   {image.props.get('rating') && image.rating === 'G' && (<General fg={theme.accentColor} bg={theme.accent} width={28} height={28} />)}

     

       68
       68
       +
                   {image.props.get('rating') && image.rating === 'NR' && (<NotRated fg={theme.accentColor} bg={theme.accent} width={28} height={28} />)}

     

       69
       69
        
                   

     

       70
       70
       -
                   {image.props.warnings && image.warning === 'NW' && (<NoWarnings fg={theme.accent2Color} bg={theme.accent2} width={28} height={28} />)}

     

       71
       71
       -
                   {image.props.warnings && image.warning === 'CNTW' && (<ChoseNotToWarn fg={theme.accent2Color} bg={theme.accent2} width={28} height={28} />)}

     

       72
       72
       -
                   {image.props.warnings && image.warning === 'W' && (<Warnings fg={theme.accent2Color} bg={theme.accent2} width={28} height={28} />)}

     

       70
       70
       +
                   {image.props.get('warnings') && image.warning === 'NW' && (<NoWarnings fg={theme.accent2Color} bg={theme.accent2} width={28} height={28} />)}

     

       71
       71
       +
                   {image.props.get('warnings') && image.warning === 'CNTW' && (<ChoseNotToWarn fg={theme.accent2Color} bg={theme.accent2} width={28} height={28} />)}

     

       72
       72
       +
                   {image.props.get('warnings') && image.warning === 'W' && (<Warnings fg={theme.accent2Color} bg={theme.accent2} width={28} height={28} />)}

     

       73
       73
        
                   

     

       74
       74
       -
                   {image.props.category && image.category === 'F' && (<Yuri fg={theme.accent3Color} bg={theme.accent3} width={28} height={28} />)}

     

       75
       75
       -
                   {image.props.category && image.category === 'M' && (<Yaoi fg={theme.accent3Color} bg={theme.accent3} width={28} height={28} />)}

     

       76
       76
       -
                   {image.props.category && image.category === 'FM' && (<Het fg={theme.accent3Color} bg={theme.accent3} width={28} height={28} />)}

     

       77
       77
       -
                   {image.props.category && image.category === 'G' && (<Gen fg={theme.accent3Color} bg={theme.accent3} width={28} height={28} />)}

     

       78
       78
       -
                   {image.props.category && image.category === 'MX' && (<MultiShip fg={theme.accent3Color} bg={theme.accent3} width={28} height={28} />)}

     

       79
       79
       -
                   {image.props.category && image.category === 'O' && (<OtherShip fg={theme.accent3Color} bg={theme.accent3} width={28} height={28} />)}

     

       74
       74
       +
                   {image.props.get('category') && image.category === 'F' && (<Yuri fg={theme.accent3Color} bg={theme.accent3} width={28} height={28} />)}

     

       75
       75
       +
                   {image.props.get('category') && image.category === 'M' && (<Yaoi fg={theme.accent3Color} bg={theme.accent3} width={28} height={28} />)}

     

       76
       76
       +
                   {image.props.get('category') && image.category === 'FM' && (<Het fg={theme.accent3Color} bg={theme.accent3} width={28} height={28} />)}

     

       77
       77
       +
                   {image.props.get('category') && image.category === 'G' && (<Gen fg={theme.accent3Color} bg={theme.accent3} width={28} height={28} />)}

     

       78
       78
       +
                   {image.props.get('category') && image.category === 'MX' && (<MultiShip fg={theme.accent3Color} bg={theme.accent3} width={28} height={28} />)}

     

       79
       79
       +
                   {image.props.get('category') && image.category === 'O' && (<OtherShip fg={theme.accent3Color} bg={theme.accent3} width={28} height={28} />)}

     

       80
       80
        
                 </div>

     

       81
       81
        
                 <div

     

       82
       82
        
                   style={{

     
···

       127
       127
        
                   alignItems: "flex-end"

     

       128
       128
        
                 }}   

     

       129
       129
        
               >

     

       130
       130
       -
                 {image.props.charTags && (<div

     

       130
       130
       +
                 {image.props.get('charTags') && (<div

     

       131
       131
        
                   style={{

     

       132
       132
        
                     display: "flex",

     

       133
       133
        
                     flexWrap: "wrap",

     
···

       150
       150
        
                     </span>

     

       151
       151
        
                   ))}

     

       152
       152
        
                 </div>)}

     

       153
       153
       -
                 {image.props.relTags && (<div

     

       153
       153
       +
                 {image.props.get('relTags') && (<div

     

       154
       154
        
                   style={{

     

       155
       155
        
                     display: "flex",

     

       156
       156
        
                     flexWrap: "wrap",

     
···

       196
       196
        
                     </span>

     

       197
       197
        
                   ))}

     

       198
       198
        
                 </div>)}

     

       199
       199
       -
                 {image.props.summary && (<div

     

       199
       199
       +
                 {image.props.get('summary') && (<div

     

       200
       200
        
                   style={{

     

       201
       201
        
                     display: "flex",

     

       202
       202
        
                     flexDirection: "column",

     
···

       225
       225
        
                     color: theme.accent2

     

       226
       226
        
                   }}

     

       227
       227
        
                 >

     

       228
       228
       -
                   {image.props.wordcount && `${image.words} words • `}{(image.props.chapters && image.chapterCount !== null) && `${image.chapterCount}  chapters • `}{image.props.postedAt && `posted on ${image.postedAt} • `}{image.props.updatedAt && `updated on ${image.updatedAt} • `}{addr}

     

       228
       228
       +
                   {image.props.get('wordcount') && `${image.words} words • `}{(image.props.get('chapters') && image.chapterCount !== null) && `${image.chapterCount}  chapters • `}{image.props.get('postedAt') && `posted on ${image.postedAt} • `}{image.props.get('updatedAt') && `updated on ${image.updatedAt} • `}{addr}

     

       229
       229
        
                 </div>

     

       230
       230
        
               </div>

     

       231
       231
        
             </div>

+4 -1

src/lib/sanitizeData.js

···

       83
       83
        
       

     

       84
       84
        
       export default async function sanitizeData ({ type, data, props}) {

     

       85
       85
        
         const archive = props && props.archive ? props.archive : process.env.ARCHIVE

     

       86
       86
       +
         console.log(props)

     

       86
       87
        
         const baseFont = props.baseFont ? props.baseFont : process.env.DEFAULT_BASE_FONT

     

       87
       88
        
         const baseFontData = baseFonts[baseFont]

     

       88
       89
        
         const titleFont = props.titleFont ? props.titleFont : process.env.DEFAULT_TITLE_FONT

     

       89
       90
        
         const titleFontData = titleFonts[titleFont]

     

       90
       90
       -
         const themeData = props.theme ? themes[props.theme] : themes[process.env.DEFAULT_THEME]

     

       91
       91
       +
         const archClean = props.has('archive') ? props.get('archive').replace("https://", '').replace('/', '') : null

     

       92
       92
       +
         const theme = props.has('theme') ? props.get('theme') : (props.has('archive') && !["ao3.org", "archiveofourown.org", "archive.transformativeworks.org"].includes(archClean) && Object.values(siteMap).includes(archClean) ? Object.keys(siteMap)[Object.values(siteMap).indexOf(archClean)] : process.env.DEFAULT_THEME)

     

       93
       93
       +
         const themeData = themes[theme]

     

       91
       94
        
         const parentWork = type === 'work' && data.chapterInfo ? await getWork(data.id, archive) : null

     

       92
       95
        
         const bfs = await Promise.all(baseFontData.defs.map(async (bf) => {

     

       93
       96
        
           return {