v0.14.0 (#27)v0.14.0

* [feat: migrate to
uz.saya.casa](https://github.com/SayaAndy/saya-today-web/commit/d3a63ca8a84bf4583bac8f5fd09bd52774bc4158)
* [feat: overhaul the design of blog
catalog](https://github.com/SayaAndy/saya-today-web/commit/99294b260661a8d3f6992404de7881945eab837b)
* [feat: replace font-andika with M PLUS and Gentium
Plus](https://github.com/SayaAndy/saya-today-web/commit/b1355436e96f2dfa777e843b53896d0bb71628e3)
* [feat: use yandexcloud.kz for photos &
static](https://github.com/SayaAndy/saya-today-web/commit/3898baa47faf268864ecac3699f7e98c6cac01a4)
* [feat: move from b2 to s3 for blog pages &
facts](https://github.com/SayaAndy/saya-today-web/commit/3efa6ed24713658af855c0ca9504f3e089342182)
* [feat: support s3 for blog
pages](https://github.com/SayaAndy/saya-today-web/commit/66b2a96fcca113105043be3cb9c49f8ee7fe240c)
* [feat: use accent colors for glightbox
tooltip](https://github.com/SayaAndy/saya-today-web/commit/81a9147c5406e3b2f2441373b935d7c5de2780da)
* [fix: set sidecar onclick attribute correctly in
update](https://github.com/SayaAndy/saya-today-web/commit/941bd3b3f3e26ca62757a34a20bc9b323be02a74)
* [fix: set cache-control for non-cacheable
pages](https://github.com/SayaAndy/saya-today-web/commit/78d6b00cd973e4254ea13cbb17bb35a30fef51b9)
* [feat: update font-awesome 6.7.2 to
7.2.0](https://github.com/SayaAndy/saya-today-web/commit/5e64aa9db2796e8aa6267d2ed9179ea01dc6561b)
* [fix: remove leading slash in path with going
up](https://github.com/SayaAndy/saya-today-web/commit/13428b467f752d9b53b39a3c8122998f1896ed1e)
* [feat: implement rate
limiting](https://github.com/SayaAndy/saya-today-web/commit/ca1f36376865cb2a20923aa62fdff3ee217abde3)
* [feat: integrate unix sockets into stage &
prod](https://github.com/SayaAndy/saya-today-web/commit/507bcbac6b1bf9f1a731afbe82bec10700f4028c)
* [feat: compact & move new fonts into
yandexcloud.kz](https://github.com/SayaAndy/saya-today-web/pull/27/commits/cca3ff72b5e29b31122c0a0496be741e7bc0162b)
* [feat: update all github actions, golang dependencies, golang to 1.26,
alpine to
3.23](https://github.com/SayaAndy/saya-today-web/commit/a3aa1dd07abfbbb27a7dfeeb536a6fcc51709256)
* [refactor: simpler frontmatter parser (replace regexp with bytes
pkg)](https://github.com/SayaAndy/saya-today-web/commit/42bf9d8e7f459f9021fb6fb389d3b51fed5edc35)
* [feat: allow some api methods + disallow user pages for
bots](https://github.com/SayaAndy/saya-today-web/commit/e3c80a07514a052adafd5c0f51daf69b664530e0)

1 files changed, 184 insertions, 2 deletions

diff --git a/config/config.go b/config/config.go
index eb4a91d..784ac38 100644
--- a/config/config.go
+++ b/config/config.go
@@ -1,6 +1,8 @@
 package config
 
 import (
+	"encoding/json"
+	"fmt"
 	"log/slog"
 	"os"
 
@@ -10,6 +12,7 @@ import (
 
 type Config struct {
 	LogLevel           slog.Level                `json:"LogLevel" yaml:"logLevel" validate:"required"`
+	Endpoint           EndpointConfig            `json:"Endpoint" yaml:"endpoint" validate:"required"`
 	BlogPages          BlogPagesConfig           `json:"BlogPages" yaml:"blogPages" validate:"required"`
 	FactGiver          FactGiverConfig           `json:"FactGiver" yaml:"factGiver" validate:"required"`
 	LocalePath         string                    `json:"LocalePath" yaml:"localePath" validate:"required,filepath"`
@@ -18,6 +21,87 @@ type Config struct {
 	Mail               MailConfig                `json:"Mail" yaml:"mail" validate:"required"`
 	CanonicalEndpoint  string                    `json:"CanonicalEndpoint" yaml:"canonicalEndpoint" validate:"required"`
 	Meta               MetaConfig                `json:"Meta" yaml:"meta"`
+	PhotoStorage       PhotoStorageConfig        `json:"PhotoStorage" yaml:"photoStorage"`
+	StaticStorage      PhotoTypeConfig           `json:"StaticStorage" yaml:"staticStorage"`
+	AllowOrigins       []string                  `json:"AllowOrigins" yaml:"allowOrigins"`
+}
+
+type EndpointConfig struct {
+	Type   string `json:"Type" yaml:"type" validate:"required,oneof=http unix"`
+	Config any    `json:"Config" yaml:"config" validate:"required"`
+}
+
+func (ec *EndpointConfig) UnmarshalJSON(data []byte) error {
+	var tmp struct {
+		Type   string          `json:"Type"`
+		Config json.RawMessage `json:"Config"`
+	}
+
+	if err := json.Unmarshal(data, &tmp); err != nil {
+		return err
+	}
+
+	ec.Type = tmp.Type
+
+	switch tmp.Type {
+	case "http":
+		var httpConfig HttpConfig
+		if err := json.Unmarshal(tmp.Config, &httpConfig); err != nil {
+			return fmt.Errorf("unmarshal HttpConfig: %w", err)
+		}
+		ec.Config = &httpConfig
+	case "unix":
+		var unixConfig UnixConfig
+		if err := json.Unmarshal(tmp.Config, &unixConfig); err != nil {
+			return fmt.Errorf("unmarshal UnixConfig: %w", err)
+		}
+		ec.Config = &unixConfig
+	default:
+		return fmt.Errorf("unsupported storage type: %s", tmp.Type)
+	}
+
+	return nil
+}
+
+func (ec *EndpointConfig) UnmarshalYAML(value *yaml.Node) error {
+	var tmp struct {
+		Type   string    `yaml:"type"`
+		Config yaml.Node `yaml:"config"`
+	}
+
+	if err := value.Decode(&tmp); err != nil {
+		return err
+	}
+
+	ec.Type = tmp.Type
+
+	switch tmp.Type {
+	case "http":
+		var httpConfig HttpConfig
+		if err := tmp.Config.Decode(&httpConfig); err != nil {
+			return fmt.Errorf("unmarshal HttpConfig: %w", err)
+		}
+		ec.Config = &httpConfig
+	case "unix":
+		var unixConfig UnixConfig
+		if err := tmp.Config.Decode(&unixConfig); err != nil {
+			return fmt.Errorf("unmarshal UnixConfig: %w", err)
+		}
+		ec.Config = &unixConfig
+	default:
+		return fmt.Errorf("unsupported storage type: %s", tmp.Type)
+	}
+
+	return nil
+}
+
+type HttpConfig struct {
+	ListenOn string `json:"ListenOn" yaml:"listenOn" validate:"required"`
+}
+
+type UnixConfig struct {
+	Path  string `json:"Path" yaml:"path" validate:"required"`
+	Chmod string `json:"Chmod" yaml:"chmod" validate:"oneof=0600 0660 0666"`
 }
 
 type BlogPagesConfig struct {
@@ -25,8 +109,72 @@ type BlogPagesConfig struct {
 }
 
 type StorageConfig struct {
-	Type   string   `json:"type" yaml:"type"`
-	Config B2Config `json:"Config" yaml:"config" validate:"required"`
+	Type   string `json:"Type" yaml:"type" validate:"required,oneof=b2 s3"`
+	Config any    `json:"Config" yaml:"config" validate:"required"`
+}
+
+func (sc *StorageConfig) UnmarshalJSON(data []byte) error {
+	var tmp struct {
+		Type   string          `json:"Type"`
+		Config json.RawMessage `json:"Config"`
+	}
+
+	if err := json.Unmarshal(data, &tmp); err != nil {
+		return err
+	}
+
+	sc.Type = tmp.Type
+
+	switch tmp.Type {
+	case "b2":
+		var b2Config B2Config
+		if err := json.Unmarshal(tmp.Config, &b2Config); err != nil {
+			return fmt.Errorf("unmarshal B2Config: %w", err)
+		}
+		sc.Config = &b2Config
+	case "s3":
+		var s3Config S3Config
+		if err := json.Unmarshal(tmp.Config, &s3Config); err != nil {
+			return fmt.Errorf("unmarshal S3Config: %w", err)
+		}
+		sc.Config = &s3Config
+	default:
+		return fmt.Errorf("unsupported storage type: %s", tmp.Type)
+	}
+
+	return nil
+}
+
+func (sc *StorageConfig) UnmarshalYAML(value *yaml.Node) error {
+	var tmp struct {
+		Type   string    `yaml:"type"`
+		Config yaml.Node `yaml:"config"`
+	}
+
+	if err := value.Decode(&tmp); err != nil {
+		return err
+	}
+
+	sc.Type = tmp.Type
+
+	switch tmp.Type {
+	case "b2":
+		var b2Config B2Config
+		if err := tmp.Config.Decode(&b2Config); err != nil {
+			return fmt.Errorf("unmarshal B2Config: %w", err)
+		}
+		sc.Config = &b2Config
+	case "s3":
+		var s3Config S3Config
+		if err := tmp.Config.Decode(&s3Config); err != nil {
+			return fmt.Errorf("unmarshal S3Config: %w", err)
+		}
+		sc.Config = &s3Config
+	default:
+		return fmt.Errorf("unsupported storage type: %s", tmp.Type)
+	}
+
+	return nil
 }
 
 type B2Config struct {
@@ -37,6 +185,16 @@ type B2Config struct {
 	ApplicationKey string `json:"ApplicationKey" yaml:"applicationKey"`
 }
 
+type S3Config struct {
+	BucketName      string `json:"BucketName" yaml:"bucketName" validate:"required,min=1"`
+	Region          string `json:"Region" yaml:"region" validate:"required,min=1"`
+	Prefix          string `json:"Prefix" yaml:"prefix"`
+	Endpoint        string `json:"Endpoint" yaml:"endpoint" validate:"url"`
+	UsePathStyle    bool   `json:"UsePathStyle"`
+	AccessKeyID     string `json:"AccessKeyID" yaml:"accessKeyID"`
+	SecretAccessKey string `json:"SecretAccessKey" yaml:"secretAccessKey"`
+}
+
 type FactGiverConfig struct {
 	Storage       StorageConfig `json:"Storage" yaml:"storage" validate:"required"`
 	FactsFileName string        `json:"FactsFileName" yaml:"factsFileName" validate:"required"`
@@ -82,6 +240,26 @@ type MetaConfig struct {
 	GoogleSiteVerification string `json:"GoogleSiteVerification" yaml:"googleSiteVerification"`
 }
 
+type PhotoStorageConfig struct {
+	Full           PhotoTypeConfig    `json:"Full" yaml:"full" validate:"required"`
+	Webp           PhotoTypeConfig    `json:"Webp" yaml:"webp"`
+	Thumbnail1600p PhotoTypeConfig    `json:"Thumbnail1600p" yaml:"thumbnail1600p"`
+	Thumbnail1200p PhotoTypeConfig    `json:"Thumbnail1200p" yaml:"thumbnail1200p"`
+	Thumbnail800p  PhotoTypeConfig    `json:"Thumbnail800p" yaml:"thumbnail800p"`
+	Thumbnail560p  PhotoTypeConfig    `json:"Thumbnail560p" yaml:"thumbnail560p"`
+	Thumbnail320p  PhotoTypeConfig    `json:"Thumbnail320p" yaml:"thumbnail320p"`
+	HomePageGifs   HomePageGifsConfig `json:"HomePageGifs" yaml:"homePageGifs"`
+}
+
+type PhotoTypeConfig struct {
+	BaseUrl string `json:"BaseUrl" yaml:"baseUrl" validate:"url,required"`
+}
+
+type HomePageGifsConfig struct {
+	BaseUrl string   `json:"BaseUrl" yaml:"baseUrl" validate:"url,required"`
+	Indexes []string `json:"Indexes" yaml:"indexes"`
+}
+
 func LoadConfig(path string, config *Config) error {
 	fileBytes, err := os.ReadFile(path)
 	if err != nil {
@@ -103,6 +281,10 @@ func InitConfig(path string) (*Config, error) {
 		return nil, err
 	}
 
+	if config.Endpoint.Type == "unix" && config.Endpoint.Config.(*UnixConfig).Chmod == "" {
+		config.Endpoint.Config.(*UnixConfig).Chmod = "0660"
+	}
+
 	validate := validator.New(validator.WithRequiredStructEnabled())
 	if err := validate.Struct(config); err != nil {
 		return nil, err