hdkv
/
i2_bot
Archived
1
Fork 0
Code Releases Activity

Fixing chats DataCache

master
Vladimir Hodakov 2018-02-17 16:25:50 +04:00
parent 2466a723be
commit 5e4ce71ff8
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/chatter/restricters.go
View File

@ -22,7 +22,7 @@ func (ct *Chatter) userPrivilegesCheck(update *tgbotapi.Update, user *tgbotapi.U
} }
// There are special users, which will bypass these checks // There are special users, which will bypass these checks
specialUsers := []string{"gantz_yaka", "agentpb", "pbhelp"} specialUsers := []string{"gantz_yaka", "agentpb", "pbhelp", "i2_bot", "i2_dev_bot"}
for j := range specialUsers { for j := range specialUsers {
if strings.ToLower(user.UserName) == specialUsers[j] { if strings.ToLower(user.UserName) == specialUsers[j] {

3
lib/datacache/chats.go
View File

@ -116,13 +116,14 @@ func (dc *DataCache) GetLeaguePrivateChats() []dbmapping.Chat {
// GetOrCreateChat returns current or new Chat object by Telegram update // GetOrCreateChat returns current or new Chat object by Telegram update
func (dc *DataCache) GetOrCreateChat(update *tgbotapi.Update) (*dbmapping.Chat, error) { func (dc *DataCache) GetOrCreateChat(update *tgbotapi.Update) (*dbmapping.Chat, error) {
telegramID := update.Message.From.ID telegramID := update.Message.Chat.ID
chatRaw := dbmapping.Chat{} chatRaw := dbmapping.Chat{}
c.Log.Info("DataCache: Getting chat with Telegram ID=", telegramID) c.Log.Info("DataCache: Getting chat with Telegram ID=", telegramID)
dc.chatsMutex.Lock() dc.chatsMutex.Lock()
for i := range dc.chats { for i := range dc.chats {
if dc.chats[i].TelegramID == int64(telegramID) { if dc.chats[i].TelegramID == int64(telegramID) {
c.Log.Debug("Chat stream found in DataCache")
dc.chatsMutex.Unlock() dc.chatsMutex.Unlock()
return dc.chats[i], nil return dc.chats[i], nil
} }

2
lib/router/router.go
View File

@ -9,6 +9,7 @@ import (
// RouteRequest decides, what to do with user input // RouteRequest decides, what to do with user input
func (r *Router) RouteRequest(update *tgbotapi.Update) string { func (r *Router) RouteRequest(update *tgbotapi.Update) string {
c.Log.Debugln(update)
playerRaw, err := c.DataCache.GetOrCreatePlayerByTelegramID(update.Message.From.ID) playerRaw, err := c.DataCache.GetOrCreatePlayerByTelegramID(update.Message.From.ID)
if err != nil { if err != nil {
c.Log.Error(err.Error()) c.Log.Error(err.Error())
@ -16,6 +17,7 @@ func (r *Router) RouteRequest(update *tgbotapi.Update) string {
return "fail" return "fail"
} }
c.Log.Debug("Getting chat...")
chatRaw, err := c.DataCache.GetOrCreateChat(update) chatRaw, err := c.DataCache.GetOrCreateChat(update)
if err != nil { if err != nil {
c.Log.Error(err.Error()) c.Log.Error(err.Error())