# HG changeset patch # User Kim Alvefur # Date 1687353737 -7200 # Node ID 08e5c8637fea2eb4920e0c5098ed357d35ad7bdd # Parent 22844ac3be4e29968a2edd012d58de81a80eab6b squishy: Normalise Lua syntax lua-format applied Makes semi-automated merging with e.g. rockspec files easier. diff -r 22844ac3be4e -r 08e5c8637fea squishy --- a/squishy Wed Jun 21 12:21:09 2023 +0200 +++ b/squishy Wed Jun 21 15:22:17 2023 +0200 @@ -2,31 +2,31 @@ local VerseModule = Module local function ProsodyModule(s) - return VerseModule("prosody."..s) + return VerseModule("prosody." .. s) end function ProsodyModules() local Module = ProsodyModule; -- Verse-specific versions of libraries - Module "util.encodings" "libs/encodings.lua" - Module "util.hashes" "libs/hashes.lua" - Module "lib.adhoc" "libs/adhoc.lib.lua" + Module "util.encodings" "libs/encodings.lua" + Module "util.hashes" "libs/hashes.lua" + Module "lib.adhoc" "libs/adhoc.lib.lua" Module "util.table" "libs/table.lua" -- Prosody libraries if not GetOption("prosody") then AutoFetchURL "http://hg.prosody.im/0.10/raw-file/tip/?" else - AutoFetchURL(GetOption("prosody").."/?") + AutoFetchURL(GetOption("prosody") .. "/?") end - Module "util.sha1" "util/sha1.lua" - Module "util.bit" "libs/bit.lua" + Module "util.sha1" "util/sha1.lua" + Module "util.bit" "libs/bit.lua" - Module "util.stanza" "util/stanza.lua" - Module "util.timer" "util/timer.lua" - Module "util.termcolours" "util/termcolours.lua" - Module "util.uuid" "util/uuid.lua" + Module "util.stanza" "util/stanza.lua" + Module "util.timer" "util/timer.lua" + Module "util.termcolours" "util/termcolours.lua" + Module "util.uuid" "util/uuid.lua" Module "util.time" "libs/time.lua" Module "util.envload" "util/envload.lua" Module "util.id" "util/id.lua" @@ -36,29 +36,29 @@ Module "util.array" "util/array.lua" Module "util.format" "util/format.lua" Module "util.promise" "util/promise.lua" - Module "net.adns" "net/unbound.lua" + Module "net.adns" "net/unbound.lua" Module "util.dns" "util/dns.lua" - Module "net.server_select" "net/server_select.lua" - Module "util.xmppstream" "util/xmppstream.lua" - Module "util.jid" "util/jid.lua" - Module "util.events" "util/events.lua" - Module "util.dataforms" "util/dataforms.lua" - Module "util.caps" "util/caps.lua" - Module "util.vcard" "util/vcard.lua" - Module "util.logger" "util/logger.lua" - Module "util.datetime" "util/datetime.lua" - Module "util.json" "util/json.lua" - Module "util.xml" "util/xml.lua" - Module "util.rsm" "util/rsm.lua" - Module "util.random" "util/random.lua" - Module "util.ip" "util/ip.lua" + Module "net.server_select" "net/server_select.lua" + Module "util.xmppstream" "util/xmppstream.lua" + Module "util.jid" "util/jid.lua" + Module "util.events" "util/events.lua" + Module "util.dataforms" "util/dataforms.lua" + Module "util.caps" "util/caps.lua" + Module "util.vcard" "util/vcard.lua" + Module "util.logger" "util/logger.lua" + Module "util.datetime" "util/datetime.lua" + Module "util.json" "util/json.lua" + Module "util.xml" "util/xml.lua" + Module "util.rsm" "util/rsm.lua" + Module "util.random" "util/random.lua" + Module "util.ip" "util/ip.lua" Module "util.hex" "util/hex.lua" Module "util.net" "libs/net.lua" Module "util.sslconfig" "util/sslconfig.lua" - Module "util.paths" "util/paths.lua" + Module "util.paths" "util/paths.lua" Module "util.mathcompat" "util/mathcompat.lua" Module "util.dnsregistry" "util/dnsregistry.lua" - Module "net.tls_luasec" "net/tls_luasec.lua" + Module "net.tls_luasec" "net/tls_luasec.lua" Module "util.http" "util/http.lua" Module "net.http.parser" "net/http/parser.lua" @@ -75,25 +75,41 @@ -- Verse plugins plugins = { -- Login - "tls", "sasl", "bind", -- "session", "legacy", "compression"; + "tls"; + "sasl"; + "bind"; -- "session", "legacy", "compression"; -- Reliability - "smacks", "keepalive"; + "smacks"; + "keepalive"; -- Queries - "disco", "version", "ping", "uptime", "time"; + "disco"; + "version"; + "ping"; + "uptime"; + "time"; -- Privacy control "blocking"; -- Jingle / file transfer - "jingle", "jingle_ft", "jingle_s5b", "proxy65", "jingle_ibb"; + "jingle"; + "jingle_ft"; + "jingle_s5b"; + "proxy65"; + "jingle_ibb"; -- Pubsub - "pubsub", "pep"; + "pubsub"; + "pep"; -- Command and control "adhoc"; -- Basics - "presence", "private", "roster", "register"; + "presence"; + "private"; + "roster"; + "register"; -- MUC "groupchat"; -- vCard - "vcard", "vcard_update"; + "vcard"; + "vcard_update"; -- Carbons "carbons"; @@ -102,20 +118,20 @@ } for _, plugin in ipairs(plugins) do - VerseModule("verse.plugins."..plugin)("plugins/"..plugin..".lua") + VerseModule("verse.plugins." .. plugin)("plugins/" .. plugin .. ".lua") end VerseModule "verse.server" "server.lua" -- SASL client mechanisms -VerseModule "verse.util.sasl.scram" "util/sasl/scram.lua" -VerseModule "verse.util.sasl.plain" "util/sasl/plain.lua" -VerseModule "verse.util.sasl.anonymous" "util/sasl/anonymous.lua" +VerseModule "verse.util.sasl.scram" "util/sasl/scram.lua" +VerseModule "verse.util.sasl.plain" "util/sasl/plain.lua" +VerseModule "verse.util.sasl.anonymous" "util/sasl/anonymous.lua" VerseModule "verse.util.sasl.oauthbearer" "util/sasl/oauthbearer.lua" -VerseModule "verse.client" "client.lua" +VerseModule "verse.client" "client.lua" VerseModule "verse.component" "component.lua" -VerseModule "verse.bosh" "bosh.lua" +VerseModule "verse.bosh" "bosh.lua" -- Main verse file Main "init.lua"