hdkv/i2_bot
Archived
1
Fork 0
Code Releases Activity

Squads and chats in DataCache, squads rework

Browse Source 
Work in progress, bugs may vary
This commit is contained in:
Vladimir Hodakov
2018-02-17 07:03:58 +04:00
parent 7af54a1b02
commit fef521e35b
25 changed files with 645 additions and 710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/chatter/chatterinterface/chatterinterface.go
View File

@@ -15,13 +15,6 @@ type ChatterInterface interface {
BanUserFromChat(user *tgbotapi.User, chatRaw *dbmapping.Chat)
ProtectChat(update *tgbotapi.Update, playerRaw *dbmapping.Player, chatRaw *dbmapping.Chat) string
GetOrCreateChat(update *tgbotapi.Update) (dbmapping.Chat, bool)
GetChatByID(chatID int64) (dbmapping.Chat, bool)
GetAllPrivateChats() ([]dbmapping.Chat, bool)
GetLeaguePrivateChats() ([]dbmapping.Chat, bool)
GetAllGroupChats() ([]dbmapping.Chat, bool)
GetGroupChatsByIDs(chatsIDs string) ([]dbmapping.Chat, bool)
UpdateChatTitle(chatRaw *dbmapping.Chat, newTitle string) (*dbmapping.Chat, bool)
UpdateChatTelegramID(update *tgbotapi.Update) (*dbmapping.Chat, bool)

175
lib/chatter/getters.go
View File

@@ -1,175 +0,0 @@
// i2_bot – Instinct PokememBro Bot
// Copyright (c) 2017 Vladimir "fat0troll" Hodakov
package chatter
import (
"github.com/go-telegram-bot-api/telegram-bot-api"
"source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping"
"strconv"
"strings"
"time"
)
func (ct *Chatter) getAllGroupChatsWithSquads() ([]dbmapping.ChatSquad, bool) {
chatsSquads := []dbmapping.ChatSquad{}
groupChats := []dbmapping.Chat{}
err := c.Db.Select(&groupChats, "SELECT * FROM chats WHERE chat_type IN ('group', 'supergroup')")
if err != nil {
c.Log.Error(err)
return chatsSquads, false
}
for i := range groupChats {
chatSquad := dbmapping.ChatSquad{}
squad := dbmapping.Squad{}
err = c.Db.Get(&squad, c.Db.Rebind("SELECT * FROM squads WHERE chat_id=?"), groupChats[i].ID)
if err != nil {
c.Log.Debug(err)
} else {
chatSquad.ChatRole = "squad"
}
err = c.Db.Get(&squad, c.Db.Rebind("SELECT * FROM squads WHERE flood_chat_id=?"), groupChats[i].ID)
if err != nil {
c.Log.Debug(err)
} else {
chatSquad.ChatRole = "flood"
}
chatSquad.Squad = squad
chatSquad.Chat = groupChats[i]
chatsSquads = append(chatsSquads, chatSquad)
}
return chatsSquads, true
}
// GetChatByID returns dbmapping.Chat instance with given ID.
func (ct *Chatter) GetChatByID(chatID int64) (dbmapping.Chat, bool) {
chatRaw := dbmapping.Chat{}
err := c.Db.Get(&chatRaw, c.Db.Rebind("SELECT * FROM chats WHERE id=?"), chatID)
if err != nil {
c.Log.Error(err)
return chatRaw, false
}
return chatRaw, true
}
// GetOrCreateChat seeks for chat in database via Telegram update.
// In case, when there is no chat with such ID, new chat will be created.
func (ct *Chatter) GetOrCreateChat(telegramUpdate *tgbotapi.Update) (dbmapping.Chat, bool) {
chatRaw := dbmapping.Chat{}
c.Log.Debug("TGID: ", telegramUpdate.Message.Chat.ID)
err := c.Db.Get(&chatRaw, c.Db.Rebind("SELECT * FROM chats WHERE telegram_id=?"), telegramUpdate.Message.Chat.ID)
if err != nil {
c.Log.Error("Chat stream not found in database.")
c.Log.Error(err.Error())
nameOfChat := ""
if telegramUpdate.Message.Chat.FirstName != "" {
nameOfChat += telegramUpdate.Message.Chat.FirstName
}
if telegramUpdate.Message.Chat.LastName != "" {
nameOfChat += " " + telegramUpdate.Message.Chat.LastName
}
if telegramUpdate.Message.Chat.Title != "" {
if nameOfChat != "" {
nameOfChat += " [" + telegramUpdate.Message.Chat.Title + "]"
} else {
nameOfChat = telegramUpdate.Message.Chat.Title
}
}
chatRaw.Name = nameOfChat
chatRaw.ChatType = telegramUpdate.Message.Chat.Type
chatRaw.TelegramID = telegramUpdate.Message.Chat.ID
chatRaw.CreatedAt = time.Now().UTC()
_, err = c.Db.NamedExec("INSERT INTO chats VALUES(NULL, :name, :chat_type, :telegram_id, :created_at)", &chatRaw)
if err != nil {
c.Log.Error(err.Error())
return chatRaw, false
}
err2 := c.Db.Get(&chatRaw, c.Db.Rebind("SELECT * FROM chats WHERE telegram_id=? AND chat_type=?"), chatRaw.TelegramID, chatRaw.ChatType)
if err2 != nil {
c.Log.Error(err2)
return chatRaw, false
}
} else {
c.Log.Info("Chat stream found in database.")
}
return chatRaw, true
}
// GetAllPrivateChats returns all private chats
func (ct *Chatter) GetAllPrivateChats() ([]dbmapping.Chat, bool) {
privateChats := []dbmapping.Chat{}
err := c.Db.Select(&privateChats, "SELECT * FROM chats WHERE chat_type='private'")
if err != nil {
c.Log.Error(err)
return privateChats, false
}
return privateChats, true
}
// GetLeaguePrivateChats returns all private chats which profiles are in our league
func (ct *Chatter) GetLeaguePrivateChats() ([]dbmapping.Chat, bool) {
privateChats := []dbmapping.Chat{}
err := c.Db.Select(&privateChats, "SELECT c.* FROM chats c, players p WHERE c.chat_type='private' AND p.telegram_id = c.telegram_id AND p.league_id = 1 AND p.status != 'spy' AND p.status != 'league_changed' AND p.status !='banned'")
if err != nil {
c.Log.Error(err)
return privateChats, false
}
return privateChats, true
}
// GetAllGroupChats returns all group chats
func (ct *Chatter) GetAllGroupChats() ([]dbmapping.Chat, bool) {
groupChats := []dbmapping.Chat{}
err := c.Db.Select(&groupChats, "SELECT * FROM chats WHERE chat_type IN ('group', 'supergroup')")
if err != nil {
c.Log.Error(err)
return groupChats, false
}
return groupChats, true
}
// GetGroupChatsByIDs returns group chats with selected IDs
func (ct *Chatter) GetGroupChatsByIDs(chatsIDs string) ([]dbmapping.Chat, bool) {
groupChats := []dbmapping.Chat{}
queryIDs := make([]int, 0)
queryIDsStr := strings.Split(chatsIDs, ",")
for i := range queryIDsStr {
id, _ := strconv.Atoi(queryIDsStr[i])
if id != 0 {
queryIDs = append(queryIDs, id)
}
}
finalQueryIDs := ""
for i := range queryIDs {
finalQueryIDs += strconv.Itoa(queryIDs[i])
if i < len(queryIDs)-1 {
finalQueryIDs += ","
}
}
c.Log.Debug("Chat query IDs: " + finalQueryIDs)
err := c.Db.Select(&groupChats, "SELECT * FROM chats WHERE chat_type IN ('group', 'supergroup') AND id IN ("+finalQueryIDs+")")
if err != nil {
c.Log.Error(err)
return groupChats, false
}
return groupChats, true
}

26
lib/chatter/responders.go
View File

@@ -10,10 +10,7 @@ import (
// GroupsList lists all chats where bot exist
func (ct *Chatter) GroupsList(update *tgbotapi.Update) string {
groupChats, ok := ct.getAllGroupChatsWithSquads()
if !ok {
return "fail"
}
groupChats := c.DataCache.GetAllGroupChats()
academyChatID, _ := strconv.ParseInt(c.Cfg.SpecialChats.AcademyID, 10, 64)
bastionChatID, _ := strconv.ParseInt(c.Cfg.SpecialChats.BastionID, 10, 64)
@@ -24,33 +21,30 @@ func (ct *Chatter) GroupsList(update *tgbotapi.Update) string {
for i := range groupChats {
message += "---\n"
message += "\\[#" + strconv.Itoa(groupChats[i].Chat.ID) + "] _" + c.Users.FormatUsername(groupChats[i].Chat.Name) + "_\n"
message += "Telegram ID: " + strconv.FormatInt(groupChats[i].Chat.TelegramID, 10) + "\n"
if groupChats[i].ChatRole == "squad" {
message += "\\[#" + strconv.Itoa(groupChats[i].ID) + "] _" + c.Users.FormatUsername(groupChats[i].Name) + "_\n"
message += "Telegram ID: " + strconv.FormatInt(groupChats[i].TelegramID, 10) + "\n"
squad, squadExistErr := c.DataCache.GetSquadByChatID(groupChats[i].ID)
if squadExistErr == nil {
message += "Статистика отряда:\n"
message += c.Statistics.SquadStatictics(groupChats[i].Squad.ID)
} else if groupChats[i].ChatRole == "flood" {
message += "Является флудочатом отряда №" + strconv.Itoa(groupChats[i].Squad.ID) + "\n"
message += c.Statistics.SquadStatictics(squad.ID)
} else {
if groupChats[i].Chat.TelegramID == academyChatID {
if groupChats[i].TelegramID == academyChatID {
message += "Является академией лиги\n"
}
if groupChats[i].Chat.TelegramID == bastionChatID {
if groupChats[i].TelegramID == bastionChatID {
message += "Является бастионом лиги\n"
}
if groupChats[i].Chat.TelegramID == defaultChatID {
if groupChats[i].TelegramID == defaultChatID {
message += "Является чатом по умолчанию лиги\n"
}
if groupChats[i].Chat.TelegramID == hqChatID {
if groupChats[i].TelegramID == hqChatID {
message += "Является чатом совета лиги\n"
}
}
}
message += "\nЧтобы создать отряд, введите команду /make\\_squad _X Y_, где _X_ — номер чата с пинами (в нём позволено писать лишь боту и командирам), а _Y_ — чат-флудилка для общения отряда."
msg := tgbotapi.NewMessage(update.Message.Chat.ID, message)
msg.ParseMode = "Markdown"

19
lib/chatter/restricters.go
View File

@@ -4,8 +4,8 @@
package chatter
import (
"source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping"
"github.com/go-telegram-bot-api/telegram-bot-api"
"source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping"
"strconv"
"strings"
)
@@ -44,15 +44,15 @@ func (ct *Chatter) userPrivilegesCheck(update *tgbotapi.Update, user *tgbotapi.U
// So, user is not a PokememBro admin. For Bastion and Academy she needs to be league player
switch update.Message.Chat.ID {
case academyChatID:
if playerRaw.LeagueID == 1 && playerRaw.Status != "spy" && playerRaw.Status != "league_changed" {
if playerRaw.LeagueID == 1 && playerRaw.Status != "spy" && playerRaw.Status != "league_changed" && playerRaw.Status != "banned" {
return true
}
case bastionChatID:
if playerRaw.LeagueID == 1 && playerRaw.Status != "spy" && playerRaw.Status != "league_changed" {
if playerRaw.LeagueID == 1 && playerRaw.Status != "spy" && playerRaw.Status != "league_changed" && playerRaw.Status != "banned" {
return true
}
default:
availableChatsForUser, _ := c.Squader.GetAvailableSquadChatsForUser(playerRaw)
availableChatsForUser := c.DataCache.GetAvailableSquadsChatsForUser(playerRaw.ID)
for i := range availableChatsForUser {
if update.Message.Chat.ID == availableChatsForUser[i].TelegramID {
return true
@@ -86,9 +86,12 @@ func (ct *Chatter) BanUserFromChat(user *tgbotapi.User, chatRaw *dbmapping.Chat)
academyChatID, _ := strconv.ParseInt(c.Cfg.SpecialChats.AcademyID, 10, 64)
hqChatID, _ := strconv.ParseInt(c.Cfg.SpecialChats.HeadquartersID, 10, 64)
if (chatRaw.TelegramID != bastionChatID) || (chatRaw.TelegramID != academyChatID) {
// In Bastion notifications are public in default chat
commanders, ok := c.Squader.GetCommandersForSquadViaChat(chatRaw)
if ok {
squad, err := c.DataCache.GetSquadByChatID(chatRaw.ID)
if err != nil {
c.Log.Error(err.Error())
} else {
// In Bastion notifications are public in default chat
commanders := c.DataCache.GetCommandersForSquad(squad.ID)
for i := range commanders {
message := "Некто " + c.Users.GetPrettyName(user) + " попытался зайти в чат _" + chatRaw.Name + "_ и был изгнан ботом, так как не имеет права посещать этот чат."
@@ -128,5 +131,5 @@ func (ct *Chatter) ProtectChat(update *tgbotapi.Update, playerRaw *dbmapping.Pla
return "fail"
}
return c.Squader.CleanFlood(update, chatRaw)
return "ok"
}