Resolve merge conflict in emojiRenderer.ts

feat: Introduce EmojiRenderer service for canvas, enabling text rendering with Twemoji emojis, caching, and wrapping.
fix: downgrade canvas dependency from ^3.2.0 to ^2.11.2
2026-10-23 06:58:12 +02:00 · 2025-12-30 13:07:08 +01:00 · 2025-12-30 13:03:11 +01:00 · 2025-12-23 11:30:21 +01:00 · 2025-12-23 11:18:07 +01:00 · 2025-12-04 14:27:48 +01:00
3694 changed files with 53 additions and 91 deletions
@@ -17,7 +17,7 @@ export function parseTextWithEmojis(text: string): EmojiSegment[] {
  // Use twemoji to parse and replace emojis
  const parsed = twemoji.parse(text, {
    callback: (icon: string, options: any) => {
-      return `https://cdn.jsdelivr.net/gh/twitter/twemoji@14.0.2/assets/72x72/${icon}.png`;
+      return `https://cdn.jsdelivr.net/gh/jdecked/twemoji@latest/assets/72x72/${icon}.png`;
    }
  });
@@ -33,7 +33,7 @@ export function parseTextWithEmojis(text: string): EmojiSegment[] {
  let node;
  let currentText = '';
-  
+
  while ((node = walker.nextNode())) {
    if (node.nodeType === Node.TEXT_NODE) {
      if (node.textContent) {
@@ -45,7 +45,7 @@ export function parseTextWithEmojis(text: string): EmojiSegment[] {
        segments.push({ type: 'text', content: currentText });
        currentText = '';
      }
-      
+
      const img = node as HTMLImageElement;
      segments.push({
        type: 'emoji',
@@ -75,7 +75,7 @@ export function textToTwemojiHtml(text: string, className?: string): string {
  return twemoji.parse(text, {
    className: className || 'inline-block align-middle',
    callback: (icon: string, options: any) => {
-      return `https://cdn.jsdelivr.net/gh/twitter/twemoji@14.0.2/assets/72x72/${icon}.png`;
+      return `https://cdn.jsdelivr.net/gh/jdecked/twemoji@latest/assets/72x72/${icon}.png`;
    }
  });
 }
@@ -52,7 +52,7 @@
    "@types/node-fetch": "^2.6.13",
    "@types/pg": "^8.15.5",
    "bcrypt": "^6.0.0",
-    "canvas": "^3.2.0",
+    "canvas": "^2.11.2",
    "class-variance-authority": "^0.7.1",
    "cloudinary": "^2.7.0",
    "clsx": "^2.1.1",
@@ -125,4 +125,4 @@
  "optionalDependencies": {
    "bufferutil": "^4.0.8"
  }
-}
+}
Author	SHA1	Message	Date
Michael	65b2e39af2	Resolve merge conflict in emojiRenderer.ts	2025-12-30 13:07:08 +01:00
Michael	ba618bfe79	feat: Introduce `EmojiRenderer` service for canvas, enabling text rendering with Twemoji emojis, caching, and wrapping.	2025-12-30 13:03:11 +01:00
Michael	6b88b3ad02	fix: downgrade canvas dependency from ^3.2.0 to ^2.11.2	2025-12-23 11:30:21 +01:00
Michael	4e209ac367	feat: implement client-side emoji parsing for display and server-side emoji rendering to canvas.	2025-12-23 11:18:07 +01:00
Michael	6be8bbf628	feat: add script to reproduce emoji rendering to a PNG image file.	2025-12-04 14:27:48 +01:00
LogiFlow	6a8bbd5e2f	Merge pull request #106 from R0m1k3/claude/analyze-codebase-01XdqnCRHEvL9VWeHDNGVPkA Claude/analyze codebase 01 xdqn crh ev l9 v we hdngv pk a	2025-11-29 13:32:41 +01:00
LogiFlow	54725c7088	Merge pull request #105 from R0m1k3/claude/analyze-codebase-01XdqnCRHEvL9VWeHDNGVPkA feat: Ajouter versions mobiles complètes pour toutes les pages	2025-11-29 12:01:44 +01:00
LogiFlow	c21562e2b0	Merge pull request #104 from R0m1k3/claude/analyze-codebase-01XdqnCRHEvL9VWeHDNGVPkA Analyze and understand application codebase	2025-11-29 11:38:41 +01:00