tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Match new server parsing of # in URLs.

Browse Source 
GitOrigin-RevId: f1e26ad10c80721db14132fd3fc3ba17aa2db509
This commit is contained in:
levlam 2018-06-25 03:22:56 +03:00
parent a365284831
commit d2e4f74c52
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
td/telegram/MessageEntity.cpp
View File

@ -542,7 +542,7 @@ static vector<Slice> match_urls(Slice str) {
while (bad_path_end_chars.find(path_end_ptr[-1]) < bad_path_end_chars.size()) {
path_end_ptr--;
}
if (url_end_ptr[0] == '/' || url_end_ptr[0] == '#' || path_end_ptr > url_end_ptr + 1) {
if (url_end_ptr[0] == '/' || path_end_ptr > url_end_ptr + 1) {
url_end_ptr = path_end_ptr;
}
}

9
test/message_entities.cpp
View File

@ -360,7 +360,7 @@ TEST(MessageEntities, url) {
check_url("http://a.0", {});
check_url("http://a.a", {});
check_url("google.com:1#ab c", {"google.com:1#ab"});
check_url("google.com:1#", {"google.com:1#"});
check_url("google.com:1#", {"google.com:1"});
check_url("google.com:1#1", {"google.com:1#1"});
check_url("google.com:00000001/abs", {"google.com:00000001/abs"});
check_url("google.com:000000065535/abs", {"google.com:000000065535/abs"});
@ -407,7 +407,8 @@ TEST(MessageEntities, url) {
check_url("bbbbbbbbbbbbbb.@.@", {});
check_url("http://google.com/", {"http://google.com/"});
check_url("http://google.com?", {"http://google.com"});
check_url("http://google.com#", {"http://google.com#"});
check_url("http://google.com#", {"http://google.com"});
check_url("http://google.com##", {"http://google.com##"});
check_url("http://google.com/?", {"http://google.com/"});
check_url("https://www.google.com/ab,", {"https://www.google.com/ab"});
check_url("@.", {});
@ -469,7 +470,7 @@ TEST(MessageEntities, url) {
"google.com/",
"google.com/#",
"google.com",
"google.com#"});
"google.com"});
check_url("https://t.…", {});
check_url("('http://telegram.org/a-b/?br=ie&lang=en',)", {"http://telegram.org/a-b/?br=ie&lang=en"});
check_url("https://ai.telegram.org/bot%20bot/test-...", {"https://ai.telegram.org/bot%20bot/test-"});
@ -517,7 +518,7 @@ TEST(MessageEntities, url) {
check_url("Look :test@example.com", {":test@example.com"}, {}); // TODO {}, {"test@example.com"}
check_url("Look mailto:test@example.com", {}, {"test@example.com"});
check_url("http://test.com#a", {"http://test.com#a"});
check_url("http://test.com#", {"http://test.com#"});
check_url("http://test.com#", {"http://test.com"});
check_url("http://test.com?#", {"http://test.com?#"});
check_url("http://test.com/?#", {"http://test.com/?#"});
check_url("https://t.me/abcdef…", {"https://t.me/abcdef"});