commit f2bcc6ed8b9bd3b056fb0b791d8524bf6eb5b58f · veryroundbird.house/fixao3

+2 -2

src/app/api/works/[workId]/route.js

···

       5
       5
        
         const { workId } = await ctx.params

     

       6
       6
        
         const params = await req.nextUrl.searchParams

     

       7
       7
        
         const domain = await req.nextUrl.hostname

     

       8
       8
       -
         const subdomain = domain.split(".").length > 1 ? domain.split(".")[0] : null

     

       9
       9
       -
         const archive = params.get('archive')

     

       8
       8
       +
         const subdomain = (domain.split(".").length > 1) ? domain.split(".")[0] : null

     

       9
       9
       +
         const archive = params ? params.get('archive') : null

     

       10
       10
        
         if (subdomain) setArchiveBaseUrl('https://'+siteMap[subdomain])

     

       11
       11
        
         if (archive) setArchiveBaseUrl(archive)

     

       12
       12
        
         const work = await getWork({workId: workId})

src/lib/ogimage.js

···

       15
       15
        
       import ChoseNotToWarn from "@/icons/chosenottowarn.js"

     

       16
       16
        
       

     

       17
       17
        
       export default async function OGImage ({ theme, baseFont, titleFont, image, addr, opts }) {

     

       18
       18
       +
         console.log(image)

     

       18
       19
        
         return new ImageResponse(

     

       19
       20
        
           (

     

       20
       21
        
             <div

+14 -14

src/lib/sanitizeData.js

···

       7
       7
        
       import titleFonts from '@/lib/titleFonts.js'

     

       8
       8
        
       

     

       9
       9
        
       const getWork = async (workId, archive = null) => {

     

       10
       10
       -
         const domainParam = archive ? `?archive=${archive}` : ''

     

       10
       10
       +
         const domainParam = (archive && archive !== process.env.ARCHIVE) ? `?archive=${archive}` : ''

     

       11
       11
        
         const data = await fetch(`http://${process.env.DOMAIN}/api/works/${workId}${domainParam}`)

     

       12
       12
        
         const work = await data.json()

     

       13
       13
        
         return work

     
···

       82
       82
        
       }

     

       83
       83
        
       

     

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

     

       85
       85
       -
         const propsParsed = sanitizeProps(querystring.parse(props ? props.toString() : ''))

     

       86
       86
       -
         const archive = props && props.has('archive') ? props.get('archive') : 'https://archiveofourown.org'

     

       87
       87
       -
         const baseFont = propsParsed.baseFont ? propsParsed.baseFont : process.env.DEFAULT_BASE_FONT

     

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

     

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

     

       88
       87
        
         const baseFontData = baseFonts[baseFont]

     

       89
       89
       -
         const titleFont = propsParsed.titleFont ? propsParsed.titleFont : process.env.DEFAULT_TITLE_FONT

     

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

     

       90
       89
        
         const titleFontData = titleFonts[titleFont]

     

       91
       91
       -
         const themeData = propsParsed.theme ? themes[propsParsed.theme] : themes[process.env.DEFAULT_THEME]

     

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

     

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

     

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

     

       94
       93
        
           return {

     
···

       117
       116
        
             return a.username

     

       118
       117
        
           })

     

       119
       118
        
           : []

     

       120
       120
       -
         const rating = type === 'work' ? await getHighestRating([data], archive) : await getHighestRating(data.works, archive)

     

       119
       119
       +
         const rating = type === 'work' ? data.rating : await getHighestRating(data.works, archive)

     

       121
       120
        
         const warning = type === 'work' ? await getHighestWarning([data], archive) : await getHighestWarning(data.works, archive)

     

       122
       121
        
         const category = type === 'work' ? await getCategory([data], archive) : await getCategory(data.works, archive)

     

       123
       123
       -
         const authorString = authorsFormatted.length > 1

     

       122
       122
       +
         const authorString = (authorsFormatted.length > 1

     

       124
       123
        
           ? authorsFormatted.slice(0, -1).join(", ") + " & " +

     

       125
       124
        
             authorsFormatted.slice(-1)[0]

     

       126
       126
       -
           : authorsFormatted[0]

     

       125
       125
       +
           : authorsFormatted[0])

     

       127
       126
        
         const summaryContent = type === 'work'

     

       128
       128
       -
           ? (propsParsed.summaryType === 'chapter' && data.chapterInfo && data.chapterInfo.summary ? data.chapterInfo.summary : (propsParsed.summaryType === 'custom' && propsParsed.customSummary !== '' ? propsParsed.customSummary : (data.summary ? data.summary : (parentWork ? parentWork.summary : ''))))

     

       129
       129
       -
           : (propsParsed.summaryType === 'custom' && propsParsed.customSummary !== '' ? propsParsed.customSummary : data.notes)

     

       127
       127
       +
           ? (props.summaryType === 'chapter' && data.chapterInfo && data.chapterInfo.summary ? data.chapterInfo.summary : (props.summaryType === 'custom' && props.customSummary !== '' ? props.customSummary : (data.summary ? data.summary : (parentWork ? parentWork.summary : ''))))

     

       128
       128
       +
           : (props.summaryType === 'custom' && props.customSummary !== '' ? props.customSummary : data.notes)

     

       130
       129
        
         const formatter = new Intl.NumberFormat('en-US')

     

       131
       130
        
         const words = formatter.format(data.words)

     

       132
       132
       -
         const summaryDOM = new DOM(summaryContent, {decodeEntities: true});

     

       131
       131
       +
         const summaryDOM = new DOM(summaryContent, {decodeEntities: true})

     

       133
       132
        
         const summaryFormatted = summaryDOM.innerHTML.replace(/\<br(?: \/)?\>/g, "\n").replace(

     

       134
       133
        
           /(<([^>]+)>)/ig,

     

       135
       134
        
           "",

     
···

       161
       160
        
         const freeTags = type === 'work' ? data.tags.additional : data.works.map(w => w.tags.additional).reduce((a, b) => { return b ? (a ? a.concat(b) : []) : (a ? a : []) }).filter((w, i) => { return i === data.works.indexOf(w) })

     

       162
       161
        
         const warnings = type === 'work' ? data.tags.warnings : data.works.map(w => w.tags.warnings).reduce((a, b) => { return b ? (a ? a.concat(b) : []) : (a ? a : []) }).filter((w, i) => { return i === data.works.indexOf(w) })

     

       163
       162
        
         

     

       164
       164
       -
         return {

     

       163
       163
       +
         const ret = {

     

       165
       164
        
           topLine: fandomString,

     

       166
       165
        
           titleLine: titleString,

     

       167
       166
        
           authorLine: authorString,

     
···

       180
       179
        
           updatedAt: data.updatedAt,

     

       181
       180
        
           baseFont: baseFont,

     

       182
       181
        
           titleFont: titleFont,

     

       183
       183
       -
           props: propsParsed,

     

       182
       182
       +
           props: props,

     

       184
       183
        
           opts: {

     

       185
       184
        
             fonts: bfs.concat(tfs)

     

       186
       185
        
           }

     

       187
       186
        
         }

     

       187
       187
       +
         return ret;

     

       188
       188
        
       }