Add rounded stickers and more tests

AlenVelocity · Feb 9, 2023 · 1927147 · 1927147
1 parent 1960701
commit 1927147
Show file tree

Hide file tree

Showing 7 changed files with 121 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -127,7 +127,9 @@ Sticker types are exported as an enum.
 enum StickerTypes {
     DEFAULT = 'default',
     CROPPED = 'crop',
-    FULL = 'full'
+    FULL = 'full',
+    CIRCLE = 'circle,
+    ROUNDED = 'rounded'
 }
 
 ```

diff --git a/examples/circle.ts b/examples/circle.ts
@@ -31,4 +31,16 @@ import { Sticker } from '../src'
         await sticker.toFile()
         console.log(`Saved to ${sticker.defaultFilename}`)
     })()
+    await (async () => {
+        console.log('Animated Potrait')
+        const sticker = new Sticker(images.animated.potrait, getOptions('animated', 'potrait'))
+        await sticker.toFile()
+        console.log(`Saved to ${sticker.defaultFilename}`)
+    })()
+    await (async () => {
+        console.log('Animated Landscape')
+        const sticker = new Sticker(images.animated.landscape, getOptions('animated', 'landscape'))
+        await sticker.toFile()
+        console.log(`Saved to ${sticker.defaultFilename}`)
+    })()
 })()
diff --git a/examples/index.ts b/examples/index.ts
@@ -6,4 +6,5 @@
     await import('./crop')
     await import('./full')
     await import('./circle')
+    await import('./rounded')
 })().catch(console.error)
diff --git a/examples/rounded.ts b/examples/rounded.ts
@@ -0,0 +1,46 @@
+import { Sticker } from '../src'
+;(async () => {
+    console.log('\n---\n')
+    console.log('Rounded example')
+    console.log('---\n')
+    const images = {
+        static: {
+            potrait: 'https://i.pinimg.com/originals/3a/53/d6/3a53d68345b56241a875595b21ec2a59.jpg',
+            landscape: 'https://chasinganime.com/wp-content/uploads/2021/02/0_YgtEypuJ2QfMPCbn.jpg'
+        },
+        animated: {
+            potrait: 'https://c.tenor.com/-1mtmQgH5eYAAAAC/watson-amelia-vtuber.gif',
+            landscape: 'https://c.tenor.com/2RdLoyV5VPsAAAAC/ayame-nakiri.gif'
+        }
+    }
+    const type = 'rounded'
+    const getOptions = (pack = '', author = '') => ({
+        pack,
+        type,
+        author: `${author}-${type}`
+    })
+    await (async () => {
+        console.log('Static Potrait')
+        const sticker = new Sticker(images.static.potrait, getOptions('static', 'potrait'))
+        await sticker.toFile()
+        console.log(`Saved to ${sticker.defaultFilename}`)
+    })()
+    await (async () => {
+        console.log('Static Landscape')
+        const sticker = new Sticker(images.static.landscape, getOptions('static', 'landscape'))
+        await sticker.toFile()
+        console.log(`Saved to ${sticker.defaultFilename}`)
+    })()
+    await (async () => {
+        console.log('Animated Potrait')
+        const sticker = new Sticker(images.animated.potrait, getOptions('animated', 'potrait'))
+        await sticker.toFile()
+        console.log(`Saved to ${sticker.defaultFilename}`)
+    })()
+    await (async () => {
+        console.log('Animated Landscape')
+        const sticker = new Sticker(images.animated.landscape, getOptions('animated', 'landscape'))
+        await sticker.toFile()
+        console.log(`Saved to ${sticker.defaultFilename}`)
+    })()
+})()
diff --git a/src/internal/Metadata/StickerTypes.ts b/src/internal/Metadata/StickerTypes.ts
@@ -2,5 +2,6 @@ export enum StickerTypes {
     DEFAULT = 'default',
     CROPPED = 'crop',
     FULL = 'full',
-    CIRCLE = 'circle'
+    CIRCLE = 'circle',
+    ROUNDED = 'rounded'
 }
diff --git a/src/internal/convert.ts b/src/internal/convert.ts
@@ -16,12 +16,16 @@ const convert = async (
     let image = isVideo ? await videoToGif(data) : data
     const isAnimated = isVideo || mime.includes('gif')
 
-    if (isAnimated && ['crop', 'circle'].includes(type)) {
+    if (isAnimated && ['crop', 'circle', 'rouded'].includes(type)) {
         const filename = `${tmpdir()}/${Math.random().toString(36)}.webp`
         await writeFile(filename, image)
         ;[image, type] = [
             await crop(filename),
-            type === StickerTypes.CIRCLE ? StickerTypes.CIRCLE : StickerTypes.DEFAULT
+            type === StickerTypes.CIRCLE
+                ? StickerTypes.CIRCLE
+                : type === StickerTypes.ROUNDED
+                ? StickerTypes.ROUNDED
+                : StickerTypes.DEFAULT
         ]
     }
 
@@ -53,6 +57,19 @@ const convert = async (
                 }
             ])
             break
+
+        case StickerTypes.ROUNDED:
+            img.resize(512, 512, {
+                fit: fit.cover
+            }).composite([
+                {
+                    input: Buffer.from(`<svg><rect rx="50" ry="50" width="512" height="512" fill="${background}"/></svg>`),
+                    blend: 'dest-in',
+                    gravity: 'northeast',
+                    tile: true
+                }
+            ])
+            break
     }
 
     return await img

diff --git a/tests/Sticker.test.ts b/tests/Sticker.test.ts
@@ -41,6 +41,24 @@ describe('Sticker', () => {
             const { height, width } = sizeOf(buffer)
             assert.equal(height, width)
         })
+
+        it('should create a circle sticker same height and width', async () => {
+            const sticker = new Sticker(images.static.landscape, {
+                type: StickerTypes.CIRCLE
+            })
+            const buffer = await sticker.build()
+            const { height, width } = sizeOf(buffer)
+            assert.equal(height, width)
+        })
+
+        it('should create a rounded sticker same height and width', async () => {
+            const sticker = new Sticker(images.static.landscape, {
+                type: StickerTypes.ROUNDED
+            })
+            const buffer = await sticker.build()
+            const { height, width } = sizeOf(buffer)
+            assert.equal(height, width)
+        })
     })
 
     describe('Animated Stickers', () => {
@@ -60,6 +78,26 @@ describe('Sticker', () => {
             assert.equal(width, 512)
         })
 
+        it('should create an animated circle sticker with size 512x512', async () => {
+            const sticker = new Sticker(images.animated.potrait, {
+                type: StickerTypes.CIRCLE
+            })
+            const buffer = await sticker.build()
+            const { height, width } = sizeOf(buffer)
+            assert.equal(height, 512)
+            assert.equal(width, 512)
+        })
+
+        it('should create an animated rounded sticker with size 512x512', async () => {
+            const sticker = new Sticker(images.animated.potrait, {
+                type: StickerTypes.ROUNDED
+            })
+            const buffer = await sticker.build()
+            const { height, width } = sizeOf(buffer)
+            assert.equal(height, 512)
+            assert.equal(width, 512)
+        })
+
         it('should create an animated sticker same height and width', async () => {
             const sticker = new Sticker(images.animated.potrait, {
                 type: StickerTypes.FULL