Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-26 16:09:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

webui: make link detection work if the message ends with </a>

Browse Source
This commit is contained in:
electron128 2015-07-30 11:02:47 +02:00 committed by cave beat
parent d004056f67
commit 7a144c231b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libresapi/src/api/ChatHandler.cpp
View File

@ -319,15 +319,6 @@ void ChatHandler::tick()
{ {
ignore = true; ignore = true;
} }
std::string a = "</a>";
if( current_link.first != -1
&& last_six_chars.size() >= a.size()
&& last_six_chars.substr(last_six_chars.size()-a.size()) == a)
{
current_link.third = out.size();
links.push_back(current_link);
current_link = Triple();
}
if(!ignore || keep_link) if(!ignore || keep_link)
out += in[i]; out += in[i];
// "falling edge" resets mode to keep // "falling edge" resets mode to keep
@ -337,6 +328,15 @@ void ChatHandler::tick()
last_six_chars += in[i]; last_six_chars += in[i];
if(last_six_chars.size() > 6) if(last_six_chars.size() > 6)
last_six_chars = last_six_chars.substr(1); last_six_chars = last_six_chars.substr(1);
std::string a = "</a>";
if( current_link.first != -1
&& last_six_chars.size() >= a.size()
&& last_six_chars.substr(last_six_chars.size()-a.size()) == a)
{
current_link.third = out.size();
links.push_back(current_link);
current_link = Triple();
}
} }
m.msg = out; m.msg = out;
m.links = links; m.links = links;