diff --git a/client.go b/client.go index 7ebeb66..9686fd2 100644 --- a/client.go +++ b/client.go @@ -301,6 +301,22 @@ func clientMsgMeAck(m *ChatWarsMessageMeAck) { } } +func clientMsgGListAck(msg *ChatWarsMessageGListAck) { + muxClients.Lock() + for _, clt := range clients { + for _, m := range msg.Members { + clt.Mux.Lock() + if m.Name == clt.Nickname { + if m.Class2 == `⚔️` { + clt.CWClass2 = `Knight` + } + } + clt.Mux.Unlock() + } + } + muxClients.Unlock() +} + func clientMsgGoQuestAck(m *ChatWarsMessageGoQuestAck) { if clt, ok := getLockedClient(m.Msg.TGUserID64, false); ok { if clt.Active { diff --git a/cron.go b/cron.go index 111bb6e..ae982f9 100644 --- a/cron.go +++ b/cron.go @@ -77,7 +77,7 @@ func cronTribute() { muxClients.RLock() for _, c := range clients { if c.Active { - if c.CWClass == `Knight` { + if c.CWClass == `Knight` || c.CWClass2 == `Knight` { clientSendCWMsgDelay(c.TGUserID64, `/tributes`, 0) } } diff --git a/msg.go b/msg.go index 55f5376..0c89722 100644 --- a/msg.go +++ b/msg.go @@ -472,7 +472,7 @@ func parseSubTypeMessageGListAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWar cwm.Msg = m cwm.Members = make([]ChatWarsGuildMember, 0) - log.Printf("parseSubTypeMessageGListAck : Guild : %s\n", r.ReplaceAllString(m.Text, "${GuildName}")) + //log.Printf("parseSubTypeMessageGListAck : Guild : %s\n", r.ReplaceAllString(m.Text, "${GuildName}")) // log.Printf("parseSubTypeMessageGListAck : Members : %s\n", r.ReplaceAllString(m.Text, "${Members}")) re := regexp.MustCompile(`\n#(?P[0-9]+) (?P(⚒|⚗️|📦|🏹|⚔️|🛡))(?P(⚒|⚗️|📦|🏹|⚔️|🛡){0,1})(?P[0-9]+) \[(?P.*)\] (?P[a-zA-z0-9 ]+)`) @@ -485,7 +485,7 @@ func parseSubTypeMessageGListAck(m *ChatWarsMessage, r *regexp.Regexp) (*ChatWar m.Status = re.ReplaceAllString(l, "${Status}") i, _ := strconv.ParseInt(re.ReplaceAllString(l, "${Level}"), 10, 64) m.Level = int(i) - log.Printf("parseSubTypeMessageGListAck : %s : %s/%s [%d] => %s\n", m.Name, m.Class1, m.Class2, m.Level, m.Status) + //log.Printf("parseSubTypeMessageGListAck : %s : %s/%s [%d] => %s\n", m.Name, m.Class1, m.Class2, m.Level, m.Status) cwm.Members = append(cwm.Members, m) }