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