remove unused code. remove redundant logs

Author: Igor Rybak

habr/feedReader.go

@@ -20,7 +20,6 @@ type FeedReader interface {
 }
 
 type FeedItem struct {
-	LinkToImage string
 	Message     string
 	ID          string
 }
@@ -96,13 +95,11 @@ func NewHabrReader() FeedReader {
 }
 
 func processItem(item *gofeed.Item) FeedItem {
-	linkToImage := getFirstImageLink(item.Description)
 	msg := "<a href=\"" + item.Link + "\">" + item.Title + "</a>\n"
 	msg += stripTags(item.Description)
 	postID := getPostID(item.Link)
 
 	return FeedItem{
-		LinkToImage: linkToImage,
 		Message:     msg,
 		ID:          postID}
 }
@@ -152,7 +149,7 @@ func (HabrReader) GetBestFeed() []FeedItem {
 		log.Printf("Feed response: %s", body)
 		log.Fatalln("Error parsing RSS feed:", err.Error())
 	}
-	log.Printf("RSS feed is pulled. Description %s, Published: %s", feed.Description, feed.Published)
+	log.Printf("RSS feed is pulled. Published: %s, Number of items: %d", feed.Published, len(feed.Items))
 
 	for _, item := range feed.Items {
 		response = append(response, processItem(item))

habrbestbot_test.go

@@ -13,9 +13,8 @@ func TestHabrBestBot_updateFeedToChannel_OneItem(t *testing.T) {
 	fr := feedReaderMocked{
 		items: []habr.FeedItem{
 			{
-				LinkToImage: "http://",
-				Message:     "text",
-				ID:          "id1",
+				Message: "text",
+				ID:      "id1",
 			},
 		},
 	}
@@ -37,14 +36,12 @@ func TestHabrBestBot_updateFeedToChannel_TwoItems(t *testing.T) {
 	fr := feedReaderMocked{
 		items: []habr.FeedItem{
 			{
-				LinkToImage: "http://",
-				Message:     "text",
-				ID:          "id1",
+				Message: "text",
+				ID:      "id1",
 			},
 			{
-				LinkToImage: "http://",
-				Message:     "text",
-				ID:          "id2",
+				Message: "text",
+				ID:      "id2",
 			},
 		},
 	}
@@ -67,14 +64,12 @@ func TestHabrBestBot_updateFeedToChannel_TwoSameItems(t *testing.T) {
 	fr := feedReaderMocked{
 		items: []habr.FeedItem{
 			{
-				LinkToImage: "http://",
-				Message:     "text",
-				ID:          "id1",
+				Message: "text",
+				ID:      "id1",
 			},
 			{
-				LinkToImage: "http://",
-				Message:     "text",
-				ID:          "id1",
+				Message: "text",
+				ID:      "id1",
 			},
 		},
 	}
@@ -94,11 +89,6 @@ type telegramBotMocked struct {
 	newMessagesCount int
 }
 
-func (t *telegramBotMocked) NewMessageToChat(chatID int64, text string) error {
-	t.newMessagesCount++
-	return nil
-}
-
 func (t *telegramBotMocked) NewMessageToChannel(username string, text string) error {
 	t.newMessagesCount++
 	return nil

telegram/bot.go

@@ -6,16 +6,8 @@ import (
 	tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api"
 )
 
-type updateMessage struct {
-	Text   string
-	ChatID int64
-}
-
-type updatesChannel <-chan updateMessage
-
 type Bot struct {
-	botAPI  *tgbotapi.BotAPI
-	updates updatesChannel
+	botAPI *tgbotapi.BotAPI
 }
 
 // NewBot returns an instance of Bot which implements Messenger interface
@@ -32,29 +24,14 @@ func NewBot(token string) Messenger {
 	return &b
 }
 
-func (b *Bot) NewMessageToChat(chatID int64, text string) error {
-	if len(text) > 4096 {
-		log.Printf("trim too long string %s", text)
-		text = text[:4090] + "..."
-	}
-	msg := tgbotapi.NewMessage(chatID, text)
-	msg.ParseMode = "HTML"
-	log.Println(msg)
-	_, err := b.botAPI.Send(msg)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
 func (b *Bot) NewMessageToChannel(username string, text string) error {
-	if len(text) > 4096 {
+	MAX_LENGTH := 4090
+	if len(text) > MAX_LENGTH {
 		log.Printf("trim too long string %s", text)
-		text = text[:4090] + "..."
+		text = text[:MAX_LENGTH] + "..."
 	}
 	msg := tgbotapi.NewMessageToChannel(username, text)
 	msg.ParseMode = "HTML"
-	log.Println(msg)
 	_, err := b.botAPI.Send(msg)
 	if err != nil {
 		return err

telegram/messenger.go

@@ -1,6 +1,5 @@
 package telegram
 
 type Messenger interface {
-	NewMessageToChat(chatID int64, text string) error
 	NewMessageToChannel(username string, text string) error
 }