diff --git a/app/javascript/mastodon/features/emoji/emoji.js b/app/javascript/mastodon/features/emoji/emoji.js
index f7d3cfd08ad582ab50ab7624a29ef610380369be..5237b25f0592bccee6ce7a1f46861db45af286f5 100644
--- a/app/javascript/mastodon/features/emoji/emoji.js
+++ b/app/javascript/mastodon/features/emoji/emoji.js
@@ -12,7 +12,7 @@ const emojiFilenames = (emojis) => {
};
// Emoji requiring extra borders depending on theme
-const darkEmoji = emojiFilenames(['🎱', 'ðŸœ', 'âš«', '🖤', '⬛', 'â—¼ï¸', 'â—¾', 'â—¼ï¸', '✒ï¸', 'â–ªï¸', '💣', '🎳', '📷', '📸', '♣ï¸', '🕶ï¸', '✴ï¸', '🔌', '💂â€â™€ï¸', '📽ï¸', 'ðŸ³', 'ðŸ¦', '💂', '🔪', '🕳ï¸', '🕹ï¸', '🕋', '🖊ï¸', '🖋ï¸', '💂â€â™‚ï¸', '🎤', '🎓', '🎥', '🎼', 'â™ ï¸', '🎩', '🦃', '📼', '📹', '🎮', 'ðŸƒ', 'ðŸ´']);
+const darkEmoji = emojiFilenames(['🎱', 'ðŸœ', 'âš«', '🖤', '⬛', 'â—¼ï¸', 'â—¾', 'â—¼ï¸', '✒ï¸', 'â–ªï¸', '💣', '🎳', '📷', '📸', '♣ï¸', '🕶ï¸', '✴ï¸', '🔌', '💂â€â™€ï¸', '📽ï¸', 'ðŸ³', 'ðŸ¦', '💂', '🔪', '🕳ï¸', '🕹ï¸', '🕋', '🖊ï¸', '🖋ï¸', '💂â€â™‚ï¸', '🎤', '🎓', '🎥', '🎼', 'â™ ï¸', '🎩', '🦃', '📼', '📹', '🎮', 'ðŸƒ', 'ðŸ´', 'ðŸž']);
const lightEmoji = emojiFilenames(['👽', 'âš¾', 'ðŸ”', 'â˜ï¸', '💨', '🕊ï¸', '👀', 'ðŸ¥', '👻', 'ðŸ', 'â•', 'â”', '⛸ï¸', '🌩ï¸', '🔊', '🔇', '📃', '🌧ï¸', 'ðŸ', 'ðŸš', 'ðŸ™', 'ðŸ“', 'ðŸ‘', '💀', '☠ï¸', '🌨ï¸', '🔉', '🔈', '💬', 'ðŸ’', 'ðŸ', 'ðŸ³ï¸', '⚪', '⬜', 'â—½', 'â—»ï¸', 'â–«ï¸']);
const emojiFilename = (filename) => {
diff --git a/lib/tasks/emojis.rake b/lib/tasks/emojis.rake
index 0e7921ffc994b641242f015dc658a2c03cc6b2ac..2ac8bc059951cbfe6de6db860041b5492e58125b 100644
--- a/lib/tasks/emojis.rake
+++ b/lib/tasks/emojis.rake
@@ -91,7 +91,7 @@ namespace :emojis do
desc 'Generate emoji variants with white borders'
task :generate_borders do
src = Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json')
- emojis = '🎱ðŸœâš«ðŸ–¤â¬›â—¼ï¸â—¾â—¼ï¸âœ’ï¸â–ªï¸ðŸ’£ðŸŽ³ðŸ“·ðŸ“¸â™£ï¸ðŸ•¶ï¸âœ´ï¸ðŸ”ŒðŸ’‚â€â™€ï¸ðŸ“½ï¸ðŸ³ðŸ¦ðŸ’‚🔪🕳ï¸ðŸ•¹ï¸ðŸ•‹ðŸ–Šï¸ðŸ–‹ï¸ðŸ’‚â€â™‚ï¸ðŸŽ¤ðŸŽ“🎥🎼♠ï¸ðŸŽ©ðŸ¦ƒðŸ“¼ðŸ“¹ðŸŽ®ðŸƒðŸ´ðŸ‘½âš¾ðŸ”â˜ï¸ðŸ’¨ðŸ•Šï¸ðŸ‘€ðŸ¥ðŸ‘»ðŸâ•â”⛸ï¸ðŸŒ©ï¸ðŸ”ŠðŸ”‡ðŸ“ƒðŸŒ§ï¸ðŸðŸšðŸ™ðŸ“ðŸ‘💀☠ï¸ðŸŒ¨ï¸ðŸ”‰ðŸ”ˆðŸ’¬ðŸ’ðŸðŸ³ï¸âšªâ¬œâ—½â—»ï¸â–«ï¸'
+ emojis = '🎱ðŸœâš«ðŸ–¤â¬›â—¼ï¸â—¾â—¼ï¸âœ’ï¸â–ªï¸ðŸ’£ðŸŽ³ðŸ“·ðŸ“¸â™£ï¸ðŸ•¶ï¸âœ´ï¸ðŸ”ŒðŸ’‚â€â™€ï¸ðŸ“½ï¸ðŸ³ðŸ¦ðŸ’‚🔪🕳ï¸ðŸ•¹ï¸ðŸ•‹ðŸ–Šï¸ðŸ–‹ï¸ðŸ’‚â€â™‚ï¸ðŸŽ¤ðŸŽ“🎥🎼♠ï¸ðŸŽ©ðŸ¦ƒðŸ“¼ðŸ“¹ðŸŽ®ðŸƒðŸ´ðŸžðŸ‘½âš¾ðŸ”â˜ï¸ðŸ’¨ðŸ•Šï¸ðŸ‘€ðŸ¥ðŸ‘»ðŸâ•â”⛸ï¸ðŸŒ©ï¸ðŸ”ŠðŸ”‡ðŸ“ƒðŸŒ§ï¸ðŸðŸšðŸ™ðŸ“ðŸ‘💀☠ï¸ðŸŒ¨ï¸ðŸ”‰ðŸ”ˆðŸ’¬ðŸ’ðŸðŸ³ï¸âšªâ¬œâ—½â—»ï¸â–«ï¸'
map = Oj.load(File.read(src))
diff --git a/public/emoji/1f41e_border.svg b/public/emoji/1f41e_border.svg
new file mode 100644
index 0000000000000000000000000000000000000000..5d4b1e3d7b35c29eeacf0b6e086912d7ed7a3156
--- /dev/null
+++ b/public/emoji/1f41e_border.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
+ <g>
+ <path d="M35 21H1c-.552 0-1-.447-1-1s.448-1 1-1h34c.553 0 1 .447 1 1s-.447 1-1 1zm-22.177-2l-.069-.002c-.092-.007-9.214-.714-10.734-8.235-.109-.542.241-1.069.782-1.178.543-.113 1.069.241 1.178.782 1.221 6.044 8.833 6.631 8.91 6.636.551.038.967.515.93 1.066-.036.527-.476.931-.997.931zM3 31c-.142 0-.286-.03-.423-.094-.5-.234-.716-.829-.482-1.33 3.166-6.77 11.038-7.721 11.372-7.758.548-.056 1.042.334 1.103.882.062.548-.332 1.043-.88 1.106-.071.008-7.099.876-9.783 6.617-.171.364-.532.577-.907.577zm19.753-12c-.522 0-.961-.405-.996-.934-.036-.551.381-1.027.931-1.064.081-.005 8.116-.617 9.332-6.636.108-.541.633-.895 1.179-.782.541.109.892.637.782 1.178-1.521 7.525-10.769 8.21-11.162 8.235l-.066.003zm10.248 12c-.377 0-.737-.213-.907-.576-2.694-5.763-10.124-6.609-10.198-6.617-.55-.058-.948-.55-.89-1.099.058-.55.555-.952 1.099-.89.352.037 8.634.983 11.802 7.758.233.501.018 1.096-.482 1.33-.139.064-.282.094-.424.094z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+ <path d="M24.989 7.766c-.069-2.626-1.277-4.216-3.095-5.04C21.961 2.5 22 2.257 22 2c0-1.105-.672-2-1.5-2S19 .895 19 2c0 .015.003.028.003.043C18.675 2.017 18.342 2 18 2s-.675.017-1.003.043c0-.015.003-.028.003-.043 0-1.105-.671-2-1.5-2S14 .895 14 2c0 .257.04.5.106.726-1.817.824-3.025 2.414-3.095 5.04C7.98 9.551 6 12.662 6 17c0 7.159 5.373 16.923 12 16.923 6.628 0 12-9.764 12-16.923 0-4.338-1.98-7.45-5.011-9.234z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+ <path d="M16.001 34.959C9.564 34.364 4.5 28.064 4.5 20.378 4.5 12.693 9.564 9.597 16 9c.33-.03 1-.046 1 2.294v22.541c0 1.171-.669 1.156-.999 1.124zm3.998 0c6.436-.595 11.501-6.895 11.501-14.581C31.5 12.693 26.435 9.597 20 9c-.33-.03-1-.046-1 2.294v22.541c0 1.171.67 1.156.999 1.124z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+ <g stroke="white" stroke-linejoin="round" stroke-width="4px">
+ <circle cx="13" cy="15" r="2"/>
+ <circle cx="10" cy="22" r="3"/>
+ <circle cx="13" cy="29" r="2"/>
+ <circle cx="24.5" cy="14.5" r="2.5"/>
+ <circle cx="22.5" cy="20.5" r="1.5"/>
+ <circle cx="28" cy="23" r="2"/>
+ <circle cx="24" cy="29" r="3"/>
+ </g>
+ </g>
+ <path d="M35 21H1c-.552 0-1-.447-1-1s.448-1 1-1h34c.553 0 1 .447 1 1s-.447 1-1 1zm-22.177-2l-.069-.002c-.092-.007-9.214-.714-10.734-8.235-.109-.542.241-1.069.782-1.178.543-.113 1.069.241 1.178.782 1.221 6.044 8.833 6.631 8.91 6.636.551.038.967.515.93 1.066-.036.527-.476.931-.997.931zM3 31c-.142 0-.286-.03-.423-.094-.5-.234-.716-.829-.482-1.33 3.166-6.77 11.038-7.721 11.372-7.758.548-.056 1.042.334 1.103.882.062.548-.332 1.043-.88 1.106-.071.008-7.099.876-9.783 6.617-.171.364-.532.577-.907.577zm19.753-12c-.522 0-.961-.405-.996-.934-.036-.551.381-1.027.931-1.064.081-.005 8.116-.617 9.332-6.636.108-.541.633-.895 1.179-.782.541.109.892.637.782 1.178-1.521 7.525-10.769 8.21-11.162 8.235l-.066.003zm10.248 12c-.377 0-.737-.213-.907-.576-2.694-5.763-10.124-6.609-10.198-6.617-.55-.058-.948-.55-.89-1.099.058-.55.555-.952 1.099-.89.352.037 8.634.983 11.802 7.758.233.501.018 1.096-.482 1.33-.139.064-.282.094-.424.094z" fill="#31373D"/>
+ <path fill="#31373D" d="M24.989 7.766c-.069-2.626-1.277-4.216-3.095-5.04C21.961 2.5 22 2.257 22 2c0-1.105-.672-2-1.5-2S19 .895 19 2c0 .015.003.028.003.043C18.675 2.017 18.342 2 18 2s-.675.017-1.003.043c0-.015.003-.028.003-.043 0-1.105-.671-2-1.5-2S14 .895 14 2c0 .257.04.5.106.726-1.817.824-3.025 2.414-3.095 5.04C7.98 9.551 6 12.662 6 17c0 7.159 5.373 16.923 12 16.923 6.628 0 12-9.764 12-16.923 0-4.338-1.98-7.45-5.011-9.234z"/>
+ <path fill="#DD2E44" d="M16.001 34.959C9.564 34.364 4.5 28.064 4.5 20.378 4.5 12.693 9.564 9.597 16 9c.33-.03 1-.046 1 2.294v22.541c0 1.171-.669 1.156-.999 1.124zm3.998 0c6.436-.595 11.501-6.895 11.501-14.581C31.5 12.693 26.435 9.597 20 9c-.33-.03-1-.046-1 2.294v22.541c0 1.171.67 1.156.999 1.124z"/>
+ <g fill="#31373D">
+ <circle cx="13" cy="15" r="2"/>
+ <circle cx="10" cy="22" r="3"/>
+ <circle cx="13" cy="29" r="2"/>
+ <circle cx="24.5" cy="14.5" r="2.5"/>
+ <circle cx="22.5" cy="20.5" r="1.5"/>
+ <circle cx="28" cy="23" r="2"/>
+ <circle cx="24" cy="29" r="3"/>
+ </g>
+</svg>