merge upstream for 2024.2.1

2024-03-02 16:36:49 +00:00 · 2024-03-02 16:36:49 +00:00 · af548d05ca
commit af548d05ca
parent eab7d5bd27
137 changed files with 4524 additions and 2933 deletions
--- a/packages/backend/src/core/CustomEmojiService.ts
+++ b/packages/backend/src/core/CustomEmojiService.ts
@ -416,6 +416,11 @@ export class CustomEmojiService implements OnApplicationShutdown {
 		return this.emojisRepository.findOneBy({ id });
 	}

+	@bindThis
+	public getEmojiByName(name: string): Promise<MiEmoji | null> {
+		return this.emojisRepository.findOneBy({ name, host: IsNull() });
+	}
+
 	@bindThis
 	public dispose(): void {
 		this.cache.dispose();