Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(emoji): Fix issue where numbers and some symbols got big_emoji class applied #1469

Merged
merged 8 commits into from
Nov 8, 2023
Merged

chore(emoji): Fix issue where numbers and some symbols got big_emoji class applied #1469

Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
db567e0
chore(emoji): fix for big numbers in messages
Nov 7, 2023
9f0665f
fix for multi digit numbers
Nov 7, 2023
b164cb5
cleanup
WanderingHogan Nov 7, 2023
e56882d
attempt to make clippy and sara ai happy
WanderingHogan Nov 7, 2023
00f4649
change from span to p tag to match other places
WanderingHogan Nov 7, 2023
540b420
remove unecessary conversion
WanderingHogan Nov 7, 2023
285b437
unbreak markdown
WanderingHogan Nov 8, 2023
10cc410
Merge branch 'dev' into big_numbers
WanderingHogan Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions kit/src/components/message/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,12 +447,21 @@ fn markdown(text: &str, emojis: bool) -> String {
let txt = text.trim();

if emojis {
let r = replace_emojis(text);
if is_only_emojis(&r) {
let r = replace_emojis(txt);
// TODO: Watch this issue for a fix: https://github.com/open-i18n/rust-unic/issues/280
// This is a temporary workaround for some characters unic-emoji-char thinks are emojis
if !r.chars().all(char::is_alphanumeric) // for any numbers, eg 1, 11, 111
&& r != "#"
&& r != "*"
&& r != "##"
&& r != "**"
&& r != "-"
&& is_only_emojis(&r)
{
WanderingHogan marked this conversation as resolved.
Show resolved Hide resolved
return format!("<span class=\"big-emoji\">{r}</span>");
WanderingHogan marked this conversation as resolved.
Show resolved Hide resolved
} else if is_only_emojis(txt) || r == "-" {
return format!("<p>{txt}</p>");
WanderingHogan marked this conversation as resolved.
Show resolved Hide resolved
}
} else if is_only_emojis(txt) {
return format!("<span class=\"big-emoji\">{txt}</span>");
}

let mut options = Options::empty();
Expand Down
Loading