Sat, 24 Jun 2023 09:59:07 +0200
clix.adhoc: Move stanza to dataform converter here
Removes the need for verse to have a custom util.dataforms fork only for
this
168
75e8ca131178
Update to handle Prosody module namespacing
Kim Alvefur <zash@zash.se>
parents:
161
diff
changeset
|
1 | local jid_split = require"prosody.util.jid".split; |
75e8ca131178
Update to handle Prosody module namespacing
Kim Alvefur <zash@zash.se>
parents:
161
diff
changeset
|
2 | local bare_jid = require"prosody.util.jid".bare; |
75e8ca131178
Update to handle Prosody module namespacing
Kim Alvefur <zash@zash.se>
parents:
161
diff
changeset
|
3 | local datetime = require"prosody.util.datetime"; |
75
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
4 | return function (opts, arg) |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
5 | if opts.short_help then |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
6 | print("Fetch archived messages"); |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
7 | return; |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
8 | end |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
9 | |
159
68e09745d928
clix.archive: Handle partial timestamps (e.g. hh:mm or yyyy-mm-dd)
Kim Alvefur <zash@zash.se>
parents:
148
diff
changeset
|
10 | local function parse_datetime(s) |
68e09745d928
clix.archive: Handle partial timestamps (e.g. hh:mm or yyyy-mm-dd)
Kim Alvefur <zash@zash.se>
parents:
148
diff
changeset
|
11 | if s:match("^%d%d:") then |
68e09745d928
clix.archive: Handle partial timestamps (e.g. hh:mm or yyyy-mm-dd)
Kim Alvefur <zash@zash.se>
parents:
148
diff
changeset
|
12 | s = datetime.date().."T"..s; |
68e09745d928
clix.archive: Handle partial timestamps (e.g. hh:mm or yyyy-mm-dd)
Kim Alvefur <zash@zash.se>
parents:
148
diff
changeset
|
13 | end |
68e09745d928
clix.archive: Handle partial timestamps (e.g. hh:mm or yyyy-mm-dd)
Kim Alvefur <zash@zash.se>
parents:
148
diff
changeset
|
14 | if #s < 20 then |
68e09745d928
clix.archive: Handle partial timestamps (e.g. hh:mm or yyyy-mm-dd)
Kim Alvefur <zash@zash.se>
parents:
148
diff
changeset
|
15 | s = s .. ("0000-01-01T00:00:00Z"):sub(#s+1) |
68e09745d928
clix.archive: Handle partial timestamps (e.g. hh:mm or yyyy-mm-dd)
Kim Alvefur <zash@zash.se>
parents:
148
diff
changeset
|
16 | end |
68e09745d928
clix.archive: Handle partial timestamps (e.g. hh:mm or yyyy-mm-dd)
Kim Alvefur <zash@zash.se>
parents:
148
diff
changeset
|
17 | return datetime.parse(s) |
68e09745d928
clix.archive: Handle partial timestamps (e.g. hh:mm or yyyy-mm-dd)
Kim Alvefur <zash@zash.se>
parents:
148
diff
changeset
|
18 | end |
114
757647426af2
clix.archive: Add support for paging backwards
Kim Alvefur <zash@zash.se>
parents:
92
diff
changeset
|
19 | local reverse = opts.before; |
78 | 20 | if opts.start then |
21 | opts.start = parse_datetime(opts.start); | |
22 | end | |
23 | if opts["end"] then | |
24 | opts["end"] = parse_datetime(opts["end"]); | |
25 | end | |
75
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
26 | local selfjid; |
81 | 27 | local function print_message(i) |
75
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
28 | -- TODO Roster lookup |
81 | 29 | local m = i.message; |
146
ae85457eca8e
clix.archive: Skip printing body-less messages
Kim Alvefur <zash@zash.se>
parents:
118
diff
changeset
|
30 | if not m:get_child("body") then return end |
75
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
31 | local a = m.attr; |
81 | 32 | if i.stamp then |
118
8bb289b2b7be
clix.archive: Show proper timestamps
Kim Alvefur <zash@zash.se>
parents:
117
diff
changeset
|
33 | print(os.date("%Y-%m-%d %H:%M:%S", i.stamp)); |
81 | 34 | end |
80
ae77d9c41f4f
clix.archive: The world doesn't revolve around us.
Kim Alvefur <zash@zash.se>
parents:
79
diff
changeset
|
35 | if a.to and bare_jid(a.to) ~= selfjid then |
75
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
36 | print("To ".. bare_jid(a.to)); |
80
ae77d9c41f4f
clix.archive: The world doesn't revolve around us.
Kim Alvefur <zash@zash.se>
parents:
79
diff
changeset
|
37 | end |
ae77d9c41f4f
clix.archive: The world doesn't revolve around us.
Kim Alvefur <zash@zash.se>
parents:
79
diff
changeset
|
38 | if a.from and bare_jid(a.from) ~= selfjid then |
75
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
39 | print("From ".. bare_jid(a.from)); |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
40 | end |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
41 | print(m:get_child_text"body"); |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
42 | print""; |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
43 | end |
147
0bc82a318c45
clix.archive: Add 'raw' output format, useful for exports
Kim Alvefur <zash@zash.se>
parents:
146
diff
changeset
|
44 | if opts.format == "raw" then |
168
75e8ca131178
Update to handle Prosody module namespacing
Kim Alvefur <zash@zash.se>
parents:
161
diff
changeset
|
45 | local st = require"prosody.util.stanza"; |
75e8ca131178
Update to handle Prosody module namespacing
Kim Alvefur <zash@zash.se>
parents:
161
diff
changeset
|
46 | local datetime = require"prosody.util.datetime".datetime; |
147
0bc82a318c45
clix.archive: Add 'raw' output format, useful for exports
Kim Alvefur <zash@zash.se>
parents:
146
diff
changeset
|
47 | function print_message(i) |
0bc82a318c45
clix.archive: Add 'raw' output format, useful for exports
Kim Alvefur <zash@zash.se>
parents:
146
diff
changeset
|
48 | print(st.stanza("forwarded",{xmlns="urn:xmpp:forward:0"}) |
0bc82a318c45
clix.archive: Add 'raw' output format, useful for exports
Kim Alvefur <zash@zash.se>
parents:
146
diff
changeset
|
49 | :tag("delay", {xmlns="urn:xmpp:delay", stamp=datetime(i.stamp)}):up() |
0bc82a318c45
clix.archive: Add 'raw' output format, useful for exports
Kim Alvefur <zash@zash.se>
parents:
146
diff
changeset
|
50 | :add_child(i.message)); |
0bc82a318c45
clix.archive: Add 'raw' output format, useful for exports
Kim Alvefur <zash@zash.se>
parents:
146
diff
changeset
|
51 | end |
148
27a9f28724d3
clix.archive: Add 'irc' output format, useful for MUC export
Kim Alvefur <zash@zash.se>
parents:
147
diff
changeset
|
52 | elseif opts.format == "irc" then |
27a9f28724d3
clix.archive: Add 'irc' output format, useful for MUC export
Kim Alvefur <zash@zash.se>
parents:
147
diff
changeset
|
53 | local date; |
27a9f28724d3
clix.archive: Add 'irc' output format, useful for MUC export
Kim Alvefur <zash@zash.se>
parents:
147
diff
changeset
|
54 | local os_date = os.date; |
27a9f28724d3
clix.archive: Add 'irc' output format, useful for MUC export
Kim Alvefur <zash@zash.se>
parents:
147
diff
changeset
|
55 | function print_message(i) |
27a9f28724d3
clix.archive: Add 'irc' output format, useful for MUC export
Kim Alvefur <zash@zash.se>
parents:
147
diff
changeset
|
56 | local m = i.message; |
27a9f28724d3
clix.archive: Add 'irc' output format, useful for MUC export
Kim Alvefur <zash@zash.se>
parents:
147
diff
changeset
|
57 | local body = m:get_child_text("body"); |
27a9f28724d3
clix.archive: Add 'irc' output format, useful for MUC export
Kim Alvefur <zash@zash.se>
parents:
147
diff
changeset
|
58 | local a = m.attr; |
27a9f28724d3
clix.archive: Add 'irc' output format, useful for MUC export
Kim Alvefur <zash@zash.se>
parents:
147
diff
changeset
|
59 | local _, _, nick = jid_split(a.from); |
27a9f28724d3
clix.archive: Add 'irc' output format, useful for MUC export
Kim Alvefur <zash@zash.se>
parents:
147
diff
changeset
|
60 | |
27a9f28724d3
clix.archive: Add 'irc' output format, useful for MUC export
Kim Alvefur <zash@zash.se>
parents:
147
diff
changeset
|
61 | local curdate = os_date("%F", i.stamp); |
27a9f28724d3
clix.archive: Add 'irc' output format, useful for MUC export
Kim Alvefur <zash@zash.se>
parents:
147
diff
changeset
|
62 | if date ~= curdate then |
27a9f28724d3
clix.archive: Add 'irc' output format, useful for MUC export
Kim Alvefur <zash@zash.se>
parents:
147
diff
changeset
|
63 | print("-!- "..curdate); |
27a9f28724d3
clix.archive: Add 'irc' output format, useful for MUC export
Kim Alvefur <zash@zash.se>
parents:
147
diff
changeset
|
64 | date = curdate; |
27a9f28724d3
clix.archive: Add 'irc' output format, useful for MUC export
Kim Alvefur <zash@zash.se>
parents:
147
diff
changeset
|
65 | end |
27a9f28724d3
clix.archive: Add 'irc' output format, useful for MUC export
Kim Alvefur <zash@zash.se>
parents:
147
diff
changeset
|
66 | if nick and body then |
27a9f28724d3
clix.archive: Add 'irc' output format, useful for MUC export
Kim Alvefur <zash@zash.se>
parents:
147
diff
changeset
|
67 | print(("%s <%s> %s"):format(os_date("%T", i.stamp), nick, body)); |
27a9f28724d3
clix.archive: Add 'irc' output format, useful for MUC export
Kim Alvefur <zash@zash.se>
parents:
147
diff
changeset
|
68 | end |
27a9f28724d3
clix.archive: Add 'irc' output format, useful for MUC export
Kim Alvefur <zash@zash.se>
parents:
147
diff
changeset
|
69 | end |
147
0bc82a318c45
clix.archive: Add 'raw' output format, useful for exports
Kim Alvefur <zash@zash.se>
parents:
146
diff
changeset
|
70 | end |
75
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
71 | |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
72 | local function on_connect(conn) |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
73 | if opts.debug then |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
74 | conn:hook("stanza-out", print); |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
75 | conn:hook("stanza", print); |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
76 | end |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
77 | selfjid = bare_jid(conn.jid); |
161
64cb732f67e4
clix.archive: Fix MAM callback argument order
Kim Alvefur <zash@zash.se>
parents:
159
diff
changeset
|
78 | local function handle_results(result, err) |
64cb732f67e4
clix.archive: Fix MAM callback argument order
Kim Alvefur <zash@zash.se>
parents:
159
diff
changeset
|
79 | if not result then |
64cb732f67e4
clix.archive: Fix MAM callback argument order
Kim Alvefur <zash@zash.se>
parents:
159
diff
changeset
|
80 | conn:close(); |
64cb732f67e4
clix.archive: Fix MAM callback argument order
Kim Alvefur <zash@zash.se>
parents:
159
diff
changeset
|
81 | return; |
64cb732f67e4
clix.archive: Fix MAM callback argument order
Kim Alvefur <zash@zash.se>
parents:
159
diff
changeset
|
82 | end |
75
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
83 | for i=1,#result do |
81 | 84 | print_message(result[i]); |
75
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
85 | end |
114
757647426af2
clix.archive: Add support for paging backwards
Kim Alvefur <zash@zash.se>
parents:
92
diff
changeset
|
86 | if result[reverse and "first" or "last"] then |
90
3115bd81b9de
clix.archive: Be interactive when --interactive is set. --everything makes it page by itself.
Kim Alvefur <zash@zash.se>
parents:
81
diff
changeset
|
87 | local fetch_next = opts.everything; |
3115bd81b9de
clix.archive: Be interactive when --interactive is set. --everything makes it page by itself.
Kim Alvefur <zash@zash.se>
parents:
81
diff
changeset
|
88 | if opts.interactive and not fetch_next then |
3115bd81b9de
clix.archive: Be interactive when --interactive is set. --everything makes it page by itself.
Kim Alvefur <zash@zash.se>
parents:
81
diff
changeset
|
89 | io.stderr:write "--More--" |
92
a629b953780c
clix.archive: Print a newline if reading a line fails (the user pressed ^D)
Kim Alvefur <zash@zash.se>
parents:
90
diff
changeset
|
90 | fetch_next = io.read"*l" or print(); |
90
3115bd81b9de
clix.archive: Be interactive when --interactive is set. --everything makes it page by itself.
Kim Alvefur <zash@zash.se>
parents:
81
diff
changeset
|
91 | end |
3115bd81b9de
clix.archive: Be interactive when --interactive is set. --everything makes it page by itself.
Kim Alvefur <zash@zash.se>
parents:
81
diff
changeset
|
92 | if fetch_next then |
114
757647426af2
clix.archive: Add support for paging backwards
Kim Alvefur <zash@zash.se>
parents:
92
diff
changeset
|
93 | if reverse then |
757647426af2
clix.archive: Add support for paging backwards
Kim Alvefur <zash@zash.se>
parents:
92
diff
changeset
|
94 | opts.before = result.first and result.first[1]; |
757647426af2
clix.archive: Add support for paging backwards
Kim Alvefur <zash@zash.se>
parents:
92
diff
changeset
|
95 | else |
115 | 96 | opts.after = result.last; |
114
757647426af2
clix.archive: Add support for paging backwards
Kim Alvefur <zash@zash.se>
parents:
92
diff
changeset
|
97 | end |
79
a19ccb8f1ef9
clix.archive: Use --to specify where to direct the query
Kim Alvefur <zash@zash.se>
parents:
78
diff
changeset
|
98 | conn:query_archive(opts.to, opts, handle_results); |
75
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
99 | return |
90
3115bd81b9de
clix.archive: Be interactive when --interactive is set. --everything makes it page by itself.
Kim Alvefur <zash@zash.se>
parents:
81
diff
changeset
|
100 | else |
116
3ee83c4801b4
clix.archive: Fix pagination message, rsm.first is a table
Kim Alvefur <zash@zash.se>
parents:
115
diff
changeset
|
101 | local whatnext, nextpage = reverse and "before" or "after"; |
3ee83c4801b4
clix.archive: Fix pagination message, rsm.first is a table
Kim Alvefur <zash@zash.se>
parents:
115
diff
changeset
|
102 | if reverse then |
3ee83c4801b4
clix.archive: Fix pagination message, rsm.first is a table
Kim Alvefur <zash@zash.se>
parents:
115
diff
changeset
|
103 | nextpage = result.first and result.first[1]; |
3ee83c4801b4
clix.archive: Fix pagination message, rsm.first is a table
Kim Alvefur <zash@zash.se>
parents:
115
diff
changeset
|
104 | else |
3ee83c4801b4
clix.archive: Fix pagination message, rsm.first is a table
Kim Alvefur <zash@zash.se>
parents:
115
diff
changeset
|
105 | nextpage = result.last; |
161
64cb732f67e4
clix.archive: Fix MAM callback argument order
Kim Alvefur <zash@zash.se>
parents:
159
diff
changeset
|
106 | end |
116
3ee83c4801b4
clix.archive: Fix pagination message, rsm.first is a table
Kim Alvefur <zash@zash.se>
parents:
115
diff
changeset
|
107 | conn:info("Next page: --%s=%s", whatnext, nextpage); |
75
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
108 | end |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
109 | end |
117
c6b5d2039f25
clix.archive: Show number of items if available
Kim Alvefur <zash@zash.se>
parents:
116
diff
changeset
|
110 | if result.count then |
c6b5d2039f25
clix.archive: Show number of items if available
Kim Alvefur <zash@zash.se>
parents:
116
diff
changeset
|
111 | conn:info("Total: %d items", result.count); |
c6b5d2039f25
clix.archive: Show number of items if available
Kim Alvefur <zash@zash.se>
parents:
116
diff
changeset
|
112 | end |
75
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
113 | conn:close(); |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
114 | end |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
115 | conn:add_plugin"archive"; |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
116 | -- TODO conn:add_plugin"roster"; |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
117 | -- c.roster:fetch(function() |
79
a19ccb8f1ef9
clix.archive: Use --to specify where to direct the query
Kim Alvefur <zash@zash.se>
parents:
78
diff
changeset
|
118 | conn:query_archive(opts.to, opts, handle_results); |
75
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
119 | end |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
120 | clix_connect(opts, on_connect); |
8d5c99f46cb8
clix.archive: New plugin, a MAM browser
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
121 | end |