mirror of
				https://codeberg.org/yeentown/barkey.git
				synced 2025-11-04 07:24:13 +00:00 
			
		
		
		
	merge: Fix: Finding emoji that include capital letters (!676)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/676 Closes #522 Approved-by: Marie <github@yuugi.dev> Approved-by: dakkar <dakkar@thenautilus.net>
This commit is contained in:
		
						commit
						fefdd1c1e8
					
				
					 1 changed files with 7 additions and 7 deletions
				
			
		| 
						 | 
				
			
			@ -233,7 +233,7 @@ watch(q, () => {
 | 
			
		|||
 | 
			
		||||
			// 名前にキーワードが含まれている
 | 
			
		||||
			for (const emoji of emojis) {
 | 
			
		||||
				if (keywords.every(keyword => emoji.name.includes(keyword))) {
 | 
			
		||||
				if (keywords.every(keyword => emoji.name.toLowerCase().includes(keyword))) {
 | 
			
		||||
					matches.add(emoji);
 | 
			
		||||
					if (matches.size >= max) break;
 | 
			
		||||
				}
 | 
			
		||||
| 
						 | 
				
			
			@ -242,7 +242,7 @@ watch(q, () => {
 | 
			
		|||
 | 
			
		||||
			// 名前またはエイリアスにキーワードが含まれている
 | 
			
		||||
			for (const emoji of emojis) {
 | 
			
		||||
				if (keywords.every(keyword => emoji.name.includes(keyword) || emoji.aliases.some(alias => alias.includes(keyword)))) {
 | 
			
		||||
				if (keywords.every(keyword => emoji.name.toLowerCase().includes(keyword) || emoji.aliases.some(alias => alias.toLowerCase().includes(keyword)))) {
 | 
			
		||||
					matches.add(emoji);
 | 
			
		||||
					if (matches.size >= max) break;
 | 
			
		||||
				}
 | 
			
		||||
| 
						 | 
				
			
			@ -254,7 +254,7 @@ watch(q, () => {
 | 
			
		|||
			if (matches.size >= max) return matches;
 | 
			
		||||
 | 
			
		||||
			for (const emoji of emojis) {
 | 
			
		||||
				if (emoji.aliases.some(alias => alias === newQ)) {
 | 
			
		||||
				if (emoji.aliases.some(alias => alias.toLowerCase() === newQ)) {
 | 
			
		||||
					matches.add(emoji);
 | 
			
		||||
					if (matches.size >= max) break;
 | 
			
		||||
				}
 | 
			
		||||
| 
						 | 
				
			
			@ -262,7 +262,7 @@ watch(q, () => {
 | 
			
		|||
			if (matches.size >= max) return matches;
 | 
			
		||||
 | 
			
		||||
			for (const emoji of emojis) {
 | 
			
		||||
				if (emoji.name.startsWith(newQ)) {
 | 
			
		||||
				if (emoji.name.toLowerCase().startsWith(newQ)) {
 | 
			
		||||
					matches.add(emoji);
 | 
			
		||||
					if (matches.size >= max) break;
 | 
			
		||||
				}
 | 
			
		||||
| 
						 | 
				
			
			@ -270,7 +270,7 @@ watch(q, () => {
 | 
			
		|||
			if (matches.size >= max) return matches;
 | 
			
		||||
 | 
			
		||||
			for (const emoji of emojis) {
 | 
			
		||||
				if (emoji.aliases.some(alias => alias.startsWith(newQ))) {
 | 
			
		||||
				if (emoji.aliases.some(alias => alias.toLowerCase().startsWith(newQ))) {
 | 
			
		||||
					matches.add(emoji);
 | 
			
		||||
					if (matches.size >= max) break;
 | 
			
		||||
				}
 | 
			
		||||
| 
						 | 
				
			
			@ -278,7 +278,7 @@ watch(q, () => {
 | 
			
		|||
			if (matches.size >= max) return matches;
 | 
			
		||||
 | 
			
		||||
			for (const emoji of emojis) {
 | 
			
		||||
				if (emoji.name.includes(newQ)) {
 | 
			
		||||
				if (emoji.name.toLowerCase().includes(newQ)) {
 | 
			
		||||
					matches.add(emoji);
 | 
			
		||||
					if (matches.size >= max) break;
 | 
			
		||||
				}
 | 
			
		||||
| 
						 | 
				
			
			@ -286,7 +286,7 @@ watch(q, () => {
 | 
			
		|||
			if (matches.size >= max) return matches;
 | 
			
		||||
 | 
			
		||||
			for (const emoji of emojis) {
 | 
			
		||||
				if (emoji.aliases.some(alias => alias.includes(newQ))) {
 | 
			
		||||
				if (emoji.aliases.some(alias => alias.toLowerCase().includes(newQ))) {
 | 
			
		||||
					matches.add(emoji);
 | 
			
		||||
					if (matches.size >= max) break;
 | 
			
		||||
				}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue