Increase font size on emoji posted into chat

Because they're difficult to make out otherwise. Relates to #1130.
drawpile · Aug 20, 2023 · 55b4d54 · 55b4d54
1 parent 65f1e26
commit 55b4d54
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -26,6 +26,7 @@ Unreleased Version 2.2.0-pre
  * Feature: Implement brush export and make the brush import also understand classic brushes.
  * Fix: Make erasing with MyPaint brushes in indirect mode actually work.
  * Feature: Make sliders adhere to the chosen color space. Thanks to leandro2222 for suggesting.
+ * Feature: Increase font size on emoji posted into chat. Thanks to leandro2222 for suggesting.
 
 2023-07-31 Version 2.2.0-beta.6
  * Fix: Don't forget account password when entering a wrong session password.

diff --git a/src/desktop/chat/chatwidget.cpp b/src/desktop/chat/chatwidget.cpp
@@ -62,6 +62,7 @@ struct Chat {
 			".timestamp { color: #8d8d8d }"
 		    ".alert .timestamp { color: #eff0f1 }"
 			"a:link { color: #1d99f3 }"
+			".emoji { font-size: xx-large; }"
 		);
 	}
 
@@ -601,7 +602,8 @@ void ChatWidget::receiveMessage(int sender, int recipient, uint8_t tflags, uint8
 			return;
 	}
 
-	const QString safetext = htmlutils::linkify(message.toHtmlEscaped());
+	const QString safetext =
+		htmlutils::linkify(htmlutils::wrapEmoji(message.toHtmlEscaped()));
 
 	Q_ASSERT(d->chats.contains(chatId));
 	Chat &chat = d->chats[chatId];
@@ -654,7 +656,8 @@ void ChatWidget::setPinnedMessage(const QString &message)
 void ChatWidget::systemMessage(const QString& message, bool alert)
 {
 	const bool wasAtEnd = d->isAtEnd();
-	const QString safetext = htmlutils::linkify(message.toHtmlEscaped());
+	const QString safetext =
+		htmlutils::linkify(htmlutils::wrapEmoji(message.toHtmlEscaped()));
 	if(alert) {
 		d->publicChat().appendMessageCompact(0, QString(), safetext, false, true);
 		emit expandRequested();

diff --git a/src/libclient/utils/html.cpp b/src/libclient/utils/html.cpp
@@ -70,4 +70,19 @@ QString linkify(const QString &input, const QString &extra)
 	return out;
 }
 
+QString wrapEmoji(const QString &input, const QString &replacement)
+{
+	// This regex is taken from the Unicode Technical Standard #51 version 15,
+	// revision 23, section 1.4.9 "EBNF and Regex". It doesn't exactly match
+	// emoji, but it should hopefully be close enough for our use case.
+	// https://unicode.org/reports/tr51/#EBNF_and_Regex
+	static QRegularExpression re{
+		"(\\p{RI}\\p{RI}|\\p{Emoji}(\\p{EMod}|\\x{FE0F}\\x{20E3}?|[\\x{E0020}-"
+		"\\x{E007E}]+\\x{E007F})?(\\x{200D}(\\p{RI}\\p{RI}|\\p{Emoji}(\\p{EMod}"
+		"|\\x{FE0F}\\x{20E3}?|[\\x{E0020}-\\x{E007E}]+\\x{E007F})?))*)+"};
+	QString s = input;
+	s.replace(re, replacement);
+	return s;
+}
+
 }
diff --git a/src/libclient/utils/html.h b/src/libclient/utils/html.h
@@ -23,6 +23,10 @@ QString newlineToBr(const QString &input);
  */
 QString linkify(const QString &input, const QString &extra=QString());
 
+QString wrapEmoji(
+	const QString &input,
+	const QString &replacement = "<span class=\"emoji\">\\1</span>");
+
 }
 
 #endif