summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2014-04-18 10:45:28 +0200
committerFlorent Le Coz <louiz@louiz.org>2014-04-18 10:46:25 +0200
commit114007f10dbc77fdc71c34689fc20ce3e3111492 (patch)
tree3153799161f2cae4157072565e4cbc2df3e71fe7 /src
parentbd7936bdfe799d6b665c4b2bd30a5210592d9ae4 (diff)
downloadbiboumi-114007f10dbc77fdc71c34689fc20ce3e3111492.tar.gz
biboumi-114007f10dbc77fdc71c34689fc20ce3e3111492.tar.bz2
biboumi-114007f10dbc77fdc71c34689fc20ce3e3111492.tar.xz
biboumi-114007f10dbc77fdc71c34689fc20ce3e3111492.zip
Actually do the last commit, but completely this time
Diffstat (limited to 'src')
-rw-r--r--src/bridge/colors.cpp6
-rw-r--r--src/test.cpp4
2 files changed, 7 insertions, 3 deletions
diff --git a/src/bridge/colors.cpp b/src/bridge/colors.cpp
index e42c5a3..aff001e 100644
--- a/src/bridge/colors.cpp
+++ b/src/bridge/colors.cpp
@@ -73,7 +73,7 @@ Xmpp::body irc_format_to_xhtmlim(const std::string& s)
if (current_node->has_children())
current_node->get_last_child()->add_to_tail(txt);
else
- current_node->set_inner(txt);
+ current_node->add_to_inner(txt);
if (s[pos_end] == IRC_FORMAT_BOLD_CHAR)
styles.strong = !styles.strong;
@@ -151,9 +151,9 @@ Xmpp::body irc_format_to_xhtmlim(const std::string& s)
const std::string txt = s.substr(pos_start, pos_end-pos_start);
cleaned += txt;
if (current_node->has_children())
- current_node->get_last_child()->set_tail(txt);
+ current_node->get_last_child()->add_to_tail(txt);
else
- current_node->set_inner(txt);
+ current_node->add_to_inner(txt);
if (current_node != result.get())
{
diff --git a/src/test.cpp b/src/test.cpp
index 553c3ce..696438d 100644
--- a/src/test.cpp
+++ b/src/test.cpp
@@ -148,6 +148,10 @@ int main()
assert(xhtml->to_string() == "<body xmlns='http://www.w3.org/1999/xhtml'>[<span style='font-style:italic;'/><span style='font-style:italic;color:lightmagenta;'>dolphin-emu/dolphin</span><span style='color:lightmagenta;'>] </span><span style='color:green;'>foo</span> commented on #283 (Add support for the guide button to XInput): <span style='text-decoration:underline;'/><span style='text-decoration:underline;color:blue;'>http://example.com</span><span style='text-decoration:underline;'/></body>");
assert(cleaned_up == "[dolphin-emu/dolphin] foo commented on #283 (Add support for the guide button to XInput): http://example.com");
+ std::tie(cleaned_up, xhtml) = irc_format_to_xhtmlim("0e46ab by 03Pierre Dindon [090|091|040] 02http://example.net/Ojrh4P media: avoid pop-in effect when loading thumbnails by specifying an explicit size");
+ assert(cleaned_up == "0e46ab by Pierre Dindon [0|1|0] http://example.net/Ojrh4P media: avoid pop-in effect when loading thumbnails by specifying an explicit size");
+ assert(xhtml->to_string() == "<body xmlns='http://www.w3.org/1999/xhtml'>0e46ab by <span style='color:green;'>Pierre Dindon</span> [<span style='color:lightgreen;'>0</span>|<span style='color:lightgreen;'>1</span>|<span style='color:indianred;'>0</span>] <span style='text-decoration:underline;'/><span style='text-decoration:underline;color:blue;'>http://example.net/Ojrh4P</span><span style='text-decoration:underline;'/> media: avoid pop-in effect when loading thumbnails by specifying an explicit size</body>");
+
/**
* JID parsing
*/