Compare commits
75
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2b856a798e | ||
|
|
37cb0abf4b | ||
|
|
13e22a9c7d | ||
|
|
47bbe2f348 | ||
|
|
6c5f0b160e | ||
|
|
f8386cbf55 | ||
|
|
f6fc2e46ac | ||
|
|
f7b9af5e8c | ||
|
|
2ca065894d | ||
|
|
9716f503bc | ||
|
|
9331573890 | ||
|
|
4b93dc42e8 | ||
|
|
4247f914ce | ||
|
|
a6ddfc6924 | ||
|
|
116e4747c2 | ||
|
|
8b8285b5d2 | ||
|
|
b41dc31f3e | ||
|
|
985b1e872d | ||
|
|
2eea1042a5 | ||
|
|
0cd880b418 | ||
|
|
a571abdb65 | ||
|
|
55048ed828 | ||
|
|
7d6a6c3d92 | ||
|
|
a63f8f9928 | ||
|
|
286ad14016 | ||
|
|
85aa3fc5b1 | ||
|
|
19e5badc07 | ||
|
|
cf4d419e52 | ||
|
|
d63cdf737a | ||
|
|
810de0cb24 | ||
|
|
4676f7860f | ||
|
|
e68f7407f3 | ||
|
|
1b768d558d | ||
|
|
ad436f786c | ||
|
|
16c40864bb | ||
|
|
a2649fddeb | ||
|
|
ffb6060cfa | ||
|
|
09fc1e62c7 | ||
|
|
f69f76a05a | ||
|
|
5071589bf9 | ||
|
|
cd2eb02d3d | ||
|
|
43e22e6768 | ||
|
|
1a75dec59a | ||
|
|
7f6f05150e | ||
|
|
b0e1270246 | ||
|
|
663ceaca16 | ||
|
|
2e2e4b113d | ||
|
|
22d2484cab | ||
|
|
b0fc547b73 | ||
|
|
54af54cd39 | ||
|
|
1af7415add | ||
|
|
e326095f3f | ||
|
|
71177f749c | ||
|
|
ac5e7fa4fd | ||
|
|
bbfa5b28c3 | ||
|
|
e741f9b491 | ||
|
|
ba11eda64c | ||
|
|
e4905ec5f1 | ||
|
|
f578e84b3f | ||
|
|
76bc965537 | ||
|
|
174ec31351 | ||
|
|
184f19e1f2 | ||
|
|
27ecdf386e | ||
|
|
4338a35202 | ||
|
|
2a0830fda0 | ||
|
|
e530e78c54 | ||
|
|
5e633b959d | ||
|
|
d9e71ed349 | ||
|
|
42a982010d | ||
|
|
a4df094191 | ||
|
|
55101f8637 | ||
|
|
15c88fc6be | ||
|
|
50cf334045 | ||
|
|
ddca7acbd4 | ||
|
|
55f5a1ac60 |
@@ -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
|
||||
@@ -134,7 +136,8 @@ jobs:
|
||||
docker images "$IMAGE_PREFIX-$svc" --format '{{.Repository}}:{{.Tag}}' | xargs -r docker rmi >/dev/null 2>&1 || true
|
||||
done
|
||||
docker image prune -f >/dev/null
|
||||
docker builder prune -af --filter until=72h >/dev/null || true
|
||||
# A size cap, not an age: a busy day builds tens of gigabytes.
|
||||
docker builder prune -af --max-used-space 10GB >/dev/null || true
|
||||
|
||||
deploy:
|
||||
needs: build
|
||||
|
||||
Generated
+190
@@ -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,11 +175,15 @@ dependencies = [
|
||||
"axum",
|
||||
"axum-extra",
|
||||
"db",
|
||||
"deunicode",
|
||||
"email-templates",
|
||||
"hmac",
|
||||
"horoscope-client",
|
||||
"http-body-util",
|
||||
"image",
|
||||
"jsonwebtoken",
|
||||
"password-hash",
|
||||
"rand 0.9.5",
|
||||
"reqwest",
|
||||
"serde",
|
||||
"serde_json",
|
||||
@@ -240,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"
|
||||
@@ -335,6 +357,24 @@ 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"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "98b0cc327b5bc766e7fda9c9260cc0fa81b43a8e240440422dff70788e3f9ef1"
|
||||
dependencies = [
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-queue"
|
||||
version = "0.3.14"
|
||||
@@ -503,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"
|
||||
@@ -979,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"
|
||||
@@ -1197,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"
|
||||
@@ -1208,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"
|
||||
@@ -1397,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"
|
||||
@@ -1445,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"
|
||||
@@ -1851,8 +1992,11 @@ name = "service-kit"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"http",
|
||||
"tokio",
|
||||
"tower-http",
|
||||
"tracing",
|
||||
"tracing-appender",
|
||||
"tracing-subscriber",
|
||||
]
|
||||
|
||||
@@ -1913,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"
|
||||
@@ -2195,6 +2345,12 @@ dependencies = [
|
||||
"cc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "symlink"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.119"
|
||||
@@ -2419,6 +2575,19 @@ dependencies = [
|
||||
"tracing-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tracing-appender"
|
||||
version = "0.2.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "050686193eb999b4bb3bc2acfa891a13da00f79734704c4b8b4ef1a10b368a3c"
|
||||
dependencies = [
|
||||
"crossbeam-channel",
|
||||
"symlink",
|
||||
"thiserror",
|
||||
"time",
|
||||
"tracing-subscriber",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tracing-attributes"
|
||||
version = "0.1.31"
|
||||
@@ -3002,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",
|
||||
]
|
||||
|
||||
@@ -53,6 +53,7 @@ tokio = { version = "1", features = ["macros", "rt-multi-thread", "net", "signal
|
||||
tower-http = { version = "0.6", features = ["trace", "cors"] }
|
||||
tracing = "0.1"
|
||||
tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
|
||||
tracing-appender = "0.2"
|
||||
|
||||
[profile.release]
|
||||
lto = "thin"
|
||||
|
||||
@@ -8,6 +8,9 @@
|
||||
|
||||
use serde_json::{Value, json};
|
||||
|
||||
pub mod tarot;
|
||||
pub use tarot::{Reading as TarotReading, TAROT_QUESTION_MAX_CHARS, build_tarot, tarot_schema};
|
||||
|
||||
/// Matches the backend's `ANALYSIS_PROMPT_VERSION` (part of the cache key).
|
||||
pub const PROMPT_VERSION: &str = "v3";
|
||||
|
||||
@@ -21,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 {
|
||||
@@ -35,6 +42,7 @@ impl Kind {
|
||||
Kind::Summary => "summary",
|
||||
Kind::Forecast => "forecast",
|
||||
Kind::Question => "question",
|
||||
Kind::Celebrity => "celebrity",
|
||||
}
|
||||
}
|
||||
|
||||
@@ -45,6 +53,7 @@ impl Kind {
|
||||
"summary" => Some(Kind::Summary),
|
||||
"forecast" => Some(Kind::Forecast),
|
||||
"question" => Some(Kind::Question),
|
||||
"celebrity" => Some(Kind::Celebrity),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
@@ -140,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 => &[],
|
||||
@@ -150,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 => &[],
|
||||
@@ -209,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}
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -249,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 \
|
||||
@@ -287,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);
|
||||
@@ -297,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:
|
||||
@@ -316,7 +359,7 @@ például a Szaturnusz-visszatérés vagy az Uránusz-szembenállás: nevezd is
|
||||
- Ha nincs szolár képlet (ismeretlen születési idő), az évet a tranzitokra és a progressziókra építsd, és ne említs \
|
||||
házakat, Aszcendenst és MC-t.";
|
||||
|
||||
const HUNGARIAN_TERMS: &str = "
|
||||
pub(crate) const HUNGARIAN_TERMS: &str = "
|
||||
|
||||
Nyelvhelyesség és szakszavak:
|
||||
- Ügyelj a helyes toldalékokra és a magánhangzó-illeszkedésre; magyar idézőjelet („…”) és nagykötőjelet (–) használj.
|
||||
@@ -341,7 +384,13 @@ felett”), progresszió (a progresszív Hold), profekció, az év ura, napfogya
|
||||
Szaturnusz-visszatérés.
|
||||
- A dátumokat magyarosan írd: „március 12.”, „március 12-től április 30-ig”, „2027 januárja”.";
|
||||
|
||||
fn language_name(language: &str) -> &'static str {
|
||||
/// "cancer" → "Cancer".
|
||||
pub(crate) fn capitalize(s: &str) -> String {
|
||||
let mut chars = s.chars();
|
||||
chars.next().map(|c| c.to_uppercase().chain(chars).collect()).unwrap_or_default()
|
||||
}
|
||||
|
||||
pub(crate) fn language_name(language: &str) -> &'static str {
|
||||
match language {
|
||||
"hu" => "Hungarian",
|
||||
_ => "English",
|
||||
@@ -358,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\").",
|
||||
@@ -410,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:
|
||||
@@ -450,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
|
||||
}
|
||||
|
||||
@@ -581,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",
|
||||
@@ -592,7 +671,7 @@ pub fn build(kind: Kind, language: &str, chart_text: &str, system: Option<&str>)
|
||||
|
||||
/// Checks an answer against our schema subset (objects with required
|
||||
/// properties, strings with at least three letters, string arrays with at
|
||||
/// least two items). A placeholder such as "x" counts as missing.
|
||||
/// least two items, other arrays not empty). A placeholder such as "x" counts as missing.
|
||||
pub fn validate(schema: &Value, value: &Value) -> Result<(), String> {
|
||||
fn walk(schema: &Value, value: &Value, path: &str) -> Result<(), String> {
|
||||
match schema["type"].as_str() {
|
||||
@@ -606,7 +685,9 @@ pub fn validate(schema: &Value, value: &Value) -> Result<(), String> {
|
||||
}
|
||||
Some("array") => {
|
||||
let items = value.as_array().ok_or_else(|| format!("{path}: expected an array"))?;
|
||||
if items.len() < 2 {
|
||||
// Lists of strings need two items; other lists (a one-card reading's cards) one.
|
||||
let min = if schema["items"]["type"] == "string" { 2 } else { 1 };
|
||||
if items.len() < min {
|
||||
return Err(format!("{path}: too few items"));
|
||||
}
|
||||
items.iter().enumerate().try_for_each(|(i, v)| walk(&schema["items"], v, &format!("{path}[{i}]")))
|
||||
@@ -658,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"),
|
||||
@@ -732,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())];
|
||||
|
||||
@@ -0,0 +1,494 @@
|
||||
//! Tarot readings: the deck, the spreads, the prompt and the answer schema.
|
||||
//!
|
||||
//! The backend draws the cards and stores them with the question (the
|
||||
//! `tarot` column of the analysis, see [`Reading`]); the worker writes the
|
||||
//! reading with the model of the detailed analyses.
|
||||
|
||||
use std::sync::OnceLock;
|
||||
|
||||
use serde_json::{Value, json};
|
||||
|
||||
use crate::{HUNGARIAN_TERMS, Prompt};
|
||||
|
||||
/// The 78 cards, shared with the frontend (which draws them from the same file).
|
||||
const DECK_JSON: &str = include_str!("../../../services/frontend/src/content/tarot-deck.json");
|
||||
|
||||
/// Longest question, in characters.
|
||||
pub const TAROT_QUESTION_MAX_CHARS: usize = 300;
|
||||
|
||||
/// A card of the deck (the fields the prompt and the views need).
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Card {
|
||||
pub id: String,
|
||||
pub name_hu: String,
|
||||
pub name_en: String,
|
||||
pub element: String,
|
||||
pub astro: String,
|
||||
pub keywords: Vec<String>,
|
||||
pub upright: String,
|
||||
pub reversed: String,
|
||||
}
|
||||
|
||||
pub fn deck() -> &'static [Card] {
|
||||
static DECK: OnceLock<Vec<Card>> = OnceLock::new();
|
||||
DECK.get_or_init(|| {
|
||||
let raw: Vec<Value> = serde_json::from_str(DECK_JSON).expect("tarot-deck.json is valid JSON");
|
||||
let text = |c: &Value, k: &str| c[k].as_str().unwrap_or_default().to_string();
|
||||
raw.iter()
|
||||
.map(|c| Card {
|
||||
id: text(c, "id"),
|
||||
name_hu: text(c, "nameHu"),
|
||||
name_en: text(c, "nameEn"),
|
||||
element: text(c, "element"),
|
||||
astro: text(c, "astroRuler"),
|
||||
keywords: c["keywords"]
|
||||
.as_array()
|
||||
.into_iter()
|
||||
.flatten()
|
||||
.filter_map(Value::as_str)
|
||||
.map(str::to_string)
|
||||
.collect(),
|
||||
upright: text(c, "upright"),
|
||||
reversed: text(c, "reversed"),
|
||||
})
|
||||
.collect()
|
||||
})
|
||||
}
|
||||
|
||||
pub fn card(id: &str) -> Option<&'static Card> {
|
||||
deck().iter().find(|c| c.id == id)
|
||||
}
|
||||
|
||||
/// A place in a spread.
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub struct Position {
|
||||
pub title: &'static str,
|
||||
/// What the card in this place tells about.
|
||||
pub about: &'static str,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub struct Spread {
|
||||
pub id: &'static str,
|
||||
pub name: &'static str,
|
||||
pub positions: &'static [Position],
|
||||
}
|
||||
|
||||
pub const SPREADS: [Spread; 3] = [
|
||||
Spread {
|
||||
id: "daily",
|
||||
name: "Napi iránymutatás",
|
||||
positions: &[Position {
|
||||
title: "A nap üzenete",
|
||||
about: "Mire hangolódj ma, és milyen minőség támogat leginkább.",
|
||||
}],
|
||||
},
|
||||
Spread {
|
||||
id: "trinity",
|
||||
name: "Sorsfonalak hármas",
|
||||
positions: &[
|
||||
Position { title: "Gyökér és előzmény", about: "Honnan ered a mostani helyzet energiája." },
|
||||
Position { title: "Jelenlegi fókusz", about: "Mi zajlik most a felszínen és a mélyben." },
|
||||
Position { title: "Kibontakozás", about: "Merre tart a folyamat, ha tudatosan együttműködsz vele." },
|
||||
],
|
||||
},
|
||||
Spread {
|
||||
id: "astro_cross",
|
||||
name: "Képlet-kereszt",
|
||||
positions: &[
|
||||
Position { title: "Központi téma", about: "A kérdés szíve és a jelenlegi sorspont." },
|
||||
Position {
|
||||
title: "Hold-mélység (belső)", about: "Tudattalan érzelmi mozgatórugók és megérzések."
|
||||
},
|
||||
Position {
|
||||
title: "Nap-tér (tudatos)", about: "Amire már rálátsz, és ami felé az akaratod irányul."
|
||||
},
|
||||
Position {
|
||||
title: "Kvadrát (kihívás)", about: "A súrlódás, amely cselekvésre és növekedésre hív."
|
||||
},
|
||||
Position {
|
||||
title: "Aszcendens (útmutatás)", about: "A legtisztább következő lépés kifelé és előre."
|
||||
},
|
||||
],
|
||||
},
|
||||
];
|
||||
|
||||
pub fn spread(id: &str) -> Option<&'static Spread> {
|
||||
SPREADS.iter().find(|s| s.id == id)
|
||||
}
|
||||
|
||||
/// What the reading is about: it steers how the cards are read.
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub struct Topic {
|
||||
pub id: &'static str,
|
||||
pub name: &'static str,
|
||||
/// The instruction for the model (Hungarian, English).
|
||||
pub focus: (&'static str, &'static str),
|
||||
}
|
||||
|
||||
pub const TOPICS: [Topic; 4] = [
|
||||
Topic {
|
||||
id: "general",
|
||||
name: "Általános",
|
||||
focus: (
|
||||
"Általános jóslás: az olvasó élete egészére vonatkoztasd a lapokat.",
|
||||
"A general reading: relate the cards to the reader's life as a whole.",
|
||||
),
|
||||
},
|
||||
Topic {
|
||||
id: "love",
|
||||
name: "Párkapcsolat",
|
||||
focus: (
|
||||
"Párkapcsolati jóslás: minden lapot a szerelem, a vonzalom, a közelség, a bizalom és a kommunikáció \
|
||||
szemszögéből olvass, akár van kapcsolata az olvasónak, akár keres. Ne feltételezd a partner nemét, és ne \
|
||||
jósolj szakítást, hűtlenséget vagy azt, hogy valaki biztosan visszatér.",
|
||||
"A relationship reading: read every card through love, attraction, closeness, trust and communication, \
|
||||
whether the reader is in a relationship or looking for one. Do not assume the partner's gender, and do \
|
||||
not predict a break-up, infidelity or that someone will surely come back.",
|
||||
),
|
||||
},
|
||||
Topic {
|
||||
id: "work",
|
||||
name: "Munka és hivatás",
|
||||
focus: (
|
||||
"Munka és hivatás: a lapokat a munka, a hivatás, a tanulás, a munkahelyi kapcsolatok és a fejlődés \
|
||||
szemszögéből olvasd. Ne adj pénzügyi vagy jogi tanácsot, és ne jósolj elbocsátást vagy anyagi \
|
||||
nyereséget, veszteséget.",
|
||||
"Work and calling: read the cards through work, vocation, learning, relationships at work and growth. \
|
||||
Give no financial or legal advice, and do not predict dismissal or financial gains or losses.",
|
||||
),
|
||||
},
|
||||
Topic {
|
||||
id: "self",
|
||||
name: "Önismeret",
|
||||
focus: (
|
||||
"Önismeret: a lapokat a belső világ, az érzelmek, a minták és a lelki fejlődés szemszögéből olvasd; a \
|
||||
külső események helyett arra figyelj, mit tanulhat az olvasó önmagáról.",
|
||||
"Self-knowledge: read the cards through the inner world, feelings, patterns and inner growth; rather \
|
||||
than outer events, focus on what the reader can learn about themselves.",
|
||||
),
|
||||
},
|
||||
];
|
||||
|
||||
/// A topic by id (`None`, and readings from before topics: general).
|
||||
pub fn topic(id: Option<&str>) -> Option<&'static Topic> {
|
||||
match id {
|
||||
None => TOPICS.first(),
|
||||
Some(id) => TOPICS.iter().find(|t| t.id == id),
|
||||
}
|
||||
}
|
||||
|
||||
/// The Hungarian name of a zodiac sign as the charts store it ("cancer").
|
||||
pub fn sign_hu(sign: &str) -> &'static str {
|
||||
match sign.to_ascii_lowercase().as_str() {
|
||||
"aries" => "Kos",
|
||||
"taurus" => "Bika",
|
||||
"gemini" => "Ikrek",
|
||||
"cancer" => "Rák",
|
||||
"leo" => "Oroszlán",
|
||||
"virgo" => "Szűz",
|
||||
"libra" => "Mérleg",
|
||||
"scorpio" => "Skorpió",
|
||||
"sagittarius" => "Nyilas",
|
||||
"capricorn" => "Bak",
|
||||
"aquarius" => "Vízöntő",
|
||||
"pisces" => "Halak",
|
||||
_ => "?",
|
||||
}
|
||||
}
|
||||
|
||||
/// What a reading is written from (the `tarot` column of the analysis):
|
||||
/// `{"spread": "trinity", "question": "…" | null, "cards": [{"card": "major-2",
|
||||
/// "reversed": false}, …], "sun": "cancer", "moon": "pisces", "ascendant": "aries" | null}`.
|
||||
/// The cards are in the order of the spread's positions.
|
||||
pub struct Reading<'a> {
|
||||
pub spread: &'static Spread,
|
||||
pub topic: &'static Topic,
|
||||
pub question: Option<&'a str>,
|
||||
/// (card, reversed) per position.
|
||||
pub cards: Vec<(&'static Card, bool)>,
|
||||
pub sun: Option<&'a str>,
|
||||
pub moon: Option<&'a str>,
|
||||
pub ascendant: Option<&'a str>,
|
||||
}
|
||||
|
||||
impl<'a> Reading<'a> {
|
||||
pub fn parse(value: &'a Value) -> Result<Self, String> {
|
||||
let spread_id = value["spread"].as_str().unwrap_or_default();
|
||||
let spread = spread(spread_id).ok_or_else(|| format!("unknown spread '{spread_id}'"))?;
|
||||
let cards = value["cards"]
|
||||
.as_array()
|
||||
.ok_or("no cards")?
|
||||
.iter()
|
||||
.map(|c| {
|
||||
let id = c["card"].as_str().unwrap_or_default();
|
||||
card(id)
|
||||
.map(|card| (card, c["reversed"].as_bool().unwrap_or(false)))
|
||||
.ok_or_else(|| format!("unknown card '{id}'"))
|
||||
})
|
||||
.collect::<Result<Vec<_>, _>>()?;
|
||||
if cards.len() != spread.positions.len() {
|
||||
return Err(format!("{} cards for a spread of {}", cards.len(), spread.positions.len()));
|
||||
}
|
||||
let text = |k: &str| value[k].as_str().map(str::trim).filter(|s| !s.is_empty());
|
||||
Ok(Self {
|
||||
spread,
|
||||
topic: topic(text("topic")).ok_or("unknown topic")?,
|
||||
question: text("question"),
|
||||
cards,
|
||||
sun: text("sun"),
|
||||
moon: text("moon"),
|
||||
ascendant: text("ascendant"),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// The JSON schema of a reading (strict mode: every property required).
|
||||
pub fn tarot_schema() -> Value {
|
||||
json!({
|
||||
"type": "object",
|
||||
"additionalProperties": false,
|
||||
"required": ["title", "summary", "cards", "synthesis", "advice"],
|
||||
"properties": {
|
||||
"title": {"type": "string", "description": "Short, evocative title for this reading (at most 8 words)"},
|
||||
"summary": {"type": "string", "description": "2-3 sentences: the heart of the answer"},
|
||||
"cards": {
|
||||
"type": "array",
|
||||
"description": "One item per card, in the order of the positions",
|
||||
"items": {
|
||||
"type": "object",
|
||||
"additionalProperties": false,
|
||||
"required": ["body"],
|
||||
"properties": {
|
||||
"body": {"type": "string", "description": "1-2 paragraphs about this card in its position"}
|
||||
}
|
||||
}
|
||||
},
|
||||
"synthesis": {"type": "string", "description": "How the cards read together (a single card: how its message shows in practice), 1-3 paragraphs separated by a blank line"},
|
||||
"advice": {"type": "string", "description": "A closing, encouraging paragraph with one or two concrete steps"}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/// Words of the whole reading, by the number of cards.
|
||||
fn length(cards: usize) -> (usize, usize) {
|
||||
match cards {
|
||||
1 => (250, 400),
|
||||
2..=3 => (450, 700),
|
||||
_ => (650, 950),
|
||||
}
|
||||
}
|
||||
|
||||
fn hungarian_system(cards: usize) -> String {
|
||||
let (min, max) = length(cards);
|
||||
let together = if cards == 1 {
|
||||
"- Egyetlen lap van, nincs mit egymáshoz mérni: a „synthesis” mezőben arról írj, hogyan jelenhet meg a lap \
|
||||
üzenete a gyakorlatban, az olvasó napjában vagy a kérdése ügyében (helyzetek, érzések, amelyekre figyelhet)."
|
||||
} else {
|
||||
"- A lapok együtt mesélnek: mutasd meg, hogyan kapcsolódnak egymáshoz (ismétlődő elemek, színek, nagy árkánumok \
|
||||
súlya, az álló és fordított lapok aránya)."
|
||||
};
|
||||
format!(
|
||||
"Tapasztalt, empatikus, lélektani szemléletű tarot-olvasó vagy, aki az asztrológiát is ismeri. A Sorsfonalak \
|
||||
alkalmazás számára személyes kártyajóslást írsz egy kirakásról, amelyet az olvasó kérdésére húzott.
|
||||
|
||||
Magyarul írj, természetes, igényes magyarsággal, ahogy egy magyar anyanyelvű szerző írna: a szöveg ne hasson fordításnak.
|
||||
|
||||
Szabályok:
|
||||
- Csak a megadott lapokat értelmezd, a megadott pozíciókban és állásban (álló vagy fordított). A lapok alapjelentése \
|
||||
kiindulópont: a saját tudásod a lapok hagyományos szimbolikájáról (Rider–Waite) kiegészítheti, de ne mondjon neki ellent.
|
||||
- Minden lapot a pozíciója fényében olvass, és mindig a kérdésre vonatkoztasd. Ha nincs kérdés, az olvasó jelenlegi \
|
||||
életszakaszáról szólj általánosan.
|
||||
{together}
|
||||
- Az olvasó Napját, Holdját és Aszcendensét (ha meg van adva) egy-két helyen, finoman kapcsold a lapokhoz, például a \
|
||||
lapok elemén vagy asztrológiai megfelelésén keresztül; ne írj belőle horoszkópot.
|
||||
- Közvetlenül az olvasóhoz szólj, tegező formában (egyes szám második személyben, „te”).
|
||||
- A tarot tükör, nem ítélet: lehetőségekről, hajlamokról és választásokról írj, soha ne biztos jövőbeli eseményekről. \
|
||||
Ne jósolj betegséget, halált, balesetet, terhességet, válást vagy pénzügyi nyereséget és veszteséget, és ne adj orvosi, \
|
||||
jogi vagy pénzügyi tanácsot. Ha a kérdés ilyesmire irányul, a lelki oldalára válaszolj, és jelezd, hogy a konkrét \
|
||||
döntéshez szakember kell.
|
||||
- Hangnem: meleg, őszinte, megerősítő és konkrét; a nehéz lapoknál is mutasd meg a kiutat. Kerüld a közhelyeket és a \
|
||||
töltelékszöveget.
|
||||
- A szövegek egyszerű bekezdések, üres sorral elválasztva, címsor és felsorolás nélkül; **félkövért** takarékosan \
|
||||
használhatsz. A lapok nevét a magyar nevükön írd.
|
||||
- Terjedelem: az egész jóslás kb. {min}–{max} szó.
|
||||
- Egyetlen, a megadott sémának megfelelő JSON-objektummal válaszolj, semmi mással; a „cards” tömbben pontosan annyi \
|
||||
elem legyen, ahány lap van, a pozíciók sorrendjében.{HUNGARIAN_TERMS}"
|
||||
)
|
||||
}
|
||||
|
||||
fn english_system(language: &str, cards: usize) -> String {
|
||||
let (min, max) = length(cards);
|
||||
let together = if cards == 1 {
|
||||
"- There is a single card, nothing to weigh it against: in \"synthesis\" write how its message may show in \
|
||||
practice, in the reader's day or in the matter of the question (situations and feelings to watch for)."
|
||||
} else {
|
||||
"- Show how the cards tell one story together (recurring elements and suits, the weight of the major arcana, \
|
||||
upright versus reversed cards)."
|
||||
};
|
||||
format!(
|
||||
"You are an experienced, empathetic tarot reader with a psychological approach who also knows astrology. You \
|
||||
write a personal tarot reading for the Sorsfonalak app about a spread the reader drew for their question.
|
||||
|
||||
Write in {language}.
|
||||
|
||||
Rules:
|
||||
- Read only the given cards, in their positions and orientation (upright or reversed). The base meanings are the \
|
||||
starting point; your knowledge of the traditional (Rider-Waite) symbolism may add to them but must not contradict them.
|
||||
- Read each card in the light of its position and always relate it to the question. Without a question, speak about \
|
||||
the reader's present phase of life.
|
||||
{together}
|
||||
- Link the reader's Sun, Moon and Ascendant (when given) to the cards once or twice, gently, e.g. through the cards' \
|
||||
elements or astrological correspondences; do not write a horoscope.
|
||||
- Address the reader directly, in the second person.
|
||||
- Tarot is a mirror, not a verdict: write about possibilities, tendencies and choices, never certain future events. \
|
||||
Do not predict illness, death, accidents, pregnancy, divorce or financial gains and losses, and give no medical, legal \
|
||||
or financial advice; if the question asks for that, answer its emotional side and say a professional is needed for the \
|
||||
decision itself.
|
||||
- Tone: warm, honest, encouraging and specific; show the way forward even with hard cards. Avoid clichés and filler.
|
||||
- Plain paragraphs separated by a blank line, no headings or lists; use **bold** sparingly.
|
||||
- Length: about {min}-{max} words in all.
|
||||
- Answer with a single JSON object matching the schema and nothing else; the \"cards\" array has exactly one item per \
|
||||
card, in the order of the positions.",
|
||||
language = crate::language_name(language),
|
||||
)
|
||||
}
|
||||
|
||||
/// The prompt of a reading.
|
||||
pub fn build_tarot(language: &str, reading: &Reading) -> Prompt {
|
||||
let hu = language == "hu";
|
||||
let mut user = String::new();
|
||||
let none = if hu { "nincs megadva" } else { "not given" };
|
||||
user.push_str(&format!(
|
||||
"{}: {}. {}\n\n",
|
||||
if hu { "Téma" } else { "Topic" },
|
||||
reading.topic.name,
|
||||
if hu { reading.topic.focus.0 } else { reading.topic.focus.1 },
|
||||
));
|
||||
match reading.question {
|
||||
Some(q) => user.push_str(&format!("{}: {}\n\n", if hu { "A kérdés" } else { "The question" }, q.trim())),
|
||||
None => user.push_str(if hu {
|
||||
"Nincs konkrét kérdés: az olvasó a témában a jelenlegi életszakaszára kér útmutatást.\n\n"
|
||||
} else {
|
||||
"No specific question: the reader asks for guidance on the topic in their present phase of life.\n\n"
|
||||
}),
|
||||
}
|
||||
let sign = |s: Option<&str>| {
|
||||
s.map_or(none.to_string(), |s| if hu { sign_hu(s).to_string() } else { crate::capitalize(s) })
|
||||
};
|
||||
user.push_str(&format!(
|
||||
"{}: {} {}, {} {}, {} {}\n\n",
|
||||
if hu { "Az olvasó képlete" } else { "The reader's chart" },
|
||||
if hu { "Nap:" } else { "Sun:" },
|
||||
sign(reading.sun),
|
||||
if hu { "Hold:" } else { "Moon:" },
|
||||
sign(reading.moon),
|
||||
if hu { "Aszcendens:" } else { "Ascendant:" },
|
||||
sign(reading.ascendant),
|
||||
));
|
||||
user.push_str(&format!(
|
||||
"{}: {} ({} {})\n",
|
||||
if hu { "Kirakás" } else { "Spread" },
|
||||
reading.spread.name,
|
||||
reading.cards.len(),
|
||||
if hu { "lap" } else { "cards" },
|
||||
));
|
||||
for (i, (position, (card, reversed))) in reading.spread.positions.iter().zip(&reading.cards).enumerate() {
|
||||
let orientation = match (hu, reversed) {
|
||||
(true, true) => "fordított",
|
||||
(true, false) => "álló",
|
||||
(false, true) => "reversed",
|
||||
(false, false) => "upright",
|
||||
};
|
||||
user.push_str(&format!(
|
||||
"\n{n}. {title} ({about})\n {name} ({en}), {orientation}\n {kw}: {keywords}\n {el}: {element}; {astro_label}: {astro}\n {meaning_label}: {meaning}\n",
|
||||
n = i + 1,
|
||||
title = position.title,
|
||||
about = position.about,
|
||||
name = card.name_hu,
|
||||
en = card.name_en,
|
||||
kw = if hu { "Kulcsszavak" } else { "Keywords" },
|
||||
keywords = card.keywords.join(", "),
|
||||
el = if hu { "Elem" } else { "Element" },
|
||||
element = card.element,
|
||||
astro_label = if hu { "Asztrológiai megfelelés" } else { "Astrological correspondence" },
|
||||
astro = card.astro,
|
||||
meaning_label = if hu { "Alapjelentés ebben az állásban" } else { "Base meaning in this orientation (Hungarian)" },
|
||||
meaning = if *reversed { &card.reversed } else { &card.upright },
|
||||
));
|
||||
}
|
||||
user.push_str(if hu { "\nMost írd meg a jóslást." } else { "\nWrite the reading now." });
|
||||
Prompt {
|
||||
system: if hu { hungarian_system(reading.cards.len()) } else { english_system(language, reading.cards.len()) },
|
||||
user,
|
||||
schema_name: "tarot_reading",
|
||||
schema: tarot_schema(),
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn the_deck_has_78_distinct_cards_with_meanings() {
|
||||
let deck = deck();
|
||||
assert_eq!(deck.len(), 78);
|
||||
let mut ids: Vec<&str> = deck.iter().map(|c| c.id.as_str()).collect();
|
||||
ids.sort_unstable();
|
||||
ids.dedup();
|
||||
assert_eq!(ids.len(), 78);
|
||||
assert!(deck.iter().all(|c| !c.name_hu.is_empty() && !c.upright.is_empty() && !c.reversed.is_empty()));
|
||||
assert_eq!(card("major-2").unwrap().name_hu, "A Főpapnő");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn readings_parse_and_build_a_prompt() {
|
||||
let value = json!({"spread": "trinity", "question": "Merre induljak tovább?",
|
||||
"cards": [{"card": "major-0", "reversed": false}, {"card": "cups-3", "reversed": true},
|
||||
{"card": "major-17", "reversed": false}],
|
||||
"sun": "cancer", "moon": "pisces", "ascendant": null});
|
||||
let reading = Reading::parse(&value).unwrap();
|
||||
let prompt = build_tarot("hu", &reading);
|
||||
// Readings without a topic (the first ones) are general.
|
||||
assert!(prompt.user.starts_with("Téma: Általános."));
|
||||
assert!(prompt.user.contains("A kérdés: Merre induljak tovább?"));
|
||||
assert!(prompt.user.contains("Nap: Rák, Hold: Halak, Aszcendens: nincs megadva"));
|
||||
assert!(prompt.user.contains("2. Jelenlegi fókusz"));
|
||||
assert!(prompt.user.contains("fordított"));
|
||||
assert!(prompt.user.contains(&card("cups-3").unwrap().reversed));
|
||||
assert!(prompt.system.contains("650") || prompt.system.contains("450"));
|
||||
assert_eq!(prompt.schema["required"][2], "cards");
|
||||
|
||||
let english = build_tarot("en", &reading);
|
||||
assert!(english.user.contains("Sun: Cancer") && english.system.contains("English"));
|
||||
|
||||
let mut love = value.clone();
|
||||
love["topic"] = json!("love");
|
||||
let prompt = build_tarot("hu", &Reading::parse(&love).unwrap());
|
||||
assert!(
|
||||
prompt.user.starts_with("Téma: Párkapcsolat.") && prompt.user.contains("Ne feltételezd a partner nemét")
|
||||
);
|
||||
love["topic"] = json!("pénz");
|
||||
assert!(Reading::parse(&love).is_err());
|
||||
|
||||
let wrong = json!({"spread": "daily", "cards": [{"card": "major-0"}, {"card": "major-1"}]});
|
||||
assert!(Reading::parse(&wrong).is_err());
|
||||
assert!(Reading::parse(&json!({"spread": "daily", "cards": [{"card": "nincs"}]})).is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn one_card_has_no_reading_together() {
|
||||
assert!(hungarian_system(1).contains("Egyetlen lap van") && !hungarian_system(1).contains("együtt mesélnek"));
|
||||
assert!(hungarian_system(3).contains("együtt mesélnek"));
|
||||
assert!(english_system("en", 1).contains("single card") && !english_system("en", 1).contains("one story"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_one_card_answer_is_valid() {
|
||||
let text = "Egy bekezdés a lapról.";
|
||||
let answer = |cards: Value| json!({"title": "Napi üzenet", "summary": text, "cards": cards, "synthesis": text, "advice": text});
|
||||
assert_eq!(crate::validate(&tarot_schema(), &answer(json!([{"body": text}]))), Ok(()));
|
||||
assert!(crate::validate(&tarot_schema(), &answer(json!([]))).is_err());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
-- Stripe Checkout sessions started from the package cards. The package is
|
||||
-- granted once, when the payment is confirmed (webhook, or the return page
|
||||
-- asking Stripe), and the session id keeps that from happening twice.
|
||||
CREATE TABLE stripe_checkouts (
|
||||
-- Stripe's Checkout Session id (cs_test_… / cs_live_…).
|
||||
id text PRIMARY KEY,
|
||||
user_id uuid NOT NULL REFERENCES users ON DELETE CASCADE,
|
||||
package text NOT NULL,
|
||||
price_huf integer NOT NULL CHECK (price_huf > 0),
|
||||
live boolean NOT NULL,
|
||||
created_at timestamptz NOT NULL DEFAULT now(),
|
||||
completed_at timestamptz,
|
||||
order_id uuid REFERENCES package_orders ON DELETE SET NULL
|
||||
);
|
||||
|
||||
CREATE INDEX stripe_checkouts_user_idx ON stripe_checkouts (user_id, created_at DESC);
|
||||
@@ -0,0 +1,64 @@
|
||||
-- What a confirmed payment keeps for the invoice, and the invoices issued in
|
||||
-- Billingo by the worker. Card details never reach us: only what Stripe
|
||||
-- reports about the payment and the buyer's billing details.
|
||||
|
||||
-- Payments outlive a deleted account: the accounting law asks for 8 years.
|
||||
ALTER TABLE stripe_checkouts ALTER COLUMN user_id DROP NOT NULL;
|
||||
ALTER TABLE stripe_checkouts DROP CONSTRAINT stripe_checkouts_user_id_fkey;
|
||||
ALTER TABLE stripe_checkouts ADD CONSTRAINT stripe_checkouts_user_id_fkey
|
||||
FOREIGN KEY (user_id) REFERENCES users ON DELETE SET NULL;
|
||||
|
||||
ALTER TABLE stripe_checkouts
|
||||
ADD COLUMN payment_intent text,
|
||||
-- What Stripe charged, in forints.
|
||||
ADD COLUMN amount_huf integer,
|
||||
-- Stripe's customer_details as it came: name, e-mail, address, and for a
|
||||
-- company its name and tax ids.
|
||||
ADD COLUMN customer jsonb;
|
||||
|
||||
-- One invoice per paid checkout. Every invoice detail is kept here (the buyer
|
||||
-- and the item as invoiced, Billingo's whole answer); the PDF itself is
|
||||
-- fetched from Billingo when downloaded.
|
||||
CREATE TABLE invoices (
|
||||
id uuid PRIMARY KEY,
|
||||
checkout_id text NOT NULL UNIQUE REFERENCES stripe_checkouts ON DELETE RESTRICT,
|
||||
user_id uuid REFERENCES users ON DELETE SET NULL,
|
||||
-- pending → issued; failed after the last retry (an admin looks at it).
|
||||
status text NOT NULL DEFAULT 'pending' CHECK (status IN ('pending', 'issued', 'failed')),
|
||||
attempts integer NOT NULL DEFAULT 0,
|
||||
next_attempt_at timestamptz NOT NULL DEFAULT now(),
|
||||
last_error text,
|
||||
-- The buyer as invoiced.
|
||||
buyer_name text NOT NULL,
|
||||
buyer_email text,
|
||||
buyer_country text NOT NULL,
|
||||
buyer_post_code text NOT NULL,
|
||||
buyer_city text NOT NULL,
|
||||
buyer_address text NOT NULL,
|
||||
-- Billingo's partner tax type: HAS_TAX_NUMBER, NO_TAX_NUMBER or FOREIGN.
|
||||
buyer_tax_type text NOT NULL CHECK (buyer_tax_type IN ('HAS_TAX_NUMBER', 'NO_TAX_NUMBER', 'FOREIGN')),
|
||||
buyer_tax_number text,
|
||||
-- The single item. vat_rate is Billingo's VAT value: AAM (alanyi
|
||||
-- adómentes: net = gross, no VAT) or a rate like 27%.
|
||||
item_name text NOT NULL,
|
||||
gross_huf integer NOT NULL CHECK (gross_huf > 0),
|
||||
net_huf integer NOT NULL,
|
||||
vat_huf integer NOT NULL,
|
||||
vat_rate text NOT NULL DEFAULT 'AAM',
|
||||
payment_method text NOT NULL DEFAULT 'online_bankcard',
|
||||
-- From Billingo.
|
||||
billingo_partner_id bigint,
|
||||
billingo_document_id bigint UNIQUE,
|
||||
invoice_number text,
|
||||
invoice_date date,
|
||||
fulfillment_date date,
|
||||
due_date date,
|
||||
document jsonb,
|
||||
-- When Billingo e-mailed it to the buyer.
|
||||
sent_at timestamptz,
|
||||
created_at timestamptz NOT NULL DEFAULT now(),
|
||||
issued_at timestamptz
|
||||
);
|
||||
|
||||
CREATE INDEX invoices_user_idx ON invoices (user_id, created_at DESC);
|
||||
CREATE INDEX invoices_due_idx ON invoices (next_attempt_at) WHERE status = 'pending';
|
||||
@@ -0,0 +1,5 @@
|
||||
-- The invoice item must identify the service (Áfa tv. 169. § e): what the
|
||||
-- package contains goes under the item, and the unit is "csomag".
|
||||
ALTER TABLE invoices
|
||||
ADD COLUMN item_comment text,
|
||||
ADD COLUMN item_unit text NOT NULL DEFAULT 'csomag';
|
||||
@@ -0,0 +1,6 @@
|
||||
-- The buyer accepted the terms (ÁSZF) and asked for immediate delivery, giving
|
||||
-- up the 14-day withdrawal right, on Stripe's payment page: when, and which
|
||||
-- version of the terms. Kept as the proof of the consent.
|
||||
ALTER TABLE stripe_checkouts
|
||||
ADD COLUMN terms_accepted_at timestamptz,
|
||||
ADD COLUMN terms_version text;
|
||||
@@ -0,0 +1,21 @@
|
||||
-- Tarot readings: a `tarot` analysis (stored with the other analyses, so
|
||||
-- the worker, retries, fallback and refunds work the same) holds the spread,
|
||||
-- the question, the cards drawn by the server and the reader's Sun, Moon and
|
||||
-- Ascendant in `tarot`. Each reading uses one `tarot` unit.
|
||||
ALTER TABLE analyses DROP CONSTRAINT analyses_kind_check;
|
||||
ALTER TABLE analyses ADD CONSTRAINT analyses_kind_check
|
||||
CHECK (kind IN ('natal', 'synastry', 'summary', 'forecast', 'tarot'));
|
||||
ALTER TABLE analyses ADD COLUMN tarot jsonb;
|
||||
ALTER TABLE analyses DROP CONSTRAINT analyses_target;
|
||||
ALTER TABLE analyses ADD CONSTRAINT analyses_target CHECK (
|
||||
(kind IN ('natal', 'summary') 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 credit_ledger DROP CONSTRAINT credit_ledger_unit_check;
|
||||
ALTER TABLE credit_ledger ADD CONSTRAINT credit_ledger_unit_check
|
||||
CHECK (unit IN ('natal', 'synastry', 'forecast', 'person', 'question', 'tarot'));
|
||||
|
||||
CREATE INDEX analyses_tarot_idx ON analyses (requested_by, created_at DESC) WHERE kind = 'tarot';
|
||||
@@ -0,0 +1,4 @@
|
||||
-- When the worker asked Billingo for the invoice. Set before the request: if
|
||||
-- the answer is lost (a timeout after Billingo made it), the next attempt
|
||||
-- looks the invoice up instead of making a second one.
|
||||
ALTER TABLE invoices ADD COLUMN document_requested_at timestamptz;
|
||||
@@ -0,0 +1,4 @@
|
||||
-- When the operator's Telegram notice about a paid checkout went out (the
|
||||
-- worker's `notify` task). Earlier purchases count as notified.
|
||||
ALTER TABLE stripe_checkouts ADD COLUMN notified_at timestamptz;
|
||||
UPDATE stripe_checkouts SET notified_at = now() WHERE completed_at IS NOT NULL;
|
||||
@@ -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>.
|
||||
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;
|
||||
@@ -91,20 +91,36 @@ pub fn render(template: &str, locale: &str, payload: &Value) -> Result<Rendered,
|
||||
};
|
||||
let content = match (template, lang) {
|
||||
("verify_email", Lang::Hu) => Content::simple(
|
||||
"Erősítsd meg az e-mail-címed".into(),
|
||||
"Add meg a jelszavad".into(),
|
||||
greeting(name(payload, "display_name")),
|
||||
"Köszönjük, hogy regisztráltál a Sorsfonalakon! Az alábbi gombbal erősítsd meg az e-mail-címed.".into(),
|
||||
"E-mail-cím megerősítése",
|
||||
"Köszönjük, hogy regisztráltál a Sorsfonalakon! Az alábbi gombbal megerősíted az e-mail-címed, és megadhatod a jelszavad. Utána már be is vagy lépve.".into(),
|
||||
"Jelszó megadása",
|
||||
url,
|
||||
"A link 3 napig érvényes. Ha nem te regisztráltál, nyugodtan hagyd figyelmen kívül ezt a levelet.",
|
||||
"A link 3 napig érvényes, és csak egyszer használható. Ha nem te regisztráltál, nyugodtan hagyd figyelmen kívül ezt a levelet.",
|
||||
),
|
||||
("verify_email", Lang::En) => Content::simple(
|
||||
"Confirm your e-mail address".into(),
|
||||
"Set your password".into(),
|
||||
greeting(name(payload, "display_name")),
|
||||
"Thanks for signing up for Sorsfonalak! Please confirm your e-mail address with the button below.".into(),
|
||||
"Confirm e-mail address",
|
||||
"Thanks for signing up for Sorsfonalak! The button below confirms your e-mail address and lets you set your password. You will be logged in right after.".into(),
|
||||
"Set password",
|
||||
url,
|
||||
"The link is valid for 3 days. If you did not sign up, you can safely ignore this e-mail.",
|
||||
"The link is valid for 3 days and can be used once. If you did not sign up, you can safely ignore this e-mail.",
|
||||
),
|
||||
("account_exists", Lang::Hu) => Content::simple(
|
||||
"Már van fiókod a Sorsfonalakon".into(),
|
||||
greeting(name(payload, "display_name")),
|
||||
"Ezzel az e-mail-címmel regisztrációt kezdtek a Sorsfonalakon, de neked már van fiókod. Beléphetsz úgy, ahogy eddig (például Google-lel), vagy az alábbi gombbal jelszót adhatsz meg.".into(),
|
||||
"Jelszó megadása",
|
||||
url,
|
||||
"A link 1 óráig érvényes, és csak egyszer használható. Ha nem te voltál, hagyd figyelmen kívül ezt a levelet: a fiókod nem változik.",
|
||||
),
|
||||
("account_exists", Lang::En) => Content::simple(
|
||||
"You already have a Sorsfonalak account".into(),
|
||||
greeting(name(payload, "display_name")),
|
||||
"Someone started signing up for Sorsfonalak with this e-mail address, but you already have an account. Log in as before (e.g. with Google), or set a password with the button below.".into(),
|
||||
"Set password",
|
||||
url,
|
||||
"The link is valid for 1 hour and can be used once. If it was not you, ignore this e-mail: your account stays the same.",
|
||||
),
|
||||
("reset_password", Lang::Hu) => Content::simple(
|
||||
"Új jelszó megadása".into(),
|
||||
@@ -160,6 +176,7 @@ pub fn render(template: &str, locale: &str, payload: &Value) -> Result<Rendered,
|
||||
("invitation", _) => invitation(lang, payload, url)?,
|
||||
("synastry_invite", _) => synastry_invite(lang, payload, url)?,
|
||||
("waitlist_joined", _) => waitlist_joined(lang, payload, url)?,
|
||||
("purchase_confirmation", _) => purchase_confirmation(lang, payload, url)?,
|
||||
_ => return Err(TemplateError::UnknownTemplate(template.to_owned())),
|
||||
};
|
||||
Ok(content.render(lang))
|
||||
@@ -284,6 +301,69 @@ fn name(payload: &Value, field: &str) -> Option<String> {
|
||||
(!name.is_empty()).then(|| name.to_owned())
|
||||
}
|
||||
|
||||
/// The confirmation of a purchase: what was bought, and that the buyer asked
|
||||
/// for immediate delivery and so gave up the 14-day withdrawal right (the
|
||||
/// confirmation 45/2014. Korm. rendelet 29. § asks for).
|
||||
fn purchase_confirmation(lang: Lang, payload: &Value, url: String) -> Result<Content, TemplateError> {
|
||||
let package = name(payload, "package_name").ok_or(TemplateError::MissingField("package_name"))?;
|
||||
let amount = field(payload, "amount")?;
|
||||
let contents =
|
||||
payload["contents"].as_str().map(|c| c.chars().filter(|c| !c.is_control()).take(300).collect::<String>());
|
||||
let paid_on =
|
||||
payload["paid_on"].as_str().and_then(|d| date(lang, d)).ok_or(TemplateError::MissingField("paid_on"))?;
|
||||
let terms_url = field(payload, "terms_url")?;
|
||||
let invoices_url = field(payload, "invoices_url")?;
|
||||
let greeting = |hu: bool| match (hu, name(payload, "display_name")) {
|
||||
(true, Some(n)) => format!("Szia {n}!"),
|
||||
(true, None) => "Szia!".to_owned(),
|
||||
(false, Some(n)) => format!("Hi {n},"),
|
||||
(false, None) => "Hi,".to_owned(),
|
||||
};
|
||||
Ok(match lang {
|
||||
Lang::Hu => Content {
|
||||
subject: format!("Köszönjük a vásárlást: {package}"),
|
||||
preheader: Some(format!("A(z) {package} csomag a tiéd.")),
|
||||
greeting: greeting(true),
|
||||
intro: format!(
|
||||
"Megkaptuk a fizetésed ({amount}, {paid_on}), és jóváírtuk a(z) „{package}” csomagot.{}",
|
||||
contents.map(|c| format!(" Tartalma: {c}.")).unwrap_or_default()
|
||||
),
|
||||
quote: Some(
|
||||
"A fizetés előtt kérted a szolgáltatás azonnali megkezdését, és tudomásul vetted, hogy ezzel elveszíted a 14 napos elállási jogodat. A csomagot ennek megfelelően azonnal teljesítettük."
|
||||
.into(),
|
||||
),
|
||||
points: None,
|
||||
button: "Megnézem a csomagjaimat",
|
||||
url,
|
||||
note: format!(
|
||||
"A számlát külön e-mailben küldjük, és a Számláim oldalon is letöltheted: {invoices_url}. A vásárlás feltételei (ÁSZF): {terms_url}. Ha valami nem működik, írj nekünk az info@sorsfonalak.hu címre."
|
||||
),
|
||||
reason: Some("Ezt a levelet a vásárlásod visszaigazolásaként kaptad.".into()),
|
||||
unsubscribe: None,
|
||||
unsubscribe_post_url: None,
|
||||
},
|
||||
Lang::En => Content {
|
||||
subject: format!("Thank you for your purchase: {package}"),
|
||||
preheader: Some(format!("The {package} package is yours.")),
|
||||
greeting: greeting(false),
|
||||
intro: format!("We received your payment ({amount}, {paid_on}) and added the “{package}” package to your account."),
|
||||
quote: Some(
|
||||
"Before paying you asked us to start the service at once and acknowledged that you thereby lose your 14-day right of withdrawal. The package was delivered at once accordingly."
|
||||
.into(),
|
||||
),
|
||||
points: None,
|
||||
button: "See my packages",
|
||||
url,
|
||||
note: format!(
|
||||
"The invoice comes in a separate e-mail and can be downloaded on the Invoices page: {invoices_url}. Terms of purchase (ÁSZF): {terms_url}. If something does not work, write to info@sorsfonalak.hu."
|
||||
),
|
||||
reason: Some("You got this e-mail as the confirmation of your purchase.".into()),
|
||||
unsubscribe: None,
|
||||
unsubscribe_post_url: None,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
/// The confirmation of a waitlist sign-up, with the link that takes the address off the list.
|
||||
fn waitlist_joined(lang: Lang, payload: &Value, url: String) -> Result<Content, TemplateError> {
|
||||
let unsubscribe_url = field(payload, "unsubscribe_url")?;
|
||||
@@ -651,6 +731,24 @@ mod tests {
|
||||
assert_eq!(render("invitation", "hu", &broken), Err(TemplateError::MissingField("unsubscribe_url")));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn purchase_confirmations_confirm_the_waiver() {
|
||||
let payload = serde_json::json!({
|
||||
"url": "https://sorsfonalak.hu/csomagok", "display_name": "Anna", "package_name": "Páros",
|
||||
"contents": "2 részletes képletelemzés, 1 kapcsolati elemzés", "amount": "6\u{a0}000\u{a0}Ft",
|
||||
"paid_on": "2026-11-20", "terms_url": "https://sorsfonalak.hu/aszf", "invoices_url": "https://sorsfonalak.hu/szamlak"
|
||||
});
|
||||
let hu = render("purchase_confirmation", "hu", &payload).unwrap();
|
||||
assert_eq!(hu.subject, "Köszönjük a vásárlást: Páros");
|
||||
assert!(hu.text.contains("2026. november 20.") && hu.text.contains("Tartalma: 2 részletes képletelemzés"));
|
||||
assert!(hu.text.contains("elveszíted a 14 napos elállási jogodat"));
|
||||
assert!(hu.text.contains("https://sorsfonalak.hu/aszf") && hu.text.contains("https://sorsfonalak.hu/szamlak"));
|
||||
let en = render("purchase_confirmation", "en", &payload).unwrap();
|
||||
assert!(en.text.contains("right of withdrawal"));
|
||||
let missing = serde_json::json!({"url": "u", "package_name": "Páros"});
|
||||
assert_eq!(render("purchase_confirmation", "hu", &missing), Err(TemplateError::MissingField("amount")));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn dates() {
|
||||
assert_eq!(date(Lang::Hu, "2027-01-05").as_deref(), Some("2027. január 5."));
|
||||
|
||||
@@ -48,6 +48,27 @@ impl HoroscopeClient {
|
||||
self.post("/v1/forecast", request).await
|
||||
}
|
||||
|
||||
/// `GET /v1/countries`
|
||||
pub async fn countries(&self) -> Result<Value, HoroscopeError> {
|
||||
self.get("/v1/countries", &[]).await
|
||||
}
|
||||
|
||||
/// `GET /v1/places?country=&q=&limit=`
|
||||
pub async fn places(&self, country: &str, query: &str, limit: u32) -> Result<Value, HoroscopeError> {
|
||||
self.get("/v1/places", &[("country", country), ("q", query), ("limit", &limit.to_string())]).await
|
||||
}
|
||||
|
||||
async fn get(&self, path: &str, query: &[(&str, &str)]) -> Result<Value, HoroscopeError> {
|
||||
let response = self
|
||||
.http
|
||||
.get(format!("{}{path}", self.base_url))
|
||||
.query(query)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| HoroscopeError::Unavailable(e.to_string()))?;
|
||||
Self::answer(response).await
|
||||
}
|
||||
|
||||
async fn post(&self, path: &str, body: &Value) -> Result<Value, HoroscopeError> {
|
||||
let response = self
|
||||
.http
|
||||
@@ -56,6 +77,10 @@ impl HoroscopeClient {
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| HoroscopeError::Unavailable(e.to_string()))?;
|
||||
Self::answer(response).await
|
||||
}
|
||||
|
||||
async fn answer(response: reqwest::Response) -> Result<Value, HoroscopeError> {
|
||||
let status = response.status();
|
||||
let body: Value = response.json().await.map_err(|e| HoroscopeError::Unavailable(e.to_string()))?;
|
||||
if status.is_success() {
|
||||
|
||||
@@ -11,3 +11,6 @@ anyhow.workspace = true
|
||||
tokio.workspace = true
|
||||
tracing.workspace = true
|
||||
tracing-subscriber.workspace = true
|
||||
tracing-appender.workspace = true
|
||||
tower-http.workspace = true
|
||||
http = "1"
|
||||
|
||||
@@ -3,24 +3,215 @@
|
||||
//! Environment:
|
||||
//! * `BIND_ADDR` listen address (each service has its own default)
|
||||
//! * `LOG_FORMAT` `text` (default) or `json`; `RUST_LOG` sets the level
|
||||
//! * `LOG_DIR` also write the log there, as JSON, one file a UTC day
|
||||
//! (`<LOG_NAME>/<LOG_NAME>.YYYY-MM-DD.log`), keeping `LOG_KEEP_DAYS`
|
||||
//! (default 30) files of at most `LOG_MAX_DAY_MB` (default 50) each
|
||||
//! * `LOG_NAME` the folder and file name (default: the service's name)
|
||||
|
||||
use std::net::SocketAddr;
|
||||
use std::time::Duration;
|
||||
|
||||
use anyhow::Context;
|
||||
|
||||
/// Initializes `tracing` from `RUST_LOG` and `LOG_FORMAT`.
|
||||
pub fn init_logging() {
|
||||
use tracing_subscriber::EnvFilter;
|
||||
let filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info,tower_http=info"));
|
||||
let builder = tracing_subscriber::fmt().with_env_filter(filter);
|
||||
/// Days of log files kept in `LOG_DIR` by default.
|
||||
const LOG_KEEP_DAYS: usize = 30;
|
||||
/// At most this many megabytes of log a day per service by default.
|
||||
const LOG_MAX_DAY_MB: u64 = 50;
|
||||
|
||||
/// Keeps the background log writer alive: hold it until `main` returns, so
|
||||
/// the last lines reach the file.
|
||||
#[must_use = "the log files stop being written when this is dropped"]
|
||||
pub struct LogGuard(#[allow(dead_code)] Option<tracing_appender::non_blocking::WorkerGuard>);
|
||||
|
||||
/// Logging for a one-off command: the console only, never the log files.
|
||||
pub fn init_console_logging() {
|
||||
use tracing_subscriber::layer::SubscriberExt;
|
||||
use tracing_subscriber::util::SubscriberInitExt;
|
||||
tracing_subscriber::registry().with(env_filter()).with(console_layer()).init();
|
||||
}
|
||||
|
||||
fn env_filter() -> tracing_subscriber::EnvFilter {
|
||||
tracing_subscriber::EnvFilter::try_from_default_env()
|
||||
.unwrap_or_else(|_| tracing_subscriber::EnvFilter::new("info,tower_http=info"))
|
||||
}
|
||||
|
||||
fn console_layer<S>() -> Box<dyn tracing_subscriber::Layer<S> + Send + Sync>
|
||||
where
|
||||
S: tracing::Subscriber + for<'a> tracing_subscriber::registry::LookupSpan<'a>,
|
||||
{
|
||||
use tracing_subscriber::{Layer, fmt};
|
||||
if std::env::var("LOG_FORMAT").is_ok_and(|f| f.eq_ignore_ascii_case("json")) {
|
||||
builder.json().init();
|
||||
fmt::layer().json().boxed()
|
||||
} else {
|
||||
builder.init();
|
||||
fmt::layer().boxed()
|
||||
}
|
||||
}
|
||||
|
||||
/// A whole number from the environment; a value that is not one is reported.
|
||||
fn env_number<T: std::str::FromStr>(name: &str, default: T, problems: &mut Vec<String>) -> T {
|
||||
match std::env::var(name) {
|
||||
Ok(raw) if !raw.trim().is_empty() => raw.trim().parse().unwrap_or_else(|_| {
|
||||
problems.push(format!("{name}={raw} is not a whole number; using the default"));
|
||||
default
|
||||
}),
|
||||
_ => default,
|
||||
}
|
||||
}
|
||||
|
||||
/// Initializes `tracing` from `RUST_LOG` and `LOG_FORMAT`, and the log files
|
||||
/// in `LOG_DIR`, so the log outlives the container: each service writes its
|
||||
/// own folder `LOG_DIR/<name>/` (`<name>` = `LOG_NAME`, else `name`), one
|
||||
/// file a UTC day, keeping `LOG_KEEP_DAYS` files (at least 2), at most
|
||||
/// `LOG_MAX_DAY_MB` megabytes a day.
|
||||
pub fn init_logging(name: &str) -> LogGuard {
|
||||
use tracing_subscriber::layer::SubscriberExt;
|
||||
use tracing_subscriber::util::SubscriberInitExt;
|
||||
use tracing_subscriber::{Layer, fmt};
|
||||
|
||||
let mut problems = Vec::new();
|
||||
let mut guard = None;
|
||||
let file = std::env::var("LOG_DIR").ok().filter(|d| !d.trim().is_empty()).and_then(|dir| {
|
||||
let name = std::env::var("LOG_NAME").ok().filter(|n| !n.trim().is_empty()).unwrap_or_else(|| name.to_string());
|
||||
let keep: usize = env_number("LOG_KEEP_DAYS", LOG_KEEP_DAYS, &mut problems);
|
||||
if keep < 2 {
|
||||
problems.push(format!("LOG_KEEP_DAYS={keep} would delete today's file on a restart; keeping 2 days"));
|
||||
}
|
||||
let max_mb: u64 = env_number("LOG_MAX_DAY_MB", LOG_MAX_DAY_MB, &mut problems);
|
||||
// Its own folder: the old-file cleanup takes every file whose name
|
||||
// starts with the prefix ("worker" would take "worker-ai" files too).
|
||||
let folder = std::path::Path::new(&dir).join(&name);
|
||||
let appender = std::fs::create_dir_all(&folder).map_err(|e| e.to_string()).and_then(|()| {
|
||||
tracing_appender::rolling::Builder::new()
|
||||
.rotation(tracing_appender::rolling::Rotation::DAILY)
|
||||
.filename_prefix(&name)
|
||||
.filename_suffix("log")
|
||||
.max_log_files(keep.max(2))
|
||||
.build(&folder)
|
||||
.map_err(|e| e.to_string())
|
||||
});
|
||||
match appender {
|
||||
Ok(appender) => {
|
||||
let (writer, g) = tracing_appender::non_blocking(DailyCap::new(appender, max_mb.max(1) * 1024 * 1024));
|
||||
guard = Some(g);
|
||||
Some(fmt::layer().json().with_ansi(false).with_writer(writer).boxed())
|
||||
}
|
||||
Err(e) => {
|
||||
problems
|
||||
.push(format!("cannot write the log files in {}: {e}; logging to stdout only", folder.display()));
|
||||
None
|
||||
}
|
||||
}
|
||||
});
|
||||
tracing_subscriber::registry().with(env_filter()).with(console_layer()).with(file).init();
|
||||
for problem in problems {
|
||||
tracing::warn!("{problem}");
|
||||
}
|
||||
LogGuard(guard)
|
||||
}
|
||||
|
||||
/// A daily size limit in front of the log file: past `limit` bytes in a UTC
|
||||
/// day the rest of that day's lines are dropped (after one note saying so),
|
||||
/// so a log storm cannot fill the disk.
|
||||
struct DailyCap<W> {
|
||||
inner: W,
|
||||
limit: u64,
|
||||
day: u64,
|
||||
written: u64,
|
||||
}
|
||||
|
||||
impl<W> DailyCap<W> {
|
||||
fn new(inner: W, limit: u64) -> Self {
|
||||
Self { inner, limit, day: utc_day(), written: 0 }
|
||||
}
|
||||
}
|
||||
|
||||
fn utc_day() -> u64 {
|
||||
std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).map_or(0, |d| d.as_secs() / 86_400)
|
||||
}
|
||||
|
||||
impl<W: std::io::Write> std::io::Write for DailyCap<W> {
|
||||
fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
|
||||
let today = utc_day();
|
||||
if today != self.day {
|
||||
self.day = today;
|
||||
self.written = 0;
|
||||
}
|
||||
if self.written >= self.limit {
|
||||
return Ok(buf.len());
|
||||
}
|
||||
self.written += buf.len() as u64;
|
||||
if self.written >= self.limit {
|
||||
let note = format!(
|
||||
"{{\"level\":\"WARN\",\"fields\":{{\"message\":\"daily log limit of {} MB reached; the rest of today is only on stdout\"}}}}\n",
|
||||
self.limit / 1024 / 1024
|
||||
);
|
||||
self.inner.write_all(buf)?;
|
||||
self.inner.write_all(note.as_bytes())?;
|
||||
return Ok(buf.len());
|
||||
}
|
||||
self.inner.write(buf)
|
||||
}
|
||||
|
||||
fn flush(&mut self) -> std::io::Result<()> {
|
||||
self.inner.flush()
|
||||
}
|
||||
}
|
||||
|
||||
/// The request log of an HTTP service (`TraceLayer::make_span_with` and
|
||||
/// `on_response`): the Docker health check stays out of it unless it fails,
|
||||
/// and e-mail addresses and tokens in the path are masked (the log is kept).
|
||||
#[derive(Debug, Clone, Copy, Default)]
|
||||
pub struct RequestLog;
|
||||
|
||||
impl<B> tower_http::trace::MakeSpan<B> for RequestLog {
|
||||
fn make_span(&mut self, request: &http::Request<B>) -> tracing::Span {
|
||||
let path = request.uri().path();
|
||||
if path == "/healthz" {
|
||||
return tracing::Span::none();
|
||||
}
|
||||
tracing::info_span!("request", method = %request.method(), path = %masked_path(path))
|
||||
}
|
||||
}
|
||||
|
||||
impl<B> tower_http::trace::OnResponse<B> for RequestLog {
|
||||
fn on_response(self, response: &http::Response<B>, latency: Duration, span: &tracing::Span) {
|
||||
// A health check (no span) that went well is not logged.
|
||||
if span.is_none() && response.status().is_success() {
|
||||
return;
|
||||
}
|
||||
let ms = latency.as_millis() as u64;
|
||||
let status = response.status().as_u16();
|
||||
if span.is_none() {
|
||||
tracing::warn!(path = "/healthz", status, latency_ms = ms, "health check failed");
|
||||
} else {
|
||||
tracing::info!(status, latency_ms = ms, "finished processing request");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The path with secrets masked: a segment holding an e-mail address, and a
|
||||
/// long one that is not a UUID (share slugs, invitation tokens). Queries are
|
||||
/// never logged.
|
||||
pub fn masked_path(path: &str) -> String {
|
||||
let uuid = |s: &str| {
|
||||
s.len() == 36
|
||||
&& s.char_indices()
|
||||
.all(|(i, c)| if [8, 13, 18, 23].contains(&i) { c == '-' } else { c.is_ascii_hexdigit() })
|
||||
};
|
||||
path.split('/')
|
||||
.map(|segment| {
|
||||
if segment.contains('@') || segment.contains("%40") {
|
||||
":email"
|
||||
} else if segment.len() >= 12 && !uuid(segment) {
|
||||
":token"
|
||||
} else {
|
||||
segment
|
||||
}
|
||||
})
|
||||
.collect::<Vec<_>>()
|
||||
.join("/")
|
||||
}
|
||||
|
||||
/// Listen address from `BIND_ADDR`, or `default`.
|
||||
pub fn bind_addr(default: &str) -> anyhow::Result<SocketAddr> {
|
||||
let raw = std::env::var("BIND_ADDR").unwrap_or_else(|_| default.into());
|
||||
@@ -62,3 +253,34 @@ pub async fn shutdown_signal() {
|
||||
}
|
||||
tracing::info!("shutting down");
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::io::Write;
|
||||
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn secrets_in_paths_are_masked() {
|
||||
assert_eq!(masked_path("/v1/admin/waitlist/anna%40example.com"), "/v1/admin/waitlist/:email");
|
||||
assert_eq!(masked_path("/v1/public/shares/Ab3dEf6hIj9kLm2n/visit"), "/v1/public/shares/:token/visit");
|
||||
assert_eq!(masked_path("/v1/public/invites/k3jh4k5j6h7k8j9h0k1j2h3k"), "/v1/public/invites/:token");
|
||||
let id = "01a1f960-96cb-765f-899a-4d76b45b236e";
|
||||
assert_eq!(masked_path(&format!("/v1/tarot/readings/{id}")), format!("/v1/tarot/readings/{id}"));
|
||||
assert_eq!(masked_path("/v1/admin/prompts/forecast/hu"), "/v1/admin/prompts/forecast/hu");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_daily_cap_drops_the_rest_of_the_day() {
|
||||
let mut cap = DailyCap::new(Vec::new(), 10);
|
||||
cap.write_all(b"12345\n").unwrap();
|
||||
cap.write_all(b"67890\n").unwrap();
|
||||
cap.write_all(b"dropped\n").unwrap();
|
||||
let text = String::from_utf8(cap.inner.clone()).unwrap();
|
||||
assert!(text.starts_with("12345\n67890\n") && text.contains("daily log limit") && !text.contains("dropped"));
|
||||
// A new day starts again.
|
||||
cap.day -= 1;
|
||||
cap.write_all(b"next\n").unwrap();
|
||||
assert!(String::from_utf8(cap.inner).unwrap().ends_with("next\n"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,3 +24,11 @@ TAG=latest
|
||||
# worker-ai: analyses and answers written at the same time.
|
||||
# QUICK_CONCURRENCY=2 # summaries and answers
|
||||
# ANALYSIS_CONCURRENCY=4 # detailed analyses and forecasts
|
||||
|
||||
# Beszel monitoring agent (deploy/README.md): the hub's public key.
|
||||
# COMPOSE_PROFILES=monitoring
|
||||
# BESZEL_KEY=ssh-ed25519 AAAA...
|
||||
|
||||
# Purchase notices to Telegram (worker notify task); the bot token
|
||||
# (TELEGRAM_BOT_TOKEN) goes to .env.secrets.
|
||||
# TELEGRAM_CHAT_ID=123456789
|
||||
|
||||
+7
-2
@@ -4,7 +4,8 @@
|
||||
{
|
||||
servers {
|
||||
# Cloudflare ranges (https://www.cloudflare.com/ips): the visitor's
|
||||
# address is taken from CF-Connecting-IP and passed on in X-Forwarded-For.
|
||||
# address ({client_ip}) is taken from CF-Connecting-IP, only when the
|
||||
# request comes from Cloudflare.
|
||||
trusted_proxies static 173.245.48.0/20 103.21.244.0/22 103.22.200.0/22 103.31.4.0/22 141.101.64.0/18 108.162.192.0/18 190.93.240.0/20 188.114.96.0/20 197.234.240.0/22 198.41.128.0/17 162.158.0.0/15 104.16.0.0/13 104.24.0.0/14 172.64.0.0/13 131.0.72.0/22 2400:cb00::/32 2606:4700::/32 2803:f800::/32 2405:b500::/32 2405:8100::/32 2a06:98c0::/29 2c0f:f248::/32
|
||||
client_ip_headers CF-Connecting-IP
|
||||
}
|
||||
@@ -14,7 +15,11 @@
|
||||
# No basic auth any more: the site is open, and new accounts need an
|
||||
# invitation (SIGNUP_MODE=invite in the backend).
|
||||
encode zstd gzip
|
||||
reverse_proxy frontend:3000
|
||||
reverse_proxy frontend:3000 {
|
||||
# The address the backend trusts (rate limits, share visits); it
|
||||
# overwrites whatever the browser sent in this header.
|
||||
header_up X-Real-IP {client_ip}
|
||||
}
|
||||
}
|
||||
|
||||
www.{$DOMAIN} {
|
||||
|
||||
+25
-6
@@ -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-<szolgáltatás>` 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-<szolgáltatás>` 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>-<hash>` taget és Gitea-release-t az előző release óta bekerült commitok listájával (repó → Releases).
|
||||
|
||||
@@ -68,7 +70,7 @@ A Docker által kinyitott portokat az ufw magától nem szűri, ezért a 80-as
|
||||
`deploy` felhasználóként, a `/opt/sorsfonalak` mappában:
|
||||
|
||||
- `.env`: az itteni `.env.example` kitöltve.
|
||||
- `.env.secrets`: `OPENROUTER_API_KEY=...`.
|
||||
- `.env.secrets`: `OPENROUTER_API_KEY=...`, a levélküldés adatai, és ha van, `STRIPE_SECRET_KEY` / `STRIPE_WEBHOOK_SECRET` és `BILLINGO_API_KEY` (`docs/fizetes.md`).
|
||||
- `docker login registry.sagifer.com` egy `read:package` jogú tokennel. Amíg a `sagifer` fiók nyilvános, erre nincs szükség.
|
||||
|
||||
### Cloudflare (sorsfonalak.hu)
|
||||
@@ -77,13 +79,30 @@ A Docker által kinyitott portokat az ufw magától nem szűri, ezért a 80-as
|
||||
- SSL/TLS mód: **Full (strict)**.
|
||||
- **Always Use HTTPS: ki.** A Let's Encrypt a Cloudflare-en át, sima HTTP-n ellenőrzi a domaint, a tanúsítvány megújításakor is. A HTTP→HTTPS átirányítást a Caddy maga végzi.
|
||||
- A Caddy a Cloudflare címtartományaiban megbízik, ezért a naplókban és a backendnél a látogató valódi IP-címe látszik (`CF-Connecting-IP`).
|
||||
- AI-robotok: Security → Settings → Bot traffic → *AI Crawler and Agent access policies*: **Training: Block**, **Search: Allow**, **Agents: Allow** (a részletek: `docs/megosztas.md`, Robotok). Bot Fight Mode: ki, mert a link-előnézeteket is elrontja.
|
||||
|
||||
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: `docker compose logs -f backend worker worker-ai`
|
||||
- Naplók élőben: `docker compose logs -f backend worker worker-ai` (ez a konténer újraindításáig/cseréjéig él).
|
||||
- Naplók utólag: a backend és a két worker JSON-sorokat ír a `logs` volume-ba is, szolgáltatásonként külön mappába, UTC-nap szerint új fájlba (`backend/backend.2026-11-20.log`, `worker/…`, `worker-ai/…`; a nap magyar idő szerint hajnali 1-2 órakor fordul). 30 napig maradnak meg, naponta legfeljebb 50 MB (`LOG_KEEP_DAYS`, `LOG_MAX_DAY_MB`, `LOG_DIR`, `LOG_NAME`); a kérések útvonalában az e-mail-címek és a tokenek maszkolva vannak. A fájlok helye: `docker volume inspect -f '{{.Mountpoint}}' sorsfonalak_logs`, például `grep -h '"level":"ERROR"' /var/lib/docker/volumes/sorsfonalak_logs/_data/backend/*.log | tail`. A Docker 30 másodpercenkénti `/healthz` ellenőrzése csak akkor kerül a naplóba, ha hibás.
|
||||
- Deploy és futó feladatok: leállításkor a worker nem vesz fel újat, a futókat befejezi (`SHUTDOWN_DRAIN_SECS`: `worker` 40 s, `worker-ai` 270 s, `stop_grace_period` 1, illetve 5 perc); ami addig nem készül el, visszakerül a sorba, a próbálkozás nem számít. Ha éppen elemzés készül, a deploy ennyivel tovább tarthat.
|
||||
- A worker két konténerben fut, ugyanabból az image-ből: a `worker` küldi az e-maileket és takarít (`WORKER_TASKS=email,cleanup`, ide kerülnek a további háttérfeladatok is), a `worker-ai` írja az elemzéseket és a válaszokat (`WORKER_TASKS=analyses`, gyors és lassú sáv). A sávok mérete a szerver `.env` fájljában állítható (`QUICK_CONCURRENCY`, `ANALYSIS_CONCURRENCY`).
|
||||
- Visszaállás korábbi verzióra: `.env`-ben `TAG=<régebbi hash>`, utána `docker compose up -d`
|
||||
- Mentés: naponta egy `pg_dump` a `/opt/sorsfonalak/backups` mappába, 14 napig megmarad. A mentéseket érdemes a szerverről is elvinni (DigitalOcean backup, vagy `rsync` otthonra).
|
||||
- Mentés: naponta egy `pg_dump` a `/opt/sorsfonalak/backups` mappába, 14 napig megmarad. Az otthoni TrueNAS naponta lehúzza (Rsync Task, Pull, SSH) a `nasbackup` felhasználóval, aki csak ezt a mappát olvashatja (`authorized_keys`: `command="/usr/bin/rrsync -ro /opt/sorsfonalak/backups",restrict`); a NAS-on a régi mentések is megmaradnak.
|
||||
- Vásárlási értesítő: a `worker` `notify` feladata minden kifizetett vásárlásról egyszer szól Telegramon („🛒 Vásárlás: Páros csomag, 6 000 Ft”, a vevő adatai nélkül), a számlázástól függetlenül. Beállítás: `TELEGRAM_BOT_TOKEN` a `.env.secrets`-ben, `TELEGRAM_CHAT_ID` a `.env`-ben; ha bármelyik hiányzik, nincs értesítés.
|
||||
- Monitorozás: a `beszel-agent` (Beszel, CPU/memória/lemez/konténerek) a NAS-on futó Beszel hubnak ad adatot, Tailscale-en át. Csak a szerver Tailscale-címén figyel (`100.69.226.118:45876`), az internet felé nem nyit portot; a hub kapcsolódik hozzá. Bekapcsolás a `.env`-ben: `COMPOSE_PROFILES=monitoring` és `BESZEL_KEY=<a hub nyilvános kulcsa>`, utána `docker compose up -d beszel-agent`. A hubban a rendszer címe `100.69.226.118`, port `45876`.
|
||||
- Visszatöltés: `gunzip -c backups/sorsfonalak-<dátum>.sql.gz | docker compose exec -T postgres psql -U sorsfonalak sorsfonalak`
|
||||
|
||||
@@ -81,13 +81,23 @@ services:
|
||||
HOROSCOPE_API_URL: http://horoscope-api:8080
|
||||
PUBLIC_BASE_URL: https://${DOMAIN}
|
||||
GOOGLE_CLIENT_IDS: ${GOOGLE_CLIENT_IDS:-}
|
||||
# Sign in with Apple: the Services ID (e.g. hu.sorsfonalak.web); empty: off.
|
||||
APPLE_CLIENT_IDS: ${APPLE_CLIENT_IDS:-}
|
||||
BOOTSTRAP_ADMIN_EMAILS: ${BOOTSTRAP_ADMIN_EMAILS:-}
|
||||
ANALYSIS_MODEL: ${ANALYSIS_MODEL:-}
|
||||
SUMMARY_MODEL: ${SUMMARY_MODEL:-}
|
||||
PASSWORD_LOGIN: ${PASSWORD_LOGIN:-false}
|
||||
# Purchases are off until real payments are connected; packages come
|
||||
# from promo codes and admins (MOCK_PAYMENTS=true: pretend purchases).
|
||||
# Without the Stripe keys purchases are off; packages come from promo
|
||||
# codes and admins (MOCK_PAYMENTS=true: pretend purchases).
|
||||
MOCK_PAYMENTS: ${MOCK_PAYMENTS:-false}
|
||||
# Stripe purchases for everyone (false: admins only, until the opening;
|
||||
# with a test key always admins only).
|
||||
PURCHASES_OPEN: ${PURCHASES_OPEN:-false}
|
||||
# Buyers accept the ÁSZF on Stripe's page (needs the terms URL in
|
||||
# Stripe's Public details): off until the opening.
|
||||
TERMS_CONSENT: ${TERMS_CONSENT:-false}
|
||||
# VAT on the invoices: AAM (alanyi adómentes) or a rate like 27%.
|
||||
INVOICE_VAT: ${INVOICE_VAT:-AAM}
|
||||
# Users inviting others ("Meghívom"): shown but off until the launch.
|
||||
USER_INVITES: ${USER_INVITES:-false}
|
||||
# A new user from a shared link earns the sharer an analysis: off until sign-up opens.
|
||||
@@ -95,12 +105,27 @@ 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
|
||||
# STRIPE_SECRET_KEY and STRIPE_WEBHOOK_SECRET (docs/fizetes.md): with them
|
||||
# packages can be bought (a test key: by admins only).
|
||||
env_file:
|
||||
- path: .env.secrets
|
||||
required: false
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
horoscope-api:
|
||||
condition: service_healthy
|
||||
read_only: true
|
||||
volumes:
|
||||
- logs:/logs
|
||||
logging: *logging
|
||||
restart: unless-stopped
|
||||
|
||||
@@ -109,12 +134,17 @@ services:
|
||||
image: ${REGISTRY_PREFIX:-registry.sagifer.com/sagifer/sorsfonalak}-worker:${TAG:-latest}
|
||||
environment:
|
||||
DATABASE_URL: postgres://sorsfonalak:${POSTGRES_PASSWORD}@postgres:5432/sorsfonalak
|
||||
WORKER_TASKS: email,cleanup
|
||||
WORKER_TASKS: email,cleanup,invoices,notify
|
||||
# Purchase notices to Telegram; the bot token (TELEGRAM_BOT_TOKEN) is in .env.secrets.
|
||||
TELEGRAM_CHAT_ID: ${TELEGRAM_CHAT_ID:-}
|
||||
# SMTP_URL or the SES credentials come from .env.secrets (docs/levelkuldes.md);
|
||||
# listing them here with an empty default would override that file.
|
||||
SES_REGION: ${SES_REGION:-eu-central-1}
|
||||
MAIL_FROM: ${MAIL_FROM:-Sorsfonalak <hello@sorsfonalak.hu>}
|
||||
MAIL_FROM: ${MAIL_FROM:-Sorsfonalak <noreply@sorsfonalak.hu>}
|
||||
PUBLIC_BASE_URL: https://${DOMAIN}
|
||||
LOG_DIR: /logs
|
||||
# On a deploy the e-mails and invoices being sent finish first.
|
||||
SHUTDOWN_DRAIN_SECS: 40
|
||||
env_file:
|
||||
- path: .env.secrets
|
||||
required: false
|
||||
@@ -122,6 +152,9 @@ services:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
read_only: true
|
||||
volumes:
|
||||
- logs:/logs
|
||||
stop_grace_period: 1m
|
||||
logging: *logging
|
||||
restart: unless-stopped
|
||||
|
||||
@@ -135,6 +168,11 @@ services:
|
||||
QUICK_CONCURRENCY: ${QUICK_CONCURRENCY:-2}
|
||||
ANALYSIS_CONCURRENCY: ${ANALYSIS_CONCURRENCY:-4}
|
||||
PUBLIC_BASE_URL: https://${DOMAIN}
|
||||
LOG_DIR: /logs
|
||||
LOG_NAME: worker-ai
|
||||
# On a deploy the analyses being written finish first (a detailed one
|
||||
# takes a few minutes); what is not done by then goes back to the queue.
|
||||
SHUTDOWN_DRAIN_SECS: 270
|
||||
env_file:
|
||||
- path: .env.secrets
|
||||
required: false
|
||||
@@ -142,6 +180,9 @@ services:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
read_only: true
|
||||
volumes:
|
||||
- logs:/logs
|
||||
stop_grace_period: 5m
|
||||
logging: *logging
|
||||
restart: unless-stopped
|
||||
|
||||
@@ -162,7 +203,27 @@ services:
|
||||
logging: *logging
|
||||
restart: unless-stopped
|
||||
|
||||
# Beszel agent: CPU, memory, disk, network and per-container stats for the
|
||||
# Beszel hub on the home NAS. Off unless COMPOSE_PROFILES=monitoring and
|
||||
# BESZEL_KEY (the hub's public key) are in .env. It listens only on the
|
||||
# server's Tailscale address, so nothing is opened to the internet.
|
||||
beszel-agent:
|
||||
image: henrygd/beszel-agent:0.21.2
|
||||
profiles: [monitoring]
|
||||
network_mode: host
|
||||
environment:
|
||||
KEY: ${BESZEL_KEY:-}
|
||||
LISTEN: ${BESZEL_LISTEN:-100.69.226.118:45876}
|
||||
volumes:
|
||||
- beszel-agent:/var/lib/beszel-agent
|
||||
- /var/run/docker.sock:/var/run/docker.sock:ro
|
||||
logging: *logging
|
||||
restart: unless-stopped
|
||||
|
||||
volumes:
|
||||
pgdata:
|
||||
# Backend and worker logs (backend.YYYY-MM-DD.log, worker…, worker-ai…).
|
||||
logs:
|
||||
caddy-data:
|
||||
caddy-config:
|
||||
beszel-agent:
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
#
|
||||
# Mailpit catches every e-mail the worker sends; nothing leaves the machine.
|
||||
# Web UI: http://<server>: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:
|
||||
|
||||
@@ -46,6 +46,7 @@ services:
|
||||
# Plain HTTP in development; leave the default (true) in production.
|
||||
COOKIE_SECURE: ${COOKIE_SECURE:-false}
|
||||
GOOGLE_CLIENT_IDS: ${GOOGLE_CLIENT_IDS:-}
|
||||
APPLE_CLIENT_IDS: ${APPLE_CLIENT_IDS:-}
|
||||
BOOTSTRAP_ADMIN_EMAILS: ${BOOTSTRAP_ADMIN_EMAILS:-}
|
||||
# Paid detailed analyses (empty: anthropic/claude-opus-5.5).
|
||||
ANALYSIS_MODEL: ${ANALYSIS_MODEL:-}
|
||||
@@ -55,9 +56,26 @@ services:
|
||||
PASSWORD_LOGIN: ${PASSWORD_LOGIN:-false}
|
||||
# Stand-in payment (adds an analysis unit at once) until Stripe is connected.
|
||||
MOCK_PAYMENTS: ${MOCK_PAYMENTS:-true}
|
||||
# Stripe purchases for everyone (false: admins only, until the opening;
|
||||
# with a test key always admins only).
|
||||
PURCHASES_OPEN: ${PURCHASES_OPEN:-false}
|
||||
TERMS_CONSENT: ${TERMS_CONSENT:-false}
|
||||
# VAT on the invoices: AAM (alanyi adómentes) or a rate like 27%.
|
||||
INVOICE_VAT: ${INVOICE_VAT:-AAM}
|
||||
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:
|
||||
- path: .env.secrets
|
||||
required: false
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
@@ -78,6 +96,8 @@ services:
|
||||
SMTP_URL: ${SMTP_URL:-}
|
||||
MAIL_FROM: ${MAIL_FROM:-Sorsfonalak <noreply@sorsfonalak.local>}
|
||||
PUBLIC_BASE_URL: ${PUBLIC_BASE_URL:-http://localhost:3001}
|
||||
# Purchase notices to Telegram (TELEGRAM_BOT_TOKEN in .env.secrets).
|
||||
TELEGRAM_CHAT_ID: ${TELEGRAM_CHAT_ID:-}
|
||||
# OPENROUTER_API_KEY (not in git); without it analyses stay pending.
|
||||
env_file:
|
||||
- path: .env.secrets
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
# Arculat
|
||||
|
||||
- `sorsfonalak-ikon-512.png`: négyzetes ikon (512×512, sötét háttér, teljes kitöltés).
|
||||
- `sorsfonalak-logo-sotet-hatterre.png`: logó átlátszó háttérrel, sötét felületre (1200×300).
|
||||
- `sorsfonalak-logo-vilagos-hatterre.png`: ugyanez világos felületre.
|
||||
|
||||
A jel forrása: `services/frontend/src/app/icon.svg`.
|
||||
|
||||
## Színek
|
||||
|
||||
| Szerep | Szín |
|
||||
|---|---|
|
||||
| Háttér | `#0d1220` |
|
||||
| Panel | `#111729` |
|
||||
| Arany (kiemelés, gombok) | `#d9b46a` |
|
||||
| Arany, világos háttéren | `#a7802f` |
|
||||
| Szöveg sötét háttéren | `#ece6d8` |
|
||||
| Szöveg világos háttéren | `#1b2236` |
|
||||
| Gomb felirata arany gombon | `#141a2c` |
|
||||
|
||||
Stripe (Settings → Branding): Brand color `#0d1220`, Accent color `#d9b46a`, ikon és a sötét háttérre szánt logó.
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 18 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
+8
-6
@@ -4,24 +4,27 @@ A katalógus a kódban van: `services/backend/src/packages.rs` (`CATALOG`). Ár-
|
||||
|
||||
## Költség
|
||||
|
||||
Egy részletes képletelemzés és egy kapcsolati elemzés is kb. **$0,21 (≈ 80 Ft)** Opus 5.5-tel, az éves előrejelzés a hosszabb adatsor miatt valamivel több; a rövid összefoglaló kb. $0,01. A fizetési szolgáltató díja kb. 1,5% + 85 Ft tranzakciónként. Az árak bruttók (27% áfa).
|
||||
Egy részletes képletelemzés és egy kapcsolati elemzés is kb. **$0,21 (≈ 80 Ft)** Opus 5.5-tel, az éves előrejelzés a hosszabb adatsor miatt valamivel több; a rövid összefoglaló kb. $0,01. A fizetési szolgáltató díja kb. 1,5% + 85 Ft tranzakciónként. Az árak végső árak: alanyi adómentesek vagyunk (`INVOICE_VAT=AAM`), áfát nem számítunk fel; ha átlépjük az alanyi adómentesség határát, `INVOICE_VAT=27%`, és az árak bruttóként értendők.
|
||||
|
||||
## A lépcső
|
||||
|
||||
| Csomag | Tartalom | Ár | Elemzésenként | Külön megvéve | Megtakarítás |
|
||||
|---|---|---|---|---|---|
|
||||
| Egy elemzés | 1 képletelemzés, 3 kérdés | 2 000 Ft | 2 000 Ft | – | – |
|
||||
| Páros | 2 képletelemzés, 2 éves előrejelzés, 1 kapcsolati, 1 személy, 3 kérdés | 6 000 Ft | 1 200 Ft | 11 800 Ft | 49% |
|
||||
| **Család** (Legnépszerűbb) | 6 képletelemzés, 6 éves előrejelzés, 5 kapcsolati, 5 személy, 3 kérdés | 11 000 Ft | 647 Ft | 41 000 Ft | 73% |
|
||||
| Egy elemzés | 1 képletelemzés, 3 kérdés, 2 kártyajóslás | 2 000 Ft | 2 000 Ft | – | – |
|
||||
| Páros | 2 képletelemzés, 2 éves előrejelzés, 1 kapcsolati, 1 személy, 3 kérdés, 5 kártyajóslás | 6 000 Ft | 1 200 Ft | 11 800 Ft | 49% |
|
||||
| **Család** (Legnépszerűbb) | 6 képletelemzés, 6 éves előrejelzés, 5 kapcsolati, 5 személy, 3 kérdés, 10 kártyajóslás | 11 000 Ft | 647 Ft | 41 000 Ft | 73% |
|
||||
| +1 kapcsolati elemzés | kiegészítő | 2 500 Ft | | | |
|
||||
| +1 éves előrejelzés | kiegészítő | 2 500 Ft | | | |
|
||||
| +5 személy | kiegészítő | 1 500 Ft | | | |
|
||||
| +5 kérdés | kiegészítő | 1 000 Ft | | | |
|
||||
| +5 kártyajóslás | kiegészítő | 1 000 Ft | | | |
|
||||
|
||||
A „külön megvéve” ár egységárakból jön: képletelemzés 2 000 Ft, kapcsolati elemzés 2 500 Ft, éves előrejelzés 2 500 Ft, személy 300 Ft (`NATAL_PRICE`, `SYNASTRY_PRICE`, `FORECAST_PRICE`, `PERSON_PRICE`).
|
||||
|
||||
A kérdések (2026 novembere óta) minden csomagban ráadásként járnak (`QUESTIONS_INCLUDED` = 3), a „külön megvéve” árban és a megtakarításban nem szerepelnek. Egy kérdés a kész képletelemzésre vagy éves előrejelzésre vonatkozik, a választ ugyanaz a modell írja, amelyik az elemzést (legfeljebb 250 szó); költsége kb. $0,04–0,07 (15–25 Ft). Részletek: `docs/kerdesek.md`.
|
||||
|
||||
A kártyajóslások (2026 novembere óta) szintén ráadásként járnak (Egy elemzés 2, Páros 5, Család 10), a megtakarításban nem szerepelnek. Részletek: `docs/kartyajoslas.md`.
|
||||
|
||||
Az éves előrejelzés (2026 novembere óta) a Páros és a Család csomagban mindenkinek benne van; külön megvéve drágább, mint egy képletelemzés. Az Egy elemzés csomag változatlanul egy képletelemzés 2 000 Ft-ért. Részletek: `docs/elorejelzes.md`.
|
||||
|
||||
## Miért így (a nagyobb felé terelés)
|
||||
@@ -39,7 +42,6 @@ Az éves előrejelzés (2026 novembere óta) a Páros és a Család csomagban mi
|
||||
|
||||
## Későbbre
|
||||
|
||||
- Stripe-bekötés: a `package_orders.source = 'stripe'` már helyet kapott.
|
||||
- Bevezető kedvezmény vagy kupon (pl. az első 100 vásárlónak).
|
||||
- Ajándékba adható csomag (karácsony, Valentin-nap): a Páros és a Család jó ajándék.
|
||||
- Számlázás (NAV Online Számla) a vásárlásokhoz.
|
||||
- Számlázás (NAV Online Számla) a vásárlásokhoz. A fizetés a Stripe-on megy: [fizetes.md](fizetes.md).
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
# Fizetés (Stripe)
|
||||
|
||||
A csomagokat a Stripe Checkout fizetési oldalán lehet megvenni. A csomagok neve, tartalma és ára a `services/backend/src/packages.rs`-ben van; minden fizetés ezekkel indul, a Stripe-ban nem kell termékeket felvenni.
|
||||
|
||||
## Menete
|
||||
|
||||
1. A „Megveszem” gomb a `POST /v1/payments/checkout` végpontot hívja (`package`, `return_path`: az oldal, ahonnan indult).
|
||||
2. A backend létrehoz egy Checkout Sessiont (bruttó ár forintban, a csomag neve, a felhasználó e-mail-címe, kötelező számlázási cím), elmenti a `stripe_checkouts` táblába, és visszaadja a fizetési oldal címét.
|
||||
3. Fizetés után a Stripe visszaküld ugyanarra az oldalra `?fizetes=<session id>` paraméterrel (megszakításkor `?fizetes=megszakitva`). A `PaymentReturn` komponens a `GET /v1/payments/checkout/{id}` végpontot kérdezi, amíg a fizetés be nem igazolódik.
|
||||
4. A csomagot a backend akkor adja meg, amikor a Stripe igazolja a fizetést:
|
||||
- a webhook (`POST /api/v1/payments/stripe/webhook`, aláírással ellenőrizve), vagy
|
||||
- ha a webhook még nem jött meg (vagy helyben nincs beállítva), a visszatérő oldal kérdésére a backend maga kérdezi meg a Stripe-ot.
|
||||
|
||||
A session id miatt egy fizetés csak egyszer ír jóvá (`package_orders.source = 'stripe'`).
|
||||
|
||||
## ÁSZF és elállási jog
|
||||
|
||||
**A megnyitásig ki van kapcsolva** (`TERMS_CONSENT=false`, az alapértelmezés): a Stripe nem kéri az elfogadást, a csomagkártyák nem írnak az elállási jogról, és visszaigazoló e-mail sem megy. Bekapcsolva (`TERMS_CONSENT=true` a `.env`-ben, a backend újraindításával) minden vásárlásnál a Stripe fizetési oldalán kötelező bepipálni: „Elfogadom az ÁSZF-et, kérem a szolgáltatás azonnali megkezdését, és tudomásul veszem, hogy ezzel elveszítem a 14 napos elállási jogomat.” (`consent_collection[terms_of_service]=required` és `custom_text[terms_of_service_acceptance]`). Digitális tartalomnál így szűnik meg az elállási jog (45/2014. Korm. rendelet 29. §). Ehhez **a Stripe felületén meg kell adni az ÁSZF címét** (Settings → Business → Public details → Terms of service: `https://sorsfonalak.hu/aszf`), különben a Stripe nem indítja el a fizetést.
|
||||
|
||||
Az elfogadás idejét és az ÁSZF változatát (`TERMS_VERSION`, a frontend `TERMS_UPDATED`-jével együtt kell léptetni) a `stripe_checkouts` sor őrzi (`terms_accepted_at`, `terms_version`). Elfogadott ÁSZF esetén fizetés után a backend visszaigazoló e-mailt küld (`purchase_confirmation`): a csomag, az összeg, a dátum és a lemondás az elállási jogról; ez a rendelet szerinti visszaigazolás.
|
||||
|
||||
Az ÁSZF az `/aszf` oldalon van (`services/frontend/src/app/aszf/page.tsx`); a céges adatok a `lib/legal.ts`-ből jönnek. Megnyitás előtt jogásszal át kell nézetni.
|
||||
|
||||
## Mit tárolunk
|
||||
|
||||
Bankkártyaadatot soha: a vásárló a Stripe oldalán adja meg, hozzánk nem jut el. A `stripe_checkouts` sorban a fizetés igazolásakor eltároljuk:
|
||||
|
||||
- a Stripe fizetés azonosítóját (`payment_intent`) és a ténylegesen fizetett összeget (`amount_huf`; ha eltér az ártól, hibát naplózunk),
|
||||
- a vevő számlázási adatait (`customer`: a Stripe `customer_details` objektuma: név, e-mail, cím, céges vásárlásnál `business_name` és `tax_ids`, pl. `hu_tin` / `eu_vat`).
|
||||
|
||||
A fizetési oldal kötelezően bekéri a számlázási címet, és felkínálja a céges vásárlást (cégnév, adószám; `tax_id_collection`).
|
||||
|
||||
A sorok a fiók törlése után is megmaradnak (`user_id` → NULL), mert a számviteli törvény 8 évig megőrzést ír elő; ilyenkor csomag már nem jár, de a számla elkészül.
|
||||
|
||||
## Számla
|
||||
|
||||
Fizetéskor a backend egy `invoices` sort is létrehoz a számla minden adatával: a vevő (név, e-mail, ország, irányítószám, város, cím, Billingo-adótípus: `HAS_TAX_NUMBER` / `NO_TAX_NUMBER` / `FOREIGN`, adószám) és a tétel (név, végösszeg, nettó, áfa, áfakód). Az áfakód az `INVOICE_VAT` (a backend `.env`-je): alapból `AAM` (alanyi adómentes: nettó = végösszeg, áfa 0, a számla megjegyzésében „Alanyi adómentes.”), vagy egy kulcs, pl. `27%`. A tétel a törvény szerint azonosítja a szolgáltatást (Áfa tv. 169. § e): megnevezése a fő csomagoknál pl. „Online tartalomszolgáltatás – Páros csomag”, a kiegészítőknél egységesen „Online tartalomszolgáltatás – kiegészítő csomag”, egysége `csomag`, megjegyzése a tartalom („Hozzáférés a sorsfonalak.hu szoftveresen előállított, személyre szabott szöveges tartalmaihoz: 2 képletelemzés, … Digitális tartalom.”; `Package::invoice_item`). Szándékosan semleges: nem „asztrológiai”, és nem „jóslás” vagy „kártya” (a kártyajóslás a megjegyzésben „egyedi szöveges tartalom”), mert a szolgáltatás egy weboldal programmal előállított tartalma, nem személyes szakmai tanácsadás. A Stripe fizetési oldalán és nyugtáján a csomag neve és leírása áll, ott a „kártyajóslás” helyett „kártya” (`Package::checkout_text`). A Telegram-értesítő a kiegészítőknél a csomag azonosítóját is kiírja („kiegészítő csomag (addon_tarot)”). Cégnél a `business_name` és a magyar adószám (`hu_tin`, ennek híján `eu_vat`) kerül a számlára.
|
||||
|
||||
Minden igazolt fizetéshez készül számla, a teszt módúakhoz (`sk_test_…`) is: így a teljes folyamat próbálható egy teszt Billingo-fiókkal. Éles Billingo-fiók mellett ezért prodon már ne legyen teszt Stripe-kulcs (a kettőt megnyitáskor együtt kell élesre cserélni).
|
||||
|
||||
A worker `invoices` feladata (`WORKER_TASKS`, prodon a `worker` konténerben) a Billingo API v3-mal:
|
||||
|
||||
1. létrehozza a partnert (`POST /partners`),
|
||||
2. kiállítja a számlát (`POST /documents`: `type=invoice`, `paid=true`, `electronic=true`, `payment_method=online_bankcard`, bruttó egységár, teljesítés = a fizetés napja magyar idő szerint),
|
||||
3. e-mailben elküldi a vevőnek (`POST /documents/{id}/send`).
|
||||
|
||||
Minden lépés eredményét elmenti a következő előtt, így újrapróbáláskor ott folytatja, ahol abbamaradt, és nem állít ki két számlát. A Billingo teljes válasza a `document` oszlopba kerül (a PDF nem: azt letöltéskor a backend kéri le, `GET /documents/{id}/download`). Hibánál növekvő várakozással újrapróbál (`MAX_INVOICE_ATTEMPTS`, alapból 10, kb. egy nap), utána `failed` lesz, és a `last_error` mondja meg, mi a baj.
|
||||
|
||||
A felhasználó a **Számláim** oldalon (`/szamlak`; a menüpont az első számlával jelenik meg) töltheti le a számláit.
|
||||
|
||||
Beállítás (`.env.secrets`, a backend és a worker is olvassa):
|
||||
|
||||
```
|
||||
BILLINGO_API_KEY=...
|
||||
```
|
||||
|
||||
A számlatömb alapból a fiók első számlatömbje; másikhoz `BILLINGO_BLOCK_ID` a `.env`-ben vagy a `.env.secrets`-ben.
|
||||
|
||||
## Beállítás
|
||||
|
||||
A kulcsok a `.env.secrets` fájlba kerülnek (helyben a repó gyökerében, a szerveren a `/opt/sorsfonalak` mappában), git-be soha:
|
||||
|
||||
```
|
||||
STRIPE_SECRET_KEY=sk_test_...
|
||||
STRIPE_WEBHOOK_SECRET=whsec_...
|
||||
```
|
||||
|
||||
- **A megnyitásig csak az adminok vásárolhatnak** (`PURCHASES_OPEN=false`, az alapértelmezés), a többieknek a gombok „Hamarosan” feliratúak; így senki nem ad meg valódi kártyát egy teszt- vagy félkész beállításnál.
|
||||
- Teszt kulccsal (`sk_test_…`) `PURCHASES_OPEN=true` mellett is csak adminok vásárolhatnak (a Stripe tesztkártyáival senki nem jut csomaghoz). Tesztkártya: `4242 4242 4242 4242`, bármilyen jövőbeli lejárat és CVC.
|
||||
- Élő kulccsal és `PURCHASES_OPEN=true` mellett mindenki vásárolhat (megnyitáskor, a `.env`-ben).
|
||||
- Kulcs nélkül nincs vásárlás (helyben a `MOCK_PAYMENTS=true` próbafizetés működik; a Stripe-kulcs ezt felülírja).
|
||||
|
||||
A Stripe felületén:
|
||||
|
||||
1. **Developers → API keys**: a Secret key → `STRIPE_SECRET_KEY`.
|
||||
2. **Developers → Webhooks → Add endpoint**: `https://sorsfonalak.hu/api/v1/payments/stripe/webhook`, események: `checkout.session.completed` és `checkout.session.async_payment_succeeded`. A Signing secret → `STRIPE_WEBHOOK_SECRET`. Teszt és élő módban külön végpontot kell felvenni, külön titokkal.
|
||||
3. **Settings → Branding**: logó, színek (a fizetési oldal kinézete).
|
||||
4. **Settings → Payment methods**: bankkártya, Apple Pay, Google Pay.
|
||||
|
||||
A kulcsok módosítása után a backendet újra kell indítani (`docker compose up -d backend`).
|
||||
|
||||
Helyben a webhook nem ér el a géphez; nem is kell, mert a visszatérő oldal a Stripe-tól kérdezi le a fizetést. Ha mégis próbálni kell: `stripe listen --forward-to localhost:3001/api/v1/payments/stripe/webhook`.
|
||||
|
||||
## Megnyitás előtt
|
||||
|
||||
- A Stripe-fiók aktiválása (céges adatok, bankszámla), élő kulcsok és élő webhook.
|
||||
- Az első éles számlát nézd át a Billingóban (vevő, adószám, áfa, teljesítési dátum). A Stripe nyugtája nem magyar számla: a Stripe felületén a Customer emails → Successful payments legyen kikapcsolva.
|
||||
- Visszatérítés: egyelőre a Stripe felületén, a csomagot pedig az admin oldalon kell kézzel csökkenteni.
|
||||
@@ -0,0 +1,17 @@
|
||||
# Kártyajóslás
|
||||
|
||||
A `/kartyajoslas` oldalon a felhasználó témát (Általános, Párkapcsolat, Munka és hivatás, Önismeret; a téma szerinti olvasási szempont a promptba kerül, `TOPICS`) és kirakást választ, opcionálisan kérdést ír (legfeljebb 300 karakter), és a legyezőbe terített, lefordított pakliból kiválasztja a lapokat. Ezután a lapok sorban felfordulnak, és elkészül a személyre szabott jóslás. A korábbi jóslások ugyanitt listázódnak, egyenként a `/kartyajoslas/{id}` oldalon nyithatók meg. A nyilvános példaoldal (`/kartyajoslas/pelda`) két előre megírt jóslást mutat fülekkel, egy munkáról (3 lap) és egy párkapcsolatról (Képlet-kereszt, 5 lap). Mindkettőnél animáció játssza le a húzást: lapválasztás a legyezőből, kirakás, felfordítás, végül megjelenik a szöveg (`src/components/tarot/TarotDemo.tsx`, a szövegek: `src/content/tarot-pelda.json`). Mozgáscsökkentő beállításnál rögtön a végállapot látszik.
|
||||
|
||||
## Működés
|
||||
|
||||
- **A lapokat a szerver húzza** (`POST /v1/tarot/readings`, `services/backend/src/routes/tarot.rs`): megkeveri a 78 lapot, kiveszi a kirakáshoz kellő számút, mindegyik 28% eséllyel fordított. A legyezőből választás csak a pillanatot választja ki, így nem lehet ingyen újrahúzni, amíg tetsző lap nem jön.
|
||||
- **Tárolás:** a jóslás egy `tarot` fajtájú sor az `analyses` táblában, a kirakással, a kérdéssel, a lapokkal és az olvasó Napjának, Holdjának és Aszcendensének jegyével (a saját képletéből, az Aszcendenst csak ismert születési időnél) a `tarot` oszlopban (migráció: 0031). Képlethez nem kötődik, ezért az újraszámolás nem törli, fióktörléskor viszont törlődik.
|
||||
- **Egység:** egy jóslás egy `tarot` egységet használ, a kirakás méretétől függetlenül. Egyszerre egy jóslás készülhet. A sikertelen jóslás egysége visszajár (a worker, mint az elemzéseknél).
|
||||
- **Modell:** ugyanaz, amelyik a részletes elemzéseket írja (admin felületen az „elemzés” funkció modellje és tartaléka); külön modellbeállítása nincs. A worker a gyors sávban írja (`Lane::Quick`), hogy ne várjon a hosszú elemzések mögött.
|
||||
- **Prompt:** `crates/analysis-prompt/src/tarot.rs`. A modell a lapok alapjelentését (a pakli JSON-ból), a pozíciókat, a kérdést és a három jegyet kapja; válasza: cím, összefoglaló, laponként egy-két bekezdés, a lapok együtt, útravaló. A rendszerprompt az adminon nem szerkeszthető (első kör).
|
||||
- **Pakli:** `services/frontend/src/content/tarot-deck.json`, ezt a Rust-crate is beolvassa (`include_str!`), így a felület és a prompt ugyanazokat a neveket és jelentéseket használja. A lapok rajza: `src/components/tarot/TarotCard.tsx` (a `../tarot` tervezőstúdió „Égi Asztrolábium” változata).
|
||||
- **Admin:** a jóslás az elemzésekhez hasonlóan újraíratható (`/v1/admin/analyses/{id}/regenerate`), az egységek az admin felhasználólistán adhatók („kártyajóslás”).
|
||||
|
||||
## Csomagok
|
||||
|
||||
Egy elemzés: 2, Páros: 5, Család: 10 jóslás; külön: „+5 kártyajóslás” 1 000 Ft. A számlán a kiegészítő neve „Online tartalomszolgáltatás – kiegészítő csomag”, a tétel leírásában „egyedi szöveges tartalom” szerepel (sem „jóslás”, sem „kártya”). A Stripe fizetési oldalán „+5 kártya”.
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
# Levélküldés élesben: Amazon SES
|
||||
|
||||
Élesben most nincs levélküldő beállítva (`SMTP_URL` üres), így minden levél az `email_outbox` táblában vár. Amíg ez így van, a meghívót kézzel is továbbadhatod: az admin „Meghívók” oldala küldés után kiírja a linket („Link másolása”).
|
||||
Élesben az Amazon SES küldi a leveleket (`noreply@sorsfonalak.hu`, eu-central-1, 2587-es port). Ha a küldés nincs beállítva (`SMTP_URL` és SES-kulcs nélkül), a levelek az `email_outbox` táblában várnak; a meghívót ilyenkor kézzel is továbbadhatod: az admin „Meghívók” oldala küldés után kiírja a linket („Link másolása”).
|
||||
|
||||
A meghívó a legkényesebb levéltípus, mert a címzett nem kérte. A spammappát elsősorban a feladó hírneve és a domain hitelesítése dönti el, a sablon csak ezután számít. Ezért kellenek a lenti lépések.
|
||||
|
||||
@@ -68,7 +68,7 @@ A droplet saját tűzfala (`sorsfonalak-fw`, DigitalOcean → Networking → Fir
|
||||
|
||||
## 6. Indítás
|
||||
|
||||
- A `.env` fájlban opcionális: `MAIL_FROM=Sorsfonalak <hello@sorsfonalak.hu>` (ez az alapérték is).
|
||||
- A `.env` fájlban opcionális: `MAIL_FROM=Sorsfonalak <noreply@sorsfonalak.hu>` (élesben ez van beállítva, és ez a deploy compose alapértéke is). Az Apple „Email Communication” beállításában ugyanez a cím van regisztrálva: ha változik, ott is át kell írni, különben az Apple-továbbítócímekre nem érkeznek meg a levelek.
|
||||
- Utána: `docker compose up -d worker`. A naplóban ennek kell megjelennie: `e-mail delivery enabled`, `via=Amazon SES eu-central-1:2587, credentials from …`.
|
||||
- Az eddig várakozó levelek ekkor kimennek. Ha ezt nem szeretnéd, előtte töröld őket: `DELETE FROM email_outbox WHERE sent_at IS NULL;`.
|
||||
- Hibaüzenetek a naplóban:
|
||||
|
||||
+7
-3
@@ -25,7 +25,7 @@ Egy kattintás önmagában semmit nem bizonyít, ezért kétféle jutalom van:
|
||||
|
||||
**Új felhasználó:**
|
||||
|
||||
- **Megjegyzés:** a megosztott oldal a böngészőben megjegyzi a link kódját (`localStorage` `sf_ref`). A Google-regisztráció elküldi (`referral`), és a backend a `referrals` táblába írja, hogy kit ki hozott. Saját link, visszavont link vagy kikapcsolt jutalom esetén nem írja be.
|
||||
- **Megjegyzés:** a megosztott oldal belépés linkje viszi a link kódját (`/belepes?ref=<slug>`), a böngészőben semmi nem tárolódik. A regisztráció (Google, Apple, e-mail) elküldi (`referral`), és a backend a `referrals` táblába írja, hogy kit ki hozott. Saját link, visszavont link vagy kikapcsolt jutalom esetén nem írja be.
|
||||
- **Jutalom:** amikor az új felhasználó elkészíti a saját képletét, a megosztó +1 képletelemzést kap (`referral_reward`), ha még nem érte el a hármat. Új felhasználónként egyszer.
|
||||
- **`/v1/me`:** a `share_reward_granted` és a `referral_rewards` (`{earned, limit}`) mezők mutatják az állapotot.
|
||||
|
||||
@@ -33,8 +33,12 @@ Egy kattintás önmagában semmit nem bizonyít, ezért kétféle jutalom van:
|
||||
|
||||
- **Az olvasás nem ír.** A megosztott tartalom lekérése (`GET /v1/public/shares/{slug}`) semmit nem ír az adatbázisba.
|
||||
- **Gyorsítótár:** a frontend 5 percig tartja (`fetch` `revalidate: 300`, `shares` tag), így a sűrűn visszatérő robotok el sem jutnak a backendig. Visszavonáskor az `/api/v1` proxy azonnal törli a taget.
|
||||
- **robots.txt** (`src/app/robots.ts`): kitiltja az ismert AI-robotokat (GPTBot, ClaudeBot, CCBot, PerplexityBot, Bytespider, meta-externalagent stb.). Az előnézet-robotok (facebookexternalhit, Slackbot, WhatsApp, Twitterbot, LinkedInBot) engedélyezve maradnak.
|
||||
- **Cloudflare:** a robots.txt-t be nem tartó robotokra a Cloudflare „Block AI bots” beállítása való (Security → Bots). Ez az előnézet-robotokat nem tiltja le. A „Bot Fight Mode” viszont az előnézeteket is elronthatja, azt ne kapcsoljuk be.
|
||||
- **robots.txt** (`src/app/robots.ts`), három csoport:
|
||||
- **Tanító robotok: kitiltva.** Amelyek AI-modell tanításához gyűjtenek, vagy tanítóadatnak adják el a tartalmat (GPTBot, ClaudeBot, CCBot, Google-Extended, Applebot-Extended, Bytespider, meta-externalagent stb.), plusz a nehéz és itt haszontalan PetalBot és Scrapy. A Google-Extended csak a Gemini-tanítást tiltja, a Google-keresést és az AI-áttekintést nem érinti.
|
||||
- **AI-keresők és -ügynökök: jöhetnek, legfeljebb 10 másodpercenként egy oldal** (`Crawl-delay: 10`, amelyik betartja). OAI-SearchBot, ChatGPT-User, Claude-SearchBot, Claude-User, PerplexityBot, Perplexity-User, DuckAssistBot stb. Ezek idézhetik az oldalt, és látogatót hozhatnak.
|
||||
- **Mindenki más** (Googlebot, Bingbot, az előnézet-robotok: facebookexternalhit, Slackbot, WhatsApp, Twitterbot, LinkedInBot): jöhet, a belépés mögötti útvonalak kivételével.
|
||||
- **Kis terhelés:** belépési süti nélkül a nyilvános oldalak nem hívják a backendet, a horoszkópszámítást pedig csak a böngészőben futó szkript indítja (IP-címenként óránként 30). Egy robotlátogatás így csak egy HTML-oldal előállítása.
|
||||
- **Cloudflare:** a robots.txt-t be nem tartó robotokra a Security → Settings → Bot traffic → *AI Crawler and Agent access policies* való: **Training: Block**, **Search: Allow**, **Agents: Allow**. Ez az előnézet-robotokat nem érinti. A „Bot Fight Mode” viszont az előnézeteket is elronthatja, azt ne kapcsoljuk be.
|
||||
|
||||
## Előnézet (Facebook, Messenger, WhatsApp, LinkedIn, X)
|
||||
|
||||
|
||||
@@ -10,9 +10,13 @@ publish.workspace = true
|
||||
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
|
||||
|
||||
@@ -16,10 +16,13 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked \
|
||||
--mount=type=cache,target=/app/target,sharing=locked \
|
||||
cargo build --release --locked -p backend \
|
||||
&& cp target/release/backend /backend
|
||||
# The log directory (LOG_DIR); a volume mounted here takes over its owner.
|
||||
RUN mkdir /logs
|
||||
|
||||
# --- 2. runtime: the binary only (TLS roots are compiled in via webpki-roots) ---
|
||||
FROM scratch
|
||||
COPY --from=build /backend /backend
|
||||
COPY --from=build --chown=65532:65532 /logs /logs
|
||||
ENV BIND_ADDR=0.0.0.0:8081 \
|
||||
LOG_FORMAT=json \
|
||||
RUST_LOG=info
|
||||
|
||||
@@ -18,6 +18,7 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh
|
||||
| `FREE_PERSON_SLOTS` | `0` | ennyi személyt vehet fel csomag nélkül egy felhasználó |
|
||||
| `SIGNUP_MODE` | `invite` | `invite`: új fiók csak meghívóval jön létre (403 `not_invited`); `open`: bárki regisztrálhat |
|
||||
| `GOOGLE_CLIENT_IDS` | – | Google OAuth kliens-azonosító(k); üresen a Google-belépés ki van kapcsolva |
|
||||
| `APPLE_CLIENT_IDS` | – | Sign in with Apple: a Services ID(k) vesszővel elválasztva (pl. `hu.sorsfonalak.web`), az ID token `aud` mezője ezek egyike kell legyen; üresen az Apple-belépés ki van kapcsolva |
|
||||
| `BOOTSTRAP_ADMIN_EMAILS` | – | ezek a címek regisztrációkor vagy belépéskor admin szerepet kapnak (így lesz meg az első admin) |
|
||||
| `SUPPORTED_LOCALES` | `hu,en` | felület- és elemzésnyelvek; az első az alapértelmezett |
|
||||
| `ANALYSIS_MODEL` | `anthropic/claude-opus-5.5` | az elemzések, előrejelzések és válaszok alapmodellje, és a tartalék, ha a választott modell hibára fut |
|
||||
@@ -31,6 +32,11 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh
|
||||
|
||||
- **Munkamenet:** véletlen token, HttpOnly + SameSite=Lax sütiben (`sf_session`). A belépési válasz törzsében is ott van, hogy nem böngészős kliens `Authorization: Bearer <token>` fejléccel küldhesse vissza. Az adatbázis csak a token SHA-256 hash-ét tárolja, így a munkamenet visszavonható (kijelentkezés, jelszócsere, fióktörlés).
|
||||
- **E-mail + jelszó** (csak `PASSWORD_LOGIN=true` mellett; élesben csak közösségi belépés lesz, hogy ne lehessen tömegesen ingyenes fiókokat nyitni):
|
||||
- a regisztráció nem kér jelszót: a címre megy egy link (`verify_email`, 3 napig él), és jelszót csak ezen lehet megadni. Az elfelejtett jelszó linkje (`reset_password`, 1 óra) ugyanoda visz (`/jelszo?token=…`). Így jelszót csak az állíthat be, aki a postafiókot olvassa, és mindig ő maga választja: senki nem regisztrálhat más címére jelszót, ezért a Google- vagy Apple-fiók összekötése az azonos című fiókkal biztonságos;
|
||||
- a link megnyitásakor a cím megerősítettnek számít, minden korábbi munkamenet megszűnik, és a felhasználó be is lép;
|
||||
- már regisztrált címre a regisztráció ugyanúgy 202-t ad (nem derül ki, ki van regisztrálva), a tulajdonos pedig egy „Már van fiókod” levelet kap jelszómegadó linkkel (`account_exists`);
|
||||
- jelszavas link címenként és fajtánként percenként egy, összesen óránként öt mehet ki;
|
||||
- megerősítetlen címmel (a linkes regisztráció előtti fiók) nem lehet jelszóval belépni;
|
||||
- a jelszó legalább 10 karakter, Argon2id hash-sel tárolva;
|
||||
- címenként 15 percen belül 10 hibás próbálkozás után átmenetileg tiltás jár;
|
||||
- ismeretlen címnél is ugyanannyi ideig tart a válasz.
|
||||
@@ -56,14 +62,14 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh
|
||||
|---|---|---|
|
||||
| `GET /v1/config` | – | Google kliens-azonosító, `password_login`, `signup_mode`, nyelvek, elemző és összefoglaló modell |
|
||||
| `GET /v1/packages` | – | a csomagkatalógus árral, tartalommal, megtakarítással, elemzésenkénti árral (lásd `docs/csomagok.md`) |
|
||||
| `POST /v1/auth/register` | – | `{email, password, display_name?, locale?, invite_token?}` → munkamenet; megerősítő e-mailt küld |
|
||||
| `POST /v1/auth/register` | – | `{email, display_name?, locale?, invite_token?, referral?}` → 202; jelszómegadó linket küld |
|
||||
| `POST /v1/auth/login` | – | `{email, password}` |
|
||||
| `POST /v1/auth/google` | – | `{id_token, invite_token?}`; `created: true`, ha most jött létre a fiók; meghívó nélkül 403 `not_invited` |
|
||||
| `POST /v1/auth/logout`, `/logout-all` | user | kijelentkezés erről, illetve minden eszközről |
|
||||
| `POST /v1/auth/verify-email` | – | `{token}` az e-mailben kapott linkből |
|
||||
| `POST /v1/auth/resend-verification` | user | |
|
||||
| `POST /v1/auth/password-reset` | – | `{email}`; mindig 202 |
|
||||
| `POST /v1/auth/password-reset/confirm` | – | `{token, password}`; minden munkamenet megszűnik |
|
||||
| `POST /v1/auth/set-password` | – | `{token, password}` a levélben kapott linkből (regisztráció vagy elfelejtett jelszó); a cím megerősítetté válik, minden más munkamenet megszűnik, és belép |
|
||||
| `POST /v1/public/chart` | – | a nyilvános születési horoszkóp: `{date, time?, country, geonames_id, ambiguous_time?}` → a teljes képlet (`chart`), `highlights` és `uncertain` (idő nélkül a határ közeli Nap és Hold); csak számítás, AI nélkül, nem ment semmit; IP-címenként óránként 30 |
|
||||
| `GET /v1/public/geo/countries`, `/v1/public/geo/places?country=&q=` | – | országlista és helykereső a nyilvános horoszkóphoz (a helykereső IP-címenként óránként 300 kérés) |
|
||||
| `GET`/`PATCH`/`DELETE /v1/me` | user | profil (`display_name`, `locale`); törlés: `{confirm: "DELETE"}` |
|
||||
| `POST /v1/me/password` | user | `{current_password?, new_password}`; Google-fiókhoz jelszót is ad |
|
||||
| `GET /v1/me/export` | user | GDPR: minden adat egy JSON-ban |
|
||||
|
||||
@@ -147,10 +147,10 @@ pub fn removal_cookie(config: &Config) -> Cookie<'static> {
|
||||
pub fn validate_password(password: &str) -> Result<(), ApiError> {
|
||||
let len = password.chars().count();
|
||||
if len < MIN_PASSWORD_LEN {
|
||||
return Err(ApiError::BadRequest(format!("the password must be at least {MIN_PASSWORD_LEN} characters long")));
|
||||
return Err(ApiError::BadRequest(format!("A jelszó legalább {MIN_PASSWORD_LEN} karakter legyen.")));
|
||||
}
|
||||
if len > MAX_PASSWORD_LEN {
|
||||
return Err(ApiError::BadRequest(format!("the password must be at most {MAX_PASSWORD_LEN} characters long")));
|
||||
return Err(ApiError::BadRequest(format!("A jelszó legfeljebb {MAX_PASSWORD_LEN} karakter lehet.")));
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
@@ -186,7 +186,8 @@ pub static DUMMY_HASH: std::sync::LazyLock<String> = std::sync::LazyLock::new(||
|
||||
// --- brute-force protection ----------------------------------------------------------
|
||||
|
||||
/// Counts failed logins per e-mail address in a sliding window (in memory,
|
||||
/// per backend instance).
|
||||
/// per backend instance). Also counts the calls of public endpoints per
|
||||
/// address ([`LoginLimiter::hit`]).
|
||||
pub struct LoginLimiter {
|
||||
max_failures: u32,
|
||||
window: Duration,
|
||||
@@ -222,6 +223,14 @@ impl LoginLimiter {
|
||||
entry.0 += 1;
|
||||
}
|
||||
|
||||
/// Counts one use of a public endpoint (every call, not just failures):
|
||||
/// 429 once `max_failures` calls were made in the window.
|
||||
pub fn hit(&self, key: &str) -> Result<(), ApiError> {
|
||||
self.check(key)?;
|
||||
self.failed(key);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn succeeded(&self, key: &str) {
|
||||
self.failures.lock().expect("limiter lock").remove(key);
|
||||
}
|
||||
|
||||
@@ -45,6 +45,23 @@ pub struct Config {
|
||||
/// `MOCK_PAYMENTS` (default `false`): a stand-in payment that adds an
|
||||
/// analysis unit at once, until Stripe is connected.
|
||||
pub mock_payments: bool,
|
||||
/// Stripe Checkout, when `STRIPE_SECRET_KEY` is set (it wins over
|
||||
/// `MOCK_PAYMENTS`).
|
||||
pub stripe: Option<StripeConfig>,
|
||||
/// `INVOICE_VAT` (default `AAM`, alanyi adómentes; or e.g. `27%`).
|
||||
pub invoice_vat: crate::invoices::Vat,
|
||||
/// `BILLINGO_API_KEY`: downloading invoices (the worker issues them).
|
||||
pub billingo_api_key: Option<String>,
|
||||
/// `BILLINGO_API_URL` (default `https://api.billingo.hu/v3`).
|
||||
pub billingo_api_url: String,
|
||||
/// `PURCHASES_OPEN` (default `false`): everyone may buy through Stripe.
|
||||
/// Until the opening only admins can (and with a test key always only
|
||||
/// admins), so nobody types a real card into a test or unfinished setup.
|
||||
pub purchases_open: bool,
|
||||
/// `TERMS_CONSENT` (default `false`): Stripe's payment page asks every
|
||||
/// buyer to accept the ÁSZF and give up the withdrawal right. Needs the
|
||||
/// terms URL in Stripe's Public details; off until the opening.
|
||||
pub terms_consent: bool,
|
||||
/// `USER_INVITES` (default `false`): users may invite others ("how
|
||||
/// compatible are we?" links, which also let the invitee sign up). Off
|
||||
/// until the launch; admins may always.
|
||||
@@ -58,6 +75,12 @@ pub struct Config {
|
||||
pub google_client_ids: Vec<String>,
|
||||
/// `GOOGLE_JWKS_URL` (default Google's certificate endpoint).
|
||||
pub google_jwks_url: String,
|
||||
/// `APPLE_CLIENT_IDS`: comma-separated Services IDs (e.g.
|
||||
/// `hu.sorsfonalak.web`) accepted as the ID token audience; empty
|
||||
/// disables Sign in with Apple.
|
||||
pub apple_client_ids: Vec<String>,
|
||||
/// `APPLE_JWKS_URL` (default Apple's key endpoint).
|
||||
pub apple_jwks_url: String,
|
||||
/// `BOOTSTRAP_ADMIN_EMAILS`: these users get the admin role when they
|
||||
/// register or log in (to create the first administrator).
|
||||
pub bootstrap_admin_emails: Vec<String>,
|
||||
@@ -83,6 +106,40 @@ 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<crate::storage::StorageConfig>,
|
||||
/// `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`
|
||||
/// (`whsec_…`, from the webhook endpoint in the Stripe dashboard) and
|
||||
/// `STRIPE_API_URL` (default `https://api.stripe.com`, tests change it).
|
||||
#[derive(Clone)]
|
||||
pub struct StripeConfig {
|
||||
pub secret_key: String,
|
||||
pub webhook_secret: Option<String>,
|
||||
pub api_url: String,
|
||||
}
|
||||
|
||||
impl StripeConfig {
|
||||
/// A test-mode key: no real money moves.
|
||||
pub fn test_mode(&self) -> bool {
|
||||
self.secret_key.starts_with("sk_test_") || self.secret_key.starts_with("rk_test_")
|
||||
}
|
||||
}
|
||||
|
||||
// The keys stay out of logs.
|
||||
impl std::fmt::Debug for StripeConfig {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
f.debug_struct("StripeConfig")
|
||||
.field("test_mode", &self.test_mode())
|
||||
.field("webhook_secret", &self.webhook_secret.is_some())
|
||||
.field("api_url", &self.api_url)
|
||||
.finish()
|
||||
}
|
||||
}
|
||||
|
||||
fn var(name: &str) -> Option<String> {
|
||||
@@ -127,11 +184,33 @@ impl Config {
|
||||
session_ttl_days: parsed("SESSION_TTL_DAYS", 30)?,
|
||||
password_login: parsed("PASSWORD_LOGIN", false)?,
|
||||
mock_payments: parsed("MOCK_PAYMENTS", false)?,
|
||||
stripe: var("STRIPE_SECRET_KEY").map(|secret_key| StripeConfig {
|
||||
secret_key,
|
||||
webhook_secret: var("STRIPE_WEBHOOK_SECRET"),
|
||||
api_url: var("STRIPE_API_URL")
|
||||
.unwrap_or_else(|| "https://api.stripe.com".into())
|
||||
.trim_end_matches('/')
|
||||
.to_string(),
|
||||
}),
|
||||
invoice_vat: match var("INVOICE_VAT") {
|
||||
None => crate::invoices::Vat::Exempt,
|
||||
Some(raw) => crate::invoices::Vat::parse(&raw)
|
||||
.with_context(|| format!("invalid INVOICE_VAT '{raw}': use AAM or a rate like 27%"))?,
|
||||
},
|
||||
billingo_api_key: var("BILLINGO_API_KEY"),
|
||||
billingo_api_url: var("BILLINGO_API_URL")
|
||||
.unwrap_or_else(|| "https://api.billingo.hu/v3".into())
|
||||
.trim_end_matches('/')
|
||||
.to_string(),
|
||||
purchases_open: parsed("PURCHASES_OPEN", false)?,
|
||||
terms_consent: parsed("TERMS_CONSENT", false)?,
|
||||
user_invites: parsed("USER_INVITES", false)?,
|
||||
referral_rewards: parsed("REFERRAL_REWARDS", false)?,
|
||||
google_client_ids: list("GOOGLE_CLIENT_IDS"),
|
||||
google_jwks_url: var("GOOGLE_JWKS_URL")
|
||||
.unwrap_or_else(|| "https://www.googleapis.com/oauth2/v3/certs".into()),
|
||||
apple_client_ids: list("APPLE_CLIENT_IDS"),
|
||||
apple_jwks_url: var("APPLE_JWKS_URL").unwrap_or_else(|| "https://appleid.apple.com/auth/keys".into()),
|
||||
bootstrap_admin_emails: list("BOOTSTRAP_ADMIN_EMAILS").into_iter().map(|e| e.to_lowercase()).collect(),
|
||||
supported_locales,
|
||||
analysis_model: var("ANALYSIS_MODEL").unwrap_or_else(|| "anthropic/claude-opus-5.5".into()),
|
||||
@@ -146,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");
|
||||
@@ -166,9 +257,17 @@ impl Config {
|
||||
session_ttl_days: 30,
|
||||
password_login: true,
|
||||
mock_payments: true,
|
||||
stripe: None,
|
||||
invoice_vat: crate::invoices::Vat::Exempt,
|
||||
billingo_api_key: Some("billingo-fake".into()),
|
||||
billingo_api_url: format!("{horoscope_api_url}/billingo"),
|
||||
purchases_open: true,
|
||||
terms_consent: true,
|
||||
user_invites: true,
|
||||
referral_rewards: true,
|
||||
google_client_ids: vec!["test-client.apps.googleusercontent.com".into()],
|
||||
apple_client_ids: vec!["hu.sorsfonalak.test".into()],
|
||||
apple_jwks_url: google_jwks_url.clone(),
|
||||
google_jwks_url,
|
||||
bootstrap_admin_emails: vec!["admin@example.com".into()],
|
||||
supported_locales: vec!["hu".into(), "en".into()],
|
||||
@@ -179,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,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
//! Analysis units: a detailed natal analysis uses one `natal` unit, a
|
||||
//! synastry analysis one `synastry` unit, a yearly forecast one `forecast`
|
||||
//! unit, a question about an analysis one `question` unit. Units come from
|
||||
//! purchases or an admin; a failed analysis or answer gives its unit back
|
||||
//! (the worker does that).
|
||||
//! unit, a question about an analysis one `question` unit, a tarot reading one
|
||||
//! `tarot` unit. Units come from purchases or an admin; a failed analysis or
|
||||
//! answer gives its unit back (the worker does that).
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::{Value, json};
|
||||
@@ -22,6 +22,8 @@ pub enum Unit {
|
||||
Person,
|
||||
/// A question about a finished analysis (see `routes::questions`).
|
||||
Question,
|
||||
/// A tarot reading (see `routes::tarot`).
|
||||
Tarot,
|
||||
}
|
||||
|
||||
impl Unit {
|
||||
@@ -32,6 +34,7 @@ impl Unit {
|
||||
Unit::Forecast => "forecast",
|
||||
Unit::Person => "person",
|
||||
Unit::Question => "question",
|
||||
Unit::Tarot => "tarot",
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -45,6 +48,7 @@ pub struct Balance {
|
||||
/// Bought person slots (not the slots left; see [`crate::persons::slots`]).
|
||||
pub person: i64,
|
||||
pub question: i64,
|
||||
pub tarot: i64,
|
||||
}
|
||||
|
||||
impl Balance {
|
||||
@@ -55,27 +59,32 @@ impl Balance {
|
||||
Unit::Forecast => self.forecast,
|
||||
Unit::Person => self.person,
|
||||
Unit::Question => self.question,
|
||||
Unit::Tarot => self.tarot,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn view(self) -> Value {
|
||||
json!({ "natal": self.natal, "synastry": self.synastry, "forecast": self.forecast, "question": self.question })
|
||||
json!({
|
||||
"natal": self.natal, "synastry": self.synastry, "forecast": self.forecast, "question": self.question,
|
||||
"tarot": self.tarot,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn balance(conn: &mut PgConnection, user_id: Uuid) -> Result<Balance, ApiError> {
|
||||
let (natal, synastry, forecast, person, question): (i64, i64, i64, i64, i64) = sqlx::query_as(
|
||||
let (natal, synastry, forecast, person, question, tarot): (i64, i64, i64, i64, i64, i64) = sqlx::query_as(
|
||||
"SELECT COALESCE(SUM(delta) FILTER (WHERE unit = 'natal'), 0)::bigint, \
|
||||
COALESCE(SUM(delta) FILTER (WHERE unit = 'synastry'), 0)::bigint, \
|
||||
COALESCE(SUM(delta) FILTER (WHERE unit = 'forecast'), 0)::bigint, \
|
||||
COALESCE(SUM(delta) FILTER (WHERE unit = 'person' AND reason <> 'person'), 0)::bigint, \
|
||||
COALESCE(SUM(delta) FILTER (WHERE unit = 'question'), 0)::bigint \
|
||||
COALESCE(SUM(delta) FILTER (WHERE unit = 'question'), 0)::bigint, \
|
||||
COALESCE(SUM(delta) FILTER (WHERE unit = 'tarot'), 0)::bigint \
|
||||
FROM credit_ledger WHERE user_id = $1",
|
||||
)
|
||||
.bind(user_id)
|
||||
.fetch_one(conn)
|
||||
.await?;
|
||||
Ok(Balance { natal, synastry, forecast, person, question })
|
||||
Ok(Balance { natal, synastry, forecast, person, question, tarot })
|
||||
}
|
||||
|
||||
/// Spends one unit inside the caller's transaction. The user row is locked
|
||||
|
||||
@@ -25,11 +25,11 @@ pub enum ApiError {
|
||||
Conflict { code: &'static str, message: String },
|
||||
#[error("{0}")]
|
||||
Gone(String),
|
||||
#[error("the link is invalid or has expired")]
|
||||
#[error("Ez a link érvénytelen vagy lejárt.")]
|
||||
InvalidToken,
|
||||
#[error("no {unit} analysis left (balance {balance})")]
|
||||
InsufficientCredits { unit: &'static str, balance: i64 },
|
||||
#[error("too many attempts; try again later")]
|
||||
#[error("Túl sok próbálkozás. Próbáld újra később.")]
|
||||
TooManyRequests,
|
||||
/// A usage limit; the message is shown to the user as is.
|
||||
#[error("{message}")]
|
||||
|
||||
@@ -1,107 +0,0 @@
|
||||
//! Google Sign-In: verification of Google ID tokens.
|
||||
//!
|
||||
//! The frontend obtains an ID token with Google Identity Services (button or
|
||||
//! One Tap) and posts it to `POST /v1/auth/google`. The token is a JWT signed
|
||||
//! by Google; it is verified here against Google's published keys (JWKS,
|
||||
//! cached), the configured client ids (audience) and the issuer.
|
||||
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
use jsonwebtoken::{Algorithm, DecodingKey, Validation, decode, decode_header};
|
||||
use serde::Deserialize;
|
||||
use tokio::sync::RwLock;
|
||||
|
||||
use crate::error::ApiError;
|
||||
|
||||
const ISSUERS: [&str; 2] = ["accounts.google.com", "https://accounts.google.com"];
|
||||
const JWKS_MAX_AGE: Duration = Duration::from_secs(3600);
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
pub struct GoogleClaims {
|
||||
/// Stable Google account id.
|
||||
pub sub: String,
|
||||
pub email: Option<String>,
|
||||
#[serde(default)]
|
||||
pub email_verified: bool,
|
||||
pub name: Option<String>,
|
||||
pub locale: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Deserialize)]
|
||||
struct Jwk {
|
||||
kid: String,
|
||||
n: String,
|
||||
e: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
struct JwkSet {
|
||||
keys: Vec<Jwk>,
|
||||
}
|
||||
|
||||
pub struct GoogleVerifier {
|
||||
client_ids: Vec<String>,
|
||||
jwks_url: String,
|
||||
http: reqwest::Client,
|
||||
cache: RwLock<Option<(Instant, Vec<Jwk>)>>,
|
||||
}
|
||||
|
||||
impl GoogleVerifier {
|
||||
pub fn new(client_ids: Vec<String>, jwks_url: String) -> Self {
|
||||
let http = reqwest::Client::builder().timeout(Duration::from_secs(10)).build().expect("static configuration");
|
||||
Self { client_ids, jwks_url, http, cache: RwLock::new(None) }
|
||||
}
|
||||
|
||||
pub fn enabled(&self) -> bool {
|
||||
!self.client_ids.is_empty()
|
||||
}
|
||||
|
||||
async fn fetch_keys(&self) -> Result<Vec<Jwk>, ApiError> {
|
||||
let set: JwkSet = self
|
||||
.http
|
||||
.get(&self.jwks_url)
|
||||
.send()
|
||||
.await
|
||||
.and_then(|r| r.error_for_status())
|
||||
.map_err(|e| ApiError::Internal(format!("fetching Google keys: {e}")))?
|
||||
.json()
|
||||
.await
|
||||
.map_err(|e| ApiError::Internal(format!("parsing Google keys: {e}")))?;
|
||||
Ok(set.keys)
|
||||
}
|
||||
|
||||
/// The key with `kid`; the key set is refetched when it is stale or the
|
||||
/// key is unknown (Google rotates its keys).
|
||||
async fn key(&self, kid: &str) -> Result<Jwk, ApiError> {
|
||||
if let Some((fetched, keys)) = self.cache.read().await.as_ref()
|
||||
&& fetched.elapsed() < JWKS_MAX_AGE
|
||||
&& let Some(k) = keys.iter().find(|k| k.kid == kid)
|
||||
{
|
||||
return Ok(k.clone());
|
||||
}
|
||||
let keys = self.fetch_keys().await?;
|
||||
let found = keys.iter().find(|k| k.kid == kid).cloned();
|
||||
*self.cache.write().await = Some((Instant::now(), keys));
|
||||
found.ok_or_else(|| ApiError::InvalidCredentials("the Google token is signed with an unknown key".into()))
|
||||
}
|
||||
|
||||
pub async fn verify(&self, id_token: &str) -> Result<GoogleClaims, ApiError> {
|
||||
if !self.enabled() {
|
||||
return Err(ApiError::Forbidden("Google login is not configured".into()));
|
||||
}
|
||||
let invalid =
|
||||
|e: jsonwebtoken::errors::Error| ApiError::InvalidCredentials(format!("invalid Google token: {e}"));
|
||||
let header = decode_header(id_token).map_err(invalid)?;
|
||||
if header.alg != Algorithm::RS256 {
|
||||
return Err(ApiError::InvalidCredentials("invalid Google token: unexpected algorithm".into()));
|
||||
}
|
||||
let kid = header.kid.ok_or_else(|| ApiError::InvalidCredentials("invalid Google token: no key id".into()))?;
|
||||
let jwk = self.key(&kid).await?;
|
||||
let key = DecodingKey::from_rsa_components(&jwk.n, &jwk.e).map_err(invalid)?;
|
||||
let mut validation = Validation::new(Algorithm::RS256);
|
||||
validation.set_audience(&self.client_ids);
|
||||
validation.set_issuer(&ISSUERS);
|
||||
validation.set_required_spec_claims(&["exp", "iss", "aud", "sub"]);
|
||||
Ok(decode::<GoogleClaims>(id_token, &key, &validation).map_err(invalid)?.claims)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,194 @@
|
||||
//! Invoices of the Stripe payments. When a payment is confirmed, an invoice
|
||||
//! row is queued with the buyer and the item as they go on the invoice; the
|
||||
//! worker issues it in Billingo (`services/worker/src/invoices.rs`). Users
|
||||
//! download the PDF through the backend, which fetches it from Billingo.
|
||||
|
||||
use serde_json::Value;
|
||||
use sqlx::PgConnection;
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::error::ApiError;
|
||||
|
||||
/// The VAT on the invoices (`INVOICE_VAT`): `AAM` (alanyi adómentes, subject
|
||||
/// to the small business exemption: no VAT, net = gross) or a rate like `27%`.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum Vat {
|
||||
Exempt,
|
||||
Percent(i64),
|
||||
}
|
||||
|
||||
impl Vat {
|
||||
pub fn parse(raw: &str) -> Option<Self> {
|
||||
match raw.trim() {
|
||||
"AAM" => Some(Vat::Exempt),
|
||||
rate => rate.strip_suffix('%')?.trim().parse().ok().filter(|p| (1..=27).contains(p)).map(Vat::Percent),
|
||||
}
|
||||
}
|
||||
|
||||
/// Billingo's VAT value.
|
||||
pub fn code(self) -> String {
|
||||
match self {
|
||||
Vat::Exempt => "AAM".into(),
|
||||
Vat::Percent(p) => format!("{p}%"),
|
||||
}
|
||||
}
|
||||
|
||||
/// Net and VAT parts of a gross price (rounded to forints, as Billingo does).
|
||||
pub fn split(self, gross: i64) -> (i64, i64) {
|
||||
match self {
|
||||
Vat::Exempt => (gross, 0),
|
||||
Vat::Percent(p) => {
|
||||
let net = (gross * 200 + 100 + p) / (200 + 2 * p);
|
||||
(net, gross - net)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The buyer as invoiced, from Stripe's `customer_details`.
|
||||
#[derive(Debug, PartialEq, Eq)]
|
||||
pub struct Buyer {
|
||||
pub name: String,
|
||||
pub email: Option<String>,
|
||||
pub country: String,
|
||||
pub post_code: String,
|
||||
pub city: String,
|
||||
pub address: String,
|
||||
/// Billingo's partner tax type: `HAS_TAX_NUMBER`, `NO_TAX_NUMBER` or `FOREIGN`.
|
||||
pub tax_type: &'static str,
|
||||
pub tax_number: Option<String>,
|
||||
}
|
||||
|
||||
fn text(v: &Value) -> Option<String> {
|
||||
v.as_str().map(str::trim).filter(|s| !s.is_empty()).map(str::to_string)
|
||||
}
|
||||
|
||||
impl Buyer {
|
||||
/// A company ("buying as a business") gives its name and tax id: a
|
||||
/// Hungarian tax number (`hu_tin`) is preferred to an EU VAT number. A
|
||||
/// Hungarian company with only an EU VAT number (`HU12345678`) is invoiced
|
||||
/// without a tax type number: Billingo takes only the full domestic
|
||||
/// number (`12345678-1-23`) for HAS_TAX_NUMBER; the EU number still goes
|
||||
/// on the invoice, in its comment (the worker adds it).
|
||||
pub fn from_stripe(details: &Value, fallback_email: Option<&str>) -> Self {
|
||||
let address = &details["address"];
|
||||
let tax_ids = details["tax_ids"].as_array().map(Vec::as_slice).unwrap_or_default();
|
||||
let tax_id = |kind: &str| tax_ids.iter().find(|t| t["type"] == kind).and_then(|t| text(&t["value"]));
|
||||
let tax_number = tax_id("hu_tin").or_else(|| tax_id("eu_vat"));
|
||||
let country = text(&address["country"]).unwrap_or_else(|| "HU".into()).to_uppercase();
|
||||
let tax_type = match (&tax_number, country.as_str()) {
|
||||
(_, c) if c != "HU" => "FOREIGN",
|
||||
(Some(_), _) if tax_id("hu_tin").is_some() => "HAS_TAX_NUMBER",
|
||||
_ => "NO_TAX_NUMBER",
|
||||
};
|
||||
let street = [text(&address["line1"]), text(&address["line2"])].into_iter().flatten().collect::<Vec<_>>();
|
||||
Self {
|
||||
name: text(&details["business_name"])
|
||||
.filter(|_| tax_number.is_some())
|
||||
.or_else(|| text(&details["name"]))
|
||||
.unwrap_or_else(|| "Vevő".into()),
|
||||
email: text(&details["email"]).or_else(|| fallback_email.map(str::to_string)),
|
||||
country,
|
||||
post_code: text(&address["postal_code"]).unwrap_or_default(),
|
||||
city: text(&address["city"]).unwrap_or_default(),
|
||||
address: street.join(", "),
|
||||
tax_type,
|
||||
tax_number,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Queues the invoice of a paid checkout, inside the caller's transaction.
|
||||
pub async fn queue(
|
||||
tx: &mut PgConnection,
|
||||
checkout_id: &str,
|
||||
user_id: Option<Uuid>,
|
||||
buyer: &Buyer,
|
||||
(item_name, item_comment): (&str, &str),
|
||||
gross_huf: i64,
|
||||
vat: Vat,
|
||||
) -> Result<Uuid, ApiError> {
|
||||
let id = Uuid::now_v7();
|
||||
let (net, vat_huf) = vat.split(gross_huf);
|
||||
sqlx::query(
|
||||
"INSERT INTO invoices (id, checkout_id, user_id, buyer_name, buyer_email, buyer_country, buyer_post_code, \
|
||||
buyer_city, buyer_address, buyer_tax_type, buyer_tax_number, item_name, gross_huf, net_huf, vat_huf, vat_rate, \
|
||||
item_comment) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17) \
|
||||
ON CONFLICT (checkout_id) DO NOTHING",
|
||||
)
|
||||
.bind(id)
|
||||
.bind(checkout_id)
|
||||
.bind(user_id)
|
||||
.bind(&buyer.name)
|
||||
.bind(&buyer.email)
|
||||
.bind(&buyer.country)
|
||||
.bind(&buyer.post_code)
|
||||
.bind(&buyer.city)
|
||||
.bind(&buyer.address)
|
||||
.bind(buyer.tax_type)
|
||||
.bind(&buyer.tax_number)
|
||||
.bind(item_name)
|
||||
.bind(gross_huf as i32)
|
||||
.bind(net as i32)
|
||||
.bind(vat_huf as i32)
|
||||
.bind(vat.code())
|
||||
.bind(item_comment)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
Ok(id)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use serde_json::json;
|
||||
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn gross_prices_split_into_net_and_vat() {
|
||||
let vat = Vat::parse("27%").unwrap();
|
||||
assert_eq!(vat.split(2000), (1575, 425));
|
||||
assert_eq!(vat.split(6000), (4724, 1276));
|
||||
assert_eq!(vat.split(127), (100, 27));
|
||||
assert_eq!(vat.code(), "27%");
|
||||
// Alanyi adómentes: no VAT at all.
|
||||
assert_eq!(Vat::parse("AAM"), Some(Vat::Exempt));
|
||||
assert_eq!(Vat::Exempt.split(6000), (6000, 0));
|
||||
assert_eq!(Vat::parse("huszonhét"), None);
|
||||
assert_eq!(Vat::parse("99%"), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn buyers_from_stripe() {
|
||||
let person = Buyer::from_stripe(
|
||||
&json!({"name": "Kovács Anna", "email": "anna@example.com",
|
||||
"address": {"line1": "Fő utca 1.", "line2": "2/3", "postal_code": "6720", "city": "Szeged", "country": "HU"},
|
||||
"tax_ids": []}),
|
||||
None,
|
||||
);
|
||||
assert_eq!(person.name, "Kovács Anna");
|
||||
assert_eq!(person.address, "Fő utca 1., 2/3");
|
||||
assert_eq!((person.tax_type, person.tax_number), ("NO_TAX_NUMBER", None));
|
||||
|
||||
let company = Buyer::from_stripe(
|
||||
&json!({"name": "Kovács Anna", "business_name": "Csillag Kft.",
|
||||
"address": {"line1": "Kossuth tér 2.", "postal_code": "1055", "city": "Budapest", "country": "HU"},
|
||||
"tax_ids": [{"type": "eu_vat", "value": "HU12345678"}, {"type": "hu_tin", "value": "12345678-1-23"}]}),
|
||||
Some("anna@example.com"),
|
||||
);
|
||||
assert_eq!(company.name, "Csillag Kft.");
|
||||
assert_eq!(company.email.as_deref(), Some("anna@example.com"));
|
||||
assert_eq!((company.tax_type, company.tax_number.as_deref()), ("HAS_TAX_NUMBER", Some("12345678-1-23")));
|
||||
|
||||
let eu_only = Buyer::from_stripe(
|
||||
&json!({"name": "Kovács Anna", "business_name": "Csillag Kft.", "address": {"country": "HU"},
|
||||
"tax_ids": [{"type": "eu_vat", "value": "HU12345678"}]}),
|
||||
None,
|
||||
);
|
||||
assert_eq!(eu_only.name, "Csillag Kft.");
|
||||
assert_eq!((eu_only.tax_type, eu_only.tax_number.as_deref()), ("NO_TAX_NUMBER", Some("HU12345678")));
|
||||
|
||||
let abroad = Buyer::from_stripe(&json!({"name": "Anna", "address": {"country": "at"}}), None);
|
||||
assert_eq!((abroad.country.as_str(), abroad.tax_type), ("AT", "FOREIGN"));
|
||||
}
|
||||
}
|
||||
@@ -12,11 +12,15 @@ mod birth_changes;
|
||||
mod config;
|
||||
mod credits;
|
||||
mod error;
|
||||
mod google;
|
||||
mod invoices;
|
||||
mod models;
|
||||
mod oidc;
|
||||
mod packages;
|
||||
mod persons;
|
||||
mod photo;
|
||||
mod routes;
|
||||
mod storage;
|
||||
mod stripe;
|
||||
#[cfg(test)]
|
||||
mod tests;
|
||||
mod views;
|
||||
@@ -30,7 +34,7 @@ use sqlx::PgPool;
|
||||
|
||||
use crate::auth::LoginLimiter;
|
||||
use crate::config::Config;
|
||||
use crate::google::GoogleVerifier;
|
||||
use crate::oidc::IdTokenVerifier;
|
||||
|
||||
const DEFAULT_BIND_ADDR: &str = "0.0.0.0:8081";
|
||||
|
||||
@@ -38,18 +42,35 @@ pub struct AppState {
|
||||
pub db: PgPool,
|
||||
pub config: Config,
|
||||
pub horoscope: HoroscopeClient,
|
||||
pub google: GoogleVerifier,
|
||||
pub google: IdTokenVerifier,
|
||||
pub apple: IdTokenVerifier,
|
||||
pub login_limiter: LoginLimiter,
|
||||
/// The public sign calculator, per visitor address.
|
||||
pub calculator_limiter: LoginLimiter,
|
||||
/// The public place search (typing makes several calls), per visitor address.
|
||||
pub places_limiter: LoginLimiter,
|
||||
/// Share visits already counted (link and visitor address, for half an hour):
|
||||
/// a reload is not a new visit, without storing anything in the browser.
|
||||
pub share_visits: LoginLimiter,
|
||||
pub models: models::Catalog,
|
||||
pub stripe: stripe::Client,
|
||||
/// Uploaded photos; `None` when no object storage is configured.
|
||||
pub storage: Option<storage::Storage>,
|
||||
}
|
||||
|
||||
impl AppState {
|
||||
pub fn new(db: PgPool, config: Config) -> Self {
|
||||
Self {
|
||||
horoscope: HoroscopeClient::new(&config.horoscope_api_url),
|
||||
google: GoogleVerifier::new(config.google_client_ids.clone(), config.google_jwks_url.clone()),
|
||||
google: IdTokenVerifier::google(config.google_client_ids.clone(), config.google_jwks_url.clone()),
|
||||
apple: IdTokenVerifier::apple(config.apple_client_ids.clone(), config.apple_jwks_url.clone()),
|
||||
login_limiter: LoginLimiter::new(10, Duration::from_secs(15 * 60)),
|
||||
calculator_limiter: LoginLimiter::new(30, Duration::from_secs(60 * 60)),
|
||||
places_limiter: LoginLimiter::new(300, Duration::from_secs(60 * 60)),
|
||||
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,
|
||||
}
|
||||
@@ -62,19 +83,27 @@ async fn main() -> anyhow::Result<()> {
|
||||
if std::env::args().nth(1).as_deref() == Some("healthcheck") {
|
||||
return service_kit::healthcheck(addr);
|
||||
}
|
||||
service_kit::init_logging();
|
||||
let _log = service_kit::init_logging("backend");
|
||||
let config = Config::from_env()?;
|
||||
let pool = db::connect(&config.database_url).await.context("connecting to the database")?;
|
||||
db::migrate(&pool).await.context("running database migrations")?;
|
||||
tracing::info!(
|
||||
google_login = !config.google_client_ids.is_empty(),
|
||||
apple_login = !config.apple_client_ids.is_empty(),
|
||||
horoscope_api = %config.horoscope_api_url,
|
||||
"database ready"
|
||||
);
|
||||
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?;
|
||||
|
||||
@@ -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,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,150 @@
|
||||
//! Sign-in with Google and Apple: verification of their ID tokens.
|
||||
//!
|
||||
//! The frontend obtains an ID token (Google Identity Services, or Sign in with
|
||||
//! Apple JS) and posts it to `POST /v1/auth/google` / `/v1/auth/apple`. The
|
||||
//! token is a JWT signed by the provider; it is verified here against the
|
||||
//! provider's published keys (JWKS, cached), the configured client ids
|
||||
//! (audience: Google client ids, Apple Services IDs) and the issuer.
|
||||
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
use jsonwebtoken::{Algorithm, DecodingKey, Validation, decode, decode_header};
|
||||
use serde::Deserialize;
|
||||
use tokio::sync::RwLock;
|
||||
|
||||
use crate::error::ApiError;
|
||||
|
||||
const GOOGLE_ISSUERS: &[&str] = &["accounts.google.com", "https://accounts.google.com"];
|
||||
const APPLE_ISSUERS: &[&str] = &["https://appleid.apple.com"];
|
||||
const JWKS_MAX_AGE: Duration = Duration::from_secs(3600);
|
||||
|
||||
/// What the user sees when a token is rejected; the reason goes to the log.
|
||||
fn failed(provider: &str) -> ApiError {
|
||||
ApiError::InvalidCredentials(format!("Nem sikerült a belépés {provider}-fiókkal. Próbáld újra."))
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
pub struct IdClaims {
|
||||
/// Stable account id at the provider.
|
||||
pub sub: String,
|
||||
pub email: Option<String>,
|
||||
/// Apple sends it as a string ("true").
|
||||
#[serde(default, deserialize_with = "flexible_bool")]
|
||||
pub email_verified: bool,
|
||||
/// Google only; Apple gives the name to the frontend, at the first sign-in.
|
||||
pub name: Option<String>,
|
||||
pub locale: Option<String>,
|
||||
}
|
||||
|
||||
fn flexible_bool<'de, D: serde::Deserializer<'de>>(d: D) -> Result<bool, D::Error> {
|
||||
Ok(match serde_json::Value::deserialize(d)? {
|
||||
serde_json::Value::Bool(b) => b,
|
||||
serde_json::Value::String(s) => s == "true",
|
||||
_ => false,
|
||||
})
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Deserialize)]
|
||||
struct Jwk {
|
||||
kid: String,
|
||||
n: String,
|
||||
e: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
struct JwkSet {
|
||||
keys: Vec<Jwk>,
|
||||
}
|
||||
|
||||
pub struct IdTokenVerifier {
|
||||
/// "Google" or "Apple", for messages.
|
||||
provider: &'static str,
|
||||
issuers: &'static [&'static str],
|
||||
client_ids: Vec<String>,
|
||||
jwks_url: String,
|
||||
http: reqwest::Client,
|
||||
cache: RwLock<Option<(Instant, Vec<Jwk>)>>,
|
||||
}
|
||||
|
||||
impl IdTokenVerifier {
|
||||
fn new(
|
||||
provider: &'static str,
|
||||
issuers: &'static [&'static str],
|
||||
client_ids: Vec<String>,
|
||||
jwks_url: String,
|
||||
) -> Self {
|
||||
let http = reqwest::Client::builder().timeout(Duration::from_secs(10)).build().expect("static configuration");
|
||||
Self { provider, issuers, client_ids, jwks_url, http, cache: RwLock::new(None) }
|
||||
}
|
||||
|
||||
pub fn google(client_ids: Vec<String>, jwks_url: String) -> Self {
|
||||
Self::new("Google", GOOGLE_ISSUERS, client_ids, jwks_url)
|
||||
}
|
||||
|
||||
pub fn apple(client_ids: Vec<String>, jwks_url: String) -> Self {
|
||||
Self::new("Apple", APPLE_ISSUERS, client_ids, jwks_url)
|
||||
}
|
||||
|
||||
pub fn enabled(&self) -> bool {
|
||||
!self.client_ids.is_empty()
|
||||
}
|
||||
|
||||
async fn fetch_keys(&self) -> Result<Vec<Jwk>, ApiError> {
|
||||
let set: JwkSet = self
|
||||
.http
|
||||
.get(&self.jwks_url)
|
||||
.send()
|
||||
.await
|
||||
.and_then(|r| r.error_for_status())
|
||||
.map_err(|e| ApiError::Internal(format!("fetching {} keys: {e}", self.provider)))?
|
||||
.json()
|
||||
.await
|
||||
.map_err(|e| ApiError::Internal(format!("parsing {} keys: {e}", self.provider)))?;
|
||||
Ok(set.keys)
|
||||
}
|
||||
|
||||
/// The key with `kid`; the key set is refetched when it is stale or the
|
||||
/// key is unknown (the providers rotate their keys).
|
||||
async fn key(&self, kid: &str) -> Result<Jwk, ApiError> {
|
||||
if let Some((fetched, keys)) = self.cache.read().await.as_ref()
|
||||
&& fetched.elapsed() < JWKS_MAX_AGE
|
||||
&& let Some(k) = keys.iter().find(|k| k.kid == kid)
|
||||
{
|
||||
return Ok(k.clone());
|
||||
}
|
||||
let keys = self.fetch_keys().await?;
|
||||
let found = keys.iter().find(|k| k.kid == kid).cloned();
|
||||
*self.cache.write().await = Some((Instant::now(), keys));
|
||||
found.ok_or_else(|| {
|
||||
tracing::warn!(provider = self.provider, "id token signed with an unknown key");
|
||||
failed(self.provider)
|
||||
})
|
||||
}
|
||||
|
||||
pub async fn verify(&self, id_token: &str) -> Result<IdClaims, ApiError> {
|
||||
let provider = self.provider;
|
||||
if !self.enabled() {
|
||||
return Err(ApiError::Forbidden(format!("{provider} login is not configured")));
|
||||
}
|
||||
let invalid = |e: jsonwebtoken::errors::Error| {
|
||||
tracing::warn!(provider, error = %e, "invalid id token");
|
||||
failed(provider)
|
||||
};
|
||||
let header = decode_header(id_token).map_err(invalid)?;
|
||||
if header.alg != Algorithm::RS256 {
|
||||
tracing::warn!(provider, alg = ?header.alg, "id token with an unexpected algorithm");
|
||||
return Err(failed(provider));
|
||||
}
|
||||
let kid = header.kid.ok_or_else(|| {
|
||||
tracing::warn!(provider, "id token without a key id");
|
||||
failed(provider)
|
||||
})?;
|
||||
let jwk = self.key(&kid).await?;
|
||||
let key = DecodingKey::from_rsa_components(&jwk.n, &jwk.e).map_err(invalid)?;
|
||||
let mut validation = Validation::new(Algorithm::RS256);
|
||||
validation.set_audience(&self.client_ids);
|
||||
validation.set_issuer(self.issuers);
|
||||
validation.set_required_spec_claims(&["exp", "iss", "aud", "sub"]);
|
||||
Ok(decode::<IdClaims>(id_token, &key, &validation).map_err(invalid)?.claims)
|
||||
}
|
||||
}
|
||||
@@ -37,7 +37,7 @@ pub struct Package {
|
||||
pub name: &'static str,
|
||||
pub tagline: &'static str,
|
||||
pub tier: Tier,
|
||||
/// Gross price (27% VAT included).
|
||||
/// The price paid (with VAT if `INVOICE_VAT` is a rate; none under AAM).
|
||||
pub price_huf: i64,
|
||||
pub natal: i64,
|
||||
pub synastry: i64,
|
||||
@@ -45,11 +45,13 @@ pub struct Package {
|
||||
pub persons: i64,
|
||||
/// Questions about the user's analyses and forecasts.
|
||||
pub questions: i64,
|
||||
/// Tarot readings.
|
||||
pub tarot: i64,
|
||||
/// Badge on the card ("Legnépszerűbb").
|
||||
pub badge: Option<&'static str>,
|
||||
}
|
||||
|
||||
pub const CATALOG: [Package; 7] = [
|
||||
pub const CATALOG: [Package; 8] = [
|
||||
Package {
|
||||
id: "single",
|
||||
name: "Egy elemzés",
|
||||
@@ -61,6 +63,7 @@ pub const CATALOG: [Package; 7] = [
|
||||
forecast: 0,
|
||||
persons: 0,
|
||||
questions: QUESTIONS_INCLUDED,
|
||||
tarot: 2,
|
||||
badge: None,
|
||||
},
|
||||
Package {
|
||||
@@ -74,6 +77,7 @@ pub const CATALOG: [Package; 7] = [
|
||||
forecast: 2,
|
||||
persons: 1,
|
||||
questions: QUESTIONS_INCLUDED,
|
||||
tarot: 5,
|
||||
badge: None,
|
||||
},
|
||||
Package {
|
||||
@@ -87,6 +91,7 @@ pub const CATALOG: [Package; 7] = [
|
||||
forecast: 6,
|
||||
persons: 5,
|
||||
questions: QUESTIONS_INCLUDED,
|
||||
tarot: 10,
|
||||
badge: Some("Legnépszerűbb"),
|
||||
},
|
||||
Package {
|
||||
@@ -100,6 +105,7 @@ pub const CATALOG: [Package; 7] = [
|
||||
forecast: 0,
|
||||
persons: 0,
|
||||
questions: 0,
|
||||
tarot: 0,
|
||||
badge: None,
|
||||
},
|
||||
Package {
|
||||
@@ -113,6 +119,7 @@ pub const CATALOG: [Package; 7] = [
|
||||
forecast: 1,
|
||||
persons: 0,
|
||||
questions: 0,
|
||||
tarot: 0,
|
||||
badge: None,
|
||||
},
|
||||
Package {
|
||||
@@ -126,6 +133,7 @@ pub const CATALOG: [Package; 7] = [
|
||||
forecast: 0,
|
||||
persons: 5,
|
||||
questions: 0,
|
||||
tarot: 0,
|
||||
badge: None,
|
||||
},
|
||||
Package {
|
||||
@@ -139,6 +147,21 @@ pub const CATALOG: [Package; 7] = [
|
||||
forecast: 0,
|
||||
persons: 0,
|
||||
questions: 5,
|
||||
tarot: 0,
|
||||
badge: None,
|
||||
},
|
||||
Package {
|
||||
id: "addon_tarot",
|
||||
name: "+5 kártyajóslás",
|
||||
tagline: "Öt újabb kártyajóslás a saját kérdéseidre.",
|
||||
tier: Tier::Addon,
|
||||
price_huf: 1_000,
|
||||
natal: 0,
|
||||
synastry: 0,
|
||||
forecast: 0,
|
||||
persons: 0,
|
||||
questions: 0,
|
||||
tarot: 5,
|
||||
badge: None,
|
||||
},
|
||||
];
|
||||
@@ -171,6 +194,7 @@ impl Package {
|
||||
"forecast": self.forecast,
|
||||
"persons": self.persons,
|
||||
"questions": self.questions,
|
||||
"tarot": self.tarot,
|
||||
"badge": self.badge,
|
||||
"list_price_huf": list,
|
||||
"savings_percent": savings,
|
||||
@@ -186,6 +210,8 @@ pub enum Source {
|
||||
Mock,
|
||||
/// A redeemed promo code.
|
||||
Promo,
|
||||
/// Paid through Stripe Checkout.
|
||||
Stripe,
|
||||
}
|
||||
|
||||
impl Source {
|
||||
@@ -194,19 +220,75 @@ impl Source {
|
||||
Source::Admin => "admin",
|
||||
Source::Mock => "mock",
|
||||
Source::Promo => "promo",
|
||||
Source::Stripe => "stripe",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Package {
|
||||
/// What the package gives, as a phrase: "2 részletes képletelemzés, 1 kapcsolati elemzés, …".
|
||||
pub fn contents_text(&self) -> String {
|
||||
[
|
||||
(self.natal, "részletes képletelemzés"),
|
||||
(self.synastry, "kapcsolati elemzés"),
|
||||
(self.forecast, "éves előrejelzés"),
|
||||
(self.persons, "személyhely"),
|
||||
(self.questions, "kérdés"),
|
||||
(self.tarot, "kártyajóslás"),
|
||||
]
|
||||
.into_iter()
|
||||
.filter(|&(n, _)| n > 0)
|
||||
.map(|(n, what)| format!("{n} {what}"))
|
||||
.collect::<Vec<_>>()
|
||||
.join(", ")
|
||||
}
|
||||
|
||||
/// The invoice item: a name that says what the service is (online,
|
||||
/// software-made content; no profession implied), and what the package
|
||||
/// contains (Áfa tv. 169. § e). Kept neutral: the main packages keep
|
||||
/// their plain names, the add-ons share one name, and tarot readings are
|
||||
/// listed as text content.
|
||||
pub fn invoice_item(&self) -> (String, String) {
|
||||
let name = match self.tier {
|
||||
Tier::Main => format!("Online tartalomszolgáltatás – {} csomag", self.name),
|
||||
Tier::Addon => "Online tartalomszolgáltatás – kiegészítő csomag".to_string(),
|
||||
};
|
||||
let lines: Vec<String> = [
|
||||
(self.natal, "képletelemzés"),
|
||||
(self.synastry, "kapcsolati elemzés"),
|
||||
(self.forecast, "éves előrejelzés"),
|
||||
(self.persons, "további személy felvétele"),
|
||||
(self.questions, "kérdés"),
|
||||
(self.tarot, "egyedi szöveges tartalom"),
|
||||
]
|
||||
.into_iter()
|
||||
.filter(|&(n, _)| n > 0)
|
||||
.map(|(n, what)| format!("{n} {what}"))
|
||||
.collect();
|
||||
let comment = format!(
|
||||
"Hozzáférés a sorsfonalak.hu szoftveresen előállított, személyre szabott szöveges tartalmaihoz: {}. \
|
||||
Digitális tartalom.",
|
||||
lines.join(", ")
|
||||
);
|
||||
(name, comment)
|
||||
}
|
||||
|
||||
/// The name and description on Stripe's payment page and receipt: as on
|
||||
/// the site, but tarot readings are called "kártya" there.
|
||||
pub fn checkout_text(&self) -> (String, String) {
|
||||
let plain = |s: &str| s.replace("kártyajóslás", "kártya");
|
||||
(format!("Sorsfonalak – {}", plain(self.name)), plain(self.tagline))
|
||||
}
|
||||
|
||||
/// What the package gives, unit by unit.
|
||||
pub fn contents(&self) -> [(Unit, i64); 5] {
|
||||
pub fn contents(&self) -> [(Unit, i64); 6] {
|
||||
[
|
||||
(Unit::Natal, self.natal),
|
||||
(Unit::Synastry, self.synastry),
|
||||
(Unit::Forecast, self.forecast),
|
||||
(Unit::Person, self.persons),
|
||||
(Unit::Question, self.questions),
|
||||
(Unit::Tarot, self.tarot),
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -268,7 +350,7 @@ async fn record(
|
||||
let order = Uuid::now_v7();
|
||||
let price = match source {
|
||||
Source::Admin | Source::Promo => 0,
|
||||
Source::Mock => package.price_huf,
|
||||
Source::Mock | Source::Stripe => package.price_huf,
|
||||
};
|
||||
sqlx::query(
|
||||
"INSERT INTO package_orders (id, user_id, package, source, price_huf, note, created_by) \
|
||||
@@ -338,4 +420,33 @@ mod tests {
|
||||
assert!(CATALOG.iter().filter(|p| p.tier == Tier::Main).all(|p| p.questions == QUESTIONS_INCLUDED));
|
||||
assert_eq!(find("addon_questions").unwrap().questions, 5);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn invoice_items_say_what_was_bought() {
|
||||
let (name, comment) = find("couple").unwrap().invoice_item();
|
||||
assert_eq!(name, "Online tartalomszolgáltatás – Páros csomag");
|
||||
assert_eq!(
|
||||
comment,
|
||||
"Hozzáférés a sorsfonalak.hu szoftveresen előállított, személyre szabott szöveges tartalmaihoz: \
|
||||
2 képletelemzés, 1 kapcsolati elemzés, 2 éves előrejelzés, 1 további személy felvétele, 3 kérdés, \
|
||||
5 egyedi szöveges tartalom. Digitális tartalom."
|
||||
);
|
||||
let (name, comment) = find("addon_persons").unwrap().invoice_item();
|
||||
assert_eq!(name, "Online tartalomszolgáltatás – kiegészítő csomag");
|
||||
assert!(comment.ends_with("tartalmaihoz: 5 további személy felvétele. Digitális tartalom."), "{comment}");
|
||||
// No profession and no fortune-telling is implied.
|
||||
for package in &CATALOG {
|
||||
let item = format!("{:?}", package.invoice_item()).to_lowercase();
|
||||
assert!(!item.contains("asztrol") && !item.contains("jóslás") && !item.contains("kártya"), "{item}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn stripe_says_kartya_instead_of_kartyajoslas() {
|
||||
let (name, description) = find("addon_tarot").unwrap().checkout_text();
|
||||
assert_eq!(name, "Sorsfonalak – +5 kártya");
|
||||
assert_eq!(description, "Öt újabb kártya a saját kérdéseidre.");
|
||||
assert_eq!(find("couple").unwrap().checkout_text().0, "Sorsfonalak – Páros");
|
||||
assert!(CATALOG.iter().all(|p| !format!("{:?}", p.checkout_text()).contains("jóslás")));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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<u8>,
|
||||
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<Photo, String> {
|
||||
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<u8> {
|
||||
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());
|
||||
}
|
||||
}
|
||||
@@ -35,6 +35,10 @@ pub async fn me(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
|
||||
let package = crate::packages::current(&mut conn, auth.id()).await?;
|
||||
let share_reward = super::shares::reward_granted(&state.db, auth.id()).await?;
|
||||
let referrals = super::shares::referral_rewards(&mut conn, auth.id()).await?;
|
||||
let (invoices,): (i64,) = sqlx::query_as("SELECT count(*) FROM invoices WHERE user_id = $1")
|
||||
.bind(auth.id())
|
||||
.fetch_one(&mut *conn)
|
||||
.await?;
|
||||
Ok(Json(json!({
|
||||
"user": UserView::from(&auth.user),
|
||||
"providers": providers.into_iter().map(|(p,)| p).collect::<Vec<_>>(),
|
||||
@@ -47,6 +51,8 @@ pub async fn me(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
|
||||
"share_reward_granted": share_reward,
|
||||
// Natal analyses earned by bringing new users, and how many can be.
|
||||
"referral_rewards": { "earned": referrals, "limit": super::shares::REFERRAL_LIMIT },
|
||||
// The "Számláim" menu shows up with the first invoice.
|
||||
"invoice_count": invoices,
|
||||
})))
|
||||
}
|
||||
|
||||
@@ -107,9 +113,9 @@ pub async fn change_password(
|
||||
.await?;
|
||||
if let Some((hash,)) = existing {
|
||||
let current =
|
||||
req.current_password.ok_or_else(|| ApiError::BadRequest("current_password is required".into()))?;
|
||||
req.current_password.ok_or_else(|| ApiError::BadRequest("Add meg a jelenlegi jelszavadat.".into()))?;
|
||||
if !verify_password(current, hash).await? {
|
||||
return Err(ApiError::InvalidCredentials("the current password is wrong".into()));
|
||||
return Err(ApiError::InvalidCredentials("A jelenlegi jelszó hibás.".into()));
|
||||
}
|
||||
}
|
||||
let hash = hash_password(req.new_password).await?;
|
||||
@@ -159,11 +165,11 @@ pub async fn export(State(state): St, auth: AuthUser) -> ApiResult<impl IntoResp
|
||||
"last_login_at": rfc3339_opt(auth.user.last_login_at),
|
||||
"login_methods": rows("SELECT json_build_object('provider', provider, 'email', email, 'created_at', created_at, 'last_used_at', last_used_at) FROM auth_identities WHERE user_id = $1").await?,
|
||||
"sessions": rows("SELECT json_build_object('created_at', created_at, 'expires_at', expires_at, 'user_agent', user_agent) FROM sessions WHERE user_id = $1").await?,
|
||||
"charts": rows("SELECT json_build_object('id', id, 'label', label, 'is_primary', is_primary, 'birth_data', birth_data, 'result', result, 'created_at', created_at) FROM charts WHERE owner_id = $1").await?,
|
||||
"charts": rows("SELECT json_build_object('id', id, 'label', label, 'is_primary', is_primary, 'birth_data', birth_data, 'result', result, 'created_at', created_at) FROM charts WHERE owner_id = $1 AND kind <> '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?,
|
||||
@@ -179,7 +185,7 @@ pub struct DeleteMe {
|
||||
}
|
||||
|
||||
/// GDPR: deletes the account and everything that belongs to it (charts,
|
||||
/// synastries using them, analyses, shares, sessions, credits).
|
||||
/// synastries using them, analyses, tarot readings, shares, sessions, credits).
|
||||
pub async fn delete_me(
|
||||
State(state): St,
|
||||
auth: AuthUser,
|
||||
@@ -189,7 +195,39 @@ pub async fn delete_me(
|
||||
if req.confirm != "DELETE" {
|
||||
return Err(ApiError::BadRequest("set confirm to \"DELETE\" to delete the account".into()));
|
||||
}
|
||||
sqlx::query("DELETE FROM users WHERE id = $1").bind(auth.id()).execute(&state.db).await?;
|
||||
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<Uuid> = 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())
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
sqlx::query("DELETE FROM users WHERE id = $1").bind(auth.id()).execute(&mut *tx).await?;
|
||||
tx.commit().await?;
|
||||
tracing::info!(user = %auth.id(), "account deleted");
|
||||
Ok((StatusCode::NO_CONTENT, jar.add(removal_cookie(&state.config))))
|
||||
}
|
||||
|
||||
@@ -46,14 +46,16 @@ pub async fn list_users(
|
||||
i64,
|
||||
i64,
|
||||
i64,
|
||||
i64,
|
||||
);
|
||||
let rows: Vec<Row> = 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'), \
|
||||
(SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger l WHERE l.user_id = u.id AND l.unit = 'question') \
|
||||
(SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger l WHERE l.user_id = u.id AND l.unit = 'question'), \
|
||||
(SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger l WHERE l.user_id = u.id AND l.unit = 'tarot') \
|
||||
FROM users u \
|
||||
WHERE $1::text IS NULL OR u.email ILIKE $1 OR u.display_name ILIKE $1 \
|
||||
ORDER BY u.created_at DESC LIMIT $2 OFFSET $3",
|
||||
@@ -65,12 +67,14 @@ pub async fn list_users(
|
||||
.await?;
|
||||
let users: Vec<Value> = rows
|
||||
.into_iter()
|
||||
.map(|(id, email, name, roles, verified, created, last_login, charts, natal, synastry, forecast, question)| {
|
||||
.map(|(id, email, name, roles, verified, created, last_login, charts, natal, synastry, forecast, question, tarot)| {
|
||||
json!({
|
||||
"id": id, "email": email, "display_name": name, "roles": roles, "email_verified": verified,
|
||||
"created_at": rfc3339(created), "last_login_at": rfc3339_opt(last_login),
|
||||
"charts": charts,
|
||||
"analyses_left": {"natal": natal, "synastry": synastry, "forecast": forecast, "question": question},
|
||||
"analyses_left": {
|
||||
"natal": natal, "synastry": synastry, "forecast": forecast, "question": question, "tarot": tarot,
|
||||
},
|
||||
})
|
||||
})
|
||||
.collect();
|
||||
|
||||
@@ -31,7 +31,6 @@ use crate::auth::AuthUser;
|
||||
use crate::credits::{self, Unit};
|
||||
use crate::error::{ApiError, ApiResult};
|
||||
use crate::views::{rfc3339, rfc3339_opt, sha256_hex};
|
||||
use db::Role;
|
||||
|
||||
#[derive(Debug, Clone, sqlx::FromRow)]
|
||||
/// An analysis as users see it; the model is left out on purpose (a business secret).
|
||||
@@ -56,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";
|
||||
|
||||
@@ -123,10 +122,27 @@ fn optional_body(body: &[u8]) -> Result<AnalysisRequest, ApiError> {
|
||||
}
|
||||
|
||||
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(
|
||||
@@ -136,10 +152,8 @@ async fn request(
|
||||
req: AnalysisRequest,
|
||||
) -> ApiResult<(StatusCode, Json<Value>)> {
|
||||
let language = validate_locale(state, Some(req.language.as_deref().unwrap_or(&auth.user.locale)))?;
|
||||
// Admins use no unit.
|
||||
let admin = auth.user.has_role(Role::Admin);
|
||||
// Admins use units too (they can add more on the admin page).
|
||||
let unit = match target {
|
||||
_ if admin => None,
|
||||
Target::Synastry { .. } => Some(Unit::Synastry),
|
||||
Target::Forecast { .. } => Some(Unit::Forecast),
|
||||
_ => Some(Unit::Natal),
|
||||
@@ -182,10 +196,16 @@ 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?;
|
||||
|
||||
// One request at a time per user (a double click must not queue and pay
|
||||
// for the same analysis twice): the user row is locked until commit.
|
||||
let mut tx = state.db.begin().await?;
|
||||
sqlx::query("SELECT id FROM users WHERE id = $1 FOR UPDATE").bind(user).execute(&mut *tx).await?;
|
||||
|
||||
// Already requested for this chart/synastry: return it.
|
||||
let existing: Option<AnalysisRow> = sqlx::query_as(&format!(
|
||||
"SELECT {ANALYSIS_COLUMNS} FROM analyses \
|
||||
@@ -196,7 +216,7 @@ pub(super) async fn queue(
|
||||
.bind(synastry_id)
|
||||
.bind(cache_key)
|
||||
.bind(forecast_id)
|
||||
.fetch_optional(&state.db)
|
||||
.fetch_optional(&mut *tx)
|
||||
.await?;
|
||||
if let Some(row) = existing {
|
||||
return Ok((StatusCode::OK, row));
|
||||
@@ -210,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<i32>, Option<i32>)> = 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(&state.db)
|
||||
.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<i32>, Option<i32>)> = 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)
|
||||
@@ -238,13 +263,13 @@ pub(super) async fn queue(
|
||||
.bind(OffsetDateTime::now_utc())
|
||||
.bind(forecast_id)
|
||||
.bind(fallback)
|
||||
.fetch_one(&state.db)
|
||||
.fetch_one(&mut *tx)
|
||||
.await?;
|
||||
tx.commit().await?;
|
||||
return Ok((StatusCode::CREATED, row));
|
||||
}
|
||||
|
||||
// New analysis: spend a unit and queue it for the worker.
|
||||
let mut tx = state.db.begin().await?;
|
||||
let row: AnalysisRow = sqlx::query_as(&insert)
|
||||
.bind(id)
|
||||
.bind(kind)
|
||||
@@ -389,11 +414,18 @@ pub async fn regenerate(
|
||||
if row.status == "pending" || row.status == "running" {
|
||||
return Err(ApiError::conflict("analysis_in_progress", "Ez az elemzés éppen készül."));
|
||||
}
|
||||
let kind = Kind::parse(&row.kind).ok_or_else(|| ApiError::Internal(format!("unknown kind {}", row.kind)))?;
|
||||
let hash = target_hash(&state.db, &row).await?;
|
||||
let hash = hash.ok_or(ApiError::NotFound("analysis"))?;
|
||||
let (model, fallback) = crate::models::models_for(&state, kind).await?;
|
||||
let (cache_key, prompt_version) = versions(&state, kind.as_str(), &hash, &model, &row.language).await?;
|
||||
let (kind, model, fallback, cache_key, prompt_version) = if row.kind == "tarot" {
|
||||
// A tarot reading: the analysis model, the same cards, never cached.
|
||||
let (model, fallback) = crate::models::models_for(&state, Kind::Natal).await?;
|
||||
("tarot", model, fallback, format!("tarot|{id}"), state.config.prompt_version.clone())
|
||||
} else {
|
||||
let kind = Kind::parse(&row.kind).ok_or_else(|| ApiError::Internal(format!("unknown kind {}", row.kind)))?;
|
||||
let hash = target_hash(&state.db, &row).await?;
|
||||
let hash = hash.ok_or(ApiError::NotFound("analysis"))?;
|
||||
let (model, fallback) = crate::models::models_for(&state, kind).await?;
|
||||
let (cache_key, prompt_version) = versions(&state, kind.as_str(), &hash, &model, &row.language).await?;
|
||||
(kind.as_str(), model, fallback, cache_key, prompt_version)
|
||||
};
|
||||
let mut tx = state.db.begin().await?;
|
||||
let row: AnalysisRow = sqlx::query_as(&format!(
|
||||
"UPDATE analyses SET status = 'pending', content = NULL, error = NULL, model_used = NULL, \
|
||||
@@ -413,6 +445,6 @@ pub async fn regenerate(
|
||||
// Wakes the worker, as a new analysis does.
|
||||
sqlx::query("SELECT pg_notify('analyses', '')").execute(&mut *tx).await?;
|
||||
tx.commit().await?;
|
||||
tracing::info!(%id, kind = kind.as_str(), "analysis regenerated");
|
||||
tracing::info!(%id, kind, "analysis regenerated");
|
||||
Ok(Json(row.view()))
|
||||
}
|
||||
|
||||
+213
-109
@@ -1,5 +1,10 @@
|
||||
//! Registration and login: e-mail + password, Google; e-mail verification,
|
||||
//! password reset, logout.
|
||||
//! Registration and login: e-mail + password, Google, Apple; password links,
|
||||
//! logout.
|
||||
//!
|
||||
//! A password can only be set through a link sent to the address (sign-up,
|
||||
//! forgotten password), by whoever opens it. So every password account has a
|
||||
//! confirmed address, and nobody can set a password for someone else's
|
||||
//! address: linking a Google or Apple account with the same address is safe.
|
||||
|
||||
use axum::Json;
|
||||
use axum::extract::State;
|
||||
@@ -40,7 +45,7 @@ pub fn normalize_email(email: &str) -> Result<String, ApiError> {
|
||||
!local.is_empty() && domain.contains('.') && !domain.starts_with('.') && !domain.ends_with('.')
|
||||
})
|
||||
&& !email.chars().any(char::is_whitespace);
|
||||
if valid { Ok(email) } else { Err(ApiError::BadRequest("invalid e-mail address".into())) }
|
||||
if valid { Ok(email) } else { Err(ApiError::BadRequest("Érvénytelen e-mail-cím.".into())) }
|
||||
}
|
||||
|
||||
pub fn validate_locale(state: &AppState, locale: Option<&str>) -> Result<String, ApiError> {
|
||||
@@ -100,14 +105,14 @@ async fn issue_token(
|
||||
Ok(token)
|
||||
}
|
||||
|
||||
/// Uses a one-time token; returns its user.
|
||||
async fn consume_token(conn: &mut PgConnection, token: &str, purpose: &str) -> Result<Uuid, ApiError> {
|
||||
/// Uses a one-time token of one of `purposes`; returns its user.
|
||||
async fn consume_token(conn: &mut PgConnection, token: &str, purposes: &[&str]) -> Result<Uuid, ApiError> {
|
||||
let row: Option<(Uuid,)> = sqlx::query_as(
|
||||
"UPDATE auth_tokens SET used_at = now() \
|
||||
WHERE token_hash = $1 AND purpose = $2 AND used_at IS NULL AND expires_at > now() RETURNING user_id",
|
||||
WHERE token_hash = $1 AND purpose = ANY($2) AND used_at IS NULL AND expires_at > now() RETURNING user_id",
|
||||
)
|
||||
.bind(db::token_hash(token.trim()))
|
||||
.bind(purpose)
|
||||
.bind(purposes)
|
||||
.fetch_optional(conn)
|
||||
.await?;
|
||||
row.map(|(id,)| id).ok_or(ApiError::InvalidToken)
|
||||
@@ -141,10 +146,44 @@ pub async fn queue_email_to(
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn queue_verification(state: &AppState, conn: &mut PgConnection, user: &User) -> Result<(), ApiError> {
|
||||
let token = issue_token(conn, user.id, "verify_email", VERIFY_EMAIL_TTL).await?;
|
||||
let url = format!("{}/verify-email?token={token}", state.config.public_base_url);
|
||||
queue_email(conn, user, "verify_email", json!({ "url": url, "display_name": user.display_name })).await
|
||||
/// The e-mails that carry a password link.
|
||||
const LINK_TEMPLATES: [&str; 3] = ["verify_email", "reset_password", "account_exists"];
|
||||
|
||||
/// Whether another password link may go to `email` now: one per kind a
|
||||
/// minute and five an hour, so the forms cannot flood a mailbox.
|
||||
async fn may_send_link(conn: &mut PgConnection, email: &str, template: &str) -> Result<bool, ApiError> {
|
||||
let (same_kind, total): (i64, i64) = sqlx::query_as(
|
||||
"SELECT count(*) FILTER (WHERE template = $2 AND created_at > now() - interval '1 minute'), count(*) \
|
||||
FROM email_outbox WHERE to_email = $1 AND template = ANY($3) AND created_at > now() - interval '1 hour'",
|
||||
)
|
||||
.bind(email)
|
||||
.bind(template)
|
||||
.bind(&LINK_TEMPLATES[..])
|
||||
.fetch_one(conn)
|
||||
.await?;
|
||||
Ok(same_kind == 0 && total < 5)
|
||||
}
|
||||
|
||||
/// Sends a link that sets the password: `verify_email` (sign-up, valid for 3
|
||||
/// days), `reset_password` (forgotten password) or `account_exists` (sign-up
|
||||
/// with an address that already has an account), the latter two for 1 hour.
|
||||
async fn queue_password_link(
|
||||
state: &AppState,
|
||||
conn: &mut PgConnection,
|
||||
user: &User,
|
||||
template: &'static str,
|
||||
) -> Result<(), ApiError> {
|
||||
if !may_send_link(conn, &user.email, template).await? {
|
||||
tracing::info!(user = %user.id, template, "password link not sent: one went out a moment ago");
|
||||
return Ok(());
|
||||
}
|
||||
let (purpose, ttl) = match template {
|
||||
"verify_email" => ("verify_email", VERIFY_EMAIL_TTL),
|
||||
_ => ("reset_password", RESET_PASSWORD_TTL),
|
||||
};
|
||||
let token = issue_token(conn, user.id, purpose, ttl).await?;
|
||||
let url = format!("{}/jelszo?token={token}", state.config.public_base_url);
|
||||
queue_email(conn, user, template, json!({ "url": url, "display_name": user.display_name })).await
|
||||
}
|
||||
|
||||
fn login_response(
|
||||
@@ -165,7 +204,6 @@ fn login_response(
|
||||
#[serde(deny_unknown_fields)]
|
||||
pub struct RegisterRequest {
|
||||
email: String,
|
||||
password: String,
|
||||
display_name: Option<String>,
|
||||
locale: Option<String>,
|
||||
/// The invitation link's token, while sign-up needs an invitation.
|
||||
@@ -183,57 +221,57 @@ pub fn password_login_enabled(state: &crate::AppState) -> Result<(), ApiError> {
|
||||
}
|
||||
}
|
||||
|
||||
/// Sign-up with an e-mail address: no password yet, only a link to the
|
||||
/// address, where the password is set. Answers 202 the same way whether or
|
||||
/// not the address already has an account (that one gets a link to set a
|
||||
/// password instead), so the form does not reveal who is registered.
|
||||
pub async fn register(
|
||||
State(state): St,
|
||||
headers: HeaderMap,
|
||||
jar: CookieJar,
|
||||
WithRejection(Json(req), _): Body<RegisterRequest>,
|
||||
) -> ApiResult<impl IntoResponse> {
|
||||
password_login_enabled(&state)?;
|
||||
let email = normalize_email(&req.email)?;
|
||||
validate_password(&req.password)?;
|
||||
let locale = validate_locale(&state, req.locale.as_deref())?;
|
||||
let hash = hash_password(req.password).await?;
|
||||
|
||||
let mut tx = state.db.begin().await?;
|
||||
let exists: Option<(Uuid,)> =
|
||||
sqlx::query_as("SELECT id FROM users WHERE email = $1").bind(&email).fetch_optional(&mut *tx).await?;
|
||||
if exists.is_some() {
|
||||
return Err(ApiError::conflict("email_taken", "an account with this e-mail address already exists"));
|
||||
let existing: Option<User> =
|
||||
sqlx::query_as(&format!("SELECT {USER_COLUMNS} FROM users WHERE email = $1 FOR UPDATE"))
|
||||
.bind(&email)
|
||||
.fetch_optional(&mut *tx)
|
||||
.await?;
|
||||
match existing {
|
||||
Some(user) if user.email_verified_at.is_none() => {
|
||||
queue_password_link(&state, &mut tx, &user, "verify_email").await?;
|
||||
}
|
||||
Some(user) => queue_password_link(&state, &mut tx, &user, "account_exists").await?,
|
||||
None => {
|
||||
super::invitations::admit(&state, &mut tx, &email, req.invite_token.as_deref()).await?;
|
||||
let user_id = Uuid::now_v7();
|
||||
sqlx::query("INSERT INTO users (id, email, display_name, locale) VALUES ($1, $2, $3, $4)")
|
||||
.bind(user_id)
|
||||
.bind(&email)
|
||||
.bind(clean_name(req.display_name))
|
||||
.bind(&locale)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
// Packages of invitations go to this account; only whoever opens
|
||||
// the link in the mailbox can ever log in to it.
|
||||
super::invitations::mark_accepted(
|
||||
&mut tx,
|
||||
user_id,
|
||||
&email,
|
||||
req.invite_token.as_deref(),
|
||||
state.config.free_person_slots,
|
||||
)
|
||||
.await?;
|
||||
super::shares::record_referral(&mut tx, state.config.referral_rewards, user_id, req.referral.as_deref())
|
||||
.await?;
|
||||
let user = load_user(&mut tx, user_id).await?;
|
||||
queue_password_link(&state, &mut tx, &user, "verify_email").await?;
|
||||
}
|
||||
}
|
||||
super::invitations::admit(&state, &mut tx, &email, req.invite_token.as_deref()).await?;
|
||||
let user_id = Uuid::now_v7();
|
||||
sqlx::query("INSERT INTO users (id, email, display_name, locale) VALUES ($1, $2, $3, $4)")
|
||||
.bind(user_id)
|
||||
.bind(&email)
|
||||
.bind(clean_name(req.display_name))
|
||||
.bind(&locale)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
sqlx::query("INSERT INTO auth_identities (id, user_id, provider, subject, password_hash, email) VALUES ($1, $2, 'password', $3, $4, $5)")
|
||||
.bind(Uuid::now_v7())
|
||||
.bind(user_id)
|
||||
.bind(user_id.to_string())
|
||||
.bind(hash)
|
||||
.bind(&email)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
super::invitations::mark_accepted(
|
||||
&mut tx,
|
||||
user_id,
|
||||
&email,
|
||||
req.invite_token.as_deref(),
|
||||
state.config.free_person_slots,
|
||||
)
|
||||
.await?;
|
||||
super::shares::record_referral(&mut tx, state.config.referral_rewards, user_id, req.referral.as_deref()).await?;
|
||||
let mut user = load_user(&mut tx, user_id).await?;
|
||||
apply_bootstrap_admin(&state, &mut tx, &mut user).await?;
|
||||
queue_verification(&state, &mut tx, &user).await?;
|
||||
tx.commit().await?;
|
||||
|
||||
let session = create_session(&state.db, &state.config, user.id, user_agent(&headers)).await?;
|
||||
Ok(login_response(&state, jar, &user, session, true))
|
||||
Ok((StatusCode::ACCEPTED, Json(json!({ "sent": true }))))
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
@@ -250,13 +288,16 @@ pub async fn login(
|
||||
WithRejection(Json(req), _): Body<LoginRequest>,
|
||||
) -> ApiResult<impl IntoResponse> {
|
||||
password_login_enabled(&state)?;
|
||||
let invalid = || ApiError::InvalidCredentials("wrong e-mail address or password".into());
|
||||
let invalid = || ApiError::InvalidCredentials("Hibás e-mail-cím vagy jelszó.".into());
|
||||
let email = normalize_email(&req.email).map_err(|_| invalid())?;
|
||||
state.login_limiter.check(&email)?;
|
||||
|
||||
// Passwords are set through e-mailed links, so every password account has
|
||||
// a confirmed address; an unconfirmed one (made before that) cannot log in.
|
||||
let row: Option<(Uuid, String)> = sqlx::query_as(
|
||||
"SELECT u.id, i.password_hash FROM users u \
|
||||
JOIN auth_identities i ON i.user_id = u.id AND i.provider = 'password' WHERE u.email = $1",
|
||||
JOIN auth_identities i ON i.user_id = u.id AND i.provider = 'password' \
|
||||
WHERE u.email = $1 AND u.email_verified_at IS NOT NULL",
|
||||
)
|
||||
.bind(&email)
|
||||
.fetch_optional(&state.db)
|
||||
@@ -307,20 +348,80 @@ pub async fn google(
|
||||
WithRejection(Json(req), _): Body<GoogleRequest>,
|
||||
) -> ApiResult<impl IntoResponse> {
|
||||
let claims = state.google.verify(&req.id_token).await?;
|
||||
let signup = Signup {
|
||||
name: claims.name.clone(),
|
||||
locale: claims.locale.clone(),
|
||||
invite_token: req.invite_token,
|
||||
referral: req.referral,
|
||||
};
|
||||
social_login(&state, headers, jar, "google", claims, signup).await
|
||||
}
|
||||
|
||||
// --- Apple ------------------------------------------------------------------------------
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
pub struct AppleRequest {
|
||||
/// ID token (JWT) from Sign in with Apple JS.
|
||||
id_token: String,
|
||||
/// The name Apple gives the page at the first sign-in only (it is not in
|
||||
/// the token): used when the account is created.
|
||||
name: Option<String>,
|
||||
invite_token: Option<String>,
|
||||
referral: Option<String>,
|
||||
}
|
||||
|
||||
/// Logs in with Apple, like [`google`]. The address may be an Apple relay
|
||||
/// (`…@privaterelay.appleid.com`), which forwards our e-mails.
|
||||
pub async fn apple(
|
||||
State(state): St,
|
||||
headers: HeaderMap,
|
||||
jar: CookieJar,
|
||||
WithRejection(Json(req), _): Body<AppleRequest>,
|
||||
) -> ApiResult<impl IntoResponse> {
|
||||
let claims = state.apple.verify(&req.id_token).await?;
|
||||
let signup = Signup { name: req.name, locale: None, invite_token: req.invite_token, referral: req.referral };
|
||||
social_login(&state, headers, jar, "apple", claims, signup).await
|
||||
}
|
||||
|
||||
/// What a new account starts with.
|
||||
struct Signup {
|
||||
name: Option<String>,
|
||||
locale: Option<String>,
|
||||
invite_token: Option<String>,
|
||||
referral: Option<String>,
|
||||
}
|
||||
|
||||
/// Logs in with a verified provider identity: the linked user, else the user
|
||||
/// with the same (provider-verified) e-mail address, else a new user.
|
||||
async fn social_login(
|
||||
state: &AppState,
|
||||
headers: HeaderMap,
|
||||
jar: CookieJar,
|
||||
provider: &'static str,
|
||||
claims: crate::oidc::IdClaims,
|
||||
signup: Signup,
|
||||
) -> ApiResult<impl IntoResponse + use<>> {
|
||||
let email = match (claims.email.as_deref(), claims.email_verified) {
|
||||
(Some(e), true) => normalize_email(e)?,
|
||||
_ => return Err(ApiError::InvalidCredentials("the Google account has no verified e-mail address".into())),
|
||||
_ => {
|
||||
return Err(ApiError::InvalidCredentials(format!(
|
||||
"A {provider}-fiókodhoz nem tartozik megerősített e-mail-cím."
|
||||
)));
|
||||
}
|
||||
};
|
||||
|
||||
let mut tx = state.db.begin().await?;
|
||||
let linked: Option<(Uuid,)> =
|
||||
sqlx::query_as("SELECT user_id FROM auth_identities WHERE provider = 'google' AND subject = $1")
|
||||
sqlx::query_as("SELECT user_id FROM auth_identities WHERE provider = $1 AND subject = $2")
|
||||
.bind(provider)
|
||||
.bind(&claims.sub)
|
||||
.fetch_optional(&mut *tx)
|
||||
.await?;
|
||||
let (user_id, created) = match linked {
|
||||
Some((id,)) => {
|
||||
sqlx::query("UPDATE auth_identities SET last_used_at = now() WHERE provider = 'google' AND subject = $1")
|
||||
sqlx::query("UPDATE auth_identities SET last_used_at = now() WHERE provider = $1 AND subject = $2")
|
||||
.bind(provider)
|
||||
.bind(&claims.sub)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
@@ -331,7 +432,24 @@ pub async fn google(
|
||||
sqlx::query_as("SELECT id FROM users WHERE email = $1").bind(&email).fetch_optional(&mut *tx).await?;
|
||||
let (id, created) = match existing {
|
||||
Some((id,)) => {
|
||||
// Google has verified the address, so it counts as verified here too.
|
||||
// An account whose address was never confirmed may have
|
||||
// been made by someone else with this address: its
|
||||
// password and sessions go, the provider has proven who
|
||||
// owns the address.
|
||||
let unverified: bool =
|
||||
sqlx::query_scalar("SELECT email_verified_at IS NULL FROM users WHERE id = $1 FOR UPDATE")
|
||||
.bind(id)
|
||||
.fetch_one(&mut *tx)
|
||||
.await?;
|
||||
if unverified {
|
||||
sqlx::query("DELETE FROM auth_identities WHERE user_id = $1 AND provider = 'password'")
|
||||
.bind(id)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
sqlx::query("DELETE FROM sessions WHERE user_id = $1").bind(id).execute(&mut *tx).await?;
|
||||
tracing::warn!(user = %id, provider, "unconfirmed password account taken over by its address's owner");
|
||||
}
|
||||
// The provider has verified the address, so it counts as verified here too.
|
||||
sqlx::query(
|
||||
"UPDATE users SET email_verified_at = COALESCE(email_verified_at, now()) WHERE id = $1",
|
||||
)
|
||||
@@ -341,9 +459,9 @@ pub async fn google(
|
||||
(id, false)
|
||||
}
|
||||
None => {
|
||||
super::invitations::admit(&state, &mut tx, &email, req.invite_token.as_deref()).await?;
|
||||
super::invitations::admit(state, &mut tx, &email, signup.invite_token.as_deref()).await?;
|
||||
let id = Uuid::now_v7();
|
||||
let locale = claims
|
||||
let locale = signup
|
||||
.locale
|
||||
.as_deref()
|
||||
.and_then(|l| l.split(['-', '_']).next())
|
||||
@@ -355,7 +473,7 @@ pub async fn google(
|
||||
)
|
||||
.bind(id)
|
||||
.bind(&email)
|
||||
.bind(clean_name(claims.name.clone()))
|
||||
.bind(clean_name(signup.name))
|
||||
.bind(locale)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
@@ -363,21 +481,27 @@ pub async fn google(
|
||||
&mut tx,
|
||||
id,
|
||||
&email,
|
||||
req.invite_token.as_deref(),
|
||||
signup.invite_token.as_deref(),
|
||||
state.config.free_person_slots,
|
||||
)
|
||||
.await?;
|
||||
super::shares::record_referral(&mut tx, state.config.referral_rewards, id, req.referral.as_deref())
|
||||
.await?;
|
||||
super::shares::record_referral(
|
||||
&mut tx,
|
||||
state.config.referral_rewards,
|
||||
id,
|
||||
signup.referral.as_deref(),
|
||||
)
|
||||
.await?;
|
||||
(id, true)
|
||||
}
|
||||
};
|
||||
sqlx::query(
|
||||
"INSERT INTO auth_identities (id, user_id, provider, subject, email, last_used_at) \
|
||||
VALUES ($1, $2, 'google', $3, $4, now())",
|
||||
VALUES ($1, $2, $3, $4, $5, now())",
|
||||
)
|
||||
.bind(Uuid::now_v7())
|
||||
.bind(id)
|
||||
.bind(provider)
|
||||
.bind(&claims.sub)
|
||||
.bind(&email)
|
||||
.execute(&mut *tx)
|
||||
@@ -386,11 +510,11 @@ pub async fn google(
|
||||
}
|
||||
};
|
||||
let mut user = load_user(&mut tx, user_id).await?;
|
||||
apply_bootstrap_admin(&state, &mut tx, &mut user).await?;
|
||||
apply_bootstrap_admin(state, &mut tx, &mut user).await?;
|
||||
tx.commit().await?;
|
||||
|
||||
let session = create_session(&state.db, &state.config, user.id, user_agent(&headers)).await?;
|
||||
Ok(login_response(&state, jar, &user, session, created))
|
||||
Ok(login_response(state, jar, &user, session, created))
|
||||
}
|
||||
|
||||
// --- logout -------------------------------------------------------------------------------
|
||||
@@ -406,34 +530,7 @@ pub async fn logout_all(State(state): St, auth: AuthUser, jar: CookieJar) -> Api
|
||||
Ok((StatusCode::NO_CONTENT, jar.add(removal_cookie(&state.config))))
|
||||
}
|
||||
|
||||
// --- e-mail verification and password reset ------------------------------------------------
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
pub struct TokenRequest {
|
||||
token: String,
|
||||
}
|
||||
|
||||
pub async fn verify_email(State(state): St, WithRejection(Json(req), _): Body<TokenRequest>) -> ApiResult<Json<Value>> {
|
||||
let mut tx = state.db.begin().await?;
|
||||
let user_id = consume_token(&mut tx, &req.token, "verify_email").await?;
|
||||
sqlx::query("UPDATE users SET email_verified_at = COALESCE(email_verified_at, now()) WHERE id = $1")
|
||||
.bind(user_id)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
tx.commit().await?;
|
||||
Ok(Json(json!({ "verified": true })))
|
||||
}
|
||||
|
||||
pub async fn resend_verification(State(state): St, auth: AuthUser) -> ApiResult<StatusCode> {
|
||||
if auth.user.email_verified_at.is_some() {
|
||||
return Err(ApiError::conflict("already_verified", "the e-mail address is already verified"));
|
||||
}
|
||||
let mut tx = state.db.begin().await?;
|
||||
queue_verification(&state, &mut tx, &auth.user).await?;
|
||||
tx.commit().await?;
|
||||
Ok(StatusCode::ACCEPTED)
|
||||
}
|
||||
// --- password links ---------------------------------------------------------------------
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
@@ -441,7 +538,9 @@ pub struct ResetRequest {
|
||||
email: String,
|
||||
}
|
||||
|
||||
/// Always 202, so the response does not reveal whether the address is registered.
|
||||
/// Forgotten password: a link to set a new one (also adds a password to a
|
||||
/// Google or Apple account). Always 202, so the response does not reveal
|
||||
/// whether the address is registered.
|
||||
pub async fn request_password_reset(
|
||||
State(state): St,
|
||||
WithRejection(Json(req), _): Body<ResetRequest>,
|
||||
@@ -449,14 +548,12 @@ pub async fn request_password_reset(
|
||||
password_login_enabled(&state)?;
|
||||
let Ok(email) = normalize_email(&req.email) else { return Ok(StatusCode::ACCEPTED) };
|
||||
let mut tx = state.db.begin().await?;
|
||||
let user: Option<User> = sqlx::query_as(&format!("SELECT {USER_COLUMNS} FROM users WHERE email = $1"))
|
||||
let user: Option<User> = sqlx::query_as(&format!("SELECT {USER_COLUMNS} FROM users WHERE email = $1 FOR UPDATE"))
|
||||
.bind(&email)
|
||||
.fetch_optional(&mut *tx)
|
||||
.await?;
|
||||
if let Some(user) = user {
|
||||
let token = issue_token(&mut tx, user.id, "reset_password", RESET_PASSWORD_TTL).await?;
|
||||
let url = format!("{}/reset-password?token={token}", state.config.public_base_url);
|
||||
queue_email(&mut tx, &user, "reset_password", json!({ "url": url, "display_name": user.display_name })).await?;
|
||||
queue_password_link(&state, &mut tx, &user, "reset_password").await?;
|
||||
}
|
||||
tx.commit().await?;
|
||||
Ok(StatusCode::ACCEPTED)
|
||||
@@ -464,31 +561,38 @@ pub async fn request_password_reset(
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
pub struct ResetConfirmRequest {
|
||||
pub struct SetPasswordRequest {
|
||||
token: String,
|
||||
password: String,
|
||||
}
|
||||
|
||||
/// Sets a new password (adding the password login if the user had only
|
||||
/// Google) and ends all sessions.
|
||||
pub async fn confirm_password_reset(
|
||||
/// Sets the password with an e-mailed link (sign-up or forgotten password):
|
||||
/// the address counts as confirmed, every other session ends, and this one
|
||||
/// is logged in.
|
||||
pub async fn set_password_with_link(
|
||||
State(state): St,
|
||||
WithRejection(Json(req), _): Body<ResetConfirmRequest>,
|
||||
) -> ApiResult<StatusCode> {
|
||||
headers: HeaderMap,
|
||||
jar: CookieJar,
|
||||
WithRejection(Json(req), _): Body<SetPasswordRequest>,
|
||||
) -> ApiResult<impl IntoResponse> {
|
||||
password_login_enabled(&state)?;
|
||||
validate_password(&req.password)?;
|
||||
let hash = hash_password(req.password).await?;
|
||||
let mut tx = state.db.begin().await?;
|
||||
let user_id = consume_token(&mut tx, &req.token, "reset_password").await?;
|
||||
let user_id = consume_token(&mut tx, &req.token, &["verify_email", "reset_password"]).await?;
|
||||
set_password(&mut tx, user_id, &hash).await?;
|
||||
// The link arrived in the mailbox, so the address is verified.
|
||||
sqlx::query("UPDATE users SET email_verified_at = COALESCE(email_verified_at, now()) WHERE id = $1")
|
||||
.bind(user_id)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
sqlx::query("DELETE FROM sessions WHERE user_id = $1").bind(user_id).execute(&mut *tx).await?;
|
||||
let mut user = load_user(&mut tx, user_id).await?;
|
||||
apply_bootstrap_admin(&state, &mut tx, &mut user).await?;
|
||||
tx.commit().await?;
|
||||
Ok(StatusCode::NO_CONTENT)
|
||||
state.login_limiter.succeeded(&user.email);
|
||||
|
||||
let session = create_session(&state.db, &state.config, user.id, user_agent(&headers)).await?;
|
||||
Ok(login_response(&state, jar, &user, session, false))
|
||||
}
|
||||
|
||||
/// Creates or replaces the password identity.
|
||||
|
||||
@@ -0,0 +1,117 @@
|
||||
//! The public birth chart (`/szuletesi-horoszkop`): the whole natal chart from
|
||||
//! birth data, without an account, plus the country list and place search it
|
||||
//! needs. A calculation only: no AI, nothing is stored. Each visitor address
|
||||
//! may make a limited number of calculations and place searches an hour, so
|
||||
//! the endpoints cannot serve as a free calculation service for other apps.
|
||||
|
||||
use axum::Json;
|
||||
use axum::extract::{Query, State};
|
||||
use axum::http::HeaderMap;
|
||||
use axum_extra::extract::WithRejection;
|
||||
use serde::Deserialize;
|
||||
use serde_json::{Value, json};
|
||||
|
||||
use super::{Body, St, client_ip};
|
||||
use crate::error::{ApiError, ApiResult};
|
||||
use crate::views::chart_highlights;
|
||||
|
||||
/// The limiter key of the visitor (all unknown addresses share one).
|
||||
fn visitor(headers: &HeaderMap) -> String {
|
||||
client_ip(headers).map_or_else(|| "unknown".to_string(), |ip| format!("ip:{ip}"))
|
||||
}
|
||||
|
||||
fn valid_country(country: &str) -> bool {
|
||||
country.len() == 2 && country.chars().all(|c| c.is_ascii_uppercase())
|
||||
}
|
||||
|
||||
pub async fn countries(State(state): St) -> ApiResult<Json<Value>> {
|
||||
Ok(Json(state.horoscope.countries().await?))
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct PlacesQuery {
|
||||
country: String,
|
||||
q: String,
|
||||
limit: Option<u32>,
|
||||
}
|
||||
|
||||
pub async fn places(
|
||||
State(state): St,
|
||||
headers: HeaderMap,
|
||||
WithRejection(Query(query), _): WithRejection<Query<PlacesQuery>, ApiError>,
|
||||
) -> ApiResult<Json<Value>> {
|
||||
let q = query.q.trim();
|
||||
if !valid_country(&query.country) || q.chars().count() < 2 || q.chars().count() > 80 {
|
||||
return Err(ApiError::BadRequest("Válassz országot, és írj be 2–80 karaktert a település nevéből.".into()));
|
||||
}
|
||||
state.places_limiter.hit(&visitor(&headers))?;
|
||||
Ok(Json(state.horoscope.places(&query.country, q, query.limit.unwrap_or(8).min(10)).await?))
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
pub struct ChartRequest {
|
||||
date: String,
|
||||
/// "HH:MM"; without it there is no Ascendant.
|
||||
time: Option<String>,
|
||||
country: String,
|
||||
geonames_id: i64,
|
||||
/// "earlier" or "later", for a time that occurred twice (clocks set back).
|
||||
ambiguous_time: Option<String>,
|
||||
}
|
||||
|
||||
/// Whether a point may have been in the neighbouring sign at the start or the
|
||||
/// end of the birth day (when the birth time is unknown).
|
||||
fn uncertain(point: &Value, default_speed: f64) -> bool {
|
||||
let speed = point["speed"].as_f64().unwrap_or(default_speed).abs();
|
||||
point["degree_in_sign"].as_f64().is_some_and(|d| d < speed / 2.0 || 30.0 - d < speed / 2.0)
|
||||
}
|
||||
|
||||
/// The natal chart of the birth data, as the chart pages show it.
|
||||
pub async fn chart(
|
||||
State(state): St,
|
||||
headers: HeaderMap,
|
||||
WithRejection(Json(req), _): Body<ChartRequest>,
|
||||
) -> ApiResult<Json<Value>> {
|
||||
if !valid_country(&req.country) {
|
||||
return Err(ApiError::BadRequest("invalid country code".into()));
|
||||
}
|
||||
if req.ambiguous_time.as_deref().is_some_and(|a| a != "earlier" && a != "later") {
|
||||
return Err(ApiError::BadRequest("ambiguous_time is 'earlier' or 'later'".into()));
|
||||
}
|
||||
state.calculator_limiter.hit(&visitor(&headers))?;
|
||||
let mut birth = json!({ "date": req.date, "country": req.country, "geonames_id": req.geonames_id });
|
||||
if let Some(time) = &req.time {
|
||||
birth["time"] = json!(time);
|
||||
}
|
||||
if let Some(ambiguous) = &req.ambiguous_time {
|
||||
birth["ambiguous_time"] = json!(ambiguous);
|
||||
}
|
||||
let chart = state.horoscope.natal(&birth).await?;
|
||||
let time_known = req.time.is_some();
|
||||
let point = |id: &str| {
|
||||
chart["points"]
|
||||
.as_array()
|
||||
.and_then(|points| points.iter().find(|p| p["id"] == id))
|
||||
.cloned()
|
||||
.unwrap_or(Value::Null)
|
||||
};
|
||||
let uncertain = json!({
|
||||
"sun": !time_known && uncertain(&point("sun"), 1.0),
|
||||
"moon": !time_known && uncertain(&point("moon"), 13.2),
|
||||
});
|
||||
Ok(Json(json!({ "highlights": chart_highlights(&chart), "uncertain": uncertain, "chart": chart })))
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn signs_near_a_border_are_uncertain() {
|
||||
assert!(uncertain(&json!({"degree_in_sign": 3.2, "speed": 12.6}), 13.2));
|
||||
assert!(!uncertain(&json!({"degree_in_sign": 15.0, "speed": 12.6}), 13.2));
|
||||
assert!(uncertain(&json!({"degree_in_sign": 29.8}), 1.0));
|
||||
assert!(!uncertain(&json!({"degree_in_sign": 29.0}), 1.0));
|
||||
}
|
||||
}
|
||||
@@ -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/<slug>`) 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<String>,
|
||||
slug: String,
|
||||
photo_key: Option<String>,
|
||||
photo_width: Option<i32>,
|
||||
photo_height: Option<i32>,
|
||||
focus_x: f32,
|
||||
focus_y: f32,
|
||||
published_at: Option<OffsetDateTime>,
|
||||
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<CelebrityRow, ApiError> {
|
||||
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<Option<AnalysisRow>, 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::<String>();
|
||||
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<Uuid>) -> Result<String, sqlx::Error> {
|
||||
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<String, ApiError> {
|
||||
let name: String = name.split_whitespace().collect::<Vec<_>>().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<String> {
|
||||
subtitle.map(|s| s.trim().chars().take(160).collect::<String>()).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<AnalysisRow, ApiError> {
|
||||
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<Value, ApiError> {
|
||||
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>, String, Option<OffsetDateTime>, Option<String>, Value, Option<String>);
|
||||
|
||||
pub async fn list(State(state): St, _admin: AdminUser) -> ApiResult<Json<Value>> {
|
||||
let rows: Vec<ListRow> = 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<Value> = 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<String>,
|
||||
/// 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<CreateCelebrity>,
|
||||
) -> ApiResult<(StatusCode, Json<Value>)> {
|
||||
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<Json<Value>> {
|
||||
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<String>,
|
||||
#[serde(default, deserialize_with = "double_option")]
|
||||
subtitle: Option<Option<String>>,
|
||||
slug: Option<String>,
|
||||
published: Option<bool>,
|
||||
focus_x: Option<f32>,
|
||||
focus_y: Option<f32>,
|
||||
/// Corrected birth data: the chart is calculated again and, if it changed,
|
||||
/// the analysis is written again.
|
||||
birth: Option<Value>,
|
||||
}
|
||||
|
||||
pub async fn update(
|
||||
State(state): St,
|
||||
AdminUser(admin): AdminUser,
|
||||
WithRejection(Path(id), _): IdPath,
|
||||
WithRejection(Json(req), _): Body<UpdateCelebrity>,
|
||||
) -> ApiResult<Json<Value>> {
|
||||
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<f32>, 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<Json<Value>> {
|
||||
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<Json<Value>> {
|
||||
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<Json<Value>> {
|
||||
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<StatusCode> {
|
||||
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<Json<Value>> {
|
||||
let rows: Vec<CelebrityRow> = 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<AuthUser, ApiError>,
|
||||
Path(slug): Path<String>,
|
||||
) -> ApiResult<Json<Value>> {
|
||||
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<String>) -> ApiResult<Response> {
|
||||
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(""));
|
||||
}
|
||||
}
|
||||
@@ -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<Option<Char
|
||||
Ok(sqlx::query_as(&format!("SELECT {CHART_COLUMNS} FROM charts WHERE id = $1")).bind(id).fetch_optional(db).await?)
|
||||
}
|
||||
|
||||
/// A chart of `owner`; 404 for missing charts and charts of others.
|
||||
/// A chart of `owner`; 404 for missing charts, charts of others and famous people's charts.
|
||||
pub async fn owned_chart(db: &PgPool, id: Uuid, owner: Uuid) -> Result<ChartRow, ApiError> {
|
||||
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<Option<ChartRow>, ApiError> {
|
||||
@@ -97,12 +103,13 @@ pub async fn primary_chart(db: &PgPool, owner: Uuid) -> Result<Option<ChartRow>,
|
||||
|
||||
fn clean_label(label: &str) -> Result<String, ApiError> {
|
||||
let label: String = label.trim().chars().take(100).collect();
|
||||
if label.is_empty() { Err(ApiError::BadRequest("label must not be empty".into())) } else { Ok(label) }
|
||||
if label.is_empty() { Err(ApiError::BadRequest("A név nem lehet üres.".into())) } else { Ok(label) }
|
||||
}
|
||||
|
||||
pub async fn list(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
|
||||
let rows: Vec<ChartRow> = 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,12 +197,14 @@ 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",
|
||||
format!("at most {} charts can be saved", state.config.max_charts_per_user),
|
||||
format!("Legfeljebb {} képletet lehet menteni.", state.config.max_charts_per_user),
|
||||
));
|
||||
}
|
||||
let free = state.config.free_person_slots;
|
||||
@@ -342,7 +351,9 @@ async fn corrected_birth(
|
||||
let (analysed, foreign_synastry): (bool, bool) = sqlx::query_as(
|
||||
"SELECT EXISTS (SELECT 1 FROM analyses WHERE chart_id = $1 AND kind <> 'summary' AND status <> 'failed') \
|
||||
OR EXISTS (SELECT 1 FROM analyses a JOIN synastries s ON s.id = a.synastry_id \
|
||||
WHERE (s.chart1_id = $1 OR s.chart2_id = $1) AND a.status <> 'failed'), \
|
||||
WHERE (s.chart1_id = $1 OR s.chart2_id = $1) AND a.status <> 'failed') \
|
||||
OR EXISTS (SELECT 1 FROM analyses a JOIN forecasts f ON f.id = a.forecast_id \
|
||||
WHERE f.chart_id = $1 AND a.status <> 'failed'), \
|
||||
EXISTS (SELECT 1 FROM synastries WHERE (chart1_id = $1 OR chart2_id = $1) AND owner_id <> $2)",
|
||||
)
|
||||
.bind(chart.id)
|
||||
@@ -370,7 +381,7 @@ pub async fn remove(
|
||||
auth: AuthUser,
|
||||
WithRejection(axum::extract::Path(id), _): IdPath,
|
||||
) -> ApiResult<StatusCode> {
|
||||
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)
|
||||
|
||||
@@ -221,7 +221,7 @@ pub async fn create(
|
||||
if count >= MAX_PER_CHART && !is_admin(&auth) {
|
||||
return Err(ApiError::conflict(
|
||||
"forecast_limit_reached",
|
||||
format!("at most {MAX_PER_CHART} forecasts can be saved for a chart"),
|
||||
format!("Egy képlethez legfeljebb {MAX_PER_CHART} előrejelzés menthető."),
|
||||
));
|
||||
}
|
||||
|
||||
|
||||
@@ -89,8 +89,8 @@ pub async fn mark_accepted(
|
||||
let hash = token.map(|t| db::token_hash(t.trim()));
|
||||
sqlx::query(
|
||||
"UPDATE invitations SET accepted_at = now(), accepted_by = $1 \
|
||||
WHERE accepted_at IS NULL AND revoked_at IS NULL \
|
||||
AND (email = $2 OR (expires_at > now() AND id IN (SELECT invitation_id FROM invitation_tokens WHERE token_hash = $3)))",
|
||||
WHERE accepted_at IS NULL AND revoked_at IS NULL AND expires_at > now() \
|
||||
AND (email = $2 OR id IN (SELECT invitation_id FROM invitation_tokens WHERE token_hash = $3))",
|
||||
)
|
||||
.bind(user_id)
|
||||
.bind(email)
|
||||
@@ -603,10 +603,19 @@ pub async fn unsubscribe(
|
||||
.bind(db::token_hash(&email))
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
sqlx::query(
|
||||
"UPDATE invitations SET revoked_at = now() WHERE email = $1 AND accepted_at IS NULL AND revoked_at IS NULL",
|
||||
let revoked: Vec<Uuid> = sqlx::query_scalar(
|
||||
"UPDATE invitations SET revoked_at = now() WHERE email = $1 AND accepted_at IS NULL AND revoked_at IS NULL \
|
||||
RETURNING id",
|
||||
)
|
||||
.bind(&email)
|
||||
.fetch_all(&mut *tx)
|
||||
.await?;
|
||||
// Their packages go with them, as when an admin revokes an invitation.
|
||||
sqlx::query(
|
||||
"UPDATE promo_codes SET revoked_at = now() \
|
||||
WHERE invitation_id = ANY($1) AND redeemed_at IS NULL AND revoked_at IS NULL",
|
||||
)
|
||||
.bind(&revoked)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
sqlx::query("DELETE FROM waitlist WHERE email = $1").bind(&email).execute(&mut *tx).await?;
|
||||
@@ -630,12 +639,7 @@ pub async fn join_waitlist(
|
||||
let email = normalize_email(&req.email)?;
|
||||
let locale = validate_locale(&state, req.locale.as_deref())?;
|
||||
// Every sign-up sends an e-mail: a few per address, so the form cannot be used to flood someone.
|
||||
let ip = headers
|
||||
.get("x-forwarded-for")
|
||||
.and_then(|v| v.to_str().ok())
|
||||
.and_then(|v| v.split(',').next())
|
||||
.map(str::trim)
|
||||
.unwrap_or("unknown");
|
||||
let ip = super::client_ip(&headers).unwrap_or_else(|| "unknown".into());
|
||||
let key = format!("waitlist:{ip}");
|
||||
state.login_limiter.check(&key)?;
|
||||
let token = db::new_token();
|
||||
|
||||
@@ -0,0 +1,100 @@
|
||||
//! The user's invoices: the list, and the PDF fetched from Billingo on
|
||||
//! download (we keep every invoice detail, but not the PDF itself).
|
||||
|
||||
use std::time::Duration;
|
||||
|
||||
use axum::Json;
|
||||
use axum::extract::{Path, State};
|
||||
use axum::http::{HeaderValue, header};
|
||||
use axum::response::{IntoResponse, Response};
|
||||
use axum_extra::extract::WithRejection;
|
||||
use serde_json::{Value, json};
|
||||
use time::{Date, OffsetDateTime};
|
||||
use uuid::Uuid;
|
||||
|
||||
use super::{IdPath, St};
|
||||
use crate::auth::AuthUser;
|
||||
use crate::error::{ApiError, ApiResult};
|
||||
|
||||
type Row = (Uuid, String, Option<String>, Option<Date>, String, i32, OffsetDateTime);
|
||||
|
||||
/// The user's invoices, newest first. Until Billingo has issued one it is
|
||||
/// shown as being prepared.
|
||||
pub async fn list(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
|
||||
let rows: Vec<Row> = sqlx::query_as(
|
||||
"SELECT id, status, invoice_number, invoice_date, item_name, gross_huf, created_at FROM invoices \
|
||||
WHERE user_id = $1 ORDER BY created_at DESC",
|
||||
)
|
||||
.bind(auth.id())
|
||||
.fetch_all(&state.db)
|
||||
.await?;
|
||||
let invoices: Vec<Value> = rows
|
||||
.into_iter()
|
||||
.map(|(id, status, number, date, item, gross, created_at)| {
|
||||
json!({
|
||||
"id": id,
|
||||
"ready": status == "issued",
|
||||
"invoice_number": number,
|
||||
"invoice_date": date.map(|d| d.to_string()),
|
||||
"item": item,
|
||||
"gross_huf": gross,
|
||||
"paid_at": created_at.format(&time::format_description::well_known::Rfc3339).ok(),
|
||||
})
|
||||
})
|
||||
.collect();
|
||||
Ok(Json(json!({ "invoices": invoices })))
|
||||
}
|
||||
|
||||
/// The invoice's PDF, from Billingo.
|
||||
pub async fn pdf(State(state): St, auth: AuthUser, WithRejection(Path(id), _): IdPath) -> ApiResult<Response> {
|
||||
let row: Option<(i64, Option<String>)> = sqlx::query_as(
|
||||
"SELECT billingo_document_id, invoice_number FROM invoices \
|
||||
WHERE id = $1 AND user_id = $2 AND status = 'issued' AND billingo_document_id IS NOT NULL",
|
||||
)
|
||||
.bind(id)
|
||||
.bind(auth.id())
|
||||
.fetch_optional(&state.db)
|
||||
.await?;
|
||||
let (document, number) = row.ok_or(ApiError::NotFound("invoice"))?;
|
||||
let unavailable = |detail: String| {
|
||||
tracing::error!(error = %detail, invoice = %id, "invoice download failed");
|
||||
ApiError::conflict("invoice_unavailable", "A számla letöltése most nem sikerült. Próbáld újra pár perc múlva.")
|
||||
};
|
||||
let key =
|
||||
state.config.billingo_api_key.as_deref().ok_or_else(|| unavailable("BILLINGO_API_KEY is not set".into()))?;
|
||||
let http = reqwest::Client::builder().timeout(Duration::from_secs(30)).build().expect("static configuration");
|
||||
let res = http
|
||||
.get(format!("{}/documents/{document}/download", state.config.billingo_api_url))
|
||||
.header("X-API-KEY", key)
|
||||
.header("Accept", "application/pdf")
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| unavailable(e.to_string()))?;
|
||||
let is_pdf = res
|
||||
.headers()
|
||||
.get(header::CONTENT_TYPE)
|
||||
.and_then(|v| v.to_str().ok())
|
||||
.is_some_and(|t| t.starts_with("application/pdf"));
|
||||
if !res.status().is_success() || !is_pdf {
|
||||
let status = res.status();
|
||||
let body = res.text().await.unwrap_or_default();
|
||||
return Err(unavailable(format!("HTTP {status}: {}", body.chars().take(300).collect::<String>())));
|
||||
}
|
||||
let bytes = res.bytes().await.map_err(|e| unavailable(e.to_string()))?;
|
||||
let name: String = number
|
||||
.unwrap_or_else(|| document.to_string())
|
||||
.chars()
|
||||
.map(|c| if c.is_ascii_alphanumeric() || c == '-' { c } else { '-' })
|
||||
.collect();
|
||||
let disposition = HeaderValue::from_str(&format!("attachment; filename=\"szamla-{name}.pdf\""))
|
||||
.unwrap_or_else(|_| HeaderValue::from_static("attachment; filename=\"szamla.pdf\""));
|
||||
Ok((
|
||||
[
|
||||
(header::CONTENT_TYPE, HeaderValue::from_static("application/pdf")),
|
||||
(header::CONTENT_DISPOSITION, disposition),
|
||||
(header::CACHE_CONTROL, HeaderValue::from_static("private, no-store")),
|
||||
],
|
||||
bytes,
|
||||
)
|
||||
.into_response())
|
||||
}
|
||||
@@ -122,9 +122,16 @@ pub async fn restart(
|
||||
.rows_affected()
|
||||
} else {
|
||||
let Some(row) = find_analysis(&state.db, id).await? else { continue };
|
||||
let Some(hash) = target_hash(&state.db, &row).await? else { continue };
|
||||
let (model, fallback) = models_for(&state, Kind::parse(&kind).unwrap_or(Kind::Natal)).await?;
|
||||
let (cache_key, prompt_version) = versions(&state, &kind, &hash, &model, &row.language).await?;
|
||||
let (model, fallback, cache_key, prompt_version) = if kind == "tarot" {
|
||||
// A tarot reading: the analysis model, the same cards, never cached.
|
||||
let (model, fallback) = models_for(&state, Kind::Natal).await?;
|
||||
(model, fallback, format!("tarot|{id}"), state.config.prompt_version.clone())
|
||||
} else {
|
||||
let Some(hash) = target_hash(&state.db, &row).await? else { continue };
|
||||
let (model, fallback) = models_for(&state, Kind::parse(&kind).unwrap_or(Kind::Natal)).await?;
|
||||
let (cache_key, prompt_version) = versions(&state, &kind, &hash, &model, &row.language).await?;
|
||||
(model, fallback, cache_key, prompt_version)
|
||||
};
|
||||
sqlx::query(
|
||||
"UPDATE analyses SET status = 'pending', model = $2, fallback_model = $3, on_fallback = false, \
|
||||
cache_key = $4, prompt_version = $5, attempts = 0, next_attempt_at = now(), started_at = NULL, \
|
||||
|
||||
@@ -9,33 +9,36 @@ mod account;
|
||||
mod admin;
|
||||
mod analyses;
|
||||
mod auth;
|
||||
mod calculator;
|
||||
mod celebrities;
|
||||
mod charts;
|
||||
mod errors;
|
||||
mod forecasts;
|
||||
mod invitations;
|
||||
mod invoices_user;
|
||||
mod jobs;
|
||||
mod models;
|
||||
mod payments;
|
||||
pub(crate) mod payments;
|
||||
mod promo;
|
||||
mod prompts;
|
||||
mod questions;
|
||||
mod recalculate;
|
||||
mod shares;
|
||||
mod synastries;
|
||||
mod tarot;
|
||||
|
||||
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};
|
||||
use axum_extra::extract::WithRejection;
|
||||
use serde_json::{Value, json};
|
||||
use tower_http::cors::{AllowOrigin, CorsLayer};
|
||||
use tower_http::trace::{DefaultMakeSpan, DefaultOnResponse, TraceLayer};
|
||||
use tracing::Level;
|
||||
use tower_http::trace::TraceLayer;
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::AppState;
|
||||
@@ -56,6 +59,15 @@ where
|
||||
serde::Deserialize::deserialize(d).map(Some)
|
||||
}
|
||||
|
||||
/// The visitor's address from `X-Real-IP`: Caddy sets it (overwriting what
|
||||
/// the browser sent) from Cloudflare's `CF-Connecting-IP`, trusted only from
|
||||
/// Cloudflare's ranges, and the frontend's proxy passes it on. Not
|
||||
/// `X-Forwarded-For`, whose first entry the browser can write.
|
||||
pub(crate) fn client_ip(headers: &axum::http::HeaderMap) -> Option<String> {
|
||||
let ip = headers.get("x-real-ip")?.to_str().ok()?.trim();
|
||||
(!ip.is_empty()).then(|| ip.to_string())
|
||||
}
|
||||
|
||||
pub fn router(state: Arc<AppState>) -> Router {
|
||||
Router::new()
|
||||
.route("/healthz", get(health))
|
||||
@@ -65,18 +77,22 @@ pub fn router(state: Arc<AppState>) -> Router {
|
||||
.route("/v1/auth/register", post(auth::register))
|
||||
.route("/v1/auth/login", post(auth::login))
|
||||
.route("/v1/auth/google", post(auth::google))
|
||||
.route("/v1/auth/apple", post(auth::apple))
|
||||
.route("/v1/auth/logout", post(auth::logout))
|
||||
.route("/v1/auth/logout-all", post(auth::logout_all))
|
||||
.route("/v1/auth/verify-email", post(auth::verify_email))
|
||||
.route("/v1/auth/resend-verification", post(auth::resend_verification))
|
||||
.route("/v1/auth/password-reset", post(auth::request_password_reset))
|
||||
.route("/v1/auth/password-reset/confirm", post(auth::confirm_password_reset))
|
||||
.route("/v1/auth/set-password", post(auth::set_password_with_link))
|
||||
// own account (GDPR export and deletion included)
|
||||
.route("/v1/me", get(account::me).patch(account::update_me).delete(account::delete_me))
|
||||
.route("/v1/me/password", post(account::change_password))
|
||||
.route("/v1/me/export", get(account::export))
|
||||
.route("/v1/credits", get(account::credits))
|
||||
.route("/v1/payments/mock", post(payments::mock))
|
||||
.route("/v1/payments/checkout", post(payments::checkout))
|
||||
.route("/v1/payments/checkout/{id}", get(payments::checkout_status))
|
||||
.route("/v1/payments/stripe/webhook", post(payments::stripe_webhook))
|
||||
.route("/v1/invoices", get(invoices_user::list))
|
||||
.route("/v1/invoices/{id}/pdf", get(invoices_user::pdf))
|
||||
// charts
|
||||
.route("/v1/charts", get(charts::list).post(charts::create))
|
||||
.route("/v1/charts/{id}", get(charts::get_one).patch(charts::update).delete(charts::remove))
|
||||
@@ -96,6 +112,8 @@ pub fn router(state: Arc<AppState>) -> Router {
|
||||
.route("/v1/analyses/{id}", get(analyses::get_one))
|
||||
.route("/v1/analyses/{id}/questions", get(questions::list).post(questions::ask))
|
||||
.route("/v1/questions/{id}", get(questions::get_one))
|
||||
.route("/v1/tarot/readings", get(tarot::list).post(tarot::create))
|
||||
.route("/v1/tarot/readings/{id}", get(tarot::get_one))
|
||||
// sharing
|
||||
.route("/v1/promo-codes/redeem", post(promo::redeem))
|
||||
.route("/v1/admin/promo-codes", get(promo::list).post(promo::create))
|
||||
@@ -109,6 +127,12 @@ pub fn router(state: Arc<AppState>) -> Router {
|
||||
.route("/v1/public/invitations/unsubscribe", post(invitations::unsubscribe))
|
||||
.route("/v1/public/invitations/{token}", get(invitations::public_view))
|
||||
.route("/v1/public/waitlist", post(invitations::join_waitlist))
|
||||
.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))
|
||||
@@ -130,13 +154,22 @@ pub fn router(state: Arc<AppState>) -> 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))
|
||||
.layer(
|
||||
TraceLayer::new_for_http()
|
||||
.make_span_with(DefaultMakeSpan::new().level(Level::INFO))
|
||||
.on_response(DefaultOnResponse::new().level(Level::INFO)),
|
||||
)
|
||||
// The request log: masked paths, health checks only when they fail.
|
||||
.layer(TraceLayer::new_for_http().make_span_with(service_kit::RequestLog).on_response(service_kit::RequestLog))
|
||||
.with_state(state)
|
||||
}
|
||||
|
||||
@@ -159,9 +192,19 @@ async fn public_config(State(state): St) -> Json<Value> {
|
||||
let c = &state.config;
|
||||
Json(json!({
|
||||
"google_login": { "enabled": state.google.enabled(), "client_id": c.google_client_ids.first() },
|
||||
"apple_login": { "enabled": state.apple.enabled(), "client_id": c.apple_client_ids.first() },
|
||||
"locales": c.supported_locales,
|
||||
"password_login": c.password_login,
|
||||
"mock_payments": c.mock_payments,
|
||||
"mock_payments": payments::method(c) == Some("mock"),
|
||||
// "stripe", "mock" or null; Stripe purchases are for admins only
|
||||
// until PURCHASES_OPEN (and always with a test key).
|
||||
"payments": payments::method(c),
|
||||
"payments_admins_only": payments::admins_only(c),
|
||||
"payments_test": c.stripe.as_ref().is_some_and(|s| s.test_mode()),
|
||||
// "AAM" (alanyi adómentes: the prices carry no VAT) or a rate like "27%".
|
||||
"vat": c.invoice_vat.code(),
|
||||
// Buyers accept the ÁSZF on Stripe's page (off until the opening).
|
||||
"terms_consent": c.terms_consent,
|
||||
"user_invites": c.user_invites,
|
||||
"referral_rewards": c.referral_rewards,
|
||||
"signup_mode": c.signup_mode.as_str(),
|
||||
|
||||
@@ -1,19 +1,27 @@
|
||||
//! Packages and payments. Until Stripe is connected, `MOCK_PAYMENTS=true`
|
||||
//! turns on a stand-in: "paying" grants the package right away, so the paid
|
||||
//! flow can be used end to end.
|
||||
//! Packages and payments. With `STRIPE_SECRET_KEY` a package is paid on
|
||||
//! Stripe's hosted Checkout page and granted when Stripe confirms the payment
|
||||
//! (webhook, or the return page asking). Without it `MOCK_PAYMENTS=true`
|
||||
//! turns on a stand-in: "paying" grants the package right away.
|
||||
|
||||
use axum::Json;
|
||||
use axum::extract::State;
|
||||
use axum::body::Bytes;
|
||||
use axum::extract::{Path, State};
|
||||
use axum::http::HeaderMap;
|
||||
use axum_extra::extract::WithRejection;
|
||||
use db::Role;
|
||||
use serde::Deserialize;
|
||||
use serde_json::{Value, json};
|
||||
use time::OffsetDateTime;
|
||||
use uuid::Uuid;
|
||||
|
||||
use super::{Body, St};
|
||||
use crate::AppState;
|
||||
use crate::auth::AuthUser;
|
||||
use crate::config::StripeConfig;
|
||||
use crate::credits::{self, Unit};
|
||||
use crate::error::{ApiError, ApiResult};
|
||||
use crate::packages::{self, CATALOG, Source};
|
||||
use crate::persons;
|
||||
use crate::{invoices, persons, stripe};
|
||||
|
||||
/// The package catalog (public).
|
||||
pub async fn catalog() -> Json<Value> {
|
||||
@@ -46,7 +54,7 @@ pub async fn mock(
|
||||
auth: AuthUser,
|
||||
WithRejection(Json(req), _): Body<MockPayment>,
|
||||
) -> ApiResult<Json<Value>> {
|
||||
if !state.config.mock_payments {
|
||||
if !state.config.mock_payments || state.config.stripe.is_some() {
|
||||
return Err(ApiError::NotFound("payment method"));
|
||||
}
|
||||
let id = match (req.package.as_deref(), req.unit) {
|
||||
@@ -56,6 +64,7 @@ pub async fn mock(
|
||||
(None, Some(Unit::Forecast)) => "addon_forecast",
|
||||
(None, Some(Unit::Person)) => "addon_persons",
|
||||
(None, Some(Unit::Question)) => "addon_questions",
|
||||
(None, Some(Unit::Tarot)) => "addon_tarot",
|
||||
_ => return Err(ApiError::BadRequest("give either package or unit".into())),
|
||||
};
|
||||
let package = packages::find(id).ok_or(ApiError::NotFound("package"))?;
|
||||
@@ -65,3 +74,284 @@ pub async fn mock(
|
||||
tracing::info!(user = %auth.id(), package = package.id, "mock payment");
|
||||
Ok(Json(holdings(&state, &auth).await?))
|
||||
}
|
||||
|
||||
/// How the frontend should offer purchases: `"stripe"`, `"mock"` or `None`
|
||||
/// (no purchases).
|
||||
pub fn method(config: &crate::config::Config) -> Option<&'static str> {
|
||||
match (&config.stripe, config.mock_payments) {
|
||||
(Some(_), _) => Some("stripe"),
|
||||
(None, true) => Some("mock"),
|
||||
(None, false) => None,
|
||||
}
|
||||
}
|
||||
|
||||
/// The terms (ÁSZF) version a purchase accepts; the frontend's `TERMS_UPDATED`.
|
||||
pub const TERMS_VERSION: &str = "2026-11-22";
|
||||
|
||||
/// Only admins can buy through Stripe: until purchases open, and always with a
|
||||
/// test key (nobody gets packages with Stripe's test cards, nobody types a
|
||||
/// real card into a test page).
|
||||
pub fn admins_only(config: &crate::config::Config) -> bool {
|
||||
!config.purchases_open || config.stripe.as_ref().is_some_and(StripeConfig::test_mode)
|
||||
}
|
||||
|
||||
/// Stripe, if this user may pay through it.
|
||||
fn stripe_for<'a>(state: &'a AppState, auth: &AuthUser) -> Result<&'a StripeConfig, ApiError> {
|
||||
let config = state.config.stripe.as_ref().ok_or(ApiError::NotFound("payment method"))?;
|
||||
if admins_only(&state.config) && !auth.user.has_role(Role::Admin) {
|
||||
return Err(ApiError::Forbidden("purchases are being tested; they open soon".into()));
|
||||
}
|
||||
Ok(config)
|
||||
}
|
||||
|
||||
/// The page to come back to after paying: a plain path of this site, without
|
||||
/// its query (anything else: the packages page).
|
||||
fn return_path(path: Option<&str>) -> String {
|
||||
let path = path.unwrap_or("").split(['?', '#']).next().unwrap_or("");
|
||||
let plain = path.starts_with('/')
|
||||
&& !path.starts_with("//")
|
||||
&& path.len() <= 200
|
||||
&& path.chars().all(|c| c.is_ascii_alphanumeric() || "/-_.".contains(c));
|
||||
if plain { path.to_string() } else { "/csomagok".to_string() }
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
pub struct CheckoutRequest {
|
||||
package: String,
|
||||
/// The page the purchase started on (default: the packages page).
|
||||
return_path: Option<String>,
|
||||
}
|
||||
|
||||
/// Starts paying for a package: returns the address of Stripe's payment page.
|
||||
pub async fn checkout(
|
||||
State(state): St,
|
||||
auth: AuthUser,
|
||||
WithRejection(Json(req), _): Body<CheckoutRequest>,
|
||||
) -> ApiResult<Json<Value>> {
|
||||
let config = stripe_for(&state, &auth)?;
|
||||
let package = packages::find(&req.package).ok_or(ApiError::NotFound("package"))?;
|
||||
let back = format!("{}{}", state.config.public_base_url, return_path(req.return_path.as_deref()));
|
||||
let (checkout_name, checkout_description) = package.checkout_text();
|
||||
let field = |k: &str, v: &str| (k.to_string(), v.to_string());
|
||||
let mut form = vec![
|
||||
field("mode", "payment"),
|
||||
field("locale", "hu"),
|
||||
field("client_reference_id", &auth.id().to_string()),
|
||||
field("customer_email", &auth.user.email),
|
||||
// Name and address go on the invoice; a company also gives its name
|
||||
// and tax number ("I'm buying as a business").
|
||||
field("billing_address_collection", "required"),
|
||||
field("tax_id_collection[enabled]", "true"),
|
||||
field("customer_creation", "always"),
|
||||
field("line_items[0][quantity]", "1"),
|
||||
field("line_items[0][price_data][currency]", "huf"),
|
||||
// Stripe counts forints in fillér.
|
||||
field("line_items[0][price_data][unit_amount]", &(package.price_huf * 100).to_string()),
|
||||
field("line_items[0][price_data][product_data][name]", &checkout_name),
|
||||
field("line_items[0][price_data][product_data][description]", &checkout_description),
|
||||
field("metadata[package]", package.id),
|
||||
field("metadata[user_id]", &auth.id().to_string()),
|
||||
field("payment_intent_data[description]", &checkout_name),
|
||||
field("payment_intent_data[metadata][package]", package.id),
|
||||
field("success_url", &format!("{back}?fizetes={{CHECKOUT_SESSION_ID}}")),
|
||||
field("cancel_url", &format!("{back}?fizetes=megszakitva")),
|
||||
];
|
||||
if state.config.terms_consent {
|
||||
// Every purchase accepts the terms and asks for immediate delivery,
|
||||
// giving up the 14-day withdrawal right (45/2014. Korm. rendelet 29. §).
|
||||
// Stripe needs the terms URL in its dashboard (Public details) for this.
|
||||
form.push(field("consent_collection[terms_of_service]", "required"));
|
||||
form.push(field(
|
||||
"custom_text[terms_of_service_acceptance][message]",
|
||||
&format!(
|
||||
"Elfogadom az [ÁSZF-et]({}/aszf), kérem a szolgáltatás azonnali megkezdését, és tudomásul veszem, \
|
||||
hogy ezzel elveszítem a 14 napos elállási jogomat.",
|
||||
state.config.public_base_url
|
||||
),
|
||||
));
|
||||
}
|
||||
let session = state.stripe.create_session(config, &form).await?;
|
||||
let url = session.url.ok_or_else(|| ApiError::Internal(format!("checkout session {} has no url", session.id)))?;
|
||||
sqlx::query("INSERT INTO stripe_checkouts (id, user_id, package, price_huf, live) VALUES ($1, $2, $3, $4, $5)")
|
||||
.bind(&session.id)
|
||||
.bind(auth.id())
|
||||
.bind(package.id)
|
||||
.bind(package.price_huf as i32)
|
||||
.bind(!config.test_mode())
|
||||
.execute(&state.db)
|
||||
.await?;
|
||||
tracing::info!(user = %auth.id(), package = package.id, session = %session.id, "checkout started");
|
||||
Ok(Json(json!({ "url": url })))
|
||||
}
|
||||
|
||||
/// Records a paid session (what was charged, the buyer's billing details),
|
||||
/// grants its package and queues the invoice, once. `false`: not our session.
|
||||
async fn complete(state: &AppState, session: &stripe::Session) -> Result<bool, ApiError> {
|
||||
let mut tx = state.db.begin().await?;
|
||||
type Checkout = (Option<Uuid>, String, i32, Option<OffsetDateTime>);
|
||||
let row: Option<Checkout> = sqlx::query_as(
|
||||
"SELECT user_id, package, price_huf, completed_at FROM stripe_checkouts WHERE id = $1 FOR UPDATE",
|
||||
)
|
||||
.bind(&session.id)
|
||||
.fetch_optional(&mut *tx)
|
||||
.await?;
|
||||
let Some((user_id, package_id, price_huf, completed_at)) = row else { return Ok(false) };
|
||||
if completed_at.is_some() {
|
||||
return Ok(true);
|
||||
}
|
||||
let amount_huf = session.amount_total.map(|minor| minor / 100);
|
||||
if amount_huf != Some(i64::from(price_huf)) || session.currency.as_deref() != Some("huf") {
|
||||
tracing::error!(session = %session.id, ?amount_huf, currency = ?session.currency, price_huf, "paid amount differs from the price");
|
||||
}
|
||||
let package =
|
||||
packages::find(&package_id).ok_or_else(|| ApiError::Internal(format!("unknown package {package_id}")))?;
|
||||
// A deleted account still gets its invoice, but no package.
|
||||
let order = match user_id {
|
||||
Some(user_id) => {
|
||||
let note = format!("Stripe {}", session.id);
|
||||
Some(packages::grant(&mut tx, user_id, package, Source::Stripe, Some(user_id), Some(¬e)).await?)
|
||||
}
|
||||
None => None,
|
||||
};
|
||||
if state.config.terms_consent && !session.terms_accepted() {
|
||||
tracing::warn!(session = %session.id, "paid without the terms consent");
|
||||
}
|
||||
sqlx::query(
|
||||
"UPDATE stripe_checkouts SET completed_at = now(), order_id = $2, payment_intent = $3, amount_huf = $4, \
|
||||
customer = $5, terms_accepted_at = CASE WHEN $6 THEN now() END, terms_version = CASE WHEN $6 THEN $7 END \
|
||||
WHERE id = $1",
|
||||
)
|
||||
.bind(&session.id)
|
||||
.bind(order)
|
||||
.bind(&session.payment_intent)
|
||||
.bind(amount_huf.map(|a| a as i32))
|
||||
.bind(&session.customer_details)
|
||||
.bind(session.terms_accepted())
|
||||
.bind(TERMS_VERSION)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
// The confirmation confirms the withdrawal waiver: only when it was given.
|
||||
if session.terms_accepted() {
|
||||
confirm_by_email(&mut tx, state, session, user_id, package, amount_huf.unwrap_or(i64::from(price_huf))).await?;
|
||||
}
|
||||
let buyer = invoices::Buyer::from_stripe(session.customer_details.as_ref().unwrap_or(&Value::Null), None);
|
||||
let (item, comment) = package.invoice_item();
|
||||
let gross = amount_huf.unwrap_or(i64::from(price_huf));
|
||||
invoices::queue(&mut tx, &session.id, user_id, &buyer, (&item, &comment), gross, state.config.invoice_vat).await?;
|
||||
tx.commit().await?;
|
||||
tracing::info!(user = ?user_id, package = %package_id, session = %session.id, "package paid");
|
||||
Ok(true)
|
||||
}
|
||||
|
||||
/// The purchase confirmation (the "visszaigazolás" of the withdrawal waiver):
|
||||
/// to the account's address, or Stripe's if the account is gone.
|
||||
async fn confirm_by_email(
|
||||
tx: &mut sqlx::PgConnection,
|
||||
state: &AppState,
|
||||
session: &stripe::Session,
|
||||
user_id: Option<Uuid>,
|
||||
package: &packages::Package,
|
||||
amount_huf: i64,
|
||||
) -> Result<(), ApiError> {
|
||||
let account: Option<(String, String, Option<String>)> = match user_id {
|
||||
Some(id) => {
|
||||
sqlx::query_as("SELECT email, locale, display_name FROM users WHERE id = $1")
|
||||
.bind(id)
|
||||
.fetch_optional(&mut *tx)
|
||||
.await?
|
||||
}
|
||||
None => None,
|
||||
};
|
||||
let stripe_email = session.customer_details.as_ref().and_then(|c| c["email"].as_str()).map(str::to_string);
|
||||
let (to, locale, name) = match account {
|
||||
Some((email, locale, name)) => (email, locale, name),
|
||||
None => match stripe_email {
|
||||
Some(email) => (email, "hu".to_string(), None),
|
||||
None => return Ok(()),
|
||||
},
|
||||
};
|
||||
let base = &state.config.public_base_url;
|
||||
let payload = json!({
|
||||
"url": format!("{base}/csomagok"),
|
||||
"display_name": name,
|
||||
"package_name": package.name,
|
||||
"contents": package.contents_text(),
|
||||
"amount": format_huf(amount_huf),
|
||||
"paid_on": OffsetDateTime::now_utc().date().to_string(),
|
||||
"terms_url": format!("{base}/aszf"),
|
||||
"invoices_url": format!("{base}/szamlak"),
|
||||
});
|
||||
super::auth::queue_email_to(tx, user_id, &to, "purchase_confirmation", &locale, payload).await
|
||||
}
|
||||
|
||||
/// "6 000 Ft"
|
||||
fn format_huf(amount: i64) -> String {
|
||||
let digits = amount.to_string();
|
||||
let mut out = String::new();
|
||||
for (i, c) in digits.chars().enumerate() {
|
||||
if i > 0 && (digits.len() - i).is_multiple_of(3) {
|
||||
out.push('\u{a0}');
|
||||
}
|
||||
out.push(c);
|
||||
}
|
||||
format!("{out}\u{a0}Ft")
|
||||
}
|
||||
|
||||
/// Where a payment stands (the return page asks until it is paid). If the
|
||||
/// webhook has not arrived yet, Stripe is asked directly.
|
||||
pub async fn checkout_status(
|
||||
State(state): St,
|
||||
auth: AuthUser,
|
||||
WithRejection(Path(id), _): WithRejection<Path<String>, ApiError>,
|
||||
) -> ApiResult<Json<Value>> {
|
||||
let row: Option<(String, Option<OffsetDateTime>)> =
|
||||
sqlx::query_as("SELECT package, completed_at FROM stripe_checkouts WHERE id = $1 AND user_id = $2")
|
||||
.bind(&id)
|
||||
.bind(auth.id())
|
||||
.fetch_optional(&state.db)
|
||||
.await?;
|
||||
let (package_id, completed_at) = row.ok_or(ApiError::NotFound("payment"))?;
|
||||
let mut status = if completed_at.is_some() { "paid" } else { "pending" };
|
||||
if let (None, Some(config)) = (completed_at, &state.config.stripe) {
|
||||
let session = state.stripe.get_session(config, &id).await?;
|
||||
if session.paid() {
|
||||
complete(&state, &session).await?;
|
||||
status = "paid";
|
||||
} else if session.status.as_deref() == Some("expired") {
|
||||
status = "expired";
|
||||
}
|
||||
}
|
||||
Ok(Json(json!({
|
||||
"status": status,
|
||||
"package": package_id,
|
||||
"name": packages::find(&package_id).map(|p| p.name),
|
||||
})))
|
||||
}
|
||||
|
||||
/// Stripe's webhook (Developers → Webhooks; event `checkout.session.completed`,
|
||||
/// for delayed methods also `checkout.session.async_payment_succeeded`).
|
||||
pub async fn stripe_webhook(State(state): St, headers: HeaderMap, body: Bytes) -> ApiResult<Json<Value>> {
|
||||
let secret = state
|
||||
.config
|
||||
.stripe
|
||||
.as_ref()
|
||||
.and_then(|c| c.webhook_secret.as_deref())
|
||||
.ok_or(ApiError::NotFound("payment method"))?;
|
||||
let signature = headers.get("stripe-signature").and_then(|v| v.to_str().ok()).unwrap_or("");
|
||||
let now = OffsetDateTime::now_utc().unix_timestamp();
|
||||
if !stripe::verify_signature(secret, signature, &body, now) {
|
||||
tracing::warn!("stripe webhook with a bad signature");
|
||||
return Err(ApiError::BadRequest("invalid signature".into()));
|
||||
}
|
||||
let mut event: Value = serde_json::from_slice(&body).map_err(|e| ApiError::BadRequest(e.to_string()))?;
|
||||
let kind = event["type"].as_str().unwrap_or_default();
|
||||
if matches!(kind, "checkout.session.completed" | "checkout.session.async_payment_succeeded") {
|
||||
let session: stripe::Session = serde_json::from_value(event["data"]["object"].take())
|
||||
.map_err(|e| ApiError::BadRequest(format!("checkout session: {e}")))?;
|
||||
if session.paid() && !complete(&state, &session).await? {
|
||||
tracing::warn!(session = %session.id, "stripe webhook for a session we did not start");
|
||||
}
|
||||
}
|
||||
Ok(Json(json!({ "received": true })))
|
||||
}
|
||||
|
||||
@@ -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<Uuid>,
|
||||
/// One of the admin's own comparisons, for a synastry analysis.
|
||||
synastry_id: Option<Uuid>,
|
||||
@@ -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")
|
||||
|
||||
@@ -9,7 +9,6 @@ use axum::Json;
|
||||
use axum::extract::{Path, State};
|
||||
use axum::http::StatusCode;
|
||||
use axum_extra::extract::WithRejection;
|
||||
use db::Role;
|
||||
use serde::Deserialize;
|
||||
use serde_json::{Value, json};
|
||||
use sqlx::PgPool;
|
||||
@@ -116,7 +115,7 @@ pub async fn ask(
|
||||
return Err(ApiError::NotFound("analysis"));
|
||||
}
|
||||
if !ASKABLE.contains(&analysis.kind.as_str()) {
|
||||
return Err(ApiError::BadRequest("questions can be asked about a detailed analysis or a forecast".into()));
|
||||
return Err(ApiError::BadRequest("Kérdést részletes elemzésről vagy előrejelzésről lehet feltenni.".into()));
|
||||
}
|
||||
if analysis.status != "done" {
|
||||
return Err(ApiError::conflict("analysis_not_ready", "Az elemzés még nem készült el."));
|
||||
@@ -124,7 +123,7 @@ pub async fn ask(
|
||||
let question = req.question.trim().replace("\r\n", "\n");
|
||||
let length = question.chars().count();
|
||||
if !(3..=QUESTION_MAX_CHARS).contains(&length) {
|
||||
return Err(ApiError::BadRequest(format!("the question must be 3 to {QUESTION_MAX_CHARS} characters long")));
|
||||
return Err(ApiError::BadRequest(format!("A kérdés 3–{QUESTION_MAX_CHARS} karakter hosszú lehet.")));
|
||||
}
|
||||
let (open, total): (i64, i64) = sqlx::query_as(
|
||||
"SELECT count(*) FILTER (WHERE status IN ('pending', 'running')), count(*) FROM questions WHERE analysis_id = $1",
|
||||
@@ -145,7 +144,6 @@ pub async fn ask(
|
||||
));
|
||||
}
|
||||
|
||||
let admin = auth.user.has_role(Role::Admin);
|
||||
let (model, fallback, prompt_version) = model_and_version(&state, &analysis.language).await?;
|
||||
let question_id = Uuid::now_v7();
|
||||
let mut tx = state.db.begin().await?;
|
||||
@@ -161,13 +159,12 @@ pub async fn ask(
|
||||
.bind(&analysis.language)
|
||||
.bind(&model)
|
||||
.bind(&prompt_version)
|
||||
.bind(i32::from(!admin))
|
||||
.bind(1i32)
|
||||
.bind(&fallback)
|
||||
.fetch_one(&mut *tx)
|
||||
.await?;
|
||||
if !admin {
|
||||
credits::spend_question(&mut tx, auth.id(), question_id).await?;
|
||||
}
|
||||
// Admins use questions too (they can add more on the admin page).
|
||||
credits::spend_question(&mut tx, auth.id(), question_id).await?;
|
||||
tx.commit().await?;
|
||||
Ok((StatusCode::ACCEPTED, Json(row.view())))
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
//! `backend recalculate`: after a change in the calculation, recalculates
|
||||
//! every stored chart, comparison and forecast with the horoscope service,
|
||||
//! then deletes all analyses and queues them again: a short summary and a
|
||||
//! then deletes all analyses (but the tarot readings) and queues them again: a short summary and a
|
||||
//! detailed analysis for every chart, one analysis for every comparison and
|
||||
//! every forecast. Nobody is charged; each analysis is requested in the name
|
||||
//! of the owner, in the owner's language.
|
||||
@@ -90,7 +90,8 @@ pub async fn run(state: &AppState) -> anyhow::Result<()> {
|
||||
}
|
||||
tracing::info!(count = forecast_hashes.len(), "forecasts recalculated");
|
||||
|
||||
let deleted = sqlx::query("DELETE FROM analyses").execute(db).await?.rows_affected();
|
||||
// Tarot readings depend on no calculation: they stay.
|
||||
let deleted = sqlx::query("DELETE FROM analyses WHERE kind <> 'tarot'").execute(db).await?.rows_affected();
|
||||
let mut queued = 0;
|
||||
for c in &charts {
|
||||
let language = locale(db, c.owner_id).await?;
|
||||
|
||||
@@ -61,12 +61,7 @@ struct ShareRow {
|
||||
const SHARE_COLUMNS: &str = "id, owner_id, slug, kind, chart_id, synastry_id, analysis_id, title, show_birth_data, \
|
||||
view_count, created_at, revoked_at, owner_ip_hash";
|
||||
|
||||
/// The visitor's address: the first `X-Forwarded-For` entry (Caddy writes it
|
||||
/// from Cloudflare's, the frontend passes it on).
|
||||
fn client_ip(headers: &HeaderMap) -> Option<String> {
|
||||
let first = headers.get("x-forwarded-for")?.to_str().ok()?.split(',').next()?.trim();
|
||||
(!first.is_empty()).then(|| first.to_string())
|
||||
}
|
||||
use super::client_ip;
|
||||
|
||||
/// An address salted with the slug, so the stored value says nothing by itself.
|
||||
fn ip_hash(slug: &str, ip: &str) -> Vec<u8> {
|
||||
@@ -160,7 +155,7 @@ pub async fn create(
|
||||
return Err(ApiError::NotFound("analysis"));
|
||||
}
|
||||
if analysis.status != "done" {
|
||||
return Err(ApiError::conflict("analysis_not_ready", "only finished analyses can be shared"));
|
||||
return Err(ApiError::conflict("analysis_not_ready", "Csak elkészült elemzést lehet megosztani."));
|
||||
}
|
||||
(None, None, Some(req.target_id), "analysis")
|
||||
}
|
||||
@@ -231,8 +226,9 @@ pub async fn revoke(State(state): St, auth: AuthUser, WithRejection(Path(id), _)
|
||||
// --- public view -------------------------------------------------------------------------------
|
||||
|
||||
fn public_chart_block(chart: &ChartRow, share: &ShareRow) -> Value {
|
||||
// Birth data only of the sharer's own chart, never of a partner's.
|
||||
let show = share.show_birth_data && chart.owner_id == share.owner_id;
|
||||
// Birth data only of the sharer's own chart, never of a partner's or of a
|
||||
// person they added (that is someone else's data).
|
||||
let show = share.show_birth_data && chart.owner_id == share.owner_id && chart.kind == "own";
|
||||
json!({ "label": chart.label, "chart": public_chart(&chart.result, show) })
|
||||
}
|
||||
|
||||
@@ -330,6 +326,11 @@ pub async fn visit(
|
||||
if sharer || same_place || is_robot(user_agent(&headers).as_deref()) {
|
||||
return Ok(Json(json!({ "counted": false })));
|
||||
}
|
||||
// The same visitor again within half an hour (a reload, back and forth).
|
||||
let visitor = format!("{}:{}", share.slug, client_ip(&headers).unwrap_or_default());
|
||||
if state.share_visits.hit(&visitor).is_err() {
|
||||
return Ok(Json(json!({ "counted": false })));
|
||||
}
|
||||
let mut tx = state.db.begin().await?;
|
||||
sqlx::query("UPDATE shares SET view_count = view_count + 1 WHERE id = $1").bind(share.id).execute(&mut *tx).await?;
|
||||
let rewarded = sqlx::query(
|
||||
|
||||
@@ -210,7 +210,7 @@ pub async fn create(
|
||||
WithRejection(Json(req), _): Body<CreateSynastry>,
|
||||
) -> ApiResult<(StatusCode, Json<Value>)> {
|
||||
if req.chart1_id == req.chart2_id {
|
||||
return Err(ApiError::BadRequest("a chart cannot be compared with itself".into()));
|
||||
return Err(ApiError::BadRequest("Egy képletet önmagával nem lehet összevetni.".into()));
|
||||
}
|
||||
let chart1 = owned_chart(&state.db, req.chart1_id, auth.id()).await?;
|
||||
let chart2 = owned_chart(&state.db, req.chart2_id, auth.id()).await?;
|
||||
@@ -249,9 +249,9 @@ pub struct CreateInvite {
|
||||
async fn chart_or_primary(db: &PgPool, chart_id: Option<Uuid>, user: Uuid) -> Result<ChartRow, ApiError> {
|
||||
match chart_id {
|
||||
Some(id) => owned_chart(db, id, user).await,
|
||||
None => primary_chart(db, user).await?.ok_or_else(|| {
|
||||
ApiError::conflict("primary_chart_required", "create your own chart first (is_primary: true)")
|
||||
}),
|
||||
None => primary_chart(db, user)
|
||||
.await?
|
||||
.ok_or_else(|| ApiError::conflict("primary_chart_required", "Előbb add meg a saját születési adataidat.")),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -459,20 +459,20 @@ pub async fn accept_invite(
|
||||
) -> ApiResult<(StatusCode, Json<Value>)> {
|
||||
let invite = invite_by_token(&state.db, &req.token).await?;
|
||||
match invite_status(invite.accepted_at, invite.expires_at) {
|
||||
"accepted" => return Err(ApiError::Gone("this invitation has already been accepted".into())),
|
||||
"expired" => return Err(ApiError::Gone("this invitation has expired".into())),
|
||||
"accepted" => return Err(ApiError::Gone("Ezt a meghívót már elfogadták.".into())),
|
||||
"expired" => return Err(ApiError::Gone("Ez a meghívó lejárt.".into())),
|
||||
_ => {}
|
||||
}
|
||||
if invite.inviter_id == auth.id() {
|
||||
return Err(ApiError::conflict("own_invitation", "you cannot accept your own invitation"));
|
||||
return Err(ApiError::conflict("own_invitation", "A saját meghívódat nem fogadhatod el."));
|
||||
}
|
||||
let my_chart = chart_or_primary(&state.db, req.chart_id, auth.id()).await?;
|
||||
let inviter_chart =
|
||||
find_chart(&state.db, invite.inviter_chart_id).await?.ok_or(ApiError::NotFound("invitation"))?;
|
||||
let (row, _) = compute_synastry(&state, invite.inviter_id, &inviter_chart, &my_chart).await?;
|
||||
let (row, created) = compute_synastry(&state, invite.inviter_id, &inviter_chart, &my_chart).await?;
|
||||
|
||||
let mut tx = state.db.begin().await?;
|
||||
sqlx::query(
|
||||
let accepted = sqlx::query(
|
||||
"UPDATE synastry_invites SET accepted_at = now(), accepted_by = $1, synastry_id = $2 \
|
||||
WHERE id = $3 AND accepted_at IS NULL",
|
||||
)
|
||||
@@ -480,7 +480,17 @@ pub async fn accept_invite(
|
||||
.bind(row.id)
|
||||
.bind(invite.id)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
.await?
|
||||
.rows_affected();
|
||||
if accepted == 0 {
|
||||
// Someone else accepted it at the same moment: the comparison made
|
||||
// for this attempt goes, the link is used up.
|
||||
drop(tx);
|
||||
if created {
|
||||
sqlx::query("DELETE FROM synastries WHERE id = $1").bind(row.id).execute(&state.db).await?;
|
||||
}
|
||||
return Err(ApiError::Gone("Ezt a meghívót már elfogadták.".into()));
|
||||
}
|
||||
let inviter: Option<db::User> = sqlx::query_as(&format!("SELECT {USER_COLUMNS} FROM users WHERE id = $1"))
|
||||
.bind(invite.inviter_id)
|
||||
.fetch_optional(&mut *tx)
|
||||
|
||||
@@ -0,0 +1,218 @@
|
||||
//! Tarot readings. The server shuffles and draws the cards (so nobody can
|
||||
//! draw again for free until a card they like comes), stores them with the
|
||||
//! question as a `tarot` analysis and spends one `tarot` unit; the worker
|
||||
//! writes the reading with the model of the detailed analyses. A failed
|
||||
//! reading gives its unit back.
|
||||
|
||||
use analysis_prompt::tarot::{self, Spread};
|
||||
use analysis_prompt::{Kind, TAROT_QUESTION_MAX_CHARS};
|
||||
use axum::Json;
|
||||
use axum::extract::{Path, State};
|
||||
use axum::http::StatusCode;
|
||||
use axum_extra::extract::WithRejection;
|
||||
use rand::seq::SliceRandom;
|
||||
use rand::{Rng, rng};
|
||||
use serde::Deserialize;
|
||||
use serde_json::{Value, json};
|
||||
use time::OffsetDateTime;
|
||||
use uuid::Uuid;
|
||||
|
||||
use super::{Body, IdPath, St};
|
||||
use crate::auth::AuthUser;
|
||||
use crate::credits::{self, Unit};
|
||||
use crate::error::{ApiError, ApiResult};
|
||||
use crate::views::{rfc3339, rfc3339_opt};
|
||||
|
||||
/// How often a card comes up reversed.
|
||||
const REVERSED_SHARE: f64 = 0.28;
|
||||
/// The readings listed on the page, newest first.
|
||||
const LIST_LIMIT: i64 = 100;
|
||||
|
||||
#[derive(Debug, sqlx::FromRow)]
|
||||
pub struct ReadingRow {
|
||||
pub id: Uuid,
|
||||
pub status: String,
|
||||
pub tarot: Value,
|
||||
pub content: Option<Value>,
|
||||
pub error: Option<String>,
|
||||
pub credits_charged: i32,
|
||||
pub attempts: i32,
|
||||
pub created_at: OffsetDateTime,
|
||||
pub completed_at: Option<OffsetDateTime>,
|
||||
}
|
||||
|
||||
const COLUMNS: &str = "id, status, tarot, content, error, credits_charged, attempts, created_at, completed_at";
|
||||
|
||||
impl ReadingRow {
|
||||
/// The reading as users see it: the cards with their positions (the model
|
||||
/// and the reader's signs are left out).
|
||||
pub fn view(&self) -> Value {
|
||||
let spread = tarot::spread(self.tarot["spread"].as_str().unwrap_or_default());
|
||||
let positions = spread.map(|s| s.positions).unwrap_or_default();
|
||||
let cards: Vec<Value> = self.tarot["cards"]
|
||||
.as_array()
|
||||
.into_iter()
|
||||
.flatten()
|
||||
.enumerate()
|
||||
.map(|(i, c)| {
|
||||
let position = positions.get(i);
|
||||
json!({
|
||||
"card": c["card"],
|
||||
"reversed": c["reversed"],
|
||||
"position": position.map(|p| p.title),
|
||||
"about": position.map(|p| p.about),
|
||||
})
|
||||
})
|
||||
.collect();
|
||||
json!({
|
||||
"id": self.id,
|
||||
"status": self.status,
|
||||
"spread": self.tarot["spread"],
|
||||
"spread_name": spread.map(|s| s.name),
|
||||
"topic": tarot::topic(self.tarot["topic"].as_str()).map(|t| t.id),
|
||||
"topic_name": tarot::topic(self.tarot["topic"].as_str()).map(|t| t.name),
|
||||
"question": self.tarot["question"],
|
||||
"cards": cards,
|
||||
"content": self.content,
|
||||
"error": self.error,
|
||||
"credits_charged": self.credits_charged,
|
||||
"attempts": self.attempts,
|
||||
"created_at": rfc3339(self.created_at),
|
||||
"completed_at": rfc3339_opt(self.completed_at),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// Shuffles the deck and draws one card per position.
|
||||
fn draw(spread: &Spread) -> Vec<Value> {
|
||||
let mut rng = rng();
|
||||
let mut ids: Vec<&str> = tarot::deck().iter().map(|c| c.id.as_str()).collect();
|
||||
ids.shuffle(&mut rng);
|
||||
ids.into_iter()
|
||||
.take(spread.positions.len())
|
||||
.map(|id| json!({ "card": id, "reversed": rng.random_bool(REVERSED_SHARE) }))
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// The Sun, Moon and Ascendant signs of the user's own chart (the Ascendant
|
||||
/// only with a known birth time).
|
||||
async fn big_three(
|
||||
state: &crate::AppState,
|
||||
user: Uuid,
|
||||
) -> Result<(Option<String>, Option<String>, Option<String>), ApiError> {
|
||||
let chart: Option<Value> = sqlx::query_scalar(
|
||||
"SELECT result FROM charts WHERE owner_id = $1 AND kind = 'own' ORDER BY is_primary DESC, created_at LIMIT 1",
|
||||
)
|
||||
.bind(user)
|
||||
.fetch_optional(&state.db)
|
||||
.await?;
|
||||
let Some(chart) = chart else { return Ok((None, None, None)) };
|
||||
let sign_of = |id: &str| {
|
||||
chart["points"]
|
||||
.as_array()
|
||||
.into_iter()
|
||||
.flatten()
|
||||
.find(|p| p["id"] == id)
|
||||
.and_then(|p| p["sign"].as_str())
|
||||
.map(str::to_string)
|
||||
};
|
||||
let time_known = chart["time"]["time_known"].as_bool().unwrap_or(false);
|
||||
let ascendant = chart["angles"]["ascendant"]["sign"].as_str().filter(|_| time_known).map(str::to_string);
|
||||
Ok((sign_of("sun"), sign_of("moon"), ascendant))
|
||||
}
|
||||
|
||||
pub async fn list(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
|
||||
let rows: Vec<ReadingRow> = sqlx::query_as(&format!(
|
||||
"SELECT {COLUMNS} FROM analyses WHERE kind = 'tarot' AND requested_by = $1 ORDER BY created_at DESC LIMIT $2"
|
||||
))
|
||||
.bind(auth.id())
|
||||
.bind(LIST_LIMIT)
|
||||
.fetch_all(&state.db)
|
||||
.await?;
|
||||
let left = credits::balance(&mut *state.db.acquire().await?, auth.id()).await?.tarot;
|
||||
Ok(Json(json!({ "readings": rows.iter().map(ReadingRow::view).collect::<Vec<_>>(), "left": left })))
|
||||
}
|
||||
|
||||
pub async fn get_one(State(state): St, auth: AuthUser, WithRejection(Path(id), _): IdPath) -> ApiResult<Json<Value>> {
|
||||
let row: ReadingRow = sqlx::query_as(&format!(
|
||||
"SELECT {COLUMNS} FROM analyses WHERE id = $1 AND kind = 'tarot' AND requested_by = $2"
|
||||
))
|
||||
.bind(id)
|
||||
.bind(auth.id())
|
||||
.fetch_optional(&state.db)
|
||||
.await?
|
||||
.ok_or(ApiError::NotFound("reading"))?;
|
||||
Ok(Json(row.view()))
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
pub struct NewReading {
|
||||
spread: String,
|
||||
/// `general` (the default), `love`, `work` or `self`.
|
||||
topic: Option<String>,
|
||||
question: Option<String>,
|
||||
}
|
||||
|
||||
/// Draws the cards and queues the reading (one `tarot` unit).
|
||||
pub async fn create(
|
||||
State(state): St,
|
||||
auth: AuthUser,
|
||||
WithRejection(Json(req), _): Body<NewReading>,
|
||||
) -> ApiResult<(StatusCode, Json<Value>)> {
|
||||
let spread = tarot::spread(&req.spread).ok_or_else(|| ApiError::BadRequest("unknown spread".into()))?;
|
||||
let topic = tarot::topic(req.topic.as_deref()).ok_or_else(|| ApiError::BadRequest("unknown topic".into()))?;
|
||||
let question = req.question.map(|q| q.trim().replace("\r\n", "\n")).filter(|q| !q.is_empty());
|
||||
if question.as_ref().is_some_and(|q| q.chars().count() > TAROT_QUESTION_MAX_CHARS) {
|
||||
return Err(ApiError::BadRequest(format!(
|
||||
"the question is at most {TAROT_QUESTION_MAX_CHARS} characters long"
|
||||
)));
|
||||
}
|
||||
let open: bool = sqlx::query_scalar(
|
||||
"SELECT EXISTS (SELECT 1 FROM analyses WHERE kind = 'tarot' AND requested_by = $1 \
|
||||
AND status IN ('pending', 'running'))",
|
||||
)
|
||||
.bind(auth.id())
|
||||
.fetch_one(&state.db)
|
||||
.await?;
|
||||
if open {
|
||||
return Err(ApiError::conflict(
|
||||
"tarot_in_progress",
|
||||
"Az előző jóslásod még készül. Várd meg, és utána húzz újra.",
|
||||
));
|
||||
}
|
||||
let (sun, moon, ascendant) = big_three(&state, auth.id()).await?;
|
||||
let reading = json!({
|
||||
"spread": spread.id,
|
||||
"topic": topic.id,
|
||||
"question": question,
|
||||
"cards": draw(spread),
|
||||
"sun": sun,
|
||||
"moon": moon,
|
||||
"ascendant": ascendant,
|
||||
});
|
||||
// The model of the detailed analyses writes the readings too.
|
||||
let (model, fallback) = crate::models::models_for(&state, Kind::Natal).await?;
|
||||
let language = super::auth::validate_locale(&state, Some(&auth.user.locale))?;
|
||||
let id = Uuid::now_v7();
|
||||
let mut tx = state.db.begin().await?;
|
||||
let row: ReadingRow = sqlx::query_as(&format!(
|
||||
"INSERT INTO analyses (id, kind, requested_by, language, model, prompt_version, cache_key, status, \
|
||||
credits_charged, fallback_model, tarot) \
|
||||
VALUES ($1, 'tarot', $2, $3, $4, $5, $6, 'pending', 1, $7, $8) RETURNING {COLUMNS}"
|
||||
))
|
||||
.bind(id)
|
||||
.bind(auth.id())
|
||||
.bind(&language)
|
||||
.bind(&model)
|
||||
.bind(&state.config.prompt_version)
|
||||
.bind(format!("tarot|{id}"))
|
||||
.bind(&fallback)
|
||||
.bind(&reading)
|
||||
.fetch_one(&mut *tx)
|
||||
.await?;
|
||||
credits::spend(&mut tx, auth.id(), Unit::Tarot, id).await?;
|
||||
tx.commit().await?;
|
||||
tracing::info!(user = %auth.id(), %id, spread = spread.id, "tarot reading queued");
|
||||
Ok((StatusCode::ACCEPTED, Json(row.view())))
|
||||
}
|
||||
@@ -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<String>,
|
||||
}
|
||||
|
||||
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<u8>,
|
||||
content_type: Option<&str>,
|
||||
) -> Result<reqwest::Response, StorageError> {
|
||||
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<reqwest::Response, StorageError> {
|
||||
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<u8>, 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<Option<Object>, 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<Sha256>;
|
||||
|
||||
fn hmac(key: &[u8], data: &str) -> Vec<u8> {
|
||||
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::<Vec<_>>().join("/")
|
||||
}
|
||||
|
||||
fn signing_key(secret: &str, date: &str, region: &str, service: &str) -> Vec<u8> {
|
||||
[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();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,179 @@
|
||||
//! The little of Stripe's API we use: Checkout Sessions (a hosted payment
|
||||
//! page for one package) and webhook signature checking. The package catalog
|
||||
//! stays in `packages.rs`; each session carries its name and price, so no
|
||||
//! products have to be kept in the Stripe dashboard.
|
||||
|
||||
use std::time::Duration;
|
||||
|
||||
use hmac::{Hmac, Mac};
|
||||
use serde::Deserialize;
|
||||
use serde_json::Value;
|
||||
use sha2::Sha256;
|
||||
|
||||
use crate::config::StripeConfig;
|
||||
use crate::error::ApiError;
|
||||
|
||||
/// How old a webhook signature may be (Stripe's own libraries use 5 minutes).
|
||||
const SIGNATURE_TOLERANCE: i64 = 300;
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
pub struct Session {
|
||||
pub id: String,
|
||||
/// The payment page (only while the session is open).
|
||||
pub url: Option<String>,
|
||||
/// `paid`, `unpaid` or `no_payment_required`.
|
||||
pub payment_status: String,
|
||||
/// `open`, `complete` or `expired`.
|
||||
pub status: Option<String>,
|
||||
/// In the smallest unit (fillér for forints).
|
||||
#[serde(default)]
|
||||
pub amount_total: Option<i64>,
|
||||
#[serde(default)]
|
||||
pub currency: Option<String>,
|
||||
/// The PaymentIntent's id.
|
||||
#[serde(default)]
|
||||
pub payment_intent: Option<String>,
|
||||
/// Name, e-mail, billing address; for a company its name and tax ids.
|
||||
#[serde(default)]
|
||||
pub customer_details: Option<Value>,
|
||||
/// `{"terms_of_service": "accepted"}` once the buyer ticked the terms box.
|
||||
#[serde(default)]
|
||||
pub consent: Option<Value>,
|
||||
}
|
||||
|
||||
impl Session {
|
||||
/// The buyer accepted the terms (and gave up the withdrawal right).
|
||||
pub fn terms_accepted(&self) -> bool {
|
||||
self.consent.as_ref().is_some_and(|c| c["terms_of_service"] == "accepted")
|
||||
}
|
||||
}
|
||||
|
||||
impl Session {
|
||||
pub fn paid(&self) -> bool {
|
||||
self.payment_status == "paid"
|
||||
}
|
||||
}
|
||||
|
||||
pub struct Client {
|
||||
http: reqwest::Client,
|
||||
}
|
||||
|
||||
impl Default for Client {
|
||||
fn default() -> Self {
|
||||
let http = reqwest::Client::builder().timeout(Duration::from_secs(20)).build().expect("static configuration");
|
||||
Self { http }
|
||||
}
|
||||
}
|
||||
|
||||
/// What the user sees when Stripe cannot be reached.
|
||||
fn unavailable(detail: String) -> ApiError {
|
||||
tracing::error!(error = %detail, "stripe request failed");
|
||||
ApiError::Limited {
|
||||
code: "payment_unavailable",
|
||||
message: "A fizetési oldal most nem érhető el. Próbáld újra pár perc múlva.".into(),
|
||||
}
|
||||
}
|
||||
|
||||
impl Client {
|
||||
/// Creates a Checkout Session from form fields (Stripe's API takes
|
||||
/// `application/x-www-form-urlencoded` with `a[b][c]` keys).
|
||||
pub async fn create_session(&self, config: &StripeConfig, form: &[(String, String)]) -> Result<Session, ApiError> {
|
||||
let res = self
|
||||
.http
|
||||
.post(format!("{}/v1/checkout/sessions", config.api_url))
|
||||
.bearer_auth(&config.secret_key)
|
||||
.form(form)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| unavailable(e.to_string()))?;
|
||||
Self::session(res).await
|
||||
}
|
||||
|
||||
pub async fn get_session(&self, config: &StripeConfig, id: &str) -> Result<Session, ApiError> {
|
||||
let res = self
|
||||
.http
|
||||
.get(format!("{}/v1/checkout/sessions/{id}", config.api_url))
|
||||
.bearer_auth(&config.secret_key)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| unavailable(e.to_string()))?;
|
||||
Self::session(res).await
|
||||
}
|
||||
|
||||
async fn session(res: reqwest::Response) -> Result<Session, ApiError> {
|
||||
let status = res.status();
|
||||
if !status.is_success() {
|
||||
let body = res.text().await.unwrap_or_default();
|
||||
return Err(unavailable(format!("HTTP {status}: {}", body.chars().take(500).collect::<String>())));
|
||||
}
|
||||
res.json().await.map_err(|e| unavailable(format!("unexpected response: {e}")))
|
||||
}
|
||||
}
|
||||
|
||||
/// Checks a `Stripe-Signature` header (`t=…,v1=…[,v1=…]`): an HMAC-SHA256 of
|
||||
/// `"{t}.{body}"` with the endpoint's signing secret, at most five minutes old.
|
||||
pub fn verify_signature(secret: &str, header: &str, body: &[u8], now: i64) -> bool {
|
||||
let mut timestamp = None;
|
||||
let mut signatures = Vec::new();
|
||||
for part in header.split(',') {
|
||||
match part.trim().split_once('=') {
|
||||
Some(("t", v)) => timestamp = v.parse::<i64>().ok(),
|
||||
Some(("v1", v)) => signatures.push(v),
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
let Some(timestamp) = timestamp else { return false };
|
||||
if (now - timestamp).abs() > SIGNATURE_TOLERANCE {
|
||||
return false;
|
||||
}
|
||||
let mut mac = Hmac::<Sha256>::new_from_slice(secret.as_bytes()).expect("HMAC takes any key length");
|
||||
mac.update(timestamp.to_string().as_bytes());
|
||||
mac.update(b".");
|
||||
mac.update(body);
|
||||
let expected = mac.finalize().into_bytes();
|
||||
signatures.iter().any(|s| decode_hex(s).is_some_and(|sig| constant_time_eq(&sig, &expected)))
|
||||
}
|
||||
|
||||
/// The signature header for a body, as Stripe would send it (tests).
|
||||
#[cfg(test)]
|
||||
pub fn sign(secret: &str, body: &[u8], timestamp: i64) -> String {
|
||||
let mut mac = Hmac::<Sha256>::new_from_slice(secret.as_bytes()).unwrap();
|
||||
mac.update(format!("{timestamp}.").as_bytes());
|
||||
mac.update(body);
|
||||
let hex: String = mac.finalize().into_bytes().iter().map(|b| format!("{b:02x}")).collect();
|
||||
format!("t={timestamp},v1={hex}")
|
||||
}
|
||||
|
||||
fn decode_hex(s: &str) -> Option<Vec<u8>> {
|
||||
if !s.len().is_multiple_of(2) {
|
||||
return None;
|
||||
}
|
||||
(0..s.len()).step_by(2).map(|i| u8::from_str_radix(s.get(i..i + 2)?, 16).ok()).collect()
|
||||
}
|
||||
|
||||
fn constant_time_eq(a: &[u8], b: &[u8]) -> bool {
|
||||
a.len() == b.len() && a.iter().zip(b).fold(0u8, |acc, (x, y)| acc | (x ^ y)) == 0
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn signatures_are_checked() {
|
||||
let body = br#"{"id":"evt_1"}"#;
|
||||
let now = 1_800_000_000;
|
||||
let header = sign("whsec_test", body, now);
|
||||
assert!(verify_signature("whsec_test", &header, body, now));
|
||||
assert!(verify_signature("whsec_test", &header, body, now + 299));
|
||||
// Another secret, a changed body, an old or missing timestamp.
|
||||
assert!(!verify_signature("whsec_other", &header, body, now));
|
||||
assert!(!verify_signature("whsec_test", &header, br#"{"id":"evt_2"}"#, now));
|
||||
assert!(!verify_signature("whsec_test", &header, body, now + 301));
|
||||
assert!(!verify_signature("whsec_test", header.split_once(',').unwrap().1, body, now));
|
||||
// One good signature among others (during a secret rotation) is enough.
|
||||
let rotated = format!("{header},v1=00ff");
|
||||
assert!(verify_signature("whsec_test", &rotated, body, now));
|
||||
assert!(!verify_signature("whsec_test", "t=1800000000,v1=zz", body, now));
|
||||
}
|
||||
}
|
||||
+983
-91
File diff suppressed because it is too large
Load Diff
@@ -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"],
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
@@ -2,25 +2,15 @@ import Link from "next/link";
|
||||
|
||||
import { ChartWheel } from "@/components/ChartWheel";
|
||||
import { Rich } from "@/components/Rich";
|
||||
import { TarotCard, TarotCardBack } from "@/components/tarot/TarotCard";
|
||||
import { Logo, PublicHeader } from "@/components/SiteHeader";
|
||||
import { Waitlist } from "@/components/Waitlist";
|
||||
import example from "@/content/pelda.json";
|
||||
import { tarotCard } from "@/lib/tarot";
|
||||
import type { AnalysisContent, ChartResult } from "@/lib/types";
|
||||
|
||||
// A quiet starfield, the same on every render.
|
||||
const STARS = (() => {
|
||||
let seed = 7;
|
||||
const rnd = () => {
|
||||
seed = (seed * 9301 + 49297) % 233280;
|
||||
return seed / 233280;
|
||||
};
|
||||
return Array.from({ length: 70 }, (_, i) => ({
|
||||
x: (rnd() * 1000).toFixed(1),
|
||||
y: (rnd() * 600).toFixed(1),
|
||||
r: (0.6 + rnd() * 1.4).toFixed(1),
|
||||
t: i % 5,
|
||||
}));
|
||||
})();
|
||||
/** The cards fanned out next to the tarot line (after a card back). */
|
||||
const TAROT_CARDS = ["major-2", "major-17"].map((id) => tarotCard(id)).filter((c) => c !== undefined);
|
||||
|
||||
const MONTHS = ["márc", "ápr", "máj", "jún", "júl", "aug", "szept", "okt", "nov", "dec", "jan", "febr"];
|
||||
|
||||
@@ -63,11 +53,6 @@ export function Landing({ inviteOnly }: { inviteOnly: boolean }) {
|
||||
<PublicHeader onHome />
|
||||
|
||||
<section className="lp-hero">
|
||||
<svg className="lp-stars" aria-hidden="true" viewBox="0 0 1000 600" preserveAspectRatio="xMidYMid slice">
|
||||
{STARS.map((s, i) => (
|
||||
<circle key={i} cx={s.x} cy={s.y} r={s.r} className={`lp-star lp-t${s.t}`} />
|
||||
))}
|
||||
</svg>
|
||||
<div className="lp-wrap lp-hero-grid">
|
||||
<div className="lp-hero-text">
|
||||
<span className="eyebrow lp-rise lp-r1">Születési képlet · Éves előrejelzés · Kapcsolat</span>
|
||||
@@ -81,8 +66,8 @@ export function Landing({ inviteOnly }: { inviteOnly: boolean }) {
|
||||
belőle. Megmutatjuk, mit hoz az éved, és mennyire illetek össze azzal, akit szeretsz.
|
||||
</p>
|
||||
<p className="ai-line lp-ai-line lp-rise lp-r3">
|
||||
Részletes elemzések a legfejlettebb AI-modellekkel: egy tapasztalt asztrológushoz közelítő mélység, töredék
|
||||
áron.
|
||||
Részletes, személyre szóló elemzések a legfejlettebb AI-modellekkel: percek alatt, egy személyes konzultáció
|
||||
árának töredékéért.
|
||||
</p>
|
||||
<div className="lp-actions lp-rise lp-r4">
|
||||
<Link href="/belepes" className="btn btn-primary lp-btn">
|
||||
@@ -92,6 +77,10 @@ export function Landing({ inviteOnly }: { inviteOnly: boolean }) {
|
||||
Példaelemzés
|
||||
</Link>
|
||||
</div>
|
||||
<p className="lp-free-line lp-rise lp-r4">
|
||||
<span className="lp-free-label">Ingyenes</span>
|
||||
<Link href="/szuletesi-horoszkop">Nézd meg a születési horoszkópodat belépés nélkül →</Link>
|
||||
</p>
|
||||
<p className="hint lp-rise lp-r4">
|
||||
{inviteOnly ? (
|
||||
<>
|
||||
@@ -132,12 +121,40 @@ export function Landing({ inviteOnly }: { inviteOnly: boolean }) {
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section className="lp-free-band" aria-labelledby="free-title">
|
||||
<div className="lp-wrap">
|
||||
<div className="lp-free-head">
|
||||
<span className="lp-free-label">Ingyenes</span>
|
||||
<h2 id="free-title" className="lp-free-title">
|
||||
Belépés nélkül is kipróbálhatod
|
||||
</h2>
|
||||
</div>
|
||||
<div className="lp-free-grid">
|
||||
<Link href="/szuletesi-horoszkop" className="card lp-free-card">
|
||||
<strong>Születési horoszkóp</strong>
|
||||
<span className="muted">
|
||||
A teljes képleted percre pontosan: képletrajz, aszcendens, holdjegy, bolygók a jegyekben és a házakban,
|
||||
fényszögek.
|
||||
</span>
|
||||
<span className="lp-free-go">Elkészítem →</span>
|
||||
</Link>
|
||||
<Link href="/csillagjegyek" className="card lp-free-card">
|
||||
<strong>A 12 csillagjegy</strong>
|
||||
<span className="muted">
|
||||
Milyen a jegyed napjegyként, holdjegyként és aszcendensként? Párkapcsolat, munka, és ami nem igaz róla.
|
||||
</span>
|
||||
<span className="lp-free-go">Megnézem →</span>
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section className="lp-band lp-why" aria-labelledby="why-title">
|
||||
<div className="lp-wrap lp-stack">
|
||||
<div className="lp-intro">
|
||||
<span className="eyebrow">Miért más?</span>
|
||||
<h2 id="why-title" className="lp-h2">
|
||||
Egy asztrológus mélysége, töredék áron
|
||||
Alapos elemzés, töredék áron
|
||||
</h2>
|
||||
</div>
|
||||
<ul className="lp-why-grid">
|
||||
@@ -158,10 +175,10 @@ export function Landing({ inviteOnly }: { inviteOnly: boolean }) {
|
||||
<circle cx="12" cy="12" r="4" />
|
||||
<path d="M12 3v5M12 16v5M3 12h5M16 12h5" />
|
||||
</svg>
|
||||
<h3 className="lp-step-title">Asztrológusi mélység</h3>
|
||||
<h3 className="lp-step-title">Az egész képletet olvassa</h3>
|
||||
<p className="lp-small">
|
||||
A bolygókat jegyükben, házukban, fényszögeikben és uralkodóik láncolatában olvassa, a holdcsomópontokkal és
|
||||
az év tranzitjaival együtt, ahogy egy tapasztalt asztrológus is tenné.
|
||||
az év tranzitjaival együtt: nem egy-egy fényállást, hanem az összefüggéseket.
|
||||
</p>
|
||||
</li>
|
||||
<li className="card lp-why-card">
|
||||
@@ -378,6 +395,28 @@ export function Landing({ inviteOnly }: { inviteOnly: boolean }) {
|
||||
</div>
|
||||
</article>
|
||||
</div>
|
||||
|
||||
<article className="card lp-tarot" aria-labelledby="tarot-title">
|
||||
<div className="lp-tarot-cards" aria-hidden="true">
|
||||
<TarotCardBack />
|
||||
{TAROT_CARDS.map((card) => (
|
||||
<TarotCard key={card.id} card={card} />
|
||||
))}
|
||||
</div>
|
||||
<div className="lp-tarot-text">
|
||||
<span className="eyebrow">Kártyajóslás is</span>
|
||||
<h3 id="tarot-title" className="lp-tarot-title">
|
||||
Egy kérdés, néhány lap
|
||||
</h3>
|
||||
<p className="lp-small">
|
||||
Húzz lapot egy konkrét kérdésre: a kirakásodra és a képleted Napjára, Holdjára, Aszcendensére személyre
|
||||
szabott értelmezés készül. Néhány jóslás minden csomagban benne van.
|
||||
</p>
|
||||
</div>
|
||||
<Link href="/kartyajoslas/pelda" className="lp-tarot-link">
|
||||
Példajóslás →
|
||||
</Link>
|
||||
</article>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
@@ -453,11 +492,12 @@ export function Landing({ inviteOnly }: { inviteOnly: boolean }) {
|
||||
<div className="lp-wrap lp-footer-inner">
|
||||
<Logo />
|
||||
<nav aria-label="Lábléc" className="lp-footer-nav">
|
||||
<Link href="/szuletesi-horoszkop">Születési horoszkóp</Link>
|
||||
<Link href="/csillagjegyek">Csillagjegyek</Link>
|
||||
<Link href="/pelda">Példaelemzés</Link>
|
||||
<Link href="/kartyajoslas/pelda">Példajóslás</Link>
|
||||
<Link href="/aszf">ÁSZF</Link>
|
||||
<Link href="/adatvedelem">Adatvédelem</Link>
|
||||
<Link href="/privacy" lang="en">
|
||||
Privacy Policy
|
||||
</Link>
|
||||
<Link href="/belepes">Belépés</Link>
|
||||
</nav>
|
||||
<span className="hint">© {new Date().getFullYear()} Sorsfonalak</span>
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
import type { Metadata } from "next";
|
||||
import Link from "next/link";
|
||||
|
||||
import { OperatorDetails } from "@/components/OperatorDetails";
|
||||
import { PublicHeader } from "@/components/SiteHeader";
|
||||
import { OPERATOR, PRIVACY_UPDATED, operatorDetails } from "@/lib/legal";
|
||||
import { OPERATOR, PRIVACY_UPDATED } from "@/lib/legal";
|
||||
import { getMe } from "@/lib/server";
|
||||
|
||||
export const metadata: Metadata = {
|
||||
title: "Adatvédelmi tájékoztató",
|
||||
description: "Hogyan kezeli a Sorsfonalak a személyes adataidat.",
|
||||
alternates: { canonical: "/adatvedelem", languages: { hu: "/adatvedelem", en: "/privacy" } },
|
||||
};
|
||||
|
||||
/** Privacy policy: public, also for visitors who are not logged in. */
|
||||
@@ -29,14 +31,8 @@ export default async function PrivacyPage() {
|
||||
<section>
|
||||
<h2>1. Ki kezeli az adataidat?</h2>
|
||||
<p>
|
||||
{operatorDetails() ? (
|
||||
<>
|
||||
A Sorsfonalak szolgáltatás (sorsfonalak.hu) adatkezelője: <strong>{operatorDetails()}</strong>.{" "}
|
||||
</>
|
||||
) : (
|
||||
"A Sorsfonalak szolgáltatás (sorsfonalak.hu) adatkezelőjét e-mailben éred el. "
|
||||
)}
|
||||
Adatvédelmi és minden más kérdésben itt érsz el minket:{" "}
|
||||
A Sorsfonalak szolgáltatás (sorsfonalak.hu) adatkezelőjének adatai a tájékoztató végén, a 12. pontban
|
||||
vannak. Adatvédelmi és minden más kérdésben itt érsz el minket:{" "}
|
||||
<a href={`mailto:${OPERATOR.email}`}>
|
||||
<strong>{OPERATOR.email}</strong>
|
||||
</a>
|
||||
@@ -57,10 +53,21 @@ export default async function PrivacyPage() {
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>Google-fiókod neve, e-mail-címe és azonosítója (belépéskor a Google adja át)</td>
|
||||
<td>
|
||||
Google- vagy Apple-fiókod neve, e-mail-címe és azonosítója (belépéskor a Google, illetve az Apple adja
|
||||
át)
|
||||
</td>
|
||||
<td>Fiókod létrehozása, belépés, kapcsolattartás</td>
|
||||
<td>Szerződés teljesítése (GDPR 6. cikk (1) b)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
E-mail-cím és jelszó, ha e-mail-címmel regisztrálsz (a jelszót nem tároljuk, csak egy sózott,
|
||||
visszafejthetetlen lenyomatát, hash-ét)
|
||||
</td>
|
||||
<td>Belépés; a címre küldött linkkel igazolod, hogy a cím a tiéd, és ezzel adhatsz meg új jelszót</td>
|
||||
<td>Szerződés teljesítése</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Megjelenített név, az elemzések nyelve</td>
|
||||
<td>A szolgáltatás személyre szabása</td>
|
||||
@@ -77,7 +84,9 @@ export default async function PrivacyPage() {
|
||||
<td>Szerződés teljesítése; a felvételhez az érintett beleegyezése szükséges (lásd 5. pont)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>A képletek és az elkészült elemzések</td>
|
||||
<td>
|
||||
A képletek, az elkészült elemzések és kártyajóslások, a feltett kérdéseid és a rájuk adott válaszok
|
||||
</td>
|
||||
<td>Hogy bármikor újra megnézhesd őket</td>
|
||||
<td>Szerződés teljesítése</td>
|
||||
</tr>
|
||||
@@ -86,6 +95,22 @@ export default async function PrivacyPage() {
|
||||
<td>A megvásárolt szolgáltatás nyújtása, elszámolás</td>
|
||||
<td>Szerződés teljesítése; számviteli kötelezettség (6. cikk (1) c)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
Fizetéseid adatai: a Stripe fizetési azonosítója, a fizetett összeg, a számlázási neved, címed és
|
||||
e-mail-címed, céges vásárlásnál a cégnév és az adószám
|
||||
</td>
|
||||
<td>A fizetés igazolása, a számla kiállítása</td>
|
||||
<td>Szerződés teljesítése; számviteli kötelezettség (6. cikk (1) c)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
Megosztott linkjeid: a link kódja, a megtekintések száma és annak az IP-címnek a sózott lenyomata
|
||||
(hash-e), ahonnan a linket létrehoztad; ha valaki a linkedről regisztrál, hogy ki hozta
|
||||
</td>
|
||||
<td>A megosztás és a megosztásért járó ajándék; hogy a saját megtekintéseid ne számítsanak</td>
|
||||
<td>Szerződés teljesítése; jogos érdek (6. cikk (1) f)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Meghívott e-mail-címe, a meghívó neve és személyes üzenete</td>
|
||||
<td>A meghívó elküldése; amíg az oldal zártkörű, csak meghívottak regisztrálhatnak</td>
|
||||
@@ -110,8 +135,15 @@ export default async function PrivacyPage() {
|
||||
</table>
|
||||
</div>
|
||||
<p>
|
||||
Bankkártyaadatot nem kezelünk és nem tárolunk; a fizetést, amikor elindul, külső fizetési szolgáltató
|
||||
végzi, akinek a neve itt lesz feltüntetve.
|
||||
<strong>Bankkártyaadatot nem kezelünk és nem tárolunk.</strong> A fizetés a Stripe biztonságos fizetési
|
||||
oldalán történik: a kártyaadataidat közvetlenül a Stripe-nak adod meg, hozzánk nem jutnak el. A Stripe-tól
|
||||
csak a fizetés azonosítóját, összegét és a számlázási adataidat kapjuk meg. Ezeket a fiókod törlése után is
|
||||
megőrizzük a számviteli törvény szerinti ideig (8 évig).
|
||||
</p>
|
||||
<p>
|
||||
<strong>Megosztott link:</strong> ha megosztasz egy képletet, a linken bárki, akinek elküldöd, látja a
|
||||
képlet rajzát és a legfrissebb rövid összefoglalót. Nevet és születési adatot nem tesz közzé, a keresők nem
|
||||
listázzák, és a linket bármikor visszavonhatod.
|
||||
</p>
|
||||
</section>
|
||||
|
||||
@@ -158,16 +190,24 @@ export default async function PrivacyPage() {
|
||||
</a>{" "}
|
||||
szabályzatnak, beleértve a „Limited Use” (korlátozott felhasználás) követelményeit.
|
||||
</p>
|
||||
<p>
|
||||
<strong>Belépés Apple-fiókkal:</strong> ha az „Apple-bejelentkezést” választod, az Apple a fiókod egyedi
|
||||
azonosítóját és az e-mail-címedet adja át, az első belépéskor a nevedet is. Ha az e-mail-címedet elrejted,
|
||||
egy Apple-továbbítócímet kapunk (<code>…@privaterelay.appleid.com</code>): az erre küldött leveleinket az Apple
|
||||
továbbítja hozzád. Ezeket ugyanarra és ugyanúgy használjuk, mint a Google-adatokat. A hozzáférést az Apple ID
|
||||
beállításaidban vonhatod vissza (Bejelentkezés és biztonság › Bejelentkezés az Apple-lel).
|
||||
</p>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<h2>4. Az elemzések és a mesterséges intelligencia</h2>
|
||||
<p>
|
||||
A rövid összefoglalót és a részletes elemzést nagy nyelvi modell (mesterséges intelligencia) írja. A
|
||||
modellhez <strong>csak a képlet csillagászati adatai</strong> jutnak el (a bolygók jegye, foka, háza és
|
||||
fényszögei). Nevet, e-mail-címet, születési dátumot, időpontot vagy helyet nem küldünk el. Az elemzés
|
||||
szórakoztató és önismereti célú szöveg, nem minősül egészségügyi, pénzügyi, jogi vagy más szakmai
|
||||
tanácsnak.
|
||||
A rövid összefoglalót, a részletes elemzéseket, a kártyajóslást és a kérdésekre adott válaszokat nagy nyelvi
|
||||
modell (mesterséges intelligencia) írja. A modellhez a <strong>képlet csillagászati adatai</strong> jutnak
|
||||
el (a bolygók jegye, foka, háza és fényszögei), kártyajóslásnál a kihúzott lapok, és ha kérdést teszel fel,
|
||||
a kérdésed szövege. Nevet, e-mail-címet, születési dátumot, időpontot vagy helyet nem küldünk el. Kérjük, a
|
||||
kérdéseidbe se írj neveket vagy érzékeny adatot (például egészségügyi adatot). Az elemzés szórakoztató és
|
||||
önismereti célú szöveg, nem minősül egészségügyi, pénzügyi, jogi vagy más szakmai tanácsnak.
|
||||
</p>
|
||||
</section>
|
||||
|
||||
@@ -198,9 +238,17 @@ export default async function PrivacyPage() {
|
||||
<strong>Amazon Web Services EMEA SARL</strong> (Amazon SES) – a rendszerlevelek és a meghívók kézbesítése;
|
||||
az Európai Unióban (Frankfurt).
|
||||
</li>
|
||||
<li>
|
||||
<strong>Stripe Payments Europe, Ltd.</strong> (Írország) – a bankkártyás fizetés lebonyolítása és a
|
||||
visszaélések kiszűrése; a kártyaadatokat csak a Stripe kezeli.
|
||||
</li>
|
||||
<li>
|
||||
<strong>Billingo Technologies Zrt.</strong> (Billingo) – a számlák kiállítása, megküldése és megőrzése; a
|
||||
számlázási adataidat (név, cím, e-mail-cím, céges vásárlásnál cégnév és adószám) kapja meg.
|
||||
</li>
|
||||
<li>
|
||||
<strong>OpenRouter, Inc.</strong> és az általa elért mesterségesintelligencia-szolgáltatók – az elemzések
|
||||
megírása, kizárólag a 4. pontban leírt csillagászati adatokból (személyes adat nem jut el hozzájuk).
|
||||
megírása, kizárólag a 4. pontban leírt adatokból (nevet, e-mail-címet és születési adatot nem kapnak).
|
||||
</li>
|
||||
</ul>
|
||||
<p>
|
||||
@@ -231,6 +279,14 @@ export default async function PrivacyPage() {
|
||||
Csak egy, a működéshez feltétlenül szükséges sütit használunk (<code>sf_session</code>), amely belépve
|
||||
tart. Reklám- vagy követő sütiket, illetve látogatottságmérőt nem használunk.
|
||||
</p>
|
||||
<p>
|
||||
A belépés nélküli <Link href="/szuletesi-horoszkop">születési horoszkópnál</Link> a megadott születési adatokat
|
||||
csak a számításhoz küldjük el, a szerveren nem tároljuk őket. Hogy oldalváltáskor ne vesszenek el, a
|
||||
böngészőlap saját tárolójában maradnak (nem sütiben), és a lap bezárásakor maguktól törlődnek; az oldalon az
|
||||
„Adatok törlése” gombbal előbb is törölheted őket. Ha ugyanabban a lapban regisztrálsz, a profilodban ezekkel
|
||||
töltjük ki a születési adataidat. Ez a tárolás csak azt őrzi meg, amit te írtál be, ezért nem kell hozzá
|
||||
külön hozzájárulás.
|
||||
</p>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
@@ -272,6 +328,11 @@ export default async function PrivacyPage() {
|
||||
oldalon olvasható.
|
||||
</p>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<h2>12. Az adatkezelő adatai</h2>
|
||||
<OperatorDetails />
|
||||
</section>
|
||||
</main>
|
||||
</>
|
||||
);
|
||||
|
||||
@@ -8,13 +8,14 @@ import { ROLE_LABELS, formatDate } from "@/lib/astro";
|
||||
import type { AdminUser, Package, Role } from "@/lib/types";
|
||||
|
||||
const EDITABLE_ROLES: Role[] = ["user", "creator", "admin"];
|
||||
type UnitKind = "natal" | "synastry" | "forecast" | "question";
|
||||
type UnitKind = "natal" | "synastry" | "forecast" | "question" | "tarot";
|
||||
|
||||
const UNITS: { value: UnitKind; label: string }[] = [
|
||||
{ value: "natal", label: "képlet" },
|
||||
{ value: "synastry", label: "szinasztria" },
|
||||
{ value: "forecast", label: "előrejelzés" },
|
||||
{ value: "question", label: "kérdés" },
|
||||
{ value: "tarot", label: "kártyajóslás" },
|
||||
];
|
||||
|
||||
export function AdminUsers({ selfId }: { selfId: string }) {
|
||||
@@ -183,6 +184,8 @@ function UserRow({
|
||||
előrejelzés {user.analyses_left.forecast ?? 0}
|
||||
<br />
|
||||
kérdés {user.analyses_left.question ?? 0}
|
||||
<br />
|
||||
jóslás {user.analyses_left.tarot ?? 0}
|
||||
</span>
|
||||
<label className="sr-only" htmlFor={`unit-${user.id}`}>
|
||||
Elemzés fajtája
|
||||
|
||||
@@ -14,6 +14,7 @@ const KINDS: Record<string, string> = {
|
||||
natal: "képletelemzés",
|
||||
synastry: "kapcsolati",
|
||||
forecast: "előrejelzés",
|
||||
celebrity: "híres ember",
|
||||
question: "válasz",
|
||||
};
|
||||
const OUTCOMES: Record<GenerationError["outcome"], { label: string; tone: string }> = {
|
||||
|
||||
@@ -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<string, string> = {
|
||||
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<AdminCelebrityRow[] | null>(null);
|
||||
const [error, setError] = useState<string | null>(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 (
|
||||
<section className="field" style={{ gap: 18 }}>
|
||||
{adding ? (
|
||||
<div className="card field" style={{ gap: 16 }}>
|
||||
<h2>Új híres ember</h2>
|
||||
<BirthForm
|
||||
initial={null}
|
||||
person={{}}
|
||||
save={(name, birth) =>
|
||||
api<AdminCelebrity>("/admin/celebrities", { body: { name, subtitle: subtitle.trim() || null, birth } })
|
||||
}
|
||||
onCancel={() => setAdding(false)}
|
||||
onSaved={(id) => router.push(`/admin/hires-emberek/${id}`)}
|
||||
>
|
||||
<SubtitleField value={subtitle} onChange={setSubtitle} />
|
||||
</BirthForm>
|
||||
<p className="hint">
|
||||
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.
|
||||
</p>
|
||||
</div>
|
||||
) : (
|
||||
<div className="form-actions">
|
||||
<button type="button" className="btn btn-primary" onClick={() => setAdding(true)}>
|
||||
Új híres ember
|
||||
</button>
|
||||
<Link href="/hires-emberek" className="btn btn-ghost">
|
||||
Nyilvános lista
|
||||
</Link>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{error && (
|
||||
<p className="msg msg-error" role="alert">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
{rows === null ? (
|
||||
!error && <p className="muted">Betöltés…</p>
|
||||
) : rows.length === 0 ? (
|
||||
<p className="muted">Még nincs híres ember.</p>
|
||||
) : (
|
||||
<div className="table-wrap">
|
||||
<table className="promo-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Név</th>
|
||||
<th>Született</th>
|
||||
<th>Nap · Hold · Asc</th>
|
||||
<th>Portré</th>
|
||||
<th>Fotó</th>
|
||||
<th>Állapot</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{rows.map((c) => (
|
||||
<tr key={c.id}>
|
||||
<td>
|
||||
<Link href={`/admin/hires-emberek/${c.id}`}>{c.name}</Link>
|
||||
{c.subtitle && <span className="hint">{c.subtitle}</span>}
|
||||
</td>
|
||||
<td className="num">
|
||||
{c.birth.date}
|
||||
{c.birth.time ? ` ${c.birth.time}` : ""}
|
||||
{c.birth.place && <span className="hint">{c.birth.place}</span>}
|
||||
</td>
|
||||
<td>
|
||||
{[c.highlights.sun, c.highlights.moon, c.highlights.time_known ? c.highlights.ascendant : null]
|
||||
.map((s) => (s ? signName(s) : "–"))
|
||||
.join(" · ")}
|
||||
</td>
|
||||
<td>{c.analysis_status ? ANALYSIS_STATUS[c.analysis_status] : <span className="muted">–</span>}</td>
|
||||
<td>{c.has_photo ? "van" : <span className="muted">nincs</span>}</td>
|
||||
<td>
|
||||
{c.published ? (
|
||||
<Link href={`/hires-emberek/${c.slug}`} className="promo-open">
|
||||
közzétéve
|
||||
</Link>
|
||||
) : (
|
||||
<span className="muted">vázlat</span>
|
||||
)}
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
)}
|
||||
</section>
|
||||
);
|
||||
}
|
||||
|
||||
/** The line under the name, e.g. "színésznő, énekesnő". */
|
||||
export function SubtitleField({ value, onChange }: { value: string; onChange: (v: string) => void }) {
|
||||
return (
|
||||
<div className="field" style={{ maxWidth: 420 }}>
|
||||
<label htmlFor="celeb-subtitle">Egy sor a név alatt (nem kötelező)</label>
|
||||
<input
|
||||
id="celeb-subtitle"
|
||||
className="inp"
|
||||
value={value}
|
||||
maxLength={160}
|
||||
placeholder="pl. színésznő, énekesnő"
|
||||
onChange={(e) => onChange(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -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<AdminCelebrity | null>(null);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const url = `/admin/celebrities/${id}`;
|
||||
|
||||
const load = useCallback(async () => {
|
||||
try {
|
||||
setC(await api<AdminCelebrity>(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 ? (
|
||||
<p className="msg msg-error" role="alert">
|
||||
{error}
|
||||
</p>
|
||||
) : (
|
||||
<p className="muted">Betöltés…</p>
|
||||
);
|
||||
}
|
||||
|
||||
async function patch(body: object) {
|
||||
setError(null);
|
||||
try {
|
||||
setC(await api<AdminCelebrity>(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 (
|
||||
<div className="field" style={{ gap: 20 }}>
|
||||
<div className="page-head">
|
||||
<span className="eyebrow">
|
||||
<Link href="/admin/hires-emberek">Híres emberek</Link>
|
||||
</span>
|
||||
<h1>{c.name}</h1>
|
||||
<p className="muted">
|
||||
{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(" · ")}
|
||||
</p>
|
||||
<div className="form-actions">
|
||||
<button type="button" className="btn btn-primary" onClick={() => patch({ published: !c.published })}>
|
||||
{c.published ? "Visszavonás vázlatba" : "Közzététel"}
|
||||
</button>
|
||||
<Link href={`/hires-emberek/${c.slug}`} className="btn btn-ghost" target="_blank">
|
||||
{c.published ? "Nyilvános oldal" : "Előnézet"}
|
||||
</Link>
|
||||
<span className={c.published ? "promo-open" : "muted"}>{c.published ? "közzétéve" : "vázlat"}</span>
|
||||
</div>
|
||||
</div>
|
||||
{error && (
|
||||
<p className="msg msg-error" role="alert">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
|
||||
<PhotoSection c={c} url={url} onChange={setC} onFocus={(x, y) => patch({ focus_x: x, focus_y: y })} />
|
||||
<TextsSection key={c.updated_at} c={c} onSave={patch} />
|
||||
<AnalysisSection c={c} url={url} onChange={setC} onAnalysis={(a) => setC({ ...c, analysis: a })} />
|
||||
|
||||
<section className="card field" style={{ gap: 14 }}>
|
||||
<h2>Születési adatok</h2>
|
||||
<p className="hint">
|
||||
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.
|
||||
</p>
|
||||
<BirthForm
|
||||
key={JSON.stringify(c.birth_data)}
|
||||
initial={{ ...c.birth_data, placeName: c.birth.place, region: c.birth.region }}
|
||||
person={{ chartId: c.id, name: c.name }}
|
||||
save={async (name, birth) => {
|
||||
const next = await api<AdminCelebrity>(url, { method: "PATCH", body: birth ? { name, birth } : { name } });
|
||||
setC(next);
|
||||
return next;
|
||||
}}
|
||||
onSaved={() => undefined}
|
||||
/>
|
||||
</section>
|
||||
|
||||
<section className="card field" style={{ gap: 10 }}>
|
||||
<h2>Törlés</h2>
|
||||
<p className="hint">A képlet, a portré és a fotó is törlődik; a nyilvános oldal megszűnik.</p>
|
||||
<div className="form-actions">
|
||||
<button type="button" className="btn btn-ghost" onClick={remove}>
|
||||
{c.name} törlése
|
||||
</button>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
/** 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<string | null>(null);
|
||||
const input = useRef<HTMLInputElement>(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<AdminCelebrity>(`${url}/photo`, { method: "DELETE" }));
|
||||
} catch (e) {
|
||||
setError(errorText(e));
|
||||
}
|
||||
}
|
||||
|
||||
function pick(e: React.MouseEvent<HTMLButtonElement>) {
|
||||
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 (
|
||||
<section className="card field" style={{ gap: 14 }}>
|
||||
<h2>Fotó</h2>
|
||||
<p className="hint">
|
||||
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.
|
||||
</p>
|
||||
{photo && (
|
||||
<div className="celeb-editor-photo">
|
||||
<button type="button" className="celeb-focus" onClick={pick} aria-label="Az arc helye: kattints az arcra">
|
||||
{/* The stored original, for clicking: no optimizer needed here. */}
|
||||
{/* eslint-disable-next-line @next/next/no-img-element */}
|
||||
<img src={photoSrc(photo)} alt={c.name} width={photo.width} height={photo.height} />
|
||||
<span
|
||||
className="celeb-focus-mark"
|
||||
style={{ left: `${photo.focus_x * 100}%`, top: `${photo.focus_y * 100}%` }}
|
||||
aria-hidden="true"
|
||||
/>
|
||||
</button>
|
||||
<div className="celeb-crops" aria-label="Kivágások">
|
||||
<figure>
|
||||
<span className="celeb-crop" style={{ aspectRatio: "440 / 630" }}>
|
||||
{/* eslint-disable-next-line @next/next/no-img-element */}
|
||||
<img src={photoSrc(photo)} alt="" style={{ objectPosition: objectPosition(photo) }} />
|
||||
</span>
|
||||
<figcaption className="hint">Megosztási kép</figcaption>
|
||||
</figure>
|
||||
<figure>
|
||||
<span className="celeb-crop" style={{ aspectRatio: "4 / 5" }}>
|
||||
{/* eslint-disable-next-line @next/next/no-img-element */}
|
||||
<img src={photoSrc(photo)} alt="" style={{ objectPosition: objectPosition(photo) }} />
|
||||
</span>
|
||||
<figcaption className="hint">Oldal</figcaption>
|
||||
</figure>
|
||||
<figure>
|
||||
<span className="celeb-crop" style={{ aspectRatio: "1 / 1" }}>
|
||||
{/* eslint-disable-next-line @next/next/no-img-element */}
|
||||
<img src={photoSrc(photo)} alt="" style={{ objectPosition: objectPosition(photo) }} />
|
||||
</span>
|
||||
<figcaption className="hint">Lista</figcaption>
|
||||
</figure>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
<div className="form-actions">
|
||||
<input
|
||||
ref={input}
|
||||
type="file"
|
||||
accept="image/jpeg,image/png,image/webp"
|
||||
className="sr-only"
|
||||
id="celeb-photo-input"
|
||||
onChange={(e) => {
|
||||
const file = e.target.files?.[0];
|
||||
if (file) upload(file);
|
||||
}}
|
||||
/>
|
||||
<label htmlFor="celeb-photo-input" className="btn" aria-disabled={busy}>
|
||||
{busy ? "Feltöltés…" : photo ? "Másik fotó" : "Fotó feltöltése"}
|
||||
</label>
|
||||
{photo && (
|
||||
<button type="button" className="btn btn-ghost" onClick={removePhoto} disabled={busy}>
|
||||
Fotó törlése
|
||||
</button>
|
||||
)}
|
||||
<Link href={`/hires-emberek/${c.slug}/kep/elonezet.png`} target="_blank" className="btn btn-ghost">
|
||||
Megosztási kép megnyitása
|
||||
</Link>
|
||||
</div>
|
||||
{error && (
|
||||
<p className="msg msg-error" role="alert">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
</section>
|
||||
);
|
||||
}
|
||||
|
||||
/** Name, the line under it and the address of the page. */
|
||||
function TextsSection({ c, onSave }: { c: AdminCelebrity; onSave: (body: object) => Promise<boolean> }) {
|
||||
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 (
|
||||
<form className="card field" style={{ gap: 14 }} onSubmit={save}>
|
||||
<h2>Név és cím</h2>
|
||||
<div className="grid-2">
|
||||
<div className="field">
|
||||
<label htmlFor="celeb-name">Név</label>
|
||||
<input id="celeb-name" className="inp" value={name} maxLength={100} required onChange={(e) => setName(e.target.value)} />
|
||||
</div>
|
||||
<SubtitleField value={subtitle} onChange={setSubtitle} />
|
||||
</div>
|
||||
<div className="field" style={{ maxWidth: 520 }}>
|
||||
<label htmlFor="celeb-slug">Az oldal címe</label>
|
||||
<input
|
||||
id="celeb-slug"
|
||||
className="inp"
|
||||
value={slug}
|
||||
maxLength={80}
|
||||
pattern="[a-z0-9]+(-[a-z0-9]+)*"
|
||||
title="Csak kisbetű, szám és kötőjel (pl. marilyn-monroe)."
|
||||
onChange={(e) => setSlug(e.target.value)}
|
||||
/>
|
||||
<span className="hint">sorsfonalak.hu/hires-emberek/{slug || "…"}</span>
|
||||
</div>
|
||||
<p className="hint">
|
||||
A név a portré szövegében is szerepel: ha jelentősen javítod, a portrét érdemes újragenerálni.
|
||||
</p>
|
||||
<div className="form-actions">
|
||||
<button type="submit" className="btn btn-primary" disabled={busy || !changed}>
|
||||
{busy ? "Mentés…" : "Mentés"}
|
||||
</button>
|
||||
{saved && !changed && <span className="msg msg-ok">Elmentve.</span>}
|
||||
</div>
|
||||
</form>
|
||||
);
|
||||
}
|
||||
|
||||
/** 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<string | null>(null);
|
||||
const [open, setOpen] = useState(false);
|
||||
const a = c.analysis;
|
||||
|
||||
async function start() {
|
||||
setError(null);
|
||||
try {
|
||||
onChange(await api<AdminCelebrity>(`${url}/analysis`, { method: "POST" }));
|
||||
} catch (e) {
|
||||
setError(errorText(e));
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<section className="card field" style={{ gap: 14 }}>
|
||||
<h2>Részletes portré</h2>
|
||||
<p className="hint">
|
||||
Saját prompttal készül (Promptok → <Link href="/admin/promptok">Híres ember</Link>), harmadik személyben, csak a
|
||||
képletből; elemzést nem használ fel.
|
||||
</p>
|
||||
{!a ? (
|
||||
<p className="muted">Még nincs portré.</p>
|
||||
) : (
|
||||
<p>
|
||||
Állapot: <strong>{ANALYSIS_STATUS[a.status] ?? a.status}</strong>
|
||||
{a.status === "failed" && a.error && <span className="hint"> ({a.error})</span>}
|
||||
{(a.status === "pending" || a.status === "running") && (a.attempts ?? 0) > 1 && (
|
||||
<span className="hint"> · {a.attempts}. próbálkozás</span>
|
||||
)}
|
||||
</p>
|
||||
)}
|
||||
<div className="form-actions">
|
||||
{(!a || a.status === "failed") && (
|
||||
<button type="button" className="btn btn-primary" onClick={start}>
|
||||
Portré írása
|
||||
</button>
|
||||
)}
|
||||
{a?.status === "done" && (
|
||||
<>
|
||||
<button type="button" className="btn btn-ghost" onClick={() => setOpen((o) => !o)}>
|
||||
{open ? "Szöveg elrejtése" : "Szöveg megnézése"}
|
||||
</button>
|
||||
<RegenerateButton<Analysis> url={`/admin/analyses/${a.id}/regenerate`} onStarted={onAnalysis} />
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
{error && (
|
||||
<p className="msg msg-error" role="alert">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
{open && a?.status === "done" && a.content && (
|
||||
<AnalysisView content={a.content} kind="celebrity" language={a.language} />
|
||||
)}
|
||||
</section>
|
||||
);
|
||||
}
|
||||
@@ -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 (
|
||||
<main className="page" style={{ maxWidth: 1180 }}>
|
||||
<AdminNav current="/admin/hires-emberek" />
|
||||
<CelebrityEditor id={id} />
|
||||
</main>
|
||||
);
|
||||
}
|
||||
@@ -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 (
|
||||
<main className="page" style={{ maxWidth: 1180 }}>
|
||||
<AdminNav current="/admin/hires-emberek" />
|
||||
<div className="page-head">
|
||||
<h1>Híres emberek</h1>
|
||||
<p className="muted">
|
||||
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.
|
||||
</p>
|
||||
</div>
|
||||
<AdminCelebrities />
|
||||
</main>
|
||||
);
|
||||
}
|
||||
@@ -10,6 +10,7 @@ const KINDS: Record<AdminJob["kind"], string> = {
|
||||
natal: "Képletelemzés",
|
||||
synastry: "Kapcsolati elemzés",
|
||||
forecast: "Éves előrejelzés",
|
||||
celebrity: "Híres ember",
|
||||
question: "Kérdés-válasz",
|
||||
};
|
||||
|
||||
|
||||
@@ -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<string, string> = { hu: "Magyar", en: "Angol" };
|
||||
export function AdminPrompts() {
|
||||
const [prompts, setPrompts] = useState<AdminPrompt[] | null>(null);
|
||||
const [charts, setCharts] = useState<ChartListItem[]>([]);
|
||||
// The famous people's charts, for trying their prompt.
|
||||
const [famous, setFamous] = useState<ChartListItem[]>([]);
|
||||
const [error, setError] = useState<string | null>(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() {
|
||||
<KindPrompts
|
||||
about={k.about}
|
||||
prompts={prompts.filter((p) => p.kind === k.kind)}
|
||||
charts={charts}
|
||||
charts={k.kind === "celebrity" ? famous : charts}
|
||||
onSaved={replace}
|
||||
/>
|
||||
),
|
||||
|
||||
@@ -3,10 +3,20 @@
|
||||
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";
|
||||
|
||||
const REQUEST_HEADERS = ["accept", "accept-language", "authorization", "content-type", "cookie", "user-agent"];
|
||||
// stripe-signature: Stripe's webhook (the body is passed on byte for byte).
|
||||
const REQUEST_HEADERS = [
|
||||
"accept",
|
||||
"accept-language",
|
||||
"authorization",
|
||||
"content-type",
|
||||
"cookie",
|
||||
"stripe-signature",
|
||||
"user-agent",
|
||||
];
|
||||
// Hop-by-hop or re-computed by the runtime.
|
||||
const SKIP_RESPONSE_HEADERS = new Set(["connection", "content-encoding", "content-length", "set-cookie", "transfer-encoding"]);
|
||||
|
||||
@@ -19,8 +29,10 @@ async function forward(req: NextRequest, ctx: { params: Promise<{ path: string[]
|
||||
const value = req.headers.get(name);
|
||||
if (value) headers.set(name, value);
|
||||
}
|
||||
const forwardedFor = req.headers.get("x-forwarded-for");
|
||||
if (forwardedFor) headers.set("x-forwarded-for", forwardedFor);
|
||||
// The visitor's address as Caddy set it (from Cloudflare's CF-Connecting-IP,
|
||||
// overwriting any the browser sent).
|
||||
const realIp = req.headers.get("x-real-ip");
|
||||
if (realIp) headers.set("x-real-ip", realIp);
|
||||
|
||||
let res: Response;
|
||||
try {
|
||||
@@ -42,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 });
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,158 @@
|
||||
import type { Metadata } from "next";
|
||||
import Link from "next/link";
|
||||
|
||||
import { OperatorDetails } from "@/components/OperatorDetails";
|
||||
import { PublicHeader } from "@/components/SiteHeader";
|
||||
import { ARBITRATION_BOARD, OPERATOR, TERMS_UPDATED } from "@/lib/legal";
|
||||
import { getMe } from "@/lib/server";
|
||||
|
||||
export const metadata: Metadata = {
|
||||
title: "Általános szerződési feltételek",
|
||||
description: "A Sorsfonalak használatának és a csomagok vásárlásának feltételei.",
|
||||
};
|
||||
|
||||
/** The terms of service (ÁSZF); every purchase accepts them on Stripe's payment page. */
|
||||
export default async function TermsPage() {
|
||||
const me = await getMe();
|
||||
const email = (
|
||||
<a href={`mailto:${OPERATOR.email}`}>
|
||||
<strong>{OPERATOR.email}</strong>
|
||||
</a>
|
||||
);
|
||||
return (
|
||||
<>
|
||||
{!me && <PublicHeader />}
|
||||
<main className="page legal">
|
||||
<div className="page-head">
|
||||
<h1>Általános szerződési feltételek</h1>
|
||||
<p className="muted">Hatályos: {TERMS_UPDATED}</p>
|
||||
</div>
|
||||
|
||||
<section>
|
||||
<h2>1. A szolgáltatás</h2>
|
||||
<p>
|
||||
A sorsfonalak.hu weboldal és szolgáltatás (a továbbiakban: Sorsfonalak) online tartalomszolgáltatás. A
|
||||
megadott születési adatokból kiszámítja és megrajzolja a születési képletet, és ingyenes rövid összefoglalót
|
||||
ad. Csomagok vásárlásával a felhasználó szoftveresen (mesterséges intelligenciával) előállított, személyre
|
||||
szabott szöveges tartalmakat kérhet: részletes képletelemzést, kapcsolati elemzést, éves előrejelzést,
|
||||
kártyajóslást és kérdésekre adott válaszokat, valamint további személyeket vehet fel.
|
||||
</p>
|
||||
<p>
|
||||
A tartalmak szórakoztató és önismereti célúak. Nem minősülnek orvosi, pszichológiai, pénzügyi, jogi vagy
|
||||
más szakmai tanácsnak, és nem személyes tanácsadás. A szoftveresen előállított szövegek tévedhetnek; a
|
||||
rájuk alapozott döntésekért a felhasználó felel.
|
||||
</p>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<h2>2. Regisztráció</h2>
|
||||
<p>
|
||||
A szolgáltatás regisztrációval vehető igénybe (Google- vagy Apple-fiókkal, vagy e-mail-címmel és jelszóval),
|
||||
16 éven felülieknek. Amíg az oldal meghívásos, új fiók csak meghívóval jön létre. A felhasználó felel azért,
|
||||
hogy a megadott adatok (köztük mások születési adatai) az érintettek hozzájárulásával kerüljenek a
|
||||
rendszerbe. Az adatkezelésről az{" "}
|
||||
<Link href="/adatvedelem">adatvédelmi tájékoztató</Link> szól.
|
||||
</p>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<h2>3. A vásárlás menete</h2>
|
||||
<ol>
|
||||
<li>A felhasználó a Csomagok oldalon (vagy egy elemzésnél) kiválasztja a csomagot, és a „Megveszem” gombra kattint.</li>
|
||||
<li>
|
||||
A Stripe biztonságos fizetési oldalán megadja a számlázási adatait (cégként a cégnevet és az adószámot
|
||||
is) és a fizetési adatokat. Az adatokat a fizetés előtt ott javíthatja.
|
||||
</li>
|
||||
<li>
|
||||
A fizetés előtt elfogadja ezt az ÁSZF-et, kéri a szolgáltatás azonnali megkezdését, és tudomásul veszi,
|
||||
hogy ezzel elveszíti az elállási jogát (6. pont).
|
||||
</li>
|
||||
<li>A fizetéssel a szerződés létrejön. A csomagot azonnal jóváírjuk, és e-mailben visszaigazoljuk.</li>
|
||||
</ol>
|
||||
<p>
|
||||
A szerződés elektronikus úton jön létre, írásba foglalt szerződésnek nem minősül, külön nem iktatjuk. A
|
||||
vásárlás adatai és a számlák a fiókban (Számláim) bármikor elérhetők. Magatartási kódexnek nem vetjük alá
|
||||
magunkat.
|
||||
</p>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<h2>4. Árak, fizetés, számla</h2>
|
||||
<p>
|
||||
Az árak forintban értendő végső árak. Alanyi adómentesek vagyunk, áfát nem számítunk fel. Az árak
|
||||
változhatnak; a vásárláskor látott ár érvényes.
|
||||
</p>
|
||||
<p>
|
||||
A fizetést a Stripe (Stripe Payments Europe, Ltd.) bonyolítja bankkártyával, Apple Payjel vagy Google
|
||||
Payjel. A kártyaadatokat csak a Stripe kezeli, hozzánk nem jutnak el. A számlát a Billingo rendszerével
|
||||
állítjuk ki, e-mailben küldjük, és a fiókban is letölthető.
|
||||
</p>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<h2>5. Teljesítés</h2>
|
||||
<p>
|
||||
A csomag egységei (elemzések, előrejelzések, kérdések, személyhelyek) a fizetés igazolása után azonnal a
|
||||
fiókban vannak. Nem járnak le, nem ruházhatók át, és pénzre nem válthatók vissza. Egy elemzés elkészítése
|
||||
általában néhány perc.
|
||||
</p>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<h2>6. Elállási jog</h2>
|
||||
<p>
|
||||
Online vásárlásnál a fogyasztót alapesetben 14 napos, indoklás nélküli elállási jog illeti meg. Nem tárgyi
|
||||
adathordozón nyújtott digitális tartalomnál és szolgáltatásnál ez megszűnik, ha a teljesítés a fogyasztó
|
||||
kifejezett, előzetes kérésére kezdődik meg, a fogyasztó tudomásul veszi, hogy ezzel elveszíti az elállási
|
||||
jogát, és erről visszaigazolást kap (45/2014. (II. 26.) Korm. rendelet 29. § (1) bekezdés). A Sorsfonalak
|
||||
csomagjait azonnal teljesítjük: a fizetési oldalon ezt kéri a vásárló, és a visszaigazoló e-mailben ezt
|
||||
megerősítjük, ezért a vásárlástól elállni nem lehet.
|
||||
</p>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<h2>7. Hibás teljesítés</h2>
|
||||
<p>
|
||||
Ha a szolgáltatás nem működik megfelelően, a jogszabályok szerinti jogok megilletnek (Ptk.; 373/2021. (VI.
|
||||
30.) Korm. rendelet). Ha egy kért elemzés többszöri próbálkozás után sem készül el, a felhasznált egységet
|
||||
magától visszaadjuk. Más hibát a {email} címen jelezz: kijavítjuk, vagy ha ez nem lehetséges (például a
|
||||
szolgáltatás tartósan nem érhető el), a fel nem használt részt visszafizetjük a fizetéskor használt módon.
|
||||
</p>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<h2>8. A fiók megszüntetése</h2>
|
||||
<p>
|
||||
A fiók a Profil oldalon bármikor törölhető. A fel nem használt egységek ezzel megszűnnek; ezekért
|
||||
visszatérítés nem jár, kivéve, ha a törlést a szolgáltatás hibája tette szükségessé. A jogszabálysértő
|
||||
vagy a szolgáltatással visszaélő felhasználó fiókját felfüggeszthetjük vagy megszüntethetjük.
|
||||
</p>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<h2>9. Panaszkezelés, jogorvoslat</h2>
|
||||
<p>
|
||||
Panaszt a {email} címen tehetsz; 30 napon belül írásban válaszolunk. Ha a panaszt nem rendezzük, a
|
||||
szolgáltató székhelye szerint illetékes békéltető testülethez fordulhatsz ({ARBITRATION_BOARD.name},{" "}
|
||||
{ARBITRATION_BOARD.address}, {ARBITRATION_BOARD.email},{" "}
|
||||
<a href={ARBITRATION_BOARD.web}>{ARBITRATION_BOARD.web.replace("https://", "")}</a>), panaszt tehetsz a
|
||||
fogyasztóvédelmi hatóságnál (a lakóhelyed szerinti kormányhivatal), vagy bírósághoz fordulhatsz.
|
||||
</p>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<h2>10. Egyéb</h2>
|
||||
<p>
|
||||
Az ÁSZF módosítása a módosítás után kötött vásárlásokra vonatkozik; a lényeges változásokat az oldalon
|
||||
jelezzük. A szerződés és a szolgáltatás nyelve magyar, a szerződésre a magyar jog irányadó.
|
||||
</p>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<h2>11. A szolgáltató adatai</h2>
|
||||
<OperatorDetails hosting />
|
||||
</section>
|
||||
</main>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,144 @@
|
||||
"use client";
|
||||
|
||||
import Script from "next/script";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { useState } from "react";
|
||||
|
||||
import { Waitlist } from "@/components/Waitlist";
|
||||
import { ApiError, api, errorText } from "@/lib/api";
|
||||
|
||||
/** The part of Sign in with Apple JS (appleid.auth.js) we use. */
|
||||
interface AppleSignInResponse {
|
||||
authorization: { id_token: string; code: string; state?: string };
|
||||
/** Only at the first sign-in of this Apple ID on the site. */
|
||||
user?: { email?: string; name?: { firstName?: string; lastName?: string } };
|
||||
}
|
||||
|
||||
declare global {
|
||||
interface Window {
|
||||
AppleID?: {
|
||||
auth: {
|
||||
init(options: { clientId: string; scope: string; redirectURI: string; state?: string; usePopup: boolean }): void;
|
||||
signIn(): Promise<AppleSignInResponse>;
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/** Apple's logo (Sign in with Apple guidelines: the logo left of the label). */
|
||||
function AppleMark() {
|
||||
return (
|
||||
<svg width="18" height="20" viewBox="0 0 17 20" aria-hidden="true" fill="currentColor">
|
||||
<path d="M13.77 10.62c-.02-2.2 1.8-3.26 1.88-3.31-1.03-1.5-2.62-1.7-3.18-1.73-1.35-.14-2.64.8-3.33.8-.69 0-1.74-.78-2.86-.76-1.47.02-2.83.86-3.59 2.17-1.53 2.65-.39 6.57 1.1 8.72.73 1.05 1.6 2.23 2.73 2.19 1.1-.04 1.51-.71 2.84-.71 1.32 0 1.7.71 2.86.69 1.18-.02 1.93-1.07 2.65-2.12.84-1.22 1.18-2.4 1.2-2.46-.03-.01-2.29-.88-2.3-3.48zM11.6 4.17c.6-.73 1.01-1.75.9-2.76-.87.04-1.92.58-2.54 1.31-.56.65-1.05 1.69-.92 2.68.97.08 1.96-.49 2.56-1.23z" />
|
||||
</svg>
|
||||
);
|
||||
}
|
||||
|
||||
/** The e-mail address inside Apple's ID token (only for the waitlist form; the backend verifies the token). */
|
||||
function tokenEmail(idToken: string): string {
|
||||
try {
|
||||
const part = idToken.split(".")[1].replace(/-/g, "+").replace(/_/g, "/");
|
||||
const bytes = Uint8Array.from(atob(part), (c) => c.charCodeAt(0));
|
||||
const email = JSON.parse(new TextDecoder().decode(bytes)).email;
|
||||
return typeof email === "string" ? email : "";
|
||||
} catch {
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* "Continue with Apple": Apple's sign-in opens in a popup and returns an ID
|
||||
* token, which the backend verifies. Apple gives the name only at the first
|
||||
* sign-in, so it is sent along then (Hungarian order: family name first).
|
||||
*/
|
||||
export function AppleLogin({
|
||||
clientId,
|
||||
target,
|
||||
inviteToken = null,
|
||||
referral = null,
|
||||
}: {
|
||||
clientId: string;
|
||||
target: string;
|
||||
inviteToken?: string | null;
|
||||
/** The shared link the visitor came from (in the login link: `?ref=`), for the sharer's reward. */
|
||||
referral?: string | null;
|
||||
}) {
|
||||
const router = useRouter();
|
||||
const [ready, setReady] = useState(false);
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [uninvited, setUninvited] = useState<string | null>(null);
|
||||
|
||||
function loaded() {
|
||||
window.AppleID?.auth.init({
|
||||
clientId,
|
||||
scope: "name email",
|
||||
redirectURI: `${window.location.origin}/belepes`,
|
||||
usePopup: true,
|
||||
});
|
||||
setReady(true);
|
||||
}
|
||||
|
||||
async function signIn() {
|
||||
const apple = window.AppleID;
|
||||
if (!apple) return;
|
||||
setError(null);
|
||||
setUninvited(null);
|
||||
let response: AppleSignInResponse;
|
||||
try {
|
||||
response = await apple.auth.signIn();
|
||||
} catch (e) {
|
||||
// Closing the popup is not an error worth showing.
|
||||
const code = (e as { error?: string } | null)?.error;
|
||||
if (code !== "popup_closed_by_user" && code !== "user_cancelled_authorize") {
|
||||
setError("Az Apple-belépés nem sikerült. Próbáld újra.");
|
||||
}
|
||||
return;
|
||||
}
|
||||
setBusy(true);
|
||||
const name = [response.user?.name?.lastName, response.user?.name?.firstName].filter(Boolean).join(" ") || null;
|
||||
try {
|
||||
await api("/auth/apple", {
|
||||
body: { id_token: response.authorization.id_token, name, invite_token: inviteToken, referral },
|
||||
});
|
||||
router.replace(target);
|
||||
router.refresh();
|
||||
} catch (e) {
|
||||
if (e instanceof ApiError && e.code === "not_invited") setUninvited(tokenEmail(response.authorization.id_token));
|
||||
else setError(errorText(e));
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="field">
|
||||
<Script
|
||||
src="https://appleid.cdn-apple.com/appleauth/static/jsapi/appleid/1/hu_HU/appleid.auth.js"
|
||||
strategy="afterInteractive"
|
||||
onReady={loaded}
|
||||
onError={() => setError("Nem sikerült betölteni az Apple-belépést. Ellenőrizd a hálózatot vagy a reklámblokkolót.")}
|
||||
/>
|
||||
<button type="button" className="btn-social btn-apple" onClick={signIn} disabled={!ready || busy}>
|
||||
<span className="btn-social-icon">
|
||||
<AppleMark />
|
||||
</span>
|
||||
{busy ? "Belépés…" : "Folytatás Apple-fiókkal"}
|
||||
</button>
|
||||
{error && (
|
||||
<p className="msg msg-error" role="alert">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
{uninvited !== null && (
|
||||
<>
|
||||
<p className="msg msg-error" role="alert">
|
||||
{inviteToken
|
||||
? "Ez a meghívó már nem érvényes, és ehhez az Apple-fiókhoz sem tartozik másik."
|
||||
: "A Sorsfonalak jelenleg meghívásos, és ehhez az Apple-fiókhoz nem tartozik meghívó. Ha kaptál meghívót, nyisd meg a levélben kapott linket, vagy lépj be azzal a fiókkal, amelynek a címére a meghívó szólt."}
|
||||
</p>
|
||||
<Waitlist email={uninvited.endsWith("@privaterelay.appleid.com") ? "" : uninvited} />
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -52,11 +52,14 @@ export function GoogleLogin({
|
||||
clientId,
|
||||
target,
|
||||
inviteToken = null,
|
||||
referral = null,
|
||||
}: {
|
||||
clientId: string;
|
||||
target: string;
|
||||
/** From an invitation link: lets in any Google account. */
|
||||
inviteToken?: string | null;
|
||||
/** The shared link the visitor came from (in the login link: `?ref=`), for the sharer's reward. */
|
||||
referral?: string | null;
|
||||
}) {
|
||||
const router = useRouter();
|
||||
const slot = useRef<HTMLDivElement>(null);
|
||||
@@ -72,18 +75,7 @@ export function GoogleLogin({
|
||||
setError(null);
|
||||
setUninvited(null);
|
||||
try {
|
||||
let referral: string | null = null;
|
||||
try {
|
||||
referral = localStorage.getItem("sf_ref");
|
||||
} catch {
|
||||
// storage blocked
|
||||
}
|
||||
await api("/auth/google", { body: { id_token: response.credential, invite_token: inviteToken, referral } });
|
||||
try {
|
||||
localStorage.removeItem("sf_ref");
|
||||
} catch {
|
||||
// storage blocked
|
||||
}
|
||||
router.replace(target);
|
||||
router.refresh();
|
||||
} catch (e) {
|
||||
@@ -92,7 +84,7 @@ export function GoogleLogin({
|
||||
setBusy(false);
|
||||
}
|
||||
},
|
||||
[router, target, inviteToken],
|
||||
[router, target, inviteToken, referral],
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
|
||||
@@ -0,0 +1,200 @@
|
||||
"use client";
|
||||
|
||||
import { useRouter } from "next/navigation";
|
||||
import { useState } from "react";
|
||||
|
||||
import { Waitlist } from "@/components/Waitlist";
|
||||
import { ApiError, api, errorText } from "@/lib/api";
|
||||
|
||||
type Mode = "login" | "register" | "forgot";
|
||||
|
||||
function loginError(e: unknown): string {
|
||||
if (e instanceof ApiError) {
|
||||
if (e.code === "invalid_credentials") return "Hibás e-mail-cím vagy jelszó.";
|
||||
if (e.code === "too_many_requests") return "Túl sok sikertelen próbálkozás. Próbáld újra negyedóra múlva.";
|
||||
}
|
||||
return errorText(e);
|
||||
}
|
||||
|
||||
/**
|
||||
* E-mail and password: login, sign-up and forgotten password. Sign-up asks
|
||||
* no password: it is set through the link sent to the address, so nobody can
|
||||
* set a password for someone else's address.
|
||||
*/
|
||||
export function PasswordLogin({
|
||||
target,
|
||||
inviteToken = null,
|
||||
referral = null,
|
||||
initialMode = "login",
|
||||
}: {
|
||||
target: string;
|
||||
inviteToken?: string | null;
|
||||
/** The shared link the visitor came from (in the login link: `?ref=`), for the sharer's reward. */
|
||||
referral?: string | null;
|
||||
initialMode?: Mode;
|
||||
}) {
|
||||
const router = useRouter();
|
||||
const [mode, setMode] = useState<Mode>(initialMode);
|
||||
const [email, setEmail] = useState("");
|
||||
const [password, setPassword] = useState("");
|
||||
const [name, setName] = useState("");
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [sent, setSent] = useState<Mode | null>(null);
|
||||
const [uninvited, setUninvited] = useState(false);
|
||||
|
||||
function switchTo(next: Mode) {
|
||||
setMode(next);
|
||||
setError(null);
|
||||
setSent(null);
|
||||
setUninvited(false);
|
||||
}
|
||||
|
||||
async function submit(e: React.FormEvent) {
|
||||
e.preventDefault();
|
||||
setBusy(true);
|
||||
setError(null);
|
||||
setUninvited(false);
|
||||
try {
|
||||
if (mode === "login") {
|
||||
await api("/auth/login", { body: { email, password } });
|
||||
router.replace(target);
|
||||
router.refresh();
|
||||
return;
|
||||
}
|
||||
if (mode === "register") {
|
||||
await api("/auth/register", {
|
||||
body: { email, display_name: name.trim() || null, locale: "hu", invite_token: inviteToken, referral },
|
||||
});
|
||||
} else {
|
||||
await api("/auth/password-reset", { body: { email } });
|
||||
}
|
||||
setSent(mode);
|
||||
} catch (err) {
|
||||
if (err instanceof ApiError && err.code === "not_invited") setUninvited(true);
|
||||
else setError(mode === "login" ? loginError(err) : errorText(err));
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
if (sent) {
|
||||
return (
|
||||
<div className="field pw-sent" role="status">
|
||||
<p className="msg msg-ok" style={{ margin: 0 }}>
|
||||
{sent === "register"
|
||||
? "Küldtünk egy levelet a(z) "
|
||||
: "Ha ehhez a címhez tartozik fiók, küldtünk egy levelet a(z) "}
|
||||
<strong>{email}</strong> címre. A benne lévő linkkel adhatod meg a jelszavad
|
||||
{sent === "register" ? ", és utána már be is vagy lépve." : "."}
|
||||
</p>
|
||||
<p className="hint" style={{ margin: 0 }}>
|
||||
Nem jött meg pár percen belül? Nézd meg a spam mappát is, vagy{" "}
|
||||
<button type="button" className="link-btn" onClick={() => switchTo(sent)}>
|
||||
próbáld újra
|
||||
</button>
|
||||
.
|
||||
</p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<form className="field pw-form" onSubmit={submit} style={{ gap: 14 }}>
|
||||
{mode === "register" && (
|
||||
<div className="field">
|
||||
<label htmlFor="pw-name">Név (nem kötelező)</label>
|
||||
<input
|
||||
id="pw-name"
|
||||
className="inp"
|
||||
autoComplete="name"
|
||||
maxLength={100}
|
||||
value={name}
|
||||
onChange={(e) => setName(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
<div className="field">
|
||||
<label htmlFor="pw-email">E-mail-cím</label>
|
||||
<input
|
||||
id="pw-email"
|
||||
className="inp"
|
||||
type="email"
|
||||
required
|
||||
autoComplete={mode === "login" ? "username" : "email"}
|
||||
value={email}
|
||||
onChange={(e) => setEmail(e.target.value)}
|
||||
placeholder="nev@pelda.hu"
|
||||
/>
|
||||
</div>
|
||||
{mode === "login" && (
|
||||
<div className="field">
|
||||
<div className="pw-label-row">
|
||||
<label htmlFor="pw-password">Jelszó</label>
|
||||
<button type="button" className="link-btn" onClick={() => switchTo("forgot")}>
|
||||
Elfelejtett jelszó?
|
||||
</button>
|
||||
</div>
|
||||
<input
|
||||
id="pw-password"
|
||||
className="inp"
|
||||
type="password"
|
||||
required
|
||||
autoComplete="current-password"
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
{mode === "register" && (
|
||||
<p className="hint" style={{ margin: 0 }}>
|
||||
A jelszavadat a levélben kapott linken adod meg. Így biztos, hogy a cím a tiéd.
|
||||
</p>
|
||||
)}
|
||||
{mode === "forgot" && (
|
||||
<p className="hint" style={{ margin: 0 }}>
|
||||
Küldünk egy linket, amellyel új jelszót adhatsz meg. Ha eddig Google- vagy Apple-fiókkal léptél be, így
|
||||
jelszót is beállíthatsz.
|
||||
</p>
|
||||
)}
|
||||
<button type="submit" className="btn btn-primary" disabled={busy}>
|
||||
{busy
|
||||
? "Küldés…"
|
||||
: mode === "login"
|
||||
? "Belépés"
|
||||
: mode === "register"
|
||||
? "Regisztráció"
|
||||
: "Link küldése"}
|
||||
</button>
|
||||
{error && (
|
||||
<p className="msg msg-error" role="alert" style={{ margin: 0 }}>
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
{uninvited && (
|
||||
<>
|
||||
<p className="msg msg-error" role="alert" style={{ margin: 0 }}>
|
||||
{inviteToken
|
||||
? "Ez a meghívó már nem érvényes, és ehhez a címhez sem tartozik másik."
|
||||
: "A Sorsfonalak jelenleg meghívásos, és ehhez az e-mail-címhez nem tartozik meghívó. Ha kaptál meghívót, nyisd meg a levélben kapott linket."}
|
||||
</p>
|
||||
<Waitlist email={email} />
|
||||
</>
|
||||
)}
|
||||
<p className="hint pw-switch" style={{ margin: 0 }}>
|
||||
{mode === "login" ? (
|
||||
<>
|
||||
Még nincs fiókod?{" "}
|
||||
<button type="button" className="link-btn" onClick={() => switchTo("register")}>
|
||||
Regisztráció e-mail-címmel
|
||||
</button>
|
||||
</>
|
||||
) : (
|
||||
<button type="button" className="link-btn" onClick={() => switchTo("login")}>
|
||||
Vissza a belépéshez
|
||||
</button>
|
||||
)}
|
||||
</p>
|
||||
</form>
|
||||
);
|
||||
}
|
||||
@@ -8,14 +8,20 @@ import { BACKEND_URL, getMe } from "@/lib/server";
|
||||
import { formatDate } from "@/lib/astro";
|
||||
import type { InvitationLanding, PublicConfig } from "@/lib/types";
|
||||
|
||||
import { AppleLogin } from "./AppleLogin";
|
||||
import { GoogleLogin } from "./GoogleLogin";
|
||||
import { PasswordLogin } from "./PasswordLogin";
|
||||
|
||||
export const metadata: Metadata = { title: "Belépés" };
|
||||
|
||||
/** Only local paths, so the login cannot redirect to another site. */
|
||||
/**
|
||||
* Only local paths, so the login cannot redirect to another site: one leading
|
||||
* slash, no backslash (browsers read "/\\evil.com" as "//evil.com") and no
|
||||
* control characters.
|
||||
*/
|
||||
function safeTarget(value: string | string[] | undefined): string {
|
||||
const v = Array.isArray(value) ? value[0] : value;
|
||||
return v && v.startsWith("/") && !v.startsWith("//") ? v : "/";
|
||||
return v && /^\/(?![/\\])[^\\\u0000-\u001f]*$/.test(v) ? v : "/";
|
||||
}
|
||||
|
||||
async function loadConfig(): Promise<PublicConfig | null> {
|
||||
@@ -43,7 +49,15 @@ const CLOSED: Record<string, string> = {
|
||||
};
|
||||
|
||||
/** The invitation the visitor came with: who sent it and what they wrote. */
|
||||
function InvitationCard({ invitation }: { invitation: InvitationLanding | null }) {
|
||||
function InvitationCard({
|
||||
invitation,
|
||||
apple,
|
||||
password,
|
||||
}: {
|
||||
invitation: InvitationLanding | null;
|
||||
apple: boolean;
|
||||
password: boolean;
|
||||
}) {
|
||||
if (!invitation) {
|
||||
return (
|
||||
<p className="msg msg-error" role="alert">
|
||||
@@ -66,7 +80,9 @@ function InvitationCard({ invitation }: { invitation: InvitationLanding | null }
|
||||
</p>
|
||||
{invitation.message && <blockquote className="invite-quote">{invitation.message}</blockquote>}
|
||||
<p className="hint" style={{ margin: 0 }}>
|
||||
Bármelyik Google-fiókoddal elfogadhatod. Érvényes: {formatDate(invitation.expires_at).replace(/\.$/, "")}-ig.
|
||||
Bármelyik {apple ? "Google- vagy Apple-fiókoddal" : "Google-fiókoddal"}
|
||||
{password ? ", vagy e-mail-címmel regisztrálva" : ""} elfogadhatod. Érvényes:{" "}
|
||||
{formatDate(invitation.expires_at).replace(/\.$/, "")}-ig.
|
||||
</p>
|
||||
</div>
|
||||
);
|
||||
@@ -83,7 +99,15 @@ export default async function LoginPage({ searchParams }: { searchParams: Promis
|
||||
inviteToken ? loadInvitation(inviteToken) : Promise.resolve(null),
|
||||
]);
|
||||
const clientId = config?.google_login.enabled ? config.google_login.client_id : null;
|
||||
const appleId = config?.apple_login?.enabled ? config.apple_login.client_id : null;
|
||||
const pendingInvite = invitation?.status === "pending" ? inviteToken : null;
|
||||
// The shared link that brought the visitor (from its login button), for the sharer's reward.
|
||||
const rawRef = Array.isArray(params.ref) ? params.ref[0] : params.ref;
|
||||
const referral = rawRef && /^[A-Za-z0-9_-]{4,64}$/.test(rawRef) ? rawRef : null;
|
||||
const inviteOnly = config?.signup_mode === "invite";
|
||||
const password = config?.password_login === true;
|
||||
const mod = Array.isArray(params.mod) ? params.mod[0] : params.mod;
|
||||
const initialMode = mod === "elfelejtett" ? "forgot" : mod === "regisztracio" || rawToken ? "register" : "login";
|
||||
|
||||
return (
|
||||
<div className="auth">
|
||||
@@ -96,8 +120,8 @@ export default async function LoginPage({ searchParams }: { searchParams: Promis
|
||||
Születési képlet, szinasztria és közösség – egy helyen.
|
||||
</p>
|
||||
<p className="ai-line" style={{ fontSize: 15 }}>
|
||||
Részletes elemzések a legfejlettebb AI-modellekkel: egy tapasztalt asztrológushoz közelítő mélység, töredék
|
||||
áron.
|
||||
Részletes, személyre szóló elemzések a legfejlettebb AI-modellekkel: percek alatt, egy személyes konzultáció
|
||||
árának töredékéért.
|
||||
</p>
|
||||
</div>
|
||||
</aside>
|
||||
@@ -107,17 +131,32 @@ export default async function LoginPage({ searchParams }: { searchParams: Promis
|
||||
<h1 style={{ fontSize: 44 }}>{rawToken ? "Meghívó" : "Belépés"}</h1>
|
||||
<p className="muted">{rawToken ? "Lépj be, és már kezdheted is." : "Üdv újra! Lépj be a fiókodba."}</p>
|
||||
</div>
|
||||
{rawToken && <InvitationCard invitation={inviteToken ? invitation : null} />}
|
||||
{rawToken && (
|
||||
<InvitationCard invitation={inviteToken ? invitation : null} apple={appleId !== null} password={password} />
|
||||
)}
|
||||
{config === null ? (
|
||||
<p className="msg msg-error" role="alert">
|
||||
A szerver most nem érhető el. Próbáld újra egy kicsit később.
|
||||
</p>
|
||||
) : clientId ? (
|
||||
<GoogleLogin
|
||||
clientId={clientId}
|
||||
target={target}
|
||||
inviteToken={invitation?.status === "pending" ? inviteToken : null}
|
||||
/>
|
||||
) : clientId || password ? (
|
||||
<>
|
||||
{clientId && (
|
||||
<div className="field" style={{ gap: 12 }}>
|
||||
<GoogleLogin clientId={clientId} target={target} inviteToken={pendingInvite} referral={referral} />
|
||||
{appleId && (
|
||||
<AppleLogin clientId={appleId} target={target} inviteToken={pendingInvite} referral={referral} />
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
{clientId && password && (
|
||||
<div className="auth-or" role="separator">
|
||||
<span>vagy</span>
|
||||
</div>
|
||||
)}
|
||||
{password && (
|
||||
<PasswordLogin target={target} inviteToken={pendingInvite} referral={referral} initialMode={initialMode} />
|
||||
)}
|
||||
</>
|
||||
) : (
|
||||
<p className="msg msg-error" role="alert">
|
||||
A Google-belépés még nincs beállítva (a backend <code>GOOGLE_CLIENT_IDS</code> változója üres).
|
||||
@@ -128,11 +167,14 @@ export default async function LoginPage({ searchParams }: { searchParams: Promis
|
||||
? "A fiókod az első belépéskor jön létre."
|
||||
: inviteOnly
|
||||
? "Az oldal jelenleg meghívásos: új fiók csak meghívóval jön létre."
|
||||
: "Még nincs fiókod? Az első belépéskor létrejön."}
|
||||
: password
|
||||
? "Google- vagy Apple-fiókkal az első belépéskor létrejön a fiókod."
|
||||
: "Még nincs fiókod? Az első belépéskor létrejön."}
|
||||
</p>
|
||||
<p className="hint">
|
||||
A belépéssel elfogadod, hogy a születési adataidat a képleted kiszámításához tároljuk. Bármikor törölheted
|
||||
őket a profilodban. Részletek: <Link href="/adatvedelem">adatvédelmi tájékoztató</Link>.
|
||||
A belépéssel elfogadod az <Link href="/aszf">általános szerződési feltételeket</Link>, és hogy a születési
|
||||
adataidat a képleted kiszámításához tároljuk. Bármikor törölheted őket a profilodban. Részletek:{" "}
|
||||
<Link href="/adatvedelem">adatvédelmi tájékoztató</Link>.
|
||||
</p>
|
||||
</div>
|
||||
</main>
|
||||
|
||||
@@ -0,0 +1,159 @@
|
||||
import type { Metadata } from "next";
|
||||
import Link from "next/link";
|
||||
import { notFound } from "next/navigation";
|
||||
|
||||
import { JsonLd, PublicFooter } from "@/components/PublicFooter";
|
||||
import { PublicHeader } from "@/components/SiteHeader";
|
||||
import { ZODIAC, ZODIAC_BY_SLUG } from "@/content/zodiac";
|
||||
import { SIGNS } from "@/lib/astro";
|
||||
import { getMe } from "@/lib/server";
|
||||
import { siteUrl } from "@/lib/share";
|
||||
|
||||
export const dynamicParams = false;
|
||||
|
||||
export function generateStaticParams() {
|
||||
return ZODIAC.map((z) => ({ jegy: z.slug }));
|
||||
}
|
||||
|
||||
export async function generateMetadata({ params }: { params: Promise<{ jegy: string }> }): Promise<Metadata> {
|
||||
const z = ZODIAC_BY_SLUG.get((await params).jegy);
|
||||
if (!z) return {};
|
||||
return {
|
||||
title: `${z.name} csillagjegy: ${z.name} Nap, Hold és aszcendens`,
|
||||
description: `${z.name} (${z.dates}): milyen ${z.article} napjegyként, holdjegyként és aszcendensként, párkapcsolatban és munkában, és mi nem igaz róla.`,
|
||||
alternates: { canonical: `/csillagjegyek/${z.slug}` },
|
||||
};
|
||||
}
|
||||
|
||||
/** One sign: its facts, and what it means as Sun, Moon and Ascendant. */
|
||||
export default async function SignPage({ params }: { params: Promise<{ jegy: string }> }) {
|
||||
const z = ZODIAC_BY_SLUG.get((await params).jegy);
|
||||
if (!z) notFound();
|
||||
const me = await getMe();
|
||||
const base = await siteUrl();
|
||||
const index = ZODIAC.indexOf(z);
|
||||
const prev = ZODIAC[(index + 11) % 12];
|
||||
const next = ZODIAC[(index + 1) % 12];
|
||||
const opposite = ZODIAC_BY_SLUG.get(z.opposite)!;
|
||||
const glyph = SIGNS[z.id]?.glyph;
|
||||
|
||||
return (
|
||||
<>
|
||||
{!me && <PublicHeader current="csillagjegyek" />}
|
||||
<main className="page sign-page" style={{ maxWidth: 880 }}>
|
||||
<nav className="hint sign-crumbs" aria-label="Morzsamenü">
|
||||
<Link href="/csillagjegyek">Csillagjegyek</Link> / {z.name}
|
||||
</nav>
|
||||
<div className="page-head sign-head">
|
||||
<span className="sign-glyph" aria-hidden="true">
|
||||
{glyph}
|
||||
</span>
|
||||
<div>
|
||||
<h1>{z.name}</h1>
|
||||
<p className="muted">{z.dates}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<table className="sign-facts">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th scope="row">Elem</th>
|
||||
<td>{z.element}</td>
|
||||
<th scope="row">Minőség</th>
|
||||
<td>{z.modality}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Uralkodó bolygó</th>
|
||||
<td>{z.ruler}</td>
|
||||
<th scope="row">Ellentétes jegy</th>
|
||||
<td>
|
||||
<Link href={`/csillagjegyek/${opposite.slug}`}>{opposite.name}</Link>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<p className="sign-intro">{z.intro}</p>
|
||||
<p className="hint">
|
||||
A dátumok évről évre egy napot csúszhatnak. Ha a határ közelében születtél, az{" "}
|
||||
<Link href="/szuletesi-horoszkop">ingyenes születési horoszkóp</Link> pontosan megmondja, melyik jegy a tiéd.
|
||||
</p>
|
||||
|
||||
<section id="nap" className="sign-section">
|
||||
<h2>{z.name} napjegy</h2>
|
||||
<p>{z.sun}</p>
|
||||
</section>
|
||||
<section id="hold" className="sign-section">
|
||||
<h2>Hold {z.inSign}</h2>
|
||||
<p>{z.moon}</p>
|
||||
</section>
|
||||
<section id="aszcendens" className="sign-section">
|
||||
<h2>{z.name} aszcendens</h2>
|
||||
<p>{z.ascendant}</p>
|
||||
</section>
|
||||
<section className="sign-section">
|
||||
<h2>Párkapcsolatban</h2>
|
||||
<p>{z.love}</p>
|
||||
</section>
|
||||
<section className="sign-section">
|
||||
<h2>Munkában</h2>
|
||||
<p>{z.work}</p>
|
||||
</section>
|
||||
<section className="sign-section sign-myth">
|
||||
<h2>Amit rosszul tudnak róla</h2>
|
||||
<p>{z.myth}</p>
|
||||
</section>
|
||||
|
||||
<div className="sign-traits">
|
||||
<div>
|
||||
<h2>Erősségek</h2>
|
||||
<p>{z.strengths}</p>
|
||||
</div>
|
||||
<div>
|
||||
<h2>Árnyoldalak</h2>
|
||||
<p>{z.challenges}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<aside className="card sign-cta">
|
||||
<p style={{ margin: 0 }}>{z.offer}</p>
|
||||
<div className="form-actions">
|
||||
<Link href="/szuletesi-horoszkop" className="btn">
|
||||
Ingyenes születési horoszkóp
|
||||
</Link>
|
||||
<Link href={me ? "/keplet" : "/belepes?mod=regisztracio&vissza=/profil"} className="btn btn-primary">
|
||||
{me ? "A saját képletem" : "A teljes képletem ingyen"}
|
||||
</Link>
|
||||
</div>
|
||||
</aside>
|
||||
|
||||
<nav className="sign-pager" aria-label="Többi jegy">
|
||||
<Link href={`/csillagjegyek/${prev.slug}`}>← {prev.name}</Link>
|
||||
<Link href="/csillagjegyek">Mind a 12 jegy</Link>
|
||||
<Link href={`/csillagjegyek/${next.slug}`}>{next.name} →</Link>
|
||||
</nav>
|
||||
</main>
|
||||
<PublicFooter />
|
||||
<JsonLd
|
||||
data={{
|
||||
"@context": "https://schema.org",
|
||||
"@type": "BreadcrumbList",
|
||||
itemListElement: [
|
||||
{
|
||||
"@type": "ListItem",
|
||||
position: 1,
|
||||
name: "Csillagjegyek",
|
||||
item: `${base}/csillagjegyek`,
|
||||
},
|
||||
{
|
||||
"@type": "ListItem",
|
||||
position: 2,
|
||||
name: z.name,
|
||||
item: `${base}/csillagjegyek/${z.slug}`,
|
||||
},
|
||||
],
|
||||
}}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
import type { Metadata } from "next";
|
||||
import Link from "next/link";
|
||||
|
||||
import { PublicFooter } from "@/components/PublicFooter";
|
||||
import { PublicHeader } from "@/components/SiteHeader";
|
||||
import { ZODIAC } from "@/content/zodiac";
|
||||
import { SIGNS } from "@/lib/astro";
|
||||
import { getMe } from "@/lib/server";
|
||||
|
||||
export const metadata: Metadata = {
|
||||
title: "Csillagjegyek: mind a 12 jegy napjegyként, holdjegyként és aszcendensként",
|
||||
description:
|
||||
"A tizenkét csillagjegy dátumokkal, elemekkel és uralkodó bolygókkal: milyen egy jegy napjegyként, holdjegyként és aszcendensként.",
|
||||
alternates: { canonical: "/csillagjegyek" },
|
||||
};
|
||||
|
||||
/** The twelve signs. */
|
||||
export default async function SignsPage() {
|
||||
const me = await getMe();
|
||||
return (
|
||||
<>
|
||||
{!me && <PublicHeader current="csillagjegyek" />}
|
||||
<main className="page" style={{ maxWidth: 1080 }}>
|
||||
<div className="page-head">
|
||||
<span className="eyebrow">Csillagjegyek</span>
|
||||
<h1>A tizenkét csillagjegy</h1>
|
||||
<p className="muted">
|
||||
A „milyen jegy vagy?” kérdésre a legtöbben a napjegyükkel felelnek. Pedig a Hold és az aszcendens jegye
|
||||
legalább ennyit elárul. Minden jegynél leírjuk, milyen napjegyként, holdjegyként és aszcendensként.
|
||||
</p>
|
||||
</div>
|
||||
<ul className="sign-grid">
|
||||
{ZODIAC.map((z) => (
|
||||
<li key={z.slug}>
|
||||
<Link href={`/csillagjegyek/${z.slug}`} className="card sign-tile">
|
||||
<span className="sign-tile-glyph" aria-hidden="true">
|
||||
{SIGNS[z.id]?.glyph}
|
||||
</span>
|
||||
<strong>{z.name}</strong>
|
||||
<span className="hint">{z.dates}</span>
|
||||
<span className="hint">
|
||||
{z.element} · {z.modality}
|
||||
</span>
|
||||
</Link>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
<div className="card sign-cta" style={{ marginTop: 32 }}>
|
||||
<p style={{ margin: 0 }}>
|
||||
Nem tudod, melyik jegyben áll a Holdad, vagy mi az aszcendensed? Az ingyenes születési horoszkóp a születési
|
||||
adataidból kiszámolja, belépés nélkül.
|
||||
</p>
|
||||
<div className="form-actions">
|
||||
<Link href="/szuletesi-horoszkop" className="btn btn-primary">
|
||||
Ingyenes születési horoszkóp
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
<PublicFooter />
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -1,14 +1,20 @@
|
||||
import type { Metadata } from "next";
|
||||
import Link from "next/link";
|
||||
|
||||
import { AiNote } from "@/components/AiNote";
|
||||
import { PackageCards } from "@/components/PackageCards";
|
||||
import { RedeemCode } from "@/components/RedeemCode";
|
||||
import { payMethod } from "@/lib/payments";
|
||||
import { backendGet, requireMe } from "@/lib/server";
|
||||
import type { Package, PublicConfig } from "@/lib/types";
|
||||
|
||||
export const metadata: Metadata = { title: "Csomagok" };
|
||||
|
||||
const FAQ: [string, string][] = [
|
||||
[
|
||||
"Biztonságos a fizetés?",
|
||||
"Igen. A fizetés a Stripe biztonságos fizetési oldalán történik, bankkártyával, Apple Payjel vagy Google Payjel. A kártyaadataidat közvetlenül a Stripe-nak adod meg: hozzánk nem jutnak el, és nem is tároljuk őket. Cégként is vásárolhatsz, ilyenkor a cégnevet és az adószámot is megadhatod a számlához.",
|
||||
],
|
||||
[
|
||||
"Lejárnak a megvett elemzések?",
|
||||
"Nem. A csomagokban kapott elemzések és személyhelyek addig megmaradnak, amíg fel nem használod őket.",
|
||||
@@ -25,6 +31,10 @@ const FAQ: [string, string][] = [
|
||||
"Mit jelent a kérdés?",
|
||||
"A kész képletelemzésed, kapcsolati elemzésed vagy éves előrejelzésed alatt kérdezhetsz róla, például hogy mit jelent egy fényszög a munkádra nézve, mire figyeljetek egy kapcsolatban, vagy mire figyelj egy időszakban. A válasz a képleted és az elemzés alapján készül, legfeljebb 250 szóban. Minden csomagban 3 kérdés van, és külön is vehetsz még.",
|
||||
],
|
||||
[
|
||||
"Mi a kártyajóslás?",
|
||||
"Kérdezel, kiválasztasz egy kirakást (1, 3 vagy 5 lap), és húzol a megkevert pakliból. A kihúzott lapokra, a kérdésedre és a képleted Napjára, Holdjára és Aszcendensére személyre szabott értelmezés készül. Egy jóslás egyet használ, a kirakás méretétől függetlenül. A csomagokban van néhány, és külön is vehetsz ötöt egyben.",
|
||||
],
|
||||
[
|
||||
"Mire kell a személyhely?",
|
||||
"A saját képleted mellé felvett emberekhez (társ, gyerek, barát). Egy személy felvétele egy helyet használ; a képlete és a rövid összefoglalója ingyenes, a részletes elemzés külön jár.",
|
||||
@@ -39,7 +49,7 @@ export default async function PackagesPage() {
|
||||
backendGet<PublicConfig>("/v1/config"),
|
||||
]);
|
||||
const packages = catalog?.packages ?? [];
|
||||
const canPay = config?.mock_payments ?? false;
|
||||
const canPay = payMethod(config, me);
|
||||
const left = me.analyses_left;
|
||||
const slots = me.persons;
|
||||
|
||||
@@ -59,6 +69,7 @@ export default async function PackagesPage() {
|
||||
<p>
|
||||
<strong>{left.natal}</strong> képletelemzés · <strong>{left.synastry}</strong> kapcsolati elemzés ·{" "}
|
||||
<strong>{left.forecast}</strong> éves előrejelzés · <strong>{left.question ?? 0}</strong> kérdés ·{" "}
|
||||
<strong>{left.tarot ?? 0}</strong> kártyajóslás ·{" "}
|
||||
{slots.unlimited ? (
|
||||
"korlátlan személy"
|
||||
) : (
|
||||
@@ -79,6 +90,12 @@ export default async function PackagesPage() {
|
||||
<RedeemCode />
|
||||
</section>
|
||||
|
||||
{me.invoice_count > 0 && (
|
||||
<p className="hint">
|
||||
A korábbi vásárlásaid számlái: <Link href="/szamlak">Számláim →</Link>
|
||||
</p>
|
||||
)}
|
||||
|
||||
<PackageCards packages={packages} canPay={canPay} />
|
||||
|
||||
<section className="field" aria-labelledby="addon-title" style={{ gap: 12 }}>
|
||||
@@ -102,7 +119,11 @@ export default async function PackagesPage() {
|
||||
</div>
|
||||
))}
|
||||
</dl>
|
||||
<p className="hint">Az árak bruttó árak, az áfát tartalmazzák.</p>
|
||||
<p className="hint">
|
||||
{config?.vat === "AAM" || !config
|
||||
? "Az árak végső árak: alanyi adómentesek vagyunk, áfát nem számítunk fel."
|
||||
: `Az árak bruttó árak, a ${config.vat} áfát tartalmazzák.`}
|
||||
</p>
|
||||
</section>
|
||||
</main>
|
||||
);
|
||||
|
||||
@@ -26,6 +26,10 @@
|
||||
|
||||
* { box-sizing: border-box; }
|
||||
html, body { margin: 0; }
|
||||
/* The night sky behind everything (components/NightSky.tsx): drawn over the
|
||||
page background, under all content, so anything with its own background
|
||||
covers it. */
|
||||
.night-sky { position: fixed; inset: 0; width: 100%; height: 100%; z-index: -1; pointer-events: none; }
|
||||
body {
|
||||
min-height: 100vh;
|
||||
overflow-x: clip; /* nothing may push the page sideways on a phone */
|
||||
@@ -64,6 +68,28 @@ p { margin: 0; }
|
||||
.nav a { color: var(--ink-2); text-decoration: none; padding: 10px 12px; border-radius: 8px; min-height: 44px; display: inline-flex; align-items: center; }
|
||||
.nav a:hover, .nav a[aria-current="page"] { color: var(--gold); background: rgba(217, 180, 106, 0.08); }
|
||||
.who { display: flex; align-items: center; gap: 12px; color: var(--muted); font-size: 14px; }
|
||||
.user-menu { position: relative; }
|
||||
.who-name {
|
||||
display: inline-flex; align-items: center; gap: 6px; min-height: 40px; padding: 0 10px; cursor: pointer;
|
||||
border: 1px solid var(--line-2); border-radius: 999px; background: none; color: var(--ink-2); font: inherit; font-size: 14px;
|
||||
}
|
||||
.who-name:hover, .who-name[aria-expanded="true"] { color: var(--gold); border-color: #5a6790; }
|
||||
.who-chevron { width: 14px; height: 14px; flex: none; fill: none; stroke: currentColor; stroke-width: 2; stroke-linecap: round; stroke-linejoin: round; }
|
||||
.who-name[aria-expanded="true"] .who-chevron { transform: rotate(180deg); }
|
||||
.user-menu-list {
|
||||
position: absolute; right: 0; top: calc(100% + 8px); z-index: 30; min-width: 200px; padding: 6px;
|
||||
display: flex; flex-direction: column; background: var(--panel); border: 1px solid var(--line-2); border-radius: 12px;
|
||||
box-shadow: 0 16px 40px rgba(0, 0, 0, 0.45);
|
||||
}
|
||||
.user-menu-item {
|
||||
display: flex; align-items: center; min-height: 40px; padding: 0 12px; border: 0; border-radius: 8px; background: none;
|
||||
color: var(--ink); font: inherit; font-size: 14px; text-align: left; text-decoration: none; cursor: pointer;
|
||||
}
|
||||
.user-menu-item:hover, .user-menu-item:focus-visible { background: rgba(255, 255, 255, 0.05); color: var(--gold); }
|
||||
.user-menu-item[aria-current="page"] { color: var(--gold); }
|
||||
.user-menu-logout { border-top: 1px solid var(--line); border-radius: 0 0 8px 8px; margin-top: 4px; padding-top: 2px; color: var(--muted); }
|
||||
.who-name-text { max-width: 220px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||
.who-icon { width: 18px; height: 18px; flex: none; fill: none; stroke: currentColor; stroke-width: 1.6; stroke-linecap: round; }
|
||||
.pkg-pill {
|
||||
display: inline-flex; align-items: center; gap: 6px; min-height: 32px; padding: 0 12px; border-radius: 999px;
|
||||
border: 1px solid rgba(217, 180, 106, 0.5); color: var(--gold); text-decoration: none; font-size: 13px; white-space: nowrap;
|
||||
@@ -92,9 +118,24 @@ p { margin: 0; }
|
||||
border: 1px solid var(--line-2); background: var(--panel-2); color: var(--ink);
|
||||
font: 400 15px var(--font-body);
|
||||
}
|
||||
select.inp { padding-right: 32px; text-overflow: ellipsis; }
|
||||
/* Our own chevron, so the text starts where it does in the other fields */
|
||||
select.inp {
|
||||
appearance: none; -webkit-appearance: none; cursor: pointer; text-overflow: ellipsis;
|
||||
padding: 0 42px 0 14px;
|
||||
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M4 6l4 4 4-4' fill='none' stroke='%23a3abc0' stroke-width='1.8' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");
|
||||
background-repeat: no-repeat; background-position: right 14px center; background-size: 16px;
|
||||
}
|
||||
select.inp:focus { background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M4 6l4 4 4-4' fill='none' stroke='%23d9b46a' stroke-width='1.8' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E"); }
|
||||
select.inp option { background: var(--panel-2); color: var(--ink); }
|
||||
/* Multi-line fields: room above and below the text too */
|
||||
textarea.inp { padding: 12px 14px; line-height: 1.55; min-height: 96px; resize: vertical; }
|
||||
/* A button beside input fields is as tall as they are */
|
||||
.row > .btn:not(.btn-sm), .redeem-row > .btn { min-height: 48px; }
|
||||
.inp::placeholder { color: #8a93ab; }
|
||||
.inp:focus { outline: none; border-color: var(--gold); box-shadow: 0 0 0 3px rgba(217, 180, 106, 0.25); }
|
||||
.inp:focus { outline: none; border-color: var(--gold); background-color: #182037; box-shadow: 0 0 0 3px rgba(217, 180, 106, 0.25); }
|
||||
/* Clicking in must visibly change the field: the example text steps aside for the caret */
|
||||
.inp:focus::placeholder { color: transparent; }
|
||||
.inp { caret-color: var(--gold); }
|
||||
.inp:disabled { opacity: 0.55; }
|
||||
.check { display: flex; align-items: center; gap: 10px; font-size: 14px; color: var(--ink-2); min-height: 32px; cursor: pointer; }
|
||||
.check input { width: 18px; height: 18px; accent-color: var(--gold); margin: 0; }
|
||||
@@ -164,6 +205,18 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
|
||||
.tagline { font-family: var(--font-display); font-size: 38px; font-weight: 600; line-height: 1.1; }
|
||||
.auth-foot { font-size: 15px; color: var(--muted); text-align: center; }
|
||||
|
||||
/* E-mail and password next to the social buttons */
|
||||
.auth-or { display: flex; align-items: center; gap: 14px; color: var(--muted); font-size: 13px; margin: -6px 0; }
|
||||
.auth-or::before, .auth-or::after { content: ""; flex: 1; border-top: 1px solid var(--line); }
|
||||
.pw-label-row { display: flex; align-items: baseline; justify-content: space-between; gap: 12px; }
|
||||
.pw-switch { text-align: center; }
|
||||
.link-btn {
|
||||
background: none; border: 0; padding: 0; font: inherit; color: var(--gold); cursor: pointer;
|
||||
text-decoration: underline; text-underline-offset: 2px;
|
||||
}
|
||||
.link-btn:hover { color: var(--gold-hover); }
|
||||
.pw-label-row .link-btn { font-size: 13px; text-decoration: none; }
|
||||
|
||||
/* Social login buttons; Google's own button lies invisibly on top (.gsi-overlay). */
|
||||
.social-login { position: relative; }
|
||||
.btn-social {
|
||||
@@ -176,6 +229,11 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
|
||||
.social-login:hover .btn-social { border-color: #5a6790; background: rgba(255, 255, 255, 0.03); }
|
||||
.social-login:focus-within .btn-social { outline: 2px solid var(--gold); outline-offset: 2px; }
|
||||
.social-login[data-ready="false"] .btn-social { opacity: 0.6; }
|
||||
/* Sign in with Apple: Apple's white button style. */
|
||||
.btn-apple { background: #fff; border-color: #fff; color: #000; cursor: pointer; }
|
||||
.btn-apple:hover:not(:disabled) { background: #e8e8ed; border-color: #e8e8ed; }
|
||||
.btn-apple:focus-visible { outline: 2px solid var(--gold); outline-offset: 2px; }
|
||||
.btn-apple:disabled { opacity: 0.6; cursor: default; }
|
||||
.gsi-overlay {
|
||||
position: absolute; inset: 0; display: flex; align-items: center; justify-content: center;
|
||||
opacity: 0.001; overflow: hidden; cursor: pointer;
|
||||
@@ -322,7 +380,8 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
|
||||
h1 { font-size: 32px; }
|
||||
.site-header { padding: 10px 16px; gap: 12px; }
|
||||
.nav { order: 3; flex-basis: 100%; }
|
||||
.who-name { display: none; }
|
||||
.who-name-text { max-width: 120px; }
|
||||
.who { margin-left: auto; }
|
||||
.card { padding: 18px; }
|
||||
.auth-aside { padding: 28px 20px; min-height: 0; }
|
||||
.wheel { width: 60%; }
|
||||
@@ -729,8 +788,6 @@ a.pair-row:hover strong { color: var(--gold); }
|
||||
.share-cta .btn { align-self: flex-start; }
|
||||
|
||||
/* Promo codes: redeeming (header, packages page, /bevaltas) and the admin page */
|
||||
.redeem-link { color: var(--ink-2); font-size: 13px; text-decoration: none; white-space: nowrap; }
|
||||
.redeem-link:hover { color: var(--gold); text-decoration: underline; text-underline-offset: 3px; }
|
||||
.redeem { display: flex; flex-direction: column; gap: 8px; }
|
||||
.redeem-row { display: flex; gap: 8px; flex-wrap: wrap; }
|
||||
.redeem-input { flex: 1 1 220px; width: auto; font-family: ui-monospace, SFMono-Regular, Menlo, monospace; letter-spacing: 1.5px; text-transform: uppercase; }
|
||||
@@ -770,6 +827,17 @@ a.pair-row:hover strong { color: var(--gold); }
|
||||
.lp-wrap { max-width: 1180px; margin: 0 auto; padding: 0 24px; }
|
||||
.lp-header { gap: 16px; }
|
||||
.lp-nav { flex: 1; }
|
||||
/* The free tools in the visitors' header, set apart from the paid sections. */
|
||||
.lp-free { display: flex; align-items: center; gap: 2px; padding-left: 14px; border-left: 1px solid var(--line-2); }
|
||||
.lp-free-label {
|
||||
font-size: 11px; font-weight: 600; letter-spacing: 1px; text-transform: uppercase; color: var(--gold);
|
||||
border: 1px solid rgba(217, 180, 106, 0.45); border-radius: 999px; padding: 2px 8px; margin-right: 6px; white-space: nowrap;
|
||||
}
|
||||
.lp-free a {
|
||||
color: var(--ink); text-decoration: none; padding: 10px 10px; border-radius: 8px; min-height: 44px;
|
||||
display: inline-flex; align-items: center; white-space: nowrap;
|
||||
}
|
||||
.lp-free a:hover, .lp-free a[aria-current="page"] { color: var(--gold); background: rgba(217, 180, 106, 0.08); }
|
||||
.lp-hero { position: relative; overflow: hidden; }
|
||||
.lp-stars { position: absolute; inset: 0; width: 100%; height: 100%; }
|
||||
.lp-star { fill: var(--ink); opacity: 0.25; animation: lp-twinkle 6s ease-in-out infinite; }
|
||||
@@ -907,6 +975,20 @@ a.pair-row:hover strong { color: var(--gold); }
|
||||
.lp-pair { grid-template-columns: minmax(0, 1fr); justify-items: center; }
|
||||
.lp-rings { max-width: 200px; }
|
||||
.lp-nav { display: none; }
|
||||
/* On phones the free tools get their own row under the logo. */
|
||||
.lp-header { flex-wrap: wrap; row-gap: 4px; }
|
||||
.lp-free { order: 3; flex-basis: 100%; padding-left: 0; border-left: 0; overflow-x: auto; scrollbar-width: none; gap: 0; }
|
||||
.lp-free a { padding: 10px 7px; }
|
||||
.lp-free-label { margin-right: 4px; }
|
||||
.lp-header > .btn { margin-left: auto; }
|
||||
}
|
||||
/* The free-tools row fits on narrow phones too, without sideways scrolling */
|
||||
@media (max-width: 380px) {
|
||||
.lp-free a { font-size: 14px; padding: 10px 5px; }
|
||||
.lp-free-label { font-size: 10px; padding: 2px 6px; letter-spacing: 0.5px; }
|
||||
}
|
||||
@media (max-width: 350px) {
|
||||
.lp-free-label { display: none; }
|
||||
}
|
||||
@media (prefers-reduced-motion: reduce) {
|
||||
.lp *, .lp-orbit { animation: none !important; }
|
||||
@@ -926,9 +1008,244 @@ a.pair-row:hover strong { color: var(--gold); }
|
||||
.lp-why-card { gap: 12px; padding: 28px; }
|
||||
.lp-why-icon { width: 36px; height: 36px; fill: none; stroke: var(--gold); stroke-width: 1.4; stroke-linecap: round; stroke-linejoin: round; }
|
||||
|
||||
/* Home page: tarot, a quiet line under the yearly forecast and the comparison */
|
||||
.lp-tarot { flex-direction: row; align-items: center; gap: 32px; padding: 22px 32px; margin-top: -16px; }
|
||||
.lp-tarot-cards { position: relative; width: 132px; height: 112px; flex: none; }
|
||||
.lp-tarot-cards .tarot-card { position: absolute; top: 12px; width: 56px; border-radius: 5px; box-shadow: 0 6px 16px rgba(0, 0, 0, 0.4); }
|
||||
.lp-tarot-cards .tarot-card:nth-child(1) { left: 4px; transform: rotate(-11deg); }
|
||||
.lp-tarot-cards .tarot-card:nth-child(2) { left: 38px; top: 4px; }
|
||||
.lp-tarot-cards .tarot-card:nth-child(3) { left: 72px; transform: rotate(11deg); }
|
||||
.lp-tarot-text { display: flex; flex-direction: column; gap: 6px; flex: 1 1 auto; min-width: 0; }
|
||||
.lp-tarot-text .lp-small { max-width: 640px; }
|
||||
.lp-tarot-title { font-size: 24px; line-height: 1.15; }
|
||||
.lp-tarot-link { flex: none; font-size: 14px; font-weight: 500; white-space: nowrap; }
|
||||
@media (max-width: 720px) {
|
||||
.lp-tarot { flex-wrap: wrap; gap: 14px 16px; padding: 22px; }
|
||||
.lp-tarot-cards { width: 104px; height: 88px; }
|
||||
.lp-tarot-cards .tarot-card { width: 44px; top: 10px; }
|
||||
.lp-tarot-cards .tarot-card:nth-child(1) { left: 2px; }
|
||||
.lp-tarot-cards .tarot-card:nth-child(2) { left: 30px; top: 3px; }
|
||||
.lp-tarot-cards .tarot-card:nth-child(3) { left: 58px; }
|
||||
.lp-tarot-text { flex: 1 1 100%; }
|
||||
.lp-tarot-link { flex-basis: 100%; min-height: 44px; display: inline-flex; align-items: center; }
|
||||
}
|
||||
|
||||
/* Home page footer: payment and invoicing partners */
|
||||
.lp-partners { display: flex; flex-wrap: wrap; align-items: center; justify-content: center; gap: 10px 16px; padding-bottom: 20px; margin-bottom: 20px; border-bottom: 1px solid var(--line); }
|
||||
.lp-partner { height: 26px; width: auto; opacity: 0.65; transition: opacity 0.2s; }
|
||||
.lp-partner:hover { opacity: 1; }
|
||||
.lp-partners .hint + .lp-partner { margin-right: 18px; }
|
||||
.lp-partners .lp-partner:last-child { margin-right: 0; }
|
||||
|
||||
/* Chart page: below the wheel and the summary, the facts and the next steps side by side */
|
||||
.chart-extras { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(300px, 100%), 1fr)); gap: 16px; align-items: stretch; }
|
||||
.chart-extras > .card { margin: 0; }
|
||||
|
||||
/* Back from Stripe: the payment's result at the bottom of the screen. */
|
||||
.pay-return { position: fixed; left: 50%; bottom: 20px; transform: translateX(-50%); z-index: 60; width: min(560px, calc(100% - 32px)); }
|
||||
.pay-return .msg {
|
||||
display: flex; align-items: center; justify-content: space-between; gap: 12px; margin: 0; padding: 14px 16px;
|
||||
background: var(--panel-2); border: 1px solid var(--line); border-radius: 14px; box-shadow: 0 12px 40px rgba(0, 0, 0, 0.45);
|
||||
}
|
||||
.pay-return .msg-ok { border-color: color-mix(in srgb, var(--ok) 55%, var(--line)); }
|
||||
.pay-return .msg-error { border-color: color-mix(in srgb, var(--danger) 55%, var(--line)); }
|
||||
|
||||
/* Számláim */
|
||||
.invoice-table th.num, .invoice-table td.num { text-align: right; }
|
||||
.invoice-table td.act { text-align: right; white-space: nowrap; }
|
||||
@media (max-width: 640px) {
|
||||
.invoice-table th:nth-child(3), .invoice-table td:nth-child(3) { display: none; }
|
||||
}
|
||||
|
||||
/* Kártyajóslás */
|
||||
.tarot { display: flex; flex-direction: column; gap: 24px; }
|
||||
.tarot-card { display: block; width: 100%; height: auto; border-radius: 9px; user-select: none; }
|
||||
.tarot-card-sm { width: 120px; flex: none; box-shadow: 0 10px 28px rgba(0, 0, 0, 0.35); }
|
||||
.tarot-card-xs { width: 30px; border-radius: 4px; }
|
||||
.tarot-question { font-family: var(--font-display); font-size: 20px; font-style: italic; color: var(--ink-2); }
|
||||
|
||||
.tarot-spreads { border: 0; margin: 0; padding: 0; display: grid; grid-template-columns: repeat(auto-fit, minmax(min(220px, 100%), 1fr)); gap: 10px; }
|
||||
.tarot-spreads legend { margin-bottom: 8px; }
|
||||
.tarot-spread {
|
||||
display: flex; flex-direction: column; gap: 4px; padding: 14px 16px; cursor: pointer;
|
||||
border: 1px solid var(--line-2); border-radius: var(--radius); background: var(--panel-2); transition: border-color 0.15s;
|
||||
}
|
||||
.tarot-spread:hover { border-color: #5a6790; }
|
||||
.tarot-spread.is-active { border-color: var(--gold); box-shadow: 0 0 0 1px var(--gold) inset; }
|
||||
.tarot-spread:has(input:focus-visible) { outline: 2px solid var(--gold); outline-offset: 2px; }
|
||||
.tarot-topics { border: 0; margin: 0; padding: 0; display: flex; flex-wrap: wrap; gap: 8px; }
|
||||
.tarot-topics legend { margin-bottom: 8px; }
|
||||
.tarot-topic {
|
||||
display: inline-flex; align-items: center; min-height: 38px; padding: 0 16px; cursor: pointer; font-size: 14px;
|
||||
border: 1px solid var(--line-2); border-radius: 999px; background: var(--panel-2); color: var(--ink-2);
|
||||
}
|
||||
.tarot-topic:hover { border-color: #5a6790; }
|
||||
.tarot-topic.is-active { border-color: var(--gold); color: var(--gold); background: rgba(217, 180, 106, 0.08); }
|
||||
.tarot-topic:has(input:focus-visible) { outline: 2px solid var(--gold); outline-offset: 2px; }
|
||||
.tarot-spread-name { font-family: var(--font-display); font-size: 20px; font-weight: 600; }
|
||||
|
||||
.tarot-stage { align-items: stretch; }
|
||||
.tarot-stage-head { display: flex; flex-direction: column; gap: 6px; text-align: center; align-items: center; }
|
||||
.tarot-slots { list-style: none; margin: 8px 0 0; padding: 0; display: flex; flex-wrap: wrap; justify-content: center; gap: 18px 20px; }
|
||||
.tarot-slot { width: 132px; display: flex; flex-direction: column; align-items: center; gap: 6px; text-align: center; }
|
||||
.tarot-slots[data-count="5"] .tarot-slot { width: 118px; }
|
||||
.tarot-slot-title { font-size: 13px; font-weight: 600; color: var(--gold); line-height: 1.3; }
|
||||
.tarot-slot-empty { width: 100%; aspect-ratio: 3 / 5; border: 1px dashed var(--line-2); border-radius: 9px; }
|
||||
|
||||
.tarot-flip { width: 100%; aspect-ratio: 3 / 5; perspective: 900px; }
|
||||
.tarot-flip-inner { position: relative; width: 100%; height: 100%; transform-style: preserve-3d; transition: transform 0.75s cubic-bezier(0.3, 0.7, 0.3, 1); animation: tarot-land 0.35s ease-out; }
|
||||
.tarot-flip.is-flipped .tarot-flip-inner { transform: rotateY(180deg); }
|
||||
.tarot-face { position: absolute; inset: 0; backface-visibility: hidden; -webkit-backface-visibility: hidden; box-shadow: 0 10px 28px rgba(0, 0, 0, 0.35); }
|
||||
.tarot-front { transform: rotateY(180deg); }
|
||||
@keyframes tarot-land { from { transform: translateY(-18px); opacity: 0; } to { transform: none; opacity: 1; } }
|
||||
|
||||
/* The shuffled deck, fanned out: each card turns around a point far below. */
|
||||
.tarot-fan { --w: 64px; --step: 4.2deg; position: relative; height: calc(var(--w) * 3.5); margin: 12px auto 0; width: 100%; max-width: 560px; overflow: visible; }
|
||||
.tarot-fan-card {
|
||||
position: absolute; left: calc(50% - var(--w) / 2); top: 12px; width: var(--w); padding: 0; border: 0; background: none; cursor: pointer;
|
||||
transform-origin: 50% 330%; transform: rotate(calc(var(--i) * var(--step))); transition: transform 0.2s ease, opacity 0.25s ease;
|
||||
}
|
||||
.tarot-fan-card .tarot-card { box-shadow: 0 6px 16px rgba(0, 0, 0, 0.4); }
|
||||
.tarot-fan-card:hover:not(:disabled), .tarot-fan-card:focus-visible { transform: rotate(calc(var(--i) * var(--step))) translateY(-14px); }
|
||||
.tarot-fan-card.is-picked { opacity: 0; transform: rotate(calc(var(--i) * var(--step))) translateY(-60px); cursor: default; }
|
||||
.tarot-fan-card { animation: tarot-deal 0.7s cubic-bezier(0.3, 0.7, 0.3, 1) backwards; }
|
||||
@keyframes tarot-deal { from { transform: rotate(0deg); } }
|
||||
span.tarot-fan-card { cursor: default; }
|
||||
.tarot-fan-card.is-lifted { transform: rotate(calc(var(--i) * var(--step))) translateY(-26px); }
|
||||
.tarot-fan-card.is-lifted .tarot-card { box-shadow: 0 0 0 1px var(--gold), 0 10px 26px rgba(217, 180, 106, 0.35); }
|
||||
|
||||
/* The example page: a reading played from the deck to the text. */
|
||||
.tarot-demo { display: flex; flex-direction: column; gap: 18px; padding-top: 8px; }
|
||||
.tarot-demo-status { text-align: center; min-height: 36px; display: flex; align-items: center; justify-content: center; }
|
||||
.tarot-demo-text { max-height: 0; overflow: hidden; opacity: 0; transform: translateY(16px); }
|
||||
.tarot-demo-text.is-shown { max-height: none; overflow: visible; opacity: 1; transform: none; transition: opacity 0.8s ease, transform 0.8s ease; }
|
||||
|
||||
.tarot-result { display: flex; flex-direction: column; gap: 28px; }
|
||||
.tarot-result-head { display: flex; flex-direction: column; gap: 10px; }
|
||||
.tarot-summary { font-size: 17px; color: var(--ink-2); }
|
||||
.tarot-card-texts { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 28px; }
|
||||
.tarot-card-text { display: flex; gap: 22px; align-items: flex-start; }
|
||||
.tarot-card-text-body { display: flex; flex-direction: column; gap: 10px; min-width: 0; }
|
||||
.tarot-synthesis, .tarot-advice { display: flex; flex-direction: column; gap: 10px; border-top: 1px solid var(--line); padding-top: 22px; }
|
||||
.tarot-advice h3 { color: var(--gold); }
|
||||
|
||||
.tarot-history { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; }
|
||||
.tarot-history li + li { border-top: 1px solid var(--line); }
|
||||
.tarot-history-row { display: flex; gap: 14px; align-items: center; padding: 12px 0; color: var(--ink); text-decoration: none; }
|
||||
.tarot-history-row:hover strong { color: var(--gold); }
|
||||
.tarot-history-cards { display: flex; gap: 3px; flex: none; }
|
||||
.tarot-history-text { display: flex; flex-direction: column; gap: 2px; min-width: 0; }
|
||||
|
||||
@media (max-width: 640px) {
|
||||
.tarot-fan { --w: 46px; --step: 4deg; }
|
||||
.tarot-slot { width: calc((100% - 40px) / 3); }
|
||||
.tarot-slots[data-count="1"] .tarot-slot { width: 46%; }
|
||||
.tarot-slots[data-count="5"] .tarot-slot { width: calc((100% - 40px) / 3); }
|
||||
.tarot-card-text { flex-direction: column; align-items: center; }
|
||||
.tarot-card-text-body { align-self: stretch; }
|
||||
.tarot-history-cards .tarot-card-xs:nth-child(n + 4) { display: none; }
|
||||
}
|
||||
@media (prefers-reduced-motion: reduce) {
|
||||
.tarot-flip-inner, .tarot-fan-card, .tarot-demo-text { transition: none; animation: none; }
|
||||
}
|
||||
|
||||
/* Birth date and time: our own Hungarian fields (not the browser's date and time inputs) */
|
||||
.birth-fields { border: 0; margin: 0; padding: 0; min-width: 0; }
|
||||
.birth-fields legend { padding: 0; margin-bottom: 8px; }
|
||||
.birth-row { display: flex; align-items: center; gap: 8px; }
|
||||
.birth-year { width: 5.5em; flex: none; }
|
||||
.birth-month { flex: 1 1 auto; min-width: 0; }
|
||||
.birth-day { width: 5.2em; flex: none; }
|
||||
.birth-time { width: 4.4em; flex: none; text-align: center; }
|
||||
.birth-colon { color: var(--muted); font-weight: 600; }
|
||||
|
||||
/* Public sign calculator (/aszcendens-kalkulator) */
|
||||
.calc-form { margin-bottom: 8px; }
|
||||
.calc-result { display: flex; flex-direction: column; gap: 16px; margin: 24px 0 8px; scroll-margin-top: 84px; }
|
||||
.calc-signs { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(220px, 100%), 1fr)); gap: 16px; }
|
||||
.calc-sign { display: flex; flex-direction: column; gap: 10px; }
|
||||
.calc-sign-main { display: flex; align-items: baseline; gap: 10px; }
|
||||
.calc-sign-main strong { font-family: var(--font-display); font-size: 30px; font-weight: 600; }
|
||||
.calc-glyph { font-size: 30px; color: var(--gold); line-height: 1; }
|
||||
.calc-sign-link { font-size: 14px; margin-top: auto; }
|
||||
.calc-cta { display: flex; flex-direction: row; gap: 20px; align-items: center; justify-content: space-between; flex-wrap: wrap; }
|
||||
.calc-cta > div { flex: 1 1 320px; }
|
||||
.calc-explain, .calc-faq { margin-top: 48px; display: flex; flex-direction: column; gap: 14px; }
|
||||
.calc-explain-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(220px, 100%), 1fr)); gap: 20px; }
|
||||
.calc-explain h3 { font-size: 18px; margin: 0 0 6px; }
|
||||
.calc-explain p { margin: 0; color: var(--ink-2); line-height: 1.6; }
|
||||
.calc-faq-item { padding: 16px 20px; }
|
||||
.calc-faq-item summary { cursor: pointer; font-weight: 600; }
|
||||
.calc-faq-item p { margin: 10px 0 0; color: var(--ink-2); line-height: 1.6; }
|
||||
|
||||
/* Sign pages (/csillagjegyek) */
|
||||
.sign-grid { list-style: none; margin: 0; padding: 0; display: grid; grid-template-columns: repeat(auto-fill, minmax(min(220px, 100%), 1fr)); gap: 16px; }
|
||||
.sign-tile { display: flex; flex-direction: column; gap: 6px; text-decoration: none; color: var(--ink); height: 100%; }
|
||||
.sign-tile:hover { border-color: #5a6790; color: var(--ink); }
|
||||
.sign-tile strong { font-family: var(--font-display); font-size: 26px; font-weight: 600; }
|
||||
.sign-tile-glyph { font-size: 28px; color: var(--gold); line-height: 1; }
|
||||
.sign-crumbs { margin-bottom: 8px; }
|
||||
.sign-crumbs a { color: var(--muted); }
|
||||
.sign-head { flex-direction: row; align-items: center; gap: 20px; }
|
||||
.sign-glyph { font-size: 64px; color: var(--gold); line-height: 1; }
|
||||
.sign-facts { width: 100%; border-collapse: collapse; margin: 8px 0 24px; font-size: 15px; }
|
||||
.sign-facts th, .sign-facts td { padding: 10px 12px; border-bottom: 1px solid var(--line); text-align: left; }
|
||||
.sign-facts th { color: var(--muted); font-weight: 500; white-space: nowrap; }
|
||||
.sign-intro { font-size: 18px; line-height: 1.65; }
|
||||
.sign-section { margin-top: 32px; scroll-margin-top: 16px; }
|
||||
.sign-section h2, .sign-traits h2 { font-size: 26px; margin: 0 0 10px; }
|
||||
.sign-section p, .sign-traits p { line-height: 1.7; color: var(--ink-2); margin: 0; }
|
||||
.sign-myth { border-left: 3px solid var(--gold); padding-left: 18px; }
|
||||
.sign-traits { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(260px, 100%), 1fr)); gap: 24px; margin-top: 32px; }
|
||||
.sign-cta { margin-top: 36px; display: flex; flex-direction: column; gap: 14px; }
|
||||
.sign-pager { display: flex; justify-content: space-between; gap: 12px; flex-wrap: wrap; margin-top: 32px; font-size: 15px; }
|
||||
@media (max-width: 640px) {
|
||||
.sign-facts th, .sign-facts td { display: block; padding: 4px 0; border: 0; }
|
||||
.sign-facts td { padding-bottom: 10px; border-bottom: 1px solid var(--line); }
|
||||
.sign-glyph { font-size: 48px; }
|
||||
}
|
||||
|
||||
/* The free tools on the home page, set apart from the paid sections */
|
||||
.lp-free-line { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; margin: 0; font-size: 15px; }
|
||||
.lp-free-line .lp-free-label { margin-right: 0; }
|
||||
.lp-free-band { border-top: 1px solid var(--line); border-bottom: 1px solid var(--line); background: var(--panel); padding: 36px 0; }
|
||||
.lp-free-head { display: flex; align-items: center; gap: 12px; flex-wrap: wrap; margin-bottom: 18px; }
|
||||
.lp-free-title { margin: 0; font-family: var(--font-display); font-size: 30px; font-weight: 600; }
|
||||
.lp-free-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(300px, 100%), 1fr)); gap: 16px; }
|
||||
.lp-free-card { display: flex; flex-direction: column; gap: 8px; text-decoration: none; color: var(--ink); border-color: rgba(217, 180, 106, 0.35); }
|
||||
.lp-free-card:hover { border-color: var(--gold); color: var(--ink); }
|
||||
.lp-free-card strong { font-family: var(--font-display); font-size: 24px; font-weight: 600; }
|
||||
.lp-free-go { color: var(--gold); font-weight: 500; margin-top: auto; }
|
||||
.calc-result-head { margin-top: 32px; }
|
||||
.calc-links ul { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 8px; }
|
||||
.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; }
|
||||
}
|
||||
|
||||
@@ -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",
|
||||
});
|
||||
}
|
||||
@@ -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<Metadata> {
|
||||
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 (
|
||||
<>
|
||||
<JsonLd
|
||||
data={{
|
||||
"@context": "https://schema.org",
|
||||
"@type": "Person",
|
||||
name: c.name,
|
||||
birthDate: chart.birth.date,
|
||||
...(chart.birth.place ? { birthPlace: { "@type": "Place", name: chart.birth.place } } : {}),
|
||||
...(c.photo ? { image: `${base}${photoSrc(c.photo)}` } : {}),
|
||||
url: `${base}/hires-emberek/${c.slug}`,
|
||||
}}
|
||||
/>
|
||||
{!me && <PublicHeader />}
|
||||
<main className="page" style={{ maxWidth: 1180 }}>
|
||||
{!c.published && (
|
||||
<p className="msg msg-warn" role="status">
|
||||
Vázlat: csak az adminok látják. <Link href={`/admin/hires-emberek/${c.id}`}>Szerkesztés</Link>
|
||||
</p>
|
||||
)}
|
||||
<div className="page-head">
|
||||
<span className="eyebrow">
|
||||
<Link href="/hires-emberek">Híres emberek</Link>
|
||||
</span>
|
||||
<h1>{c.name} horoszkópja</h1>
|
||||
{c.subtitle && <p className="celeb-subtitle">{c.subtitle}</p>}
|
||||
<p className="muted">Született: {birthLine(chart.birth)}</p>
|
||||
</div>
|
||||
|
||||
<section className="chart-layout" aria-label={`${c.name} képlete`}>
|
||||
<div className="card chart-wheel-card">
|
||||
<ChartWheel chart={chart} timeKnown={chart.time_known} />
|
||||
<WheelLegend />
|
||||
</div>
|
||||
<div className="field chart-side">
|
||||
<section className="card celeb-portrait" aria-label={c.name}>
|
||||
{c.photo && (
|
||||
<div className="celeb-photo">
|
||||
<Image
|
||||
src={photoSrc(c.photo)}
|
||||
alt={c.name}
|
||||
fill
|
||||
priority
|
||||
sizes="(max-width: 900px) 100vw, 420px"
|
||||
style={{ objectFit: "cover", objectPosition: objectPosition(c.photo) }}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
{trio.length > 0 && (
|
||||
<p className="share-trio">
|
||||
{trio.map((t) => (
|
||||
<span key={t.label}>
|
||||
<span className="sym" aria-hidden="true">
|
||||
{SIGNS[t.sign]?.glyph}
|
||||
</span>{" "}
|
||||
{t.label} {signName(t.sign)}
|
||||
</span>
|
||||
))}
|
||||
</p>
|
||||
)}
|
||||
{!chart.time_known && (
|
||||
<p className="hint">A születési idő nem ismert, ezért a képleten nincsenek házak és Aszcendens.</p>
|
||||
)}
|
||||
</section>
|
||||
<section className="card share-cta">
|
||||
<h2>És a te képleted mit mutat?</h2>
|
||||
<p className="muted">
|
||||
Add meg a születési adataidat, és megkapod a saját képletedet a rövid összefoglalóval együtt, ingyen.
|
||||
</p>
|
||||
<Link href={me ? "/keplet" : "/szuletesi-horoszkop"} className="btn btn-primary">
|
||||
{me ? "A saját képletem" : "Ingyenes születési horoszkóp"}
|
||||
</Link>
|
||||
</section>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{c.analysis ? (
|
||||
<section className="card analysis-card" aria-label={`${c.name} részletes portréja`}>
|
||||
<span className="eyebrow">Asztrológiai portré</span>
|
||||
<AnalysisView content={c.analysis.content} kind="celebrity" language={c.analysis.language} />
|
||||
</section>
|
||||
) : (
|
||||
<p className="muted">A részletes portré hamarosan elkészül.</p>
|
||||
)}
|
||||
<p className="hint">
|
||||
A portrét mesterséges intelligencia írta, kizárólag a születési képlet alapján, nem az életrajz ismeretében.
|
||||
</p>
|
||||
</main>
|
||||
<PublicFooter />
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -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 && <PublicHeader />}
|
||||
<main className="page" style={{ maxWidth: 1080 }}>
|
||||
<div className="page-head">
|
||||
<span className="eyebrow">Híres emberek</span>
|
||||
<h1>Híres emberek horoszkópja</h1>
|
||||
<p className="muted">
|
||||
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.
|
||||
</p>
|
||||
</div>
|
||||
{people.length === 0 ? (
|
||||
<p className="muted">Hamarosan.</p>
|
||||
) : (
|
||||
<ul className="celeb-grid">
|
||||
{people.map((p) => (
|
||||
<li key={p.id}>
|
||||
<Link href={`/hires-emberek/${p.slug}`} className="card celeb-tile">
|
||||
<span className="celeb-tile-photo">
|
||||
{p.photo ? (
|
||||
<Image
|
||||
src={photoSrc(p.photo)}
|
||||
alt={p.name}
|
||||
fill
|
||||
sizes="(max-width: 640px) 50vw, 240px"
|
||||
style={{ objectFit: "cover", objectPosition: objectPosition(p.photo) }}
|
||||
/>
|
||||
) : (
|
||||
<span className="celeb-tile-glyph" aria-hidden="true">
|
||||
{p.highlights.sun ? SIGNS[p.highlights.sun]?.glyph : "✶"}
|
||||
</span>
|
||||
)}
|
||||
</span>
|
||||
<strong>{p.name}</strong>
|
||||
{p.subtitle && <span className="hint">{p.subtitle}</span>}
|
||||
<span className="hint">
|
||||
{[
|
||||
p.highlights.sun && `Nap ${signName(p.highlights.sun)}`,
|
||||
p.highlights.moon && `Hold ${signName(p.highlights.moon)}`,
|
||||
]
|
||||
.filter(Boolean)
|
||||
.join(" · ")}
|
||||
</span>
|
||||
</Link>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
)}
|
||||
<div className="card sign-cta" style={{ marginTop: 32 }}>
|
||||
<p style={{ margin: 0 }}>
|
||||
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.
|
||||
</p>
|
||||
<div className="form-actions">
|
||||
<Link href="/szuletesi-horoszkop" className="btn btn-primary">
|
||||
Ingyenes születési horoszkóp
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
<PublicFooter />
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,92 @@
|
||||
"use client";
|
||||
|
||||
import Link from "next/link";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { useState } from "react";
|
||||
|
||||
import { ApiError, api, errorText } from "@/lib/api";
|
||||
|
||||
/** Sets the password with the e-mailed link's token; logs in on success. */
|
||||
export function SetPasswordForm({ token, minLength }: { token: string; minLength: number }) {
|
||||
const router = useRouter();
|
||||
const [password, setPassword] = useState("");
|
||||
const [again, setAgain] = useState("");
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [expired, setExpired] = useState(false);
|
||||
|
||||
async function submit(e: React.FormEvent) {
|
||||
e.preventDefault();
|
||||
setError(null);
|
||||
if (password.length < minLength) {
|
||||
setError(`A jelszó legalább ${minLength} karakter legyen.`);
|
||||
return;
|
||||
}
|
||||
if (password !== again) {
|
||||
setError("A két jelszó nem egyezik.");
|
||||
return;
|
||||
}
|
||||
setBusy(true);
|
||||
try {
|
||||
await api("/auth/set-password", { body: { token, password } });
|
||||
router.replace("/");
|
||||
router.refresh();
|
||||
} catch (err) {
|
||||
if (err instanceof ApiError && err.code === "invalid_token") setExpired(true);
|
||||
else setError(errorText(err));
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
if (expired) {
|
||||
return (
|
||||
<div className="field" role="alert">
|
||||
<p className="msg msg-error" style={{ margin: 0 }}>
|
||||
Ez a link lejárt, vagy már felhasználták.
|
||||
</p>
|
||||
<p className="hint" style={{ margin: 0 }}>
|
||||
A <Link href="/belepes?mod=elfelejtett">belépésnél</Link> az „Elfelejtett jelszó?” linkkel kérhetsz újat.
|
||||
</p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<form className="field" onSubmit={submit} style={{ gap: 14 }}>
|
||||
<div className="field">
|
||||
<label htmlFor="new-password">Új jelszó</label>
|
||||
<input
|
||||
id="new-password"
|
||||
className="inp"
|
||||
type="password"
|
||||
required
|
||||
minLength={minLength}
|
||||
autoComplete="new-password"
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
/>
|
||||
<span className="hint">Legalább {minLength} karakter.</span>
|
||||
</div>
|
||||
<div className="field">
|
||||
<label htmlFor="new-password-again">Új jelszó még egyszer</label>
|
||||
<input
|
||||
id="new-password-again"
|
||||
className="inp"
|
||||
type="password"
|
||||
required
|
||||
autoComplete="new-password"
|
||||
value={again}
|
||||
onChange={(e) => setAgain(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<button type="submit" className="btn btn-primary" disabled={busy}>
|
||||
{busy ? "Mentés…" : "Jelszó mentése és belépés"}
|
||||
</button>
|
||||
{error && (
|
||||
<p className="msg msg-error" role="alert" style={{ margin: 0 }}>
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
</form>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
import type { Metadata } from "next";
|
||||
import Link from "next/link";
|
||||
|
||||
import { Logo } from "@/components/SiteHeader";
|
||||
import { BACKEND_URL } from "@/lib/server";
|
||||
import type { PublicConfig } from "@/lib/types";
|
||||
|
||||
import { SetPasswordForm } from "./SetPasswordForm";
|
||||
|
||||
export const metadata: Metadata = { title: "Jelszó megadása", robots: { index: false } };
|
||||
|
||||
async function minLength(): Promise<number> {
|
||||
try {
|
||||
const res = await fetch(`${BACKEND_URL}/v1/config`, { cache: "no-store" });
|
||||
if (res.ok) return ((await res.json()) as PublicConfig).password_min_length;
|
||||
} catch {
|
||||
// backend down: the form still works, the backend checks the length
|
||||
}
|
||||
return 10;
|
||||
}
|
||||
|
||||
/** The page of the e-mailed password link (sign-up and forgotten password). */
|
||||
export default async function SetPasswordPage({
|
||||
searchParams,
|
||||
}: {
|
||||
searchParams: Promise<Record<string, string | string[]>>;
|
||||
}) {
|
||||
const params = await searchParams;
|
||||
const raw = Array.isArray(params.token) ? params.token[0] : params.token;
|
||||
const token = raw && /^[A-Za-z0-9_-]{8,200}$/.test(raw) ? raw : null;
|
||||
|
||||
return (
|
||||
<div className="auth">
|
||||
<main className="auth-main">
|
||||
<div className="auth-box">
|
||||
<Logo />
|
||||
<div className="page-head">
|
||||
<h1 style={{ fontSize: 40 }}>Jelszó megadása</h1>
|
||||
<p className="muted">Add meg a jelszavad, amellyel ezentúl belépsz.</p>
|
||||
</div>
|
||||
{token ? (
|
||||
<SetPasswordForm token={token} minLength={await minLength()} />
|
||||
) : (
|
||||
<p className="msg msg-error" role="alert">
|
||||
Hiányos a link. Nyisd meg a teljes linket a levélből, vagy kérj újat a{" "}
|
||||
<Link href="/belepes?mod=elfelejtett">belépésnél</Link>.
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
import type { Metadata } from "next";
|
||||
import Link from "next/link";
|
||||
import { notFound } from "next/navigation";
|
||||
|
||||
import { TarotLive } from "@/components/tarot/TarotLive";
|
||||
import { backendGet, requireMe } from "@/lib/server";
|
||||
import type { TarotReading } from "@/lib/tarot";
|
||||
|
||||
export const metadata: Metadata = { title: "Kártyajóslás" };
|
||||
|
||||
const day = (iso: string) =>
|
||||
new Date(iso).toLocaleDateString("hu-HU", { timeZone: "Europe/Budapest", year: "numeric", month: "long", day: "numeric" });
|
||||
|
||||
/** One of the user's readings. */
|
||||
export default async function TarotReadingPage({ params }: { params: Promise<{ id: string }> }) {
|
||||
const { id } = await params;
|
||||
const me = await requireMe(`/kartyajoslas/${id}`);
|
||||
const reading = await backendGet<TarotReading>(`/v1/tarot/readings/${encodeURIComponent(id)}`);
|
||||
if (!reading) notFound();
|
||||
return (
|
||||
<main className="page" style={{ maxWidth: 1040 }}>
|
||||
<div className="page-head">
|
||||
<Link href="/kartyajoslas" className="hint">
|
||||
← Kártyajóslás
|
||||
</Link>
|
||||
<span className="eyebrow">
|
||||
{reading.topic_name ? `${reading.topic_name} · ` : ""}
|
||||
{reading.spread_name} · {day(reading.created_at)}
|
||||
</span>
|
||||
</div>
|
||||
<section className="card">
|
||||
<TarotLive key={reading.id} initial={reading} isAdmin={me.user.roles.includes("admin")} />
|
||||
</section>
|
||||
</main>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
import type { Metadata } from "next";
|
||||
import Link from "next/link";
|
||||
|
||||
import { TarotTable } from "@/components/tarot/TarotTable";
|
||||
import { payMethod } from "@/lib/payments";
|
||||
import { backendGet, requireMe } from "@/lib/server";
|
||||
import type { TarotReading } from "@/lib/tarot";
|
||||
import type { PublicConfig } from "@/lib/types";
|
||||
|
||||
export const metadata: Metadata = { title: "Kártyajóslás" };
|
||||
|
||||
/** Tarot readings written for the user's own question. */
|
||||
export default async function TarotPage() {
|
||||
const me = await requireMe("/kartyajoslas");
|
||||
const [data, config] = await Promise.all([
|
||||
backendGet<{ readings: TarotReading[]; left: number }>("/v1/tarot/readings"),
|
||||
backendGet<PublicConfig>("/v1/config"),
|
||||
]);
|
||||
return (
|
||||
<main className="page" style={{ maxWidth: 1040 }}>
|
||||
<div className="page-head">
|
||||
<span className="eyebrow">Tarot</span>
|
||||
<h1>Kártyajóslás</h1>
|
||||
<p className="muted">
|
||||
Kérdezz, húzz lapot, és a kirakásod alapján személyre szabott jóslást kapsz. A lapok értelmezéséhez a képleted
|
||||
Napja, Holdja és Aszcendense is hozzájárul. <Link href="/kartyajoslas/pelda">Példajóslás →</Link>
|
||||
</p>
|
||||
</div>
|
||||
<TarotTable
|
||||
readings={data?.readings ?? []}
|
||||
left={data?.left ?? me.analyses_left.tarot ?? 0}
|
||||
isAdmin={me.user.roles.includes("admin")}
|
||||
canPay={payMethod(config, me)}
|
||||
/>
|
||||
</main>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
import type { Metadata } from "next";
|
||||
import Link from "next/link";
|
||||
|
||||
import { PublicHeader } from "@/components/SiteHeader";
|
||||
import { TarotDemo, type TarotExample } from "@/components/tarot/TarotDemo";
|
||||
import data from "@/content/tarot-pelda.json";
|
||||
import { getMe } from "@/lib/server";
|
||||
|
||||
export const metadata: Metadata = {
|
||||
title: "Példajóslás",
|
||||
description:
|
||||
"Így néz ki egy Sorsfonalak-kártyajóslás: lapválasztás a pakliból, kirakás és személyre szabott értelmezés, munkáról és párkapcsolatról.",
|
||||
};
|
||||
|
||||
/** A full example tarot reading for a made-up question, for visitors and users without readings. */
|
||||
export default async function TarotExamplePage() {
|
||||
const me = await getMe();
|
||||
return (
|
||||
<>
|
||||
{!me && <PublicHeader />}
|
||||
<main className="page" style={{ maxWidth: 1040 }}>
|
||||
<div className="page-head">
|
||||
<span className="eyebrow">Példajóslás</span>
|
||||
<h1>Így néz ki egy kártyajóslás</h1>
|
||||
<p className="muted">
|
||||
Két kitalált kérdés, két kirakás: nézd meg, hogyan választ a pakliból, hogyan fordulnak fel a lapok, és mit
|
||||
mondanak együtt. A saját jóslásod a te kérdésedre, a te lapjaidra és a képletedre készül.
|
||||
</p>
|
||||
</div>
|
||||
<TarotDemo examples={data.examples as TarotExample[]} />
|
||||
<section className="card" style={{ gap: 12 }}>
|
||||
<p>
|
||||
{me
|
||||
? "Kérdezz te is: húzz lapot a saját kérdésedre."
|
||||
: "Lépj be, és a csomagodban lévő jóslásokkal a saját kérdéseidre húzhatsz lapot."}
|
||||
</p>
|
||||
<div className="form-actions">
|
||||
<Link href={me ? "/kartyajoslas" : "/belepes?vissza=/kartyajoslas"} className="btn btn-primary">
|
||||
{me ? "Saját jóslás" : "Belépés"}
|
||||
</Link>
|
||||
<Link href="/csomagok" className="btn btn-ghost">
|
||||
Csomagok
|
||||
</Link>
|
||||
</div>
|
||||
</section>
|
||||
</main>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -6,6 +6,7 @@ import { ChartWheel } from "@/components/ChartWheel";
|
||||
import { DetailedAnalysis } from "@/components/DetailedAnalysis";
|
||||
import { ForecastKeys, ForecastTimeline, ForecastTransits, longDay } from "@/components/ForecastViews";
|
||||
import { Tabs } from "@/components/Tabs";
|
||||
import { payMethod } from "@/lib/payments";
|
||||
import { backendGet, requireMe } from "@/lib/server";
|
||||
import type { Analysis, Chart, ForecastDetail, ForecastList, PublicConfig } from "@/lib/types";
|
||||
|
||||
@@ -134,7 +135,7 @@ export default async function ForecastPage({
|
||||
initial={detailed}
|
||||
left={me.analyses_left.forecast}
|
||||
isAdmin={me.user.roles.includes("admin")}
|
||||
canPay={config?.mock_payments ?? false}
|
||||
canPay={payMethod(config, me)}
|
||||
questionsLeft={me.analyses_left.question ?? 0}
|
||||
/>
|
||||
),
|
||||
|
||||
@@ -10,6 +10,7 @@ import { ChartWheel, WheelLegend } from "@/components/ChartWheel";
|
||||
import { CompareButton } from "@/components/CompareButton";
|
||||
import { Tabs } from "@/components/Tabs";
|
||||
import { ASPECTS, ELEMENTS, MODALITIES, MOON_PHASES, countryName, formatBirthDate, pointName } from "@/lib/astro";
|
||||
import { payMethod } from "@/lib/payments";
|
||||
import { backendGet, requireMe } from "@/lib/server";
|
||||
import type { Analysis, Chart, ChartListItem, PublicConfig } from "@/lib/types";
|
||||
|
||||
@@ -82,87 +83,90 @@ export default async function ChartPage({ params }: { params: Promise<{ id: stri
|
||||
referralsLeft={me.referral_rewards.limit - me.referral_rewards.earned}
|
||||
/>
|
||||
<BigThree chart={chart} />
|
||||
{(elements || modalities || phase) && (
|
||||
<div className="card" style={{ gap: 12 }}>
|
||||
<dl className="facts">
|
||||
{elements && (
|
||||
<>
|
||||
<dt>Elemek</dt>
|
||||
<dd>
|
||||
{Object.entries(elements)
|
||||
.map(([k, v]) => `${ELEMENTS[k] ?? k} ${v.count}`)
|
||||
.join(" · ")}
|
||||
</dd>
|
||||
</>
|
||||
)}
|
||||
{modalities && (
|
||||
<>
|
||||
<dt>Minőségek</dt>
|
||||
<dd>
|
||||
{Object.entries(modalities)
|
||||
.map(([k, v]) => `${MODALITIES[k] ?? k} ${v.count}`)
|
||||
.join(" · ")}
|
||||
</dd>
|
||||
</>
|
||||
)}
|
||||
{phase && (
|
||||
<>
|
||||
<dt>Holdfázis</dt>
|
||||
<dd>
|
||||
{MOON_PHASES[phase.phase] ?? phase.phase}, {Math.round(phase.illumination * 100)}%
|
||||
</dd>
|
||||
</>
|
||||
)}
|
||||
</dl>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section className="chart-extras" aria-label="A képlet összegzése és továbblépés">
|
||||
{(elements || modalities || phase) && (
|
||||
<div className="card" style={{ gap: 12 }}>
|
||||
<dl className="facts">
|
||||
{elements && (
|
||||
<p className="hint">
|
||||
Az elemek és minőségek a tíz bolygóból számolva:{" "}
|
||||
{Object.entries(elements)
|
||||
.filter(([, v]) => v.count > 0)
|
||||
.map(([k, v]) => `${ELEMENTS[k] ?? k}: ${v.points.map(pointName).join(", ")}`)
|
||||
.join("; ")}
|
||||
.
|
||||
</p>
|
||||
<>
|
||||
<dt>Elemek</dt>
|
||||
<dd>
|
||||
{Object.entries(elements)
|
||||
.map(([k, v]) => `${ELEMENTS[k] ?? k} ${v.count}`)
|
||||
.join(" · ")}
|
||||
</dd>
|
||||
</>
|
||||
)}
|
||||
{modalities && (
|
||||
<>
|
||||
<dt>Minőségek</dt>
|
||||
<dd>
|
||||
{Object.entries(modalities)
|
||||
.map(([k, v]) => `${MODALITIES[k] ?? k} ${v.count}`)
|
||||
.join(" · ")}
|
||||
</dd>
|
||||
</>
|
||||
)}
|
||||
{phase && (
|
||||
<>
|
||||
<dt>Holdfázis</dt>
|
||||
<dd>
|
||||
{MOON_PHASES[phase.phase] ?? phase.phase}, {Math.round(phase.illumination * 100)}%
|
||||
</dd>
|
||||
</>
|
||||
)}
|
||||
</dl>
|
||||
{elements && (
|
||||
<p className="hint">
|
||||
Az elemek és minőségek a tíz bolygóból számolva:{" "}
|
||||
{Object.entries(elements)
|
||||
.filter(([, v]) => v.count > 0)
|
||||
.map(([k, v]) => `${ELEMENTS[k] ?? k}: ${v.points.map(pointName).join(", ")}`)
|
||||
.join("; ")}
|
||||
.
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
<Link href={`/kepletek/${chart.id}/elorejelzes`} className="card persons-tile">
|
||||
<span className="eyebrow">Éves előrejelzés</span>
|
||||
<strong>{chart.is_primary ? "Mit hoz az éved?" : `Mit hoz ${chart.label} éve?`}</strong>
|
||||
<span className="muted">
|
||||
Szolár képlet, tranzitok pontos dátumokkal, progresszió: egy év születésnaptól születésnapig.
|
||||
</span>
|
||||
<span className="persons-tile-arrow" aria-hidden="true">
|
||||
→
|
||||
</span>
|
||||
</Link>
|
||||
{!chart.is_primary && own && (
|
||||
<div className="card compare-tile">
|
||||
<span className="eyebrow">Összevetés</span>
|
||||
<strong>Te és {chart.label}</strong>
|
||||
<span className="muted">Két képlet egy körön: mi vonz, hol súrlódtok, és mit ad a kapcsolat.</span>
|
||||
<div className="form-actions">
|
||||
<CompareButton chart1={own.id} chart2={chart.id} label="Összevetés velem" className="btn" />
|
||||
</div>
|
||||
)}
|
||||
<Link href={`/kepletek/${chart.id}/elorejelzes`} className="card persons-tile">
|
||||
<span className="eyebrow">Éves előrejelzés</span>
|
||||
<strong>{chart.is_primary ? "Mit hoz az éved?" : `Mit hoz ${chart.label} éve?`}</strong>
|
||||
</div>
|
||||
)}
|
||||
{chart.is_primary && (
|
||||
<Link href="/szemelyek" className="card persons-tile">
|
||||
<span className="eyebrow">Személyek</span>
|
||||
<strong>
|
||||
{persons.length > 0 ? `${persons.length} felvett személy` : "Társad, családod képlete"}
|
||||
</strong>
|
||||
<span className="muted">
|
||||
Szolár képlet, tranzitok pontos dátumokkal, progresszió: egy év születésnaptól születésnapig.
|
||||
{persons.length > 0
|
||||
? persons.slice(0, 3).map((p) => p.label).join(", ") + (persons.length > 3 ? "…" : "")
|
||||
: "Vedd fel őket, és nézd meg az ő képletüket és elemzésüket is."}
|
||||
</span>
|
||||
<span className="persons-tile-arrow" aria-hidden="true">
|
||||
→
|
||||
</span>
|
||||
</Link>
|
||||
{!chart.is_primary && own && (
|
||||
<div className="card compare-tile">
|
||||
<span className="eyebrow">Összevetés</span>
|
||||
<strong>Te és {chart.label}</strong>
|
||||
<span className="muted">Két képlet egy körön: mi vonz, hol súrlódtok, és mit ad a kapcsolat.</span>
|
||||
<div className="form-actions">
|
||||
<CompareButton chart1={own.id} chart2={chart.id} label="Összevetés velem" className="btn" />
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
{chart.is_primary && (
|
||||
<Link href="/szemelyek" className="card persons-tile">
|
||||
<span className="eyebrow">Személyek</span>
|
||||
<strong>
|
||||
{persons.length > 0 ? `${persons.length} felvett személy` : "Társad, családod képlete"}
|
||||
</strong>
|
||||
<span className="muted">
|
||||
{persons.length > 0
|
||||
? persons.slice(0, 3).map((p) => p.label).join(", ") + (persons.length > 3 ? "…" : "")
|
||||
: "Vedd fel őket, és nézd meg az ő képletüket és elemzésüket is."}
|
||||
</span>
|
||||
<span className="persons-tile-arrow" aria-hidden="true">
|
||||
→
|
||||
</span>
|
||||
</Link>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</section>
|
||||
|
||||
<section className="card chart-tabs" aria-label="Elemzés és táblázatok">
|
||||
@@ -178,7 +182,7 @@ export default async function ChartPage({ params }: { params: Promise<{ id: stri
|
||||
initial={detailed}
|
||||
left={me.analyses_left.natal}
|
||||
isAdmin={me.user.roles.includes("admin")}
|
||||
canPay={config?.mock_payments ?? false}
|
||||
canPay={payMethod(config, me)}
|
||||
questionsLeft={me.analyses_left.question ?? 0}
|
||||
/>
|
||||
),
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user