merge upstream for 2024.2.1

2024-03-02 16:36:49 +00:00
parent eab7d5bd27
commit af548d05ca
137 changed files with 4524 additions and 2933 deletions
@@ -135,7 +135,7 @@ async function addRole() {
 	const { canceled, result: role } = await os.select({
 		items: roles.filter(r => r.isPublic).filter(r => !currentRoleIds.includes(r.id)).map(r => ({ text: r.name, value: r })),
 	});
-	if (canceled) return;
+	if (canceled || role == null) return;

 	rolesThatCanBeUsedThisEmojiAsReaction.value.push(role);
 }