Added "DoNotSaveMessagesFromOtherChats" test

Makefile

@@ -1,3 +1,14 @@
+.PHONY: help
+## help: prints this help message
+help:
+	@echo "Usage: \n"
+	@sed -n 's/^##//p' ${MAKEFILE_LIST} | column -t -s ':' |  sed -e 's/^/ /'
+
+.PHONY: generate
+## generate: runs `go generate`
+generate:
+	@go generate ./app/...
+
 .PHONY: build
 ## build: builds server
 build:
@@ -11,12 +22,12 @@ vendor:
 .PHONY: test
 ## test: runs `go test`
 test:
-	@cd app && go test -mod=vendor ./... -coverprofile cover.out
-	
+	@go test -mod=vendor ./app/... -coverprofile cover.out
+
 .PHONY: lint
 ## lint: runs `golangci-lint`
 lint:
-	@cd app && golangci-lint run
+	@golangci-lint run ./app/...
 
 .PHONY: run
 ## run: runs app locally (don't forget to set all required environment variables)
@@ -26,8 +37,3 @@ lint:
 run:
 	@go run -v -mod=vendor app/main.go --dbg ${ARGS}
 
-.PHONY: help
-## help: prints this help message
-help:
-	@echo "Usage: \n"
-	@sed -n 's/^##//p' ${MAKEFILE_LIST} | column -t -s ':' |  sed -e 's/^/ /'

app/events/telegram.go

@@ -328,6 +328,7 @@ func (l *TelegramListener) transformEntities(entities *[]tbapi.MessageEntity) *[
 		}
 		if entity.User != nil {
 			e.User = &bot.User{
+				ID:          entity.User.ID,
 				Username:    entity.User.UserName,
 				DisplayName: entity.User.FirstName + " " + entity.User.LastName,
 			}

app/events/telegram_test.go

@@ -219,7 +219,6 @@ func TestTelegramListener_DoWithAutoBan(t *testing.T) {
 	tbAPI.AssertNumberOfCalls(t, "Send", 1)
 	msgLogger.AssertExpectations(t)
 	msgLogger.AssertNumberOfCalls(t, "Save", 6)
-
 }
 
 func TestTelegramListener_DoWithBotBan(t *testing.T) {
@@ -389,6 +388,48 @@ func TestTelegramListener_DoUnpinMessages(t *testing.T) {
 	tbAPI.AssertExpectations(t)
 }
 
+func TestTelegramListener_DoNotSaveMessagesFromOtherChats(t *testing.T) {
+	msgLogger := &mockMsgLogger{}
+	tbAPI := &mockTbAPI{}
+	bots := &bot.MockInterface{}
+
+	l := TelegramListener{
+		MsgLogger: msgLogger,
+		TbAPI:     tbAPI,
+		Bots:      bots,
+		Group:     "gr",
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 500*time.Minute)
+	defer cancel()
+
+	updMsg := tbapi.Update{
+		Message: &tbapi.Message{
+			Chat: &tbapi.Chat{ID: 456}, // different group or private message
+			Text: "text 123",
+			From: &tbapi.User{UserName: "user"},
+			Date: int(time.Date(2020, 2, 11, 19, 35, 55, 9, time.UTC).Unix()),
+		},
+	}
+
+	tbAPI.On("GetChat", mock.Anything).Return(tbapi.Chat{ID: 123}, nil)
+
+	updChan := make(chan tbapi.Update, 1)
+	updChan <- updMsg
+	close(updChan)
+	tbAPI.On("GetUpdatesChan", mock.Anything).Return(tbapi.UpdatesChannel(updChan), nil)
+
+	bots.On("OnMessage", mock.Anything).Return(bot.Response{Send: true, Text: "bot's answer"})
+	tbAPI.On("Send", mock.Anything).Return(tbapi.Message{Text: "bot's answer", From: &tbapi.User{UserName: "user"}}, nil)
+
+	err := l.Do(ctx)
+	assert.EqualError(t, err, "telegram update chan closed")
+
+	msgLogger.AssertNotCalled(t, "Save", mock.Anything)
+	bots.AssertExpectations(t)
+	tbAPI.AssertExpectations(t)
+}
+
 func TestTelegram_transformTextMessage(t *testing.T) {
 	l := TelegramListener{}
 	assert.Equal(

app/reporter/export_test.go

@@ -361,6 +361,11 @@ func TestExporter_format(t *testing.T) {
 			&[]bot.Entity{{Type: "mention", Offset: 0, Length: 10}, {Type: "italic", Offset: 11, Length: 30}},
 			"<a class=\"mention\" href=\"https://t.me/chuhlomin\">@chuhlomin</a> <em>тебя слишком много, отдохни...</em>",
 		},
+		{
+			"Firstname Surname получает бан на 2m3s",
+			&[]bot.Entity{{Type: "text_mention", Offset: 0, Length: 17, User: &bot.User{ID: 900000000, Username: "", DisplayName: "Firstname Surname"}}},
+			"Firstname Surname получает бан на 2m3s",
+		},
 		{
 			"Меня url заинтересовал... do.co",
 			&[]bot.Entity{{Type: "url", Offset: 26, Length: 5}},