From b89c45c606bf9aabbc771be666c19ddb87809833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Thu, 25 Jul 2024 22:00:21 +0200
Subject: [PATCH 1/2] Fix PinnedHostsPicker overflow
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 src/features/remote-timeline/components/pinned-hosts-picker.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/features/remote-timeline/components/pinned-hosts-picker.tsx b/src/features/remote-timeline/components/pinned-hosts-picker.tsx
index 0dbb5b5f71..e055ea978d 100644
--- a/src/features/remote-timeline/components/pinned-hosts-picker.tsx
+++ b/src/features/remote-timeline/components/pinned-hosts-picker.tsx
@@ -15,7 +15,7 @@ const PinnedHostsPicker: React.FC<IPinnedHostsPicker> = ({ host: activeHost }) =
   if (!pinnedHosts.length) return null;
 
   return (
-    <HStack className='mb-4' space={2}>
+    <HStack className='mb-4 black:mx-2' space={2}>
       {pinnedHosts.map((host) => (
         <Button
           key={host}

From 50c6a341343d11fca273f3acf2b9be18fe455bcd Mon Sep 17 00:00:00 2001
From: animegrafmays <animegrafmays>
Date: Sat, 20 Jul 2024 11:57:34 -0400
Subject: [PATCH 2/2] finally once and for all no foolin fix the flag reactions
 that have been broken for over five months

---
 src/schemas/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/schemas/utils.ts b/src/schemas/utils.ts
index 8d16a23495..dee902170b 100644
--- a/src/schemas/utils.ts
+++ b/src/schemas/utils.ts
@@ -19,7 +19,7 @@ const filteredArray = <T extends z.ZodTypeAny>(schema: T) =>
     ));
 
 /** Validates the string as an emoji. */
-const emojiSchema = z.string().refine((v) => /\p{Extended_Pictographic}/u.test(v));
+const emojiSchema = z.string().refine((v) => /\p{Extended_Pictographic}|[\u{1F1E6}-\u{1F1FF}]{2}/u.test(v));
 
 /** Map a list of CustomEmoji to their shortcodes. */
 const makeCustomEmojiMap = (customEmojis: CustomEmoji[]) =>