feat: last shaping to forum msg

Author: dd84ai

app/configurator/ping.go

@@ -0,0 +1,21 @@
+package configurator
+
+import (
+	"darkbot/app/discorder"
+	"darkbot/app/settings/logus"
+	"darkbot/app/settings/types"
+	"fmt"
+)
+
+func GetPingingMessage(ChannelID types.DiscordChannelID, configurator *Configurators, Discorder *discorder.Discorder) types.PingMessage {
+	pingMessage, err := configurator.Alerts.PingMessage.Status(ChannelID)
+	logus.Debug("RenderAlertTemplate.PingMessage.Status", logus.OptError(err), logus.PingMessage(pingMessage))
+	if err != nil {
+		ownerID, err := Discorder.GetOwnerID(ChannelID)
+		if logus.CheckWarn(err, "unable to acquire Discorder Channel Owner", logus.ChannelID(ChannelID)) {
+			ownerID = "TestOwnerID"
+		}
+		pingMessage = types.PingMessage(fmt.Sprintf("<@%s>", ownerID))
+	}
+	return pingMessage
+}

app/discorder/main.go

@@ -20,8 +20,8 @@ type Discorder struct {
 	dg *discordgo.Session
 }
 
-func NewClient() Discorder {
-	d := Discorder{}
+func NewClient() *Discorder {
+	d := &Discorder{}
 	dg, err := discordgo.New("Bot " + settings.Config.DiscorderBotToken)
 	logus.CheckFatal(err, "failed to init discord")
 	dg.Identify.Intents = discordgo.IntentsGuildMessages

app/forumer/run.go

@@ -18,7 +18,7 @@ type iThreadsRequester interface {
 	GetLatestThreads(opts ...threadPageParam) ([]*forum_types.LatestThread, error)
 }
 type Forumer struct {
-	Discorder discorder.Discorder
+	Discorder *discorder.Discorder
 	*configurator.Configurators
 	threads_requester iThreadsRequester
 	post_requester    *PostRequester
@@ -126,6 +126,8 @@ func (v *Forumer) update() {
 					continue
 				}
 
+				pingMessage := configurator.GetPingingMessage(channel, v.Configurators, v.Discorder)
+
 				duplication_checker := discorder.NewDeduplicator(func(msgs []discorder.DiscordMessage) bool {
 					for _, msg := range msgs {
 						content := msg.Content
@@ -142,7 +144,11 @@ func (v *Forumer) update() {
 				})
 				v.Discorder.SendDeduplicatedMsg(
 					duplication_checker, channel, func(channel types.DiscordChannelID, dg *discordgo.Session) error {
-						dg_msg := &discordgo.MessageSend{Embed: &discordgo.MessageEmbed{}}
+
+						dg_msg := &discordgo.MessageSend{
+							Content: string(pingMessage),
+							Embed:   &discordgo.MessageEmbed{},
+						}
 						dg_msg.Embed.Title = `✉️  You've got mail`
 						dg_msg.Embed.Timestamp = string(new_post.LastUpdated)
 

app/viewer/apis/apis.go

@@ -8,7 +8,7 @@ import (
 )
 
 type API struct {
-	Discorder discorder.Discorder
+	Discorder *discorder.Discorder
 	ChannelID types.DiscordChannelID
 	Scrappy   *scrappy.ScrappyStorage
 	*configurator.Configurators

app/viewer/views/alert.go

@@ -1,12 +1,11 @@
 package views
 
 import (
-	"darkbot/app/settings/logus"
+	"darkbot/app/configurator"
 	"darkbot/app/settings/types"
 	"darkbot/app/settings/utils"
 	"darkbot/app/viewer/apis"
 	_ "embed"
-	"fmt"
 	"text/template"
 )
 
@@ -24,17 +23,10 @@ type TemplateAlertInput struct {
 }
 
 func RenderAlertTemplate(ChannelID types.DiscordChannelID, Msg string, api *apis.API) types.ViewRecord {
+	// pingMessage, err := api.Alerts.PingMessage.Status(ChannelID)
+	// ownerID, err := api.Discorder.GetOwnerID(ChannelID)
 
-	pingMessage, err := api.Alerts.PingMessage.Status(ChannelID)
-	logus.Debug("RenderAlertTemplate.PingMessage.Status", logus.OptError(err), logus.PingMessage(pingMessage))
-	if err != nil {
-		ownerID, err := api.Discorder.GetOwnerID(ChannelID)
-		if logus.CheckWarn(err, "unable to acquire Discorder Channel Owner", logus.ChannelID(ChannelID)) {
-			ownerID = "TestOwnerID"
-		}
-		pingMessage = types.PingMessage(fmt.Sprintf("<@%s>", ownerID))
-	}
-
+	pingMessage := configurator.GetPingingMessage(ChannelID, api.Configurators, api.Discorder)
 	input := TemplateAlertInput{
 		PingMessage: pingMessage,
 		Msg:         Msg,