# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1479421241 -3600
# Node ID 17c7e3ac47f733db2ff8ebf51e8f975257018c4e
# Parent  9c8eb0239eef10aa834e1cd43bb6739ac484842d# Parent  c58075c4d37501bf101b293de87b93f7b069342c
Merge 0.10->trunk

diff -r 9c8eb0239eef -r 17c7e3ac47f7 plugins/mod_carbons.lua
--- a/plugins/mod_carbons.lua	Sat Nov 05 00:28:30 2016 +0100
+++ b/plugins/mod_carbons.lua	Thu Nov 17 23:20:41 2016 +0100
@@ -100,11 +100,11 @@
 end
 
 -- Stanzas sent by local clients
-module:hook("pre-message/host", c2s_message_handler, 1);
-module:hook("pre-message/bare", c2s_message_handler, 1);
-module:hook("pre-message/full", c2s_message_handler, 1);
+module:hook("pre-message/host", c2s_message_handler, -0.5);
+module:hook("pre-message/bare", c2s_message_handler, -0.5);
+module:hook("pre-message/full", c2s_message_handler, -0.5);
 -- Stanzas to local clients
-module:hook("message/bare", message_handler, 1);
-module:hook("message/full", message_handler, 1);
+module:hook("message/bare", message_handler, -0.5);
+module:hook("message/full", message_handler, -0.5);
 
 module:add_feature(xmlns_carbons);
diff -r 9c8eb0239eef -r 17c7e3ac47f7 plugins/mod_message.lua
--- a/plugins/mod_message.lua	Sat Nov 05 00:28:30 2016 +0100
+++ b/plugins/mod_message.lua	Thu Nov 17 23:20:41 2016 +0100
@@ -73,13 +73,13 @@
 	else -- resource not online
 		return process_to_bare(jid_bare(stanza.attr.to), origin, stanza);
 	end
-end);
+end, -1);
 
 module:hook("message/bare", function(data)
 	-- message to bare JID recieved
 	local origin, stanza = data.origin, data.stanza;
 
 	return process_to_bare(stanza.attr.to or (origin.username..'@'..origin.host), origin, stanza);
-end);
+end, -1);
 
 module:add_feature("msgoffline");