diff options
| author | Kim Alvefur <zash@zash.se> | 2023-12-09 14:57:41 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2023-12-09 14:57:41 +0100 |
| commit | c61c78447b855c3fef1def5ce962156d2ce2e7f3 (patch) | |
| tree | 0a2382309cefe7b4185be6d36c399542217bd45b /util/xtemplate.lua | |
| parent | 48f26f9b98616eb619d891df47b730c04cde72fb (diff) | |
| download | prosody-c61c78447b855c3fef1def5ce962156d2ce2e7f3.tar.gz prosody-c61c78447b855c3fef1def5ce962156d2ce2e7f3.zip | |
util.xtemplate: Adopt {-path-} syntax to strip preceding and/or trailing whitespace
Seen in some other template languages
Diffstat (limited to 'util/xtemplate.lua')
| -rw-r--r-- | util/xtemplate.lua | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/util/xtemplate.lua b/util/xtemplate.lua index 1c58c63e..56413012 100644 --- a/util/xtemplate.lua +++ b/util/xtemplate.lua @@ -8,8 +8,16 @@ local st = require("prosody.util.stanza"); local function render(template, root, escape, filters) escape = escape or st.xml_escape; - return (s_gsub(template, "%b{}", function(block) + return (s_gsub(template, "(%s*)(%b{})(%s*)", function(pre_blank, block, post_blank) local inner = s_sub(block, 2, -2); + if inner:sub(1, 1) == "-" then + pre_blank = ""; + inner = inner:sub(2); + end + if inner:sub(-1, -1) == "-" then + post_blank = ""; + inner = inner:sub(1, -2); + end local path, pipe, pos = s_match(inner, "^([^|]+)(|?)()"); if not (type(path) == "string") then return end local value @@ -74,12 +82,12 @@ local function render(template, root, escape, filters) if type(value) == "string" then if not is_escaped then value = escape(value); end - return value + return pre_blank .. value .. post_blank elseif st.is_stanza(value) then value = value:get_text(); - if value then return escape(value) end + if value then return pre_blank .. escape(value) .. post_blank end end - return "" + return pre_blank .. post_blank end)) end |