Mercurial > prosody-modules
annotate mod_mam_muc/mod_mam_muc.lua @ 2845:0de6ed2ae9bd
mod_http_muc_log: Check that there are timestamps to work with
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Tue, 21 Nov 2017 00:48:05 +0100 |
parents | b69ef062806e |
children | 39994c6bb314 |
rev | line source |
---|---|
1313 | 1 -- XEP-0313: Message Archive Management for Prosody MUC |
2626
17883c405df3
mod_mam_muc: Shorten some lines [luacheck]
Kim Alvefur <zash@zash.se>
parents:
2507
diff
changeset
|
2 -- Copyright (C) 2011-2017 Kim Alvefur |
820 | 3 -- |
4 -- This file is MIT/X11 licensed. | |
5 | |
1973
9329a11c03a6
mod_mam_muc: Add guard to prevent loading on normal hosts
Kim Alvefur <zash@zash.se>
parents:
1865
diff
changeset
|
6 if module:get_host_type() ~= "component" then |
9329a11c03a6
mod_mam_muc: Add guard to prevent loading on normal hosts
Kim Alvefur <zash@zash.se>
parents:
1865
diff
changeset
|
7 module:log("error", "mod_%s should be loaded only on a MUC component, not normal hosts", module.name); |
9329a11c03a6
mod_mam_muc: Add guard to prevent loading on normal hosts
Kim Alvefur <zash@zash.se>
parents:
1865
diff
changeset
|
8 return; |
9329a11c03a6
mod_mam_muc: Add guard to prevent loading on normal hosts
Kim Alvefur <zash@zash.se>
parents:
1865
diff
changeset
|
9 end |
9329a11c03a6
mod_mam_muc: Add guard to prevent loading on normal hosts
Kim Alvefur <zash@zash.se>
parents:
1865
diff
changeset
|
10 |
2627
3f166242b460
mod_mam_muc: Add stanza-id tags (updates to XEP-0313 v0.6)
Kim Alvefur <zash@zash.se>
parents:
2626
diff
changeset
|
11 local xmlns_mam = "urn:xmpp:mam:2"; |
820 | 12 local xmlns_delay = "urn:xmpp:delay"; |
13 local xmlns_forward = "urn:xmpp:forward:0"; | |
2627
3f166242b460
mod_mam_muc: Add stanza-id tags (updates to XEP-0313 v0.6)
Kim Alvefur <zash@zash.se>
parents:
2626
diff
changeset
|
14 local xmlns_st_id = "urn:xmpp:sid:0"; |
2721
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
15 local xmlns_muc_user = "http://jabber.org/protocol/muc#user"; |
2716
02a7f9fe44fa
mod_mam_muc: Rename various fields from "logging" to "archiving"
Kim Alvefur <zash@zash.se>
parents:
2628
diff
changeset
|
16 local muc_form_enable = "muc#roomconfig_enablearchiving" |
820 | 17 |
18 local st = require "util.stanza"; | |
2497
c6761ebe613b
mod_mam_muc: Use util.rsm (fixes #829, depends on a recent 0.10+)
Kim Alvefur <zash@zash.se>
parents:
2429
diff
changeset
|
19 local rsm = require "util.rsm"; |
820 | 20 local jid_bare = require "util.jid".bare; |
21 local jid_split = require "util.jid".split; | |
2627
3f166242b460
mod_mam_muc: Add stanza-id tags (updates to XEP-0313 v0.6)
Kim Alvefur <zash@zash.se>
parents:
2626
diff
changeset
|
22 local jid_prep = require "util.jid".prep; |
1536
4fb280768efc
mod_mam_muc: Add missing import and change the namespace to MAM v0.3
Kim Alvefur <zash@zash.se>
parents:
1535
diff
changeset
|
23 local dataform = require "util.dataforms".new; |
1551
5127f4db9d39
mod_mam_muc: Try to use new MUC API for getting room objects (fixes queries to not yet initialized rooms)
Kim Alvefur <zash@zash.se>
parents:
1548
diff
changeset
|
24 local it = require"util.iterators"; |
1534
4dd6eebc8fbd
mod_mam_muc: Minor moving about of variables
Kim Alvefur <zash@zash.se>
parents:
1533
diff
changeset
|
25 |
1551
5127f4db9d39
mod_mam_muc: Try to use new MUC API for getting room objects (fixes queries to not yet initialized rooms)
Kim Alvefur <zash@zash.se>
parents:
1548
diff
changeset
|
26 -- Support both old and new MUC code |
1534
4dd6eebc8fbd
mod_mam_muc: Minor moving about of variables
Kim Alvefur <zash@zash.se>
parents:
1533
diff
changeset
|
27 local mod_muc = module:depends"muc"; |
1543
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
28 local rooms = rawget(mod_muc, "rooms"); |
1551
5127f4db9d39
mod_mam_muc: Try to use new MUC API for getting room objects (fixes queries to not yet initialized rooms)
Kim Alvefur <zash@zash.se>
parents:
1548
diff
changeset
|
29 local each_room = rawget(mod_muc, "each_room") or function() return it.values(rooms); end; |
1543
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
30 local new_muc = not rooms; |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
31 if new_muc then |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
32 rooms = module:shared"muc/rooms"; |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
33 end |
1551
5127f4db9d39
mod_mam_muc: Try to use new MUC API for getting room objects (fixes queries to not yet initialized rooms)
Kim Alvefur <zash@zash.se>
parents:
1548
diff
changeset
|
34 local get_room_from_jid = rawget(mod_muc, "get_room_from_jid") or |
5127f4db9d39
mod_mam_muc: Try to use new MUC API for getting room objects (fixes queries to not yet initialized rooms)
Kim Alvefur <zash@zash.se>
parents:
1548
diff
changeset
|
35 function (jid) |
5127f4db9d39
mod_mam_muc: Try to use new MUC API for getting room objects (fixes queries to not yet initialized rooms)
Kim Alvefur <zash@zash.se>
parents:
1548
diff
changeset
|
36 return rooms[jid]; |
5127f4db9d39
mod_mam_muc: Try to use new MUC API for getting room objects (fixes queries to not yet initialized rooms)
Kim Alvefur <zash@zash.se>
parents:
1548
diff
changeset
|
37 end |
820 | 38 |
2498
e065e94f0ac6
mod_mam_muc: Remove fallback for util.stanza.is_stanza, it should be available
Kim Alvefur <zash@zash.se>
parents:
2497
diff
changeset
|
39 local is_stanza = st.is_stanza; |
820 | 40 local tostring = tostring; |
41 local time_now = os.time; | |
42 local m_min = math.min; | |
43 local timestamp, timestamp_parse = require "util.datetime".datetime, require "util.datetime".parse; | |
2831
d65868fed77a
mod_mam_muc: Copy max_archive_query_results option from mod_mam
Kim Alvefur <zash@zash.se>
parents:
2723
diff
changeset
|
44 local default_max_items, max_max_items = 20, module:get_option_number("max_archive_query_results", 50); |
2718
02d688ba7739
mod_mam_muc: Make calculation of max history length more like in mod_muc
Kim Alvefur <zash@zash.se>
parents:
2716
diff
changeset
|
45 |
02d688ba7739
mod_mam_muc: Make calculation of max history length more like in mod_muc
Kim Alvefur <zash@zash.se>
parents:
2716
diff
changeset
|
46 local default_history_length = 20; |
02d688ba7739
mod_mam_muc: Make calculation of max history length more like in mod_muc
Kim Alvefur <zash@zash.se>
parents:
2716
diff
changeset
|
47 local max_history_length = module:get_option_number("max_history_messages", math.huge); |
02d688ba7739
mod_mam_muc: Make calculation of max history length more like in mod_muc
Kim Alvefur <zash@zash.se>
parents:
2716
diff
changeset
|
48 |
02d688ba7739
mod_mam_muc: Make calculation of max history length more like in mod_muc
Kim Alvefur <zash@zash.se>
parents:
2716
diff
changeset
|
49 local function get_historylength(room) |
02d688ba7739
mod_mam_muc: Make calculation of max history length more like in mod_muc
Kim Alvefur <zash@zash.se>
parents:
2716
diff
changeset
|
50 return math.min(room._data.history_length or default_history_length, max_history_length); |
02d688ba7739
mod_mam_muc: Make calculation of max history length more like in mod_muc
Kim Alvefur <zash@zash.se>
parents:
2716
diff
changeset
|
51 end |
820 | 52 |
1143
8098683b6d6f
mod_mam_muc: Allow archiving to be enabled trough in the room configuration
Kim Alvefur <zash@zash.se>
parents:
1142
diff
changeset
|
53 local log_all_rooms = module:get_option_boolean("muc_log_all_rooms", false); |
8098683b6d6f
mod_mam_muc: Allow archiving to be enabled trough in the room configuration
Kim Alvefur <zash@zash.se>
parents:
1142
diff
changeset
|
54 local log_by_default = module:get_option_boolean("muc_log_by_default", true); |
1142
fabdaa0d99e3
mod_mam_muc: Stap archived messages
Kim Alvefur <zash@zash.se>
parents:
1141
diff
changeset
|
55 |
1571
eed7db9f3157
mod_mam_muc, mod_http_muc_log: Change store name from 'archive2' to 'muc_log' to distinguish it from personal MAM archives. Old data will require migration.
Kim Alvefur <zash@zash.se>
parents:
1551
diff
changeset
|
56 local archive_store = "muc_log"; |
1311
27b2a357c73c
mod_mam_muc: porting archive checks from mod_mam (to avoid tracebacks about calling null functions)
Vadim Misbakh-Soloviov <mva@mva.name>
parents:
1279
diff
changeset
|
57 local archive = module:open_store(archive_store, "archive"); |
2031
f21147d56bc4
mod_mam_muc: Yell loudly when archive store can't be opened
Kim Alvefur <zash@zash.se>
parents:
1973
diff
changeset
|
58 |
f21147d56bc4
mod_mam_muc: Yell loudly when archive store can't be opened
Kim Alvefur <zash@zash.se>
parents:
1973
diff
changeset
|
59 if archive.name == "null" or not archive.find then |
f21147d56bc4
mod_mam_muc: Yell loudly when archive store can't be opened
Kim Alvefur <zash@zash.se>
parents:
1973
diff
changeset
|
60 if not archive.find then |
2626
17883c405df3
mod_mam_muc: Shorten some lines [luacheck]
Kim Alvefur <zash@zash.se>
parents:
2507
diff
changeset
|
61 module:log("error", "Attempt to open archive storage returned a driver without archive API support"); |
17883c405df3
mod_mam_muc: Shorten some lines [luacheck]
Kim Alvefur <zash@zash.se>
parents:
2507
diff
changeset
|
62 module:log("error", "mod_%s does not support archiving", |
17883c405df3
mod_mam_muc: Shorten some lines [luacheck]
Kim Alvefur <zash@zash.se>
parents:
2507
diff
changeset
|
63 archive._provided_by or archive.name and "storage_"..archive.name.."(?)" or "<unknown>"); |
2031
f21147d56bc4
mod_mam_muc: Yell loudly when archive store can't be opened
Kim Alvefur <zash@zash.se>
parents:
1973
diff
changeset
|
64 else |
f21147d56bc4
mod_mam_muc: Yell loudly when archive store can't be opened
Kim Alvefur <zash@zash.se>
parents:
1973
diff
changeset
|
65 module:log("error", "Attempt to open archive storage returned null driver"); |
f21147d56bc4
mod_mam_muc: Yell loudly when archive store can't be opened
Kim Alvefur <zash@zash.se>
parents:
1973
diff
changeset
|
66 end |
f21147d56bc4
mod_mam_muc: Yell loudly when archive store can't be opened
Kim Alvefur <zash@zash.se>
parents:
1973
diff
changeset
|
67 module:log("info", "See https://prosody.im/doc/storage and https://prosody.im/doc/archiving for more information"); |
f21147d56bc4
mod_mam_muc: Yell loudly when archive store can't be opened
Kim Alvefur <zash@zash.se>
parents:
1973
diff
changeset
|
68 return false; |
1311
27b2a357c73c
mod_mam_muc: porting archive checks from mod_mam (to avoid tracebacks about calling null functions)
Vadim Misbakh-Soloviov <mva@mva.name>
parents:
1279
diff
changeset
|
69 end |
27b2a357c73c
mod_mam_muc: porting archive checks from mod_mam (to avoid tracebacks about calling null functions)
Vadim Misbakh-Soloviov <mva@mva.name>
parents:
1279
diff
changeset
|
70 |
2716
02a7f9fe44fa
mod_mam_muc: Rename various fields from "logging" to "archiving"
Kim Alvefur <zash@zash.se>
parents:
2628
diff
changeset
|
71 local function archiving_enabled(room) |
1542
ccb9dc624ebd
mod_mam_muc: Split logic for determining if logging is enabled into a function
Kim Alvefur <zash@zash.se>
parents:
1541
diff
changeset
|
72 if log_all_rooms then |
ccb9dc624ebd
mod_mam_muc: Split logic for determining if logging is enabled into a function
Kim Alvefur <zash@zash.se>
parents:
1541
diff
changeset
|
73 return true; |
ccb9dc624ebd
mod_mam_muc: Split logic for determining if logging is enabled into a function
Kim Alvefur <zash@zash.se>
parents:
1541
diff
changeset
|
74 end |
2716
02a7f9fe44fa
mod_mam_muc: Rename various fields from "logging" to "archiving"
Kim Alvefur <zash@zash.se>
parents:
2628
diff
changeset
|
75 local enabled = room._data.archiving; |
1542
ccb9dc624ebd
mod_mam_muc: Split logic for determining if logging is enabled into a function
Kim Alvefur <zash@zash.se>
parents:
1541
diff
changeset
|
76 if enabled == nil then |
ccb9dc624ebd
mod_mam_muc: Split logic for determining if logging is enabled into a function
Kim Alvefur <zash@zash.se>
parents:
1541
diff
changeset
|
77 return log_by_default; |
ccb9dc624ebd
mod_mam_muc: Split logic for determining if logging is enabled into a function
Kim Alvefur <zash@zash.se>
parents:
1541
diff
changeset
|
78 end |
ccb9dc624ebd
mod_mam_muc: Split logic for determining if logging is enabled into a function
Kim Alvefur <zash@zash.se>
parents:
1541
diff
changeset
|
79 return enabled; |
ccb9dc624ebd
mod_mam_muc: Split logic for determining if logging is enabled into a function
Kim Alvefur <zash@zash.se>
parents:
1541
diff
changeset
|
80 end |
ccb9dc624ebd
mod_mam_muc: Split logic for determining if logging is enabled into a function
Kim Alvefur <zash@zash.se>
parents:
1541
diff
changeset
|
81 |
1314
cc9831033f5d
mod_mam_muc: Add and remove method overrides based on configuration instead of modifying room metatable
Kim Alvefur <zash@zash.se>
parents:
1313
diff
changeset
|
82 local send_history, save_to_history; |
cc9831033f5d
mod_mam_muc: Add and remove method overrides based on configuration instead of modifying room metatable
Kim Alvefur <zash@zash.se>
parents:
1313
diff
changeset
|
83 |
cc9831033f5d
mod_mam_muc: Add and remove method overrides based on configuration instead of modifying room metatable
Kim Alvefur <zash@zash.se>
parents:
1313
diff
changeset
|
84 -- Override history methods for all rooms. |
1543
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
85 if not new_muc then -- 0.10 or older |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
86 module:hook("muc-room-created", function (event) |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
87 local room = event.room; |
2716
02a7f9fe44fa
mod_mam_muc: Rename various fields from "logging" to "archiving"
Kim Alvefur <zash@zash.se>
parents:
2628
diff
changeset
|
88 if archiving_enabled(room) then |
1533
915bdcb35e79
mod_mam_muc: Restructure initialization
Kim Alvefur <zash@zash.se>
parents:
1532
diff
changeset
|
89 room.send_history = send_history; |
915bdcb35e79
mod_mam_muc: Restructure initialization
Kim Alvefur <zash@zash.se>
parents:
1532
diff
changeset
|
90 room.save_to_history = save_to_history; |
1314
cc9831033f5d
mod_mam_muc: Add and remove method overrides based on configuration instead of modifying room metatable
Kim Alvefur <zash@zash.se>
parents:
1313
diff
changeset
|
91 end |
1543
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
92 end); |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
93 |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
94 function module.load() |
1551
5127f4db9d39
mod_mam_muc: Try to use new MUC API for getting room objects (fixes queries to not yet initialized rooms)
Kim Alvefur <zash@zash.se>
parents:
1548
diff
changeset
|
95 for room in each_room() do |
2716
02a7f9fe44fa
mod_mam_muc: Rename various fields from "logging" to "archiving"
Kim Alvefur <zash@zash.se>
parents:
2628
diff
changeset
|
96 if archiving_enabled(room) then |
1543
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
97 room.send_history = send_history; |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
98 room.save_to_history = save_to_history; |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
99 end |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
100 end |
1314
cc9831033f5d
mod_mam_muc: Add and remove method overrides based on configuration instead of modifying room metatable
Kim Alvefur <zash@zash.se>
parents:
1313
diff
changeset
|
101 end |
1543
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
102 function module.unload() |
1551
5127f4db9d39
mod_mam_muc: Try to use new MUC API for getting room objects (fixes queries to not yet initialized rooms)
Kim Alvefur <zash@zash.se>
parents:
1548
diff
changeset
|
103 for room in each_room() do |
1543
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
104 if room.send_history == send_history then |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
105 room.send_history = nil; |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
106 room.save_to_history = nil; |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
107 end |
1314
cc9831033f5d
mod_mam_muc: Add and remove method overrides based on configuration instead of modifying room metatable
Kim Alvefur <zash@zash.se>
parents:
1313
diff
changeset
|
108 end |
cc9831033f5d
mod_mam_muc: Add and remove method overrides based on configuration instead of modifying room metatable
Kim Alvefur <zash@zash.se>
parents:
1313
diff
changeset
|
109 end |
1533
915bdcb35e79
mod_mam_muc: Restructure initialization
Kim Alvefur <zash@zash.se>
parents:
1532
diff
changeset
|
110 end |
915bdcb35e79
mod_mam_muc: Restructure initialization
Kim Alvefur <zash@zash.se>
parents:
1532
diff
changeset
|
111 |
915bdcb35e79
mod_mam_muc: Restructure initialization
Kim Alvefur <zash@zash.se>
parents:
1532
diff
changeset
|
112 if not log_all_rooms then |
1276
01dfaf2f2782
mod_mam_muc: Hide logging option from room configuration if set to log all rooms
Kim Alvefur <zash@zash.se>
parents:
1275
diff
changeset
|
113 module:hook("muc-config-form", function(event) |
01dfaf2f2782
mod_mam_muc: Hide logging option from room configuration if set to log all rooms
Kim Alvefur <zash@zash.se>
parents:
1275
diff
changeset
|
114 local room, form = event.room, event.form; |
01dfaf2f2782
mod_mam_muc: Hide logging option from room configuration if set to log all rooms
Kim Alvefur <zash@zash.se>
parents:
1275
diff
changeset
|
115 table.insert(form, |
01dfaf2f2782
mod_mam_muc: Hide logging option from room configuration if set to log all rooms
Kim Alvefur <zash@zash.se>
parents:
1275
diff
changeset
|
116 { |
2716
02a7f9fe44fa
mod_mam_muc: Rename various fields from "logging" to "archiving"
Kim Alvefur <zash@zash.se>
parents:
2628
diff
changeset
|
117 name = muc_form_enable, |
1276
01dfaf2f2782
mod_mam_muc: Hide logging option from room configuration if set to log all rooms
Kim Alvefur <zash@zash.se>
parents:
1275
diff
changeset
|
118 type = "boolean", |
2716
02a7f9fe44fa
mod_mam_muc: Rename various fields from "logging" to "archiving"
Kim Alvefur <zash@zash.se>
parents:
2628
diff
changeset
|
119 label = "Enable archiving?", |
02a7f9fe44fa
mod_mam_muc: Rename various fields from "logging" to "archiving"
Kim Alvefur <zash@zash.se>
parents:
2628
diff
changeset
|
120 value = archiving_enabled(room), |
1276
01dfaf2f2782
mod_mam_muc: Hide logging option from room configuration if set to log all rooms
Kim Alvefur <zash@zash.se>
parents:
1275
diff
changeset
|
121 } |
01dfaf2f2782
mod_mam_muc: Hide logging option from room configuration if set to log all rooms
Kim Alvefur <zash@zash.se>
parents:
1275
diff
changeset
|
122 ); |
01dfaf2f2782
mod_mam_muc: Hide logging option from room configuration if set to log all rooms
Kim Alvefur <zash@zash.se>
parents:
1275
diff
changeset
|
123 end); |
1143
8098683b6d6f
mod_mam_muc: Allow archiving to be enabled trough in the room configuration
Kim Alvefur <zash@zash.se>
parents:
1142
diff
changeset
|
124 |
1276
01dfaf2f2782
mod_mam_muc: Hide logging option from room configuration if set to log all rooms
Kim Alvefur <zash@zash.se>
parents:
1275
diff
changeset
|
125 module:hook("muc-config-submitted", function(event) |
01dfaf2f2782
mod_mam_muc: Hide logging option from room configuration if set to log all rooms
Kim Alvefur <zash@zash.se>
parents:
1275
diff
changeset
|
126 local room, fields, changed = event.room, event.fields, event.changed; |
2716
02a7f9fe44fa
mod_mam_muc: Rename various fields from "logging" to "archiving"
Kim Alvefur <zash@zash.se>
parents:
2628
diff
changeset
|
127 local new = fields[muc_form_enable]; |
02a7f9fe44fa
mod_mam_muc: Rename various fields from "logging" to "archiving"
Kim Alvefur <zash@zash.se>
parents:
2628
diff
changeset
|
128 if new ~= room._data.archiving then |
02a7f9fe44fa
mod_mam_muc: Rename various fields from "logging" to "archiving"
Kim Alvefur <zash@zash.se>
parents:
2628
diff
changeset
|
129 room._data.archiving = new; |
1276
01dfaf2f2782
mod_mam_muc: Hide logging option from room configuration if set to log all rooms
Kim Alvefur <zash@zash.se>
parents:
1275
diff
changeset
|
130 if type(changed) == "table" then |
2716
02a7f9fe44fa
mod_mam_muc: Rename various fields from "logging" to "archiving"
Kim Alvefur <zash@zash.se>
parents:
2628
diff
changeset
|
131 changed[muc_form_enable] = true; |
1276
01dfaf2f2782
mod_mam_muc: Hide logging option from room configuration if set to log all rooms
Kim Alvefur <zash@zash.se>
parents:
1275
diff
changeset
|
132 else |
01dfaf2f2782
mod_mam_muc: Hide logging option from room configuration if set to log all rooms
Kim Alvefur <zash@zash.se>
parents:
1275
diff
changeset
|
133 event.changed = true; |
01dfaf2f2782
mod_mam_muc: Hide logging option from room configuration if set to log all rooms
Kim Alvefur <zash@zash.se>
parents:
1275
diff
changeset
|
134 end |
1314
cc9831033f5d
mod_mam_muc: Add and remove method overrides based on configuration instead of modifying room metatable
Kim Alvefur <zash@zash.se>
parents:
1313
diff
changeset
|
135 if new then |
cc9831033f5d
mod_mam_muc: Add and remove method overrides based on configuration instead of modifying room metatable
Kim Alvefur <zash@zash.se>
parents:
1313
diff
changeset
|
136 room.send_history = send_history; |
cc9831033f5d
mod_mam_muc: Add and remove method overrides based on configuration instead of modifying room metatable
Kim Alvefur <zash@zash.se>
parents:
1313
diff
changeset
|
137 room.save_to_history = save_to_history; |
cc9831033f5d
mod_mam_muc: Add and remove method overrides based on configuration instead of modifying room metatable
Kim Alvefur <zash@zash.se>
parents:
1313
diff
changeset
|
138 else |
cc9831033f5d
mod_mam_muc: Add and remove method overrides based on configuration instead of modifying room metatable
Kim Alvefur <zash@zash.se>
parents:
1313
diff
changeset
|
139 room.send_history = nil; |
cc9831033f5d
mod_mam_muc: Add and remove method overrides based on configuration instead of modifying room metatable
Kim Alvefur <zash@zash.se>
parents:
1313
diff
changeset
|
140 room.save_to_history = nil; |
cc9831033f5d
mod_mam_muc: Add and remove method overrides based on configuration instead of modifying room metatable
Kim Alvefur <zash@zash.se>
parents:
1313
diff
changeset
|
141 end |
1143
8098683b6d6f
mod_mam_muc: Allow archiving to be enabled trough in the room configuration
Kim Alvefur <zash@zash.se>
parents:
1142
diff
changeset
|
142 end |
1276
01dfaf2f2782
mod_mam_muc: Hide logging option from room configuration if set to log all rooms
Kim Alvefur <zash@zash.se>
parents:
1275
diff
changeset
|
143 end); |
01dfaf2f2782
mod_mam_muc: Hide logging option from room configuration if set to log all rooms
Kim Alvefur <zash@zash.se>
parents:
1275
diff
changeset
|
144 end |
1143
8098683b6d6f
mod_mam_muc: Allow archiving to be enabled trough in the room configuration
Kim Alvefur <zash@zash.se>
parents:
1142
diff
changeset
|
145 |
1546
fff2858c554f
mod_mam_muc: Remove parsing of 'with' field in MAM form, we currently ignore it anyways
Kim Alvefur <zash@zash.se>
parents:
1543
diff
changeset
|
146 -- Note: We ignore the 'with' field as this is internally used for stanza types |
1535
efbb047c01e7
mod_mam_muc: Update to XEP-0313 v 0.3
Kim Alvefur <zash@zash.se>
parents:
1534
diff
changeset
|
147 local query_form = dataform { |
efbb047c01e7
mod_mam_muc: Update to XEP-0313 v 0.3
Kim Alvefur <zash@zash.se>
parents:
1534
diff
changeset
|
148 { name = "FORM_TYPE"; type = "hidden"; value = xmlns_mam; }; |
efbb047c01e7
mod_mam_muc: Update to XEP-0313 v 0.3
Kim Alvefur <zash@zash.se>
parents:
1534
diff
changeset
|
149 { name = "with"; type = "jid-single"; }; |
efbb047c01e7
mod_mam_muc: Update to XEP-0313 v 0.3
Kim Alvefur <zash@zash.se>
parents:
1534
diff
changeset
|
150 { name = "start"; type = "text-single" }; |
efbb047c01e7
mod_mam_muc: Update to XEP-0313 v 0.3
Kim Alvefur <zash@zash.se>
parents:
1534
diff
changeset
|
151 { name = "end"; type = "text-single"; }; |
efbb047c01e7
mod_mam_muc: Update to XEP-0313 v 0.3
Kim Alvefur <zash@zash.se>
parents:
1534
diff
changeset
|
152 }; |
efbb047c01e7
mod_mam_muc: Update to XEP-0313 v 0.3
Kim Alvefur <zash@zash.se>
parents:
1534
diff
changeset
|
153 |
efbb047c01e7
mod_mam_muc: Update to XEP-0313 v 0.3
Kim Alvefur <zash@zash.se>
parents:
1534
diff
changeset
|
154 -- Serve form |
1627
458c80904525
mod_mam_muc: fix <iq type='get' to='room-bare-jid'> query
Stuart Carnie <stuart.carnie@gmail.com>
parents:
1616
diff
changeset
|
155 module:hook("iq-get/bare/"..xmlns_mam..":query", function(event) |
1535
efbb047c01e7
mod_mam_muc: Update to XEP-0313 v 0.3
Kim Alvefur <zash@zash.se>
parents:
1534
diff
changeset
|
156 local origin, stanza = event.origin, event.stanza; |
1691
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
157 origin.send(st.reply(stanza):add_child(query_form:form())); |
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
158 return true; |
1535
efbb047c01e7
mod_mam_muc: Update to XEP-0313 v 0.3
Kim Alvefur <zash@zash.se>
parents:
1534
diff
changeset
|
159 end); |
efbb047c01e7
mod_mam_muc: Update to XEP-0313 v 0.3
Kim Alvefur <zash@zash.se>
parents:
1534
diff
changeset
|
160 |
820 | 161 -- Handle archive queries |
1535
efbb047c01e7
mod_mam_muc: Update to XEP-0313 v 0.3
Kim Alvefur <zash@zash.se>
parents:
1534
diff
changeset
|
162 module:hook("iq-set/bare/"..xmlns_mam..":query", function(event) |
820 | 163 local origin, stanza = event.origin, event.stanza; |
2426
deedb77c4f96
mod_mam_muc: Rename room and room JID variables for consistency
Kim Alvefur <zash@zash.se>
parents:
2414
diff
changeset
|
164 local room_jid = stanza.attr.to; |
deedb77c4f96
mod_mam_muc: Rename room and room JID variables for consistency
Kim Alvefur <zash@zash.se>
parents:
2414
diff
changeset
|
165 local room_node = jid_split(room_jid); |
1382
ba17268490b7
mod_mam_muc: Fix to, from on result messages (thanks daurnimator)
Kim Alvefur <zash@zash.se>
parents:
1369
diff
changeset
|
166 local orig_from = stanza.attr.from; |
820 | 167 local query = stanza.tags[1]; |
168 | |
2426
deedb77c4f96
mod_mam_muc: Rename room and room JID variables for consistency
Kim Alvefur <zash@zash.se>
parents:
2414
diff
changeset
|
169 local room = get_room_from_jid(room_jid); |
deedb77c4f96
mod_mam_muc: Rename room and room JID variables for consistency
Kim Alvefur <zash@zash.se>
parents:
2414
diff
changeset
|
170 if not room then |
1865
db8b256f51ff
mod_admin_web,mod_carbons,mod_csi_compat,mod_mam_muc,mod_tcpproxy: Explicitly return true
Kim Alvefur <zash@zash.se>
parents:
1691
diff
changeset
|
171 origin.send(st.error_reply(stanza, "cancel", "item-not-found")) |
db8b256f51ff
mod_admin_web,mod_carbons,mod_csi_compat,mod_mam_muc,mod_tcpproxy: Explicitly return true
Kim Alvefur <zash@zash.se>
parents:
1691
diff
changeset
|
172 return true; |
820 | 173 end |
1382
ba17268490b7
mod_mam_muc: Fix to, from on result messages (thanks daurnimator)
Kim Alvefur <zash@zash.se>
parents:
1369
diff
changeset
|
174 local from = jid_bare(orig_from); |
820 | 175 |
1140
402cb9b604eb
mod_mam_muc: Send proper error reply when one is not allowed to query archive
Kim Alvefur <zash@zash.se>
parents:
1139
diff
changeset
|
176 -- Banned or not a member of a members-only room? |
2426
deedb77c4f96
mod_mam_muc: Rename room and room JID variables for consistency
Kim Alvefur <zash@zash.se>
parents:
2414
diff
changeset
|
177 local from_affiliation = room:get_affiliation(from); |
1312
a48cf3ccdf9c
mod_mam_muc: Use public API of rooms for authorization check
Kim Alvefur <zash@zash.se>
parents:
1311
diff
changeset
|
178 if from_affiliation == "outcast" -- banned |
2426
deedb77c4f96
mod_mam_muc: Rename room and room JID variables for consistency
Kim Alvefur <zash@zash.se>
parents:
2414
diff
changeset
|
179 or room:get_members_only() and not from_affiliation then -- members-only, not a member |
1865
db8b256f51ff
mod_admin_web,mod_carbons,mod_csi_compat,mod_mam_muc,mod_tcpproxy: Explicitly return true
Kim Alvefur <zash@zash.se>
parents:
1691
diff
changeset
|
180 origin.send(st.error_reply(stanza, "auth", "forbidden")) |
db8b256f51ff
mod_admin_web,mod_carbons,mod_csi_compat,mod_mam_muc,mod_tcpproxy: Explicitly return true
Kim Alvefur <zash@zash.se>
parents:
1691
diff
changeset
|
181 return true; |
820 | 182 end |
183 | |
1138
5c97ee75cadb
mod_mam_muc: Switch to iq-get hook and drop some indentation
Kim Alvefur <zash@zash.se>
parents:
820
diff
changeset
|
184 local qid = query.attr.queryid; |
5c97ee75cadb
mod_mam_muc: Switch to iq-get hook and drop some indentation
Kim Alvefur <zash@zash.se>
parents:
820
diff
changeset
|
185 |
5c97ee75cadb
mod_mam_muc: Switch to iq-get hook and drop some indentation
Kim Alvefur <zash@zash.se>
parents:
820
diff
changeset
|
186 -- Search query parameters |
1546
fff2858c554f
mod_mam_muc: Remove parsing of 'with' field in MAM form, we currently ignore it anyways
Kim Alvefur <zash@zash.se>
parents:
1543
diff
changeset
|
187 local qstart, qend; |
1535
efbb047c01e7
mod_mam_muc: Update to XEP-0313 v 0.3
Kim Alvefur <zash@zash.se>
parents:
1534
diff
changeset
|
188 local form = query:get_child("x", "jabber:x:data"); |
efbb047c01e7
mod_mam_muc: Update to XEP-0313 v 0.3
Kim Alvefur <zash@zash.se>
parents:
1534
diff
changeset
|
189 if form then |
efbb047c01e7
mod_mam_muc: Update to XEP-0313 v 0.3
Kim Alvefur <zash@zash.se>
parents:
1534
diff
changeset
|
190 local err; |
efbb047c01e7
mod_mam_muc: Update to XEP-0313 v 0.3
Kim Alvefur <zash@zash.se>
parents:
1534
diff
changeset
|
191 form, err = query_form:data(form); |
efbb047c01e7
mod_mam_muc: Update to XEP-0313 v 0.3
Kim Alvefur <zash@zash.se>
parents:
1534
diff
changeset
|
192 if err then |
1691
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
193 origin.send(st.error_reply(stanza, "modify", "bad-request", select(2, next(err)))); |
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
194 return true; |
1535
efbb047c01e7
mod_mam_muc: Update to XEP-0313 v 0.3
Kim Alvefur <zash@zash.se>
parents:
1534
diff
changeset
|
195 end |
1546
fff2858c554f
mod_mam_muc: Remove parsing of 'with' field in MAM form, we currently ignore it anyways
Kim Alvefur <zash@zash.se>
parents:
1543
diff
changeset
|
196 qstart, qend = form["start"], form["end"]; |
1535
efbb047c01e7
mod_mam_muc: Update to XEP-0313 v 0.3
Kim Alvefur <zash@zash.se>
parents:
1534
diff
changeset
|
197 end |
820 | 198 |
1138
5c97ee75cadb
mod_mam_muc: Switch to iq-get hook and drop some indentation
Kim Alvefur <zash@zash.se>
parents:
820
diff
changeset
|
199 if qstart or qend then -- Validate timestamps |
5c97ee75cadb
mod_mam_muc: Switch to iq-get hook and drop some indentation
Kim Alvefur <zash@zash.se>
parents:
820
diff
changeset
|
200 local vstart, vend = (qstart and timestamp_parse(qstart)), (qend and timestamp_parse(qend)) |
5c97ee75cadb
mod_mam_muc: Switch to iq-get hook and drop some indentation
Kim Alvefur <zash@zash.se>
parents:
820
diff
changeset
|
201 if (qstart and not vstart) or (qend and not vend) then |
5c97ee75cadb
mod_mam_muc: Switch to iq-get hook and drop some indentation
Kim Alvefur <zash@zash.se>
parents:
820
diff
changeset
|
202 origin.send(st.error_reply(stanza, "modify", "bad-request", "Invalid timestamp")) |
2500
ec046f915506
mod_mam_muc: Minor syntax change
Kim Alvefur <zash@zash.se>
parents:
2498
diff
changeset
|
203 return true; |
1138
5c97ee75cadb
mod_mam_muc: Switch to iq-get hook and drop some indentation
Kim Alvefur <zash@zash.se>
parents:
820
diff
changeset
|
204 end |
5c97ee75cadb
mod_mam_muc: Switch to iq-get hook and drop some indentation
Kim Alvefur <zash@zash.se>
parents:
820
diff
changeset
|
205 qstart, qend = vstart, vend; |
5c97ee75cadb
mod_mam_muc: Switch to iq-get hook and drop some indentation
Kim Alvefur <zash@zash.se>
parents:
820
diff
changeset
|
206 end |
820 | 207 |
2719
7568157bf998
mod_mam_muc: Add debug logging like in mod_mam
Kim Alvefur <zash@zash.se>
parents:
2718
diff
changeset
|
208 module:log("debug", "Archive query id %s from %s until %s)", |
7568157bf998
mod_mam_muc: Add debug logging like in mod_mam
Kim Alvefur <zash@zash.se>
parents:
2718
diff
changeset
|
209 tostring(qid), |
7568157bf998
mod_mam_muc: Add debug logging like in mod_mam
Kim Alvefur <zash@zash.se>
parents:
2718
diff
changeset
|
210 qstart and timestamp(qstart) or "the dawn of time", |
7568157bf998
mod_mam_muc: Add debug logging like in mod_mam
Kim Alvefur <zash@zash.se>
parents:
2718
diff
changeset
|
211 qend and timestamp(qend) or "now"); |
7568157bf998
mod_mam_muc: Add debug logging like in mod_mam
Kim Alvefur <zash@zash.se>
parents:
2718
diff
changeset
|
212 |
1141
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
213 -- RSM stuff |
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
214 local qset = rsm.get(query); |
2831
d65868fed77a
mod_mam_muc: Copy max_archive_query_results option from mod_mam
Kim Alvefur <zash@zash.se>
parents:
2723
diff
changeset
|
215 local qmax = m_min(qset and qset.max or default_max_items, max_max_items); |
1141
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
216 local reverse = qset and qset.before or false; |
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
217 |
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
218 local before, after = qset and qset.before, qset and qset.after; |
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
219 if type(before) ~= "string" then before = nil; end |
820 | 220 |
1138
5c97ee75cadb
mod_mam_muc: Switch to iq-get hook and drop some indentation
Kim Alvefur <zash@zash.se>
parents:
820
diff
changeset
|
221 -- Load all the data! |
1146
9fa89dc7a86f
mod_mam_muc: Search the rooms archive correctly (copypaste error from mod_mam)
Kim Alvefur <zash@zash.se>
parents:
1145
diff
changeset
|
222 local data, err = archive:find(room_node, { |
1141
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
223 start = qstart; ["end"] = qend; -- Time range |
1691
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
224 limit = qmax + 1; |
1141
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
225 before = before; after = after; |
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
226 reverse = reverse; |
1547
e98c335c6554
mod_mam_muc: Limit search to groupchat messages (we use the internal 'with' field stanza types)
Kim Alvefur <zash@zash.se>
parents:
1546
diff
changeset
|
227 with = "message<groupchat"; |
1141
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
228 }); |
1138
5c97ee75cadb
mod_mam_muc: Switch to iq-get hook and drop some indentation
Kim Alvefur <zash@zash.se>
parents:
820
diff
changeset
|
229 |
1141
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
230 if not data then |
1865
db8b256f51ff
mod_admin_web,mod_carbons,mod_csi_compat,mod_mam_muc,mod_tcpproxy: Explicitly return true
Kim Alvefur <zash@zash.se>
parents:
1691
diff
changeset
|
231 origin.send(st.error_reply(stanza, "cancel", "internal-server-error")); |
db8b256f51ff
mod_admin_web,mod_carbons,mod_csi_compat,mod_mam_muc,mod_tcpproxy: Explicitly return true
Kim Alvefur <zash@zash.se>
parents:
1691
diff
changeset
|
232 return true; |
1141
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
233 end |
2832
15a9d508c5f7
mod_mam_muc: Pass along the size of the matching set, if returned from storage driver
Kim Alvefur <zash@zash.se>
parents:
2831
diff
changeset
|
234 local total = tonumber(err); |
1138
5c97ee75cadb
mod_mam_muc: Switch to iq-get hook and drop some indentation
Kim Alvefur <zash@zash.se>
parents:
820
diff
changeset
|
235 |
1534
4dd6eebc8fbd
mod_mam_muc: Minor moving about of variables
Kim Alvefur <zash@zash.se>
parents:
1533
diff
changeset
|
236 local msg_reply_attr = { to = stanza.attr.from, from = stanza.attr.to }; |
4dd6eebc8fbd
mod_mam_muc: Minor moving about of variables
Kim Alvefur <zash@zash.se>
parents:
1533
diff
changeset
|
237 |
1691
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
238 local results = {}; |
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
239 |
1141
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
240 -- Wrap it in stuff and deliver |
1691
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
241 local first, last; |
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
242 local count = 0; |
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
243 local complete = "true"; |
1141
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
244 for id, item, when in data do |
1691
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
245 count = count + 1; |
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
246 if count > qmax then |
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
247 complete = nil; |
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
248 break; |
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
249 end |
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
250 local fwd_st = st.message(msg_reply_attr) |
1141
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
251 :tag("result", { xmlns = xmlns_mam, queryid = qid, id = id }) |
1138
5c97ee75cadb
mod_mam_muc: Switch to iq-get hook and drop some indentation
Kim Alvefur <zash@zash.se>
parents:
820
diff
changeset
|
252 :tag("forwarded", { xmlns = xmlns_forward }) |
5c97ee75cadb
mod_mam_muc: Switch to iq-get hook and drop some indentation
Kim Alvefur <zash@zash.se>
parents:
820
diff
changeset
|
253 :tag("delay", { xmlns = xmlns_delay, stamp = timestamp(when) }):up(); |
1141
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
254 |
2833
4f9466be7b46
mod_mam_muc: Add comment describing stripping of <x> tag in results
Kim Alvefur <zash@zash.se>
parents:
2832
diff
changeset
|
255 -- Strip <x> tag, containing the original senders JID, unless the room makes this public |
2721
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
256 if room:get_whois() ~= "anyone" then |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
257 item:maptags(function (tag) |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
258 if tag.name == "x" and tag.attr.xmlns == xmlns_muc_user then |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
259 return nil; |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
260 end |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
261 return tag; |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
262 end); |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
263 end |
1141
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
264 if not is_stanza(item) then |
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
265 item = st.deserialize(item); |
1138
5c97ee75cadb
mod_mam_muc: Switch to iq-get hook and drop some indentation
Kim Alvefur <zash@zash.se>
parents:
820
diff
changeset
|
266 end |
1141
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
267 item.attr.xmlns = "jabber:client"; |
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
268 fwd_st:add_child(item); |
820 | 269 |
1141
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
270 if not first then first = id; end |
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
271 last = id; |
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
272 |
1691
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
273 if reverse then |
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
274 results[count] = fwd_st; |
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
275 else |
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
276 origin.send(fwd_st); |
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
277 end |
1138
5c97ee75cadb
mod_mam_muc: Switch to iq-get hook and drop some indentation
Kim Alvefur <zash@zash.se>
parents:
820
diff
changeset
|
278 end |
2500
ec046f915506
mod_mam_muc: Minor syntax change
Kim Alvefur <zash@zash.se>
parents:
2498
diff
changeset
|
279 |
1691
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
280 if reverse then |
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
281 for i = #results, 1, -1 do |
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
282 origin.send(results[i]); |
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
283 end |
2502
f576ac1cad65
mod_mam_muc: Move swapping of reversed variables (like 5fb917b86838 for mod_mam)
Kim Alvefur <zash@zash.se>
parents:
2501
diff
changeset
|
284 first, last = last, first; |
1691
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
285 end |
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
286 |
1138
5c97ee75cadb
mod_mam_muc: Switch to iq-get hook and drop some indentation
Kim Alvefur <zash@zash.se>
parents:
820
diff
changeset
|
287 -- That's all folks! |
5c97ee75cadb
mod_mam_muc: Switch to iq-get hook and drop some indentation
Kim Alvefur <zash@zash.se>
parents:
820
diff
changeset
|
288 module:log("debug", "Archive query %s completed", tostring(qid)); |
820 | 289 |
2507
b8a66805459e
mod_mam_muc: Update to XEP-0313 0.5.1
Kim Alvefur <zash@zash.se>
parents:
2502
diff
changeset
|
290 origin.send(st.reply(stanza) |
1691
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
291 :tag("fin", { xmlns = xmlns_mam, queryid = qid, complete = complete }) |
1535
efbb047c01e7
mod_mam_muc: Update to XEP-0313 v 0.3
Kim Alvefur <zash@zash.se>
parents:
1534
diff
changeset
|
292 :add_child(rsm.generate { |
2832
15a9d508c5f7
mod_mam_muc: Pass along the size of the matching set, if returned from storage driver
Kim Alvefur <zash@zash.se>
parents:
2831
diff
changeset
|
293 first = first, last = last, count = total })); |
1691
1a8c791d365f
mod_mam_muc: d20cfc5ba827 .. cd87a2eba8f2 here too (uh, duplicated code)
Kim Alvefur <zash@zash.se>
parents:
1679
diff
changeset
|
294 return true; |
820 | 295 end); |
296 | |
1543
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
297 module:hook("muc-get-history", function (event) |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
298 local room = event.room; |
2716
02a7f9fe44fa
mod_mam_muc: Rename various fields from "logging" to "archiving"
Kim Alvefur <zash@zash.se>
parents:
2628
diff
changeset
|
299 if not archiving_enabled(room) then return end |
1543
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
300 local room_jid = room.jid; |
2723
ec02ee02a04b
mod_mam_muc: Handle missing maxstanzas (thanks Martin)
Kim Alvefur <zash@zash.se>
parents:
2722
diff
changeset
|
301 local maxstanzas = event.maxstanzas or math.huge; |
1543
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
302 local maxchars = event.maxchars; |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
303 local since = event.since; |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
304 local to = event.to; |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
305 |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
306 -- Load all the data! |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
307 local query = { |
2718
02d688ba7739
mod_mam_muc: Make calculation of max history length more like in mod_muc
Kim Alvefur <zash@zash.se>
parents:
2716
diff
changeset
|
308 limit = math.min(maxstanzas, get_historylength(room)); |
1543
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
309 start = since; |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
310 reverse = true; |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
311 with = "message<groupchat"; |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
312 } |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
313 local data, err = archive:find(jid_split(room_jid), query); |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
314 |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
315 if not data then |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
316 module:log("error", "Could not fetch history: %s", tostring(err)); |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
317 return |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
318 end |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
319 |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
320 local history, i = {}, 1; |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
321 |
2628
fbb26a56a667
mod_mam_muc: Include stanza-id in history replay
Kim Alvefur <zash@zash.se>
parents:
2627
diff
changeset
|
322 for id, item, when in data do |
1543
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
323 item.attr.to = to; |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
324 item:tag("delay", { xmlns = "urn:xmpp:delay", from = room_jid, stamp = timestamp(when) }):up(); -- XEP-0203 |
2628
fbb26a56a667
mod_mam_muc: Include stanza-id in history replay
Kim Alvefur <zash@zash.se>
parents:
2627
diff
changeset
|
325 item:tag("stanza-id", { xmlns = xmlns_st_id, by = room_jid, id = id }):up(); |
2721
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
326 if room:get_whois() ~= "anyone" then |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
327 item:maptags(function (tag) |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
328 if tag.name == "x" and tag.attr.xmlns == xmlns_muc_user then |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
329 return nil; |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
330 end |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
331 return tag; |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
332 end); |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
333 end |
1543
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
334 if maxchars then |
1649
ab4073468dfb
mod_mam_muc: Fix character limit again(?)
Kim Alvefur <zash@zash.se>
parents:
1636
diff
changeset
|
335 local chars = #tostring(item); |
1636
7fa0c41792c7
mod_mam_muc: Fix character limit
Kim Alvefur <zash@zash.se>
parents:
1627
diff
changeset
|
336 if maxchars - chars < 0 then |
1543
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
337 break |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
338 end |
1649
ab4073468dfb
mod_mam_muc: Fix character limit again(?)
Kim Alvefur <zash@zash.se>
parents:
1636
diff
changeset
|
339 maxchars = maxchars - chars; |
1543
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
340 end |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
341 history[i], i = item, i+1; |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
342 -- module:log("debug", tostring(item)); |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
343 end |
1650
66d67f0bae16
mod_mam_muc: Cleanup [luacheck]
Kim Alvefur <zash@zash.se>
parents:
1649
diff
changeset
|
344 function event.next_stanza() |
1543
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
345 i = i - 1; |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
346 return history[i]; |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
347 end |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
348 return true; |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
349 end, 1); |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
350 |
1519
67c80abe742e
mod_mam_muc: Fix add/removal of room method overrides
Kim Alvefur <zash@zash.se>
parents:
1430
diff
changeset
|
351 function send_history(self, to, stanza) |
1278
40f077b18dfe
mod_mam_muc: Override sending of room history and use archives
Kim Alvefur <zash@zash.se>
parents:
1277
diff
changeset
|
352 local maxchars, maxstanzas, seconds, since; |
40f077b18dfe
mod_mam_muc: Override sending of room history and use archives
Kim Alvefur <zash@zash.se>
parents:
1277
diff
changeset
|
353 local history_tag = stanza:find("{http://jabber.org/protocol/muc}x/history") |
40f077b18dfe
mod_mam_muc: Override sending of room history and use archives
Kim Alvefur <zash@zash.se>
parents:
1277
diff
changeset
|
354 if history_tag then |
40f077b18dfe
mod_mam_muc: Override sending of room history and use archives
Kim Alvefur <zash@zash.se>
parents:
1277
diff
changeset
|
355 module:log("debug", tostring(history_tag)); |
40f077b18dfe
mod_mam_muc: Override sending of room history and use archives
Kim Alvefur <zash@zash.se>
parents:
1277
diff
changeset
|
356 local history_attr = history_tag.attr; |
40f077b18dfe
mod_mam_muc: Override sending of room history and use archives
Kim Alvefur <zash@zash.se>
parents:
1277
diff
changeset
|
357 maxchars = tonumber(history_attr.maxchars); |
40f077b18dfe
mod_mam_muc: Override sending of room history and use archives
Kim Alvefur <zash@zash.se>
parents:
1277
diff
changeset
|
358 maxstanzas = tonumber(history_attr.maxstanzas); |
40f077b18dfe
mod_mam_muc: Override sending of room history and use archives
Kim Alvefur <zash@zash.se>
parents:
1277
diff
changeset
|
359 seconds = tonumber(history_attr.seconds); |
40f077b18dfe
mod_mam_muc: Override sending of room history and use archives
Kim Alvefur <zash@zash.se>
parents:
1277
diff
changeset
|
360 since = history_attr.since; |
40f077b18dfe
mod_mam_muc: Override sending of room history and use archives
Kim Alvefur <zash@zash.se>
parents:
1277
diff
changeset
|
361 if since then |
40f077b18dfe
mod_mam_muc: Override sending of room history and use archives
Kim Alvefur <zash@zash.se>
parents:
1277
diff
changeset
|
362 since = timestamp_parse(since); |
40f077b18dfe
mod_mam_muc: Override sending of room history and use archives
Kim Alvefur <zash@zash.se>
parents:
1277
diff
changeset
|
363 end |
40f077b18dfe
mod_mam_muc: Override sending of room history and use archives
Kim Alvefur <zash@zash.se>
parents:
1277
diff
changeset
|
364 if seconds then |
40f077b18dfe
mod_mam_muc: Override sending of room history and use archives
Kim Alvefur <zash@zash.se>
parents:
1277
diff
changeset
|
365 since = math.max(os.time() - seconds, since or 0); |
40f077b18dfe
mod_mam_muc: Override sending of room history and use archives
Kim Alvefur <zash@zash.se>
parents:
1277
diff
changeset
|
366 end |
40f077b18dfe
mod_mam_muc: Override sending of room history and use archives
Kim Alvefur <zash@zash.se>
parents:
1277
diff
changeset
|
367 end |
40f077b18dfe
mod_mam_muc: Override sending of room history and use archives
Kim Alvefur <zash@zash.se>
parents:
1277
diff
changeset
|
368 |
1543
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
369 local event = { |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
370 room = self; |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
371 to = to; -- `to` is required to calculate the character count for `maxchars` |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
372 maxchars = maxchars, maxstanzas = maxstanzas, since = since; |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
373 next_stanza = function() end; -- events should define this iterator |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
374 }; |
1278
40f077b18dfe
mod_mam_muc: Override sending of room history and use archives
Kim Alvefur <zash@zash.se>
parents:
1277
diff
changeset
|
375 |
1543
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
376 module:fire_event("muc-get-history", event); |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
377 |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
378 for msg in event.next_stanza, event do |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
379 self:_route_stanza(msg); |
1278
40f077b18dfe
mod_mam_muc: Override sending of room history and use archives
Kim Alvefur <zash@zash.se>
parents:
1277
diff
changeset
|
380 end |
40f077b18dfe
mod_mam_muc: Override sending of room history and use archives
Kim Alvefur <zash@zash.se>
parents:
1277
diff
changeset
|
381 end |
40f077b18dfe
mod_mam_muc: Override sending of room history and use archives
Kim Alvefur <zash@zash.se>
parents:
1277
diff
changeset
|
382 |
820 | 383 -- Handle messages |
1519
67c80abe742e
mod_mam_muc: Fix add/removal of room method overrides
Kim Alvefur <zash@zash.se>
parents:
1430
diff
changeset
|
384 function save_to_history(self, stanza) |
2627
3f166242b460
mod_mam_muc: Add stanza-id tags (updates to XEP-0313 v0.6)
Kim Alvefur <zash@zash.se>
parents:
2626
diff
changeset
|
385 local room_node, room_host = jid_split(self.jid); |
3f166242b460
mod_mam_muc: Add stanza-id tags (updates to XEP-0313 v0.6)
Kim Alvefur <zash@zash.se>
parents:
2626
diff
changeset
|
386 |
3f166242b460
mod_mam_muc: Add stanza-id tags (updates to XEP-0313 v0.6)
Kim Alvefur <zash@zash.se>
parents:
2626
diff
changeset
|
387 -- Filter out <stanza-id> that claim to be from us |
3f166242b460
mod_mam_muc: Add stanza-id tags (updates to XEP-0313 v0.6)
Kim Alvefur <zash@zash.se>
parents:
2626
diff
changeset
|
388 stanza:maptags(function (tag) |
3f166242b460
mod_mam_muc: Add stanza-id tags (updates to XEP-0313 v0.6)
Kim Alvefur <zash@zash.se>
parents:
2626
diff
changeset
|
389 if tag.name == "stanza-id" and tag.attr.xmlns == xmlns_st_id |
3f166242b460
mod_mam_muc: Add stanza-id tags (updates to XEP-0313 v0.6)
Kim Alvefur <zash@zash.se>
parents:
2626
diff
changeset
|
390 and jid_prep(tag.attr.by) == self.jid then |
3f166242b460
mod_mam_muc: Add stanza-id tags (updates to XEP-0313 v0.6)
Kim Alvefur <zash@zash.se>
parents:
2626
diff
changeset
|
391 return nil; |
3f166242b460
mod_mam_muc: Add stanza-id tags (updates to XEP-0313 v0.6)
Kim Alvefur <zash@zash.se>
parents:
2626
diff
changeset
|
392 end |
2721
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
393 if tag.name == "x" and tag.attr.xmlns == xmlns_muc_user then |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
394 return nil; |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
395 end |
2627
3f166242b460
mod_mam_muc: Add stanza-id tags (updates to XEP-0313 v0.6)
Kim Alvefur <zash@zash.se>
parents:
2626
diff
changeset
|
396 return tag; |
3f166242b460
mod_mam_muc: Add stanza-id tags (updates to XEP-0313 v0.6)
Kim Alvefur <zash@zash.se>
parents:
2626
diff
changeset
|
397 end); |
820 | 398 |
2721
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
399 local stored_stanza = stanza; |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
400 |
2722
e32bf5e19acd
mod_mam_muc: Only collect original JID for messages (unavailable presence seems to cause an error)
Kim Alvefur <zash@zash.se>
parents:
2721
diff
changeset
|
401 if stanza.name == "message" and self:get_whois() == "anyone" then |
2721
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
402 stored_stanza = st.clone(stanza); |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
403 local actor = jid_bare(self._occupants[stanza.attr.from].jid); |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
404 local affiliation = self:get_affiliation(actor) or "none"; |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
405 local role = self:get_role(actor) or self:get_default_role(affiliation); |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
406 stored_stanza:add_direct_child(st.stanza("x", { xmlns = xmlns_muc_user }) |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
407 :tag("item", { affiliation = affiliation; role = role; jid = actor })); |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
408 end |
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
409 |
1279
2118a2eeb1d5
mod_mam_muc: Override method for storing history messages instead of hooking stanza events
Kim Alvefur <zash@zash.se>
parents:
1278
diff
changeset
|
410 -- Policy check |
2716
02a7f9fe44fa
mod_mam_muc: Rename various fields from "logging" to "archiving"
Kim Alvefur <zash@zash.se>
parents:
2628
diff
changeset
|
411 if not archiving_enabled(self) then return end -- Don't log |
1143
8098683b6d6f
mod_mam_muc: Allow archiving to be enabled trough in the room configuration
Kim Alvefur <zash@zash.se>
parents:
1142
diff
changeset
|
412 |
820 | 413 -- And stash it |
1385
da9469e68dee
mod_mam_muc: Place stanza type in 'with' column; when sending history, only send messages with type=groupchat
daurnimator <quae@daurnimator.com>
parents:
1382
diff
changeset
|
414 local with = stanza.name |
da9469e68dee
mod_mam_muc: Place stanza type in 'with' column; when sending history, only send messages with type=groupchat
daurnimator <quae@daurnimator.com>
parents:
1382
diff
changeset
|
415 if stanza.attr.type then |
da9469e68dee
mod_mam_muc: Place stanza type in 'with' column; when sending history, only send messages with type=groupchat
daurnimator <quae@daurnimator.com>
parents:
1382
diff
changeset
|
416 with = with .. "<" .. stanza.attr.type |
da9469e68dee
mod_mam_muc: Place stanza type in 'with' column; when sending history, only send messages with type=groupchat
daurnimator <quae@daurnimator.com>
parents:
1382
diff
changeset
|
417 end |
2627
3f166242b460
mod_mam_muc: Add stanza-id tags (updates to XEP-0313 v0.6)
Kim Alvefur <zash@zash.se>
parents:
2626
diff
changeset
|
418 |
2721
391c508e0b75
mod_mam_muc: Store and return original JID, role and affiliation (fixes #903)
Kim Alvefur <zash@zash.se>
parents:
2720
diff
changeset
|
419 local id = archive:append(room_node, nil, stored_stanza, time_now(), with); |
2627
3f166242b460
mod_mam_muc: Add stanza-id tags (updates to XEP-0313 v0.6)
Kim Alvefur <zash@zash.se>
parents:
2626
diff
changeset
|
420 |
3f166242b460
mod_mam_muc: Add stanza-id tags (updates to XEP-0313 v0.6)
Kim Alvefur <zash@zash.se>
parents:
2626
diff
changeset
|
421 if id then |
3f166242b460
mod_mam_muc: Add stanza-id tags (updates to XEP-0313 v0.6)
Kim Alvefur <zash@zash.se>
parents:
2626
diff
changeset
|
422 stanza:add_direct_child(st.stanza("stanza-id", { xmlns = xmlns_st_id, by = self.jid, id = id })); |
3f166242b460
mod_mam_muc: Add stanza-id tags (updates to XEP-0313 v0.6)
Kim Alvefur <zash@zash.se>
parents:
2626
diff
changeset
|
423 end |
820 | 424 end |
425 | |
1543
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
426 module:hook("muc-broadcast-message", function (event) |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
427 local room, stanza = event.room, event.stanza; |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
428 if stanza:get_child("body") then |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
429 save_to_history(room, stanza); |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
430 end |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
431 end); |
57fb9ce21f9c
mod_mam_muc: Add compatibility with the new MUC code in trunk
Kim Alvefur <zash@zash.se>
parents:
1542
diff
changeset
|
432 |
1616
28411e97db94
mod_mam_muc: support to disable presence logging via muc_log_presences
Stuart Carnie <stuart.carnie@gmail.com>
parents:
1571
diff
changeset
|
433 if module:get_option_boolean("muc_log_presences", true) then |
28411e97db94
mod_mam_muc: support to disable presence logging via muc_log_presences
Stuart Carnie <stuart.carnie@gmail.com>
parents:
1571
diff
changeset
|
434 module:hook("muc-occupant-joined", function (event) |
28411e97db94
mod_mam_muc: support to disable presence logging via muc_log_presences
Stuart Carnie <stuart.carnie@gmail.com>
parents:
1571
diff
changeset
|
435 save_to_history(event.room, st.stanza("presence", { from = event.nick })); |
28411e97db94
mod_mam_muc: support to disable presence logging via muc_log_presences
Stuart Carnie <stuart.carnie@gmail.com>
parents:
1571
diff
changeset
|
436 end); |
28411e97db94
mod_mam_muc: support to disable presence logging via muc_log_presences
Stuart Carnie <stuart.carnie@gmail.com>
parents:
1571
diff
changeset
|
437 module:hook("muc-occupant-left", function (event) |
28411e97db94
mod_mam_muc: support to disable presence logging via muc_log_presences
Stuart Carnie <stuart.carnie@gmail.com>
parents:
1571
diff
changeset
|
438 save_to_history(event.room, st.stanza("presence", { type = "unavailable", from = event.nick })); |
28411e97db94
mod_mam_muc: support to disable presence logging via muc_log_presences
Stuart Carnie <stuart.carnie@gmail.com>
parents:
1571
diff
changeset
|
439 end); |
28411e97db94
mod_mam_muc: support to disable presence logging via muc_log_presences
Stuart Carnie <stuart.carnie@gmail.com>
parents:
1571
diff
changeset
|
440 end |
1548
d3c847070618
mod_mam_muc: Store joins and leaves
Kim Alvefur <zash@zash.se>
parents:
1547
diff
changeset
|
441 |
2835
b69ef062806e
mod_mam_muc: Warn if the storage driver is missing the deletion API (instead of a traceback) (thanks asterix)
Kim Alvefur <zash@zash.se>
parents:
2833
diff
changeset
|
442 if not archive.delete then |
b69ef062806e
mod_mam_muc: Warn if the storage driver is missing the deletion API (instead of a traceback) (thanks asterix)
Kim Alvefur <zash@zash.se>
parents:
2833
diff
changeset
|
443 module:log("warn", "Storage driver %s does not support deletion", archive._provided_by); |
b69ef062806e
mod_mam_muc: Warn if the storage driver is missing the deletion API (instead of a traceback) (thanks asterix)
Kim Alvefur <zash@zash.se>
parents:
2833
diff
changeset
|
444 module:log("warn", "Archived message will persist after a room has been destroyed"); |
b69ef062806e
mod_mam_muc: Warn if the storage driver is missing the deletion API (instead of a traceback) (thanks asterix)
Kim Alvefur <zash@zash.se>
parents:
2833
diff
changeset
|
445 else |
b69ef062806e
mod_mam_muc: Warn if the storage driver is missing the deletion API (instead of a traceback) (thanks asterix)
Kim Alvefur <zash@zash.se>
parents:
2833
diff
changeset
|
446 module:hook("muc-room-destroyed", function(event) |
b69ef062806e
mod_mam_muc: Warn if the storage driver is missing the deletion API (instead of a traceback) (thanks asterix)
Kim Alvefur <zash@zash.se>
parents:
2833
diff
changeset
|
447 local room_node = jid_split(event.room.jid); |
b69ef062806e
mod_mam_muc: Warn if the storage driver is missing the deletion API (instead of a traceback) (thanks asterix)
Kim Alvefur <zash@zash.se>
parents:
2833
diff
changeset
|
448 archive:delete(room_node); |
b69ef062806e
mod_mam_muc: Warn if the storage driver is missing the deletion API (instead of a traceback) (thanks asterix)
Kim Alvefur <zash@zash.se>
parents:
2833
diff
changeset
|
449 end); |
b69ef062806e
mod_mam_muc: Warn if the storage driver is missing the deletion API (instead of a traceback) (thanks asterix)
Kim Alvefur <zash@zash.se>
parents:
2833
diff
changeset
|
450 end |
1277
999891a9ae5d
mod_mam_muc: Remove archives when a room is destroyed
Kim Alvefur <zash@zash.se>
parents:
1276
diff
changeset
|
451 |
1141
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
452 -- And role/affiliation changes? |
1091be1c3aba
mod_mam_muc: Switch to new stanza storage API
Kim Alvefur <zash@zash.se>
parents:
1140
diff
changeset
|
453 |
820 | 454 module:add_feature(xmlns_mam); |
1679
c77e9522dc66
mod_mam_muc: Advertise MAM feature on bare JID room disco#info (only effective after prosody 57bc52f67564)
Kim Alvefur <zash@zash.se>
parents:
1650
diff
changeset
|
455 |
c77e9522dc66
mod_mam_muc: Advertise MAM feature on bare JID room disco#info (only effective after prosody 57bc52f67564)
Kim Alvefur <zash@zash.se>
parents:
1650
diff
changeset
|
456 module:hook("muc-disco#info", function(event) |
c77e9522dc66
mod_mam_muc: Advertise MAM feature on bare JID room disco#info (only effective after prosody 57bc52f67564)
Kim Alvefur <zash@zash.se>
parents:
1650
diff
changeset
|
457 event.reply:tag("feature", {var=xmlns_mam}):up(); |
c77e9522dc66
mod_mam_muc: Advertise MAM feature on bare JID room disco#info (only effective after prosody 57bc52f67564)
Kim Alvefur <zash@zash.se>
parents:
1650
diff
changeset
|
458 end); |