commit d5095a3bb530de4451e69165a8ea3c862228a291 · mewsse.pet/pet.mewsse.link

+13 -5

assets/style.css

···

       108
       108
        
       

     

       109
       109
        
       .item {

     

       110
       110
        
         text-align: center;

     

       111
       111
       -
         display: flex;

     

       112
       111
        
         margin-bottom: 1rem;

     

       113
       112
        
         padding-bottom: 1rem;

     

       114
       113
        
         border-bottom : 1px solid oklch(100% 0% 0 / 10%);

     
···

       123
       122
        
       .item section {

     

       124
       123
        
         width: 100%;

     

       125
       124
        
         padding: 0 1rem 0 0;

     

       125
       125
       +
         margin-bottom: 1em;

     

       126
       126
        
       }

     

       127
       127
        
       

     

       128
       128
        
       .item .aside {

     
···

       157
       157
        
         filter: blur(30px);

     

       158
       158
        
       }

     

       159
       159
        
       

     

       160
       160
       -
       .item.big {

     

       161
       161
       -
         flex-direction: column;

     

       162
       162
       -
       }

     

       163
       163
       -
       

     

       164
       160
        
       .item.big .description {

     

       165
       161
        
         margin-bottom: 1rem;

     

       166
       162
        
       }

     
···

       195
       191
        
       

     

       196
       192
        
       h2 {

     

       197
       193
        
         margin-top: 0;

     

       194
       194
       +
       }

     

       195
       195
       +
       

     

       196
       196
       +
       .media {

     

       197
       197
       +
         max-width: 600px;

     

       198
       198
       +
         width: 100%;

     

       199
       199
       +
         display: flex;

     

       200
       200
       +
         margin: 10px auto;

     

       201
       201
       +
       }

     

       202
       202
       +
       

     

       203
       203
       +
       iframe {

     

       204
       204
       +
         width: 100%;

     

       205
       205
       +
         min-height: 300px;

     

       198
       206
        
       }

     

       199
       207
        
       

     

       200
       208
        
       @media only screen and (max-width: 700px) {

+1 -6

lexicons/pet/mewsse/link.json

···

       14
       14
        
                 "createdAt"

     

       15
       15
        
               ],

     

       16
       16
        
               "properties": {

     

       17
       17
       -
                 "link": {

     

       17
       17
       +
                 "url": {

     

       18
       18
        
                   "type": "string",

     

       19
       19
        
                   "maxLength": 3000,

     

       20
       20
        
                   "description": "The link to point to."

     
···

       41
       41
        
                   "type": "boolean",

     

       42
       42
        
                   "default": false,

     

       43
       43
        
                   "description": "Is the link nsfw ?"

     

       44
       44
       -
                 },

     

       45
       45
       -
                 "big": {

     

       46
       46
       -
                   "type": "boolean",

     

       47
       47
       -
                   "default": false,

     

       48
       48
       -
                   "description": "Do we need to display the link as large content ?"

     

       49
       44
        
                 },

     

       50
       45
        
                 "createdAt": {

     

       51
       46
        
                   "type": "string",

+5 -8

src/db.ts

···

       12
       12
        
       

     

       13
       13
        
       export type Embed = { 

     

       14
       14
        
           '$type': string, 

     

       15
       15
       -
           image?: Blob | LegacyBlob,

     

       16
       16
       -
           video?: Blob | LegacyBlob,

     

       17
       17
       -
           alt?: string, 

     

       18
       18
       -
           uri?: string 

     

       15
       15
       +
           url?: string,

     

       16
       16
       +
           html?: string,

     

       17
       17
       +
           alt?: string

     

       19
       18
        
         } | null

     

       20
       19
        
       

     

       21
       20
        
       export type Link = {

     

       22
       21
        
         rkey: string,

     

       23
       23
       -
         link: string,

     

       22
       22
       +
         url: string,

     

       24
       23
        
         title: string,

     

       25
       24
        
         description: string | null,

     

       26
       25
        
         embed: Embed,

     

       27
       26
        
         nsfw: number,

     

       28
       28
       -
         big: number,

     

       29
       27
        
         createdAt: string,

     

       30
       28
        
       }

     

       31
       29
        
       

     
···

       46
       44
        
           await db.schema

     

       47
       45
        
             .createTable('links')

     

       48
       46
        
             .addColumn('rkey', 'varchar', (col) => col.primaryKey())

     

       49
       49
       -
             .addColumn('link', 'varchar', (col) => col.notNull())

     

       47
       47
       +
             .addColumn('url', 'varchar', (col) => col.notNull())

     

       50
       48
        
             .addColumn('title', 'varchar', (col) => col.notNull())

     

       51
       49
        
             .addColumn('description', 'varchar')

     

       52
       50
        
             .addColumn('embed', 'varchar')

     

       53
       51
        
             .addColumn('nsfw', 'integer')

     

       54
       54
       -
             .addColumn('big', 'integer')

     

       55
       52
        
             .addColumn('createdAt', 'varchar', (col) => col.notNull())

     

       56
       53
        
             .execute()

     

       57
       54

+12 -13

src/ingester.ts

···

       7
       7
        
       import { RepoReader } from '@atcute/car/v4'

     

       8
       8
        
       import { decode } from '@atcute/cbor'

     

       9
       9
        
       import { logger } from "./lib/logger.ts"

     

       10
       10
       +
       import { findEmbed } from "./lib/embed.ts"

     

       10
       11
        
       

     

       11
       12
        
       interface RepoParams {

     

       12
       13
        
         did: Did<"web"> | Did<"plc">,

     
···

       61
       62
        
               if (!repoRev) repoRev = entry.rkey

     

       62
       63
        
               if (entry.collection != "pet.mewsse.link") continue

     

       63
       64
        
               const link = decode(entry.bytes)

     

       65
       65
       +
               console.log(link)

     

       64
       66
        
       

     

       65
       67
        
               links.push({

     

       66
       68
        
                 rkey: entry.rkey,

     

       67
       67
       -
                 link: link.link,

     

       69
       69
       +
                 url: link.url,

     

       68
       70
        
                 title: link.title,

     

       69
       71
        
                 description: link.description,

     

       70
       70
       -
                 embed: link.embed || null,

     

       72
       72
       +
                 embed: await findEmbed(did, pds, link.embed),

     

       71
       73
        
                 nsfw: +(link.nsfw || 0),

     

       72
       72
       -
                 big: +(link.big || 0),

     

       73
       74
        
                 createdAt: link.createdAt

     

       74
       75
        
               })

     

       75
       76
        
             }

     
···

       77
       78
        
             links = links.sort((a, b) => a.createdAt > b.createdAt ? 1 : -1)

     

       78
       79
        
       

     

       79
       80
        
             for await (const link of links) {

     

       81
       81
       +
               const embed = await findEmbed(did, pds, link.embed)

     

       80
       82
        
               await db

     

       81
       83
        
                 .insertInto('links')

     

       82
       84
        
                 .values(link)

     

       83
       85
        
                 .onConflict((conflict) =>

     

       84
       86
        
                   conflict.column('rkey').doUpdateSet({

     

       85
       85
       -
                     link: link.link,

     

       87
       87
       +
                     url: link.url,

     

       86
       88
        
                     title: link.title,

     

       87
       89
        
                     description: link.description,

     

       88
       88
       -
                     embed: link.embed || null,

     

       90
       90
       +
                     embed: embed,

     

       89
       91
        
                     nsfw: +(link.nsfw || 0),

     

       90
       90
       -
                     big: +(link.big || 0),

     

       91
       92
        
                   })

     

       92
       93
        
                 )

     

       93
       94
        
                 .execute()

     
···

       174
       175
        
                 .insertInto('links')

     

       175
       176
        
                 .values({

     

       176
       177
        
                   rkey: rev,

     

       177
       177
       -
                   link: record.link,

     

       178
       178
       +
                   url: record.url,

     

       178
       179
        
                   title: record.title,

     

       179
       180
        
                   description: record.description ?? null,

     

       180
       180
       -
                   embed: record.embed || null,

     

       181
       181
       +
                   embed: await findEmbed(did, pds, record.embed),

     

       181
       182
        
                   nsfw: +(record.nsfw || 0),

     

       182
       182
       -
                   big: +(record.big || 0),

     

       183
       183
        
                   createdAt: record.createdAt

     

       184
       184
        
                 })

     

       185
       185
        
                 .execute()

     
···

       196
       196
        
               await db

     

       197
       197
        
                 .updateTable('links')

     

       198
       198
        
                 .set({

     

       199
       199
       -
                   link: record.link,

     

       199
       199
       +
                   url: record.url,

     

       200
       200
        
                   title: record.title,

     

       201
       201
        
                   description: record.description ?? null,

     

       202
       202
       -
                   embed: record.embed,

     

       202
       202
       +
                   embed: await findEmbed(did, pds, record.embed),

     

       203
       203
        
                   nsfw: +(record.nsfw || 0),

     

       204
       204
       -
                   big: +(record.big || 0),

     

       205
       204
        
                   createdAt: record.createdAt

     

       206
       205
        
                 })

     

       207
       206
        
                 .where('rkey', '=', rev)

     

       208
       208
       -
                 .executeTakeFirstOrThrow()

     

       207
       207
       +
                 .executeTakeFirst()

     

       209
       208
        
       

     

       210
       209
        
               logger.info(`Record ${rev} updated`)

     

       211
       210
        
             })

+1 -6

src/lexicons/types/pet/mewsse/link.ts

···

       11
       11
        
         /*#__PURE__*/ v.object({

     

       12
       12
        
           $type: /*#__PURE__*/ v.literal("pet.mewsse.link"),

     

       13
       13
        
           /**

     

       14
       14
       -
            * Do we need to display the link as large content ?

     

       15
       15
       -
            * @default false

     

       16
       16
       -
            */

     

       17
       17
       -
           big: /*#__PURE__*/ v.optional(/*#__PURE__*/ v.boolean(), false),

     

       18
       18
       -
           /**

     

       19
       14
        
            * Client-declared timestamp when this post was originally created.

     

       20
       15
        
            */

     

       21
       16
        
           createdAt: /*#__PURE__*/ v.datetimeString(),

     
···

       37
       32
        
            * The link to point to.

     

       38
       33
        
            * @maxLength 3000

     

       39
       34
        
            */

     

       40
       40
       -
           link: /*#__PURE__*/ v.constrain(/*#__PURE__*/ v.string(), [

     

       35
       35
       +
           url: /*#__PURE__*/ v.constrain(/*#__PURE__*/ v.string(), [

     

       41
       36
        
             /*#__PURE__*/ v.stringLength(0, 3000),

     

       42
       37
        
           ]),

     

       43
       38
        
           /**

+39 -29

src/lib/embed.ts

···

       2
       2
        
       import type { Did } from '@atcute/lexicons/syntax'

     

       3
       3
        
       import type { Embed } from '../db.ts'

     

       4
       4
        
       

     

       5
       5
       -
       export function findEmbed(did: Did<"web"> | Did<"plc">, pds: string): Function {

     

       6
       6
       -
         return async (embed: Embed): Promise<{url?: string, html?:string, $type:string} | null> => {

     

       7
       7
       -
           if (!embed) return null

     

       5
       5
       +
       export async function findEmbed(did: Did<"web"> | Did<"plc">, pds: string, embed: any): Promise<Embed | null> {

     

       6
       6
       +
         if (!embed) return null

     

       8
       7
        
       

     

       9
       9
       -
           if (embed.$type === "pet.mewsse.embed.image" || embed.$type === "pet.mewsse.embed.video") {

     

       10
       10
       -
             if (!embed.image && !embed.video) return null

     

       8
       8
       +
         if (embed.$type === "pet.mewsse.embed.image" || embed.$type === "pet.mewsse.embed.video") {

     

       9
       9
       +
           if (!embed.image && !embed.video) return null

     

       11
       10
        
       

     

       12
       12
       -
             const embedType = embed.image || embed.video

     

       11
       11
       +
           const embedType = embed.image || embed.video

     

       13
       12
        
       

     

       14
       14
       -
             if (!embedType) return null

     

       13
       13
       +
           if (!embedType) return null

     

       15
       14
        
       

     

       16
       16
       -
             const cid = isBlob(embedType) ? embedType.ref.$link : embedType.cid

     

       15
       15
       +
           const cid = isBlob(embedType) ? embedType.ref.$link : embedType.cid

     

       17
       16
        
       

     

       18
       18
       -
             // let the user pull the blob with their browser directly fomr the pds

     

       19
       19
       -
             // decreasing space needed to run the service and prevent duplication

     

       20
       20
       -
             // if hosted at the same place as the pds (self host anyone ?)

     

       21
       21
       -
             return {

     

       22
       22
       -
               '$type': embed.$type,

     

       23
       23
       -
               url: `${pds}/xrpc/com.atproto.sync.getBlob?did=${did}&cid=${cid}`

     

       24
       24
       -
             }

     

       17
       17
       +
           // let the user pull the blob with their browser directly fomr the pds

     

       18
       18
       +
           // decreasing space needed to run the service and prevent duplication

     

       19
       19
       +
           // if hosted at the same place as the pds (self host anyone ?)

     

       20
       20
       +
           return {

     

       21
       21
       +
             '$type': embed.$type,

     

       22
       22
       +
             url: `${pds}/xrpc/com.atproto.sync.getBlob?did=${did}&cid=${cid}`,

     

       23
       23
       +
             alt: embed.alt

     

       25
       24
        
           }

     

       25
       25
       +
         }

     

       26
       26
        
       

     

       27
       27
       -
           if (embed.$type === "pet.mewsse.embed.post" && embed.uri) {

     

       28
       28
       -
             const at = embed.uri.split("at://").pop()

     

       27
       27
       +
         if (embed.$type === "pet.mewsse.embed.post" && embed.uri) {

     

       28
       28
       +
           const at = embed.uri.split('at://').pop()

     

       29
       29
       +
           const response = await fetch(`https://embed.bsky.app/oembed?url=${embed.uri}`)

     

       30
       30
       +
           const body = await response.json()

     

       29
       31
        
       

     

       30
       30
       -
             return {

     

       31
       31
       -
               '$type': embed.$type,

     

       32
       32
       -
               url: `https://embed.bsky.app/embed/${at}`

     

       33
       33
       -
             }

     

       32
       32
       +
           return {

     

       33
       33
       +
             '$type': embed.$type,

     

       34
       34
       +
             html: body.html,

     

       35
       35
       +
             alt: embed.alt

     

       34
       36
        
           }

     

       37
       37
       +
         }

     

       35
       38
        
       

     

       36
       36
       -
           if (embed.$type === "pet.mewsse.embed.external" && embed.uri) {

     

       37
       37
       -
             if (embed.uri.indexOf('youtube') != -1) {

     

       38
       38
       -
               const id = embed.uri.split("?v=").pop()

     

       39
       39
       +
         if (embed.$type === "pet.mewsse.embed.external" && embed.uri) {

     

       40
       40
       +
           if (embed.uri.indexOf('youtube') != -1) {

     

       41
       41
       +
             const response = await fetch(`https://www.youtube.com/oembed?url=${embed.uri}`)

     

       42
       42
       +
             const body = await response.json()

     

       39
       43
        
       

     

       40
       40
       -
               return {

     

       41
       41
       -
                 '$type': embed.$type,

     

       42
       42
       -
                 url: `http://www.youtube.com/embed/${id}`

     

       43
       43
       -
               }

     

       44
       44
       +
             return {

     

       45
       45
       +
               '$type': embed.$type,

     

       46
       46
       +
               html: body.html,

     

       47
       47
       +
               alt: embed.alt

     

       44
       48
        
             }

     

       45
       49
        
           }

     

       46
       50
        
       

     

       47
       47
       -
           return null

     

       51
       51
       +
           return {

     

       52
       52
       +
             '$type': embed.$type,

     

       53
       53
       +
             url: embed.uri,

     

       54
       54
       +
             alt: embed.alt

     

       55
       55
       +
           }

     

       48
       56
        
         }

     

       57
       57
       +
       

     

       58
       58
       +
         return null

     

       49
       59
        
       }

+4 -15

src/routes.ts

···

       1
       1
        
       

     

       2
       2
        
       import { IncomingMessage, ServerResponse } from "node:http"

     

       3
       3
       -
       import { findEmbed } from "./lib/embed.ts"

     

       4
       3
        
       import path from "node:path"

     

       5
       4
        
       import { Eta } from "eta"

     

       6
       5
        
       

     
···

       9
       8
        
       export const createRoutes = (ctx: Context) => {

     

       10
       9
        
         const eta = new Eta({ views: path.join(import.meta.dirname, "views") })

     

       11
       10
        
         const itemPerPages = parseInt(process.env.ITEM_PER_PAGES || "10", 10)

     

       12
       12
       -
         const embed = findEmbed(ctx.did, ctx.pds)

     

       13
       11
        
       

     

       14
       12
        
         async function renderPage (

     

       15
       13
        
           req:IncomingMessage, 

     

       16
       14
        
           res:ServerResponse<IncomingMessage>, 

     

       17
       15
        
           params:{[key:string]: string} | undefined

     

       18
       16
        
         ) {

     

       19
       19
       -
           const offset = params ? parseInt(params?.page, 10) - 1 : 0

     

       17
       17
       +
           const offset = params ? (parseInt(params?.page, 10) - 1) * itemPerPages : 0

     

       20
       18
        
       

     

       21
       19
        
           const links = await ctx.db

     

       22
       20
        
             .selectFrom("links")

     
···

       32
       30
        
             .executeTakeFirstOrThrow()

     

       33
       31
        
       

     

       34
       32
        
           const pages = Math.ceil(parseInt(totalLink.count.toString(), 10) / itemPerPages)

     

       35
       35
       -
       

     

       36
       36
       -
           const items = await Promise.all(links.map(async (link) => {

     

       37
       37
       -
             return {

     

       38
       38
       -
               ...link,

     

       39
       39
       -
               embed: await embed(link.embed)

     

       40
       40
       -
             }

     

       41
       41
       -
           }))

     

       42
       33
        
             

     

       43
       34
        
           const body = eta.render("./main", { 

     

       44
       44
       -
             items: items, 

     

       35
       35
       +
             items: links, 

     

       45
       36
        
             pages: Array.from(Array(pages).keys()),

     

       46
       46
       -
             selected: parseInt(params?.page || "0", 10),

     

       47
       47
       -
             embed: embed

     

       37
       37
       +
             selected: parseInt(params?.page || "0", 10)

     

       48
       38
        
           })

     

       49
       39
        
       

     

       50
       40
        
           res.writeHead(200, { 'Content-Type': 'text/html' })

     
···

       71
       61
        
       

     

       72
       62
        
           const body = eta.render("./feed", { 

     

       73
       63
        
             items: links, 

     

       74
       74
       -
             date,

     

       75
       75
       -
             embed: embed

     

       64
       64
       +
             date

     

       76
       65
        
           })

     

       77
       66
        
           res.writeHead(200, { 'Content-Type': 'application/atom+xml' })

     

       78
       67
        
           res.end(body)

+23 -18

src/views/link.eta

···

       1
       1
        
       <div class="item <% if (it.nsfw) { %>nsfw<% } %> <% if (it.big) { %>big<% } %>">

     

       2
       2
        
         <section>

     

       3
       3
       -
           <h2><a href="<%= it.link %>"><%= it.title  %></a></h2>

     

       3
       3
       +
           <h2><a href="<%= it.url %>"><%= it.title  %></a></h2>

     

       4
       4
        
           <% if (it.description) { %>

     

       5
       5
        
             <div class="description"><%~ it.description %></div>

     

       6
       6
        
           <% } %>

     

       7
       7
        
         </section>

     

       8
       8
        
         <% if (it.embed) { %>

     

       9
       9
       -
           <% if (it.embed.$type == "pet.mewsse.embed.image") { %>

     

       10
       10
       -
           <a class="aside" href="<%= it.link %>">

     

       11
       11
       -
             <img src="<%= it.embed.url %>" alt="<%= it.embed.alt || "" %>">

     

       12
       12
       -
           </a>

     

       13
       13
       -
           <% } %>

     

       9
       9
       +
           <div class="media">

     

       10
       10
       +
             <% if (it.embed.$type == "pet.mewsse.embed.image") { %>

     

       11
       11
       +
             <a class="aside" href="<%= it.url %>">

     

       12
       12
       +
               <img src="<%= it.embed.url %>" alt="<%= it.embed.alt || "" %>">

     

       13
       13
       +
             </a>

     

       14
       14
       +
             <% } %>

     

       14
       15
        
       

     

       15
       15
       -
           <% if (it.embed.$type == "pet.mewsse.embed.video") { %>

     

       16
       16
       -
             <video controls>

     

       17
       17
       -
               <source src="<%= it.embed.url %>">

     

       18
       18
       -
             </video>

     

       19
       19
       -
           <% } %>

     

       16
       16
       +
             <% if (it.embed.$type == "pet.mewsse.embed.video") { %>

     

       17
       17
       +
               <video controls>

     

       18
       18
       +
                 <source src="<%= it.embed.url %>">

     

       19
       19
       +
               </video>

     

       20
       20
       +
             <% } %>

     

       20
       21
        
       

     

       21
       21
       -
           <% if (it.embed.$type == "pet.mewsse.embed.post") { %>

     

       22
       22
       -
             <iframe frameborder="0" src="<%= it.embed.url %>"></iframe>

     

       23
       23
       -
           <% } %>

     

       24
       24
       -
       

     

       25
       25
       -
           <% if (it.embed.$type == "pet.mewsse.embed.external") {%>

     

       26
       26
       -
             <iframe frameborder="0" allowfullscreen src="<%= it.embed.url %>"></iframe>

     

       27
       27
       -
           <% } %>

     

       22
       22
       +
             <% if (it.embed.$type == "pet.mewsse.embed.post") { %>

     

       23
       23
       +
               <%~ it.embed.html %>

     

       24
       24
       +
             <% } %>

     

       28
       25
        
       

     

       26
       26
       +
             <% if (it.embed.$type == "pet.mewsse.embed.external") {%>

     

       27
       27
       +
               <% if (it.embed.html) { %>

     

       28
       28
       +
                 <%~ it.embed.html %>

     

       29
       29
       +
               <% } else { %>

     

       30
       30
       +
                 <img src="<%= it.embed.url %>">

     

       31
       31
       +
               <% } %>

     

       32
       32
       +
             <% } %>

     

       33
       33
       +
           </div>

     

       29
       34
        
         <% } %>

     

       30
       35
        
       </div>