From 162b1d3d6523b67fa81b9b00d749fb90b1d00d4e Mon Sep 17 00:00:00 2001
From: Tom Wiesing <tkw01536@gmail.com>
Date: Mon, 14 Nov 2022 10:57:37 +0100
Subject: [PATCH] component: Remove legacy type alias

---
 internal/dis/component/control/home/public.go   | 6 +++---
 internal/dis/component/control/info/index.go    | 6 +++---
 internal/dis/component/control/info/instance.go | 4 ++--
 internal/wisski/ingredient/info/info.go         | 5 +----
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/internal/dis/component/control/home/public.go b/internal/dis/component/control/home/public.go
index 0e4518a..175400f 100644
--- a/internal/dis/component/control/home/public.go
+++ b/internal/dis/component/control/home/public.go
@@ -8,7 +8,7 @@ import (
 	_ "embed"
 
 	"github.com/FAU-CDI/wisski-distillery/internal/dis/component/control/static"
-	"github.com/FAU-CDI/wisski-distillery/internal/wisski/ingredient/info"
+	"github.com/FAU-CDI/wisski-distillery/internal/wisski/ingredient"
 	"github.com/FAU-CDI/wisski-distillery/pkg/timex"
 	"github.com/tkw1536/goprogram/stream"
 	"golang.org/x/sync/errgroup"
@@ -65,7 +65,7 @@ func (home *Home) homeRender() ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	context.Instances = make([]info.WissKIInfo, len(wissKIs))
+	context.Instances = make([]ingredient.Information, len(wissKIs))
 
 	// determine their infos
 	var eg errgroup.Group
@@ -86,7 +86,7 @@ func (home *Home) homeRender() ([]byte, error) {
 }
 
 type HomeContext struct {
-	Instances []info.WissKIInfo
+	Instances []ingredient.Information
 
 	Time time.Time
 
diff --git a/internal/dis/component/control/info/index.go b/internal/dis/component/control/info/index.go
index b8495f6..f02c4c1 100644
--- a/internal/dis/component/control/info/index.go
+++ b/internal/dis/component/control/info/index.go
@@ -9,7 +9,7 @@ import (
 	"github.com/FAU-CDI/wisski-distillery/internal/config"
 	"github.com/FAU-CDI/wisski-distillery/internal/dis/component/control/static"
 	"github.com/FAU-CDI/wisski-distillery/internal/models"
-	"github.com/FAU-CDI/wisski-distillery/internal/wisski/ingredient/info"
+	"github.com/FAU-CDI/wisski-distillery/internal/wisski/ingredient"
 	"golang.org/x/sync/errgroup"
 )
 
@@ -25,7 +25,7 @@ type indexContext struct {
 
 	Config *config.Config
 
-	Instances []info.WissKIInfo
+	Instances []ingredient.Information
 
 	TotalCount   int
 	RunningCount int
@@ -45,7 +45,7 @@ func (nfo *Info) index(r *http.Request) (idx indexContext, err error) {
 		}
 
 		// get all of their info!
-		idx.Instances = make([]info.WissKIInfo, len(all))
+		idx.Instances = make([]ingredient.Information, len(all))
 		for i, instance := range all {
 			{
 				i := i
diff --git a/internal/dis/component/control/info/instance.go b/internal/dis/component/control/info/instance.go
index 2fac1fa..ec1da08 100644
--- a/internal/dis/component/control/info/instance.go
+++ b/internal/dis/component/control/info/instance.go
@@ -9,7 +9,7 @@ import (
 	"github.com/FAU-CDI/wisski-distillery/internal/dis/component/control/static"
 	"github.com/FAU-CDI/wisski-distillery/internal/dis/component/instances"
 	"github.com/FAU-CDI/wisski-distillery/internal/models"
-	"github.com/FAU-CDI/wisski-distillery/internal/wisski/ingredient/info"
+	"github.com/FAU-CDI/wisski-distillery/internal/wisski/ingredient"
 	"github.com/FAU-CDI/wisski-distillery/pkg/httpx"
 )
 
@@ -24,7 +24,7 @@ type instanceContext struct {
 	Time time.Time
 
 	Instance models.Instance
-	Info     info.WissKIInfo
+	Info     ingredient.Information
 }
 
 func (info *Info) instance(r *http.Request) (is instanceContext, err error) {
diff --git a/internal/wisski/ingredient/info/info.go b/internal/wisski/ingredient/info/info.go
index 6839aa6..b1dc6d7 100644
--- a/internal/wisski/ingredient/info/info.go
+++ b/internal/wisski/ingredient/info/info.go
@@ -18,12 +18,9 @@ type Info struct {
 	Analytics *lazy.PoolAnalytics
 }
 
-// TODO: Use the information struct globally
-type WissKIInfo = ingredient.Information
-
 // Information fetches information about this WissKI.
 // TODO: Rework this to be able to determine what kind of information is available.
-func (wisski *Info) Information(quick bool) (info WissKIInfo, err error) {
+func (wisski *Info) Information(quick bool) (info ingredient.Information, err error) {
 	// setup flags
 	flags := ingredient.FetchFlags{
 		Quick: quick,