feat: forumer, main logic is written

Author: dd84ai

app/discorder/main.go

@@ -51,6 +51,7 @@ type DiscordMessage struct {
 	ID        types.DiscordMessageID
 	Content   string
 	Timestamp time.Time
+	Embeds    []*discordgo.MessageEmbed
 }
 
 func (d Discorder) GetLatestMessages(channelID types.DiscordChannelID) ([]DiscordMessage, error) {
@@ -67,6 +68,7 @@ func (d Discorder) GetLatestMessages(channelID types.DiscordChannelID) ([]Discor
 			ID:        types.DiscordMessageID(msg.ID),
 			Content:   msg.Content,
 			Timestamp: msg.Timestamp,
+			Embeds:    msg.Embeds,
 		})
 	}
 
@@ -119,37 +121,47 @@ func (d Discorder) GetOwnerID(channelID types.DiscordChannelID) (types.DiscordOw
 }
 
 type deduplicator struct {
-	repeatCheckers []func(msgs []DiscordMessage) bool
+	dupCheckers []func(msgs []DiscordMessage) bool
 }
 
-func NewDeduplicator(checkers ...func(msgs []DiscordMessage) bool) *deduplicator {
+type DuplicatedError struct {
+}
+
+func (d DuplicatedError) Error() string { return "This msg is duplicated" }
+
+func NewDeduplicator(isDuplicaters ...func(msgs []DiscordMessage) bool) *deduplicator {
 	d := &deduplicator{
-		repeatCheckers: checkers,
+		dupCheckers: isDuplicaters,
 	}
 	return d
 }
 
 func (d *deduplicator) isDuplicated(msgs []DiscordMessage) bool {
-	for _, checker := range d.repeatCheckers {
-		if checker(msgs) {
+	for _, isDup := range d.dupCheckers {
+		if isDup(msgs) {
 			return true
 		}
 	}
 	return false
 }
 
-func (dg Discorder) SendDeduplicatedMsg(deduplicator *deduplicator, msg string, channel types.DiscordChannelID) {
-	logus.Info("sent_message= " + msg)
-	msgs, err := dg.GetLatestMessages(channel)
+func (d Discorder) SendDeduplicatedMsg(
+	deduplicator *deduplicator,
+	channel types.DiscordChannelID,
+	send_callback func(channel types.DiscordChannelID, dg *discordgo.Session) error,
+) error {
+	msgs, err := d.GetLatestMessages(channel)
 
 	if logus.CheckError(err, "failed to get discord latest msgs") {
-		return
+		return err
 	}
 
 	if deduplicator.isDuplicated(msgs) {
-		logus.Debug("not sending duplicated", logus.ChannelID(channel), logus.DiscordMessage(msg))
-		return
+		logus.Debug("not sending duplicated", logus.ChannelID(channel))
+		return DuplicatedError{}
 	}
 
-	dg.SengMessage(channel, msg)
+	err = send_callback(channel, d.dg)
+	logus.CheckWarn(err, "failed sending message in discorder", logus.ChannelID(channel))
+	return err
 }

app/forumer/forum_post_test.go

@@ -22,9 +22,7 @@ func FixtureLatestThread() *forum_types.LatestThread {
 	}
 }
 
-func TestGetDetailedPost(t *testing.T) {
-	thread := FixtureLatestThread()
-
+func FixtureDetailedRequester() func(mt MethodType, u forum_types.Url) (*QueryResult, error) {
 	detailed_post_content_filepath := filepath.Join(utils.GetCurrrentFolder(), "test_data", "detailed_post_content.html")
 	if _, err := os.Stat(detailed_post_content_filepath); err != nil {
 		query, err := NewQuery("GET", "https://discoverygc.com/forums/showthread.php?tid=200175&action=lastpost")
@@ -39,6 +37,13 @@ func TestGetDetailedPost(t *testing.T) {
 			ResponseFullUrl:  `https://discoverygc.com/forums/showthread.php?tid=200175&pid=2315295#pid2315295`,
 		}, nil
 	}
+	return mocked_requester
+}
+
+func TestGetDetailedPost(t *testing.T) {
+	thread := FixtureLatestThread()
+
+	mocked_requester := FixtureDetailedRequester()
 	detailed_post, err := NewDetailedPostRequester(WithMockedRequester(mocked_requester)).GetDetailedPost(thread)
 	_ = detailed_post
 	fmt.Println("err=", err)

app/forumer/forum_threads_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestGetPosts(t *testing.T) {
+func FixtureMockedThreadsRequester() func(mt MethodType, u forum_types.Url) (*QueryResult, error) {
 	thread_post_content_filepath := filepath.Join(utils.GetCurrrentFolder(), "test_data", "latest_threads.html")
 	if _, err := os.Stat(thread_post_content_filepath); err != nil {
 		query, err := NewQuery("GET", ThreadPageURL)
@@ -26,8 +26,11 @@ func TestGetPosts(t *testing.T) {
 			ResponseFullUrl:  `https://discoverygc.com/forums/portal.php`,
 		}, nil
 	}
-
-	threads, err := NewLatestThreads(WithMockedPageRequester(mocked_requester)).GetLatestThreads()
+	return mocked_requester
+}
+func TestGetPosts(t *testing.T) {
+	mocked_threads_requester := FixtureMockedThreadsRequester()
+	threads, err := NewLatestThreads(WithMockedPageRequester(mocked_threads_requester)).GetLatestThreads()
 	assert.Nil(t, err, "expected nil as error")
 	assert.Greater(t, len(threads), 0)
 }

app/forumer/forum_types/post.go

@@ -12,8 +12,3 @@ type Post struct {
 	PostPermamentLink PostPermamentLink
 	ThreadFullName    ThreadFullName
 }
-
-func (p Post) Render() string {
-	// TODO Write your code
-	return ""
-}

app/forumer/run.go

@@ -7,14 +7,20 @@ import (
 	"darkbot/app/forumer/forum_types"
 	"darkbot/app/settings/logus"
 	"darkbot/app/settings/types"
+	"fmt"
 	"strings"
 	"time"
+
+	"github.com/bwmarrin/discordgo"
 )
 
+type iThreadsRequester interface {
+	GetLatestThreads(opts ...threadPageParam) ([]*forum_types.LatestThread, error)
+}
 type Forumer struct {
 	Discorder discorder.Discorder
 	*configurator.Configurators
-	threads_requester *ThreadsRequester
+	threads_requester iThreadsRequester
 	post_requester    *PostRequester
 
 	cache map[ThreadCacheKey]*forum_types.Post
@@ -33,11 +39,11 @@ func NewThreadCacheKey(thread *forum_types.LatestThread) ThreadCacheKey {
 type forumerParam func(forum *Forumer)
 
 func WithThreadsRequester(
-	threads_page_requester *ThreadsRequester) forumerParam {
+	threads_page_requester iThreadsRequester) forumerParam {
 	return func(forum *Forumer) { forum.threads_requester = threads_page_requester }
 }
-func WithDetailedPostRequest(threads_page_requester *ThreadsRequester) forumerParam {
-	return func(forum *Forumer) { forum.threads_requester = threads_page_requester }
+func WithDetailedPostRequest(post_requester *PostRequester) forumerParam {
+	return func(forum *Forumer) { forum.post_requester = post_requester }
 }
 
 func NewForumer(dbpath types.Dbpath, opts ...forumerParam) *Forumer {
@@ -47,6 +53,7 @@ func NewForumer(dbpath types.Dbpath, opts ...forumerParam) *Forumer {
 		Configurators:     configurator.NewConfigugurators(dbpath),
 		threads_requester: NewLatestThreads(),
 		post_requester:    NewDetailedPostRequester(),
+		cache:             make(map[ThreadCacheKey]*forum_types.Post),
 	}
 
 	for _, opt := range opts {
@@ -90,9 +97,7 @@ func (v *Forumer) update() {
 	}
 
 	for _, thread := range threads {
-
 		v.GetPost(thread, func(new_post *forum_types.Post) {
-			// Insert code to push post to channels
 			for _, channel := range channelIDs {
 				watch_tags, err := v.Forum.Watch.TagsList(channel)
 				if logus.CheckDebug(err, "failed to get watch tags") {
@@ -121,18 +126,36 @@ func (v *Forumer) update() {
 					continue
 				}
 
-				// Check against deduplication
+				duplication_checker := discorder.NewDeduplicator(func(msgs []discorder.DiscordMessage) bool {
+					for _, msg := range msgs {
+						content := msg.Content
+						for _, embed := range msg.Embeds {
+							content += embed.Description
+						}
+
+						if strings.Contains(content, string(new_post.PostID)) &&
+							strings.Contains(content, string(new_post.ThreadID)) {
+							return true
+						}
+					}
+					return false
+				})
 				v.Discorder.SendDeduplicatedMsg(
-					discorder.NewDeduplicator(),
-					new_post.Render(),
-					channel,
-				)
+					duplication_checker, channel, func(channel types.DiscordChannelID, dg *discordgo.Session) error {
+						dg_msg := &discordgo.MessageSend{Embed: &discordgo.MessageEmbed{}}
+						dg_msg.Embed.Title = `✉️  You've got mail`
+						dg_msg.Embed.Timestamp = string(new_post.LastUpdated)
+
+						var content strings.Builder
+						content.WriteString(fmt.Sprintf("New post in [%s](<%s>)\n", new_post.ThreadFullName, new_post.PostPermamentLink))
+						content.WriteString(fmt.Sprintf("Topic started by [%s](<%s>)", new_post.PostAuthorName, new_post.PostAuthorLink))
+						content.WriteString(fmt.Sprintf("```%s```", new_post.PostContent[:600]))
+						dg_msg.Embed.Description = content.String()
+						return nil
+					})
 			}
-
 		})
 	}
-
-	_ = channelIDs
 }
 
 func (v *Forumer) Run() {

app/forumer/run_test.go

@@ -1 +1,41 @@
 package forumer
+
+import (
+	"darkbot/app/configurator"
+	"darkbot/app/forumer/forum_types"
+	"darkbot/app/settings/logus"
+	"darkbot/app/settings/types"
+	"testing"
+)
+
+type MockedThreadsQuery struct {
+	threads []*forum_types.LatestThread
+}
+
+func (m MockedThreadsQuery) GetLatestThreads(opts ...threadPageParam) ([]*forum_types.LatestThread, error) {
+	return m.threads, nil
+}
+
+func newMockedThreadsQuery() MockedThreadsQuery {
+	mocked_threads_requester := FixtureMockedThreadsRequester()
+	threads_requester := NewLatestThreads(WithMockedPageRequester(mocked_threads_requester))
+	threads, err := threads_requester.GetLatestThreads()
+	logus.CheckFatal(err, "unexpected error from GetLatestThreads")
+	one_thread := threads[:1]
+	return MockedThreadsQuery{threads: one_thread}
+}
+
+func TestForumerSending(t *testing.T) {
+
+	mocked_post_requester := FixtureDetailedRequester()
+	configurator.FixtureMigrator(func(dbpath types.Dbpath) {
+		forum := NewForumer(
+			dbpath,
+			WithThreadsRequester(newMockedThreadsQuery()),
+			WithDetailedPostRequest(NewDetailedPostRequester(WithMockedRequester(mocked_post_requester))),
+		)
+
+		forum.update()
+	})
+
+}