This commit is contained in:
shoopea 2019-05-30 16:57:10 +08:00
parent 37e0385268
commit d069f6b223

8
msg.go
View File

@ -67,25 +67,25 @@ func parseSubTypeMessageGRolesAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWa
SquireID64: getObjUserID(r.ReplaceAllString(m.Text, "${Squire}")), SquireID64: getObjUserID(r.ReplaceAllString(m.Text, "${Squire}")),
TreasurerID64: getObjUserID(r.ReplaceAllString(m.Text, "${Treasurer}")), TreasurerID64: getObjUserID(r.ReplaceAllString(m.Text, "${Treasurer}")),
*/ */
if strings.compare(`[unassigned]`, r.ReplaceAllString(m.Text, "${Bartender}")) != 0 { if strings.Compare(`[unassigned]`, r.ReplaceAllString(m.Text, "${Bartender}")) != 0 {
s := r.ReplaceAllString(m.Text, "${Bartender}") s := r.ReplaceAllString(m.Text, "${Bartender}")
cwm.BartenderID64 = getObjUserID(s[1:]) cwm.BartenderID64 = getObjUserID(s[1:])
} else { } else {
cwm.BartenderID64 = 0 cwm.BartenderID64 = 0
} }
if strings.compare(`[unassigned]`, r.ReplaceAllString(m.Text, "${Commander}")) != 0 { if strings.Compare(`[unassigned]`, r.ReplaceAllString(m.Text, "${Commander}")) != 0 {
s := r.ReplaceAllString(m.Text, "${Commander}") s := r.ReplaceAllString(m.Text, "${Commander}")
cwm.CommanderID64 = getObjUserID(s[1:]) cwm.CommanderID64 = getObjUserID(s[1:])
} else { } else {
cwm.CommanderID64 = 0 cwm.CommanderID64 = 0
} }
if strings.compare(`[unassigned]`, r.ReplaceAllString(m.Text, "${Squire}")) != 0 { if strings.Compare(`[unassigned]`, r.ReplaceAllString(m.Text, "${Squire}")) != 0 {
s := r.ReplaceAllString(m.Text, "${Bartender}") s := r.ReplaceAllString(m.Text, "${Bartender}")
cwm.SquireID64 = getObjUserID(s[1:]) cwm.SquireID64 = getObjUserID(s[1:])
} else { } else {
cwm.SquireID64 = 0 cwm.SquireID64 = 0
} }
if strings.compare(`[unassigned]`, r.ReplaceAllString(m.Text, "${Treasurer}")) != 0 { if strings.Compare(`[unassigned]`, r.ReplaceAllString(m.Text, "${Treasurer}")) != 0 {
s := r.ReplaceAllString(m.Text, "${Bartender}") s := r.ReplaceAllString(m.Text, "${Bartender}")
cwm.TreasurerID64 = getObjUserID(s[1:]) cwm.TreasurerID64 = getObjUserID(s[1:])
} else { } else {