feat: view table splitter

Author: dd84ai

app/settings/types/types.go

@@ -19,3 +19,10 @@ type DiscordOwnerID string
 type PingMessage string
 
 type Tag string
+
+type ViewID string
+type ViewEnumeratedID string
+
+type ViewBeginning string
+type ViewRecord string
+type ViewEnd string

app/viewer/viewer.go

@@ -43,11 +43,11 @@ func (v Viewer) Update() {
 	for _, channelID := range channelIDs {
 		v.api.SetChannelID(channelID)
 		channel := NewChannelView(v.api, channelID)
+		channel.Render()
 		err := channel.Discover()
 		if logus.CheckWarn(err, "unable to grab Discord msgs", logus.ChannelID(channelID)) {
 			continue
 		}
-		channel.Render()
 		channel.Send()
 		channel.DeleteOld()
 		time.Sleep(time.Duration(v.delays.betweenChannels) * time.Second)

app/viewer/views/alert.go

@@ -8,7 +8,6 @@ import (
 	_ "embed"
 	"fmt"
 	"text/template"
-	"time"
 )
 
 //go:embed alert_template.md
@@ -20,13 +19,11 @@ func init() {
 }
 
 type TemplateAlertInput struct {
-	Header      string
-	LastUpdated string
 	PingMessage types.PingMessage
 	Msg         string
 }
 
-func RenderAlertTemplate(Header string, ChannelID types.DiscordChannelID, Msg string, api *apis.API) string {
+func RenderAlertTemplate(ChannelID types.DiscordChannelID, Msg string, api *apis.API) types.ViewRecord {
 
 	pingMessage, err := api.Alerts.PingMessage.Status(ChannelID)
 	logus.Debug("RenderAlertTemplate.PingMessage.Status", logus.OptError(err), logus.PingMessage(pingMessage))
@@ -39,10 +36,8 @@ func RenderAlertTemplate(Header string, ChannelID types.DiscordChannelID, Msg st
 	}
 
 	input := TemplateAlertInput{
-		Header:      Header,
-		LastUpdated: time.Now().String(),
 		PingMessage: pingMessage,
 		Msg:         Msg,
 	}
-	return utils.TmpRender(alertTemplate, input)
+	return types.ViewRecord(utils.TmpRender(alertTemplate, input))
 }

app/viewer/views/alert_template.md

@@ -1,2 +1 @@
-{{.Header}} (last updated: {{.LastUpdated}})
 {{.PingMessage}} **Alert: {{.Msg}}**

app/viewer/views/baseview/base.go

@@ -13,7 +13,6 @@ import (
 	"strconv"
 	"strings"
 	"text/template"
-	"time"
 )
 
 //go:embed base_template.md
@@ -27,20 +26,30 @@ func init() {
 // Base
 
 type TemplateBase struct {
-	main                    views.TemplateShared
-	alertHealthLowerThan    views.TemplateShared
-	alertHealthIsDecreasing views.TemplateShared
-	alertBaseUnderAttack    views.TemplateShared
+	main                    views.ViewTable
+	alertHealthLowerThan    views.ViewTable
+	alertHealthIsDecreasing views.ViewTable
+	alertBaseUnderAttack    views.ViewTable
 	api                     *apis.API
+	*views.SharedViewTableSplitter
 }
 
 func NewTemplateBase(api *apis.API) *TemplateBase {
 	base := TemplateBase{}
 	base.api = api
-	base.main.Header = "#darkbot-base-view"
-	base.alertHealthLowerThan.Header = "#darkbot-base-alert-health-lower-than"
-	base.alertHealthIsDecreasing.Header = "#darkbot-base-health-is-decreasing"
-	base.alertBaseUnderAttack.Header = "#darkbot-base-base-under-attack"
+	base.main.ViewID = "#darkbot-base-view"
+	base.alertHealthLowerThan.ViewID = "#darkbot-base-alert-health-lower-than"
+	base.alertHealthIsDecreasing.ViewID = "#darkbot-base-health-is-decreasing"
+	base.alertBaseUnderAttack.ViewID = "#darkbot-base-base-under-attack"
+
+	base.SharedViewTableSplitter = views.NewSharedViewSplitter(
+		api,
+		&base,
+		&base.main,
+		&base.alertHealthLowerThan,
+		&base.alertHealthIsDecreasing,
+		&base.alertBaseUnderAttack,
+	)
 	return &base
 }
 
@@ -53,14 +62,6 @@ type TemplateAugmentedBase struct {
 	UnderAttackPhrase    string
 }
 
-type TemplateRendererBaseInput struct {
-	Header               string
-	LastUpdated          string
-	Bases                []TemplateAugmentedBase
-	HealthDecreasePhrase string
-	UnderAttackPhrase    string
-}
-
 func BaseContainsTag(bas base.Base, tags []types.Tag) bool {
 	for _, tag := range tags {
 		if strings.Contains(bas.Name, string(tag)) {
@@ -86,22 +87,23 @@ func MatchBases(bases []base.Base, tags []types.Tag) []base.Base {
 
 const HealthRateDecreasingThreshold = -0.01
 
-func (b *TemplateBase) Render() error {
-	input := TemplateRendererBaseInput{
-		Header:               b.main.Header,
-		LastUpdated:          time.Now().String(),
-		HealthDecreasePhrase: "\n@healthDecreasing;",
-		UnderAttackPhrase:    "\n@underAttack;",
-	}
-
+func (b *TemplateBase) GenerateRecords() error {
 	record, err := b.api.Scrappy.GetBaseStorage().GetLatestRecord()
-	if logus.CheckWarn(err, "unable to render TemplateBase") {
+	if logus.CheckWarn(err, "unable to query bases from storage in Template base Generate records") {
 		return err
 	}
 	sort.Slice(record.List, func(i, j int) bool {
 		return record.List[i].Name < record.List[j].Name
 	})
 
+	var beginning strings.Builder
+	beginning.WriteString("**Bases:**\n")
+	b.main.ViewBeginning = types.ViewBeginning(beginning.String())
+
+	HealthDecreasePhrase := "\n@healthDecreasing;"
+	UnderAttackPhrase := "\n@underAttack;"
+	bases := []TemplateAugmentedBase{}
+
 	tags, _ := b.api.Bases.TagsList(b.api.ChannelID)
 
 	matchedBases := MatchBases(record.List, tags)
@@ -121,98 +123,65 @@ func (b *TemplateBase) Render() error {
 			UnderAttack = healthDeritiveNumber < HealthRateDecreasingThreshold || strings.Contains(string(b.api.Scrappy.GetBaseAttackStorage().GetData()), base.Name)
 		}
 
-		input.Bases = append(input.Bases, TemplateAugmentedBase{
+		baseVars := TemplateAugmentedBase{
 			Base:                 base,
 			HealthChange:         healthDeritive,
 			IsHealthDecreasing:   HealthDecreasing,
 			IsUnderAttack:        UnderAttack,
-			HealthDecreasePhrase: input.HealthDecreasePhrase,
-			UnderAttackPhrase:    input.UnderAttackPhrase,
-		})
-	}
+			HealthDecreasePhrase: HealthDecreasePhrase,
+			UnderAttackPhrase:    UnderAttackPhrase,
+		}
+		bases = append(bases, baseVars)
 
-	if len(input.Bases) != 0 {
-		b.main.Content = utils.TmpRender(baseTemplate, input)
 	}
 
-	// Alerts
-	if DerivativesInitializing {
-		// Don't update alerts until bases are properly initalized. To avoid extra pings to players
-		return nil
+	for _, base := range bases {
+		b.main.AppendRecord(types.ViewRecord(utils.TmpRender(baseTemplate, base)))
 	}
 
-	b.alertHealthLowerThan.Content = ""
 	if healthThreshold, err := b.api.Alerts.BaseHealthLowerThan.Status(b.api.ChannelID); err == nil {
-		for _, base := range input.Bases {
+		for _, base := range bases {
 			if int(base.Health) < healthThreshold {
-				b.alertHealthLowerThan.Content = views.RenderAlertTemplate(b.alertHealthLowerThan.Header, b.api.ChannelID, fmt.Sprintf("Base %s has health %d lower than threshold %d", base.Name, int(base.Health), healthThreshold), b.api)
+				b.alertHealthLowerThan.AppendRecord(views.RenderAlertTemplate(
+					b.api.ChannelID,
+					fmt.Sprintf("Base %s has health %d lower than threshold %d", base.Name, int(base.Health), healthThreshold),
+					b.api,
+				))
 				break
 			}
 		}
 	}
 
-	b.alertHealthIsDecreasing.Content = ""
 	if isAlertEnabled, err := b.api.Alerts.BaseHealthIsDecreasing.Status(b.api.ChannelID); err == nil && isAlertEnabled {
-		for _, base := range input.Bases {
+		for _, base := range bases {
 			if base.IsHealthDecreasing {
-				b.alertHealthIsDecreasing.Content = views.RenderAlertTemplate(b.alertHealthIsDecreasing.Header, b.api.ChannelID, fmt.Sprintf("Base %s health %d is decreasing with value %s", base.Name, int(base.Health), base.HealthChange), b.api)
+				b.alertHealthIsDecreasing.AppendRecord(views.RenderAlertTemplate(
+					b.api.ChannelID,
+					fmt.Sprintf("Base %s health %d is decreasing with value %s", base.Name, int(base.Health), base.HealthChange),
+					b.api,
+				))
 				break
 			}
 		}
 	}
 
-	b.alertBaseUnderAttack.Content = ""
 	if isAlertEnabled, _ := b.api.Alerts.BaseIsUnderAttack.Status(b.api.ChannelID); isAlertEnabled {
-		for _, base := range input.Bases {
+		for _, base := range bases {
 			if base.IsUnderAttack {
-				b.alertBaseUnderAttack.Content = views.RenderAlertTemplate(b.alertBaseUnderAttack.Header, b.api.ChannelID, fmt.Sprintf("Base %s health %d is probably under attack because health change %s is dropping faster than %f. Or it was detected at forum attack declaration thread.", base.Name, int(base.Health), base.HealthChange, HealthRateDecreasingThreshold), b.api)
+				b.alertBaseUnderAttack.AppendRecord(views.RenderAlertTemplate(
+					b.api.ChannelID,
+					fmt.Sprintf("Base %s health %d is probably under attack because health change %s is dropping faster than %f. Or it was detected at forum attack declaration thread.",
+						base.Name,
+						int(base.Health),
+						base.HealthChange,
+						HealthRateDecreasingThreshold,
+					),
+					b.api,
+				))
 				break
 			}
 		}
 	}
 
 	return nil
 }
-
-func (t *TemplateBase) Send() {
-	t.main.Send(t.api)
-	t.alertHealthLowerThan.Send(t.api)
-	t.alertHealthIsDecreasing.Send(t.api)
-	t.alertBaseUnderAttack.Send(t.api)
-}
-
-func (t *TemplateBase) MatchMessageID(messageID types.DiscordMessageID) bool {
-
-	if messageID == t.main.MessageID {
-		return true
-	}
-	if messageID == t.alertHealthLowerThan.MessageID {
-		return true
-	}
-	if messageID == t.alertHealthIsDecreasing.MessageID {
-		return true
-	}
-	if messageID == t.alertBaseUnderAttack.MessageID {
-		return true
-	}
-	return false
-}
-
-func (t *TemplateBase) DiscoverMessageID(content string, msgID types.DiscordMessageID) {
-	if strings.Contains(content, t.main.Header) {
-		t.main.MessageID = msgID
-		t.main.Content = content
-	}
-	if strings.Contains(content, t.alertHealthLowerThan.Header) {
-		t.alertHealthLowerThan.MessageID = msgID
-		t.alertHealthLowerThan.Content = content
-	}
-	if strings.Contains(content, t.alertHealthIsDecreasing.Header) {
-		t.alertHealthIsDecreasing.MessageID = msgID
-		t.alertHealthIsDecreasing.Content = content
-	}
-	if strings.Contains(content, t.alertBaseUnderAttack.Header) {
-		t.alertBaseUnderAttack.MessageID = msgID
-		t.alertBaseUnderAttack.Content = content
-	}
-}

app/viewer/views/baseview/base_template.md

@@ -1,12 +1,8 @@
-{{.Header}} (last updated: {{.LastUpdated}})
-**Bases:**
-{{range $val := .Bases -}}
 ```scss
-BaseName({{$val.Name | printf "%q"}});
-Health({{$val.Health | printf "\"%.1f\""}});
-HealthChangeInLast15m({{$val.HealthChange | printf "%q"}});
-Affiliation({{$val.Affiliation | printf "%q"}});
-{{- if $val.IsHealthDecreasing -}}{{ $val.HealthDecreasePhrase }}{{- end }}
-{{- if $val.IsUnderAttack -}}{{ $val.UnderAttackPhrase }}{{- end }}
+BaseName({{.Name | printf "%q"}});
+Health({{.Health | printf "\"%.1f\""}});
+HealthChangeInLast15m({{.HealthChange | printf "%q"}});
+Affiliation({{.Affiliation | printf "%q"}});
+{{- if .IsHealthDecreasing -}}{{ .HealthDecreasePhrase }}{{- end }}
+{{- if .IsUnderAttack -}}{{ .UnderAttackPhrase }}{{- end }}
 ```
-{{ end }}