commit c867a543606ec2bca4eefa7679698c91478044f4
parent 94f0d7e70793c45e71d8aa98936cc1676c7656ae
Author: n0tr1v <n0tr1v@protonmail.com>
Date: Thu, 5 Jan 2023 20:48:59 -0800
use emoji characters
Diffstat:
4 files changed, 75 insertions(+), 87 deletions(-)
diff --git a/pkg/web/handlers/api/v1/topBarHandler.go b/pkg/web/handlers/api/v1/topBarHandler.go
@@ -36,48 +36,48 @@ const (
var linkRgx = regexp.MustCompile(`(http|ftp|https):\/\/([\w\-_]+(?:(?:\.[\w\-_]+)+))([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?`)
var emojiReplacer = strings.NewReplacer(
- ":):", `<span class="emoji" style="background-position: -54px -0px;" title=":):"></span>`,
- ":smile:", `<span class="emoji" style="background-position: -54px -0px;" title=":smile:"></span>`,
- ":happy:", `<span class="emoji" style="background-position: -18px -0px;" title=":happy:"></span>`,
- ":see-no-evil:", `<span class="emoji" style="background-position: -54px -54px;" title=":see-no-evil:"></span>`,
- ":hear-no-evil:", `<span class="emoji" style="background-position: -72px -54px;" title=":hear-no-evil:"></span>`,
- ":speak-no-evil:", `<span class="emoji" style="background-position: -90px -54px;" title=":speak-no-evil:"></span>`,
- ":poop:", `<span class="emoji" style="background-position: -144px -54px;" title=":poop:"></span>`,
- ":+1:", `<span class="emoji" style="background-position: -432px -54px;" title=":+1:"></span>`,
- ":evil:", `<span class="emoji" style="background-position: -360px -18px;" title=":evil:"></span>`,
- ":cat-happy:", `<span class="emoji" style="background-position: -360px -36px;" title=":cat-happy:"></span>`,
- ":eyes:", `<span class="emoji" style="background-position: -360px -54px;" title=":eyes:"></span>`,
- ":wave:", `<span class="emoji" style="background-position: -54px -72px;" title=":wave:"></span>`,
- ":clap:", `<span class="emoji" style="background-position: -234px -72px;" title=":clap:"></span>`,
- ":fire:", `<span class="emoji" style="background-position: -162px -54px;" title=":fire:"></span>`,
- ":sparkles:", `<span class="emoji" style="background-position: -180px -54px;" title=":sparkles:"></span>`,
- ":sweat:", `<span class="emoji" style="background-position: -270px -54px;" title=":sweat:"></span>`,
- ":heart:", `<span class="emoji" style="background-position: -180px -108px;" title=":heart:"></span>`,
- ":broken-heart:", `<span class="emoji" style="background-position: -198px -108px;" title=":broken-heart:"></span>`,
- ":zzz:", `<span class="emoji" style="background-position: -306px -54px;" title=":zzz:"></span>`,
- ":praise:", `<span class="emoji" style="background-position: -180px -72px;" title=":praise:"></span>`,
- ":joy:", `<span class="emoji" style="background-position: -396px -0px;" title=":joy:"></span>`,
- ":sob:", `<span class="emoji" style="background-position: -414px -0px;" title=":joy:"></span>`,
- ":scream:", `<span class="emoji" style="background-position: -90px -18px;" title=":scream:"></span>`,
- ":heart-eyes:", `<span class="emoji" style="background-position: -108px -0px;" title=":heart-eyes:"></span>`,
- ":blush:", `<span class="emoji" style="background-position: -72px -0px;" title=":blush:"></span>`,
- ":crazy:", `<span class="emoji" style="background-position: -198px -0px;" title=":crazy:"></span>`,
- ":angry:", `<span class="emoji" style="background-position: -126px -18px;" title=":angry:"></span>`,
- ":triumph:", `<span class="emoji" style="background-position: -144px -18px;" title=":triumph:"></span>`,
- ":skull:", `<span class="emoji" style="background-position: -108px -54px;" title=":skull:"></span>`,
- ":alien:", `<span class="emoji" style="background-position: -126px -54px;" title=":alien:"></span>`,
- ":sleeping:", `<span class="emoji" style="background-position: -252px -18px;" title=":sleeping:"></span>`,
- ":tongue:", `<span class="emoji" style="background-position: -234px -0px;" title=":tongue:"></span>`,
- ":cool:", `<span class="emoji" style="background-position: -234px -18px;" title=":cool:"></span>`,
- ":wink:", `<span class="emoji" style="background-position: -90px -0px;" title=":wink:"></span>`,
- ":happy-sweat:", `<span class="emoji" style="background-position: -0px -18px;" title=":happy-sweat:"></span>`,
+ ":):", `<span class="emoji" title=":):">☺</span>`,
+ ":smile:", `<span class="emoji" title=":smile:">☺</span>`,
+ ":happy:", `<span class="emoji" title=":happy:">😃</span>`,
+ ":see-no-evil:", `<span class="emoji" title=":see-no-evil:">🙈</span>`,
+ ":hear-no-evil:", `<span class="emoji" title=":hear-no-evil:">🙉</span>`,
+ ":speak-no-evil:", `<span class="emoji" title=":speak-no-evil:">🙊</span>`,
+ ":poop:", `<span class="emoji" title=":poop:">💩</span>`,
+ ":+1:", `<span class="emoji" title=":+1:">👍</span>`,
+ ":evil:", `<span class="emoji" title=":evil:">😈</span>`,
+ ":cat-happy:", `<span class="emoji" title=":cat-happy:">😸</span>`,
+ ":eyes:", `<span class="emoji" title=":eyes:">👀</span>`,
+ ":wave:", `<span class="emoji" title=":wave:">👋</span>`,
+ ":clap:", `<span class="emoji" title=":clap:">👏</span>`,
+ ":fire:", `<span class="emoji" title=":fire:">🔥</span>`,
+ ":sparkles:", `<span class="emoji" title=":sparkles:">✨</span>`,
+ ":sweat:", `<span class="emoji">💦</span>`,
+ ":heart:", `<span class="emoji" title=":heart:">❤</span>`,
+ ":broken-heart:", `<span class="emoji" title=":broken-heart:">💔</span>`,
+ ":zzz:", `<span class="emoji">💤</span>`,
+ ":praise:", `<span class="emoji">🙌</span>`,
+ ":joy:", `<span class="emoji" title=":joy:">😂</span>`,
+ ":sob:", `<span class="emoji" title=":sob:">😭</span>`,
+ ":scream:", `<span class="emoji" title=":scream:">😱</span>`,
+ ":heart-eyes:", `<span class="emoji" title=":heart-eyes:">😍</span>`,
+ ":blush:", `<span class="emoji" title=":blush:">☺</span>`,
+ ":crazy:", `<span class="emoji" title=":crazy:">😜</span>`,
+ ":angry:", `<span class="emoji" title=":angry:">😡</span>`,
+ ":triumph:", `<span class="emoji" title=":triumph:">😤</span>`,
+ ":skull:", `<span class="emoji" title=":skull:">💀</span>`,
+ ":alien:", `<span class="emoji" title=":alien:">👽</span>`,
+ ":sleeping:", `<span class="emoji" title=":sleeping:">😴</span>`,
+ ":tongue:", `<span class="emoji" title=":tongue:">😛</span>`,
+ ":cool:", `<span class="emoji" title=":cool:">😎</span>`,
+ ":wink:", `<span class="emoji" title=":wink:">😉</span>`,
+ ":happy-sweat:", `<span class="emoji" title=":happy-sweat:">😅</span>`,
+ ":fox:", `<span class="emoji" title=":fox:">🦊</span>`,
+ ":popcorn:", `<span class="emoji" title=":popcorn:">🍿</span>`,
":shrug:", `¯\_(ツ)_/¯`,
":flip:", `(╯°□°)╯︵ ┻━┻`,
":flip-all:", `┻━┻︵ \(°□°)/ ︵ ┻━┻`,
":fix-table:", `(ヘ･_･)ヘ┳━┳`,
":disap:", `ಠ_ಠ`,
- ":fox:", `🦊`,
- ":popcorn:", `🍿`,
)
var ErrRedirect = errors.New("redirect")
diff --git a/pkg/web/public/css/style.css b/pkg/web/public/css/style.css
@@ -9,12 +9,7 @@
}
.emoji {
- background-image: url('/public/img/emojis_sm.png');
- width: 18px;
- height: 18px;
- background-size: 486px 126px;
- display: inline-block;
- vertical-align: middle;
+ font-family: "Noto Color Emoji", "Apple Color Emoji", "Segoe UI Emoji", Times, Symbola, Aegyptus, Code2000, Code2001, Code2002, Musica, serif, LastResort;
}
.dropdown {
diff --git a/pkg/web/public/views/pages/chat-help.gohtml b/pkg/web/public/views/pages/chat-help.gohtml
@@ -268,44 +268,42 @@
<h3>Emojis:</h3>
<div style="columns: 4 auto;" class="mb-3">
- <div><span class="emoji" style="background-position: -54px -0px;" title=":smile:"></span> <code>:smile: </code></div>
- <div><span class="emoji" style="background-position: -18px -0px;" title=":happy:"></span> <code>:happy: </code></div>
- <div><span class="emoji" style="background-position: -0px -18px;" title=":happy-sweat:"></span> <code>:happy-sweat: </code></div>
- <div><span class="emoji" style="background-position: -108px -0px;" title=":heart-eyes:"></span> <code>:heart-eyes: </code></div>
- <div><span class="emoji" style="background-position: -72px -0px;" title=":blush:"></span> <code>:blush: </code></div>
- <div><span class="emoji" style="background-position: -252px -18px;" title=":sleeping:"></span> <code>:sleeping: </code></div>
- <div><span class="emoji" style="background-position: -234px -0px;" title=":tongue:"></span> <code>:tongue: </code></div>
- <div><span class="emoji" style="background-position: -234px -18px;" title=":cool:"></span> <code>:cool: </code></div>
- <div><span class="emoji" style="background-position: -90px -0px;" title=":wink:"></span> <code>:wink: </code></div>
- <div><span class="emoji" style="background-position: -198px -0px;" title=":crazy:"></span> <code>:crazy: </code></div>
- <div><span class="emoji" style="background-position: -396px -0px;" title=":joy:"></span> <code>:joy: </code></div>
- <div><span class="emoji" style="background-position: -414px -0px;" title=":sob:"></span> <code>:sob: </code></div>
- <div><span class="emoji" style="background-position: -90px -18px;" title=":scream:"></span> <code>:scream: </code></div>
- <div><span class="emoji" style="background-position: -126px -18px;" title=":angry:"></span> <code>:angry: </code></div>
- <div><span class="emoji" style="background-position: -144px -18px;" title=":triumph:"></span> <code>:triumph: </code></div>
- <div><span class="emoji" style="background-position: -360px -18px;" title=":evil:"></span> <code>:evil: </code></div>
- <div><span class="emoji" style="background-position: -54px -54px;" title=":see-no-evil:"></span> <code>:see-no-evil: </code></div>
- <div><span class="emoji" style="background-position: -72px -54px;" title=":hear-no-evil:"></span> <code>:hear-no-evil: </code></div>
- <div><span class="emoji" style="background-position: -90px -54px;" title=":speak-no-evil:"></span> <code>:speak-no-evil:</code></div>
- <div><span class="emoji" style="background-position: -360px -36px;" title=":cat-happy:"></span> <code>:cat-happy: </code></div>
- <div><span class="emoji" style="background-position: -360px -54px;" title=":eyes:"></span> <code>:eyes: </code></div>
- <div><span class="emoji" style="background-position: -144px -54px;" title=":poop:"></span> <code>:poop: </code></div>
- <div><span class="emoji" style="background-position: -432px -54px;" title=":+1:"></span> <code>:+1: </code></div>
- <div><span class="emoji" style="background-position: -54px -72px;" title=":wave:"></span> <code>:wave: </code></div>
- <div><span class="emoji" style="background-position: -234px -72px;" title=":clap:"></span> <code>:clap: </code></div>
- <div><span class="emoji" style="background-position: -162px -54px;" title=":fire:"></span> <code>:fire: </code></div>
- <div><span class="emoji" style="background-position: -180px -54px;" title=":sparkles:"></span> <code>:sparkles: </code></div>
- <div><span class="emoji" style="background-position: -270px -54px;" title=":sweat:"></span> <code>:sweat: </code></div>
- <div><span class="emoji" style="background-position: -180px -108px;" title=":heart:"></span> <code>:heart: </code></div>
- <div><span class="emoji" style="background-position: -198px -108px;" title=":broken-heart:"></span> <code>:broken-heart: </code></div>
- <div><span class="emoji" style="background-position: -180px -72px;" title=":praise:"></span> <code>:praise: </code></div>
- <div><span class="emoji" style="background-position: -108px -54px;" title=":skull:"></span> <code>:skull: </code></div>
- <div><span class="emoji" style="background-position: -126px -54px;" title=":alien:"></span> <code>:alien: </code></div>
- <div><span class="emoji" style="background-position: -306px -54px;" title=":zzz:"></span> <code>:zzz: </code></div>
- </div>
- <div style="columns: 4 auto;" class="mb-3">
- <div><span title=":fox:">🦊</span> <code>:fox:</code></div>
- <div><span title=":popcorn:">🍿</span> <code>:popcorn:</code></div>
+ <div><span class="emoji" title=":smile:">☺</span> <code>:smile: </code></div>
+ <div><span class="emoji" title=":happy:">😃</span> <code>:happy: </code></div>
+ <div><span class="emoji" title=":happy-sweat:">😅</span> <code>:happy-sweat: </code></div>
+ <div><span class="emoji" title=":heart-eyes:">😍</span> <code>:heart-eyes: </code></div>
+ <div><span class="emoji" title=":blush:">☺</span> <code>:blush: </code></div>
+ <div><span class="emoji" title=":sleeping:">😴</span> <code>:sleeping: </code></div>
+ <div><span class="emoji" title=":tongue:">😛</span> <code>:tongue: </code></div>
+ <div><span class="emoji" title=":cool:">😎</span> <code>:cool: </code></div>
+ <div><span class="emoji" title=":wink:">😉</span> <code>:wink: </code></div>
+ <div><span class="emoji" title=":crazy:">😜</span> <code>:crazy: </code></div>
+ <div><span class="emoji" title=":joy:">😂</span> <code>:joy: </code></div>
+ <div><span class="emoji" title=":sob:">😭</span> <code>:sob: </code></div>
+ <div><span class="emoji" title=":scream:">😱</span> <code>:scream: </code></div>
+ <div><span class="emoji" title=":angry:">😡</span> <code>:angry: </code></div>
+ <div><span class="emoji" title=":triumph:">😤</span> <code>:triumph: </code></div>
+ <div><span class="emoji" title=":evil:">😈</span> <code>:evil: </code></div>
+ <div><span class="emoji" title=":see-no-evil:">🙈</span> <code>:see-no-evil: </code></div>
+ <div><span class="emoji" title=":hear-no-evil:">🙉</span> <code>:hear-no-evil: </code></div>
+ <div><span class="emoji" title=":speak-no-evil:">🙊</span> <code>:speak-no-evil:</code></div>
+ <div><span class="emoji" title=":cat-happy:">😸</span> <code>:cat-happy: </code></div>
+ <div><span class="emoji" title=":eyes:">👀</span> <code>:eyes: </code></div>
+ <div><span class="emoji" title=":poop:">💩</span> <code>:poop: </code></div>
+ <div><span class="emoji" title=":+1:">👍</span> <code>:+1: </code></div>
+ <div><span class="emoji" title=":wave:">👋</span> <code>:wave: </code></div>
+ <div><span class="emoji" title=":clap:">👏</span> <code>:clap: </code></div>
+ <div><span class="emoji" title=":fire:">🔥</span> <code>:fire: </code></div>
+ <div><span class="emoji" title=":sparkles:">✨</span> <code>:sparkles: </code></div>
+ <div><span class="emoji" title=":sweat:">💦</span> <code>:sweat: </code></div>
+ <div><span class="emoji" title=":heart:">❤</span> <code>:heart: </code></div>
+ <div><span class="emoji" title=":broken-heart:">💔</span> <code>:broken-heart: </code></div>
+ <div><span class="emoji" title=":praise:">🙌</span> <code>:praise: </code></div>
+ <div><span class="emoji" title=":skull:">💀</span> <code>:skull: </code></div>
+ <div><span class="emoji" title=":alien:">👽</span> <code>:alien: </code></div>
+ <div><span class="emoji" title=":zzz:">💤</span> <code>:zzz: </code></div>
+ <div><span class="emoji" title=":fox:">🦊</span> <code>:fox:</code></div>
+ <div><span class="emoji" title=":popcorn:">🍿</span> <code>:popcorn:</code></div>
</div>
<table>
diff --git a/pkg/web/public/views/pages/chat-messages.gohtml b/pkg/web/public/views/pages/chat-messages.gohtml
@@ -69,12 +69,7 @@
.unread_room { color: #2392da; text-decoration: none; }
.unread_room:hover { color: #004970; text-decoration: underline; }
.emoji {
- background-image: url('/public/img/emojis_sm.png');
- width: 18px;
- height: 18px;
- background-size: 486px 126px;
- display: inline-block;
- vertical-align: middle;
+ font-family: "Noto Color Emoji", "Apple Color Emoji", "Segoe UI Emoji", Times, Symbola, Aegyptus, Code2000, Code2001, Code2002, Musica, serif, LastResort;
}
.mod-btn {
width: 16px; height: 16px;
