diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-03-31 13:25:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-31 13:25:15 +0200 |
| commit | b7ec2a900251410c65ba214b50c1657209285b07 (patch) | |
| tree | 8b75038d0c2d6a6bc4f8b38de6a13ddc9bedbff0 /lib | |
| parent | a2a85d5ae03282c6f9cbf452b9b8f7d948a9f380 (diff) | |
| parent | 15efa32cca5c2d7dfc32b101a38081add1b3af40 (diff) | |
Merge pull request #1517 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mastodon/emoji_cli.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mastodon/emoji_cli.rb b/lib/mastodon/emoji_cli.rb index 0a1f538e6..5bee70ea5 100644 --- a/lib/mastodon/emoji_cli.rb +++ b/lib/mastodon/emoji_cli.rb @@ -49,7 +49,7 @@ module Mastodon next if filename.start_with?('._') shortcode = [options[:prefix], filename, options[:suffix]].compact.join - custom_emoji = CustomEmoji.local.find_by(shortcode: shortcode) + custom_emoji = CustomEmoji.local.find_by("LOWER(shortcode) = ?", shortcode.downcase) if custom_emoji && !options[:overwrite] skipped += 1 |