# HG changeset patch # User Kim Alvefur # Date 1680292887 -7200 # Node ID b2b090181270daf1145566c83fd4c4253dc5eb8d # Parent 84fa880bf476325325c62c696021bf13c911f462 mod_admin_shell: Allow matching on host or bare JID in c2s:show Only supporting exact match on full JID isn't helpful if you want to list sessions per host or user. Backport of 430333198e4c Fixes #1857 diff -r 84fa880bf476 -r b2b090181270 plugins/mod_admin_shell.lua --- a/plugins/mod_admin_shell.lua Sat Apr 27 15:55:23 2024 +0200 +++ b/plugins/mod_admin_shell.lua Fri Mar 31 22:01:27 2023 +0200 @@ -25,7 +25,7 @@ local unpack = table.unpack or unpack; -- luacheck: ignore 113 local iterators = require "util.iterators"; local keys, values = iterators.keys, iterators.values; -local jid_bare, jid_split, jid_join = import("util.jid", "bare", "prepped_split", "join"); +local jid_bare, jid_split, jid_join, jid_compare = import("util.jid", "bare", "prepped_split", "join", "compare"); local set, array = require "util.set", require "util.array"; local cert_verify_identity = require "util.x509".verify_identity; local envload = require "util.envload".envload; @@ -940,7 +940,7 @@ local function match(session) local jid = get_jid(session) - return (not match_jid) or jid == match_jid; + return (not match_jid) or jid_compare(jid, match_jid); end local group_by_host = true;