diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-08-01 13:27:18 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-01 13:27:18 -0400 |
commit | 0cc5854b64756010c1d3e85a2021bf7a7010e63b (patch) | |
tree | 71767f7caa892e5fe299624eae84b0c25c2aac79 /webapp/make-emojis | |
parent | 1026b7d84c9560802c7e5bcaded90a4748951bd5 (diff) | |
download | chat-0cc5854b64756010c1d3e85a2021bf7a7010e63b.tar.gz chat-0cc5854b64756010c1d3e85a2021bf7a7010e63b.tar.bz2 chat-0cc5854b64756010c1d3e85a2021bf7a7010e63b.zip |
Fixed error thrown when viewing a channel containing an invalid emoji reaction (#7080)
* Added better error handling for when reacting with a non-existant emoji
* Re-added emoji aliases ca, za, and pk
Diffstat (limited to 'webapp/make-emojis')
-rwxr-xr-x | webapp/make-emojis | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/webapp/make-emojis b/webapp/make-emojis index 8a6bce47f..2de199b54 100755 --- a/webapp/make-emojis +++ b/webapp/make-emojis @@ -24,6 +24,19 @@ Dir.mkdir emoji_path Emoji.create('mattermost') FileUtils.cp(File.join(File.dirname(__FILE__), 'images', 'icon64x64.png'), File.join(emoji_path, 'mattermost.png')) +custom_aliases = { + "ca" => "canada", + "pk" => "pakistan", + "za" => "south_africa" +} +custom_aliases.each do |custom, original| + emoji = Emoji.find_by_alias original + + Emoji.edit_emoji(emoji) do |char| + char.add_alias custom + end +end + blacklist = ['basecamp', 'basecampy'] categories = [] |