# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1440603341 -7200
# Node ID 7ed87299dbf9c626a9d1962f0cb9e396c649a54f
# Parent  442019e955dc8e69371a81c53b888cc422a63ebd
mod_carbons: Carbon chat messages or normal messages that have a body

diff -r 442019e955dc -r 7ed87299dbf9 plugins/mod_carbons.lua
--- a/plugins/mod_carbons.lua	Wed Aug 26 14:32:20 2015 +0200
+++ b/plugins/mod_carbons.lua	Wed Aug 26 17:35:41 2015 +0200
@@ -21,14 +21,12 @@
 
 local function message_handler(event, c2s)
 	local origin, stanza = event.origin, event.stanza;
-	local orig_type = stanza.attr.type;
+	local orig_type = stanza.attr.type or "normal";
 	local orig_from = stanza.attr.from;
 	local orig_to = stanza.attr.to;
 	
-	if not (orig_type == nil
-			or orig_type == "normal"
-			or orig_type == "chat") then
-		return -- No carbons for messages of type error or headline
+	if not(orig_type == "chat" or orig_type == "normal" and stanza:get_child("body")) then
+		return -- Only chat type messages
 	end
 
 	-- Stanza sent by a local client