merge: upstream

2024-02-06 21:23:37 +01:00 · 2024-02-06 21:23:37 +01:00 · 6a94a52131
commit 6a94a52131
parent 34b4646b9f
60 changed files with 741 additions and 190 deletions
--- a/packages/backend/src/models/json-schema/emoji.ts
+++ b/packages/backend/src/models/json-schema/emoji.ts
@ -27,6 +27,10 @@ export const packedEmojiSimpleSchema = {
 			type: 'string',
 			optional: false, nullable: false,
 		},
+		localOnly: {
+			type: 'boolean',
+			optional: true, nullable: false,
+		},
 		isSensitive: {
 			type: 'boolean',
 			optional: true, nullable: false,