Merge pull request #390 from dfpc-coe/icons

Alt Icons
dfpc-coe · Oct 17, 2024 · 5f8815b · 5f8815b
2 parents 36fa91f + 07bb1e4
commit 5f8815b
Show file tree

Hide file tree

Showing 14 changed files with 2,522 additions and 437 deletions.
diff --git a/api/lib/models/Icon.ts b/api/lib/models/Icon.ts
@@ -11,6 +11,7 @@ export type Icon = {
     iconset: string;
     type2525b: string;
     data: string;
+    data_alt: string;
     path: string;
     username: string;
 }
@@ -40,6 +41,7 @@ export default class IconModel extends Modeler<typeof pgschema.Icon> {
             iconset: pgschema.Icon.iconset,
             type2525b: pgschema.Icon.type2525b,
             data: pgschema.Icon.data,
+            data_alt: pgschema.Icon.data_alt,
             path: pgschema.Icon.path,
             username: pgschema.Iconset.username
         }).from(this.generic)

diff --git a/api/lib/schema.ts b/api/lib/schema.ts
diff --git a/api/lib/sprites.ts b/api/lib/sprites.ts
@@ -1,25 +1,33 @@
 import spritesmith from 'spritesmith';
 import Vinyl from 'vinyl';
 import { promisify } from 'node:util'
-import type { Icon } from './schema.js';
-import { type InferSelectModel } from 'drizzle-orm';
+import { Static } from '@sinclair/typebox';
+import { IconResponse } from './types.js';
+import Sharp from 'sharp';
 
 const SpriteSmith = promisify(spritesmith.run);
 
 type SpriteConfig = {
     name?: string;
+    useDataAlt?: boolean;
 };
 
-export default async function(icons: Array<InferSelectModel<typeof Icon>>, config: SpriteConfig = {}) {
-    const doc = await SpriteSmith({
-        src: icons.map((icon) => {
-            return new Vinyl({
-                // @ts-expect-error Deal with indexing issue on icon
-                path: config.name ? icon[config.name] + '.png' : icon.path.replace(/.*?\//, ''),
-                contents: Buffer.from(icon.data, 'base64'),
-            })
-        })
-    });
+export default async function(icons: Array<Static<typeof IconResponse>>, config: SpriteConfig = {}) {
+    const src = [];
+    for (const icon of icons) {
+        const contents = await Sharp(Buffer.from(config.useDataAlt && icon.data_alt ? icon.data_alt : icon.data, 'base64'))
+            .resize(32)
+            .png()
+            .toBuffer();
+
+        src.push(new Vinyl({
+            // @ts-expect-error Deal with indexing issue on icon
+            path: config.name ? icon[config.name] + '.png' : icon.path.replace(/.*?\//, ''),
+                contents
+        }))
+    }
+
+    const doc = await SpriteSmith({ src });
 
     const coords: Record<string, any> = {};
     for (const key in doc.coordinates) {

diff --git a/api/migrations/0067_strange_lifeguard.sql b/api/migrations/0067_strange_lifeguard.sql
@@ -0,0 +1,6 @@
+UPDATE settings
+    SET value = Replace(value, '"', '')
+    WHERE Starts_With(key, 'group:');
+
+ALTER TABLE icons
+    ADD COLUMN data_alt TEXT;