refactor: views to be grouped

app/viewer/channel.go

@@ -6,6 +6,8 @@ import (
 	"darkbot/app/settings/types"
 	"darkbot/app/viewer/apis"
 	"darkbot/app/viewer/views"
+	"darkbot/app/viewer/views/baseview"
+	"darkbot/app/viewer/views/playerview"
 	"strings"
 	"time"
 )
@@ -20,8 +22,8 @@ type ChannelView struct {
 // apis.NewAPI(view.ChannelID, dbpath)
 func NewChannelView(api *apis.API, channelID types.DiscordChannelID) ChannelView {
 	view := ChannelView{api: api}
-	view.views = append(view.views, views.NewTemplateBase(api))
-	view.views = append(view.views, views.NewTemplatePlayers(api))
+	view.views = append(view.views, baseview.NewTemplateBase(api))
+	view.views = append(view.views, playerview.NewTemplatePlayers(api))
 	view.ChannelID = channelID
 
 	return view

app/viewer/views/base.go → app/viewer/views/baseview/base.go

@@ -1,11 +1,12 @@
-package views
+package baseview
 
 import (
 	"darkbot/app/scrappy/base"
 	"darkbot/app/settings/logus"
 	"darkbot/app/settings/types"
 	"darkbot/app/settings/utils"
 	"darkbot/app/viewer/apis"
+	"darkbot/app/viewer/views"
 	_ "embed"
 	"fmt"
 	"sort"
@@ -26,10 +27,10 @@ func init() {
 // Base
 
 type TemplateBase struct {
-	main                    TemplateShared
-	alertHealthLowerThan    TemplateShared
-	alertHealthIsDecreasing TemplateShared
-	alertBaseUnderAttack    TemplateShared
+	main                    views.TemplateShared
+	alertHealthLowerThan    views.TemplateShared
+	alertHealthIsDecreasing views.TemplateShared
+	alertBaseUnderAttack    views.TemplateShared
 	api                     *apis.API
 }
 
@@ -144,7 +145,7 @@ func (b *TemplateBase) Render() error {
 	if healthThreshold, err := b.api.Alerts.BaseHealthLowerThan.Status(b.api.ChannelID); err == nil {
 		for _, base := range input.Bases {
 			if int(base.Health) < healthThreshold {
-				b.alertHealthLowerThan.Content = 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.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)
 				break
 			}
 		}
@@ -154,7 +155,7 @@ func (b *TemplateBase) Render() error {
 	if isAlertEnabled, err := b.api.Alerts.BaseHealthIsDecreasing.Status(b.api.ChannelID); err == nil && isAlertEnabled {
 		for _, base := range input.Bases {
 			if base.IsHealthDecreasing {
-				b.alertHealthIsDecreasing.Content = 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.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)
 				break
 			}
 		}
@@ -164,7 +165,7 @@ func (b *TemplateBase) Render() error {
 	if isAlertEnabled, _ := b.api.Alerts.BaseIsUnderAttack.Status(b.api.ChannelID); isAlertEnabled {
 		for _, base := range input.Bases {
 			if base.IsUnderAttack {
-				b.alertBaseUnderAttack.Content = 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.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)
 				break
 			}
 		}

app/viewer/views/base_test.go → app/viewer/views/baseview/base_test.go

@@ -1,4 +1,4 @@
-package views
+package baseview
 
 import (
 	"darkbot/app/configurator"

app/viewer/views/derivatives.go → app/viewer/views/baseview/derivatives.go

@@ -1,4 +1,4 @@
-package views
+package baseview
 
 import (
 	"darkbot/app/scrappy/base"

app/viewer/views/player.go → app/viewer/views/playerview/player.go

@@ -1,11 +1,12 @@
-package views
+package playerview
 
 import (
 	"darkbot/app/scrappy/player"
 	"darkbot/app/settings/logus"
 	"darkbot/app/settings/types"
 	"darkbot/app/settings/utils"
 	"darkbot/app/viewer/apis"
+	"darkbot/app/viewer/views"
 	_ "embed"
 	"fmt"
 	"strings"
@@ -23,16 +24,16 @@ import (
 // Send
 
 type PlayersFriends struct {
-	mainTable TemplateShared
-	alertTmpl TemplateShared
+	mainTable views.TemplateShared
+	alertTmpl views.TemplateShared
 }
 type PlayersEnemies struct {
-	mainTable TemplateShared
-	alertTmpl TemplateShared
+	mainTable views.TemplateShared
+	alertTmpl views.TemplateShared
 }
 type PlayersNeutral struct {
-	mainTable TemplateShared
-	alertTmpl TemplateShared
+	mainTable views.TemplateShared
+	alertTmpl views.TemplateShared
 }
 
 type PlayersTemplates struct {
@@ -137,17 +138,17 @@ func (t *PlayersTemplates) Render() error {
 
 	if alertNeutralCount, err := t.api.Alerts.NeutralsGreaterThan.Status(t.api.ChannelID); err == nil {
 		if len(neutralPlayers) >= alertNeutralCount {
-			t.neutral.alertTmpl.Content = RenderAlertTemplate(t.neutral.alertTmpl.Header, t.api.ChannelID, fmt.Sprintf("Amount %d of neutral players is above threshold %d", len(neutralPlayers), alertNeutralCount), t.api)
+			t.neutral.alertTmpl.Content = views.RenderAlertTemplate(t.neutral.alertTmpl.Header, t.api.ChannelID, fmt.Sprintf("Amount %d of neutral players is above threshold %d", len(neutralPlayers), alertNeutralCount), t.api)
 		}
 	}
 	if alertEnemyCount, err := t.api.Alerts.EnemiesGreaterThan.Status(t.api.ChannelID); err == nil {
 		if len(enemyPlayers) >= alertEnemyCount {
-			t.enemies.alertTmpl.Content = RenderAlertTemplate(t.enemies.alertTmpl.Header, t.api.ChannelID, fmt.Sprintf("Amount %d of enemy players is above threshold %d", len(enemyPlayers), alertEnemyCount), t.api)
+			t.enemies.alertTmpl.Content = views.RenderAlertTemplate(t.enemies.alertTmpl.Header, t.api.ChannelID, fmt.Sprintf("Amount %d of enemy players is above threshold %d", len(enemyPlayers), alertEnemyCount), t.api)
 		}
 	}
 	if alertFriendCount, err := t.api.Alerts.FriendsGreaterThan.Status(t.api.ChannelID); err == nil {
 		if len(friendPlayers) >= alertFriendCount {
-			t.friends.alertTmpl.Content = RenderAlertTemplate(t.friends.alertTmpl.Header, t.api.ChannelID, fmt.Sprintf("Amount %d of friendly players is above threshold %d", len(friendPlayers), alertFriendCount), t.api)
+			t.friends.alertTmpl.Content = views.RenderAlertTemplate(t.friends.alertTmpl.Header, t.api.ChannelID, fmt.Sprintf("Amount %d of friendly players is above threshold %d", len(friendPlayers), alertFriendCount), t.api)
 		}
 	}
 	return nil

app/viewer/views/player_test.go → app/viewer/views/playerview/player_test.go

@@ -1,4 +1,4 @@
-package views
+package playerview
 
 import (
 	"darkbot/app/configurator"