diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 6088acd..531f18c 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -1,9 +1,10 @@ -# main: tests and image build (tags: commit hash, `main`). -# prod: the same, then deployment to the server (tags: commit hash, `prod`, `latest`). +# main: tests only. +# prod: tests, image build (tags: commit hash, `prod`, `latest`), then +# deployment to the server. # -# Runs on the self-hosted runner in ci/runner (label `linux`). Jobs use the -# host's Docker daemon, so image builds share its BuildKit cache; a commit -# already built on main is rebuilt from cache in seconds. +# Runs on the self-hosted runner in ci/runner (label `linux`), one job at a +# time; building on main too would build every deployed commit twice. Jobs use +# the host's Docker daemon, so image builds share its BuildKit cache. # # Repository settings (Settings → Actions): # secrets.REGISTRY_TOKEN Gitea access token with package write access @@ -63,6 +64,7 @@ jobs: build: needs: test + if: github.ref == 'refs/heads/prod' runs-on: linux steps: - name: Checkout diff --git a/Cargo.lock b/Cargo.lock index e7ef3da..55f6730 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,12 @@ # It is not intended for manual editing. version = 4 +[[package]] +name = "adler2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" + [[package]] name = "aho-corasick" version = "1.1.5" @@ -169,10 +175,12 @@ dependencies = [ "axum", "axum-extra", "db", + "deunicode", "email-templates", "hmac", "horoscope-client", "http-body-util", + "image", "jsonwebtoken", "password-hash", "rand 0.9.5", @@ -242,12 +250,24 @@ version = "3.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" +[[package]] +name = "bytemuck" +version = "1.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95832e849adfb21180ccb6826a99da14e5d266ae5c2e668e1602cf234f153797" + [[package]] name = "byteorder" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + [[package]] name = "bytes" version = "1.12.1" @@ -337,6 +357,15 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853" +[[package]] +name = "crc32fast" +version = "1.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b929dd2a135771f40afabd1073f85eed59c800b7c61901e5c254270497dad64" +dependencies = [ + "cfg-if", +] + [[package]] name = "crossbeam-channel" version = "0.5.17" @@ -514,12 +543,32 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223" +[[package]] +name = "fdeflate" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c" +dependencies = [ + "simd-adler32", +] + [[package]] name = "find-msvc-tools" version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c66915cc5391097de7a2b0b972e8505aa33c0df401fd3a6811dbdb32881ba48" +[[package]] +name = "flate2" +version = "1.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "626d4928326b646e70f65ed36fc7cf9f206bdb68a0019ee7c6b4709da4e084c4" +dependencies = [ + "crc32fast", + "miniz_oxide 0.9.1", + "zlib-rs", +] + [[package]] name = "flume" version = "0.11.1" @@ -990,6 +1039,32 @@ dependencies = [ "icu_properties", ] +[[package]] +name = "image" +version = "0.25.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104" +dependencies = [ + "bytemuck", + "byteorder-lite", + "image-webp", + "moxcms", + "num-traits", + "png", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525e9ff3e1a4be2fbea1fdf0e98686a6d98b4d8f937e1bf7402245af1909e8c3" +dependencies = [ + "byteorder-lite", + "quick-error", +] + [[package]] name = "indexmap" version = "2.14.2" @@ -1208,6 +1283,26 @@ version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5848f5a9e8117cf94f2f90faac24a87ff81600ff8628c1e3deaab572e76bfa1" +[[package]] +name = "miniz_oxide" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" +dependencies = [ + "adler2", + "simd-adler32", +] + +[[package]] +name = "miniz_oxide" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b63fbc4a50860e98e7b2aa7804ded1db5cbc3aff9193adaff57a6931bf7c4b4c" +dependencies = [ + "adler2", + "simd-adler32", +] + [[package]] name = "mio" version = "1.2.4" @@ -1219,6 +1314,16 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "moxcms" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b" +dependencies = [ + "num-traits", + "pxfm", +] + [[package]] name = "nom" version = "8.0.0" @@ -1408,6 +1513,19 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" +[[package]] +name = "png" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61" +dependencies = [ + "bitflags", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide 0.8.9", +] + [[package]] name = "portable-atomic" version = "1.15.0" @@ -1456,6 +1574,18 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "pxfm" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea" + +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + [[package]] name = "quinn" version = "0.11.12" @@ -1927,6 +2057,12 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "simd-adler32" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea" + [[package]] name = "simple_asn1" version = "0.6.4" @@ -3035,8 +3171,29 @@ dependencies = [ "syn 3.0.10", ] +[[package]] +name = "zlib-rs" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b268e58e7c693d7c271f93ffc4ba3b380412554231c85bf61ca7af91042a4112" + [[package]] name = "zmij" version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" + +[[package]] +name = "zune-core" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d56377fd46368984a170bc5aac5567e52ca5da874caa60bea39fcbca78fb658b" + +[[package]] +name = "zune-jpeg" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296" +dependencies = [ + "zune-core", +] diff --git a/crates/analysis-prompt/src/lib.rs b/crates/analysis-prompt/src/lib.rs index 78f39c8..7edb385 100644 --- a/crates/analysis-prompt/src/lib.rs +++ b/crates/analysis-prompt/src/lib.rs @@ -24,12 +24,16 @@ pub enum Kind { Forecast, /// The answer to a user's question about a finished natal analysis or forecast. Question, + /// A detailed analysis of a famous person's chart, about them in the third + /// person, for the public pages (the name comes with the data, see [`with_name`]). + Celebrity, } impl Kind { - pub const ALL: [Kind; 5] = [Kind::Summary, Kind::Natal, Kind::Synastry, Kind::Forecast, Kind::Question]; + pub const ALL: [Kind; 6] = + [Kind::Summary, Kind::Natal, Kind::Synastry, Kind::Forecast, Kind::Question, Kind::Celebrity]; /// The kinds stored as analyses (a question is stored with its analysis). - pub const ANALYSES: [Kind; 4] = [Kind::Summary, Kind::Natal, Kind::Synastry, Kind::Forecast]; + pub const ANALYSES: [Kind; 5] = [Kind::Summary, Kind::Natal, Kind::Synastry, Kind::Forecast, Kind::Celebrity]; pub fn as_str(self) -> &'static str { match self { @@ -38,6 +42,7 @@ impl Kind { Kind::Summary => "summary", Kind::Forecast => "forecast", Kind::Question => "question", + Kind::Celebrity => "celebrity", } } @@ -48,6 +53,7 @@ impl Kind { "summary" => Some(Kind::Summary), "forecast" => Some(Kind::Forecast), "question" => Some(Kind::Question), + "celebrity" => Some(Kind::Celebrity), _ => None, } } @@ -143,7 +149,7 @@ const FORECAST_SECTIONS_HU: [&str; 5] = [ /// (key, description) of the sections in the language of the user message. fn sections_in(kind: Kind, language: &str) -> Vec<(&'static str, &'static str)> { let hu: &[&str] = match kind { - Kind::Natal => &NATAL_SECTIONS_HU, + Kind::Natal | Kind::Celebrity => &NATAL_SECTIONS_HU, Kind::Synastry => &SYNASTRY_SECTIONS_HU, Kind::Forecast => &FORECAST_SECTIONS_HU, Kind::Summary | Kind::Question => &[], @@ -153,7 +159,7 @@ fn sections_in(kind: Kind, language: &str) -> Vec<(&'static str, &'static str)> fn sections(kind: Kind) -> &'static [(&'static str, &'static str)] { match kind { - Kind::Natal => &NATAL_SECTIONS, + Kind::Natal | Kind::Celebrity => &NATAL_SECTIONS, Kind::Synastry => &SYNASTRY_SECTIONS, Kind::Forecast => &FORECAST_SECTIONS, Kind::Summary | Kind::Question => &[], @@ -212,17 +218,27 @@ pub fn schema(kind: Kind) -> Value { ), _ => ("3-5 key strengths, one sentence each", "3-5 key challenges, one sentence each"), }; + let (title, advice) = match kind { + Kind::Celebrity => ( + "Short, evocative title for this portrait (at most 8 words)", + "A closing paragraph that draws the portrait together", + ), + _ => ( + "Short, evocative title for this analysis (at most 8 words)", + "A closing, encouraging paragraph with concrete guidance", + ), + }; json!({ "type": "object", "additionalProperties": false, "required": ["title", "summary", "sections", "strengths", "challenges", "advice"], "properties": { - "title": {"type": "string", "description": "Short, evocative title for this analysis (at most 8 words)"}, + "title": {"type": "string", "description": title}, "summary": {"type": "string", "description": "3-4 sentence overview"}, "sections": {"type": "object", "additionalProperties": false, "required": keys, "properties": props}, "strengths": {"type": "array", "items": {"type": "string"}, "description": strengths}, "challenges": {"type": "array", "items": {"type": "string"}, "description": challenges}, - "advice": {"type": "string", "description": "A closing, encouraging paragraph with concrete guidance"} + "advice": {"type": "string", "description": advice} } }) } @@ -252,6 +268,11 @@ fn hungarian_system(kind: Kind) -> String { előrejelzés kb. 1500–2000 szó.", ), Kind::Question => unreachable!("questions have their own prompt"), + Kind::Celebrity => ( + "portrét egy híres ember születési képletéről (az olvasó nem ő maga, hanem egy érdeklődő látogató)", + THIRD_PERSON_HU, + "Terjedelem: fejezetenként 2–4 bekezdés (kb. 150–250 szó); az egész elemzés kb. 1300–1800 szó.", + ), Kind::Synastry => ( "kapcsolati (szinasztria-) elemzést két ember számára", "Egyszerre mindkettőjükhöz szólj, többes szám második személyben („ti”, „kettőtök”). Ha meg kell \ @@ -290,6 +311,9 @@ használhatsz. if kind == Kind::Forecast { text.push_str(FORECAST_RULES_HU); } + if kind == Kind::Celebrity { + text.push_str(CELEBRITY_RULES_HU); + } text.push_str(HUNGARIAN_TERMS); if kind == Kind::Forecast { text.push_str(HUNGARIAN_FORECAST_TERMS); @@ -300,6 +324,22 @@ használhatsz. const SECOND_PERSON_HU: &str = "Közvetlenül a képlet tulajdonosához szólj, tegező formában (egyes szám második személyben, „te”)."; +const THIRD_PERSON_HU: &str = "Egyes szám harmadik személyben írj róla, a nevén nevezve: az összefoglalóban a teljes \ +nevén, később a megszokott rövidebb nevén is (vezetéknév vagy művésznév), de ne minden mondatban. Az olvasót ne szólítsd \ +meg."; + +const CELEBRITY_RULES_HU: &str = " + +A híres emberekről szóló portré szabályai: +- Kizárólag a képletből dolgozz, mintha csak a nevét és a születési adatait ismernéd. Ne hivatkozz az életrajzára, a \ +műveire, a sikereire, a kapcsolataira, a családjára, a nyilvános szerepléseire vagy a haláláról szóló tényekre, és ne \ +próbáld a képletet ismert életeseményekkel igazolni. +- A képletről jelen időben írj („a képlete azt mutatja”), róla magáról általánosan, hajlamokként („olyan ember képe \ +rajzolódik ki, aki…”), mert lehet, hogy már nem él. Ne állíts semmit az életéről, ami ne a képletből következne. +- Tisztelettel írj róla: ne ítélkezz, ne gúnyolódj, és ne tegyél egészségre, lelki betegségre vagy halálra vonatkozó \ +kijelentést. +- Az „advice” mező nem neki szóló tanács, hanem zárógondolat: egy bekezdés, amely összefogja a portrét."; + const FORECAST_RULES_HU: &str = " Az előrejelzés szabályai: @@ -367,6 +407,11 @@ pub fn default_system(kind: Kind, language: &str) -> String { } let (role, reader) = match kind { Kind::Question => unreachable!("questions have their own prompt"), + Kind::Celebrity => ( + "a portrait of a famous person's natal chart (the reader is not that person but an interested visitor)", + "Write about them in the third person singular, by name: the full name in the summary, later also the \ + usual shorter name (surname or stage name), but not in every sentence. Do not address the reader.", + ), Kind::Natal => ( "a personal natal chart interpretation", "Speak to the owner of the chart directly, in the informal second person singular (in Hungarian: tegező forma, \"te\").", @@ -419,9 +464,30 @@ and no medical, legal or financial advice. if kind == Kind::Forecast { text.push_str(FORECAST_RULES); } + if kind == Kind::Celebrity { + text.push_str(CELEBRITY_RULES); + } text } +const CELEBRITY_RULES: &str = " + +Rules for a famous person's portrait: +- Work from the chart alone, as if you knew only their name and birth data. Do not refer to their biography, works, \ +successes, relationships, family, public appearances or the facts of their death, and do not try to prove the chart \ +with known events of their life. +- Write about the chart in the present tense (\"the chart shows\") and about the person in general terms, as \ +tendencies (\"the picture is of someone who…\"), since they may no longer be alive. Claim nothing about their life \ +that does not follow from the chart. +- Write with respect: no judging, no mockery, and no statements about health, mental illness or death. +- The \"advice\" field is not advice to them but a closing thought: one paragraph that draws the portrait together."; + +/// The chart data of a famous person with their name in front (the user +/// message of a [`Kind::Celebrity`] analysis). +pub fn with_name(language: &str, name: &str, chart_text: &str) -> String { + format!("{}: {}\n\n{chart_text}", if language == "hu" { "Név" } else { "Name" }, name.trim()) +} + const FORECAST_RULES: &str = " Forecast rules: @@ -459,6 +525,9 @@ pub fn user_template(kind: Kind) -> String { let history = [("{korábbi kérdés}".to_string(), "{korábbi válasz}".to_string())]; return build_question("hu", "{chart data}\n", "{az elemzés szövege}\n", &history, "{a kérdés}", None).user; } + if kind == Kind::Celebrity { + return build(kind, "hu", &with_name("hu", "{név}", "{chart data}\n"), None).user; + } build(kind, "hu", "{chart data}\n", None).user } @@ -590,6 +659,7 @@ pub fn build(kind: Kind, language: &str, chart_text: &str, system: Option<&str>) user, schema_name: match kind { Kind::Natal => "natal_analysis", + Kind::Celebrity => "celebrity_analysis", Kind::Synastry => "synastry_analysis", Kind::Summary => "chart_summary", Kind::Question => "question_answer", @@ -669,6 +739,8 @@ pub fn polish(language: &str, content: &mut Value) { pub fn to_markdown(kind: Kind, language: &str, content: &Value) -> String { let (strengths, challenges, advice) = match (language, kind) { ("hu", Kind::Forecast) => ("Lehetőségek", "Kihívások", "Útravaló"), + ("hu", Kind::Celebrity) => ("Erősségek", "Kihívások", "Összegzés"), + (_, Kind::Celebrity) => ("Strengths", "Challenges", "In sum"), ("hu", _) => ("Erősségek", "Kihívások", "Útravaló"), (_, Kind::Forecast) => ("Opportunities", "Challenges", "Advice"), _ => ("Strengths", "Challenges", "Advice"), @@ -743,6 +815,24 @@ mod tests { } } + #[test] + fn celebrity_prompt() { + let text = with_name("hu", " Marilyn Monroe ", "SUN: Gemini\n"); + assert!(text.starts_with("Név: Marilyn Monroe\n\nSUN: Gemini")); + let p = build(Kind::Celebrity, "hu", &text, None); + assert_eq!(p.schema_name, "celebrity_analysis"); + assert!(p.system.contains("harmadik személyben") && p.system.contains("Kizárólag a képletből")); + assert!(!p.system.contains("tegező")); + assert!(p.user.contains("Név: Marilyn Monroe") && p.user.contains("- personality:")); + // the same sections as a natal analysis, so the pages show it the same way + assert_eq!(p.schema["properties"]["sections"], schema(Kind::Natal)["properties"]["sections"]); + assert!(p.schema["properties"]["advice"]["description"].as_str().unwrap().contains("portrait")); + let en = default_system(Kind::Celebrity, "en"); + assert!(en.contains("third person") && en.contains("chart alone") && !en.contains("second person singular")); + assert!(user_template(Kind::Celebrity).contains("Név: {név}")); + assert!(to_markdown(Kind::Celebrity, "hu", &json!({"title": "C", "summary": "S"})).contains("## Összegzés")); + } + #[test] fn question_prompt() { let history = [("Mikor jó váltani?".to_string(), "Tavasszal.".to_string())]; diff --git a/crates/db/migrations/0034_celebrities.sql b/crates/db/migrations/0034_celebrities.sql new file mode 100644 index 0000000..ed838d3 --- /dev/null +++ b/crates/db/migrations/0034_celebrities.sql @@ -0,0 +1,58 @@ +-- Famous people: an admin adds their birth data, one photo and a detailed +-- analysis written with its own prompt (`celebrity` kind, about them in the +-- third person). Published ones have a public page and a list. +-- +-- The chart is an ordinary `charts` row of kind 'celebrity' (so calculation, +-- recalculation and the worker work as for any chart), owned by the admin +-- who added it; the user's own lists leave these out. + +ALTER TABLE charts DROP CONSTRAINT charts_kind_check; +ALTER TABLE charts ADD CONSTRAINT charts_kind_check CHECK (kind IN ('own', 'person', 'celebrity')); + +ALTER TABLE analyses DROP CONSTRAINT analyses_kind_check; +ALTER TABLE analyses ADD CONSTRAINT analyses_kind_check + CHECK (kind IN ('natal', 'synastry', 'summary', 'forecast', 'tarot', 'celebrity')); +ALTER TABLE analyses DROP CONSTRAINT analyses_target; +ALTER TABLE analyses ADD CONSTRAINT analyses_target CHECK ( + (kind IN ('natal', 'summary', 'celebrity') AND chart_id IS NOT NULL AND synastry_id IS NULL AND forecast_id IS NULL) + OR (kind = 'synastry' AND synastry_id IS NOT NULL AND chart_id IS NULL AND forecast_id IS NULL) + OR (kind = 'forecast' AND forecast_id IS NOT NULL AND chart_id IS NULL AND synastry_id IS NULL) + OR (kind = 'tarot' AND tarot IS NOT NULL AND chart_id IS NULL AND synastry_id IS NULL AND forecast_id IS NULL) +); + +ALTER TABLE prompt_revisions DROP CONSTRAINT prompt_revisions_kind_check; +ALTER TABLE prompt_revisions ADD CONSTRAINT prompt_revisions_kind_check + CHECK (kind IN ('summary', 'natal', 'synastry', 'forecast', 'question', 'celebrity')); + +ALTER TABLE prompt_previews DROP CONSTRAINT prompt_previews_target; +ALTER TABLE prompt_previews ADD CONSTRAINT prompt_previews_target CHECK ( + (kind IN ('summary', 'natal', 'celebrity') AND chart_id IS NOT NULL AND synastry_id IS NULL AND forecast_id IS NULL) + OR (kind = 'synastry' AND synastry_id IS NOT NULL AND chart_id IS NULL AND forecast_id IS NULL) + OR (kind = 'forecast' AND forecast_id IS NOT NULL AND chart_id IS NULL AND synastry_id IS NULL) +); + +CREATE TABLE celebrities ( + id uuid PRIMARY KEY, + -- Deleting the chart deletes the famous person (and the analyses with it). + chart_id uuid NOT NULL UNIQUE REFERENCES charts (id) ON DELETE CASCADE, + name text NOT NULL CHECK (length(name) BETWEEN 1 AND 100), + -- One line under the name, e.g. "színésznő, énekesnő". + subtitle text CHECK (subtitle IS NULL OR length(subtitle) BETWEEN 1 AND 160), + -- The address of the public page: /hires-emberek/. + slug text NOT NULL UNIQUE CHECK (slug ~ '^[a-z0-9]+(-[a-z0-9]+)*$'), + -- The one photo in the object storage (a new upload gets a new key, so + -- caches never serve an old picture), its size, and the point of the face + -- (0..1 from the left and from the top) that every crop keeps in view. + photo_key text, + photo_width integer, + photo_height integer, + focus_x real NOT NULL DEFAULT 0.5 CHECK (focus_x BETWEEN 0 AND 1), + focus_y real NOT NULL DEFAULT 0.3 CHECK (focus_y BETWEEN 0 AND 1), + -- NULL: a draft, only admins see it. + published_at timestamptz, + created_by uuid REFERENCES users (id) ON DELETE SET NULL, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now(), + CONSTRAINT celebrities_photo CHECK ((photo_key IS NULL) = (photo_width IS NULL) AND (photo_key IS NULL) = (photo_height IS NULL)) +); +CREATE INDEX celebrities_published_idx ON celebrities (published_at DESC) WHERE published_at IS NOT NULL; diff --git a/deploy/README.md b/deploy/README.md index 7e26fa4..0770207 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -2,13 +2,15 @@ A `.gitea/workflows/ci.yml` (Gitea Actions) két ágra fut: -- **main**: tesztek, majd image-build. Címkék: a commit hash első 12 karaktere és `main`. -- **prod**: ugyanez, majd telepítés a szerverre. Címkék: hash, `prod` és `latest`. Élesíteni tehát úgy kell, hogy a main-t a prod-ba mergeled (vagy pusholod). +- **main**: csak tesztek. +- **prod**: tesztek, image-build, majd telepítés a szerverre. Címkék: a commit hash első 12 karaktere, `prod` és `latest`. Élesíteni tehát úgy kell, hogy a main-t a prod-ba mergeled (vagy pusholod). + +A runner egyszerre egy feladatot futtat; ha a main is buildelne, minden kitett commit kétszer épülne, és a két futás feladatai egymás közé ékelődnének. A fordítási hibák (például a frontend TypeScript-ellenőrzése) így a prod buildben derülnek ki, ezért kitétel előtt helyben is érdemes buildelni. A lépések: 1. **test**: `cargo test` a backendre, a workerre, a db-re, a horoscope-clientre és a service-kitre, egy Postgres szolgáltatás-konténerrel. -2. **build**: megépíti a négy image-et, és feltölti őket a `registry.sagifer.com/sagifer/sorsfonalak-` címre. A frontend buildje a TypeScript-típusokat is ellenőrzi. Egy main-en már megépült commit a cache-ből pár mp alatt újraépül. +2. **build** (csak prod): megépíti a négy image-et, és feltölti őket a `registry.sagifer.com/sagifer/sorsfonalak-` címre. A frontend buildje a TypeScript-típusokat is ellenőrzi. 3. **deploy** (csak prod): felmásolja a `docker-compose.yml`-t és a `Caddyfile`-t a szerverre, beírja az új `TAG`-et a szerveren lévő `.env`-be, majd `docker compose pull && up -d`. Az adatbázis-migrációk a backend indulásakor futnak le. 4. **release** (csak prod, a deploy után): létrehoz egy `v<év.hónap.nap>-` taget és Gitea-release-t az előző release óta bekerült commitok listájával (repó → Releases). @@ -81,6 +83,18 @@ A Docker által kinyitott portokat az ufw magától nem szűri, ezért a 80-as A Google OAuth kliensnél a `https://sorsfonalak.hu` címet fel kell venni az engedélyezett JavaScript-források közé. +### Fotók: DigitalOcean Spaces (híres emberek) + +A híres emberek fotóit a backend S3-kompatibilis tárolóba teszi, fotónként egyetlen változatot (álló JPEG, legfeljebb 2000 px, metaadatok nélkül). A tároló privát marad. A backend a `/v1/public/photos/...` címen adja ki a képet, a méretezett változatokat a Next.js képoptimalizálója készíti (`/_next/image`), és ezeket a Cloudflare cache-eli. Minden feltöltés új kulcsot kap, ezért a régi kép sosem ragad be a cache-ben. + +- Spaces: Create → Spaces Object Storage, régió például `fra1`, név például `sorsfonalak-photos`. A File Listing legyen *Restricted*. CDN nem kell. +- Kulcs: Spaces Object Storage → Access Keys → *Limited access*, csak erre a bucketre, *Read/Write/Delete* joggal. +- `.env`: `S3_ENDPOINT=https://fra1.digitaloceanspaces.com`, `S3_BUCKET=sorsfonalak-photos` (a `S3_REGION` maradhat `us-east-1`). +- `.env.secrets`: `S3_ACCESS_KEY_ID` és `S3_SECRET_ACCESS_KEY`. Utána `docker compose up -d backend`. +- Ha nincs beállítva `S3_ENDPOINT`, minden más működik, csak fotót nem lehet feltölteni. +- A fotók nincsenek benne a napi `pg_dump`-ban. A Spaces maga is több példányban tárol, de ha a bucketet törlik, a fotókat újra fel kell tölteni. +- Cloudflare: Caching → Cache Rules → új szabály: *URI Path starts with `/_next/image`* → **Eligible for cache**, Edge TTL: *Use cache-control header if present*. Kiterjesztés nélküli címet a Cloudflare magától nem cache-el, a szabály nélkül minden méretet a szerver számolna újra. A Next csak WebP-t ad, ezért nem gond, hogy a Cloudflare az `Accept` fejlécet nem veszi figyelembe. + ## Üzemeltetés - Naplók élőben: `docker compose logs -f backend worker worker-ai` (ez a konténer újraindításáig/cseréjéig él). diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index dd91d15..2869980 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -105,6 +105,11 @@ services: FREE_PERSON_SLOTS: ${FREE_PERSON_SLOTS:-0} # invite: new accounts need an invitation (admin page "Meghívók"); open: anyone. SIGNUP_MODE: ${SIGNUP_MODE:-invite} + # Famous people's photos: DigitalOcean Spaces (S3_ACCESS_KEY_ID and + # S3_SECRET_ACCESS_KEY in .env.secrets). Empty S3_ENDPOINT: no uploads. + S3_ENDPOINT: ${S3_ENDPOINT:-} + S3_BUCKET: ${S3_BUCKET:-} + S3_REGION: ${S3_REGION:-us-east-1} # The log also goes to the logs volume, one file a day, kept 30 days # (deploy/README.md: Logs). LOG_DIR: /logs diff --git a/docker-compose.override.yml b/docker-compose.override.yml index d3d4fad..50fa91c 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -3,6 +3,9 @@ # # Mailpit catches every e-mail the worker sends; nothing leaves the machine. # Web UI: http://:8025 +# +# RustFS stands in for DigitalOcean Spaces (S3-compatible object storage of the +# famous people's photos). Console: http://localhost:9001 (rustfs-dev / rustfs-dev-secret). services: mailpit: @@ -15,9 +18,36 @@ services: - "8025:8025" restart: unless-stopped + rustfs: + image: rustfs/rustfs:1.0.4 + environment: + RUSTFS_ACCESS_KEY: rustfs-dev + RUSTFS_SECRET_KEY: rustfs-dev-secret + RUSTFS_CONSOLE_ENABLE: "true" + volumes: + - rustfs:/data + ports: + - "127.0.0.1:9000:9000" + - "127.0.0.1:9001:9001" + restart: unless-stopped + + backend: + environment: + S3_ENDPOINT: http://rustfs:9000 + S3_BUCKET: sorsfonalak-dev + S3_ACCESS_KEY_ID: rustfs-dev + S3_SECRET_ACCESS_KEY: rustfs-dev-secret + S3_CREATE_BUCKET: "true" + depends_on: + rustfs: + condition: service_started + worker: environment: SMTP_URL: smtp://mailpit:1025 depends_on: mailpit: condition: service_healthy + +volumes: + rustfs: diff --git a/docker-compose.yml b/docker-compose.yml index 32cdc4c..990a676 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -65,6 +65,12 @@ services: FREE_PERSON_SLOTS: ${FREE_PERSON_SLOTS:-0} # invite: new accounts need an invitation (admin page "Meghívók"); open: anyone. SIGNUP_MODE: ${SIGNUP_MODE:-invite} + # Famous people's photos (S3-compatible storage; the override file + # points it at the RustFS container in development). + S3_ENDPOINT: ${S3_ENDPOINT:-} + S3_BUCKET: ${S3_BUCKET:-} + S3_REGION: ${S3_REGION:-us-east-1} + S3_CREATE_BUCKET: ${S3_CREATE_BUCKET:-false} # STRIPE_SECRET_KEY / STRIPE_WEBHOOK_SECRET (test keys; docs/fizetes.md). # With them Stripe replaces the stand-in payment. env_file: diff --git a/services/backend/Cargo.toml b/services/backend/Cargo.toml index 2197b90..eddb61f 100644 --- a/services/backend/Cargo.toml +++ b/services/backend/Cargo.toml @@ -11,10 +11,12 @@ db.workspace = true analysis-prompt.workspace = true email-templates.workspace = true hmac.workspace = true +image = { version = "0.25", default-features = false, features = ["jpeg", "png", "webp"] } rand.workspace = true horoscope-client.workspace = true service-kit.workspace = true anyhow.workspace = true +deunicode.workspace = true argon2.workspace = true password-hash = { version = "0.5", features = ["getrandom"] } axum.workspace = true diff --git a/services/backend/src/config.rs b/services/backend/src/config.rs index a63c0da..2b8e165 100644 --- a/services/backend/src/config.rs +++ b/services/backend/src/config.rs @@ -106,6 +106,12 @@ pub struct Config { /// `SIGNUP_MODE` (`invite` or `open`, default `invite`): whether new /// accounts need an invitation. pub signup_mode: SignupMode, + /// Object storage of the uploaded photos (see [`crate::storage`]); `None` + /// when `S3_ENDPOINT` is not set (photo uploads are then refused). + pub storage: Option, + /// `S3_CREATE_BUCKET` (default false): create the bucket at startup if it + /// is missing (development; in production it is made in the console). + pub storage_create_bucket: bool, } /// `STRIPE_SECRET_KEY` (`sk_test_…` or `sk_live_…`), `STRIPE_WEBHOOK_SECRET` @@ -219,6 +225,18 @@ impl Config { Some("open") => SignupMode::Open, Some(other) => bail!("invalid SIGNUP_MODE '{other}': use 'invite' or 'open'"), }, + storage: match var("S3_ENDPOINT") { + None => None, + Some(endpoint) => Some(crate::storage::StorageConfig { + endpoint: endpoint.trim_end_matches('/').to_string(), + bucket: var("S3_BUCKET").context("S3_BUCKET is required with S3_ENDPOINT")?, + region: var("S3_REGION").unwrap_or_else(|| "us-east-1".into()), + access_key: var("S3_ACCESS_KEY_ID").context("S3_ACCESS_KEY_ID is required with S3_ENDPOINT")?, + secret_key: var("S3_SECRET_ACCESS_KEY") + .context("S3_SECRET_ACCESS_KEY is required with S3_ENDPOINT")?, + }), + }, + storage_create_bucket: parsed("S3_CREATE_BUCKET", false)?, }; if config.session_ttl_days < 1 { bail!("SESSION_TTL_DAYS must be at least 1"); @@ -260,6 +278,14 @@ impl Config { max_charts_per_user: 50, free_person_slots: 5, signup_mode: SignupMode::Open, + storage: Some(crate::storage::StorageConfig { + endpoint: format!("{horoscope_api_url}/s3"), + bucket: "photos".into(), + region: "us-east-1".into(), + access_key: "test-key".into(), + secret_key: "test-secret".into(), + }), + storage_create_bucket: false, } } } diff --git a/services/backend/src/main.rs b/services/backend/src/main.rs index 93572c5..aadad7f 100644 --- a/services/backend/src/main.rs +++ b/services/backend/src/main.rs @@ -17,7 +17,9 @@ mod models; mod oidc; mod packages; mod persons; +mod photo; mod routes; +mod storage; mod stripe; #[cfg(test)] mod tests; @@ -52,6 +54,8 @@ pub struct AppState { pub share_visits: LoginLimiter, pub models: models::Catalog, pub stripe: stripe::Client, + /// Uploaded photos; `None` when no object storage is configured. + pub storage: Option, } impl AppState { @@ -66,6 +70,7 @@ impl AppState { share_visits: LoginLimiter::new(1, Duration::from_secs(30 * 60)), models: models::Catalog::new(&config.openrouter_models_url), stripe: stripe::Client::default(), + storage: config.storage.clone().map(storage::Storage::new), db, config, } @@ -91,7 +96,14 @@ async fn main() -> anyhow::Result<()> { if std::env::args().nth(1).as_deref() == Some("recalculate") { return routes::recalculate(&AppState::new(pool, config)).await; } - let app = routes::router(Arc::new(AppState::new(pool, config))); + let state = AppState::new(pool, config); + if state.config.storage_create_bucket + && let Some(storage) = &state.storage + && let Err(e) = storage.ensure_bucket().await + { + tracing::warn!(error = %e, "creating the object storage bucket failed"); + } + let app = routes::router(Arc::new(state)); let listener = tokio::net::TcpListener::bind(addr).await.with_context(|| format!("binding {addr}"))?; tracing::info!(%addr, "listening"); axum::serve(listener, app).with_graceful_shutdown(service_kit::shutdown_signal()).await?; diff --git a/services/backend/src/models.rs b/services/backend/src/models.rs index 01b5f23..318735b 100644 --- a/services/backend/src/models.rs +++ b/services/backend/src/models.rs @@ -47,7 +47,7 @@ impl Function { match kind { Kind::Summary => Function::Summary, Kind::Question => Function::Question, - Kind::Natal | Kind::Synastry | Kind::Forecast => Function::Analysis, + Kind::Natal | Kind::Synastry | Kind::Forecast | Kind::Celebrity => Function::Analysis, } } } diff --git a/services/backend/src/photo.rs b/services/backend/src/photo.rs new file mode 100644 index 0000000..3b2e3b8 --- /dev/null +++ b/services/backend/src/photo.rs @@ -0,0 +1,111 @@ +//! Uploaded photos: one stored version per photo, an upright JPEG at most +//! [`MAX_SIDE`] pixels on its longer side. Sized versions are made on request +//! by the frontend's image optimizer, so nothing else is stored. +//! +//! Re-encoding also drops the metadata of the original (EXIF: camera, place). + +use std::io::Cursor; + +use image::codecs::jpeg::JpegEncoder; +use image::imageops::FilterType; +use image::metadata::Orientation; +use image::{DynamicImage, ImageDecoder, ImageFormat, ImageReader, Limits}; + +/// The longer side of the stored photo, in pixels. +pub const MAX_SIDE: u32 = 2000; +/// The largest upload accepted, in bytes. +pub const MAX_UPLOAD: usize = 15 * 1024 * 1024; +/// The smallest photo worth showing (shorter side, in pixels). +const MIN_SIDE: u32 = 200; +const QUALITY: u8 = 86; + +pub struct Photo { + pub jpeg: Vec, + pub width: u32, + pub height: u32, +} + +impl std::fmt::Debug for Photo { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "Photo({}×{}, {} bytes)", self.width, self.height, self.jpeg.len()) + } +} + +/// A JPEG, PNG or WebP image made upright, at most [`MAX_SIDE`] pixels, as JPEG. +/// The error is a message for the uploader. +pub fn normalize(bytes: &[u8]) -> Result { + let unreadable = || "A képet nem sikerült beolvasni. JPEG, PNG vagy WebP fotót tölts fel.".to_string(); + let mut reader = ImageReader::new(Cursor::new(bytes)).with_guessed_format().map_err(|_| unreadable())?; + if !matches!(reader.format(), Some(ImageFormat::Jpeg | ImageFormat::Png | ImageFormat::WebP)) { + return Err(unreadable()); + } + let mut limits = Limits::default(); + limits.max_image_width = Some(12_000); + limits.max_image_height = Some(12_000); + reader.limits(limits); + let mut decoder = reader.into_decoder().map_err(|_| unreadable())?; + let orientation = decoder.orientation().unwrap_or(Orientation::NoTransforms); + let mut img = DynamicImage::from_decoder(decoder).map_err(|_| unreadable())?; + img.apply_orientation(orientation); + if img.width().min(img.height()) < MIN_SIDE { + return Err(format!("A kép túl kicsi: legalább {MIN_SIDE}×{MIN_SIDE} pixeles fotót tölts fel.")); + } + if img.width().max(img.height()) > MAX_SIDE { + img = img.resize(MAX_SIDE, MAX_SIDE, FilterType::Lanczos3); + } + // JPEG has no transparency: a transparent PNG gets the site's dark background. + let rgb = flatten(img); + let mut jpeg = Vec::new(); + JpegEncoder::new_with_quality(&mut jpeg, QUALITY).encode_image(&rgb).map_err(|e| e.to_string())?; + Ok(Photo { jpeg, width: rgb.width(), height: rgb.height() }) +} + +fn flatten(img: DynamicImage) -> image::RgbImage { + if !img.color().has_alpha() { + return img.to_rgb8(); + } + let rgba = img.to_rgba8(); + let background = [13u16, 18, 32]; + image::RgbImage::from_fn(rgba.width(), rgba.height(), |x, y| { + let [r, g, b, a] = rgba.get_pixel(x, y).0; + let mix = |c: u8, bg: u16| ((u16::from(c) * u16::from(a) + bg * (255 - u16::from(a))) / 255) as u8; + image::Rgb([mix(r, background[0]), mix(g, background[1]), mix(b, background[2])]) + }) +} + +#[cfg(test)] +mod tests { + use super::*; + + fn png(width: u32, height: u32, alpha: bool) -> Vec { + let img = if alpha { + DynamicImage::ImageRgba8(image::RgbaImage::from_pixel(width, height, image::Rgba([200, 100, 50, 0]))) + } else { + DynamicImage::ImageRgb8(image::RgbImage::from_pixel(width, height, image::Rgb([200, 100, 50]))) + }; + let mut out = Vec::new(); + img.write_to(&mut Cursor::new(&mut out), ImageFormat::Png).unwrap(); + out + } + + #[test] + fn makes_a_bounded_jpeg() { + let photo = normalize(&png(3000, 1500, false)).unwrap(); + assert_eq!((photo.width, photo.height), (2000, 1000)); + assert_eq!(&photo.jpeg[..3], &[0xFF, 0xD8, 0xFF], "a JPEG"); + let small = normalize(&png(400, 600, true)).unwrap(); + assert_eq!((small.width, small.height), (400, 600)); + // a fully transparent pixel takes the background colour + let back = image::load_from_memory(&small.jpeg).unwrap().to_rgb8(); + let [r, g, b] = back.get_pixel(10, 10).0; + assert!(r < 30 && g < 30 && b < 45, "{r} {g} {b}"); + } + + #[test] + fn rejects_what_is_not_a_photo() { + assert!(normalize(b"not an image at all").unwrap_err().contains("JPEG, PNG vagy WebP")); + assert!(normalize(&png(150, 900, false)).unwrap_err().contains("túl kicsi")); + // a GIF is a format we do not take + assert!(normalize(b"GIF89a\x01\x00\x01\x00\x00\x00\x00;").is_err()); + } +} diff --git a/services/backend/src/routes/account.rs b/services/backend/src/routes/account.rs index ca8673f..4f15d2b 100644 --- a/services/backend/src/routes/account.rs +++ b/services/backend/src/routes/account.rs @@ -165,11 +165,11 @@ pub async fn export(State(state): St, auth: AuthUser) -> ApiResult 'celebrity'").await?, "synastries": rows("SELECT json_build_object('id', s.id, 'owner_id', s.owner_id, 'chart1_id', s.chart1_id, 'chart2_id', s.chart2_id, 'result', s.result, 'created_at', s.created_at) FROM synastries s JOIN charts c1 ON c1.id = s.chart1_id JOIN charts c2 ON c2.id = s.chart2_id WHERE s.owner_id = $1 OR c1.owner_id = $1 OR c2.owner_id = $1").await?, "invites": rows("SELECT json_build_object('id', id, 'chart_id', inviter_chart_id, 'message', message, 'created_at', created_at, 'expires_at', expires_at, 'accepted_at', accepted_at) FROM synastry_invites WHERE inviter_id = $1").await?, "forecasts": rows("SELECT json_build_object('id', f.id, 'chart_id', f.chart_id, 'year', f.year, 'location', f.location, 'result', f.result, 'created_at', f.created_at) FROM forecasts f JOIN charts c ON c.id = f.chart_id WHERE c.owner_id = $1").await?, - "analyses": rows("SELECT json_build_object('id', a.id, 'kind', a.kind, 'chart_id', a.chart_id, 'synastry_id', a.synastry_id, 'forecast_id', a.forecast_id, 'language', a.language, 'status', a.status, 'content', a.content, 'created_at', a.created_at) FROM analyses a WHERE a.requested_by = $1 OR a.chart_id IN (SELECT id FROM charts WHERE owner_id = $1)").await?, + "analyses": rows("SELECT json_build_object('id', a.id, 'kind', a.kind, 'chart_id', a.chart_id, 'synastry_id', a.synastry_id, 'forecast_id', a.forecast_id, 'language', a.language, 'status', a.status, 'content', a.content, 'created_at', a.created_at) FROM analyses a WHERE a.kind <> 'celebrity' AND (a.requested_by = $1 OR a.chart_id IN (SELECT id FROM charts WHERE owner_id = $1 AND kind <> 'celebrity'))").await?, "questions": rows("SELECT json_build_object('id', q.id, 'analysis_id', q.analysis_id, 'question', q.question, 'status', q.status, 'answer', q.answer, 'created_at', q.created_at) FROM questions q WHERE q.asked_by = $1").await?, "credit_ledger": rows("SELECT json_build_object('unit', unit, 'delta', delta, 'reason', reason, 'note', note, 'created_at', created_at) FROM credit_ledger WHERE user_id = $1 ORDER BY created_at").await?, "shares": rows("SELECT json_build_object('slug', slug, 'kind', kind, 'title', title, 'show_birth_data', show_birth_data, 'view_count', view_count, 'created_at', created_at, 'revoked_at', revoked_at) FROM shares WHERE owner_id = $1").await?, @@ -196,6 +196,31 @@ pub async fn delete_me( return Err(ApiError::BadRequest("set confirm to \"DELETE\" to delete the account".into())); } let mut tx = state.db.begin().await?; + // Famous people's charts are the site's, not the admin's: another admin + // takes them over, or the account cannot be deleted yet. + let celebrities: i64 = sqlx::query_scalar("SELECT count(*) FROM charts WHERE owner_id = $1 AND kind = 'celebrity'") + .bind(auth.id()) + .fetch_one(&mut *tx) + .await?; + if celebrities > 0 { + let heir: Option = sqlx::query_scalar( + "SELECT id FROM users WHERE id <> $1 AND 'admin' = ANY(roles) ORDER BY created_at LIMIT 1", + ) + .bind(auth.id()) + .fetch_optional(&mut *tx) + .await?; + let Some(heir) = heir else { + return Err(ApiError::conflict( + "owns_celebrities", + "A fiókhoz híres emberek tartoznak, és nincs másik admin, aki átvenné őket. Előbb töröld őket.", + )); + }; + sqlx::query("UPDATE charts SET owner_id = $2 WHERE owner_id = $1 AND kind = 'celebrity'") + .bind(auth.id()) + .bind(heir) + .execute(&mut *tx) + .await?; + } // Tarot readings belong to no chart: they go with the account. sqlx::query("DELETE FROM analyses WHERE kind = 'tarot' AND requested_by = $1") .bind(auth.id()) diff --git a/services/backend/src/routes/admin.rs b/services/backend/src/routes/admin.rs index be93380..47660e6 100644 --- a/services/backend/src/routes/admin.rs +++ b/services/backend/src/routes/admin.rs @@ -50,7 +50,7 @@ pub async fn list_users( ); let rows: Vec = sqlx::query_as( "SELECT u.id, u.email, u.display_name, u.roles, u.email_verified_at IS NOT NULL, u.created_at, u.last_login_at, \ - (SELECT count(*) FROM charts c WHERE c.owner_id = u.id), \ + (SELECT count(*) FROM charts c WHERE c.owner_id = u.id AND c.kind <> 'celebrity'), \ (SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger l WHERE l.user_id = u.id AND l.unit = 'natal'), \ (SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger l WHERE l.user_id = u.id AND l.unit = 'synastry'), \ (SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger l WHERE l.user_id = u.id AND l.unit = 'forecast'), \ diff --git a/services/backend/src/routes/analyses.rs b/services/backend/src/routes/analyses.rs index a7b563a..bbb7001 100644 --- a/services/backend/src/routes/analyses.rs +++ b/services/backend/src/routes/analyses.rs @@ -55,7 +55,7 @@ pub struct AnalysisRow { pub requested_at: OffsetDateTime, } -const ANALYSIS_COLUMNS: &str = "id, kind, chart_id, synastry_id, forecast_id, language, prompt_version, status, \ +pub(super) const ANALYSIS_COLUMNS: &str = "id, kind, chart_id, synastry_id, forecast_id, language, prompt_version, status, \ content, error, \ credits_charged, created_at, completed_at, attempts, next_attempt_at, requested_at"; @@ -122,10 +122,27 @@ fn optional_body(body: &[u8]) -> Result { } pub(super) enum Target { - Natal { chart_id: Uuid, hash: String }, - Summary { chart_id: Uuid, hash: String }, - Synastry { synastry_id: Uuid, hash: String }, - Forecast { forecast_id: Uuid, hash: String }, + Natal { + chart_id: Uuid, + hash: String, + }, + Summary { + chart_id: Uuid, + hash: String, + }, + Synastry { + synastry_id: Uuid, + hash: String, + }, + Forecast { + forecast_id: Uuid, + hash: String, + }, + /// A famous person's chart (admins only, no unit is spent). + Celebrity { + chart_id: Uuid, + hash: String, + }, } async fn request( @@ -179,6 +196,7 @@ pub(super) async fn queue( Target::Summary { chart_id, hash } => ("summary", hash, Some(*chart_id), None, None), Target::Synastry { synastry_id, hash } => ("synastry", hash, None, Some(*synastry_id), None), Target::Forecast { forecast_id, hash } => ("forecast", hash, None, None, Some(*forecast_id)), + Target::Celebrity { chart_id, hash } => ("celebrity", hash, Some(*chart_id), None, None), }; let (model, fallback) = &crate::models::models_for(state, Kind::parse(kind).expect("known kind")).await?; let (cache_key, prompt_version) = &versions(state, kind, hash, model, language).await?; @@ -212,15 +230,20 @@ pub(super) async fn queue( ); let id = Uuid::now_v7(); - // The same chart elsewhere (another user, same birth data) was already analysed: copy it. - let cached: Option<(Value, Option, Option)> = sqlx::query_as( - "SELECT content, input_tokens, output_tokens FROM analyses \ - WHERE cache_key = $1 AND prompt_version = $2 AND status = 'done' LIMIT 1", - ) - .bind(cache_key) - .bind(prompt_version) - .fetch_optional(&mut *tx) - .await?; + // The same chart elsewhere (another user, same birth data) was already + // analysed: copy it. Not a famous person's portrait: it has their name in it. + let cached: Option<(Value, Option, Option)> = if kind == "celebrity" { + None + } else { + sqlx::query_as( + "SELECT content, input_tokens, output_tokens FROM analyses \ + WHERE cache_key = $1 AND prompt_version = $2 AND status = 'done' LIMIT 1", + ) + .bind(cache_key) + .bind(prompt_version) + .fetch_optional(&mut *tx) + .await? + }; if let Some((content, input_tokens, output_tokens)) = cached { let row: AnalysisRow = sqlx::query_as(&insert) .bind(id) diff --git a/services/backend/src/routes/celebrities.rs b/services/backend/src/routes/celebrities.rs new file mode 100644 index 0000000..34c8960 --- /dev/null +++ b/services/backend/src/routes/celebrities.rs @@ -0,0 +1,546 @@ +//! Famous people: admins add them (birth data, one photo) and get a detailed +//! analysis written about them in the third person (`celebrity` kind, its own +//! prompt). Published ones have a public page (`/hires-emberek/`) with +//! the birth data, the chart, the analysis and the photo; drafts only admins see. +//! +//! The photo is stored once (see [`crate::photo`]) under a new key at every +//! upload and served by [`photo`], so the frontend's image optimizer and the +//! CDN may keep it forever. + +use axum::Json; +use axum::body::Bytes; +use axum::extract::{Path, State}; +use axum::http::{StatusCode, header}; +use axum::response::{IntoResponse, Response}; +use axum_extra::extract::WithRejection; +use serde::Deserialize; +use serde_json::{Value, json}; +use sqlx::PgPool; +use time::OffsetDateTime; +use uuid::Uuid; + +use super::analyses::{ANALYSIS_COLUMNS, AnalysisRow, Target, queue}; +use super::charts::{CHART_COLUMNS, ChartRow, calculate, find_chart}; +use super::{Body, IdPath, St, double_option}; +use crate::AppState; +use crate::auth::{AdminUser, AuthUser}; +use crate::error::{ApiError, ApiResult}; +use crate::views::{chart_highlights, public_chart, rfc3339, rfc3339_opt}; + +/// The analyses of famous people are written in Hungarian (the public pages are). +const LANGUAGE: &str = "hu"; + +#[derive(Debug, sqlx::FromRow)] +struct CelebrityRow { + id: Uuid, + chart_id: Uuid, + name: String, + subtitle: Option, + slug: String, + photo_key: Option, + photo_width: Option, + photo_height: Option, + focus_x: f32, + focus_y: f32, + published_at: Option, + created_at: OffsetDateTime, + updated_at: OffsetDateTime, +} + +const COLUMNS: &str = "id, chart_id, name, subtitle, slug, photo_key, photo_width, photo_height, focus_x, focus_y, \ + published_at, created_at, updated_at"; + +impl CelebrityRow { + fn photo(&self) -> Value { + match (&self.photo_key, self.photo_width, self.photo_height) { + (Some(key), Some(width), Some(height)) => json!({ + "key": key, "width": width, "height": height, "focus_x": self.focus_x, "focus_y": self.focus_y, + }), + _ => Value::Null, + } + } + + fn base(&self) -> Value { + json!({ + "id": self.id, + "name": self.name, + "subtitle": self.subtitle, + "slug": self.slug, + "published": self.published_at.is_some(), + "published_at": rfc3339_opt(self.published_at), + "photo": self.photo(), + "created_at": rfc3339(self.created_at), + "updated_at": rfc3339(self.updated_at), + }) + } +} + +async fn find(db: &PgPool, id: Uuid) -> Result { + sqlx::query_as(&format!("SELECT {COLUMNS} FROM celebrities WHERE id = $1")) + .bind(id) + .fetch_optional(db) + .await? + .ok_or(ApiError::NotFound("celebrity")) +} + +/// The newest analysis of the famous person's chart (any state). +async fn latest_analysis(db: &PgPool, chart_id: Uuid) -> Result, sqlx::Error> { + sqlx::query_as(&format!( + "SELECT {ANALYSIS_COLUMNS} FROM analyses WHERE chart_id = $1 AND kind = 'celebrity' \ + ORDER BY created_at DESC LIMIT 1" + )) + .bind(chart_id) + .fetch_optional(db) + .await +} + +/// "Marilyn Monroe" → "marilyn-monroe"; "Kovács Ödön" → "kovacs-odon". +fn slugify(name: &str) -> String { + let ascii = deunicode::deunicode(name).to_lowercase(); + let mut slug = String::new(); + for c in ascii.chars() { + if c.is_ascii_alphanumeric() { + slug.push(c); + } else if !slug.is_empty() && !slug.ends_with('-') { + slug.push('-'); + } + } + let slug = slug.trim_end_matches('-').chars().take(80).collect::(); + let slug = slug.trim_end_matches('-').to_string(); + if slug.is_empty() { "hires-ember".into() } else { slug } +} + +fn valid_slug(slug: &str) -> bool { + !slug.is_empty() + && slug.len() <= 80 + && slug + .split('-') + .all(|part| !part.is_empty() && part.bytes().all(|b| b.is_ascii_lowercase() || b.is_ascii_digit())) +} + +/// `base`, or `base-2`, `base-3`, ... whichever is free (`except`: the row being renamed). +async fn free_slug(db: &PgPool, base: &str, except: Option) -> Result { + for n in 1..1000 { + let slug = if n == 1 { base.to_string() } else { format!("{base}-{n}") }; + let taken: bool = + sqlx::query_scalar("SELECT EXISTS (SELECT 1 FROM celebrities WHERE slug = $1 AND id IS DISTINCT FROM $2)") + .bind(&slug) + .bind(except) + .fetch_one(db) + .await?; + if !taken { + return Ok(slug); + } + } + Ok(format!("{base}-{}", Uuid::now_v7().simple())) +} + +fn clean_name(name: &str) -> Result { + let name: String = name.split_whitespace().collect::>().join(" ").chars().take(100).collect(); + if name.is_empty() { Err(ApiError::BadRequest("A név nem lehet üres.".into())) } else { Ok(name) } +} + +fn clean_subtitle(subtitle: Option<&str>) -> Option { + subtitle.map(|s| s.trim().chars().take(160).collect::()).filter(|s| !s.is_empty()) +} + +/// Calculates the chart from birth data (the horoscope service never sees the name). +async fn chart_for(state: &AppState, birth: Value) -> Result<(Value, Value, String), ApiError> { + calculate(state, birth).await +} + +/// Queues the analysis of the chart (no unit is spent); an existing one with +/// the same cache key is returned instead. +async fn queue_analysis(state: &AppState, admin: &AuthUser, chart: &ChartRow) -> Result { + let target = Target::Celebrity { chart_id: chart.id, hash: chart.chart_hash.clone() }; + Ok(queue(state, admin.id(), &target, LANGUAGE, None).await?.1) +} + +/// The admin view: everything, with the birth data for the edit form. +async fn admin_view(db: &PgPool, row: &CelebrityRow) -> Result { + let chart = find_chart(db, row.chart_id).await?.ok_or(ApiError::NotFound("celebrity"))?; + let analysis = latest_analysis(db, row.chart_id).await?; + let mut view = row.base(); + view["birth_data"] = chart.birth_data.clone(); + view["birth"] = public_chart(&chart.result, true)["birth"].clone(); + view["highlights"] = chart_highlights(&chart.result); + view["chart"] = chart.result.clone(); + view["analysis"] = analysis.map_or(Value::Null, |a| a.view()); + Ok(view) +} + +// --- admin ------------------------------------------------------------------------------------- + +type ListRow = + (Uuid, Uuid, String, Option, String, Option, Option, Value, Option); + +pub async fn list(State(state): St, _admin: AdminUser) -> ApiResult> { + let rows: Vec = sqlx::query_as( + "SELECT c.id, c.chart_id, c.name, c.subtitle, c.slug, c.published_at, c.photo_key, ch.result, \ + (SELECT a.status FROM analyses a WHERE a.chart_id = c.chart_id AND a.kind = 'celebrity' \ + ORDER BY a.created_at DESC LIMIT 1) \ + FROM celebrities c JOIN charts ch ON ch.id = c.chart_id ORDER BY c.created_at DESC", + ) + .fetch_all(&state.db) + .await?; + let items: Vec = rows + .into_iter() + .map(|(id, chart_id, name, subtitle, slug, published_at, photo_key, result, status)| { + json!({ + "id": id, "chart_id": chart_id, "name": name, "subtitle": subtitle, "slug": slug, + "published": published_at.is_some(), "has_photo": photo_key.is_some(), + "birth": public_chart(&result, true)["birth"].clone(), + "highlights": chart_highlights(&result), + "analysis_status": status, + }) + }) + .collect(); + Ok(Json(json!({ "celebrities": items }))) +} + +#[derive(Deserialize)] +#[serde(deny_unknown_fields)] +pub struct CreateCelebrity { + name: String, + subtitle: Option, + /// Birth data as for a chart (`POST /v1/charts`). + birth: Value, +} + +/// Adds a famous person: calculates the chart and queues the analysis. +pub async fn create( + State(state): St, + AdminUser(admin): AdminUser, + WithRejection(Json(req), _): Body, +) -> ApiResult<(StatusCode, Json)> { + let name = clean_name(&req.name)?; + let (birth, result, hash) = chart_for(&state, req.birth).await?; + let slug = free_slug(&state.db, &slugify(&name), None).await?; + let mut tx = state.db.begin().await?; + let chart: ChartRow = sqlx::query_as(&format!( + "INSERT INTO charts (id, owner_id, label, is_primary, kind, birth_data, result, chart_hash) \ + VALUES ($1, $2, $3, false, 'celebrity', $4, $5, $6) RETURNING {CHART_COLUMNS}" + )) + .bind(Uuid::now_v7()) + .bind(admin.id()) + .bind(&name) + .bind(birth) + .bind(result) + .bind(hash) + .fetch_one(&mut *tx) + .await?; + let row: CelebrityRow = sqlx::query_as(&format!( + "INSERT INTO celebrities (id, chart_id, name, subtitle, slug, created_by) \ + VALUES ($1, $2, $3, $4, $5, $6) RETURNING {COLUMNS}" + )) + .bind(Uuid::now_v7()) + .bind(chart.id) + .bind(&name) + .bind(clean_subtitle(req.subtitle.as_deref())) + .bind(&slug) + .bind(admin.id()) + .fetch_one(&mut *tx) + .await?; + tx.commit().await?; + queue_analysis(&state, &admin, &chart).await?; + tracing::info!(admin = %admin.id(), celebrity = %row.id, "famous person added"); + Ok((StatusCode::CREATED, Json(admin_view(&state.db, &row).await?))) +} + +pub async fn get_one( + State(state): St, + _admin: AdminUser, + WithRejection(Path(id), _): IdPath, +) -> ApiResult> { + let row = find(&state.db, id).await?; + Ok(Json(admin_view(&state.db, &row).await?)) +} + +#[derive(Deserialize)] +#[serde(deny_unknown_fields)] +pub struct UpdateCelebrity { + name: Option, + #[serde(default, deserialize_with = "double_option")] + subtitle: Option>, + slug: Option, + published: Option, + focus_x: Option, + focus_y: Option, + /// Corrected birth data: the chart is calculated again and, if it changed, + /// the analysis is written again. + birth: Option, +} + +pub async fn update( + State(state): St, + AdminUser(admin): AdminUser, + WithRejection(Path(id), _): IdPath, + WithRejection(Json(req), _): Body, +) -> ApiResult> { + let row = find(&state.db, id).await?; + let name = req.name.as_deref().map(clean_name).transpose()?.unwrap_or_else(|| row.name.clone()); + let subtitle = match &req.subtitle { + Some(s) => clean_subtitle(s.as_deref()), + None => row.subtitle.clone(), + }; + let slug = match req.slug.as_deref().map(str::trim) { + Some(s) if s != row.slug => { + if !valid_slug(s) { + return Err(ApiError::BadRequest( + "A cím csak kisbetűt, számot és kötőjelet tartalmazhat (pl. marilyn-monroe).".into(), + )); + } + if free_slug(&state.db, s, Some(id)).await? != s { + return Err(ApiError::conflict("slug_taken", "Ez a cím már foglalt.")); + } + s.to_string() + } + _ => row.slug.clone(), + }; + let unit = + |v: Option, current: f32| v.map_or(current, |v| if v.is_finite() { v.clamp(0.0, 1.0) } else { current }); + let (focus_x, focus_y) = (unit(req.focus_x, row.focus_x), unit(req.focus_y, row.focus_y)); + let published_at = match req.published { + Some(true) => row.published_at.or(Some(OffsetDateTime::now_utc())), + Some(false) => None, + None => row.published_at, + }; + + let chart = find_chart(&state.db, row.chart_id).await?.ok_or(ApiError::NotFound("celebrity"))?; + let birth = req.birth.filter(|b| *b != chart.birth_data); + let recalculated = match birth { + Some(birth) => Some(chart_for(&state, birth).await?), + None => None, + }; + let chart_changed = recalculated.as_ref().is_some_and(|(_, _, hash)| *hash != chart.chart_hash); + + let mut tx = state.db.begin().await?; + if let Some((birth, result, hash)) = &recalculated { + if chart_changed { + // The analysis was written from the old chart. + sqlx::query("DELETE FROM analyses WHERE chart_id = $1").bind(chart.id).execute(&mut *tx).await?; + } + sqlx::query( + "UPDATE charts SET birth_data = $1, result = $2, chart_hash = $3, updated_at = now() WHERE id = $4", + ) + .bind(birth) + .bind(result) + .bind(hash) + .bind(chart.id) + .execute(&mut *tx) + .await?; + } + sqlx::query("UPDATE charts SET label = $1 WHERE id = $2").bind(&name).bind(chart.id).execute(&mut *tx).await?; + let row: CelebrityRow = sqlx::query_as(&format!( + "UPDATE celebrities SET name = $2, subtitle = $3, slug = $4, focus_x = $5, focus_y = $6, published_at = $7, \ + updated_at = now() WHERE id = $1 RETURNING {COLUMNS}" + )) + .bind(id) + .bind(&name) + .bind(&subtitle) + .bind(&slug) + .bind(focus_x) + .bind(focus_y) + .bind(published_at) + .fetch_one(&mut *tx) + .await?; + tx.commit().await?; + if chart_changed { + let chart = find_chart(&state.db, row.chart_id).await?.ok_or(ApiError::NotFound("celebrity"))?; + queue_analysis(&state, &admin, &chart).await?; + } + Ok(Json(admin_view(&state.db, &row).await?)) +} + +/// Queues the analysis again when there is none or the last one failed +/// (rewriting a finished one: `POST /v1/admin/analyses/{id}/regenerate`). +pub async fn request_analysis( + State(state): St, + AdminUser(admin): AdminUser, + WithRejection(Path(id), _): IdPath, +) -> ApiResult> { + let row = find(&state.db, id).await?; + let chart = find_chart(&state.db, row.chart_id).await?.ok_or(ApiError::NotFound("celebrity"))?; + queue_analysis(&state, &admin, &chart).await?; + Ok(Json(admin_view(&state.db, &row).await?)) +} + +fn storage(state: &AppState) -> Result<&crate::storage::Storage, ApiError> { + state + .storage + .as_ref() + .ok_or_else(|| ApiError::conflict("storage_not_configured", "A fotótárolás nincs beállítva (S3_ENDPOINT).")) +} + +/// Deletes a stored photo; a failure is only logged (the row no longer points to it). +async fn delete_photo(state: &AppState, key: &str) { + if let Some(storage) = &state.storage + && let Err(e) = storage.delete(key).await + { + tracing::warn!(key, error = %e, "deleting a photo from the object storage failed"); + } +} + +/// Uploads the photo (the request body is the image itself: JPEG, PNG or +/// WebP); it replaces the previous one. The face point is reset. +pub async fn upload_photo( + State(state): St, + AdminUser(admin): AdminUser, + WithRejection(Path(id), _): IdPath, + body: Bytes, +) -> ApiResult> { + let row = find(&state.db, id).await?; + let storage = storage(&state)?; + if body.len() > crate::photo::MAX_UPLOAD { + return Err(ApiError::BadRequest("A kép legfeljebb 15 MB lehet.".into())); + } + let photo = tokio::task::spawn_blocking(move || crate::photo::normalize(&body)) + .await + .map_err(|e| ApiError::Internal(format!("photo processing: {e}")))? + .map_err(ApiError::BadRequest)?; + let key = format!("celebrities/{}/{}.jpg", row.id, db::random_token(9)); + storage + .put(&key, photo.jpeg, "image/jpeg") + .await + .map_err(|e| ApiError::Internal(format!("storing the photo: {e}")))?; + let updated: CelebrityRow = sqlx::query_as(&format!( + "UPDATE celebrities SET photo_key = $2, photo_width = $3, photo_height = $4, focus_x = 0.5, focus_y = 0.3, \ + updated_at = now() WHERE id = $1 RETURNING {COLUMNS}" + )) + .bind(id) + .bind(&key) + .bind(i32::try_from(photo.width).unwrap_or(i32::MAX)) + .bind(i32::try_from(photo.height).unwrap_or(i32::MAX)) + .fetch_one(&state.db) + .await?; + if let Some(old) = &row.photo_key { + delete_photo(&state, old).await; + } + tracing::info!(admin = %admin.id(), celebrity = %id, width = photo.width, height = photo.height, "photo uploaded"); + Ok(Json(admin_view(&state.db, &updated).await?)) +} + +pub async fn remove_photo( + State(state): St, + _admin: AdminUser, + WithRejection(Path(id), _): IdPath, +) -> ApiResult> { + let row = find(&state.db, id).await?; + let updated: CelebrityRow = sqlx::query_as(&format!( + "UPDATE celebrities SET photo_key = NULL, photo_width = NULL, photo_height = NULL, updated_at = now() \ + WHERE id = $1 RETURNING {COLUMNS}" + )) + .bind(id) + .fetch_one(&state.db) + .await?; + if let Some(old) = &row.photo_key { + delete_photo(&state, old).await; + } + Ok(Json(admin_view(&state.db, &updated).await?)) +} + +/// Deletes the famous person with their chart, analysis and photo. +pub async fn remove( + State(state): St, + AdminUser(admin): AdminUser, + WithRejection(Path(id), _): IdPath, +) -> ApiResult { + let row = find(&state.db, id).await?; + sqlx::query("DELETE FROM charts WHERE id = $1").bind(row.chart_id).execute(&state.db).await?; + if let Some(key) = &row.photo_key { + delete_photo(&state, key).await; + } + tracing::info!(admin = %admin.id(), celebrity = %id, "famous person deleted"); + Ok(StatusCode::NO_CONTENT) +} + +// --- public ------------------------------------------------------------------------------------ + +/// Public: the published famous people, newest first. +pub async fn public_list(State(state): St) -> ApiResult> { + let rows: Vec = sqlx::query_as(&format!( + "SELECT {COLUMNS} FROM celebrities WHERE published_at IS NOT NULL ORDER BY published_at DESC" + )) + .fetch_all(&state.db) + .await?; + let mut items = Vec::with_capacity(rows.len()); + for row in &rows { + let chart = find_chart(&state.db, row.chart_id).await?.ok_or(ApiError::NotFound("celebrity"))?; + let mut item = row.base(); + item["birth"] = public_chart(&chart.result, true)["birth"].clone(); + item["highlights"] = chart_highlights(&chart.result); + items.push(item); + } + Ok(Json(json!({ "celebrities": items }))) +} + +/// Public: one famous person's page (a draft only for admins). +pub async fn public_view( + State(state): St, + auth: Result, + Path(slug): Path, +) -> ApiResult> { + let row: CelebrityRow = sqlx::query_as(&format!("SELECT {COLUMNS} FROM celebrities WHERE slug = $1")) + .bind(slug.trim()) + .fetch_optional(&state.db) + .await? + .ok_or(ApiError::NotFound("celebrity"))?; + let admin = auth.is_ok_and(|a| a.user.has_role(db::Role::Admin)); + if row.published_at.is_none() && !admin { + return Err(ApiError::NotFound("celebrity")); + } + let chart = find_chart(&state.db, row.chart_id).await?.ok_or(ApiError::NotFound("celebrity"))?; + let analysis = latest_analysis(&state.db, row.chart_id).await?.filter(|a| a.status == "done"); + let mut view = row.base(); + view["chart"] = public_chart(&chart.result, true); + view["analysis"] = match analysis { + Some(a) => json!({ + "id": a.id, + "language": a.language, + "content": a.content, + "completed_at": rfc3339_opt(a.completed_at), + }), + None => Value::Null, + }; + Ok(Json(view)) +} + +/// Public: a stored photo, only while a famous person uses it. The key changes +/// with every upload, so it may be cached for good. +pub async fn photo(State(state): St, Path(key): Path) -> ApiResult { + let used: bool = sqlx::query_scalar("SELECT EXISTS (SELECT 1 FROM celebrities WHERE photo_key = $1)") + .bind(&key) + .fetch_one(&state.db) + .await?; + if !used { + return Err(ApiError::NotFound("photo")); + } + let object = storage(&state)? + .get(&key) + .await + .map_err(|e| ApiError::Internal(format!("reading the photo: {e}")))? + .ok_or(ApiError::NotFound("photo"))?; + Ok(( + [ + (header::CONTENT_TYPE, object.content_type.unwrap_or_else(|| "image/jpeg".into())), + (header::CACHE_CONTROL, "public, max-age=31536000, immutable".into()), + ], + object.bytes, + ) + .into_response()) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn slugs() { + assert_eq!(slugify("Marilyn Monroe"), "marilyn-monroe"); + assert_eq!(slugify(" Kovács Ödön (1911–1996) "), "kovacs-odon-1911-1996"); + assert_eq!(slugify("Szőke Szabolcs, Jr."), "szoke-szabolcs-jr"); + assert_eq!(slugify("!!!"), "hires-ember"); + assert!(valid_slug("marilyn-monroe") && valid_slug("a1")); + assert!(!valid_slug("Marilyn") && !valid_slug("a--b") && !valid_slug("-a") && !valid_slug("")); + } +} diff --git a/services/backend/src/routes/charts.rs b/services/backend/src/routes/charts.rs index 8507e88..aebdf6c 100644 --- a/services/backend/src/routes/charts.rs +++ b/services/backend/src/routes/charts.rs @@ -1,6 +1,9 @@ //! Natal charts of a user: their own chart (kind `own`; the current one is //! primary) and charts of other people they added (kind `person`, see //! [`crate::persons`]). Calculated by the horoscope service. +//! +//! Famous people's charts (kind `celebrity`) are kept by the admin pages +//! (see `celebrities`): these routes neither list nor change them. use axum::Json; use axum::extract::State; @@ -26,7 +29,7 @@ pub struct ChartRow { pub owner_id: Uuid, pub label: String, pub is_primary: bool, - /// `own` or `person`. + /// `own`, `person` or `celebrity`. pub kind: String, pub birth_data: Value, pub result: Value, @@ -83,9 +86,12 @@ pub async fn find_chart(db: impl PgExecutor<'_>, id: Uuid) -> Result Result { - find_chart(db, id).await?.filter(|c| c.owner_id == owner).ok_or(ApiError::NotFound("chart")) + find_chart(db, id) + .await? + .filter(|c| c.owner_id == owner && c.kind != "celebrity") + .ok_or(ApiError::NotFound("chart")) } pub async fn primary_chart(db: &PgPool, owner: Uuid) -> Result, ApiError> { @@ -102,7 +108,8 @@ fn clean_label(label: &str) -> Result { pub async fn list(State(state): St, auth: AuthUser) -> ApiResult> { let rows: Vec = sqlx::query_as(&format!( - "SELECT {CHART_COLUMNS} FROM charts WHERE owner_id = $1 ORDER BY is_primary DESC, created_at DESC" + "SELECT {CHART_COLUMNS} FROM charts WHERE owner_id = $1 AND kind <> 'celebrity' \ + ORDER BY is_primary DESC, created_at DESC" )) .bind(auth.id()) .fetch_all(&state.db) @@ -190,8 +197,10 @@ pub async fn create( queue_summary(&state, &auth, &chart).await; return Ok((StatusCode::OK, Json(chart.owner_view()))); } - let (count,): (i64,) = - sqlx::query_as("SELECT count(*) FROM charts WHERE owner_id = $1").bind(auth.id()).fetch_one(&state.db).await?; + let (count,): (i64,) = sqlx::query_as("SELECT count(*) FROM charts WHERE owner_id = $1 AND kind <> 'celebrity'") + .bind(auth.id()) + .fetch_one(&state.db) + .await?; if count >= state.config.max_charts_per_user { return Err(ApiError::conflict( "chart_limit_reached", @@ -372,7 +381,7 @@ pub async fn remove( auth: AuthUser, WithRejection(axum::extract::Path(id), _): IdPath, ) -> ApiResult { - let result = sqlx::query("DELETE FROM charts WHERE id = $1 AND owner_id = $2") + let result = sqlx::query("DELETE FROM charts WHERE id = $1 AND owner_id = $2 AND kind <> 'celebrity'") .bind(id) .bind(auth.id()) .execute(&state.db) diff --git a/services/backend/src/routes/mod.rs b/services/backend/src/routes/mod.rs index 1331e37..0e43b4c 100644 --- a/services/backend/src/routes/mod.rs +++ b/services/backend/src/routes/mod.rs @@ -10,6 +10,7 @@ mod admin; mod analyses; mod auth; mod calculator; +mod celebrities; mod charts; mod errors; mod forecasts; @@ -30,7 +31,7 @@ pub use recalculate::run as recalculate; use std::sync::Arc; -use axum::extract::{Path, State}; +use axum::extract::{DefaultBodyLimit, Path, State}; use axum::http::{HeaderValue, Method, header}; use axum::routing::{delete, get, patch, post}; use axum::{Json, Router}; @@ -129,6 +130,9 @@ pub fn router(state: Arc) -> Router { .route("/v1/public/chart", post(calculator::chart)) .route("/v1/public/geo/countries", get(calculator::countries)) .route("/v1/public/geo/places", get(calculator::places)) + .route("/v1/public/celebrities", get(celebrities::public_list)) + .route("/v1/public/celebrities/{slug}", get(celebrities::public_view)) + .route("/v1/public/photos/{*key}", get(celebrities::photo)) // administration .route("/v1/admin/users", get(admin::list_users)) .route("/v1/admin/users/{id}", patch(admin::update_user)) @@ -150,6 +154,18 @@ pub fn router(state: Arc) -> Router { .route("/v1/admin/models/catalog", get(models::catalog)) .route("/v1/admin/models/{kind}", axum::routing::put(models::save)) .route("/v1/admin/analyses/{id}/regenerate", post(analyses::regenerate)) + .route("/v1/admin/celebrities", get(celebrities::list).post(celebrities::create)) + .route( + "/v1/admin/celebrities/{id}", + get(celebrities::get_one).patch(celebrities::update).delete(celebrities::remove), + ) + .route("/v1/admin/celebrities/{id}/analysis", post(celebrities::request_analysis)) + .route( + "/v1/admin/celebrities/{id}/photo", + axum::routing::put(celebrities::upload_photo) + .delete(celebrities::remove_photo) + .layer(DefaultBodyLimit::max(crate::photo::MAX_UPLOAD + 1024)), + ) .route("/v1/admin/questions/{id}/regenerate", post(questions::regenerate)) .layer(cors(&state.config.cors_allowed_origins)) // The request log: masked paths, health checks only when they fail. diff --git a/services/backend/src/routes/prompts.rs b/services/backend/src/routes/prompts.rs index 8766607..4a500ff 100644 --- a/services/backend/src/routes/prompts.rs +++ b/services/backend/src/routes/prompts.rs @@ -27,7 +27,8 @@ use crate::error::{ApiError, ApiResult}; use crate::views::{rfc3339, rfc3339_opt}; /// The kinds whose prompt the admin page edits. -const EDITABLE: [Kind; 5] = [Kind::Summary, Kind::Natal, Kind::Synastry, Kind::Forecast, Kind::Question]; +const EDITABLE: [Kind; 6] = + [Kind::Summary, Kind::Natal, Kind::Synastry, Kind::Forecast, Kind::Question, Kind::Celebrity]; const MAX_CHARS: usize = 50_000; const HISTORY: i64 = 20; /// Test runs of one admin waiting or being written at the same time. @@ -158,7 +159,8 @@ pub async fn save( pub struct StartPreview { /// The draft to try (it need not be saved). system: String, - /// One of the admin's own charts (own or a person), for a summary or natal analysis. + /// One of the admin's own charts (own or a person), for a summary or natal + /// analysis; a famous person's chart (anyone's) for their analysis. chart_id: Option, /// One of the admin's own comparisons, for a synastry analysis. synastry_id: Option, @@ -216,7 +218,10 @@ pub async fn start_preview( let (chart_id, synastry_id, forecast_id) = (req.chart_id, req.synastry_id, req.forecast_id); let (query, id, what) = match (kind, chart_id, synastry_id, forecast_id) { (Kind::Summary | Kind::Natal, Some(id), None, None) => { - ("SELECT id FROM charts WHERE id = $1 AND owner_id = $2", id, "chart") + ("SELECT id FROM charts WHERE id = $1 AND owner_id = $2 AND kind <> 'celebrity'", id, "chart") + } + (Kind::Celebrity, Some(id), None, None) => { + ("SELECT chart_id FROM celebrities WHERE chart_id = $1 AND $2::uuid IS NOT NULL", id, "celebrity") } (Kind::Synastry, None, Some(id), None) => { ("SELECT id FROM synastries WHERE id = $1 AND owner_id = $2", id, "synastry") diff --git a/services/backend/src/storage.rs b/services/backend/src/storage.rs new file mode 100644 index 0000000..b791724 --- /dev/null +++ b/services/backend/src/storage.rs @@ -0,0 +1,276 @@ +//! Object storage for uploaded photos: any S3-compatible service, addressed +//! path-style (`{endpoint}/{bucket}/{key}`). In production DigitalOcean +//! Spaces, in development a RustFS container. +//! +//! The bucket stays private: the backend reads the objects itself and serves +//! them under `/v1/public/photos/...`, from where the frontend's image +//! optimizer makes the sized versions (and Cloudflare caches those). +//! +//! Requests are signed with AWS Signature Version 4. + +use std::time::Duration; + +use hmac::{Hmac, Mac}; +use sha2::{Digest, Sha256}; +use time::OffsetDateTime; + +/// `S3_ENDPOINT` (e.g. `https://fra1.digitaloceanspaces.com`), `S3_BUCKET`, +/// `S3_REGION` (default `us-east-1`; Spaces accepts it too), +/// `S3_ACCESS_KEY_ID` and `S3_SECRET_ACCESS_KEY` (in `.env.secrets`). +#[derive(Clone)] +pub struct StorageConfig { + pub endpoint: String, + pub bucket: String, + pub region: String, + pub access_key: String, + pub secret_key: String, +} + +// The secret stays out of logs. +impl std::fmt::Debug for StorageConfig { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.debug_struct("StorageConfig") + .field("endpoint", &self.endpoint) + .field("bucket", &self.bucket) + .field("region", &self.region) + .finish() + } +} + +#[derive(Debug, thiserror::Error)] +pub enum StorageError { + #[error("object storage request failed: {0}")] + Http(#[from] reqwest::Error), + #[error("object storage answered {status}: {body}")] + Status { status: u16, body: String }, +} + +pub struct Storage { + config: StorageConfig, + http: reqwest::Client, +} + +/// An object read back: its bytes and content type. +pub struct Object { + pub bytes: axum::body::Bytes, + pub content_type: Option, +} + +impl Storage { + pub fn new(config: StorageConfig) -> Self { + let http = reqwest::Client::builder().timeout(Duration::from_secs(30)).build().expect("static configuration"); + Self { config, http } + } + + fn url(&self, key: &str) -> String { + let path = if key.is_empty() { String::new() } else { format!("/{}", encode_path(key)) }; + format!("{}/{}{path}", self.config.endpoint, encode_segment(&self.config.bucket)) + } + + async fn send( + &self, + method: reqwest::Method, + key: &str, + body: Vec, + content_type: Option<&str>, + ) -> Result { + let url = self.url(key); + let parsed = reqwest::Url::parse(&url).map_err(|e| StorageError::Status { status: 0, body: e.to_string() })?; + let host = match parsed.port() { + Some(port) => format!("{}:{port}", parsed.host_str().unwrap_or_default()), + None => parsed.host_str().unwrap_or_default().to_string(), + }; + let payload_hash = hex(&Sha256::digest(&body)); + let now = OffsetDateTime::now_utc(); + let auth = authorization(&self.config, method.as_str(), parsed.path(), &host, &payload_hash, now); + let mut request = self + .http + .request(method, url) + .header("x-amz-date", amz_date(now)) + .header("x-amz-content-sha256", &payload_hash) + .header("authorization", auth); + if let Some(ct) = content_type { + request = request.header("content-type", ct); + } + let response = request.body(body).send().await?; + Ok(response) + } + + async fn checked(response: reqwest::Response) -> Result { + if response.status().is_success() { + return Ok(response); + } + let status = response.status().as_u16(); + let body = response.text().await.unwrap_or_default().chars().take(500).collect(); + Err(StorageError::Status { status, body }) + } + + pub async fn put(&self, key: &str, body: Vec, content_type: &str) -> Result<(), StorageError> { + Self::checked(self.send(reqwest::Method::PUT, key, body, Some(content_type)).await?).await?; + Ok(()) + } + + /// The object, or `None` if there is no such key. + pub async fn get(&self, key: &str) -> Result, StorageError> { + let response = self.send(reqwest::Method::GET, key, Vec::new(), None).await?; + if response.status() == reqwest::StatusCode::NOT_FOUND { + return Ok(None); + } + let response = Self::checked(response).await?; + let content_type = response.headers().get("content-type").and_then(|v| v.to_str().ok()).map(str::to_owned); + Ok(Some(Object { bytes: response.bytes().await?, content_type })) + } + + /// Deletes the object; a missing one is not an error. + pub async fn delete(&self, key: &str) -> Result<(), StorageError> { + let response = self.send(reqwest::Method::DELETE, key, Vec::new(), None).await?; + if response.status() == reqwest::StatusCode::NOT_FOUND { + return Ok(()); + } + Self::checked(response).await?; + Ok(()) + } + + /// Creates the bucket if it does not exist yet (development: a fresh + /// RustFS container has none; in production it is made in the console). + pub async fn ensure_bucket(&self) -> Result<(), StorageError> { + let head = self.send(reqwest::Method::HEAD, "", Vec::new(), None).await?; + if head.status().is_success() { + return Ok(()); + } + Self::checked(self.send(reqwest::Method::PUT, "", Vec::new(), None).await?).await?; + tracing::info!(bucket = %self.config.bucket, "object storage bucket created"); + Ok(()) + } +} + +type HmacSha256 = Hmac; + +fn hmac(key: &[u8], data: &str) -> Vec { + let mut mac = HmacSha256::new_from_slice(key).expect("HMAC takes any key length"); + mac.update(data.as_bytes()); + mac.finalize().into_bytes().to_vec() +} + +fn hex(bytes: &[u8]) -> String { + bytes.iter().map(|b| format!("{b:02x}")).collect() +} + +fn amz_date(t: OffsetDateTime) -> String { + format!( + "{:04}{:02}{:02}T{:02}{:02}{:02}Z", + t.year(), + u8::from(t.month()), + t.day(), + t.hour(), + t.minute(), + t.second() + ) +} + +/// URI-encodes one path segment as SigV4 wants it (unreserved characters stay). +fn encode_segment(s: &str) -> String { + s.bytes() + .map(|b| match b { + b'A'..=b'Z' | b'a'..=b'z' | b'0'..=b'9' | b'-' | b'_' | b'.' | b'~' => (b as char).to_string(), + _ => format!("%{b:02X}"), + }) + .collect() +} + +fn encode_path(key: &str) -> String { + key.split('/').map(encode_segment).collect::>().join("/") +} + +fn signing_key(secret: &str, date: &str, region: &str, service: &str) -> Vec { + [date, region, service, "aws4_request"] + .iter() + .fold(format!("AWS4{secret}").into_bytes(), |key, part| hmac(&key, part)) +} + +/// The `Authorization` header of a request (no query string; the path is +/// already encoded, as in the URL). +fn authorization( + config: &StorageConfig, + method: &str, + path: &str, + host: &str, + payload_hash: &str, + now: OffsetDateTime, +) -> String { + let date_time = amz_date(now); + let date = &date_time[..8]; + let signed_headers = "host;x-amz-content-sha256;x-amz-date"; + let canonical = format!( + "{method}\n{path}\n\nhost:{host}\nx-amz-content-sha256:{payload_hash}\nx-amz-date:{date_time}\n\n\ + {signed_headers}\n{payload_hash}" + ); + let scope = format!("{date}/{}/s3/aws4_request", config.region); + let to_sign = format!("AWS4-HMAC-SHA256\n{date_time}\n{scope}\n{}", hex(&Sha256::digest(canonical.as_bytes()))); + let signature = hex(&hmac(&signing_key(&config.secret_key, date, &config.region, "s3"), &to_sign)); + format!( + "AWS4-HMAC-SHA256 Credential={}/{scope}, SignedHeaders={signed_headers}, Signature={signature}", + config.access_key + ) +} + +#[cfg(test)] +mod tests { + use super::*; + + /// The signing key example of the AWS documentation ("Examples of how to + /// derive a signing key for Signature Version 4"). + #[test] + fn derives_the_signing_key_like_aws() { + let key = signing_key("wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY", "20150830", "us-east-1", "iam"); + assert_eq!(hex(&key), "c4afb1cc5771d871763a393e44b703571b55cc28424d1a5e86da6ed3c154a4b9"); + } + + #[test] + fn builds_the_authorization_header() { + let config = StorageConfig { + endpoint: "http://rustfs:9000".into(), + bucket: "photos".into(), + region: "us-east-1".into(), + access_key: "AKIAIOSFODNN7EXAMPLE".into(), + secret_key: "secret".into(), + }; + let now = OffsetDateTime::from_unix_timestamp(1_369_353_600).unwrap(); + assert_eq!(amz_date(now), "20130524T000000Z"); + let empty = hex(&Sha256::digest(b"")); + assert_eq!(empty, "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"); + let auth = authorization(&config, "GET", "/photos/a.jpg", "rustfs:9000", &empty, now); + assert!(auth.starts_with( + "AWS4-HMAC-SHA256 Credential=AKIAIOSFODNN7EXAMPLE/20130524/us-east-1/s3/aws4_request, \ + SignedHeaders=host;x-amz-content-sha256;x-amz-date, Signature=" + )); + let storage = Storage::new(config); + assert_eq!(storage.url("celebrities/a b/ő.jpg"), "http://rustfs:9000/photos/celebrities/a%20b/%C5%91.jpg"); + assert_eq!(storage.url(""), "http://rustfs:9000/photos"); + } + + /// Against a real S3 service (e.g. the RustFS container of development): + /// `S3_TEST_ENDPOINT=http://127.0.0.1:9000 S3_TEST_KEY=… S3_TEST_SECRET=… + /// cargo test -p backend live_round_trip -- --ignored` + #[tokio::test] + #[ignore] + async fn live_round_trip() { + let env = |name: &str| std::env::var(name).unwrap_or_else(|_| panic!("{name} is not set")); + let storage = Storage::new(StorageConfig { + endpoint: env("S3_TEST_ENDPOINT"), + bucket: "storage-test".into(), + region: "us-east-1".into(), + access_key: env("S3_TEST_KEY"), + secret_key: env("S3_TEST_SECRET"), + }); + storage.ensure_bucket().await.unwrap(); + storage.ensure_bucket().await.unwrap(); + let key = "dir/próba kép.jpg"; + storage.put(key, b"hello".to_vec(), "image/jpeg").await.unwrap(); + let object = storage.get(key).await.unwrap().unwrap(); + assert_eq!((&object.bytes[..], object.content_type.as_deref()), (&b"hello"[..], Some("image/jpeg"))); + storage.delete(key).await.unwrap(); + assert!(storage.get(key).await.unwrap().is_none()); + storage.delete(key).await.unwrap(); + } +} diff --git a/services/backend/src/tests.rs b/services/backend/src/tests.rs index d2b981a..5d822fe 100644 --- a/services/backend/src/tests.rs +++ b/services/backend/src/tests.rs @@ -168,8 +168,44 @@ async fn fake_billingo_pdf( ([("content-type", "application/pdf")], "%PDF-1.4 fake").into_response() } -async fn fake_services() -> String { +/// A tiny S3: objects of the `photos` bucket in memory; signed requests only. +type FakeS3 = Arc)>>>; + +async fn fake_s3( + axum::extract::State(store): axum::extract::State, + method: axum::http::Method, + headers: HeaderMap, + axum::extract::Path(key): axum::extract::Path, + body: axum::body::Bytes, +) -> axum::response::Response { + use axum::response::IntoResponse; + let auth = headers.get("authorization").and_then(|v| v.to_str().ok()).unwrap_or_default(); + if !auth.starts_with("AWS4-HMAC-SHA256 Credential=test-key/") || headers.get("x-amz-content-sha256").is_none() { + return StatusCode::FORBIDDEN.into_response(); + } + let mut store = store.lock().unwrap(); + match method.as_str() { + "PUT" => { + let ct = headers.get("content-type").and_then(|v| v.to_str().ok()).unwrap_or_default().to_string(); + store.insert(key, (ct, body.to_vec())); + StatusCode::OK.into_response() + } + "GET" => match store.get(&key) { + Some((ct, bytes)) => ([("content-type", ct.clone())], bytes.clone()).into_response(), + None => StatusCode::NOT_FOUND.into_response(), + }, + "DELETE" => { + store.remove(&key); + StatusCode::NO_CONTENT.into_response() + } + _ => StatusCode::METHOD_NOT_ALLOWED.into_response(), + } +} + +async fn fake_services_with(s3: FakeS3) -> String { + let objects = Router::new().route("/s3/photos/{*key}", get(fake_s3).put(fake_s3).delete(fake_s3)).with_state(s3); let app = Router::new() + .merge(objects) .route("/billingo/documents/{id}/download", get(fake_billingo_pdf)) .route("/openrouter/models", get(fake_openrouter_models)) .route("/v1/checkout/sessions", post(fake_stripe_create)) @@ -221,6 +257,8 @@ struct TestApp { router: Router, pool: PgPool, state: Arc, + /// The objects in the fake object storage. + s3: FakeS3, } struct Response { @@ -235,11 +273,29 @@ impl TestApp { } async fn with_config(pool: PgPool, change: impl FnOnce(&mut Config)) -> Self { - let fake = fake_services().await; + let s3 = FakeS3::default(); + let fake = fake_services_with(s3.clone()).await; let mut config = Config::for_tests(String::new(), fake.clone(), format!("{fake}/jwks")); change(&mut config); let state = Arc::new(AppState::new(pool.clone(), config)); - Self { router: routes::router(state.clone()), pool, state } + Self { router: routes::router(state.clone()), pool, state, s3 } + } + + /// A request with a raw body (an uploaded file); the response body as bytes. + async fn call_raw( + &self, + method: &str, + uri: &str, + token: Option<&str>, + body: Vec, + ) -> (StatusCode, HeaderMap, Vec) { + let mut req = Request::builder().method(method).uri(uri).header("content-type", "application/octet-stream"); + if let Some(t) = token { + req = req.header("authorization", format!("Bearer {t}")); + } + let resp = self.router.clone().oneshot(req.body(Body::from(body)).unwrap()).await.unwrap(); + let (status, headers) = (resp.status(), resp.headers().clone()); + (status, headers, resp.into_body().collect().await.unwrap().to_bytes().to_vec()) } async fn call(&self, method: &str, uri: &str, token: Option<&str>, body: Option) -> Response { @@ -941,7 +997,7 @@ async fn export_and_delete_account(pool: PgPool) { /// config and catalog, shared links, invitation pages, the waitlist and /// unsubscribing. Every other route (charts, calculations, analyses) needs a /// logged-in user, so other apps cannot use them. -const PUBLIC_ROUTES: [&str; 19] = [ +const PUBLIC_ROUTES: [&str; 22] = [ "/healthz", // Stripe calls it; the signature proves it. "/v1/payments/stripe/webhook", @@ -963,6 +1019,10 @@ const PUBLIC_ROUTES: [&str; 19] = [ "/v1/public/chart", "/v1/public/geo/countries", "/v1/public/geo/places", + // Famous people's pages (drafts only for admins) and their photos. + "/v1/public/celebrities", + "/v1/public/celebrities/{slug}", + "/v1/public/photos/{*key}", ]; #[sqlx::test(migrator = "db::MIGRATOR")] @@ -1075,7 +1135,10 @@ async fn everything_else_needs_login(pool: PgPool) { let source = include_str!("routes/mod.rs"); let id = uuid::Uuid::now_v7().to_string(); let mut checked = 0; - for line in source.lines().map(str::trim).filter(|l| l.starts_with(".route(\"")) { + // One route per item, also when rustfmt broke it into several lines. + let flat = source.split_whitespace().collect::>().join(" ").replace(".route( \"", ".route(\""); + for line in flat.split(".route(\"").skip(1).map(|r| format!(".route(\"{}", r.split(".layer(cors").next().unwrap())) + { let path = line.split('"').nth(1).unwrap(); if PUBLIC_ROUTES.contains(&path) { continue; @@ -1334,8 +1397,8 @@ async fn admins_edit_analysis_prompts(pool: PgPool) { let prompts = r.body["prompts"].as_array().unwrap(); let keys: Vec = prompts.iter().map(|p| format!("{}/{}", p["kind"], p["language"]).replace('"', "")).collect(); - let expected = - ["summary", "natal", "synastry", "forecast", "question"].map(|k| [format!("{k}/hu"), format!("{k}/en")]); + let expected = ["summary", "natal", "synastry", "forecast", "question", "celebrity"] + .map(|k| [format!("{k}/hu"), format!("{k}/en")]); assert_eq!(keys, expected.concat()); let natal = &prompts[2]; assert_eq!((&natal["custom"], &natal["system"]), (&json!(false), &natal["default"])); @@ -2899,3 +2962,140 @@ async fn a_paid_forecast_fixes_the_person(pool: PgPool) { let r = app.call("PATCH", &format!("/v1/charts/{bela_id}"), Some(&anna), Some(corrected)).await; assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::CONFLICT, Some("person_analysed"))); } + +fn test_png(width: u32, height: u32) -> Vec { + let img = image::RgbImage::from_pixel(width, height, image::Rgb([180, 140, 90])); + let mut out = Vec::new(); + img.write_to(&mut std::io::Cursor::new(&mut out), image::ImageFormat::Png).unwrap(); + out +} + +#[sqlx::test(migrator = "db::MIGRATOR")] +async fn admins_publish_famous_people_with_a_photo(pool: PgPool) { + let app = TestApp::new(pool.clone()).await; + let admin = app.register("admin@example.com", "Admin").await; + let anna = app.register("anna@example.com", "Anna").await; + let birth = json!({"date": "1926-06-01", "time": "09:30", "country": "HU", "place": "Szeged"}); + let new = json!({"name": " Teszt Elek ", "subtitle": "színész", "birth": birth}); + assert_eq!(app.post("/v1/admin/celebrities", Some(&anna), new.clone()).await.status, StatusCode::FORBIDDEN); + + // added: the chart is calculated and the analysis queued, free of charge + let r = app.post("/v1/admin/celebrities", Some(&admin), new.clone()).await; + assert_eq!(r.status, StatusCode::CREATED, "{}", r.body); + let c = r.body; + let id = c["id"].as_str().unwrap().to_string(); + assert_eq!((c["name"].as_str(), c["slug"].as_str()), (Some("Teszt Elek"), Some("teszt-elek"))); + assert_eq!((&c["published"], &c["photo"]), (&json!(false), &Value::Null)); + assert_eq!((c["birth"]["date"].as_str(), c["birth"]["time"].as_str()), (Some("1926-06-01"), Some("09:30"))); + let analysis = &c["analysis"]; + assert_eq!((analysis["kind"].as_str(), analysis["status"].as_str()), (Some("celebrity"), Some("pending"))); + assert_eq!((analysis["credits_charged"].as_i64(), analysis["language"].as_str()), (Some(0), Some("hu"))); + let analysis_id = analysis["id"].as_str().unwrap().to_string(); + // the same name again gets its own address + let r = app.post("/v1/admin/celebrities", Some(&admin), new.clone()).await; + assert_eq!(r.body["slug"].as_str(), Some("teszt-elek-2")); + let second = r.body["id"].as_str().unwrap().to_string(); + + // not among the admin's own charts, and the chart routes do not reach it + let charts = app.get("/v1/charts", Some(&admin)).await.body; + assert_eq!(charts["charts"].as_array().unwrap().len(), 0, "{charts}"); + let (chart_id,): (uuid::Uuid,) = sqlx::query_as("SELECT chart_id FROM celebrities WHERE id = $1::uuid") + .bind(&id) + .fetch_one(&pool) + .await + .unwrap(); + assert_eq!(app.get(&format!("/v1/charts/{chart_id}"), Some(&admin)).await.status, StatusCode::NOT_FOUND); + let r = app.call("DELETE", &format!("/v1/charts/{chart_id}"), Some(&admin), None).await; + assert_eq!(r.status, StatusCode::NOT_FOUND); + + // a draft: only admins see the page + assert_eq!(app.get("/v1/public/celebrities/teszt-elek", None).await.status, StatusCode::NOT_FOUND); + assert_eq!(app.get("/v1/public/celebrities/teszt-elek", Some(&anna)).await.status, StatusCode::NOT_FOUND); + let r = app.get("/v1/public/celebrities/teszt-elek", Some(&admin)).await; + assert_eq!((r.status, &r.body["analysis"]), (StatusCode::OK, &Value::Null)); + assert_eq!(app.get("/v1/public/celebrities", None).await.body["celebrities"], json!([])); + + // the photo: stored once as JPEG under a new key, the old one deleted + let uri = format!("/v1/admin/celebrities/{id}/photo"); + let (status, _, body) = app.call_raw("PUT", &uri, Some(&admin), b"not an image".to_vec()).await; + assert_eq!(status, StatusCode::BAD_REQUEST, "{}", String::from_utf8_lossy(&body)); + let (status, _, body) = app.call_raw("PUT", &uri, Some(&admin), test_png(3000, 4000)).await; + assert_eq!(status, StatusCode::OK, "{}", String::from_utf8_lossy(&body)); + let photo = serde_json::from_slice::(&body).unwrap()["photo"].clone(); + assert_eq!((photo["width"].as_i64(), photo["height"].as_i64()), (Some(1500), Some(2000))); + let first_key = photo["key"].as_str().unwrap().to_string(); + assert!(first_key.starts_with(&format!("celebrities/{id}/")) && first_key.ends_with(".jpg")); + let (status, _, body) = app.call_raw("PUT", &uri, Some(&admin), test_png(800, 800)).await; + assert_eq!(status, StatusCode::OK); + let key = serde_json::from_slice::(&body).unwrap()["photo"]["key"].as_str().unwrap().to_string(); + assert_ne!(key, first_key); + { + let s3 = app.s3.lock().unwrap(); + assert!(!s3.contains_key(&first_key) && s3.contains_key(&key)); + assert_eq!(s3[&key].0, "image/jpeg"); + } + // served while in use, cacheable for good; the replaced one is gone + let (status, headers, bytes) = app.call_raw("GET", &format!("/v1/public/photos/{key}"), None, vec![]).await; + assert_eq!(status, StatusCode::OK); + assert_eq!(headers["cache-control"], "public, max-age=31536000, immutable"); + assert_eq!(&bytes[..3], &[0xFF, 0xD8, 0xFF]); + let (status, ..) = app.call_raw("GET", &format!("/v1/public/photos/{first_key}"), None, vec![]).await; + assert_eq!(status, StatusCode::NOT_FOUND); + + // edits: face point, address, publishing + let item = format!("/v1/admin/celebrities/{id}"); + let patch = |body: Value| app.call("PATCH", &item, Some(&admin), Some(body)); + let r = patch(json!({"slug": "Rossz Cím"})).await; + assert_eq!(r.status, StatusCode::BAD_REQUEST); + let r = patch(json!({"slug": "teszt-elek-2"})).await; + assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::CONFLICT, Some("slug_taken"))); + let r = patch(json!({"focus_x": 0.25, "focus_y": 7.0, "published": true, "subtitle": null})).await; + assert_eq!(r.status, StatusCode::OK, "{}", r.body); + assert_eq!((&r.body["photo"]["focus_x"], &r.body["photo"]["focus_y"]), (&json!(0.25), &json!(1.0))); + assert_eq!((&r.body["published"], &r.body["subtitle"]), (&json!(true), &Value::Null)); + + // published: the list and the page, with the birth data, the chart and the finished analysis + sqlx::query("UPDATE analyses SET status = 'done', content = '{\"title\": \"Portré\"}', completed_at = now() WHERE id = $1::uuid") + .bind(&analysis_id) + .execute(&pool) + .await + .unwrap(); + // someone else with the very same chart gets their own portrait (the text has the name in it) + let twin = json!({"name": "Teszt Ikertestvér", "birth": birth}); + let r = app.post("/v1/admin/celebrities", Some(&admin), twin).await; + assert_eq!(r.body["analysis"]["status"].as_str(), Some("pending"), "{}", r.body); + let twin_id = r.body["id"].as_str().unwrap().to_string(); + let r = app.call("DELETE", &format!("/v1/admin/celebrities/{twin_id}"), Some(&admin), None).await; + assert_eq!(r.status, StatusCode::NO_CONTENT); + + let list = app.get("/v1/public/celebrities", None).await.body; + assert_eq!(list["celebrities"].as_array().unwrap().len(), 1, "{list}"); + assert_eq!(list["celebrities"][0]["highlights"]["sun"], "cancer"); + let page = app.get("/v1/public/celebrities/teszt-elek", None).await; + assert_eq!(page.status, StatusCode::OK); + assert_eq!(page.body["analysis"]["content"]["title"], "Portré"); + assert_eq!(page.body["chart"]["birth"]["place"], "Szeged"); + assert_eq!(page.body["photo"]["key"].as_str(), Some(key.as_str())); + + // corrected birth data: a new chart and a new analysis + let r = patch(json!({"birth": {"date": "1926-06-02", "time": "09:30", "country": "HU", "place": "Szeged"}})).await; + assert_eq!(r.status, StatusCode::OK, "{}", r.body); + assert_eq!(r.body["birth"]["date"].as_str(), Some("1926-06-02")); + assert_ne!(r.body["analysis"]["id"].as_str(), Some(analysis_id.as_str())); + assert_eq!(r.body["analysis"]["status"].as_str(), Some("pending")); + + // the prompt can be tried on a famous person's chart + let r = app + .post("/v1/admin/prompts/celebrity/hu/preview", Some(&admin), json!({"system": "Próba.", "chart_id": chart_id})) + .await; + assert_eq!(r.status, StatusCode::ACCEPTED, "{}", r.body); + + // deleted with the photo; the other one stays + let r = app.call("DELETE", &format!("/v1/admin/celebrities/{id}"), Some(&admin), None).await; + assert_eq!(r.status, StatusCode::NO_CONTENT); + assert!(app.s3.lock().unwrap().is_empty()); + assert_eq!(app.get("/v1/public/celebrities/teszt-elek", None).await.status, StatusCode::NOT_FOUND); + let left = app.get("/v1/admin/celebrities", Some(&admin)).await.body; + assert_eq!(left["celebrities"].as_array().unwrap().len(), 1); + assert_eq!(left["celebrities"][0]["id"].as_str(), Some(second.as_str())); +} diff --git a/services/backend/src/views.rs b/services/backend/src/views.rs index dd3f769..a4aa91f 100644 --- a/services/backend/src/views.rs +++ b/services/backend/src/views.rs @@ -54,6 +54,7 @@ pub fn public_chart(result: &Value, show_birth_data: bool) -> Value { "place": result["location"]["place"]["name"], "region": result["location"]["place"]["region"], "country": result["location"]["country"]["name"], + "country_code": result["location"]["country"]["iso2"], }), ); } diff --git a/services/frontend/next.config.ts b/services/frontend/next.config.ts index 8aad8e1..11e06f9 100644 --- a/services/frontend/next.config.ts +++ b/services/frontend/next.config.ts @@ -8,6 +8,15 @@ const config: NextConfig = { outputFileTracingIncludes: { "/s/[slug]/kep/[file]": ["./src/assets/og/*.ttf"], "/kep/fooldal.png": ["./src/assets/og/*.ttf"], + "/hires-emberek/[slug]/kep/[file]": ["./src/assets/og/*.ttf"], + }, + images: { + // Only the famous people's photos (served by the backend through the + // /api/v1 proxy, one stored version each) go through the optimizer. + localPatterns: [{ pathname: "/api/v1/public/photos/**", search: "" }], + formats: ["image/webp"], + // The photo's address changes with every upload: the sized versions may be kept long. + minimumCacheTTL: 2678400, }, }; diff --git a/services/frontend/src/app/admin/hibak/ErrorLog.tsx b/services/frontend/src/app/admin/hibak/ErrorLog.tsx index d3060f6..9cef345 100644 --- a/services/frontend/src/app/admin/hibak/ErrorLog.tsx +++ b/services/frontend/src/app/admin/hibak/ErrorLog.tsx @@ -14,6 +14,7 @@ const KINDS: Record = { natal: "képletelemzés", synastry: "kapcsolati", forecast: "előrejelzés", + celebrity: "híres ember", question: "válasz", }; const OUTCOMES: Record = { diff --git a/services/frontend/src/app/admin/hires-emberek/AdminCelebrities.tsx b/services/frontend/src/app/admin/hires-emberek/AdminCelebrities.tsx new file mode 100644 index 0000000..b6d2a82 --- /dev/null +++ b/services/frontend/src/app/admin/hires-emberek/AdminCelebrities.tsx @@ -0,0 +1,139 @@ +"use client"; + +import Link from "next/link"; +import { useRouter } from "next/navigation"; +import { useEffect, useState } from "react"; + +import { BirthForm } from "@/app/profil/BirthForm"; +import { api, errorText } from "@/lib/api"; +import { signName } from "@/lib/astro"; +import type { AdminCelebrity, AdminCelebrityRow } from "@/lib/types"; + +export const ANALYSIS_STATUS: Record = { + pending: "sorban áll", + running: "készül", + done: "kész", + failed: "sikertelen", +}; + +/** The famous people (drafts too) and the form for a new one. */ +export function AdminCelebrities() { + const router = useRouter(); + const [rows, setRows] = useState(null); + const [error, setError] = useState(null); + const [adding, setAdding] = useState(false); + const [subtitle, setSubtitle] = useState(""); + + useEffect(() => { + api<{ celebrities: AdminCelebrityRow[] }>("/admin/celebrities") + .then((r) => setRows(r.celebrities)) + .catch((e) => setError(errorText(e))); + }, []); + + return ( +
+ {adding ? ( +
+

Új híres ember

+ + api("/admin/celebrities", { body: { name, subtitle: subtitle.trim() || null, birth } }) + } + onCancel={() => setAdding(false)} + onSaved={(id) => router.push(`/admin/hires-emberek/${id}`)} + > + + +

+ Mentés után kiszámolja a képletet, és elindítja a részletes portré írását. Utána tölthetsz fel fotót. +

+
+ ) : ( +
+ + + Nyilvános lista + +
+ )} + + {error && ( +

+ {error} +

+ )} + {rows === null ? ( + !error &&

Betöltés…

+ ) : rows.length === 0 ? ( +

Még nincs híres ember.

+ ) : ( +
+ + + + + + + + + + + + + {rows.map((c) => ( + + + + + + + + + ))} + +
NévSzületettNap · Hold · AscPortréFotóÁllapot
+ {c.name} + {c.subtitle && {c.subtitle}} + + {c.birth.date} + {c.birth.time ? ` ${c.birth.time}` : ""} + {c.birth.place && {c.birth.place}} + + {[c.highlights.sun, c.highlights.moon, c.highlights.time_known ? c.highlights.ascendant : null] + .map((s) => (s ? signName(s) : "–")) + .join(" · ")} + {c.analysis_status ? ANALYSIS_STATUS[c.analysis_status] : –}{c.has_photo ? "van" : nincs} + {c.published ? ( + + közzétéve + + ) : ( + vázlat + )} +
+
+ )} +
+ ); +} + +/** The line under the name, e.g. "színésznő, énekesnő". */ +export function SubtitleField({ value, onChange }: { value: string; onChange: (v: string) => void }) { + return ( +
+ + onChange(e.target.value)} + /> +
+ ); +} diff --git a/services/frontend/src/app/admin/hires-emberek/[id]/CelebrityEditor.tsx b/services/frontend/src/app/admin/hires-emberek/[id]/CelebrityEditor.tsx new file mode 100644 index 0000000..cc9f237 --- /dev/null +++ b/services/frontend/src/app/admin/hires-emberek/[id]/CelebrityEditor.tsx @@ -0,0 +1,399 @@ +"use client"; + +import Link from "next/link"; +import { useRouter } from "next/navigation"; +import { useCallback, useEffect, useRef, useState } from "react"; + +import { BirthForm } from "@/app/profil/BirthForm"; +import { AnalysisView } from "@/components/AnalysisView"; +import { RegenerateButton } from "@/components/RegenerateButton"; +import { ApiError, api, errorText } from "@/lib/api"; +import { signName } from "@/lib/astro"; +import { objectPosition, photoSrc } from "@/lib/celebrityPhoto"; +import type { AdminCelebrity, Analysis } from "@/lib/types"; + +import { ANALYSIS_STATUS, SubtitleField } from "../AdminCelebrities"; + +const POLL_MS = 10_000; + +/** Everything about one famous person: photo and face point, texts, publishing, portrait, birth data. */ +export function CelebrityEditor({ id }: { id: string }) { + const router = useRouter(); + const [c, setC] = useState(null); + const [error, setError] = useState(null); + const url = `/admin/celebrities/${id}`; + + const load = useCallback(async () => { + try { + setC(await api(url)); + } catch (e) { + setError(errorText(e)); + } + }, [url]); + + useEffect(() => { + load(); + }, [load]); + + // A portrait being written: look again now and then. + const writing = c?.analysis?.status === "pending" || c?.analysis?.status === "running"; + useEffect(() => { + if (!writing) return; + const t = setInterval(load, POLL_MS); + return () => clearInterval(t); + }, [writing, load]); + + if (!c) { + return error ? ( +

+ {error} +

+ ) : ( +

Betöltés…

+ ); + } + + async function patch(body: object) { + setError(null); + try { + setC(await api(url, { method: "PATCH", body })); + return true; + } catch (e) { + setError(errorText(e)); + return false; + } + } + + async function remove() { + if (!c || !window.confirm(`Biztosan törlöd: ${c.name}? A képlet, a portré és a fotó is törlődik.`)) return; + try { + await api(url, { method: "DELETE" }); + router.push("/admin/hires-emberek"); + } catch (e) { + setError(errorText(e)); + } + } + + return ( +
+
+ + Híres emberek + +

{c.name}

+

+ {c.birth.date} + {c.birth.time ? ` ${c.birth.time}` : " (idő nélkül)"} + {c.birth.place ? `, ${c.birth.place}` : ""} ·{" "} + {[c.highlights.sun, c.highlights.moon, c.highlights.time_known ? c.highlights.ascendant : null] + .filter(Boolean) + .map((s) => signName(s as string)) + .join(" · ")} +

+
+ + + {c.published ? "Nyilvános oldal" : "Előnézet"} + + {c.published ? "közzétéve" : "vázlat"} +
+
+ {error && ( +

+ {error} +

+ )} + + patch({ focus_x: x, focus_y: y })} /> + + setC({ ...c, analysis: a })} /> + +
+

Születési adatok

+

+ Ha a javítás után más lesz a képlet, a portré törlődik, és újra elkészül az új képletből. +

+ { + const next = await api(url, { method: "PATCH", body: birth ? { name, birth } : { name } }); + setC(next); + return next; + }} + onSaved={() => undefined} + /> +
+ +
+

Törlés

+

A képlet, a portré és a fotó is törlődik; a nyilvános oldal megszűnik.

+
+ +
+
+
+ ); +} + +/** Upload, the face point (a click on the photo) and how the crops will look. */ +function PhotoSection({ + c, + url, + onChange, + onFocus, +}: { + c: AdminCelebrity; + url: string; + onChange: (c: AdminCelebrity) => void; + onFocus: (x: number, y: number) => void; +}) { + const [busy, setBusy] = useState(false); + const [error, setError] = useState(null); + const input = useRef(null); + const photo = c.photo; + + async function upload(file: File) { + setBusy(true); + setError(null); + try { + // The image itself is the body (the backend makes the stored JPEG). + const res = await fetch(`/api/v1${url}/photo`, { + method: "PUT", + headers: { "content-type": file.type || "application/octet-stream" }, + body: file, + credentials: "same-origin", + }); + const data = await res.json().catch(() => null); + if (!res.ok) { + const err = data?.error ?? {}; + throw new ApiError(res.status, err.code ?? "error", err.message ?? `HTTP ${res.status}`); + } + onChange(data as AdminCelebrity); + } catch (e) { + setError(errorText(e)); + } finally { + setBusy(false); + if (input.current) input.current.value = ""; + } + } + + async function removePhoto() { + if (!window.confirm("Törlöd a fotót?")) return; + try { + onChange(await api(`${url}/photo`, { method: "DELETE" })); + } catch (e) { + setError(errorText(e)); + } + } + + function pick(e: React.MouseEvent) { + const r = e.currentTarget.getBoundingClientRect(); + const x = Math.min(1, Math.max(0, (e.clientX - r.left) / r.width)); + const y = Math.min(1, Math.max(0, (e.clientY - r.top) / r.height)); + onFocus(Math.round(x * 1000) / 1000, Math.round(y * 1000) / 1000); + } + + return ( +
+

Fotó

+

+ Egy fotó kell (JPEG, PNG vagy WebP, legfeljebb 15 MB). Feltöltés után kattints az arcra: minden kivágás + (megosztási kép, oldal, lista) e pont köré igazodik. +

+ {photo && ( +
+ +
+
+ + {/* eslint-disable-next-line @next/next/no-img-element */} + + +
Megosztási kép
+
+
+ + {/* eslint-disable-next-line @next/next/no-img-element */} + + +
Oldal
+
+
+ + {/* eslint-disable-next-line @next/next/no-img-element */} + + +
Lista
+
+
+
+ )} +
+ { + const file = e.target.files?.[0]; + if (file) upload(file); + }} + /> + + {photo && ( + + )} + + Megosztási kép megnyitása + +
+ {error && ( +

+ {error} +

+ )} +
+ ); +} + +/** Name, the line under it and the address of the page. */ +function TextsSection({ c, onSave }: { c: AdminCelebrity; onSave: (body: object) => Promise }) { + const [name, setName] = useState(c.name); + const [subtitle, setSubtitle] = useState(c.subtitle ?? ""); + const [slug, setSlug] = useState(c.slug); + const [busy, setBusy] = useState(false); + const [saved, setSaved] = useState(false); + const changed = name.trim() !== c.name || subtitle.trim() !== (c.subtitle ?? "") || slug.trim() !== c.slug; + + async function save(e: React.FormEvent) { + e.preventDefault(); + setBusy(true); + setSaved(await onSave({ name: name.trim(), subtitle: subtitle.trim() || null, slug: slug.trim() })); + setBusy(false); + } + + return ( +
+

Név és cím

+
+
+ + setName(e.target.value)} /> +
+ +
+
+ + setSlug(e.target.value)} + /> + sorsfonalak.hu/hires-emberek/{slug || "…"} +
+

+ A név a portré szövegében is szerepel: ha jelentősen javítod, a portrét érdemes újragenerálni. +

+
+ + {saved && !changed && Elmentve.} +
+
+ ); +} + +/** The portrait: its state, the text, writing it again. */ +function AnalysisSection({ + c, + url, + onChange, + onAnalysis, +}: { + c: AdminCelebrity; + url: string; + onChange: (c: AdminCelebrity) => void; + onAnalysis: (a: Analysis) => void; +}) { + const [error, setError] = useState(null); + const [open, setOpen] = useState(false); + const a = c.analysis; + + async function start() { + setError(null); + try { + onChange(await api(`${url}/analysis`, { method: "POST" })); + } catch (e) { + setError(errorText(e)); + } + } + + return ( +
+

Részletes portré

+

+ Saját prompttal készül (Promptok → Híres ember), harmadik személyben, csak a + képletből; elemzést nem használ fel. +

+ {!a ? ( +

Még nincs portré.

+ ) : ( +

+ Állapot: {ANALYSIS_STATUS[a.status] ?? a.status} + {a.status === "failed" && a.error && ({a.error})} + {(a.status === "pending" || a.status === "running") && (a.attempts ?? 0) > 1 && ( + · {a.attempts}. próbálkozás + )} +

+ )} +
+ {(!a || a.status === "failed") && ( + + )} + {a?.status === "done" && ( + <> + + url={`/admin/analyses/${a.id}/regenerate`} onStarted={onAnalysis} /> + + )} +
+ {error && ( +

+ {error} +

+ )} + {open && a?.status === "done" && a.content && ( + + )} +
+ ); +} diff --git a/services/frontend/src/app/admin/hires-emberek/[id]/page.tsx b/services/frontend/src/app/admin/hires-emberek/[id]/page.tsx new file mode 100644 index 0000000..8bb8204 --- /dev/null +++ b/services/frontend/src/app/admin/hires-emberek/[id]/page.tsx @@ -0,0 +1,23 @@ +import type { Metadata } from "next"; +import { notFound } from "next/navigation"; + +import { AdminNav } from "@/components/AdminNav"; +import { requireMe } from "@/lib/server"; + +import { CelebrityEditor } from "./CelebrityEditor"; + +export const metadata: Metadata = { title: "Híres ember" }; + +type Props = { params: Promise<{ id: string }> }; + +export default async function AdminCelebrityPage({ params }: Props) { + const { id } = await params; + const me = await requireMe(`/admin/hires-emberek/${id}`); + if (!me.user.roles.includes("admin")) notFound(); + return ( +
+ + +
+ ); +} diff --git a/services/frontend/src/app/admin/hires-emberek/page.tsx b/services/frontend/src/app/admin/hires-emberek/page.tsx new file mode 100644 index 0000000..6e2c1d5 --- /dev/null +++ b/services/frontend/src/app/admin/hires-emberek/page.tsx @@ -0,0 +1,28 @@ +import type { Metadata } from "next"; +import { notFound } from "next/navigation"; + +import { AdminNav } from "@/components/AdminNav"; +import { requireMe } from "@/lib/server"; + +import { AdminCelebrities } from "./AdminCelebrities"; + +export const metadata: Metadata = { title: "Híres emberek" }; + +export default async function AdminCelebritiesPage() { + const me = await requireMe("/admin/hires-emberek"); + if (!me.user.roles.includes("admin")) notFound(); + return ( +
+ +
+

Híres emberek

+

+ Születési adat, egy fotó és egy részletes portré (saját prompt: Promptok → Híres ember). Közzététel után a + nyilvános oldalon (sorsfonalak.hu/hires-emberek) és a keresőkben is megjelenik; megosztáskor az előnézeti + képen az arc és a képlet látszik. +

+
+ +
+ ); +} diff --git a/services/frontend/src/app/admin/modellek/RunningJobs.tsx b/services/frontend/src/app/admin/modellek/RunningJobs.tsx index 11c4a35..6413af6 100644 --- a/services/frontend/src/app/admin/modellek/RunningJobs.tsx +++ b/services/frontend/src/app/admin/modellek/RunningJobs.tsx @@ -10,6 +10,7 @@ const KINDS: Record = { natal: "Képletelemzés", synastry: "Kapcsolati elemzés", forecast: "Éves előrejelzés", + celebrity: "Híres ember", question: "Kérdés-válasz", }; diff --git a/services/frontend/src/app/admin/promptok/AdminPrompts.tsx b/services/frontend/src/app/admin/promptok/AdminPrompts.tsx index fda2371..cd19685 100644 --- a/services/frontend/src/app/admin/promptok/AdminPrompts.tsx +++ b/services/frontend/src/app/admin/promptok/AdminPrompts.tsx @@ -5,7 +5,7 @@ import { useEffect, useState } from "react"; import { Tabs } from "@/components/Tabs"; import { api, errorText } from "@/lib/api"; import { formatDate } from "@/lib/astro"; -import type { AdminPrompt, ChartListItem, PromptKind } from "@/lib/types"; +import type { AdminCelebrityRow, AdminPrompt, ChartListItem, PromptKind } from "@/lib/types"; import { PromptTrial } from "./PromptTrial"; @@ -35,6 +35,13 @@ const KINDS: { kind: PromptKind; id: string; label: string; about: string }[] = about: "Fizetős elemzés egy születésnaptól a következőig: szolár, lassú tranzitok, progresszió, profekció, fogyatkozások. Öt fejezet, lehetőségek, kihívások és útravaló. Kérésre készül.", }, + { + kind: "celebrity", + id: "hires-ember", + label: "Híres ember", + about: + "A híres emberek nyilvános oldalának részletes portréja: ugyanaz a hat fejezet, mint a részletes elemzésé, de harmadik személyben, a nevén nevezve, csak a képletből (az életrajzát nem használja). A modell a nevet és a képlet adatait kapja. Az admin oldalon készül (Híres emberek).", + }, { kind: "question", id: "kerdesek", @@ -49,6 +56,8 @@ const LANGUAGES: Record = { hu: "Magyar", en: "Angol" }; export function AdminPrompts() { const [prompts, setPrompts] = useState(null); const [charts, setCharts] = useState([]); + // The famous people's charts, for trying their prompt. + const [famous, setFamous] = useState([]); const [error, setError] = useState(null); useEffect(() => { @@ -58,6 +67,22 @@ export function AdminPrompts() { api<{ charts: ChartListItem[] }>("/charts") .then((d) => setCharts(d.charts)) .catch(() => setCharts([])); + api<{ celebrities: AdminCelebrityRow[] }>("/admin/celebrities") + .then((d) => + setFamous( + d.celebrities.map((c) => ({ + id: c.chart_id, + label: c.name, + is_primary: false, + kind: "person", + editable_until: null, + birth: { date: c.birth.date, time: c.birth.time, place: c.birth.place }, + highlights: c.highlights, + created_at: "", + })), + ), + ) + .catch(() => setFamous([])); }, []); if (error) { @@ -83,7 +108,7 @@ export function AdminPrompts() { p.kind === k.kind)} - charts={charts} + charts={k.kind === "celebrity" ? famous : charts} onSaved={replace} /> ), diff --git a/services/frontend/src/app/api/v1/[...path]/route.ts b/services/frontend/src/app/api/v1/[...path]/route.ts index ab7e45e..4a380af 100644 --- a/services/frontend/src/app/api/v1/[...path]/route.ts +++ b/services/frontend/src/app/api/v1/[...path]/route.ts @@ -3,6 +3,7 @@ import { revalidateTag } from "next/cache"; import type { NextRequest } from "next/server"; +import { CELEBRITIES_TAG } from "@/lib/celebrities"; import { BACKEND_URL } from "@/lib/server"; import { SHARES_TAG } from "@/lib/share"; @@ -53,6 +54,10 @@ async function forward(req: NextRequest, ctx: { params: Promise<{ path: string[] for (const cookie of res.headers.getSetCookie()) out.append("set-cookie", cookie); // A revoked link must disappear at once from the cached share pages. if (req.method === "DELETE" && path[0] === "shares" && res.ok) revalidateTag(SHARES_TAG, { expire: 0 }); + // An admin's change to a famous person shows on the public pages at once. + if (req.method !== "GET" && path[0] === "admin" && path[1] === "celebrities" && res.ok) { + revalidateTag(CELEBRITIES_TAG, { expire: 0 }); + } return new Response(res.body, { status: res.status, headers: out }); } diff --git a/services/frontend/src/app/globals.css b/services/frontend/src/app/globals.css index 684c9e8..7fae058 100644 --- a/services/frontend/src/app/globals.css +++ b/services/frontend/src/app/globals.css @@ -1221,3 +1221,31 @@ span.tarot-fan-card { cursor: default; } .calc-links li { font-size: 15px; } .calc-save { display: flex; flex-direction: column; gap: 10px; } .calc-save .btn { align-self: flex-start; } + +/* Famous people: the public list and page, and the admin editor. */ +.msg-warn { color: var(--gold); border: 1px solid rgba(217, 180, 106, 0.45); border-radius: 10px; padding: 10px 14px; } +.celeb-subtitle { margin: -6px 0 0; font-size: 18px; color: var(--ink-2); } +.celeb-grid { list-style: none; margin: 0; padding: 0; display: grid; grid-template-columns: repeat(auto-fill, minmax(min(220px, 100%), 1fr)); gap: 16px; } +.celeb-tile { display: flex; flex-direction: column; gap: 6px; text-decoration: none; color: var(--ink); height: 100%; padding: 14px; } +.celeb-tile:hover { border-color: #5a6790; color: var(--ink); } +.celeb-tile strong { font-family: var(--font-display); font-size: 24px; font-weight: 600; line-height: 1.15; margin-top: 6px; } +.celeb-tile-photo { position: relative; display: flex; align-items: center; justify-content: center; aspect-ratio: 1 / 1; border-radius: 10px; overflow: hidden; background: #141b2e; } +.celeb-tile-glyph { font-size: 64px; color: var(--gold); } +.celeb-portrait { gap: 14px; } +.celeb-photo { position: relative; aspect-ratio: 4 / 5; width: 100%; border-radius: 10px; overflow: hidden; background: #141b2e; } +.celeb-editor-photo { display: grid; grid-template-columns: minmax(0, 380px) minmax(0, 1fr); gap: 20px; align-items: start; } +.celeb-focus { position: relative; display: block; padding: 0; border: 1px solid var(--line); border-radius: 10px; overflow: hidden; cursor: crosshair; background: none; line-height: 0; } +.celeb-focus img { width: 100%; height: auto; display: block; } +.celeb-focus-mark { position: absolute; width: 34px; height: 34px; margin: -17px 0 0 -17px; border: 2px solid var(--gold); border-radius: 50%; box-shadow: 0 0 0 2px rgba(13, 18, 32, 0.7); pointer-events: none; } +.celeb-crops { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 12px; align-items: end; } +.celeb-crops figure { margin: 0; display: flex; flex-direction: column; gap: 6px; } +.celeb-crop { position: relative; display: block; width: 100%; border-radius: 8px; overflow: hidden; border: 1px solid var(--line); } +.celeb-crop img { position: absolute; inset: 0; width: 100%; height: 100%; object-fit: cover; } +@media (max-width: 760px) { + .celeb-editor-photo { grid-template-columns: 1fr; } +} +@media (max-width: 640px) { + .celeb-grid { grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 10px; } + .celeb-tile { padding: 10px; } + .celeb-tile strong { font-size: 19px; } +} diff --git a/services/frontend/src/app/hires-emberek/[slug]/kep/[file]/route.tsx b/services/frontend/src/app/hires-emberek/[slug]/kep/[file]/route.tsx new file mode 100644 index 0000000..85b0d7d --- /dev/null +++ b/services/frontend/src/app/hires-emberek/[slug]/kep/[file]/route.tsx @@ -0,0 +1,29 @@ +// The link preview image of a famous person (og:image): the photo with the +// face in view, the name and the chart. The file name carries a version (see +// `celebrityImageVersion`), so a new photo or face point gets a new address. +import { SIGNS, signName } from "@/lib/astro"; +import { loadCelebrity } from "@/lib/celebrities"; +import { celebrityCard } from "@/lib/ogCard"; +import { BACKEND_URL } from "@/lib/server"; +import { bigThree } from "@/lib/share"; + +export async function GET(_req: Request, { params }: { params: Promise<{ slug: string; file: string }> }) { + const { slug } = await params; + const c = await loadCelebrity(slug); + if (!c) return new Response("Not found", { status: 404 }); + let photo = null; + if (c.photo) { + const res = await fetch(`${BACKEND_URL}/v1/public/photos/${c.photo.key}`, { cache: "no-store" }); + if (res.ok) photo = { ...c.photo, data: await res.arrayBuffer() }; + } + return celebrityCard({ + chart: c.chart, + timeKnown: c.chart.time_known, + name: c.name, + subtitle: c.subtitle, + lines: bigThree(c.chart).map((t) => ({ glyph: SIGNS[t.sign]?.glyph ?? "", label: `${t.label} ${signName(t.sign)}` })), + photo, + // A draft's image is not kept anywhere. + cacheControl: c.published ? "public, max-age=3600, s-maxage=86400" : "private, no-store", + }); +} diff --git a/services/frontend/src/app/hires-emberek/[slug]/page.tsx b/services/frontend/src/app/hires-emberek/[slug]/page.tsx new file mode 100644 index 0000000..4ecc369 --- /dev/null +++ b/services/frontend/src/app/hires-emberek/[slug]/page.tsx @@ -0,0 +1,141 @@ +import type { Metadata } from "next"; +import Image from "next/image"; +import Link from "next/link"; +import { notFound } from "next/navigation"; + +import { AnalysisView } from "@/components/AnalysisView"; +import { ChartWheel, WheelLegend } from "@/components/ChartWheel"; +import { JsonLd, PublicFooter } from "@/components/PublicFooter"; +import { PublicHeader } from "@/components/SiteHeader"; +import { SIGNS, signName } from "@/lib/astro"; +import { birthLine, celebrityImageVersion, loadCelebrity } from "@/lib/celebrities"; +import { objectPosition, photoSrc } from "@/lib/celebrityPhoto"; +import { getMe } from "@/lib/server"; +import { bigThree, plain, shorten, siteUrl } from "@/lib/share"; + +type Props = { params: Promise<{ slug: string }> }; + +export async function generateMetadata({ params }: Props): Promise { + const { slug } = await params; + const c = await loadCelebrity(slug); + if (!c) return { title: "Nem található", robots: { index: false } }; + const base = await siteUrl(); + const title = `${c.name} horoszkópja`; + const summary = c.analysis?.content.summary; + const description = summary + ? shorten(plain(summary), 200) + : `${c.name} születési képlete: ${birthLine(c.chart.birth)}.`; + const url = `${base}/hires-emberek/${c.slug}`; + const image = { url: `${url}/kep/${celebrityImageVersion(c)}.png`, width: 1200, height: 630, alt: title }; + return { + title, + description, + // A draft (only admins see it) stays out of search engines. + robots: c.published ? undefined : { index: false, follow: false }, + alternates: { canonical: url }, + openGraph: { type: "article", siteName: "Sorsfonalak", locale: "hu_HU", url, title, description, images: [image] }, + twitter: { card: "summary_large_image", title, description, images: [image.url] }, + }; +} + +/** A famous person: photo, birth data, chart and the detailed portrait. */ +export default async function CelebrityPage({ params }: Props) { + const { slug } = await params; + const [c, me] = await Promise.all([loadCelebrity(slug), getMe()]); + if (!c) notFound(); + const chart = c.chart; + const trio = bigThree(chart); + const base = await siteUrl(); + + return ( + <> + + {!me && } +
+ {!c.published && ( +

+ Vázlat: csak az adminok látják. Szerkesztés +

+ )} +
+ + Híres emberek + +

{c.name} horoszkópja

+ {c.subtitle &&

{c.subtitle}

} +

Született: {birthLine(chart.birth)}

+
+ +
+
+ + +
+
+
+ {c.photo && ( +
+ {c.name} +
+ )} + {trio.length > 0 && ( +

+ {trio.map((t) => ( + + {" "} + {t.label} {signName(t.sign)} + + ))} +

+ )} + {!chart.time_known && ( +

A születési idő nem ismert, ezért a képleten nincsenek házak és Aszcendens.

+ )} +
+
+

És a te képleted mit mutat?

+

+ Add meg a születési adataidat, és megkapod a saját képletedet a rövid összefoglalóval együtt, ingyen. +

+ + {me ? "A saját képletem" : "Ingyenes születési horoszkóp"} + +
+
+
+ + {c.analysis ? ( +
+ Asztrológiai portré + +
+ ) : ( +

A részletes portré hamarosan elkészül.

+ )} +

+ A portrét mesterséges intelligencia írta, kizárólag a születési képlet alapján, nem az életrajz ismeretében. +

+
+ + + ); +} diff --git a/services/frontend/src/app/hires-emberek/page.tsx b/services/frontend/src/app/hires-emberek/page.tsx new file mode 100644 index 0000000..19e4441 --- /dev/null +++ b/services/frontend/src/app/hires-emberek/page.tsx @@ -0,0 +1,86 @@ +import type { Metadata } from "next"; +import Image from "next/image"; +import Link from "next/link"; + +import { PublicFooter } from "@/components/PublicFooter"; +import { PublicHeader } from "@/components/SiteHeader"; +import { SIGNS, signName } from "@/lib/astro"; +import { loadCelebrities } from "@/lib/celebrities"; +import { objectPosition, photoSrc } from "@/lib/celebrityPhoto"; +import { getMe } from "@/lib/server"; + +export const metadata: Metadata = { + title: "Híres emberek horoszkópja", + description: + "Híres emberek születési képlete és részletes asztrológiai portréja: Nap, Hold, Aszcendens és a képlet teljes értelmezése.", + alternates: { canonical: "/hires-emberek" }, +}; + +/** The published famous people. */ +export default async function CelebritiesPage() { + const [people, me] = await Promise.all([loadCelebrities(), getMe()]); + return ( + <> + {!me && } +
+
+ Híres emberek +

Híres emberek horoszkópja

+

+ Ismert emberek születési képlete és részletes portréja. A szöveg csak a képletből dolgozik, nem az + életrajzukból: azt mutatja meg, mit árul el róluk a születésük pillanatának égboltja. +

+
+ {people.length === 0 ? ( +

Hamarosan.

+ ) : ( +
    + {people.map((p) => ( +
  • + + + {p.photo ? ( + {p.name} + ) : ( + + )} + + {p.name} + {p.subtitle && {p.subtitle}} + + {[ + p.highlights.sun && `Nap ${signName(p.highlights.sun)}`, + p.highlights.moon && `Hold ${signName(p.highlights.moon)}`, + ] + .filter(Boolean) + .join(" · ")} + + +
  • + ))} +
+ )} +
+

+ Kíváncsi vagy a saját képletedre? Az ingyenes születési horoszkóp a születési adataidból kiszámolja, belépés + nélkül. +

+
+ + Ingyenes születési horoszkóp + +
+
+
+ + + ); +} diff --git a/services/frontend/src/app/profil/BirthForm.tsx b/services/frontend/src/app/profil/BirthForm.tsx index d70f936..7cb64a0 100644 --- a/services/frontend/src/app/profil/BirthForm.tsx +++ b/services/frontend/src/app/profil/BirthForm.tsx @@ -20,15 +20,33 @@ const ERRORS: Record = { /** Someone else's chart: added with a name, or (with `chartId`) corrected. */ export type PersonTarget = { chartId?: string; name?: string }; +/** The birth data the form sends (as `POST /v1/charts` takes it). */ +export type BirthInput = { + date: string; + time?: string; + country: string; + geonames_id: number; + ambiguous_time?: Ambiguity; +}; + export function BirthForm({ initial, person, + save, + children, onCancel, onSaved, }: { initial: Initial; /** Not given: the user's own birth data. */ person?: PersonTarget; + /** + * Saves somewhere else than the user's charts (e.g. a famous person); gets + * the birth data only when it changed. Its errors show in the form. + */ + save?: (name: string, birth: BirthInput | null) => Promise<{ id: string }>; + /** More fields, after the name. */ + children?: React.ReactNode; onCancel?: () => void; onSaved: (chartId: string) => void; }) { @@ -105,7 +123,7 @@ export function BirthForm({ if (!place) return setError("Válaszd ki a születési helyet a listából."); setBusy(true); try { - const birth = { + const birth: BirthInput = { date, ...(timeUnknown ? {} : { time }), country, @@ -121,7 +139,9 @@ export function BirthForm({ (timeUnknown ? null : time) !== (initial.time?.slice(0, 5) ?? null) || country !== (initial.country ?? "HU") || place.geonames_id !== initial.geonames_id; - const saved = person?.chartId + const saved = save + ? await save(name.trim(), birthChanged ? birth : null) + : person?.chartId ? await api<{ id: string }>(`/charts/${person.chartId}`, { method: "PATCH", body: birthChanged ? { label: name.trim(), birth } : { label: name.trim() }, @@ -172,6 +192,7 @@ export function BirthForm({ /> )} + {children}
Születési dátum diff --git a/services/frontend/src/app/sitemap.ts b/services/frontend/src/app/sitemap.ts index 53a6aa0..f31cfd6 100644 --- a/services/frontend/src/app/sitemap.ts +++ b/services/frontend/src/app/sitemap.ts @@ -1,12 +1,15 @@ import type { MetadataRoute } from "next"; import { ZODIAC } from "@/content/zodiac"; +import { loadCelebrities } from "@/lib/celebrities"; import { siteUrl } from "@/lib/share"; /** The public pages for search engines; everything else needs a login. */ export default async function sitemap(): Promise { const base = await siteUrl(); const privacy = { languages: { hu: `${base}/adatvedelem`, en: `${base}/privacy` } }; + // The sitemap still works when the backend does not answer. + const people = await loadCelebrities().catch(() => []); return [ { url: `${base}/`, changeFrequency: "weekly", priority: 1 }, { url: `${base}/pelda`, changeFrequency: "monthly", priority: 0.8 }, @@ -14,6 +17,13 @@ export default async function sitemap(): Promise { { url: `${base}/szuletesi-horoszkop`, changeFrequency: "monthly", priority: 0.9 }, { url: `${base}/csillagjegyek`, changeFrequency: "monthly", priority: 0.8 }, ...ZODIAC.map((z) => ({ url: `${base}/csillagjegyek/${z.slug}`, changeFrequency: "monthly" as const, priority: 0.7 })), + { url: `${base}/hires-emberek`, changeFrequency: "weekly", priority: 0.7 }, + ...people.map((p) => ({ + url: `${base}/hires-emberek/${p.slug}`, + lastModified: p.updated_at, + changeFrequency: "monthly" as const, + priority: 0.6, + })), { url: `${base}/aszf`, changeFrequency: "yearly", priority: 0.2 }, { url: `${base}/adatvedelem`, changeFrequency: "yearly", priority: 0.2, alternates: privacy }, { url: `${base}/privacy`, changeFrequency: "yearly", priority: 0.2, alternates: privacy }, diff --git a/services/frontend/src/components/AdminNav.tsx b/services/frontend/src/components/AdminNav.tsx index ad8a491..3f21911 100644 --- a/services/frontend/src/components/AdminNav.tsx +++ b/services/frontend/src/components/AdminNav.tsx @@ -4,6 +4,7 @@ const PAGES = [ { href: "/admin", label: "Felhasználók" }, { href: "/admin/meghivok", label: "Meghívók" }, { href: "/admin/promokodok", label: "Promókódok" }, + { href: "/admin/hires-emberek", label: "Híres emberek" }, { href: "/admin/promptok", label: "Promptok" }, { href: "/admin/modellek", label: "Modellek" }, { href: "/admin/hibak", label: "Hibanapló" }, diff --git a/services/frontend/src/components/AnalysisView.tsx b/services/frontend/src/components/AnalysisView.tsx index 6814476..4ddb208 100644 --- a/services/frontend/src/components/AnalysisView.tsx +++ b/services/frontend/src/components/AnalysisView.tsx @@ -5,16 +5,16 @@ import { Paragraphs, Rich } from "./Rich"; const NATAL_ORDER = ["personality", "emotions", "mind", "love", "work", "growth"]; const SYNASTRY_ORDER = ["attraction", "communication", "emotional_bond", "friction", "long_term"]; const FORECAST_ORDER = ["theme", "love", "work", "growth", "timeline"]; -const ORDER = { natal: NATAL_ORDER, synastry: SYNASTRY_ORDER, forecast: FORECAST_ORDER }; +const ORDER = { natal: NATAL_ORDER, synastry: SYNASTRY_ORDER, forecast: FORECAST_ORDER, celebrity: NATAL_ORDER }; -/** A finished detailed analysis (natal, synastry or yearly forecast). */ +/** A finished detailed analysis (natal, synastry, yearly forecast or a famous person's portrait). */ export function AnalysisView({ content, kind = "natal", language, }: { content: AnalysisContent; - kind?: "natal" | "synastry" | "forecast"; + kind?: "natal" | "synastry" | "forecast" | "celebrity"; /** The language of the text, for hyphenation. */ language?: string; }) { @@ -64,7 +64,7 @@ export function AnalysisView({
{content.advice && (
-

Útravaló

+

{kind === "celebrity" ? "Összegzés" : "Útravaló"}

)} diff --git a/services/frontend/src/components/PublicFooter.tsx b/services/frontend/src/components/PublicFooter.tsx index b9ff553..93c5a2a 100644 --- a/services/frontend/src/components/PublicFooter.tsx +++ b/services/frontend/src/components/PublicFooter.tsx @@ -11,6 +11,7 @@ export function PublicFooter() {