From 14f61d88ffb5ac7f66d46e0155833d32d46802d6 Mon Sep 17 00:00:00 2001
From: Zachery Notz <zachery_notz@enigma.mil>
Date: Sat, 23 May 2020 17:14:31 -0700
Subject: Improved regex so that TELLRAW templates can use variables more than
 once

---
 src/Discord.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Discord.ts b/src/Discord.ts
index 2893c8b..c9b3b74 100644
--- a/src/Discord.ts
+++ b/src/Discord.ts
@@ -140,9 +140,9 @@ class Discord {
     }
 
     return this.config.MINECRAFT_TELLRAW_TEMPLATE
-      .replace('%username%', variables.username)
-      .replace('%discriminator%', variables.discriminator)
-      .replace('%message%', variables.text)
+      .replace(/%username%/g, variables.username)
+      .replace(/%discriminator%/g, variables.discriminator)
+      .replace(/%message%/g, variables.text)
   }
 
   private replaceDiscordMentions(message: string): string {
-- 
cgit 1.4.1

/table>
<table class='tabs'><tr><td>
<a href='/src/'>summary</a> <a href='/src/refs/?id=95c5128887f200f5693e3542df985d4b6018ec53'>refs</a> <a class='active' href='/src/log/bin/1sh/TOUR?follow=1'>log</a> <a href='/src/tree/bin/1sh/TOUR?id=95c5128887f200f5693e3542df985d4b6018ec53'>tree</a> <a href='/src/commit/bin/1sh/TOUR?id=95c5128887f200f5693e3542df985d4b6018ec53&amp;follow=1'>commit</a> <a href='/src/diff/bin/1sh/TOUR?id=95c5128887f200f5693e3542df985d4b6018ec53&amp;follow=1'>diff</a></td><td class='form'><form class='right' method='get' action='/src/log/bin/1sh/TOUR'>
<input type='hidden' name='id' value='95c5128887f200f5693e3542df985d4b6018ec53'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/src/log/?id=95c5128887f200f5693e3542df985d4b6018ec53&amp;follow=1'>root</a>/<a href='/src/log/bin?id=95c5128887f200f5693e3542df985d4b6018ec53&amp;follow=1'>bin</a>/<a href='/src/log/bin/1sh?id=95c5128887f200f5693e3542df985d4b6018ec53&amp;follow=1'>1sh</a>/<a href='/src/log/bin/1sh/TOUR?id=95c5128887f200f5693e3542df985d4b6018ec53&amp;follow=1'>TOUR</a> (<a href='/src/log/bin/1sh/TOUR?id=95c5128887f200f5693e3542df985d4b6018ec53'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/bin/1sh/TOUR?id=95c5128887f200f5693e3542df985d4b6018ec53&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-05-22 11:53:19 -0400'>2020-05-22</span></td><td><a href='/src/commit/txt/books.txt?id=bd6fbce1f88680595277d8032c0f3e5589ca35b5&amp;follow=1'>Add The Hundred Thousand Kingdoms</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2020-05-20 21:44:21 -0400'>2020-05-20</span></td><td><a href='/src/commit/txt/plan.7?id=c9058412188f3f11af5d15a4970b6e719ad0b035&amp;follow=1'>Add RFC man-like to plan</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2020-05-14 14:24:19 -0400'>2020-05-14</span></td><td><a href='/src/commit/bin/hi.c?id=f49d2a9ddcfa4402b78f2d6fa121fa97f7e71017&amp;follow=1'>Add hi rule for sh arithmetic expansion</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2020-05-13 15:21:14 -0400'>2020-05-13</span></td><td><a href='/src/commit/install.sh?id=9243b2fbd61a0472320d4e9626226b7433e9bc81&amp;follow=1'>Remove gpg symlink from NetBSD install</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2020-05-11 11:56:23 -0400'>2020-05-11</span></td><td><a href='/src/commit/txt/books.txt?id=6051f211d73e866bc3fb5685c9dc2bcb728ee6f1&amp;follow=1'>Add Autonomous</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2020-05-08 17:56:49 -0400'>2020-05-08</span></td><td><a href='/src/commit/etc/CodeQWERTY.bundle/Contents/Resources/CodeQWERTY.keylayout?id=44926dcc9108343be9447128181a6b6b95ecc881&amp;follow=1'>Move keyboard layout into a .bundle</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2020-05-07 11:53:55 -0400'>2020-05-07</span></td><td><a href='/src/commit/install.sh?id=85135ce8792c8b93b31e62c0b133ae1c16f85cfe&amp;follow=1'>Remove mksh</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2020-05-07 11:52:16 -0400'>2020-05-07</span></td><td><a href='/src/commit/home/.bashrc?id=f287284318d78c95dfba3d7bad86101d7cd7a20d&amp;follow=1'>Emulate 1sh prompts in bash</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2020-05-07 11:46:03 -0400'>2020-05-07</span></td><td><a href='/src/commit/home/.profile?id=262c56dc7c714da3f37f3ac1364c3c9d3d42227f&amp;follow=1'>Update nvim MANPAGER</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2020-05-06 19:44:12 -0400'>2020-05-06</span></td><td><a href='/src/commit/www/text.causal.agency/Makefile?id=19aa95ffad9241ec9244353e8548b602733aa150&amp;follow=1'>Post "casual update"</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2020-05-06 19:20:58 -0400'>2020-05-06</span></td><td><a href='/src/commit/home/.shrc?id=b64e55f59b83b2f5c7cfe4c4539b581767217363&amp;follow=1'>Remove bman function</a></td><td>June McEnroe