noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Format

Browse source
This commit is contained in:
Colton Clemmer 2023-09-03 10:37:03 -05:00
parent d6873ad05d
commit 3c72fc867c
2 changed files with 66 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/common/LinkParser.cpp
View file

@ -116,23 +116,26 @@ bool startsWithPort(QStringView string)
// For unicode ranges see: https://unicode.org/charts/
using UnicodeRange = std::pair<ushort, ushort>;
std::vector<UnicodeRange> emojiRanges = {
{U'\U00002700', U'\U000027BF' }, // Dingbats
{U'\U00001F60', U'\U0001F64F' }, // Emoticons
{U'\U00002600', U'\U000026FF' }, // Miscellaneous Symbols
{U'\U00001F30', U'\U0001F5FF' }, // Miscellaneous Symbols and Pictographs
{U'\U00001F90', U'\U0001F9FF' }, // Supplemental Symbols and Pictographs
{U'\U00002700', U'\U000027BF'}, // Dingbats
{U'\U00001F60', U'\U0001F64F'}, // Emoticons
{U'\U00002600', U'\U000026FF'}, // Miscellaneous Symbols
{U'\U00001F30', U'\U0001F5FF'}, // Miscellaneous Symbols and Pictographs
{U'\U00001F90', U'\U0001F9FF'}, // Supplemental Symbols and Pictographs
};
std::vector<UnicodeRange> alphaNumeric = {
{ U'\u0041', U'\u005A' }, // Upper alphabet
{ U'\u0061', U'\u007A' }, //Lower alphabet
{ U'\u0030', U'\u0039' }, // Numbers
{U'\u0041', U'\u005A'}, // Upper alphabet
{U'\u0061', U'\u007A'}, //Lower alphabet
{U'\u0030', U'\u0039'}, // Numbers
};
bool isInUnicodeRange(const QChar& ch, std::vector<UnicodeRange> ranges) {
bool isInUnicodeRange(const QChar &ch, std::vector<UnicodeRange> ranges)
{
ushort unicodeValue = ch.unicode();
for (const auto& range : ranges) {
if (unicodeValue >= range.first && unicodeValue <= range.second) {
for (const auto &range : ranges)
{
if (unicodeValue >= range.first && unicodeValue <= range.second)
{
return true;
}
}
@ -147,7 +150,8 @@ QString sanitizeUrl(const QString &unparsedString)
QString sanitizedUrl;
for (const QChar &c : unparsedString)
{
if (isInUnicodeRange(c, alphaNumeric) || isInUnicodeRange(c, emojiRanges))
if (isInUnicodeRange(c, alphaNumeric) ||
isInUnicodeRange(c, emojiRanges))
{
sanitizedUrl.append(c);
continue;

24
tests/src/LinkParser.cpp
View file

@ -34,14 +34,16 @@ struct SanitizeCheck {
TEST(LinkParser, parseDomainLinks)
{
const QList<SanitizeCheck> sanitizeCases = {
{ "TW❘TCH.tv", "TW❘TCH.tv" "" }, // contains dingbat
{"(twitch.tv/foo)", "twitch.tv", "/foo" },
{"t🤪w🤪i🤪t🤪c🤪h🤪.tv/foo", "t🤪w🤪i🤪t🤪c🤪h🤪.tv", "/foo" },
{ "https://🏹.to/bar", "🏹.to", "/bar" },
{ "😀.com/baz", "😀.com", "/baz" }, // Emoticon
{ "❀.com/baz", "❀.com", "/baz" }, // Dingbat
{ "⛑.com/baz", "⛑.com", "/baz" }, // Misc Symbol
{ "🍀.com/baz", "🍀.com", "/baz" }, // Pictograph
{"TW❘TCH.tv", "TW❘TCH.tv"
""}, // contains dingbat
{"(twitch.tv/foo)", "twitch.tv", "/foo"},
{"t🤪w🤪i🤪t🤪c🤪h🤪.tv/foo",
"t🤪w🤪i🤪t🤪c🤪h🤪.tv", "/foo"},
{"https://🏹.to/bar", "🏹.to", "/bar"},
{"😀.com/baz", "😀.com", "/baz"}, // Emoticon
{"❀.com/baz", "❀.com", "/baz"}, // Dingbat
{"⛑.com/baz", "⛑.com", "/baz"}, // Misc Symbol
{"🍀.com/baz", "🍀.com", "/baz"}, // Pictograph
};
for (auto &c : sanitizeCases)
@ -50,7 +52,8 @@ TEST(LinkParser, parseDomainLinks)
ASSERT_TRUE(p.result().has_value()) << c.testValue.toStdString();
const auto &r = *p.result();
std::ostringstream ss;
ss << "Expected: " << c.expectedHost.toStdString() << "\nResult: " << r.host.toString().toStdString();
ss << "Expected: " << c.expectedHost.toStdString()
<< "\nResult: " << r.host.toString().toStdString();
ASSERT_EQ(c.expectedHost, r.host) << ss.str();
ASSERT_EQ(c.expectedRest, r.rest) << c.expectedRest.toStdString();
}
@ -160,7 +163,8 @@ TEST(LinkParser, doesntParseInvalidIpv4Links)
TEST(LinkParser, doesntParseInvalidLinks)
{
const QStringList inputs = {"h://foo.com",
const QStringList inputs = {
"h://foo.com",
"spotify:1234",
"ftp://chatterino.com",
"ftps://chatterino.com",