squishy

Thu, 10 Jun 2021 11:58:23 +0200

author
Kim Alvefur <zash@zash.se>
date
Thu, 10 Jun 2021 11:58:23 +0200
changeset 445
b119dc4d8bc2
parent 443
89526c890363
child 447
f3ecbf65a81e
permissions
-rw-r--r--

plugins.smacks: Don't warn about zero stanzas acked

It's only if the count somehow goes backwards that something is really
wrong. An ack for zero stanzas is fine and we don't need to do anything.

26
6c5fab6c11cf Rename verse2 -> verse
Matthew Wild <mwild1@gmail.com>
parents: 24
diff changeset
1 Output "verse.lua"
0
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
2
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
3 -- Verse-specific versions of libraries
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
4 Module "util.encodings" "libs/encodings.lua"
131
1c30dd51ca6b squishy: Add util.hashes [libs/hashes.lua]
Matthew Wild <mwild1@gmail.com>
parents: 123
diff changeset
5 Module "util.hashes" "libs/hashes.lua"
443
89526c890363 libs.hashes: Add back pure Lua sha1 implementation
Kim Alvefur <zash@zash.se>
parents: 439
diff changeset
6 Module "util.sha1" "util/sha1.lua"
136
3a85c62f544c squishy: Re-organise and add net.dns, net.adns and util.ztact
Matthew Wild <mwild1@gmail.com>
parents: 134
diff changeset
7 Module "lib.adhoc" "libs/adhoc.lib.lua"
439
6fc73ad6b1d2 util.table: Add fallback for the Prosody C module
Kim Alvefur <zash@zash.se>
parents: 426
diff changeset
8 Module "util.table" "libs/table.lua"
0
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
9
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
10 -- Prosody libraries
158
068176069dfa squishy: Add --prosody option to specify a path to a Prosody checkout to use when squishing
Matthew Wild <mwild1@gmail.com>
parents: 157
diff changeset
11 if not GetOption("prosody") then
416
92ce569b9b73 buildsys: Update to fetch from Prosody 0.10 branch
Kim Alvefur <zash@zash.se>
parents: 399
diff changeset
12 AutoFetchURL "http://hg.prosody.im/0.10/raw-file/tip/?"
158
068176069dfa squishy: Add --prosody option to specify a path to a Prosody checkout to use when squishing
Matthew Wild <mwild1@gmail.com>
parents: 157
diff changeset
13 else
068176069dfa squishy: Add --prosody option to specify a path to a Prosody checkout to use when squishing
Matthew Wild <mwild1@gmail.com>
parents: 157
diff changeset
14 AutoFetchURL(GetOption("prosody").."/?")
068176069dfa squishy: Add --prosody option to specify a path to a Prosody checkout to use when squishing
Matthew Wild <mwild1@gmail.com>
parents: 157
diff changeset
15 end
0
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
16
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
17 Module "util.stanza" "util/stanza.lua"
18
f15de643f502 squishy: Add util.timer
Matthew Wild <mwild1@gmail.com>
parents: 14
diff changeset
18 Module "util.timer" "util/timer.lua"
0
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
19 Module "util.termcolours" "util/termcolours.lua"
24
db0ed736785a squishy: Add util.uuid dependency
Matthew Wild <mwild1@gmail.com>
parents: 19
diff changeset
20 Module "util.uuid" "util/uuid.lua"
136
3a85c62f544c squishy: Re-organise and add net.dns, net.adns and util.ztact
Matthew Wild <mwild1@gmail.com>
parents: 134
diff changeset
21 Module "net.dns" "net/dns.lua"
3a85c62f544c squishy: Re-organise and add net.dns, net.adns and util.ztact
Matthew Wild <mwild1@gmail.com>
parents: 134
diff changeset
22 Module "net.adns" "net/adns.lua"
30
9c96318913f7 Revert module names throughout to their Prosody equivalents
Matthew Wild <mwild1@gmail.com>
parents: 26
diff changeset
23 Module "net.server" "net/server_select.lua"
161
b177bcea2006 squishy, verse.client, verse.component, verse.bosh: Port to util.xmppstream instead of xmlhandlers which has been removed from Prosody. Also remove util.ztact from squishy for the same reason.
Matthew Wild <mwild1@gmail.com>
parents: 158
diff changeset
24 Module "util.xmppstream" "util/xmppstream.lua"
30
9c96318913f7 Revert module names throughout to their Prosody equivalents
Matthew Wild <mwild1@gmail.com>
parents: 26
diff changeset
25 Module "util.jid" "util/jid.lua"
9c96318913f7 Revert module names throughout to their Prosody equivalents
Matthew Wild <mwild1@gmail.com>
parents: 26
diff changeset
26 Module "util.events" "util/events.lua"
123
8a079aa70b84 util.dataforms, squishy: Add util.dataforms library
Matthew Wild <mwild1@gmail.com>
parents: 116
diff changeset
27 Module "util.dataforms" "util/dataforms.lua"
214
78ae20c875cd squishy: Add a convenience function for plugins
Kim Alvefur <zash@zash.se>
parents: 208
diff changeset
28 Module "util.caps" "util/caps.lua"
227
31019cb93d59 util.vcard: Add util for converting vCard3 to/from XEP 54
Kim Alvefur <zash@zash.se>
parents: 225
diff changeset
29 Module "util.vcard" "util/vcard.lua"
238
9b6fca5d9a02 verse, squishy: Port to Prosody's util.logger. Adds new function, verse.set_log_handler(handler, levels).
Matthew Wild <mwild1@gmail.com>
parents: 233
diff changeset
30 Module "util.logger" "util/logger.lua"
278
6f58f6f3986d squishy: add util.datetime
Kim Alvefur <zash@zash.se>
parents: 273
diff changeset
31 Module "util.datetime" "util/datetime.lua"
386
7b68c57ceac2 squishy: Include util.xml and util.json
Kim Alvefur <zash@zash.se>
parents: 367
diff changeset
32 Module "util.json" "util/json.lua"
7b68c57ceac2 squishy: Include util.xml and util.json
Kim Alvefur <zash@zash.se>
parents: 367
diff changeset
33 Module "util.xml" "util/xml.lua"
387
508bf163502b Import util.rsm from prosody-modules
Kim Alvefur <zash@zash.se>
parents: 386
diff changeset
34 Module "util.rsm" "util/rsm.lua"
388
d963c8a5d89c Import util.random from Prosody (using SHA-1)
Kim Alvefur <zash@zash.se>
parents: 387
diff changeset
35 Module "util.random" "util/random.lua"
396
b0afde43b3e5 Add util.ip, dependency of net.dns since Prosody 0.9.9
Kim Alvefur <zash@zash.se>
parents: 388
diff changeset
36 Module "util.ip" "util/ip.lua"
425
9f910529d8f0 squishy: Add util.time
Matthew Wild <mwild1@gmail.com>
parents: 420
diff changeset
37 Module "util.time" "util/time.lua"
116
151c8cc776df verse.plugins.adhoc: XEP-0050 Ad-hoc commands plugin
Matthew Wild <mwild1@gmail.com>
parents: 114
diff changeset
38
357
ed12e00991b1 squishy: Add sasl mechs
Kim Alvefur <zash@zash.se>
parents: 304
diff changeset
39 Module "util.sasl.scram" "util/sasl/scram.lua"
ed12e00991b1 squishy: Add sasl mechs
Kim Alvefur <zash@zash.se>
parents: 304
diff changeset
40 Module "util.sasl.plain" "util/sasl/plain.lua"
ed12e00991b1 squishy: Add sasl mechs
Kim Alvefur <zash@zash.se>
parents: 304
diff changeset
41 Module "util.sasl.anonymous" "util/sasl/anonymous.lua"
ed12e00991b1 squishy: Add sasl mechs
Kim Alvefur <zash@zash.se>
parents: 304
diff changeset
42
14
53246b2b933b squish: Add plugins
Matthew Wild <mwild1@gmail.com>
parents: 7
diff changeset
43 -- Verse plugins
233
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
44 plugins = {
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
45 -- Login
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
46 "tls", "sasl", "bind", "session", "legacy", "compression";
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
47 -- Reliability
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
48 "smacks", "keepalive";
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
49 -- Queries
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
50 "disco", "version", "ping", "uptime";
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
51 -- Privacy control
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
52 "blocking";
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
53 -- Jingle / file transfer
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
54 "jingle", "jingle_ft", "jingle_s5b", "proxy65", "jingle_ibb";
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
55 -- Pubsub
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
56 "pubsub", "pep";
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
57 -- Command and control
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
58 "adhoc";
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
59 -- Basics
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
60 "presence", "private", "roster", "register";
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
61 -- MUC
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
62 "groupchat";
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
63 -- vCard
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
64 "vcard", "vcard_update";
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
65 -- Carbons
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
66 "carbons";
273
c5b7a4c717a6 plugins.archive: Experimental implementation of the Message Archive Management ProtoXEP
Kim Alvefur <zash@zash.se>
parents: 238
diff changeset
67
c5b7a4c717a6 plugins.archive: Experimental implementation of the Message Archive Management ProtoXEP
Kim Alvefur <zash@zash.se>
parents: 238
diff changeset
68 "archive";
233
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
69 }
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
70
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
71 for _, plugin in ipairs(plugins) do
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
72 Module("verse.plugins."..plugin)("plugins/"..plugin..".lua")
214
78ae20c875cd squishy: Add a convenience function for plugins
Kim Alvefur <zash@zash.se>
parents: 208
diff changeset
73 end
233
b5fd3292bdbd squishy: Rewrite in an attempt to curb the unbounded growth of the plugin list
Matthew Wild <mwild1@gmail.com>
parents: 227
diff changeset
74
367
8e9f44ecb95b squishy: Fetch from latest 0.9
Kim Alvefur <zash@zash.se>
parents: 366
diff changeset
75 Module "util.http" "util/http.lua"
8e9f44ecb95b squishy: Fetch from latest 0.9
Kim Alvefur <zash@zash.se>
parents: 366
diff changeset
76 Module "net.http.parser" "net/http/parser.lua"
157
7c47e5639c00 squishy: Add util.httpstream. Now also squishes bosh by default
Matthew Wild <mwild1@gmail.com>
parents: 156
diff changeset
77 Module "net.http" "net/http.lua"
426
9813b17ee096 squishy: Include util.x509, required by net.http in Prosody 0.10+
Matthew Wild <mwild1@gmail.com>
parents: 425
diff changeset
78 Module "util.x509" "util/x509.lua"
90
aa0b78053cec squishy: Add --with-bosh option to squish with verse.bosh and necessarylibraries
Matthew Wild <mwild1@gmail.com>
parents: 80
diff changeset
79
157
7c47e5639c00 squishy: Add util.httpstream. Now also squishes bosh by default
Matthew Wild <mwild1@gmail.com>
parents: 156
diff changeset
80 Module "verse.bosh" "bosh.lua"
90
aa0b78053cec squishy: Add --with-bosh option to squish with verse.bosh and necessarylibraries
Matthew Wild <mwild1@gmail.com>
parents: 80
diff changeset
81
134
2101acbb27c4 squishy: Use --internal-bit-module to squish with the pure-Lua bit library
Matthew Wild <mwild1@gmail.com>
parents: 131
diff changeset
82 if GetOption "internal-bit-module" then
2101acbb27c4 squishy: Use --internal-bit-module to squish with the pure-Lua bit library
Matthew Wild <mwild1@gmail.com>
parents: 131
diff changeset
83 Module "bit" "libs/bit.lua"
2101acbb27c4 squishy: Use --internal-bit-module to squish with the pure-Lua bit library
Matthew Wild <mwild1@gmail.com>
parents: 131
diff changeset
84 end
2101acbb27c4 squishy: Use --internal-bit-module to squish with the pure-Lua bit library
Matthew Wild <mwild1@gmail.com>
parents: 131
diff changeset
85
26
6c5fab6c11cf Rename verse2 -> verse
Matthew Wild <mwild1@gmail.com>
parents: 24
diff changeset
86 Module "verse.client" "client.lua"
138
35971523c8fc squishy: Add verse.component
Matthew Wild <mwild1@gmail.com>
parents: 136
diff changeset
87 Module "verse.component" "component.lua"
0
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
88
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
89 -- Main verse file
caf260adc453 Beginning of new verse
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
90 Main "init.lua"

mercurial