Merge 0.10 -> trunk

This commit intentionally drops changes from c2b99fa134b3
and 8da11142fabf which are based on older MUC code.

2 files changed, 33 insertions, 2 deletions

diff --git a/plugins/mod_websocket.lua b/plugins/mod_websocket.lua
index 4f43cb7b..d301088e 100644
--- a/plugins/mod_websocket.lua
+++ b/plugins/mod_websocket.lua
@@ -261,6 +261,7 @@ function handle_request(event)
 	session.ip = request.ip;
 
 	session.secure = consider_websocket_secure or session.secure;
+	session.websocket_request = request;
 
 	session.open_stream = session_open_stream;
 	session.close = session_close;
diff --git a/plugins/muc/history.lib.lua b/plugins/muc/history.lib.lua
index b97e3f97..100ab720 100644
--- a/plugins/muc/history.lib.lua
+++ b/plugins/muc/history.lib.lua
@@ -31,6 +31,19 @@ local function set_historylength(room, length)
 	return true;
 end
 
+-- Fix for clients who don't support XEP-0045 correctly
+-- Default number of history messages the room returns
+local function get_defaulthistorymessages(room)
+	return room._data.default_history_messages or default_history_length;
+end
+local function set_defaulthistorymessages(room, number)
+	number = math.min(tonumber(number) or default_history_length, room._data.history_length or default_history_length);
+	if number == default_history_length then
+		number = nil;
+	end
+	room._data.default_history_messages = number;
+end
+
 module:hook("muc-config-form", function(event)
 	table.insert(event.form, {
 		name = "muc#roomconfig_historylength";
@@ -38,6 +51,12 @@ module:hook("muc-config-form", function(event)
 		label = "Maximum Number of History Messages Returned by Room";
 		value = tostring(get_historylength(event.room));
 	});
+	table.insert(event.form, {
+		name = 'muc#roomconfig_defaulthistorymessages',
+		type = 'text-single',
+		label = 'Default Number of History Messages Returned by Room',
+		value = tostring(get_defaulthistorymessages(event.room))
+	});
 end, 100-10);
 
 module:hook("muc-config-submitted/muc#roomconfig_historylength", function(event)
@@ -46,11 +65,17 @@ module:hook("muc-config-submitted/muc#roomconfig_historylength", function(event)
 	end
 end);
 
+module:hook("muc-config-submitted/muc#roomconfig_defaulthistorymessages", function(event)
+	if set_defaulthistorymessages(event.room, event.value) then
+		event.status_codes["104"] = true;
+	end
+end);
+
 local function parse_history(stanza)
 	local x_tag = stanza:get_child("x", "http://jabber.org/protocol/muc");
 	local history_tag = x_tag and x_tag:get_child("history", "http://jabber.org/protocol/muc");
 	if not history_tag then
-		return nil, default_history_length, nil;
+		return nil, nil, nil;
 	end
 
 	local maxchars = tonumber(history_tag.attr.maxchars);
@@ -118,11 +143,16 @@ end, -1);
 
 local function send_history(room, stanza)
 	local maxchars, maxstanzas, since = parse_history(stanza);
+	if not(maxchars or maxstanzas or since) then
+		maxstanzas = get_defaulthistorymessages(room);
+	end
 	local event = {
 		room = room;
 		stanza = stanza;
 		to = stanza.attr.from; -- `to` is required to calculate the character count for `maxchars`
-		maxchars = maxchars, maxstanzas = maxstanzas, since = since;
+		maxchars = maxchars,
+		maxstanzas = maxstanzas,
+		since = since;
 		next_stanza = function() end; -- events should define this iterator
 	};
 	module:fire_event("muc-get-history", event);