# HG changeset patch # User Kim Alvefur # Date 1552513628 -3600 # Node ID 181561d0aae5869a33c9fefe98ae354564a7ae85 # Parent ce89fabb1f02fc9f9ac27ab21d617a10a6080945 mod_http_muc_log: Add functionality for hiding joins and parts For Guus diff -r ce89fabb1f02 -r 181561d0aae5 mod_http_muc_log/http_muc_log.html --- a/mod_http_muc_log/http_muc_log.html Wed Mar 13 21:15:21 2019 +0000 +++ b/mod_http_muc_log/http_muc_log.html Wed Mar 13 22:47:08 2019 +0100 @@ -38,6 +38,7 @@ .body::before,.body::after{content:"";} .presence .verb{font-style:normal;color:#30c030;} .unavailable .verb{color:#c03030;} +form{text-align:right} @@ -45,7 +46,7 @@

{title}

@@ -53,7 +54,7 @@

{item.name}
{item.name}: {item.description?}

{years# @@ -62,11 +63,24 @@ {item.weeks# -{item.days#}} +{item.days#}}

} }

+ +

{item.time} @@ -79,7 +93,7 @@

{links# -{item.text}} +{item.text}}

Prosody
@@ -99,6 +113,9 @@ tag.setAttribute("title", date.toString()); } } +document.forms[0].elements.p.addEventListener("change", function() { +document.forms[0].submit(); +}); })(); diff -r ce89fabb1f02 -r 181561d0aae5 mod_http_muc_log/mod_http_muc_log.lua --- a/mod_http_muc_log/mod_http_muc_log.lua Wed Mar 13 21:15:21 2019 +0000 +++ b/mod_http_muc_log/mod_http_muc_log.lua Wed Mar 13 22:47:08 2019 +0100 @@ -5,6 +5,7 @@ local it = require"util.iterators"; local url = require"socket.url"; local os_time, os_date = os.time, os.date; +local httplib = require "util.http"; local render = require"util.interpolation".new("%b{}", require"util.stanza".xml_escape); local archive = module:open_store("muc_log", "archive"); @@ -109,9 +110,19 @@ local lazy = module:get_option_boolean(module.name .. "_lazy_calendar", true); +local function hide_presence(request) + if request.url.query then + local data = httplib.formdecode(request.url.query); + if data then + return data.p == "h" + end + end + return false; +end + -- Produce the calendar view local function years_page(event, path) - local response = event.response; + local request, response = event.request, event.response; local room = nodeprep(path:match("^(.*)/$")); local is_open = open_room(room); @@ -204,6 +215,7 @@ return render(template, { title = get_room(room):get_name(); jid = get_room(room).jid; + hide_presence = hide_presence(request); years = years; links = { { href = "../", rel = "up", text = "Room list" }, @@ -213,7 +225,7 @@ -- Produce the chat log view local function logs_page(event, path) - local response = event.response; + local request, response = event.request, event.response; -- FIXME In the year, 105105, if MUC is still alive, -- if Prosody can survive... Enjoy this Y10k bug @@ -234,6 +246,7 @@ local iter, err = archive:find(room, { ["start"] = day_start; ["end"] = day_start + 86399; + ["with"] = hide_presence(request) and "message

{item.month}
Mon	Tue	Wed	Thu	Fri	Sat	Sun
{item.href&}{item.day? }{item.href&}
{item.href&}{item.day? }{item.href&}