Mercurial > prosody-modules
annotate mod_muc_markers/mod_muc_markers.lua @ 4034:a359972d246e
mod_http_muc_log: Add link to room list from logs page
Improve UX by reducing in number of clicks to get back to the room list.
Uncommitted diff from logs.xmpp.org
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Tue, 26 May 2020 21:32:55 +0200 |
parents | 7b6bcb91493e |
children | 554f64c8d0c0 |
rev | line source |
---|---|
3972
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
1 -- Track messages received by users of the MUC |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
2 |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
3 -- We rewrite the 'id' attribute of outgoing stanzas to match the stanza (archive) id |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
4 -- This module is therefore incompatible with the muc#stable_id feature |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
5 -- We rewrite the id because XEP-0333 doesn't tell clients explicitly which id to use |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
6 -- in marker reports. However it implies the 'id' attribute through examples, and this |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
7 -- is what some clients implement. |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
8 -- Notably Conversations will ack the origin-id instead. We need to update the XEP to |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
9 -- clarify the correct behaviour. |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
10 |
4026
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
11 local st = require "util.stanza"; |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
12 |
3972
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
13 local xmlns_markers = "urn:xmpp:chat-markers:0"; |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
14 |
4024
95882b487ed2
mod_muc_markers: Allow configuration of which marker to track, default to displayed
Matthew Wild <mwild1@gmail.com>
parents:
3972
diff
changeset
|
15 local marker_element_name = module:get_option_string("muc_marker_type", "displayed"); |
4033
7b6bcb91493e
mod_muc_markers: Allow tracking multiple markers
Matthew Wild <mwild1@gmail.com>
parents:
4032
diff
changeset
|
16 local marker_element_names = module:get_option_set("muc_marker_types", { marker_element_name }); |
4024
95882b487ed2
mod_muc_markers: Allow configuration of which marker to track, default to displayed
Matthew Wild <mwild1@gmail.com>
parents:
3972
diff
changeset
|
17 |
3972
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
18 local muc_marker_map_store = module:open_store("muc_markers", "map"); |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
19 |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
20 local function get_stanza_id(stanza, by_jid) |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
21 for tag in stanza:childtags("stanza-id", "urn:xmpp:sid:0") do |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
22 if tag.attr.by == by_jid then |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
23 return tag.attr.id; |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
24 end |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
25 end |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
26 return nil; |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
27 end |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
28 |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
29 module:hook("muc-broadcast-message", function (event) |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
30 local stanza = event.stanza; |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
31 |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
32 local archive_id = get_stanza_id(stanza, event.room.jid); |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
33 -- We are not interested in stanzas that didn't get archived |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
34 if not archive_id then return; end |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
35 |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
36 -- Add stanza id as id attribute |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
37 stanza.attr.id = archive_id; |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
38 -- Add markable element to request markers from clients |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
39 stanza:tag("markable", { xmlns = xmlns_markers }):up(); |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
40 end, -1); |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
41 |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
42 module:hook("muc-occupant-groupchat", function (event) |
4033
7b6bcb91493e
mod_muc_markers: Allow tracking multiple markers
Matthew Wild <mwild1@gmail.com>
parents:
4032
diff
changeset
|
43 local marker = event.stanza:child_with_ns(xmlns_markers); |
7b6bcb91493e
mod_muc_markers: Allow tracking multiple markers
Matthew Wild <mwild1@gmail.com>
parents:
4032
diff
changeset
|
44 if not marker or not marker_element_names:contains(marker.name) then |
7b6bcb91493e
mod_muc_markers: Allow tracking multiple markers
Matthew Wild <mwild1@gmail.com>
parents:
4032
diff
changeset
|
45 return; -- No marker, or not one we are interested in |
7b6bcb91493e
mod_muc_markers: Allow tracking multiple markers
Matthew Wild <mwild1@gmail.com>
parents:
4032
diff
changeset
|
46 end |
3972
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
47 |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
48 -- Store the id that the user has received to |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
49 module:log("warn", "New marker for %s: %s", event.occupant.bare_jid, marker.attr.id); |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
50 muc_marker_map_store:set(event.occupant.bare_jid, event.room.jid, marker.attr.id); |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
51 |
4025
57b4cdeba318
mod_muc_markers: Prevent storage instead of broadcast
Kim Alvefur <zash@zash.se>
parents:
4024
diff
changeset
|
52 end); |
57b4cdeba318
mod_muc_markers: Prevent storage instead of broadcast
Kim Alvefur <zash@zash.se>
parents:
4024
diff
changeset
|
53 |
57b4cdeba318
mod_muc_markers: Prevent storage instead of broadcast
Kim Alvefur <zash@zash.se>
parents:
4024
diff
changeset
|
54 module:hook("muc-message-is-historic", function (event) |
57b4cdeba318
mod_muc_markers: Prevent storage instead of broadcast
Kim Alvefur <zash@zash.se>
parents:
4024
diff
changeset
|
55 local marker = event.stanza:get_child("received", xmlns_markers); |
57b4cdeba318
mod_muc_markers: Prevent storage instead of broadcast
Kim Alvefur <zash@zash.se>
parents:
4024
diff
changeset
|
56 |
57b4cdeba318
mod_muc_markers: Prevent storage instead of broadcast
Kim Alvefur <zash@zash.se>
parents:
4024
diff
changeset
|
57 -- Prevent stanza from reaching the archive (it's just noise) |
57b4cdeba318
mod_muc_markers: Prevent storage instead of broadcast
Kim Alvefur <zash@zash.se>
parents:
4024
diff
changeset
|
58 if marker then |
57b4cdeba318
mod_muc_markers: Prevent storage instead of broadcast
Kim Alvefur <zash@zash.se>
parents:
4024
diff
changeset
|
59 return false |
57b4cdeba318
mod_muc_markers: Prevent storage instead of broadcast
Kim Alvefur <zash@zash.se>
parents:
4024
diff
changeset
|
60 end |
3972
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
61 end); |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
62 |
4026
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
63 local function find_nickname(room, user_jid) |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
64 -- Find their current nickname |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
65 for nick, occupant in pairs(room._occupants) do |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
66 if occupant.bare_jid == user_jid then |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
67 return nick; |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
68 end |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
69 end |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
70 -- Or if they're not here |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
71 local nickname = room:get_affiliation_data(user_jid, "reserved_nickname"); |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
72 if nickname then return room.jid.."/"..nickname; end |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
73 end |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
74 |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
75 -- Synthesize markers |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
76 if muc_marker_map_store.get_all then |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
77 module:hook("muc-occupant-session-new", function (event) |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
78 local room, to = event.room, event.stanza.attr.from; |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
79 local markers = muc_marker_map_store:get_all(room.jid); |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
80 if not markers then return end |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
81 for user_jid, id in pairs(markers) do |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
82 local room_nick = find_nickname(room, user_jid); |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
83 if room_nick then |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
84 local recv_marker = st.message({ type = "groupchat", from = room_nick, to = to }) |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
85 :tag("received", { xmlns = xmlns_markers, id = id }); |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
86 room:route_stanza(recv_marker); |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
87 end |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
88 end |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
89 end); |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
90 end |
e3964f876b5d
mod_muc_markers: Broadcast current markers on join
Kim Alvefur <zash@zash.se>
parents:
4025
diff
changeset
|
91 |
3972
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
92 -- Public API |
4032
787fc3030087
mod_muc_markers: luacheck annotation
Matthew Wild <mwild1@gmail.com>
parents:
4026
diff
changeset
|
93 --luacheck: ignore 131 |
3972
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
94 |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
95 function get_user_read_marker(user_jid, room_jid) |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
96 return muc_marker_map_store:get(user_jid, room_jid); |
45c5603a6c07
mod_muc_markers: New module for server-side receipt tracking in MUCs
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
97 end |