From eace24d67fb37ab2653d5cfc2bdf961e32500f8c Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@siteop.biz>
Date: Mon, 12 Aug 2019 16:42:18 +0800
Subject: [PATCH] test g roles

---
 msg.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/msg.go b/msg.go
index 408f1e7..e46ff87 100644
--- a/msg.go
+++ b/msg.go
@@ -117,22 +117,22 @@ func parseSubTypeMessageGRolesAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWa
 		SquireID64: getObjUserID(r.ReplaceAllString(m.Text, "${Squire}")),
 		TreasurerID64: getObjUserID(r.ReplaceAllString(m.Text, "${Treasurer}")),
 	*/
-	if strings.Compare(`[unassigned]`, r.ReplaceAllString(m.Text, "${Bartender}")) != 0 {
+	if len(r.ReplaceAllString(m.Text, "${Bartender}")) > 0 {
 		cwm.BartenderID64 = getObjUserID(r.ReplaceAllString(m.Text, "${Bartender}"))
 	} else {
 		cwm.BartenderID64 = 0
 	}
-	if strings.Compare(`[unassigned]`, r.ReplaceAllString(m.Text, "${Commander}")) != 0 {
+	if len(r.ReplaceAllString(m.Text, "${Commander}")) > 0 {
 		cwm.CommanderID64 = getObjUserID(r.ReplaceAllString(m.Text, "${Commander}"))
 	} else {
 		cwm.CommanderID64 = 0
 	}
-	if strings.Compare(`[unassigned]`, r.ReplaceAllString(m.Text, "${Squire}")) != 0 {
+	if len(r.ReplaceAllString(m.Text, "${Squire}")) > 0 {
 		cwm.SquireID64 = getObjUserID(r.ReplaceAllString(m.Text, "${Squire}"))
 	} else {
 		cwm.SquireID64 = 0
 	}
-	if strings.Compare(`[unassigned]`, r.ReplaceAllString(m.Text, "${Treasurer}")) != 0 {
+	if len(r.ReplaceAllString(m.Text, "${Treasurer}")) > 0 {
 		cwm.TreasurerID64 = getObjUserID(r.ReplaceAllString(m.Text, "${Treasurer}"))
 	} else {
 		cwm.TreasurerID64 = 0