From 5e4ce71ff855755e3335ec9d8d0aaf4753ef0c92 Mon Sep 17 00:00:00 2001
From: Vladimir Hodakov <vladimir@hodakov.me>
Date: Sat, 17 Feb 2018 16:25:50 +0400
Subject: [PATCH] Fixing chats DataCache

---
 lib/chatter/restricters.go | 2 +-
 lib/datacache/chats.go     | 3 ++-
 lib/router/router.go       | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/chatter/restricters.go b/lib/chatter/restricters.go
index 3654e1f..cb224a8 100644
--- a/lib/chatter/restricters.go
+++ b/lib/chatter/restricters.go
@@ -22,7 +22,7 @@ func (ct *Chatter) userPrivilegesCheck(update *tgbotapi.Update, user *tgbotapi.U
 	}
 
 	// 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 {
 		if strings.ToLower(user.UserName) == specialUsers[j] {
diff --git a/lib/datacache/chats.go b/lib/datacache/chats.go
index 4493f84..e1827b4 100644
--- a/lib/datacache/chats.go
+++ b/lib/datacache/chats.go
@@ -116,13 +116,14 @@ func (dc *DataCache) GetLeaguePrivateChats() []dbmapping.Chat {
 
 // GetOrCreateChat returns current or new Chat object by Telegram update
 func (dc *DataCache) GetOrCreateChat(update *tgbotapi.Update) (*dbmapping.Chat, error) {
-	telegramID := update.Message.From.ID
+	telegramID := update.Message.Chat.ID
 	chatRaw := dbmapping.Chat{}
 	c.Log.Info("DataCache: Getting chat with Telegram ID=", telegramID)
 
 	dc.chatsMutex.Lock()
 	for i := range dc.chats {
 		if dc.chats[i].TelegramID == int64(telegramID) {
+			c.Log.Debug("Chat stream found in DataCache")
 			dc.chatsMutex.Unlock()
 			return dc.chats[i], nil
 		}
diff --git a/lib/router/router.go b/lib/router/router.go
index 22bcfac..2505ba9 100644
--- a/lib/router/router.go
+++ b/lib/router/router.go
@@ -9,6 +9,7 @@ import (
 
 // RouteRequest decides, what to do with user input
 func (r *Router) RouteRequest(update *tgbotapi.Update) string {
+	c.Log.Debugln(update)
 	playerRaw, err := c.DataCache.GetOrCreatePlayerByTelegramID(update.Message.From.ID)
 	if err != nil {
 		c.Log.Error(err.Error())
@@ -16,6 +17,7 @@ func (r *Router) RouteRequest(update *tgbotapi.Update) string {
 		return "fail"
 	}
 
+	c.Log.Debug("Getting chat...")
 	chatRaw, err := c.DataCache.GetOrCreateChat(update)
 	if err != nil {
 		c.Log.Error(err.Error())