Diffstat (limited to 'main.go')
| -rw-r--r-- | main.go | 24 |
1 files changed, 8 insertions, 16 deletions
@@ -12,7 +12,7 @@ import ( "github.com/SayaAndy/saya-today-web/config" "github.com/SayaAndy/saya-today-web/internal/b2" "github.com/SayaAndy/saya-today-web/internal/factgiver" - "github.com/SayaAndy/saya-today-web/internal/glightbox" + "github.com/SayaAndy/saya-today-web/internal/lightgallery" "github.com/SayaAndy/saya-today-web/internal/router" "github.com/SayaAndy/saya-today-web/internal/tailwind" "github.com/SayaAndy/saya-today-web/locale" @@ -23,9 +23,7 @@ import ( "github.com/golang-migrate/migrate/v4/database/sqlite3" "github.com/yuin/goldmark" "github.com/yuin/goldmark/parser" - "github.com/yuin/goldmark/renderer" - "github.com/yuin/goldmark/renderer/html" - "github.com/yuin/goldmark/util" + gmhtml "github.com/yuin/goldmark/renderer/html" _ "github.com/golang-migrate/migrate/v4/source/file" _ "github.com/mattn/go-sqlite3" @@ -34,25 +32,19 @@ import ( var ( md = goldmark.New( goldmark.WithExtensions( - glightbox.NewGLightboxExtension(), + lightgallery.NewLightGalleryExtension(), tailwind.NewTailwindExtension(), ), goldmark.WithParserOptions( parser.WithAutoHeadingID(), - parser.WithAttribute(), ), - goldmark.WithRenderer( - renderer.NewRenderer( - renderer.WithNodeRenderers( - util.Prioritized(tailwind.NewCustomLinkRenderer(html.WithUnsafe(), html.WithXHTML()), 50), - util.Prioritized(html.NewRenderer(html.WithXHTML()), 100), - ), - ), + goldmark.WithRendererOptions( + gmhtml.WithXHTML(), ), ) b2Client *b2.B2Client configPath = flag.String("c", "config.yaml", "Path to the configuration file (in YAML format)") - availableLanguages = make([]config.AvailableLanguageConfig, 0) + availableLanguages = make([]string, 0) localization = make(map[string]*locale.LocaleConfig) ) @@ -108,7 +100,7 @@ func main() { slog.Warn("fail to initialize a locale", slog.String("locale", lang.Name), slog.String("error", err.Error())) continue } - availableLanguages = append(availableLanguages, lang) + availableLanguages = append(availableLanguages, lang.Name) localization[lang.Name] = localeCfg } @@ -144,7 +136,7 @@ func main() { os.Exit(1) } - app.Get("/", router.Api_V1_GeneralPage(localization, availableLanguages)) + app.Get("/", router.Root(cfg.AvailableLanguages)) app.Get("/:lang<len(2)>", router.Api_V1_GeneralPage(localization, availableLanguages)) app.Get("/:lang/map", router.Lang_Map(localization, availableLanguages, b2Client)) app.Get("/:lang/blog", router.Api_V1_GeneralPage(localization, availableLanguages)) |