hdkv/i2_bot
Archived
1
Fork 0
Code Releases Activity

Orders are now respect Academy as another chat 0.

Browse Source
This commit is contained in:
Vladimir Hodakov 2017-12-23 17:09:18 +04:00
parent b7ca6b3c6a
commit 5afe064b54
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/orders/orders.go
View File

@ -34,14 +34,21 @@ func (o *Orders) sendOrder(order *dbmapping.Order) string {
return "fail" return "fail"
} }
// Adding Bastion chat as it's the zero chat // Adding Academy and Bastion chat as they are both the zero chat
academyGroupID, _ := strconv.ParseInt(c.Cfg.SpecialChats.AcademyID, 10, 64)
bastionGroupID, _ := strconv.ParseInt(c.Cfg.SpecialChats.BastionID, 10, 64) bastionGroupID, _ := strconv.ParseInt(c.Cfg.SpecialChats.BastionID, 10, 64)
academyChat := dbmapping.Chat{}
bastionChat := dbmapping.Chat{} bastionChat := dbmapping.Chat{}
err := c.Db.Get(&bastionChat, c.Db.Rebind("SELECT * FROM chats WHERE telegram_id=?"), bastionGroupID) err := c.Db.Get(&academyChat, c.Db.Rebind("SELECT * FROM chats WHERE telegram_id=?"), academyGroupID)
if err != nil {
return "fail"
}
err = c.Db.Get(&bastionChat, c.Db.Rebind("SELECT * FROM chats WHERE telegram_id=?"), bastionGroupID)
if err != nil { if err != nil {
return "fail" return "fail"
} }
targetChats = append(targetChats, academyChat)
targetChats = append(targetChats, bastionChat) targetChats = append(targetChats, bastionChat)
} else { } else {
targetChats, ok = c.Squader.GetSquadChatsBySquadsIDs(order.TargetSquads) targetChats, ok = c.Squader.GetSquadChatsBySquadsIDs(order.TargetSquads)
@ -52,13 +59,21 @@ func (o *Orders) sendOrder(order *dbmapping.Order) string {
targetChatsIDs := strings.Split(order.TargetSquads, ",") targetChatsIDs := strings.Split(order.TargetSquads, ",")
for i := range targetChatsIDs { for i := range targetChatsIDs {
if targetChatsIDs[i] == "0" { if targetChatsIDs[i] == "0" {
// Adding Academy and Bastion chat as they are both the zero chat
academyGroupID, _ := strconv.ParseInt(c.Cfg.SpecialChats.AcademyID, 10, 64)
bastionGroupID, _ := strconv.ParseInt(c.Cfg.SpecialChats.BastionID, 10, 64) bastionGroupID, _ := strconv.ParseInt(c.Cfg.SpecialChats.BastionID, 10, 64)
academyChat := dbmapping.Chat{}
bastionChat := dbmapping.Chat{} bastionChat := dbmapping.Chat{}
err := c.Db.Get(&bastionChat, c.Db.Rebind("SELECT * FROM chats WHERE telegram_id=?"), bastionGroupID) err := c.Db.Get(&academyChat, c.Db.Rebind("SELECT * FROM chats WHERE telegram_id=?"), academyGroupID)
if err != nil {
return "fail"
}
err = c.Db.Get(&bastionChat, c.Db.Rebind("SELECT * FROM chats WHERE telegram_id=?"), bastionGroupID)
if err != nil { if err != nil {
return "fail" return "fail"
} }
targetChats = append(targetChats, academyChat)
targetChats = append(targetChats, bastionChat) targetChats = append(targetChats, bastionChat)
} }
} }