commit 5dcad419047605a0445a56df91cb460c28404d7b · veryroundbird.house/fixao3

+1 -1

src/app/generator/page.js

···

       63
       63
        
           const fn = async () => {

     

       64
       64
        
             if (!addr) return;

     

       65
       65
        
             const params = new URLSearchParams(props)

     

       66
       66
       -
             const image = await fetch(`/${addr}/opengraph-image?${params.toString()}`)

     

       66
       66
       +
             const image = await fetch(`/${addr}/preview?${params.toString()}`)

     

       67
       67
        
             if (image.status !== 200) return;

     

       68
       68
        
             const imageBlob = await image.blob()

     

       69
       69
        
             const reader = new FileReader()

+22 -20

src/app/series/[seriesId]/opengraph-image.jsx

···

       12
       12
        
       

     

       13
       13
        
       export const contentType = 'image/webp'

     

       14
       14
        
       

     

       15
       15
       -
       export default async function Image({params}) {

     

       15
       15
       +
       const defaults = new URLSearchParams({

     

       16
       16
       +
         theme: 'ao3',

     

       17
       17
       +
         baseFont: 'bricolagegrotesque',

     

       18
       18
       +
         titleFont: 'stacksansnotch',

     

       19
       19
       +
         category: true,

     

       20
       20
       +
         rating: true,

     

       21
       21
       +
         warnings: false,

     

       22
       22
       +
         charTags: false,

     

       23
       23
       +
         relTags: false,

     

       24
       24
       +
         freeTags: false,

     

       25
       25
       +
         summary: true,

     

       26
       26
       +
         wordcount: true,

     

       27
       27
       +
         chapters: true,

     

       28
       28
       +
         postedAt: true,

     

       29
       29
       +
         updatedAt: false,

     

       30
       30
       +
         summaryType: 'basic',

     

       31
       31
       +
         customSummary: ''

     

       32
       32
       +
       })

     

       33
       33
       +
       

     

       34
       34
       +
       export default async function Image({params, searchParams}) {

     

       16
       35
        
         const { seriesId } = await params

     

       17
       17
       -
         const props = new URLSearchParams({

     

       18
       18
       -
           theme: 'ao3',

     

       19
       19
       -
           baseFont: 'bricolagegrotesque',

     

       20
       20
       -
           titleFont: 'stacksansnotch',

     

       21
       21
       -
           category: true,

     

       22
       22
       -
           rating: true,

     

       23
       23
       -
           warnings: false,

     

       24
       24
       -
           charTags: false,

     

       25
       25
       -
           relTags: false,

     

       26
       26
       -
           freeTags: false,

     

       27
       27
       -
           summary: true,

     

       28
       28
       -
           wordcount: true,

     

       29
       29
       -
           chapters: true,

     

       30
       30
       -
           postedAt: true,

     

       31
       31
       -
           updatedAt: false,

     

       32
       32
       -
           summaryType: 'basic',

     

       33
       33
       -
           customSummary: ''

     

       34
       34
       -
         })

     

       35
       36
        
         const addr = `series/${seriesId}`

     

       36
       37
        
         const data = await getSeries({seriesId: seriesId})

     

       37
       37
       -
         const imageParams = await sanitizeData({type: 'series', data: data, props: props})

     

       38
       38
       +
         const imageParams = await sanitizeData({type: 'series', data: data, props: defaults})

     

       38
       39
        
         const theme = imageParams.theme

     

       40
       40
       +
         console.log(theme)

     

       39
       41
        
         const baseFont = baseFonts[imageParams.baseFont].displayName

     

       40
       42
        
         const titleFont = titleFonts[imageParams.titleFont].displayName

     

       41
       43
        
         const opts = imageParams.opts

+25

src/app/series/[seriesId]/preview/route.js

···

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

     

       2
       2
       +
       import sanitizeData from "@/lib/sanitizeData.js"

     

       3
       3
       +
       import OGImage from "@/lib/ogimage.js"

     

       4
       4
       +
       import baseFonts from "@/lib/baseFonts.js"

     

       5
       5
       +
       import titleFonts from "@/lib/titleFonts.js"

     

       6
       6
       +
       

     

       7
       7
       +
       export const size = {

     

       8
       8
       +
         width: 1600,

     

       9
       9
       +
         height: 900,

     

       10
       10
       +
       }

     

       11
       11
       +
       

     

       12
       12
       +
       export const contentType = 'image/webp'

     

       13
       13
       +
       

     

       14
       14
       +
       export async function GET(req, ctx) {

     

       15
       15
       +
         const { seriesId } = await ctx.params

     

       16
       16
       +
         const props = await req.nextUrl.searchParams

     

       17
       17
       +
         const addr = `series/${seriesId}`

     

       18
       18
       +
         const data = await getSeries({seriesId: seriesId})

     

       19
       19
       +
         const imageParams = await sanitizeData({type: 'series', data: data, props: props})

     

       20
       20
       +
         const theme = imageParams.theme

     

       21
       21
       +
         const baseFont = baseFonts[imageParams.baseFont].displayName

     

       22
       22
       +
         const titleFont = titleFonts[imageParams.titleFont].displayName

     

       23
       23
       +
         const opts = imageParams.opts

     

       24
       24
       +
         return OGImage({theme: theme, baseFont: baseFont, titleFont: titleFont, image: imageParams, addr: addr, opts: opts})

     

       25
       25
       +
       }

+5 -4

src/app/works/[workId]/chapters/[chapterId]/opengraph-image.jsx

···

       12
       12
        
       

     

       13
       13
        
       export const contentType = 'image/webp'

     

       14
       14
        
       

     

       15
       15
       -
       export default async function Image({params}) {

     

       16
       16
       -
         const { workId, chapterId } = await params

     

       17
       17
       -
         const props = new URLSearchParams({

     

       15
       15
       +
       const defaults = new URLSearchParams({

     

       18
       16
        
           theme: 'ao3',

     

       19
       17
        
           baseFont: 'bricolagegrotesque',

     

       20
       18
        
           titleFont: 'stacksansnotch',

     
···

       32
       30
        
           summaryType: 'basic',

     

       33
       31
        
           customSummary: ''

     

       34
       32
        
         })

     

       33
       33
       +
       

     

       34
       34
       +
       export default async function Image({params, searchParams}) {

     

       35
       35
       +
         const { workId, chapterId } = await params

     

       35
       36
        
         const addr = `works/${workId}/chapters/${chapterId}`

     

       36
       37
        
         const data = await getWork({workId: workId, chapterId: chapterId})

     

       37
       37
       -
         const imageParams = await sanitizeData({type: 'work', data: data, props: props})

     

       38
       38
       +
         const imageParams = await sanitizeData({type: 'work', data: data, props: defaults})

     

       38
       39
        
         const theme = imageParams.theme

     

       39
       40
        
         const baseFont = baseFonts[imageParams.baseFont].displayName

     

       40
       41
        
         const titleFont = titleFonts[imageParams.titleFont].displayName

+25

src/app/works/[workId]/chapters/[chapterId]/preview/route.js

···

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

     

       2
       2
       +
       import sanitizeData from "@/lib/sanitizeData.js"

     

       3
       3
       +
       import OGImage from "@/lib/ogimage.js"

     

       4
       4
       +
       import baseFonts from "@/lib/baseFonts.js"

     

       5
       5
       +
       import titleFonts from "@/lib/titleFonts.js"

     

       6
       6
       +
       

     

       7
       7
       +
       export const size = {

     

       8
       8
       +
         width: 1600,

     

       9
       9
       +
         height: 900,

     

       10
       10
       +
       }

     

       11
       11
       +
       

     

       12
       12
       +
       export const contentType = 'image/webp'

     

       13
       13
       +
       

     

       14
       14
       +
       export async function GET(req, ctx) {

     

       15
       15
       +
         const { workId, chapterId } = await ctx.params

     

       16
       16
       +
         const props = await req.nextUrl.searchParams

     

       17
       17
       +
         const addr = `works/${workId}/chapters/${chapterId}`

     

       18
       18
       +
         const data = await getWork({workId: workId, chapterId: chapterId})

     

       19
       19
       +
         const imageParams = await sanitizeData({type: 'work', data: data, props: props})

     

       20
       20
       +
         const theme = imageParams.theme

     

       21
       21
       +
         const baseFont = baseFonts[imageParams.baseFont].displayName

     

       22
       22
       +
         const titleFont = titleFonts[imageParams.titleFont].displayName

     

       23
       23
       +
         const opts = imageParams.opts

     

       24
       24
       +
         return OGImage({theme: theme, baseFont: baseFont, titleFont: titleFont, image: imageParams, addr: addr, opts: opts})

     

       25
       25
       +
       }

+20 -19

src/app/works/[workId]/opengraph-image.jsx

···

       12
       12
        
       

     

       13
       13
        
       export const contentType = 'image/webp'

     

       14
       14
        
       

     

       15
       15
       +
       const defaults = new URLSearchParams({

     

       16
       16
       +
         theme: 'ao3',

     

       17
       17
       +
         baseFont: 'bricolagegrotesque',

     

       18
       18
       +
         titleFont: 'stacksansnotch',

     

       19
       19
       +
         category: true,

     

       20
       20
       +
         rating: true,

     

       21
       21
       +
         warnings: false,

     

       22
       22
       +
         charTags: false,

     

       23
       23
       +
         relTags: false,

     

       24
       24
       +
         freeTags: false,

     

       25
       25
       +
         summary: true,

     

       26
       26
       +
         wordcount: true,

     

       27
       27
       +
         chapters: true,

     

       28
       28
       +
         postedAt: true,

     

       29
       29
       +
         updatedAt: false,

     

       30
       30
       +
         summaryType: 'basic',

     

       31
       31
       +
         customSummary: ''

     

       32
       32
       +
       })

     

       33
       33
       +
       

     

       15
       34
        
       export default async function Image({params}) {

     

       16
       35
        
         const { workId } = await params

     

       17
       17
       -
         const props = new URLSearchParams({

     

       18
       18
       -
           theme: 'ao3',

     

       19
       19
       -
           baseFont: 'bricolagegrotesque',

     

       20
       20
       -
           titleFont: 'stacksansnotch',

     

       21
       21
       -
           category: true,

     

       22
       22
       -
           rating: true,

     

       23
       23
       -
           warnings: false,

     

       24
       24
       -
           charTags: false,

     

       25
       25
       -
           relTags: false,

     

       26
       26
       -
           freeTags: false,

     

       27
       27
       -
           summary: true,

     

       28
       28
       -
           wordcount: true,

     

       29
       29
       -
           chapters: true,

     

       30
       30
       -
           postedAt: true,

     

       31
       31
       -
           updatedAt: false,

     

       32
       32
       -
           summaryType: 'basic',

     

       33
       33
       -
           customSummary: ''

     

       34
       34
       -
         })

     

       35
       36
        
         const addr = `works/${workId}`

     

       36
       37
        
         const data = await getWork({workId: workId})

     

       37
       37
       -
         const imageParams = await sanitizeData({type: 'work', data: data, props: props})

     

       38
       38
       +
         const imageParams = await sanitizeData({type: 'work', data: data, props: defaults})

     

       38
       39
        
         const theme = imageParams.theme

     

       39
       40
        
         const baseFont = baseFonts[imageParams.baseFont].displayName

     

       40
       41
        
         const titleFont = titleFonts[imageParams.titleFont].displayName

+25

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

···

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

     

       2
       2
       +
       import sanitizeData from "@/lib/sanitizeData.js"

     

       3
       3
       +
       import OGImage from "@/lib/ogimage.js"

     

       4
       4
       +
       import baseFonts from "@/lib/baseFonts.js"

     

       5
       5
       +
       import titleFonts from "@/lib/titleFonts.js"

     

       6
       6
       +
       

     

       7
       7
       +
       export const size = {

     

       8
       8
       +
         width: 1600,

     

       9
       9
       +
         height: 900,

     

       10
       10
       +
       }

     

       11
       11
       +
       

     

       12
       12
       +
       export const contentType = 'image/webp'

     

       13
       13
       +
       

     

       14
       14
       +
       export async function GET(req, ctx) {

     

       15
       15
       +
         const { workId } = await ctx.params

     

       16
       16
       +
         const props = await req.nextUrl.searchParams

     

       17
       17
       +
         const addr = `works/${workId}`

     

       18
       18
       +
         const data = await getWork({workId: workId})

     

       19
       19
       +
         const imageParams = await sanitizeData({type: 'work', data: data, props: props})

     

       20
       20
       +
         const theme = imageParams.theme

     

       21
       21
       +
         const baseFont = baseFonts[imageParams.baseFont].displayName

     

       22
       22
       +
         const titleFont = titleFonts[imageParams.titleFont].displayName

     

       23
       23
       +
         const opts = imageParams.opts

     

       24
       24
       +
         return OGImage({theme: theme, baseFont: baseFont, titleFont: titleFont, image: imageParams, addr: addr, opts: opts})

     

       25
       25
       +
       }