From 27f831dce92e3c462f48994d849b7baebf12c7f5 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 5 Jun 2023 12:19:59 -0400
Subject: [PATCH 1/4] Improve emoji search

---
 app/soapbox/features/emoji/search.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/emoji/search.ts b/app/soapbox/features/emoji/search.ts
index dbcb29756..2330d17f0 100644
--- a/app/soapbox/features/emoji/search.ts
+++ b/app/soapbox/features/emoji/search.ts
@@ -12,7 +12,7 @@ const index = new Index({
 });
 
 for (const [key, emoji] of Object.entries(data.emojis)) {
-  index.add('n' + key, emoji.name);
+  index.add('n' + key, `${emoji.keywords.join(' ')} ${emoji.name}`);
 }
 
 export interface searchOptions {

From 1fed96e99e0fdc37e4fdd443057bef81408430d4 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 5 Jun 2023 12:39:32 -0400
Subject: [PATCH 2/4] Sort the emojis

---
 app/soapbox/features/emoji/search.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/emoji/search.ts b/app/soapbox/features/emoji/search.ts
index 2330d17f0..c4953eda9 100644
--- a/app/soapbox/features/emoji/search.ts
+++ b/app/soapbox/features/emoji/search.ts
@@ -11,8 +11,10 @@ const index = new Index({
   context: true,
 });
 
-for (const [key, emoji] of Object.entries(data.emojis)) {
-  index.add('n' + key, `${emoji.keywords.join(' ')} ${emoji.name}`);
+// console.log(Object.entries(data.emojis));
+const sortedEmojis = Object.entries(data.emojis).sort((a, b) => a[0].localeCompare(b[0]));
+for (const [key, emoji] of sortedEmojis) {
+  index.add('n' + key, `${emoji.id} ${emoji.name} ${emoji.keywords.join(' ')}`);
 }
 
 export interface searchOptions {

From 476ae0a68d49b605d2b422599691e69de9053fc7 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 5 Jun 2023 13:17:48 -0400
Subject: [PATCH 3/4] Fix emoji search test

---
 .../emoji/__tests__/emoji-index.test.ts       | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/app/soapbox/features/emoji/__tests__/emoji-index.test.ts b/app/soapbox/features/emoji/__tests__/emoji-index.test.ts
index 59e2e9bef..925e2627a 100644
--- a/app/soapbox/features/emoji/__tests__/emoji-index.test.ts
+++ b/app/soapbox/features/emoji/__tests__/emoji-index.test.ts
@@ -19,22 +19,12 @@ describe('emoji_index', () => {
 
   it('orders search results correctly', () => {
     const expected = [
-      {
-        id: 'pineapple',
-        unified: '1f34d',
-        native: '🍍',
-      },
-      {
-        id: 'apple',
-        unified: '1f34e',
-        native: '🍎',
-      },
-      {
-        id: 'green_apple',
-        unified: '1f34f',
-        native: '🍏',
-      },
+      { id: 'apple', unified: '1f34e', native: '🍎' },
+      { id: 'pineapple', unified: '1f34d', native: '🍍' },
+      { id: 'green_apple', unified: '1f34f', native: '🍏' },
+      { id: 'iphone', unified: '1f4f1', native: '📱' },
     ];
+
     expect(search('apple').map(trimEmojis)).toEqual(expected);
   });
 

From c5ec7556617045faaedc4fef2c0ef12f4275f385 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Mon, 5 Jun 2023 14:21:04 -0400
Subject: [PATCH 4/4] Remove log

---
 app/soapbox/features/emoji/search.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/soapbox/features/emoji/search.ts b/app/soapbox/features/emoji/search.ts
index c4953eda9..363af2106 100644
--- a/app/soapbox/features/emoji/search.ts
+++ b/app/soapbox/features/emoji/search.ts
@@ -11,7 +11,6 @@ const index = new Index({
   context: true,
 });
 
-// console.log(Object.entries(data.emojis));
 const sortedEmojis = Object.entries(data.emojis).sort((a, b) => a[0].localeCompare(b[0]));
 for (const [key, emoji] of sortedEmojis) {
   index.add('n' + key, `${emoji.id} ${emoji.name} ${emoji.keywords.join(' ')}`);