diff --git a/msg.go b/msg.go index a307085..cfbe7b4 100644 --- a/msg.go +++ b/msg.go @@ -71,6 +71,7 @@ func parseSubTypeMessageGRolesAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWa if strings.Compare(`[unassigned]`, r.ReplaceAllString(m.Text, "${Bartender}")) != 0 { s := r.ReplaceAllString(m.Text, "${Bartender}") _, i := utf8.DecodeRuneInString(s) + _, i = utf8.DecodeRuneInString(s[i:]) cwm.BartenderID64 = getObjUserID(s[i:]) } else { cwm.BartenderID64 = 0 @@ -78,20 +79,23 @@ func parseSubTypeMessageGRolesAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWa if strings.Compare(`[unassigned]`, r.ReplaceAllString(m.Text, "${Commander}")) != 0 { s := r.ReplaceAllString(m.Text, "${Commander}") _, i := utf8.DecodeRuneInString(s) + _, i = utf8.DecodeRuneInString(s[i:]) cwm.CommanderID64 = getObjUserID(s[i:]) } else { cwm.CommanderID64 = 0 } if strings.Compare(`[unassigned]`, r.ReplaceAllString(m.Text, "${Squire}")) != 0 { - s := r.ReplaceAllString(m.Text, "${Bartender}") + s := r.ReplaceAllString(m.Text, "${Squire}") _, i := utf8.DecodeRuneInString(s) + _, i = utf8.DecodeRuneInString(s[i:]) cwm.SquireID64 = getObjUserID(s[i:]) } else { cwm.SquireID64 = 0 } if strings.Compare(`[unassigned]`, r.ReplaceAllString(m.Text, "${Treasurer}")) != 0 { - s := r.ReplaceAllString(m.Text, "${Bartender}") + s := r.ReplaceAllString(m.Text, "${Treasurer}") _, i := utf8.DecodeRuneInString(s) + _, i = utf8.DecodeRuneInString(s[i:]) cwm.TreasurerID64 = getObjUserID(s[i:]) } else { cwm.TreasurerID64 = 0