Mercurial > hg > egg-tcls
diff quotedb.tcl @ 529:3046ee0e574d
quotedb: Use utillib version of the function.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 07 Jul 2020 14:22:06 +0300 |
parents | 1cfa567f9500 |
children | a7e44605c930 |
line wrap: on
line diff
--- a/quotedb.tcl Tue Jul 07 14:20:55 2020 +0300 +++ b/quotedb.tcl Tue Jul 07 14:22:06 2020 +0300 @@ -66,7 +66,7 @@ proc qdb_msg {acmd atable apublic anick achan aid {aargs {}}} { - global qdb_preferredmsg qdb_messages + global qdb_preferredmsg # Get message set amsg [qdb_qm $atable $aid] @@ -75,17 +75,8 @@ # Map constant tokens set amsg [string map [list "@cmd@" $acmd] $amsg] set amsg [string map [list "@name@" $aname] $amsg] - set amsg [string map [list "@nick@" $anick] $amsg] - set amsg [string map [list "@chan@" $achan] $amsg] - # Map variable tokens - set narg 1 - foreach marg $aargs { - set amsg [string map [list "@$narg@" $marg] $amsg] - incr narg - } - - utl_msg_do $qdb_preferredmsg $apublic $anick $achan $amsg + utl_msg_args $qdb_preferredmsg $apublic $anick $achan $amsg $aargs }