fix: display old groups to facilitate conversion

toboshii · Oct 2, 2022 · b321846 · b321846
1 parent 49f5e77
commit b321846
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 6 deletions.
diff --git a/internal/handlers/startpage.go b/internal/handlers/startpage.go
@@ -66,10 +66,6 @@ func (sr *startpageResource) StartpageCtx(next http.Handler) http.Handler {
 func (sr *startpageResource) GetStartpage(w http.ResponseWriter, r *http.Request) {
 	startpage := r.Context().Value(contextKeyStartpage).(*models.Startpage)
 
-	if len(startpage.Bookmarks) == 0 {
-		startpage.Bookmarks = []models.BookmarkGroup{}
-	}
-
 	appConfig, err := config.GetConfig()
 	if err != nil {
 		logger.Error("Failed to read configuration for hajimari: ", err)

diff --git a/internal/models/startpage.go b/internal/models/startpage.go
@@ -22,4 +22,6 @@ type Startpage struct {
 	DefaultSearchProvider string           `json:"defaultSearchProvider"`
 	SearchProviders       []SearchProvider `json:"searchProviders"`
 	Bookmarks             []BookmarkGroup  `json:"bookmarks"`
+	// Deprecated
+	Groups []map[string]interface{} `json:"groups,omitempty"`
 }
diff --git a/internal/services/startpage.go b/internal/services/startpage.go
@@ -31,7 +31,20 @@ func (s *startpageService) NewStartpage(startpage *models.Startpage) (string, er
 }
 
 func (s *startpageService) GetStartpage(id string) (*models.Startpage, error) {
-	return s.store.GetStartpage(id)
+	startpage, err := s.store.GetStartpage(id)
+	if err != nil {
+		return startpage, err
+	}
+
+	if len(startpage.Bookmarks) == 0 {
+		startpage.Bookmarks = []models.BookmarkGroup{}
+	}
+
+	if len(startpage.Groups) > 0 {
+		logger.Warnf("Startpage %s contains deprecated option `groups`, please convert it to `bookmarks`", startpage.ID)
+	}
+
+	return startpage, err
 }
 
 func (s *startpageService) UpdateStartpage(id string, startpage *models.Startpage) (*models.Startpage, error) {

diff --git a/internal/stores/memory.go b/internal/stores/memory.go
@@ -50,7 +50,21 @@ var startpages = []*models.Startpage{
 			},
 		},
 	},
-	{ID: "r1NqSpS1C0z3cMHyzX-Y5", Name: "Bob"},
+	{
+		ID:   "r1NqSpS1C0z3cMHyzX-Y5",
+		Name: "Bob",
+		Groups: []map[string]interface{}{
+			{
+				"name": "communicate",
+				"links": []map[string]interface{}{
+					{
+						"name": "Discord",
+						"url":  "https://discord.im",
+					},
+				},
+			},
+		},
+	},
 	{ID: "NmcvYTdRozUDNpbjAxFTO", Name: "Carol"},
 	{ID: "3OG1X_GuRS_TrCcWb5YjK", Name: "Derrick"},
 	{ID: "Qq4EF6MaSKaYZpEldtLTn", Name: "Emily"},