Author SHA1 Message Date
sagifer 85977cb7af Merge pull request 'Header shows the user's package and what is left of it' (#9) from main into prod
CI / test (push) Successful in 50s
CI / build (push) Successful in 13s
CI / deploy (push) Successful in 38s
Reviewed-on: #9
2026-11-17 21:05:49 +01:00
fecoandClaude Opus 5.5 742b88183b Header shows the user's package and what is left of it
CI / test (push) Successful in 51s
CI / build (push) Successful in 4m0s
CI / deploy (push) Skipped
- /v1/me: `package` = the running unlimited package, or the latest main
  package bought or given (top-ups do not count; an ended unlimited not)
- header badge: "Család · 11 elemzés", "Korlátlan · 2027. november 17-ig",
  "Páros · elfogyott"; links to the packages page, details in the tooltip

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 19:24:52 +00:00
sagifer 2032837aad Merge pull request 'Main' (#7) from main into prod
CI / test (push) Successful in 57s
CI / build (push) Successful in 1m20s
CI / deploy (push) Successful in 42s
Reviewed-on: #7
2026-11-17 19:58:35 +01:00
fecoandClaude Opus 5.5 21640ffd9e Amazon SES as the mail sender
CI / test (push) Successful in 53s
CI / build (push) Successful in 4m32s
CI / deploy (push) Skipped
- worker: without SMTP_URL, the SES SMTP address is built from the AWS
  access key and secret in .env.secrets (several common names, any case);
  the SMTP password is derived from the secret as AWS documents; region
  eu-central-1, port 2587 (DigitalOcean blocks 25/465/587)
- deploy compose: no empty SMTP_URL in the worker's environment (it
  overrode .env.secrets); MAIL_FROM defaults to hello@sorsfonalak.hu
- docs/levelkuldes.md rewritten for SES (domain, DKIM, custom MAIL FROM,
  sandbox, firewall); privacy policy names AWS as the mail processor

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 18:43:39 +00:00
fecoandClaude Opus 5.5 7f761a0f0e docs: allow outbound TCP 2525 in the droplet firewall for mail
CI / test (push) Successful in 52s
CI / build (push) Successful in 11s
CI / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 18:37:32 +00:00
fecoandClaude Opus 5.5 30b26340a0 Remove the basic auth gate: the site opens, sign-up needs an invitation
CI / test (push) Successful in 52s
CI / build (push) Successful in 5m39s
CI / deploy (push) Skipped
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 18:37:15 +00:00
fecoandClaude Opus 5.5 7272d0f1f3 Invitation-only sign-up, invitation e-mails and waitlist
- SIGNUP_MODE=invite (default): a new account needs an open invitation for
  its address, or the invitation link (then any Google account will do)
- admin page "Meghívók": invite many addresses at once, personal message,
  resend (max 3, 24 h apart), revoke, copy link, mail preview and test copy,
  waitlist
- invitation e-mail in HTML and plain text; Message-ID on the sender's
  domain, List-Unsubscribe with one-click POST, opt-out list (hashes only)
- e-mail texts moved to a shared crate (crates/email-templates)
- login page shows the invitation; waitlist for uninvited visitors;
  unsubscribe page; privacy policy updated
- docs/levelkuldes.md: Brevo, DNS (SPF, DKIM, DMARC) and the SMTP setup

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 18:37:15 +00:00
fecoandClaude Opus 5.5 b53cadcd8c Renaming a person keeps the chart and its analyses
CI / test (push) Successful in 47s
CI / build (push) Successful in 3m55s
CI / deploy (push) Skipped
The person edit form sent the birth data with every save, so a new name alone
recalculated the chart, deleted its analyses and comparisons and queued a new
summary. Now the backend ignores birth data equal to the stored one (and keeps
everything when a recalculation gives the same chart), and the form sends it
only when it changed. The name can be changed after the correction window too
("Átnevezés" on the person card).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 16:59:18 +00:00
sagifer a097cf4311 Merge pull request 'Main' (#6) from main into prod
CI / test (push) Successful in 45s
CI / build (push) Successful in 13s
CI / deploy (push) Successful in 41s
Reviewed-on: #6
2026-11-17 17:45:40 +01:00
fecoandClaude Opus 5.5 e004ea696b Packages: from one analysis to unlimited, admin can give them
CI / test (push) Successful in 47s
CI / build (push) Successful in 4m19s
CI / deploy (push) Skipped
A fixed catalog (packages.rs, reasoning in docs/csomagok.md): Egy elemzés
2 990 Ft, Páros 6 990 Ft, Család 11 990 Ft (featured), Korlátlan 17 990 Ft
for a year, and two top-ups. Every grant is a package_orders row; units are
credit_ledger rows with reason 'package' and never expire. The unlimited
package is a time-limited 'unlimited' entitlement: analyses use no unit and
persons have no limit, with a daily fair-use cap (UNLIMITED_DAILY_LIMIT, 5);
buying it again extends it by a year.

- GET /v1/packages, mock payment by package id, /v1/me unlimited_until
- POST /v1/admin/users/{id}/packages: give a package as a gift
- /csomagok page; the paid step of an analysis offers three packages with
  the bigger one featured; person packs use the catalog; admin user list
  has a package column
- PERSON_PACK_SIZE is replaced by the catalog's +5 személy top-up

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 16:19:20 +00:00
fecoandClaude Opus 5.5 0bd5c39080 Comparisons (synastry) of the own chart and persons
CI / test (push) Successful in 45s
CI / build (push) Successful in 4m19s
CI / deploy (push) Skipped
/osszevetesek compares any two of the user's charts (own and persons); the
person card and the person's chart page have "Összevetés velem". The
comparison page shows a double wheel (first person inside with houses, second
outside, aspects between them), the aspects by character, and tabs: paid
relationship analysis (synastry unit), the cross aspect grid, house overlays,
composite and the full aspect list.

Correcting a person within the hour now deletes the user's own comparisons
with them instead of being refused; still refused after a paid analysis or
when someone else's comparison uses the chart.

The relationship analysis prompt is editable on /admin/promptok too, and can be
tried on one of the admin's comparisons.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 16:04:44 +00:00
fecoandClaude Opus 5.5 b77dafdb26 Try draft prompts on own charts before saving
CI / test (push) Successful in 46s
CI / build (push) Successful in 4m16s
CI / deploy (push) Skipped
Under each prompt on /admin/promptok, "Kipróbálás" writes the summary or
detailed analysis with the text in the editor (saved or not) on one of the
admin's own charts. Test runs live in prompt_previews: never shown with the
chart, not cached, no credits, one attempt, at most three open per admin,
removed after 30 days. The worker writes them when no analysis is due. The
result shows the model, tokens, cost and time, and the draft can be loaded back.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 14:41:12 +00:00
fecoandClaude Opus 5.5 86d5dc5503 Editable analysis prompts on the admin page
CI / test (push) Successful in 44s
CI / build (push) Successful in 4m13s
CI / deploy (push) Skipped
The system prompts of the free summary and the paid detailed analysis can be
edited per language under /admin/promptok. Every save is a new row in
prompt_revisions (NULL = built-in text); new analyses record the revision in
prompt_version (v2-r<id>) and the worker uses exactly that text. Existing
analyses stay; the cross-user cache only copies results of the same revision.

The prompt code moves to the shared analysis-prompt crate so the backend can
show the built-in text.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012vLHzh5qUhFtmJhzkcTbXL
2026-11-17 14:25:08 +00:00
89 changed files with 7004 additions and 850 deletions
+1 -1
View File
@@ -59,7 +59,7 @@ jobs:
# astro-engine and horoscope-api need the Swiss Ephemeris sources and
# data (scripts/fetch-deps.sh); their tests run locally.
- name: Test
run: cargo test --locked -p backend -p worker -p db -p horoscope-client -p service-kit
run: cargo test --locked -p backend -p worker -p db -p horoscope-client -p service-kit -p analysis-prompt -p email-templates
build:
needs: test
Generated
+21
View File
@@ -17,6 +17,13 @@ version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
[[package]]
name = "analysis-prompt"
version = "0.1.0"
dependencies = [
"serde_json",
]
[[package]]
name = "anyhow"
version = "1.0.104"
@@ -156,11 +163,13 @@ dependencies = [
name = "backend"
version = "0.1.0"
dependencies = [
"analysis-prompt",
"anyhow",
"argon2",
"axum",
"axum-extra",
"db",
"email-templates",
"horoscope-client",
"http-body-util",
"jsonwebtoken",
@@ -438,6 +447,13 @@ dependencies = [
"memchr",
]
[[package]]
name = "email-templates"
version = "0.1.0"
dependencies = [
"serde_json",
]
[[package]]
name = "email_address"
version = "0.2.9"
@@ -2856,15 +2872,20 @@ checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
name = "worker"
version = "0.1.0"
dependencies = [
"analysis-prompt",
"anyhow",
"axum",
"base64 0.22.1",
"db",
"email-templates",
"hmac",
"lettre",
"rand 0.9.5",
"reqwest",
"serde",
"serde_json",
"service-kit",
"sha2",
"sqlx",
"time",
"tokio",
+5
View File
@@ -7,6 +7,8 @@ members = [
"crates/service-kit",
"crates/db",
"crates/horoscope-client",
"crates/analysis-prompt",
"crates/email-templates",
"services/horoscope-api",
"services/backend",
"services/worker",
@@ -25,12 +27,15 @@ geo-tz = { path = "crates/geo-tz" }
service-kit = { path = "crates/service-kit" }
db = { path = "crates/db" }
horoscope-client = { path = "crates/horoscope-client" }
analysis-prompt = { path = "crates/analysis-prompt" }
email-templates = { path = "crates/email-templates" }
anyhow = "1"
argon2 = { version = "0.5", features = ["std"] }
axum = "0.8"
axum-extra = { version = "0.10", features = ["cookie"] }
base64 = "0.22"
hmac = "0.12"
jsonwebtoken = { version = "9", default-features = false }
lettre = { version = "0.11", default-features = false, features = ["builder", "hostname", "smtp-transport", "tokio1", "tokio1-rustls", "webpki-roots", "ring"] }
rand = "0.9"
+10
View File
@@ -0,0 +1,10 @@
[package]
name = "analysis-prompt"
description = "Prompts and answer schemas of the Sorsfonalak LLM analyses (shared by backend and worker)"
edition.workspace = true
version.workspace = true
license.workspace = true
publish.workspace = true
[dependencies]
serde_json.workspace = true
+383
View File
@@ -0,0 +1,383 @@
//! Prompts and output schemas of the analyses (prompt version [`PROMPT_VERSION`]).
//!
//! The model answers with one JSON object (OpenRouter structured output);
//! [`validate`] checks it against the same schema before it is stored.
//!
//! The system prompt ([`default_system`]) can be replaced by an admin-edited
//! text; the user message (chart data, section list) and the schema stay fixed.
use serde_json::{Value, json};
/// Matches the backend's `ANALYSIS_PROMPT_VERSION` (part of the cache key).
pub const PROMPT_VERSION: &str = "v2";
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Kind {
Natal,
Synastry,
/// A free teaser of a natal chart: a title and a few sentences.
Summary,
}
impl Kind {
pub const ALL: [Kind; 3] = [Kind::Summary, Kind::Natal, Kind::Synastry];
pub fn as_str(self) -> &'static str {
match self {
Kind::Natal => "natal",
Kind::Synastry => "synastry",
Kind::Summary => "summary",
}
}
pub fn parse(s: &str) -> Option<Kind> {
match s {
"natal" => Some(Kind::Natal),
"synastry" => Some(Kind::Synastry),
"summary" => Some(Kind::Summary),
_ => None,
}
}
}
pub struct Prompt {
pub system: String,
pub user: String,
pub schema_name: &'static str,
pub schema: Value,
}
/// (key, what the section covers) in reading order.
const NATAL_SECTIONS: [(&str, &str); 6] = [
("personality", "Core identity: the Sun, Moon, Ascendant and chart ruler read together"),
("emotions", "Emotional needs, security and inner life (Moon, 4th house, water emphasis)"),
("mind", "Thinking, communication and learning (Mercury, 3rd and 9th houses)"),
("love", "Love, attraction and relationships (Venus, Mars, 5th and 7th houses, Descendant)"),
("work", "Calling, career, money and daily work (MC, 10th, 2nd and 6th houses, Saturn, Jupiter)"),
(
"growth",
"Main inner tensions, life lessons and the path of growth (tight squares and oppositions, Saturn, Chiron, Nodes)",
),
];
const SYNASTRY_SECTIONS: [(&str, &str); 5] = [
("attraction", "What draws them together: Sun, Moon, Venus, Mars and Ascendant contacts"),
("communication", "How they think and talk together (Mercury contacts, air emphasis, 3rd house overlays)"),
("emotional_bond", "Emotional closeness, safety and care (Moon contacts, 4th and 8th house overlays)"),
("friction", "Where they rub against each other and how to handle it (challenging aspects, Saturn, Pluto, Mars)"),
("long_term", "Long-term potential and shared purpose, including the composite chart"),
];
fn sections(kind: Kind) -> &'static [(&'static str, &'static str)] {
match kind {
Kind::Natal => &NATAL_SECTIONS,
Kind::Synastry => &SYNASTRY_SECTIONS,
Kind::Summary => &[],
}
}
/// The JSON schema of the answer (strict mode: every property required).
pub fn schema(kind: Kind) -> Value {
if kind == Kind::Summary {
return json!({
"type": "object",
"additionalProperties": false,
"required": ["title", "summary"],
"properties": {
"title": {"type": "string", "description": "Short, evocative title for this chart (at most 6 words)"},
"summary": {"type": "string", "description": "3-4 sentences, 60-100 words, one paragraph"}
}
});
}
let mut props = serde_json::Map::new();
for (key, about) in sections(kind) {
props.insert(
(*key).into(),
json!({
"type": "object",
"description": about,
"additionalProperties": false,
"required": ["title", "body"],
"properties": {
"title": {"type": "string", "description": "Short, specific section title (not just the topic name)"},
"body": {"type": "string", "description": "2-4 paragraphs separated by a blank line"}
}
}),
);
}
let keys: Vec<&str> = sections(kind).iter().map(|(k, _)| *k).collect();
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)"},
"summary": {"type": "string", "description": "3-4 sentence overview"},
"sections": {"type": "object", "additionalProperties": false, "required": keys, "properties": props},
"strengths": {"type": "array", "items": {"type": "string"}, "description": "3-5 key strengths, one sentence each"},
"challenges": {"type": "array", "items": {"type": "string"}, "description": "3-5 key challenges, one sentence each"},
"advice": {"type": "string", "description": "A closing, encouraging paragraph with concrete guidance"}
}
})
}
const HUNGARIAN_STYLE: &str = "\
Write natural, idiomatic Hungarian, as a native Hungarian author would; it must not read like a translation from English. \
Use correct Hungarian suffixes and vowel harmony, Hungarian quotation marks („…”) and the en dash (–). \
Use the usual Hungarian astrological terms:
- signs: Kos, Bika, Ikrek, Rák, Oroszlán, Szűz, Mérleg, Skorpió, Nyilas, Bak, Vízöntő, Halak (\"a Nap a Rák jegyében\", \"Kos Aszcendens\");
- planets and points: Nap, Hold, Merkúr, Vénusz, Mars, Jupiter, Szaturnusz, Uránusz, Neptunusz, Plútó, Chiron (Kiron), \
Észak-Holdcsomópont, Dél-Holdcsomópont, Lilith (Fekete Hold), Aszcendens, Descendens, Medium Coeli (MC), Imum Coeli (IC), Szerencsepont;
- aspects: együttállás (konjunkció), szextil, kvadrát (négyzet), trigon, szembenállás (oppozíció);
- elements and modalities: tűz, föld, levegő, víz (\"tűz elem\", \"a föld hiánya\"); kardinális, fix, változó;
Never leave English words (e.g. fire, earth, air, water) in the Hungarian text.
- other: \"a 3. házban\", \"a horoszkóp uralkodója\", retrográd, uralom (domicilium), száműzetés, exaltáció, esés, nappali/éjszakai horoszkóp.";
fn language_name(language: &str) -> &'static str {
match language {
"hu" => "Hungarian",
_ => "English",
}
}
/// The built-in system prompt of an analysis kind in a language.
pub fn default_system(kind: Kind, language: &str) -> String {
let (role, reader) = match kind {
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\").",
),
Kind::Summary => (
"a short free summary of a natal chart (a teaser shown before the detailed, paid analysis)",
"Speak to the owner of the chart directly, in the informal second person singular (in Hungarian: tegező forma, \"te\").",
),
Kind::Synastry => (
"a relationship (synastry) interpretation for two people",
"Write for both people at once, in the informal second person plural (in Hungarian: \"ti\", \"kettőtök\"). \
When you must tell them apart, call them Person 1 and Person 2 (in Hungarian: \"az első fél\" and \"a második fél\"). \
Do not assume their genders or the type of relationship.",
),
};
let mut text = format!(
"You are an experienced, warm and psychologically minded astrologer. You write {role} for the Sorsfonalak app.
Write in {lang}.
Rules:
- Base every statement on the chart data given. Never invent positions, aspects or houses that are not listed.
- When you interpret a placement, name its astrological basis in a short clause, but keep the focus on the person, not on jargon.
- Synthesize: weave signs, houses, aspects and rulers into one coherent portrait; show how tensions can be integrated. \
Give the most weight to the Sun, Moon, Ascendant, chart ruler, tight aspects (orb under 3°) and strong emphases or gaps in elements and modalities.
- If a birth time is unknown, do not mention houses, the Ascendant or the Midheaven for that chart, and be careful with the Moon's sign.
- {reader}
- Tone: warm, honest, empowering and concrete. Not fatalistic: no predictions of illness, death, accidents or specific events, \
and no medical, legal or financial advice.
- Avoid generic horoscope clichés and filler: every paragraph must say something specific to this chart.
- Texts are plain paragraphs separated by a blank line, without headings or lists inside; **bold** may be used sparingly.
- {length}
- Answer with a single JSON object that matches the given schema, and nothing else.",
lang = language_name(language),
length = match kind {
Kind::Summary => "Length: one paragraph of 3-4 sentences (60-100 words). Pick the Sun, Moon and Ascendant \
(if the birth time is known) and the single most striking feature of the chart (a very tight aspect, \
a stellium, a strong element emphasis or gap). It must be complete in itself and specific to this chart: \
no sales talk, and do not mention a longer analysis.",
_ => "Length: each section 2-4 paragraphs (about 150-250 words); the whole analysis about 1300-1800 words.",
},
);
if language == "hu" {
text.push_str("\n\n");
text.push_str(HUNGARIAN_STYLE);
}
text
}
/// Splits a stored prompt version (`v2` or `v2-r<id>`, the id of an admin-edited
/// system prompt in `prompt_revisions`) into the code version and the revision id.
pub fn split_version(version: &str) -> (&str, Option<i64>) {
match version.rsplit_once("-r") {
Some((base, id)) => match id.parse() {
Ok(id) => (base, Some(id)),
Err(_) => (version, None),
},
None => (version, None),
}
}
/// The built-in text of the user message around the chart data, for showing
/// next to the editable system prompt (`{chart data}` stands for the data).
pub fn user_template(kind: Kind) -> String {
build(kind, "hu", "{chart data}\n", None).user
}
/// The prompt for one analysis; `system` replaces [`default_system`].
pub fn build(kind: Kind, language: &str, chart_text: &str, system: Option<&str>) -> Prompt {
let mut user = String::from("Chart data:\n\n");
user.push_str(chart_text);
if kind == Kind::Summary {
user.push_str("\nWrite the short summary now.");
} else {
user.push_str("\nSections to write, in this order:\n");
for (key, about) in sections(kind) {
user.push_str(&format!("- {key}: {about}\n"));
}
user.push_str("\nWrite the analysis now.");
}
Prompt {
system: system.map_or_else(|| default_system(kind, language), str::to_owned),
user,
schema_name: match kind {
Kind::Natal => "natal_analysis",
Kind::Synastry => "synastry_analysis",
Kind::Summary => "chart_summary",
},
schema: schema(kind),
}
}
/// 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.
pub fn validate(schema: &Value, value: &Value) -> Result<(), String> {
fn walk(schema: &Value, value: &Value, path: &str) -> Result<(), String> {
match schema["type"].as_str() {
Some("object") => {
let obj = value.as_object().ok_or_else(|| format!("{path}: expected an object"))?;
for key in schema["required"].as_array().into_iter().flatten().filter_map(Value::as_str) {
let child = obj.get(key).ok_or_else(|| format!("{path}.{key}: missing"))?;
walk(&schema["properties"][key], child, &format!("{path}.{key}"))?;
}
Ok(())
}
Some("array") => {
let items = value.as_array().ok_or_else(|| format!("{path}: expected an array"))?;
if items.len() < 2 {
return Err(format!("{path}: too few items"));
}
items.iter().enumerate().try_for_each(|(i, v)| walk(&schema["items"], v, &format!("{path}[{i}]")))
}
Some("string") => match value.as_str() {
Some(s) if s.chars().filter(|c| c.is_alphabetic()).nth(2).is_some() => Ok(()),
_ => Err(format!("{path}: expected a non-empty string")),
},
_ => Ok(()),
}
}
walk(schema, value, "$")
}
/// Fixes typography the models often get wrong. In Hungarian, pairs of
/// straight double quotes become „…” (only when they pair up evenly).
pub fn polish(language: &str, content: &mut Value) {
fn hungarian_quotes(text: &str) -> Option<String> {
if !text.contains('"') || !text.matches('"').count().is_multiple_of(2) {
return None;
}
let mut open = true;
Some(
text.chars()
.map(|c| match c {
'"' => {
let q = if open { '„' } else { '”' };
open = !open;
q
}
c => c,
})
.collect(),
)
}
match content {
Value::String(s) if language == "hu" => {
if let Some(fixed) = hungarian_quotes(s) {
*s = fixed;
}
}
Value::Array(items) => items.iter_mut().for_each(|v| polish(language, v)),
Value::Object(map) => map.values_mut().for_each(|v| polish(language, v)),
_ => {}
}
}
/// The analysis as Markdown (for reading and comparing outputs).
pub fn to_markdown(kind: Kind, language: &str, content: &Value) -> String {
let (strengths, challenges, advice) = if language == "hu" {
("Erősségek", "Kihívások", "Útravaló")
} else {
("Strengths", "Challenges", "Advice")
};
let mut md =
format!("# {}\n\n_{}_\n\n", content["title"].as_str().unwrap_or(""), content["summary"].as_str().unwrap_or(""));
if kind == Kind::Summary {
return md;
}
for (key, _) in sections(kind) {
let s = &content["sections"][*key];
md.push_str(&format!("## {}\n\n{}\n\n", s["title"].as_str().unwrap_or(key), s["body"].as_str().unwrap_or("")));
}
for (title, key) in [(strengths, "strengths"), (challenges, "challenges")] {
md.push_str(&format!("## {title}\n\n"));
for item in content[key].as_array().into_iter().flatten().filter_map(Value::as_str) {
md.push_str(&format!("- {item}\n"));
}
md.push('\n');
}
md.push_str(&format!("## {advice}\n\n{}\n", content["advice"].as_str().unwrap_or("")));
md
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn summary_prompt_is_short() {
let p = build(Kind::Summary, "hu", "SUN: Cancer", None);
assert_eq!(p.schema_name, "chart_summary");
assert!(p.system.contains("3-4 sentences") && p.system.contains("tegező"));
assert!(!p.user.contains("Sections to write"));
assert_eq!(validate(&p.schema, &json!({"title": "Érzékeny mag", "summary": "Rövid szöveg."})), Ok(()));
assert!(validate(&p.schema, &json!({"title": "Érzékeny mag"})).is_err());
let md = to_markdown(Kind::Summary, "hu", &json!({"title": "Cím", "summary": "Szöveg."}));
assert_eq!(md, "# Cím\n\n_Szöveg._\n\n");
}
#[test]
fn custom_system_replaces_only_the_rules() {
let p = build(Kind::Natal, "hu", "SUN: Cancer", Some("Saját szabályok."));
assert_eq!(p.system, "Saját szabályok.");
assert!(p.user.contains("SUN: Cancer") && p.user.contains("- personality:"));
assert_eq!(p.schema, schema(Kind::Natal));
assert!(user_template(Kind::Natal).contains("{chart data}"));
assert_eq!(split_version("v2-r12"), ("v2", Some(12)));
assert_eq!(split_version("v2"), ("v2", None));
assert!(Kind::ALL.iter().all(|k| Kind::parse(k.as_str()) == Some(*k)));
}
#[test]
fn validate_rejects_placeholder_titles() {
let schema = schema(Kind::Synastry);
let section = json!({"title": "Rák-szívek", "body": "Két bekezdés szöveg."});
let mut answer = json!({
"title": "Két Rák-szív", "summary": "Összefoglaló.", "advice": "Útravaló.",
"strengths": ["Egyik erősség.", "Másik erősség."], "challenges": ["Egy kihívás.", "Még egy."],
"sections": {"attraction": section, "communication": section, "emotional_bond": section,
"friction": section, "long_term": section},
});
assert_eq!(validate(&schema, &answer), Ok(()));
answer["sections"]["attraction"]["title"] = json!("x");
assert_eq!(validate(&schema, &answer), Err("$.sections.attraction.title: expected a non-empty string".into()));
}
#[test]
fn polish_turns_straight_quotes_hungarian() {
let mut v = json!({"a": "a \"hazai pálya\" és a \"sorok\"", "b": ["egy \" pár nélkül"], "c": {"d": "nincs"}});
polish("hu", &mut v);
assert_eq!(v["a"], "a „hazai pálya” és a „sorok”");
assert_eq!(v["b"][0], "egy \" pár nélkül");
assert_eq!(v["c"]["d"], "nincs");
let mut en = json!({"a": "the \"home\" ground"});
polish("en", &mut en);
assert_eq!(en["a"], "the \"home\" ground");
}
}
@@ -0,0 +1,14 @@
-- Admin-edited system prompts of the analyses. The newest row of a
-- (kind, language) is in force; system NULL means the built-in default.
-- An analysis records the revision it was written with in prompt_version
-- ("v2-r<id>"), so the worker uses exactly that text.
CREATE TABLE prompt_revisions (
id bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
kind text NOT NULL CHECK (kind IN ('summary', 'natal', 'synastry')),
language text NOT NULL,
system text CHECK (system IS NULL OR length(system) BETWEEN 1 AND 50000),
created_by uuid REFERENCES users ON DELETE SET NULL,
created_at timestamptz NOT NULL DEFAULT now()
);
CREATE INDEX prompt_revisions_current ON prompt_revisions (kind, language, id DESC);
@@ -0,0 +1,29 @@
-- Test runs of an edited (not yet saved) system prompt on one of the admin's
-- charts. Kept apart from analyses: never shown to users, never cached, no
-- credits, one attempt. Removed after 30 days by the cleanup job.
CREATE TABLE prompt_previews (
id uuid PRIMARY KEY,
kind text NOT NULL CHECK (kind IN ('summary', 'natal')),
chart_id uuid NOT NULL REFERENCES charts ON DELETE CASCADE,
language text NOT NULL,
model text NOT NULL,
system text NOT NULL CHECK (length(system) BETWEEN 1 AND 50000),
status text NOT NULL DEFAULT 'pending' CHECK (status IN ('pending', 'running', 'done', 'failed')),
content jsonb,
error text,
model_used text,
input_tokens integer,
output_tokens integer,
cost_usd double precision,
created_by uuid NOT NULL REFERENCES users ON DELETE CASCADE,
created_at timestamptz NOT NULL DEFAULT now(),
started_at timestamptz,
completed_at timestamptz
);
CREATE INDEX prompt_previews_pending_idx ON prompt_previews (created_at) WHERE status = 'pending';
-- Wakes the analysis worker, like a new analysis.
CREATE TRIGGER prompt_previews_notify
AFTER INSERT ON prompt_previews
FOR EACH STATEMENT EXECUTE FUNCTION notify_analyses();
@@ -0,0 +1,10 @@
-- Prompt test runs of the relationship (synastry) analysis: on one of the
-- admin's comparisons instead of a chart.
ALTER TABLE prompt_previews DROP CONSTRAINT prompt_previews_kind_check;
ALTER TABLE prompt_previews ALTER COLUMN chart_id DROP NOT NULL;
ALTER TABLE prompt_previews
ADD COLUMN synastry_id uuid REFERENCES synastries ON DELETE CASCADE,
ADD CONSTRAINT prompt_previews_target CHECK (
(kind IN ('summary', 'natal') AND chart_id IS NOT NULL AND synastry_id IS NULL)
OR (kind = 'synastry' AND synastry_id IS NOT NULL AND chart_id IS NULL)
);
+26
View File
@@ -0,0 +1,26 @@
-- Packages: every purchase or admin grant of a package is an order; the units
-- it gives are credit_ledger rows pointing at it (reason 'package'), and the
-- unlimited package is a time-limited 'unlimited' entitlement.
CREATE TABLE package_orders (
id uuid PRIMARY KEY,
user_id uuid NOT NULL REFERENCES users ON DELETE CASCADE,
package text NOT NULL,
source text NOT NULL CHECK (source IN ('admin', 'mock', 'stripe')),
price_huf integer NOT NULL DEFAULT 0 CHECK (price_huf >= 0),
note text,
created_by uuid REFERENCES users ON DELETE SET NULL,
created_at timestamptz NOT NULL DEFAULT now()
);
CREATE INDEX package_orders_user_idx ON package_orders (user_id, created_at DESC);
ALTER TABLE credit_ledger DROP CONSTRAINT credit_ledger_reason_check;
ALTER TABLE credit_ledger ADD CONSTRAINT credit_ledger_reason_check
CHECK (reason IN ('monthly_grant', 'analysis', 'chat', 'refund', 'admin_adjust', 'purchase', 'person', 'package'));
ALTER TABLE credit_ledger ADD COLUMN order_id uuid REFERENCES package_orders ON DELETE SET NULL;
-- 'unlimited': analyses and persons without limit until expires_at.
ALTER TABLE entitlements DROP CONSTRAINT entitlements_entitlement_check;
ALTER TABLE entitlements ADD CONSTRAINT entitlements_entitlement_check
CHECK (entitlement IN ('unlimited_persons', 'unlimited'));
ALTER TABLE entitlements ADD COLUMN expires_at timestamptz;
+43
View File
@@ -0,0 +1,43 @@
-- Invitations to the closed site. While SIGNUP_MODE=invite, a new account
-- (Google or password) needs an open invitation for its address, or the
-- invitation link itself (then any address will do).
CREATE TABLE invitations (
id uuid PRIMARY KEY,
email text NOT NULL,
message text CHECK (char_length(message) <= 300),
locale text NOT NULL,
invited_by uuid REFERENCES users (id) ON DELETE SET NULL,
created_at timestamptz NOT NULL DEFAULT now(),
expires_at timestamptz NOT NULL,
sent_count integer NOT NULL DEFAULT 1,
last_sent_at timestamptz NOT NULL DEFAULT now(),
accepted_at timestamptz,
accepted_by uuid REFERENCES users (id) ON DELETE SET NULL,
revoked_at timestamptz
);
-- At most one open invitation per address.
CREATE UNIQUE INDEX invitations_open_email_idx ON invitations (email)
WHERE accepted_at IS NULL AND revoked_at IS NULL;
CREATE INDEX invitations_created_idx ON invitations (created_at DESC);
-- Link tokens (only their hashes). Every sending issues a new one, and the
-- earlier links keep working while the invitation is open.
CREATE TABLE invitation_tokens (
token_hash bytea PRIMARY KEY,
invitation_id uuid NOT NULL REFERENCES invitations (id) ON DELETE CASCADE,
created_at timestamptz NOT NULL DEFAULT now()
);
CREATE INDEX invitation_tokens_invitation_idx ON invitation_tokens (invitation_id);
-- Addresses that asked for no more invitations (only the SHA-256 of the address).
CREATE TABLE email_optouts (
email_hash bytea PRIMARY KEY,
created_at timestamptz NOT NULL DEFAULT now()
);
-- "Tell me when it opens": people without an invitation.
CREATE TABLE waitlist (
email text PRIMARY KEY,
locale text NOT NULL,
created_at timestamptz NOT NULL DEFAULT now()
);
+10
View File
@@ -0,0 +1,10 @@
[package]
name = "email-templates"
description = "E-mail texts of Sorsfonalak as HTML and plain text (sent by the worker, previewed by the backend)"
edition.workspace = true
version.workspace = true
license.workspace = true
publish.workspace = true
[dependencies]
serde_json.workspace = true
+482
View File
@@ -0,0 +1,482 @@
//! E-mail texts (Hungarian and English), as plain text and HTML.
//!
//! The payloads are written by the backend; the validity periods in the
//! texts match the token lifetimes there. The worker sends the result, the
//! backend renders it for the admin preview.
//!
//! The layout is deliberately plain for spam filters: one column, inline
//! styles, no images, no tracking, every link on the site's own domain, and
//! a plain-text part with the same content.
use serde_json::Value;
#[derive(Debug, Clone, PartialEq)]
pub struct Rendered {
pub subject: String,
pub text: String,
pub html: String,
/// One-click unsubscribe address for the `List-Unsubscribe` header (RFC 8058).
pub unsubscribe_post_url: Option<String>,
}
#[derive(Debug, PartialEq)]
pub enum TemplateError {
UnknownTemplate(String),
MissingField(&'static str),
}
impl std::fmt::Display for TemplateError {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
TemplateError::UnknownTemplate(t) => write!(f, "unknown e-mail template '{t}'"),
TemplateError::MissingField(field) => write!(f, "e-mail payload has no '{field}'"),
}
}
}
#[derive(Clone, Copy, PartialEq)]
enum Lang {
Hu,
En,
}
/// One e-mail: greeting, paragraphs, a button and a closing note.
struct Content {
subject: String,
/// The line mail clients show after the subject in the inbox.
preheader: Option<String>,
greeting: String,
intro: String,
/// A personal message, shown as a quote.
quote: Option<String>,
/// A short list after the intro, with its heading.
points: Option<(&'static str, Vec<&'static str>)>,
button: &'static str,
url: String,
note: String,
/// Why the recipient got this e-mail (for mails they did not ask for).
reason: Option<String>,
/// Label and page of the unsubscribe link in the footer.
unsubscribe: Option<(&'static str, String)>,
unsubscribe_post_url: Option<String>,
}
impl Content {
fn simple(subject: String, greeting: String, intro: String, button: &'static str, url: String, note: &str) -> Self {
Self {
subject,
preheader: None,
greeting,
intro,
quote: None,
points: None,
button,
url,
note: note.to_owned(),
reason: None,
unsubscribe: None,
unsubscribe_post_url: None,
}
}
}
pub fn render(template: &str, locale: &str, payload: &Value) -> Result<Rendered, TemplateError> {
let lang = if locale.eq_ignore_ascii_case("hu") { Lang::Hu } else { Lang::En };
let url = field(payload, "url")?;
let greeting = |name: Option<String>| match (lang, name) {
(Lang::Hu, Some(n)) => format!("Szia {n}!"),
(Lang::Hu, None) => "Szia!".to_owned(),
(Lang::En, Some(n)) => format!("Hi {n},"),
(Lang::En, None) => "Hi,".to_owned(),
};
let content = match (template, lang) {
("verify_email", Lang::Hu) => Content::simple(
"Erősítsd meg az e-mail-címed".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",
url,
"A link 3 napig érvényes. 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(),
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",
url,
"The link is valid for 3 days. If you did not sign up, you can safely ignore this e-mail.",
),
("reset_password", Lang::Hu) => Content::simple(
"Új jelszó megadása".into(),
greeting(name(payload, "display_name")),
"Jelszó-visszaállítást kértél a Sorsfonalak-fiókodhoz. Az alábbi gombbal adhatsz meg új jelszót.".into(),
"Új jelszó megadása",
url,
"A link 1 óráig érvényes, és csak egyszer használható. Ha nem te kérted, hagyd figyelmen kívül ezt a levelet: a jelszavad nem változik.",
),
("reset_password", Lang::En) => Content::simple(
"Set a new password".into(),
greeting(name(payload, "display_name")),
"You asked to reset the password of your Sorsfonalak account. Use the button below to set a new one."
.into(),
"Set a new password",
url,
"The link is valid for 1 hour and can be used once. If you did not ask for this, ignore this e-mail: your password stays the same.",
),
("invite_accepted", Lang::Hu) => {
let who = name(payload, "invitee_name");
Content::simple(
match &who {
Some(n) => format!("{n} elfogadta a meghívásod"),
None => "Elfogadták a meghívásod".into(),
},
greeting(None),
format!(
"{} elfogadta a „Mennyire illünk össze?” meghívásod, és elkészült a szinasztriátok.",
who.as_deref().unwrap_or("A meghívott")
),
"Szinasztria megnyitása",
url,
"A szinasztriát mindketten látjátok, de egymás születési adatait nem.",
)
}
("invite_accepted", Lang::En) => {
let who = name(payload, "invitee_name");
Content::simple(
match &who {
Some(n) => format!("{n} accepted your invitation"),
None => "Your invitation was accepted".into(),
},
greeting(None),
format!(
"{} accepted your “How compatible are we?” invitation, and your synastry is ready.",
who.as_deref().unwrap_or("Your invitee")
),
"Open synastry",
url,
"You both see the synastry, but not each other's birth data.",
)
}
("invitation", _) => invitation(lang, payload, url)?,
_ => return Err(TemplateError::UnknownTemplate(template.to_owned())),
};
Ok(content.render(lang))
}
/// An invitation to the closed site (sent by an administrator).
fn invitation(lang: Lang, payload: &Value, url: String) -> Result<Content, TemplateError> {
let inviter = name(payload, "inviter_name");
let message = message(payload);
let until =
payload["expires_on"].as_str().and_then(|d| date(lang, d)).ok_or(TemplateError::MissingField("expires_on"))?;
// "2026. december 17." + "-ig" = "2026. december 17-ig"
let until_hu = until.trim_end_matches('.');
let unsubscribe_url = field(payload, "unsubscribe_url")?;
let unsubscribe_post_url = field(payload, "unsubscribe_post_url")?;
Ok(match lang {
Lang::Hu => Content {
subject: match &inviter {
Some(n) => format!("{n} meghívott a Sorsfonalakra"),
None => "Meghívót kaptál a Sorsfonalakra".into(),
},
preheader: Some(format!("Születési képlet és rövid elemzés ingyen. A meghívó {until_hu}-ig érvényes.")),
greeting: "Szia!".into(),
intro: match &inviter {
Some(n) => {
format!("{n} meghívott a Sorsfonalakra. Az oldal egyelőre zártkörű: csak meghívóval lehet belépni.")
}
None => {
"Meghívót kaptál a Sorsfonalakra. Az oldal egyelőre zártkörű: csak meghívóval lehet belépni.".into()
}
},
quote: message,
points: Some((
"Mit találsz ott?",
vec![
"a születési képleted kiszámolva és megrajzolva, ingyen,",
"egy rövid, személyre szóló elemzést róla,",
"összevetést a szeretteiddel: mennyire illetek össze.",
],
)),
button: "Meghívás elfogadása",
url,
note: format!(
"A meghívó {until_hu}-ig érvényes. Elfogadáskor Google-fiókkal lépsz be, és ezzel a linkkel bármelyik Google-fiókodat használhatod."
),
reason: Some(match &inviter {
Some(n) => {
format!("Ezt a levelet azért kaptad, mert {n} megadta az e-mail-címed a Sorsfonalak meghívójában.")
}
None => {
"Ezt a levelet azért kaptad, mert valaki megadta az e-mail-címed a Sorsfonalak meghívójában.".into()
}
}),
unsubscribe: Some(("Nem kérek több meghívót", unsubscribe_url)),
unsubscribe_post_url: Some(unsubscribe_post_url),
},
Lang::En => Content {
subject: match &inviter {
Some(n) => format!("{n} invited you to Sorsfonalak"),
None => "You are invited to Sorsfonalak".into(),
},
preheader: Some(format!(
"Your birth chart and a short reading, free. The invitation is valid until {until}."
)),
greeting: "Hi,".into(),
intro: match &inviter {
Some(n) => format!("{n} invited you to Sorsfonalak. The site is invitation-only for now."),
None => "You are invited to Sorsfonalak. The site is invitation-only for now.".into(),
},
quote: message,
points: Some((
"What you will find there:",
vec![
"your birth chart, calculated and drawn, for free,",
"a short, personal reading of it,",
"comparisons with your loved ones: how well you match.",
],
)),
button: "Accept the invitation",
url,
note: format!(
"The invitation is valid until {until}. You sign in with Google, and with this link any of your Google accounts will do."
),
reason: Some(match &inviter {
Some(n) => format!("You got this e-mail because {n} entered your address in a Sorsfonalak invitation."),
None => "You got this e-mail because someone entered your address in a Sorsfonalak invitation.".into(),
}),
unsubscribe: Some(("No more invitations, please", unsubscribe_url)),
unsubscribe_post_url: Some(unsubscribe_post_url),
},
})
}
fn field(payload: &Value, name: &'static str) -> Result<String, TemplateError> {
payload[name].as_str().filter(|u| !u.is_empty()).map(str::to_owned).ok_or(TemplateError::MissingField(name))
}
/// A user-supplied name, safe for a subject line.
fn name(payload: &Value, field: &str) -> Option<String> {
let name: String = payload[field].as_str()?.chars().filter(|c| !c.is_control()).take(60).collect();
let name = name.trim();
(!name.is_empty()).then(|| name.to_owned())
}
/// The personal message of an invitation: line breaks kept, other control characters dropped.
fn message(payload: &Value) -> Option<String> {
let text: String =
payload["message"].as_str()?.chars().filter(|c| *c == '\n' || !c.is_control()).take(500).collect();
let text = text.trim();
(!text.is_empty()).then(|| text.to_owned())
}
/// `2026-12-17` as "2026. december 17." or "17 December 2026".
fn date(lang: Lang, iso: &str) -> Option<String> {
const HU: [&str; 12] = [
"január",
"február",
"március",
"április",
"május",
"június",
"július",
"augusztus",
"szeptember",
"október",
"november",
"december",
];
const EN: [&str; 12] = [
"January",
"February",
"March",
"April",
"May",
"June",
"July",
"August",
"September",
"October",
"November",
"December",
];
let mut parts = iso.splitn(3, '-');
let (y, m, d) = (parts.next()?, parts.next()?, parts.next()?);
let (y, m, d): (u32, usize, u32) = (y.parse().ok()?, m.parse().ok()?, d.get(..2)?.parse().ok()?);
let month = m.checked_sub(1).filter(|&i| i < 12)?;
Some(match lang {
Lang::Hu => format!("{y}. {} {d}.", HU[month]),
Lang::En => format!("{d} {} {y}", EN[month]),
})
}
fn escape(s: &str) -> String {
let mut out = String::with_capacity(s.len());
for c in s.chars() {
match c {
'&' => out.push_str("&amp;"),
'<' => out.push_str("&lt;"),
'>' => out.push_str("&gt;"),
'"' => out.push_str("&quot;"),
'\'' => out.push_str("&#39;"),
_ => out.push(c),
}
}
out
}
const TEXT: &str = "#2a2620";
const MUTED: &str = "#6b645a";
const FAINT: &str = "#9b948a";
const GOLD: &str = "#9a7b3c";
impl Content {
fn render(self, lang: Lang) -> Rendered {
let footer = match lang {
Lang::Hu => "Ezt a levelet a Sorsfonalak küldte.",
Lang::En => "This e-mail was sent by Sorsfonalak.",
};
let mut text = format!("{}\n\n{}\n\n", self.greeting, self.intro);
if let Some(q) = &self.quote {
for line in q.lines() {
text.push_str(&format!("> {line}\n"));
}
text.push('\n');
}
if let Some((heading, items)) = &self.points {
text.push_str(heading);
text.push('\n');
for item in items {
text.push_str(&format!("- {item}\n"));
}
text.push('\n');
}
text.push_str(&format!("{}:\n{}\n\n{}\n\n-- \nSorsfonalak\n", self.button, self.url, self.note));
if let Some(reason) = &self.reason {
text.push_str(&format!("\n{reason}\n"));
}
if let Some((label, url)) = &self.unsubscribe {
text.push_str(&format!("{label}: {url}\n"));
}
let preheader = self.preheader.as_deref().map_or(String::new(), |p| {
format!(
r#"<div style="display:none;max-height:0;overflow:hidden;opacity:0;color:transparent">{}</div>"#,
escape(p)
)
});
let quote = self.quote.as_deref().map_or(String::new(), |q| {
format!(
r#"<tr><td style="padding-bottom:24px"><div style="border-left:3px solid {GOLD};padding:4px 0 4px 16px;font-size:16px;line-height:1.6;font-style:italic;color:{TEXT}">{}</div></td></tr>
"#,
escape(q).replace('\n', "<br>")
)
});
let points = self.points.as_ref().map_or(String::new(), |(heading, items)| {
let items: String = items
.iter()
.map(|i| format!(r#"<li style="margin:0 0 6px">{}</li>"#, escape(i)))
.collect();
format!(
r#"<tr><td style="font-size:16px;line-height:1.6;padding-bottom:24px">{}<ul style="margin:8px 0 0;padding-left:20px">{items}</ul></td></tr>
"#,
escape(heading)
)
});
let mut small = Vec::new();
if let Some(reason) = &self.reason {
small.push(escape(reason));
}
if let Some((label, url)) = &self.unsubscribe {
small.push(format!(r#"<a href="{}" style="color:{FAINT}">{}</a>"#, escape(url), escape(label)));
}
small.push(escape(footer));
let small = small.join("<br>");
let html = format!(
r#"<!doctype html>
<html lang="{lang}">
<head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><title>{subject}</title></head>
<body style="margin:0;padding:0;background:#f4f1ea;font-family:Georgia,'Times New Roman',serif;color:{TEXT}">
{preheader}<table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="background:#f4f1ea;padding:32px 16px">
<tr><td align="center">
<table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="max-width:520px;background:#ffffff;border-radius:8px;padding:32px">
<tr><td style="font-size:20px;letter-spacing:2px;color:{GOLD};padding-bottom:24px">SORSFONALAK</td></tr>
<tr><td style="font-size:16px;line-height:1.6;padding-bottom:12px">{greeting}</td></tr>
<tr><td style="font-size:16px;line-height:1.6;padding-bottom:24px">{intro}</td></tr>
{quote}{points}<tr><td style="padding-bottom:24px"><a href="{url}" style="display:inline-block;background:{GOLD};color:#ffffff;text-decoration:none;padding:12px 24px;border-radius:6px;font-size:16px">{button}</a></td></tr>
<tr><td style="font-size:14px;line-height:1.6;color:{MUTED};padding-bottom:16px">{note}</td></tr>
<tr><td style="font-size:12px;line-height:1.5;color:{FAINT};word-break:break-all">{url_text}</td></tr>
</table>
<p style="font-size:12px;line-height:1.5;color:{FAINT};max-width:520px">{small}</p>
</td></tr>
</table>
</body>
</html>
"#,
lang = if lang == Lang::Hu { "hu" } else { "en" },
subject = escape(&self.subject),
greeting = escape(&self.greeting),
intro = escape(&self.intro),
url = escape(&self.url),
button = escape(self.button),
note = escape(&self.note),
url_text = escape(&self.url),
);
Rendered { subject: self.subject, text, html, unsubscribe_post_url: self.unsubscribe_post_url }
}
}
#[cfg(test)]
mod tests {
use serde_json::json;
use super::*;
fn invitation_payload() -> Value {
json!({
"url": "https://sorsfonalak.test/meghivo/abc",
"inviter_name": "Kata",
"message": "Gyere, nézd meg!\n<b>Szia</b>",
"expires_on": "2026-12-17",
"unsubscribe_url": "https://sorsfonalak.test/leiratkozas?token=abc",
"unsubscribe_post_url": "https://sorsfonalak.test/api/v1/public/invitations/unsubscribe?token=abc",
})
}
#[test]
fn invitation_has_both_parts() {
let hu = render("invitation", "hu", &invitation_payload()).unwrap();
assert_eq!(hu.subject, "Kata meghívott a Sorsfonalakra");
assert!(hu.text.contains("> Gyere, nézd meg!\n> <b>Szia</b>"));
assert!(hu.text.contains("A meghívó 2026. december 17-ig érvényes."));
assert!(hu.text.contains("Nem kérek több meghívót: https://sorsfonalak.test/leiratkozas?token=abc"));
assert!(hu.html.contains("Gyere, nézd meg!<br>&lt;b&gt;Szia&lt;/b&gt;"));
assert!(hu.html.contains(r#"href="https://sorsfonalak.test/meghivo/abc""#));
assert!(hu.html.contains("display:none"));
assert_eq!(
hu.unsubscribe_post_url.as_deref(),
Some("https://sorsfonalak.test/api/v1/public/invitations/unsubscribe?token=abc")
);
let mut anonymous = invitation_payload();
anonymous["inviter_name"] = Value::Null;
anonymous["message"] = Value::Null;
let en = render("invitation", "en", &anonymous).unwrap();
assert_eq!(en.subject, "You are invited to Sorsfonalak");
assert!(en.text.contains("valid until 17 December 2026") && !en.text.contains("> "));
assert!(!en.html.contains("border-left"));
let mut broken = invitation_payload();
broken["unsubscribe_url"] = Value::Null;
assert_eq!(render("invitation", "hu", &broken), Err(TemplateError::MissingField("unsubscribe_url")));
}
#[test]
fn dates() {
assert_eq!(date(Lang::Hu, "2027-01-05").as_deref(), Some("2027. január 5."));
assert_eq!(date(Lang::En, "2027-01-05T10:00:00Z").as_deref(), Some("5 January 2027"));
assert_eq!(date(Lang::Hu, "2027-13-05"), None);
}
}
+7 -3
View File
@@ -10,9 +10,13 @@ GOOGLE_CLIENT_IDS=
# These accounts become admins at their first login
BOOTSTRAP_ADMIN_EMAILS=
# Outgoing mail, e.g. smtps://user:password@smtp.example.com:465
SMTP_URL=
MAIL_FROM=Sorsfonalak <noreply@sorsfonalak.hu>
# Outgoing mail: Amazon SES (docs/levelkuldes.md). The credentials go to .env.secrets:
# SES_SMTP_USERNAME + SES_SMTP_PASSWORD, or AWS_ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY.
SES_REGION=eu-central-1
MAIL_FROM=Sorsfonalak <hello@sorsfonalak.hu>
# invite: new accounts need an invitation (default); open: anyone can sign up
SIGNUP_MODE=invite
# Image version; every deployment rewrites it
TAG=latest
+2 -6
View File
@@ -11,12 +11,8 @@
}
{$DOMAIN} {
# Temporary gate until launch (user sf, password sf). Remove this block to open the site.
# The privacy policy stays public (Google's OAuth consent screen links to it).
@gated not path /adatvedelem /_next/static/* /favicon.ico /icon*
basic_auth @gated {
sf $2a$14$oggzzuNO41uGS5M.TCMlB.bQ6fdXUHtNLx9XahWyKLHjRlpEP1XN6
}
# 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
}
+7 -3
View File
@@ -88,7 +88,9 @@ services:
# Stand-in payment (adds an analysis unit at once) until Stripe is connected.
MOCK_PAYMENTS: ${MOCK_PAYMENTS:-true}
FREE_PERSON_SLOTS: ${FREE_PERSON_SLOTS:-0}
PERSON_PACK_SIZE: ${PERSON_PACK_SIZE:-5}
UNLIMITED_DAILY_LIMIT: ${UNLIMITED_DAILY_LIMIT:-5}
# invite: new accounts need an invitation (admin page "Meghívók"); open: anyone.
SIGNUP_MODE: ${SIGNUP_MODE:-invite}
depends_on:
postgres:
condition: service_healthy
@@ -102,8 +104,10 @@ services:
image: ${REGISTRY_PREFIX:-registry.sagifer.com/sagifer/sorsfonalak}-worker:${TAG:-latest}
environment:
DATABASE_URL: postgres://sorsfonalak:${POSTGRES_PASSWORD}@postgres:5432/sorsfonalak
SMTP_URL: ${SMTP_URL:-}
MAIL_FROM: ${MAIL_FROM:-}
# 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>}
PUBLIC_BASE_URL: https://${DOMAIN}
env_file:
- path: .env.secrets
+3 -1
View File
@@ -56,7 +56,9 @@ services:
# Stand-in payment (adds an analysis unit at once) until Stripe is connected.
MOCK_PAYMENTS: ${MOCK_PAYMENTS:-true}
FREE_PERSON_SLOTS: ${FREE_PERSON_SLOTS:-0}
PERSON_PACK_SIZE: ${PERSON_PACK_SIZE:-5}
UNLIMITED_DAILY_LIMIT: ${UNLIMITED_DAILY_LIMIT:-5}
# invite: new accounts need an invitation (admin page "Meghívók"); open: anyone.
SIGNUP_MODE: ${SIGNUP_MODE:-invite}
depends_on:
postgres:
condition: service_healthy
+39
View File
@@ -0,0 +1,39 @@
# Csomagok és árazás
A katalógus a kódban van: `services/backend/src/packages.rs` (`CATALOG`). Ár- vagy tartalomváltozás egy deploy.
## Költség
Egy részletes képletelemzés és egy kapcsolati elemzés is kb. **$0,21 (≈ 80 Ft)** Opus 5.5-tel; 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).
## A lépcső
| Csomag | Tartalom | Ár | Elemzésenként | Külön megvéve | Megtakarítás |
|---|---|---|---|---|---|
| Egy elemzés | 1 képletelemzés | 2 990 Ft | 2 990 Ft | – | – |
| Páros | 2 képletelemzés, 1 kapcsolati, 1 személy | 6 990 Ft | 2 330 Ft | 9 868 Ft | 29% |
| **Család** (Legnépszerűbb) | 6 képletelemzés, 5 kapcsolati, 5 személy | 11 990 Ft | 1 090 Ft | 37 380 Ft | 68% |
| Korlátlan | minden korlátlanul, 12 hónapig | 17 990 Ft | – | – | – |
| +1 kapcsolati elemzés | kiegészítő | 3 490 Ft | | | |
| +5 személy | kiegészítő | 1 990 Ft | | | |
## Miért így (a nagyobb felé terelés)
- **Horgony:** az Egy elemzés ára (2 990 Ft) az egységár. Minden más ehhez mérve látszik olcsónak; a kártyákon áthúzva ott a „külön megvéve” ár.
- **Kis lépések, nagy ugrások:** minden szint csak egy kicsivel drágább az előzőnél, de sokkal többet ad. Páros: +4 000 Ft-ért háromszor annyi elemzés. Család: +5 000 Ft-ért majdnem négyszer annyi. Korlátlan: +6 000 Ft-ért nincs határ. A kártyán ki is írjuk: „Csak +5 000 Ft a Páros csomaghoz képest”.
- **Csali:** a Páros szándékosan „csak jó” ajánlat (−29%), hogy mellette a Család (−68%) kiugorjon. A Család kapja a kiemelést és a „Legnépszerűbb” címkét.
- **A Korlátlan mint felső horgony:** a Család ára mellette mérsékeltnek tűnik; aki sokakat venne fel, annak a 6 000 Ft különbség semmiség.
- **Drága kiegészítők:** a +1 kapcsolati elemzés 3 490 Ft, többe kerül, mint egy képletelemzés, és a Páros már kettő árán ad egyet kettőtök képletével együtt. Aki darabonként venne, annak jobban megéri csomagot venni.
- **A vásárlás pillanatában** (a „Részletes elemzés kérése” után) nem egy darabot kínálunk, hanem három csomagot egymás mellett, kiemelt Családdal.
- **Nem jár le:** a megvett elemzések megmaradnak, ezért a nagyobb csomag nem kockázat a vevőnek.
## Korlátlan csomag
Egy év; ha még tart, egy újabb a lejárathoz ad hozzá egy évet. Méltányos használat: naponta legfeljebb `UNLIMITED_DAILY_LIMIT` (alapból 5) új részletes elemzés. Legrosszabb esetben is jóval a csomag ára alatt marad a költség, ha valaki nem visszaélésszerűen használja; a napi korlát a gépi tömeges lekérést fogja meg.
## 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.
+95
View File
@@ -0,0 +1,95 @@
# 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”).
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.
A SES ára 1000 levelenként 0,10 USD; a mi forgalmunknál ez havi néhány cent.
## 1. Régió és domain (SES konzol)
1. **Régió:** `eu-central-1` (Frankfurt), hogy az adatok az EU-ban maradjanak. Minden lépést ebben a régióban kell elvégezni, mert a SES-beállítások régiónként külön élnek.
2. *Configuration → Identities → Create identity → Domain*: `sorsfonalak.hu`.
- **Easy DKIM**, RSA 2048 bit. A SES három CNAME-rekordot ad (lásd 3. pont).
- **Custom MAIL FROM domain:** `mail.sorsfonalak.hu`, és *Behavior on MX failure*: *Use default MAIL FROM domain*. Ettől az SPF is a saját domainünkre szól, ami a DMARC-nál számít. Ehhez egy MX- és egy TXT-rekord kell.
3. A domain igazolása után bármelyik `@sorsfonalak.hu` cím lehet feladó. Javaslat: `hello@sorsfonalak.hu`. A `noreply` cím a szűrőknél rosszabb, és válaszolni sem lehet rá.
## 2. Kilépés a homokozóból (sandbox)
Új SES-fiók homokozóban indul. Ilyenkor:
- csak igazolt címekre lehet küldeni (*Identities → Create identity → Email address*; teszteléshez a saját címed elég);
- naponta legfeljebb 200 levél megy ki.
Meghívót idegen címre csak éles hozzáféréssel lehet küldeni: *Account dashboard → Request production access*. Az AWS kézzel bírálja el, általában egy napon belül. A kérésben érdemes leírni:
- tranzakciós levelek (megerősítés, értesítés) és meghívók egy zártkörű oldalra;
- meghívót csak az admin küld, személyesen ismert embereknek, kis mennyiségben;
- minden meghívóban egykattintásos leiratkozás van, a leiratkozott címekre többé nem megy levél;
- a visszapattanó és panaszos címeket a SES fiókszintű tiltólistája kezeli (*Suppression list*: bounces és complaints).
Fontos: ha a visszapattanási arány 5%, vagy a panaszarány 0,1% fölé megy, az AWS felfüggesztheti a küldést. Ezért csak olyan címre küldj meghívót, amelyről tudod, hogy él.
## 3. DNS a Cloudflare-en
| Típus | Név | Tartalom |
|---|---|---|
| CNAME ×3 | `<kód>._domainkey` | `<kód>.dkim.amazonses.com` (a SES konzol kiírja mindhármat) |
| MX | `mail` | `feedback-smtp.eu-central-1.amazonses.com`, prioritás 10 |
| TXT | `mail` | `v=spf1 include:amazonses.com ~all` |
| TXT | `_dmarc` | `v=DMARC1; p=none; rua=mailto:<a te címed>` |
- Minden rekord **DNS only** (szürke felhő) legyen; a proxyzott CNAME-mel a DKIM nem működik.
- DMARC: induláskor `p=none` (csak jelentés). Ha pár hétig minden levél átmegy, szigorítható `p=quarantine`-ra.
- Ha a `hello@sorsfonalak.hu` címre érkező válaszokat is olvasni szeretnéd: a Cloudflare *Email Routing* ingyen továbbítja őket a Gmailedre. Ez a fő domainre (`sorsfonalak.hu`) tesz MX- és SPF-rekordot, ami nem ütközik a `mail.` aldomain rekordjaival.
## 4. Hozzáférés
Két út van, mindkettő a szerver `.env.secrets` fájljába kerül (kis- vagy nagybetűvel is jó):
- **SMTP-hozzáférés** (*SMTP settings → Create SMTP credentials*): egy IAM-felhasználó, amely csak levelet küldhet.
```
SES_SMTP_USERNAME=AKIA...
SES_SMTP_PASSWORD=...
```
- **IAM-kulcspár**, amelynek van `ses:SendRawEmail` joga:
```
AWS_ACCESS_KEY_ID=AKIA...
AWS_SECRET_ACCESS_KEY=...
```
Más nevek is jók: a kulcsnál `SES_AUTH_KEY`, `SES_ACCESS_KEY`, `SES_KEY`, `AUTH_KEY`, a titoknál `SES_SECRET`, `SES_SECRET_KEY`, `AWS_SECRET`, `AUTH_SECRET` (a teljes lista: `services/worker/src/ses.rs`).
A worker ebből az AWS által leírt módon kiszámolja az SMTP-jelszót. Ha az `AWS_SECRET_ACCESS_KEY` helyére az SMTP-jelszót írtad, azt is felismeri, és változatlanul használja.
A régió alapból `eu-central-1` (Frankfurt); felülírható a `SES_REGION` változóval. A port 2587, ezt a `SES_SMTP_PORT` írja felül. URL-kódolásra itt nincs szükség, mert a worker maga állítja össze a címet.
## 5. Tűzfal
A DigitalOcean a dropleteken tiltja a szokásos kimenő SMTP-portokat (25, 465, 587). A SES erre a **2587**-es portot (STARTTLS) is kínálja.
A droplet saját tűzfala (`sorsfonalak-fw`, DigitalOcean → Networking → Firewalls) a kimenő forgalmat is szűri. Az **Outbound rules** közé fel kell venni a **TCP 2587**-et (cél: All IPv4, All IPv6), különben a worker nem éri el a SES-t.
## 6. Indítás
- A `.env` fájlban opcionális: `MAIL_FROM=Sorsfonalak <hello@sorsfonalak.hu>` (ez az alapérték is).
- 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:
- `535 Authentication Credentials Invalid`: hibás kulcs, vagy az IAM-felhasználónak nincs `ses:SendRawEmail` joga;
- `554 Message rejected: Email address is not verified`: a fiók még homokozóban van, és a címzett nincs igazolva;
- időtúllépés: a tűzfalon nincs engedélyezve a kimenő 2587-es port.
- Ha mégis kész SMTP-címet adnál meg, az `SMTP_URL` mindig elsőbbséget élvez a SES-változókkal szemben.
## 7. Próba
1. Admin → Meghívók → **Teszt küldése magamnak**: megérkezik-e, és nem a spamben van-e.
2. A Gmailben a levélnél *⋮ → Eredeti megjelenítése*: az SPF, a DKIM és a DMARC mellett is `PASS` álljon.
3. A [mail-tester.com](https://www.mail-tester.com) ad egy egyszeri címet. Küldj rá meghívót az admin oldalról (utána vond vissza), és nézd meg a pontszámot; 9/10 fölött jó. Ehhez már éles hozzáférés kell.
## Amit a kód már elintéz
- HTML és szöveges változat ugyanazzal a tartalommal. Egyhasábos, képek és követés nélkül, minden link a saját domainre mutat.
- `List-Unsubscribe` és `List-Unsubscribe-Post` (RFC 8058): a Gmail és a többi levelező saját „Leiratkozás” gombot mutat. Aki leiratkozik, annak a címére soha többé nem megy meghívó (`email_optouts`, csak a cím hash-e).
- A worker saját domaines `Message-ID`-t tesz a levélre. A SES ezt a sajátjára cseréli, ami rendben van.
- Meghívót csak admin küldhet. Egy meghívó legfeljebb háromszor megy ki, 24 óránként egyszer. A személyes üzenet legfeljebb 300 karakter, és nem lehet benne link.
## Később
A visszapattanásokról és panaszokról a SES utólag, SNS-értesítésben szól; az SMTP-kapcsolat ezt nem jelzi. Ha lesz forgalom, érdemes bekötni egy SNS → backend webhookot. Ez a meghívólistán megjelölné a visszapattant címeket, és a panaszt tevőket a leiratkozottak közé tenné.
+2
View File
@@ -8,6 +8,8 @@ publish.workspace = true
[dependencies]
db.workspace = true
analysis-prompt.workspace = true
email-templates.workspace = true
horoscope-client.workspace = true
service-kit.workspace = true
anyhow.workspace = true
+26 -6
View File
@@ -14,9 +14,10 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh
| `COOKIE_DOMAIN` | – | pl. `.sorsfonalak.hu`, ha a frontend és az API más aldomainen fut |
| `SESSION_TTL_DAYS` | `30` | a munkamenet élettartama |
| `PASSWORD_LOGIN` | `false` | e-mail + jelszó regisztráció és belépés; élesben ki van kapcsolva (csak Google, Apple, Facebook), a jelszavas végpontok ilyenkor 403-at adnak |
| `MOCK_PAYMENTS` | `false` | próbafizetés a Stripe bekötéséig: a `POST /v1/payments/mock` azonnal jóváír egy elemzési egységet (`{"unit": "natal"}`) vagy személycsomagot (`{"package": "persons"}` / `"persons_unlimited"`); a compose-fájlokban egyelőre `true` |
| `MOCK_PAYMENTS` | `false` | próbafizetés a Stripe bekötéséig: a `POST /v1/payments/mock` `{"package": "<id>"}` azonnal jóváírja a katalógus egy csomagját (`{"unit": "natal"}` rövidítés: a legkisebb ilyen csomag); a compose-fájlokban egyelőre `true` |
| `FREE_PERSON_SLOTS` | `0` | ennyi személyt vehet fel csomag nélkül egy felhasználó |
| `PERSON_PACK_SIZE` | `5` | ennyi személy van egy személycsomagban |
| `UNLIMITED_DAILY_LIMIT` | `5` | a Korlátlan csomaggal naponta ennyi új részletes elemzés kérhető (méltányos használat; utána 429 `fair_use_limit`) |
| `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 |
| `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 |
@@ -36,6 +37,12 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh
- **Google:** a frontend a Google Identity Services gombbal vagy a One Tap felülettel szerez ID tokent, és elküldi a `POST /v1/auth/google` végpontra. A backend Google kulcsaival ellenőrzi az aláírást, a kiállítót és a kliens-azonosítót.
- Ismeretlen Google-fióknál, ha a Google által igazolt e-mail-címmel már van felhasználó, ahhoz kapcsolja; ha nincs, újat hoz létre.
- Ugyanaz a felhasználó több belépési móddal is rendelkezhet (`auth_identities`). A Facebook, az Apple és a passkey ugyanígy adható hozzá.
- **Meghívásos regisztráció** (`SIGNUP_MODE=invite`): új fiók (Google vagy jelszó) akkor jön létre, ha
- a címre szól élő meghívó (`invitations`), vagy
- a kérés a meghívólink tokenjét hozza (`invite_token`): ilyenkor bármelyik cím jó, mert sokan nem azzal a Google-fiókkal lépnek be, amelyiket az ismerősük tudja; a meghívó ezzel elfogy;
- vagy egy élő „Mennyire illünk össze?” link tokenjét hozza, illetve a cím a `BOOTSTRAP_ADMIN_EMAILS` listában van.
Meglévő felhasználók belépése nem változik. Meghívót csak admin küld; a levelet a worker kézbesíti (`invitation` sablon). Minden küldés új linket ad, de a korábbi linkek is élnek, amíg a meghívó nyitott (`invitation_tokens`). A leiratkozott címekre nem megy több meghívó (`email_optouts`, csak hash). Lásd még `docs/levelkuldes.md`.
- **Szerepek** (`users.roles`, tömb): `user` (alap), `creator` (cikkírás, 2. fázis), `premium` és `vip` (jelenleg nincs hozzájuk funkció; a fizetős elemzés egységekkel megy), `admin`.
- **Guardok:**
- `AuthUser`: belépés kell (401);
@@ -47,10 +54,11 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh
| Végpont | Guard | Leírás |
|---|---|---|
| `GET /v1/config` | – | Google kliens-azonosító, `password_login`, nyelvek, elemző és összefoglaló modell |
| `POST /v1/auth/register` | – | `{email, password, display_name?, locale?}` → munkamenet; megerősítő e-mailt küld |
| `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/login` | – | `{email, password}` |
| `POST /v1/auth/google` | – | `{id_token}`; `created: true`, ha most jött létre a fiók |
| `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 | |
@@ -76,7 +84,19 @@ Felhasználók, belépés, mentett születési képletek, szinasztriák és megh
| `GET /v1/public/shares/{slug}` | – | a megosztott tartalom (oldal + OG-kép adatai) |
| `GET /v1/admin/users?q=` | admin | felhasználók kereséssel, szerepekkel, megmaradt elemzésekkel |
| `PATCH /v1/admin/users/{id}` | admin | `{roles: [...]}`; a saját admin szerep nem vehető el |
| `POST /v1/admin/users/{id}/packages` | admin | `{package, note?}`: csomag kiosztása ajándékként (`package_orders`, ár 0) |
| `POST /v1/admin/users/{id}/credits` | admin | `{unit: natal\|synastry, delta, note?}`: elemzések jóváírása vagy levonása |
| `GET`/`POST /v1/admin/invitations` | admin | lista (állapot, az utolsó levél állapota, várólista); új: `{emails: [...], message?, locale?}`, címenként `invited` (linkkel), `invalid`, `already_user`, `already_invited` vagy `opted_out` |
| `POST /v1/admin/invitations/{id}/resend`, `DELETE …/{id}` | admin | újraküldés új linkkel és újabb 30 nappal (legfeljebb 3 küldés, 24 óránként); visszavonás |
| `POST /v1/admin/invitations/preview` | admin | `{message?, locale?, send_to_me?}`: a meghívólevél HTML- és szöveges változata mintalinkekkel; kérésre tesztpéldány az adminnak |
| `DELETE /v1/admin/waitlist/{email}` | admin | törlés a várólistáról |
| `GET /v1/public/invitations/{token}` | – | a meghívó adatai a belépőoldalnak (ki hívott, üzenet, állapot) |
| `POST /v1/public/invitations/unsubscribe?token=` | – | „Nem kérek több meghívót”: a lábléc linkjéről és a levelezők egykattintásos gombjáról (RFC 8058) |
| `POST /v1/public/waitlist` | – | `{email, locale?}`; mindig 202, nem árulja el, kinek van fiókja |
| `GET /v1/admin/prompts` | admin | a tömör és a részletes elemzés system promptja nyelvenként: érvényes szöveg, alapértelmezett, változatok |
| `PUT /v1/admin/prompts/{kind}/{language}` | admin | `{system}` új változatként menti (`null` vagy az alapértelmezett szöveg: vissza a beépítettre); az új elemzések `prompt_version`-je `v2-r<id>` |
| `POST /v1/admin/prompts/{kind}/{language}/preview` | admin | `{system, chart_id}`: próbafuttatás a (mentetlen) szöveggel egy saját képleten; nem kerül a képlethez, nem gyorsítótárazott, nem fogy egység; egyszerre legfeljebb 3 |
| `GET /v1/admin/previews/{id}` | admin | a próbafuttatás állapota és eredménye (modell, token, költség) |
Hibák formátuma: `{"error": {"code", "message"}}`. A születési adatok hibái (például ismeretlen hely, javaslatokkal együtt) változatlanul jönnek tovább a horoscope-api-ból.
@@ -118,5 +138,5 @@ A [worker](../worker/README.md) kiküldi az e-maileket, megírja az elemzéseket
## Korlátok
- **Saját születési adatok módosítása:** az első mentés után egy órán belül még háromszor javíthatók, utána naponta egyszer (`birth_data_changes` tábla). A tiltott módosítás 429-et ad `birth_data_change_limit` kóddal, a felhasználónak szóló üzenettel („A rendszer csak napi egy módosítást engedélyez. …”). A `/v1/me` `birth_change` mezője mutatja, él-e a napi korlát. Más emberek képleteit ez nem érinti.
- **Személyek** (más emberek képletei, `charts.kind = 'person'`): minden új személy egy `person` egységet használ (`credit_ledger`, `reason = 'person'`); a törlés nem adja vissza. Egységet a személycsomag ad (`PERSON_PACK_SIZE` darab), a korlátlan csomag az `entitlements` tábla `unlimited_persons` sora. Ha elfogyott, 409 `person_limit_reached`. Egy személy születési adatai a felvétel után egy órán belül javíthatók (`PATCH /v1/charts/{id}` `birth` mezővel), utána 409 `person_locked`; részletes elemzés vagy szinasztria után sem. A `/v1/me` `persons` mezője: `used`, `limit`, `left`, `unlimited`.
- **Személyek** (más emberek képletei, `charts.kind = 'person'`): minden új személy egy `person` egységet használ (`credit_ledger`, `reason = 'person'`); a törlés nem adja vissza. Helyet a csomagok adnak; korlátlan az `unlimited_persons` jogosultsággal és futó Korlátlan csomaggal. Ha elfogyott, 409 `person_limit_reached`. Egy személy születési adatai a felvétel után egy órán belül javíthatók (`PATCH /v1/charts/{id}` `birth` mezővel), utána 409 `person_locked`. A név (`label`) bármikor változhat; ha a `birth` ugyanaz, mint a tárolt (vagy ugyanazt a képletet adja), nincs újraszámolás, és az elemzések, összevetések maradnak. Részletes elemzés (képlet vagy összevetés) után sem (409 `person_analysed`), és akkor sem, ha valaki más összevetésében szerepel (409 `person_in_synastry`); a saját, elemzés nélküli összevetései a javításkor törlődnek. A `/v1/me` `persons` mezője: `used`, `limit`, `left`, `unlimited`.
- **Admin:** nincs módosítási korlát, korlátlan személy, a személyek adatai bármikor javíthatók, és a részletes elemzés ingyenes (nem fogy egység).
+31 -4
View File
@@ -2,6 +2,24 @@
use anyhow::{Context, bail};
/// Who may create an account.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum SignupMode {
/// Anyone.
Open,
/// Only invited addresses (or the holder of an invitation link).
Invite,
}
impl SignupMode {
pub fn as_str(self) -> &'static str {
match self {
SignupMode::Open => "open",
SignupMode::Invite => "invite",
}
}
}
#[derive(Debug, Clone)]
pub struct Config {
/// `DATABASE_URL` (required).
@@ -49,8 +67,11 @@ pub struct Config {
pub max_charts_per_user: i64,
/// `FREE_PERSON_SLOTS` (default 0): persons a user may add without a package.
pub free_person_slots: i64,
/// `PERSON_PACK_SIZE` (default 5): persons in one person package.
pub person_pack_size: i64,
/// `UNLIMITED_DAILY_LIMIT` (default 5): new detailed analyses a day with the unlimited package.
pub unlimited_daily_limit: i64,
/// `SIGNUP_MODE` (`invite` or `open`, default `invite`): whether new
/// accounts need an invitation.
pub signup_mode: SignupMode,
}
fn var(name: &str) -> Option<String> {
@@ -105,7 +126,12 @@ impl Config {
prompt_version: var("ANALYSIS_PROMPT_VERSION").unwrap_or_else(|| "v2".into()),
max_charts_per_user: parsed("MAX_CHARTS_PER_USER", 1000)?,
free_person_slots: parsed("FREE_PERSON_SLOTS", 0)?,
person_pack_size: parsed("PERSON_PACK_SIZE", 5)?,
unlimited_daily_limit: parsed("UNLIMITED_DAILY_LIMIT", 5)?,
signup_mode: match var("SIGNUP_MODE").as_deref() {
None | Some("invite") => SignupMode::Invite,
Some("open") => SignupMode::Open,
Some(other) => bail!("invalid SIGNUP_MODE '{other}': use 'invite' or 'open'"),
},
};
if config.session_ttl_days < 1 {
bail!("SESSION_TTL_DAYS must be at least 1");
@@ -135,7 +161,8 @@ impl Config {
prompt_version: "v1".into(),
max_charts_per_user: 50,
free_person_slots: 5,
person_pack_size: 5,
unlimited_daily_limit: 3,
signup_mode: SignupMode::Open,
}
}
}
+4
View File
@@ -16,6 +16,9 @@ pub enum ApiError {
InvalidCredentials(String),
#[error("{0}")]
Forbidden(String),
/// Refused, with a code the frontend acts on (e.g. `not_invited`).
#[error("{message}")]
Refused { code: &'static str, message: String },
#[error("{0} not found")]
NotFound(&'static str),
#[error("{message}")]
@@ -51,6 +54,7 @@ impl ApiError {
ApiError::Unauthorized => (StatusCode::UNAUTHORIZED, "unauthorized"),
ApiError::InvalidCredentials(_) => (StatusCode::UNAUTHORIZED, "invalid_credentials"),
ApiError::Forbidden(_) => (StatusCode::FORBIDDEN, "forbidden"),
ApiError::Refused { code, .. } => (StatusCode::FORBIDDEN, code),
ApiError::NotFound(_) => (StatusCode::NOT_FOUND, "not_found"),
ApiError::Conflict { code, .. } => (StatusCode::CONFLICT, code),
ApiError::Gone(_) => (StatusCode::GONE, "gone"),
+1
View File
@@ -13,6 +13,7 @@ mod config;
mod credits;
mod error;
mod google;
mod packages;
mod persons;
mod routes;
#[cfg(test)]
+305
View File
@@ -0,0 +1,305 @@
//! Packages: what a user can buy (or an admin can give). The catalog is
//! fixed here; see `docs/csomagok.md` for the reasoning behind it.
//!
//! A package gives analysis units and person slots (`credit_ledger` rows
//! with reason `package`) that never expire, or a time-limited `unlimited`
//! entitlement: analyses and persons without limit, with a daily fair-use cap.
use serde_json::{Value, json};
use sqlx::PgConnection;
use time::OffsetDateTime;
use uuid::Uuid;
use crate::credits::Unit;
use crate::error::ApiError;
/// List prices of the single items, for showing what a package saves.
const NATAL_PRICE: i64 = 2_990;
const SYNASTRY_PRICE: i64 = 3_490;
const PERSON_PRICE: i64 = 398; // 1 990 Ft for five
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Tier {
/// The main ladder, shown side by side.
Main,
/// Top-ups for those who already have something.
Addon,
}
#[derive(Debug, Clone, Copy)]
pub struct Package {
pub id: &'static str,
pub name: &'static str,
pub tagline: &'static str,
pub tier: Tier,
/// Gross price (27% VAT included).
pub price_huf: i64,
pub natal: i64,
pub synastry: i64,
pub persons: i64,
/// Months of unlimited analyses and persons.
pub unlimited_months: Option<i64>,
/// Badge on the card ("Legnépszerűbb").
pub badge: Option<&'static str>,
}
pub const CATALOG: [Package; 6] = [
Package {
id: "single",
name: "Egy elemzés",
tagline: "Egy részletes képletelemzés: neked vagy egy felvett személynek.",
tier: Tier::Main,
price_huf: 2_990,
natal: 1,
synastry: 0,
persons: 0,
unlimited_months: None,
badge: None,
},
Package {
id: "couple",
name: "Páros",
tagline: "Te és ő: mindkettőtök képlete és a kapcsolati elemzés.",
tier: Tier::Main,
price_huf: 6_990,
natal: 2,
synastry: 1,
persons: 1,
unlimited_months: None,
badge: None,
},
Package {
id: "family",
name: "Család",
tagline: "Az egész család: öt személy, mindenki képlete, és öt kapcsolat.",
tier: Tier::Main,
price_huf: 11_990,
natal: 6,
synastry: 5,
persons: 5,
unlimited_months: None,
badge: Some("Legnépszerűbb"),
},
Package {
id: "unlimited",
name: "Korlátlan",
tagline: "Egy évig bárki, bármennyi elemzés és összevetés.",
tier: Tier::Main,
price_huf: 17_990,
natal: 0,
synastry: 0,
persons: 0,
unlimited_months: Some(12),
badge: None,
},
Package {
id: "addon_synastry",
name: "+1 kapcsolati elemzés",
tagline: "Egy újabb összevetés részletes elemzése.",
tier: Tier::Addon,
price_huf: 3_490,
natal: 0,
synastry: 1,
persons: 0,
unlimited_months: None,
badge: None,
},
Package {
id: "addon_persons",
name: "+5 személy",
tagline: "Még öt ember képlete (az elemzés külön jár).",
tier: Tier::Addon,
price_huf: 1_990,
natal: 0,
synastry: 0,
persons: 5,
unlimited_months: None,
badge: None,
},
];
pub fn find(id: &str) -> Option<&'static Package> {
CATALOG.iter().find(|p| p.id == id)
}
impl Package {
/// What the contents would cost one by one (`None` for the unlimited one).
fn list_price(&self) -> Option<i64> {
self.unlimited_months
.is_none()
.then(|| self.natal * NATAL_PRICE + self.synastry * SYNASTRY_PRICE + self.persons * PERSON_PRICE)
}
pub fn view(&self) -> Value {
let analyses = self.natal + self.synastry;
let savings = self
.list_price()
.filter(|&list| list > self.price_huf)
.map(|list| ((list - self.price_huf) * 100 + list / 2) / list);
json!({
"id": self.id,
"name": self.name,
"tagline": self.tagline,
"tier": match self.tier { Tier::Main => "main", Tier::Addon => "addon" },
"price_huf": self.price_huf,
"natal": self.natal,
"synastry": self.synastry,
"persons": self.persons,
"unlimited_months": self.unlimited_months,
"badge": self.badge,
"list_price_huf": self.list_price(),
"savings_percent": savings,
"per_analysis_huf": (analyses > 0).then(|| (self.price_huf + analyses / 2) / analyses),
})
}
}
/// Who gives the package.
#[derive(Debug, Clone, Copy)]
pub enum Source {
Admin,
Mock,
}
impl Source {
fn as_str(self) -> &'static str {
match self {
Source::Admin => "admin",
Source::Mock => "mock",
}
}
}
/// Records an order and gives its contents, inside the caller's transaction.
pub async fn grant(
tx: &mut PgConnection,
user_id: Uuid,
package: &Package,
source: Source,
created_by: Option<Uuid>,
note: Option<&str>,
) -> Result<Uuid, ApiError> {
let order = Uuid::now_v7();
let price = match source {
Source::Admin => 0,
Source::Mock => package.price_huf,
};
sqlx::query(
"INSERT INTO package_orders (id, user_id, package, source, price_huf, note, created_by) \
VALUES ($1, $2, $3, $4, $5, $6, $7)",
)
.bind(order)
.bind(user_id)
.bind(package.id)
.bind(source.as_str())
.bind(price as i32)
.bind(note)
.bind(created_by)
.execute(&mut *tx)
.await?;
for (unit, n) in [(Unit::Natal, package.natal), (Unit::Synastry, package.synastry), (Unit::Person, package.persons)]
{
if n == 0 {
continue;
}
sqlx::query(
"INSERT INTO credit_ledger (id, user_id, unit, delta, reason, order_id, note, created_by) \
VALUES ($1, $2, $3, $4, 'package', $5, $6, $7)",
)
.bind(Uuid::now_v7())
.bind(user_id)
.bind(unit.as_str())
.bind(n as i32)
.bind(order)
.bind(package.name)
.bind(created_by)
.execute(&mut *tx)
.await?;
}
if let Some(months) = package.unlimited_months {
// Buying again extends from the current end, not from today.
sqlx::query(
"INSERT INTO entitlements (user_id, entitlement, note, created_by, expires_at) \
VALUES ($1, 'unlimited', $2, $3, now() + make_interval(months => $4)) \
ON CONFLICT (user_id, entitlement) DO UPDATE SET \
expires_at = greatest(entitlements.expires_at, now()) + make_interval(months => $4), \
note = EXCLUDED.note, created_by = EXCLUDED.created_by",
)
.bind(user_id)
.bind(package.name)
.bind(created_by)
.bind(months as i32)
.execute(&mut *tx)
.await?;
}
Ok(order)
}
/// Until when the user's unlimited package runs (`None`: none, or it ended).
pub async fn unlimited_until(conn: &mut PgConnection, user_id: Uuid) -> Result<Option<OffsetDateTime>, ApiError> {
let until: Option<OffsetDateTime> = sqlx::query_scalar(
"SELECT expires_at FROM entitlements \
WHERE user_id = $1 AND entitlement = 'unlimited' AND expires_at > now()",
)
.bind(user_id)
.fetch_optional(conn)
.await?
.flatten();
Ok(until)
}
/// The package to show for the user (header, profile): the running
/// unlimited one, or else the latest bought or given package of the main
/// ladder (top-ups do not count). `None`: no package.
pub async fn current(
conn: &mut PgConnection,
user_id: Uuid,
unlimited_until: Option<OffsetDateTime>,
) -> Result<Option<(&'static Package, OffsetDateTime)>, ApiError> {
let orders: Vec<(String, OffsetDateTime)> =
sqlx::query_as("SELECT package, created_at FROM package_orders WHERE user_id = $1 ORDER BY created_at DESC")
.bind(user_id)
.fetch_all(conn)
.await?;
Ok(orders.into_iter().find_map(|(id, at)| {
let p = find(&id).filter(|p| p.tier == Tier::Main)?;
// While an unlimited package runs, only that is shown; an ended one never.
(p.unlimited_months.is_some() == unlimited_until.is_some()).then_some((p, at))
}))
}
/// The fair-use cap of the unlimited package: new detailed analyses in 24 hours.
pub async fn check_fair_use(conn: &mut PgConnection, user_id: Uuid, daily_limit: i64) -> Result<(), ApiError> {
let (count,): (i64,) = sqlx::query_as(
"SELECT count(*) FROM analyses WHERE requested_by = $1 AND kind IN ('natal', 'synastry') \
AND created_at > now() - interval '24 hours'",
)
.bind(user_id)
.fetch_one(conn)
.await?;
if count >= daily_limit {
return Err(ApiError::Limited {
code: "fair_use_limit",
message: format!(
"A korlátlan csomaggal naponta legfeljebb {daily_limit} új részletes elemzés kérhető. Holnap folytathatod."
),
});
}
Ok(())
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn bigger_packages_are_cheaper_per_analysis() {
let per = |id: &str| find(id).unwrap().view()["per_analysis_huf"].as_i64().unwrap();
assert!(per("single") > per("couple") && per("couple") > per("family"));
assert_eq!(find("family").unwrap().view()["savings_percent"], 68);
assert_eq!(find("couple").unwrap().view()["savings_percent"], 29);
assert!(find("single").unwrap().view()["savings_percent"].is_null());
assert!(find("unlimited").unwrap().view()["list_price_huf"].is_null());
assert!(CATALOG.iter().all(|p| find(p.id).is_some()));
}
}
+4 -3
View File
@@ -1,7 +1,7 @@
//! Persons: charts of other people (name and birth data) a user adds next to
//! their own. Each new person uses one `person` unit, bought in packages;
//! deleting a person does not give it back. An unlimited package
//! (`unlimited_persons` entitlement) and admins have no limit.
//! deleting a person does not give it back. The `unlimited_persons`
//! entitlement, a running unlimited package and admins have no limit.
//!
//! A person's birth data can be corrected within an hour of adding them,
//! then it is locked (admins: any time).
@@ -53,7 +53,8 @@ pub async fn slots(conn: &mut PgConnection, auth: &AuthUser, free: i64) -> Resul
(SELECT COUNT(*) FROM credit_ledger WHERE user_id = $1 AND unit = 'person' AND reason = 'person'), \
(SELECT COALESCE(SUM(delta), 0)::bigint FROM credit_ledger \
WHERE user_id = $1 AND unit = 'person' AND reason <> 'person'), \
EXISTS (SELECT 1 FROM entitlements WHERE user_id = $1 AND entitlement = 'unlimited_persons')",
EXISTS (SELECT 1 FROM entitlements WHERE user_id = $1 \
AND (entitlement = 'unlimited_persons' OR (entitlement = 'unlimited' AND expires_at > now())))",
)
.bind(auth.id())
.fetch_one(conn)
+4
View File
@@ -32,6 +32,8 @@ pub async fn me(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
let balance = credits::balance(&mut conn, auth.id()).await?;
let birth_change = crate::birth_changes::view(&mut conn, &auth).await?;
let persons = crate::persons::slots(&mut conn, &auth, state.config.free_person_slots).await?;
let unlimited = crate::packages::unlimited_until(&mut conn, auth.id()).await?;
let package = crate::packages::current(&mut conn, auth.id(), unlimited).await?;
Ok(Json(json!({
"user": UserView::from(&auth.user),
"providers": providers.into_iter().map(|(p,)| p).collect::<Vec<_>>(),
@@ -39,6 +41,8 @@ pub async fn me(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
"analyses_left": balance.view(),
"birth_change": birth_change,
"persons": persons.view(),
"unlimited_until": rfc3339_opt(unlimited),
"package": package.map(|(p, since)| json!({ "id": p.id, "name": p.name, "since": rfc3339(since) })),
})))
}
+53 -3
View File
@@ -14,6 +14,7 @@ use super::{Body, IdPath, St};
use crate::auth::AdminUser;
use crate::credits::{self, Unit};
use crate::error::{ApiError, ApiResult};
use crate::packages::{self, Source};
use crate::views::{rfc3339, rfc3339_opt};
#[derive(Deserialize)]
@@ -32,12 +33,26 @@ pub async fn list_users(
let limit = query.limit.unwrap_or(50).clamp(1, 200);
let offset = query.offset.unwrap_or(0).max(0);
let pattern = query.q.as_deref().map(|q| format!("%{}%", q.trim().replace(['%', '_'], "")));
type Row = (Uuid, String, Option<String>, Vec<String>, bool, OffsetDateTime, Option<OffsetDateTime>, i64, i64, i64);
type Row = (
Uuid,
String,
Option<String>,
Vec<String>,
bool,
OffsetDateTime,
Option<OffsetDateTime>,
i64,
i64,
i64,
Option<OffsetDateTime>,
);
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 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 = 'synastry'), \
(SELECT e.expires_at FROM entitlements e \
WHERE e.user_id = u.id AND e.entitlement = 'unlimited' AND e.expires_at > now()) \
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",
@@ -49,11 +64,12 @@ 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)| {
.map(|(id, email, name, roles, verified, created, last_login, charts, natal, synastry, unlimited)| {
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},
"unlimited_until": rfc3339_opt(unlimited),
})
})
.collect();
@@ -128,3 +144,37 @@ pub async fn adjust_credits(
let balance = credits::balance(&mut *state.db.acquire().await?, id).await?;
Ok((StatusCode::CREATED, Json(json!({ "user_id": id, "analyses_left": balance.view() }))))
}
#[derive(Deserialize)]
#[serde(deny_unknown_fields)]
pub struct GrantPackage {
package: String,
note: Option<String>,
}
/// Gives a user a package from the catalog (a gift: no payment, price 0).
pub async fn grant_package(
State(state): St,
AdminUser(admin): AdminUser,
WithRejection(Path(id), _): IdPath,
WithRejection(Json(req), _): Body<GrantPackage>,
) -> ApiResult<(StatusCode, Json<Value>)> {
let package = packages::find(&req.package).ok_or(ApiError::NotFound("package"))?;
let exists: Option<(Uuid,)> =
sqlx::query_as("SELECT id FROM users WHERE id = $1").bind(id).fetch_optional(&state.db).await?;
exists.ok_or(ApiError::NotFound("user"))?;
let note = req.note.map(|n| n.trim().chars().take(500).collect::<String>()).filter(|n| !n.is_empty());
let mut tx = state.db.begin().await?;
let order = packages::grant(&mut tx, id, package, Source::Admin, Some(admin.id()), note.as_deref()).await?;
let balance = credits::balance(&mut tx, id).await?;
let unlimited = packages::unlimited_until(&mut tx, id).await?;
tx.commit().await?;
tracing::info!(admin = %admin.id(), user = %id, package = package.id, "package granted");
Ok((
StatusCode::CREATED,
Json(json!({
"order_id": order, "user_id": id, "package": package.id,
"analyses_left": balance.view(), "unlimited_until": rfc3339_opt(unlimited),
})),
))
}
+23 -5
View File
@@ -28,6 +28,7 @@ use crate::AppState;
use crate::auth::AuthUser;
use crate::credits::{self, Unit};
use crate::error::{ApiError, ApiResult};
use crate::packages;
use crate::views::{rfc3339, rfc3339_opt, sha256_hex};
use db::Role;
@@ -118,9 +119,18 @@ 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 get detailed analyses free of charge.
// Admins and a running unlimited package (within its daily cap) use no unit.
let admin = auth.user.has_role(Role::Admin);
let unlimited = !admin && {
let mut conn = state.db.acquire().await?;
let until = packages::unlimited_until(&mut conn, auth.id()).await?;
if until.is_some() {
packages::check_fair_use(&mut conn, auth.id(), state.config.unlimited_daily_limit).await?;
}
until.is_some()
};
let unit = match target {
_ if auth.user.has_role(Role::Admin) => None,
_ if admin || unlimited => None,
Target::Synastry { .. } => Some(Unit::Synastry),
_ => Some(Unit::Natal),
};
@@ -145,8 +155,14 @@ async fn queue(
Target::Summary { chart_id, hash } => ("summary", hash, Some(*chart_id), None),
Target::Synastry { synastry_id, hash } => ("synastry", hash, None, Some(*synastry_id)),
};
let prompt_version = &state.config.prompt_version;
let cache_key = sha256_hex(&format!("{kind}|{hash}|{prompt_version}|{model}|{language}"));
// The cache key leaves out the admin-edited prompt revision, so a chart keeps
// its analysis when the prompt changes; copying from another chart needs the same revision.
let base_version = &state.config.prompt_version;
let cache_key = sha256_hex(&format!("{kind}|{hash}|{base_version}|{model}|{language}"));
let prompt_version = &match super::prompts::current_revision(&state.db, kind, language).await? {
Some(id) => format!("{base_version}-r{id}"),
None => base_version.clone(),
};
// Already requested for this chart/synastry: return it.
let existing: Option<AnalysisRow> = sqlx::query_as(&format!(
@@ -172,9 +188,11 @@ async fn queue(
// 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 status = 'done' LIMIT 1",
"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?;
if let Some((content, input_tokens, output_tokens)) = cached {
+24 -4
View File
@@ -113,16 +113,28 @@ async fn consume_token(conn: &mut PgConnection, token: &str, purpose: &str) -> R
row.map(|(id,)| id).ok_or(ApiError::InvalidToken)
}
/// Queues an e-mail for the worker.
/// Queues an e-mail to a user for the worker.
pub async fn queue_email(conn: &mut PgConnection, user: &User, template: &str, payload: Value) -> Result<(), ApiError> {
queue_email_to(conn, Some(user.id), &user.email, template, &user.locale, payload).await
}
/// Queues an e-mail to any address (e.g. an invitation) for the worker.
pub async fn queue_email_to(
conn: &mut PgConnection,
user_id: Option<Uuid>,
to: &str,
template: &str,
locale: &str,
payload: Value,
) -> Result<(), ApiError> {
sqlx::query(
"INSERT INTO email_outbox (id, user_id, to_email, template, locale, payload) VALUES ($1, $2, $3, $4, $5, $6)",
)
.bind(Uuid::now_v7())
.bind(user.id)
.bind(&user.email)
.bind(user_id)
.bind(to)
.bind(template)
.bind(&user.locale)
.bind(locale)
.bind(payload)
.execute(conn)
.await?;
@@ -156,6 +168,8 @@ pub struct RegisterRequest {
password: String,
display_name: Option<String>,
locale: Option<String>,
/// The invitation link's token, while sign-up needs an invitation.
invite_token: Option<String>,
}
/// Password endpoints answer 403 while `PASSWORD_LOGIN` is off.
@@ -185,6 +199,7 @@ pub async fn register(
if exists.is_some() {
return Err(ApiError::conflict("email_taken", "an account with this e-mail address already exists"));
}
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)
@@ -201,6 +216,7 @@ pub async fn register(
.bind(&email)
.execute(&mut *tx)
.await?;
super::invitations::mark_accepted(&mut tx, user_id, &email, req.invite_token.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?;
@@ -266,6 +282,8 @@ pub async fn login(
pub struct GoogleRequest {
/// ID token (JWT) from Google Identity Services.
id_token: String,
/// The invitation link's token, while sign-up needs an invitation.
invite_token: Option<String>,
}
/// Logs in with Google. An unknown Google account is linked to the existing
@@ -311,6 +329,7 @@ pub async fn google(
(id, false)
}
None => {
super::invitations::admit(&state, &mut tx, &email, req.invite_token.as_deref()).await?;
let id = Uuid::now_v7();
let locale = claims
.locale
@@ -328,6 +347,7 @@ pub async fn google(
.bind(locale)
.execute(&mut *tx)
.await?;
super::invitations::mark_accepted(&mut tx, id, &email, req.invite_token.as_deref()).await?;
(id, true)
}
};
+25 -9
View File
@@ -267,14 +267,25 @@ pub async fn update(
None => chart.label.clone(),
};
let is_primary = req.is_primary.unwrap_or(chart.is_primary);
let recalculated = match req.birth {
// The same birth data again (e.g. only the name changed): no recalculation,
// and the analyses and comparisons stay. A new calculation that gives the
// same chart keeps them too.
let birth = req.birth.map(clean_birth).transpose()?.filter(|b| *b != chart.birth_data);
let recalculated = match birth {
Some(birth) => Some(corrected_birth(&state, &auth, &chart, 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 {
// The old summary (and an admin's analyses) no longer match the chart.
sqlx::query("DELETE FROM analyses WHERE chart_id = $1").bind(id).execute(&mut *tx).await?;
if chart_changed {
// The old summary, the comparisons (and an admin's analyses) no longer match the chart.
sqlx::query("DELETE FROM analyses WHERE chart_id = $1").bind(id).execute(&mut *tx).await?;
sqlx::query("DELETE FROM synastries WHERE chart1_id = $1 OR chart2_id = $1")
.bind(id)
.execute(&mut *tx)
.await?;
}
sqlx::query("UPDATE charts SET birth_data = $1, result = $2, chart_hash = $3 WHERE id = $4")
.bind(birth)
.bind(result)
@@ -302,7 +313,7 @@ pub async fn update(
birth_changes::record(&mut tx, &auth, id).await?;
}
tx.commit().await?;
if recalculated.is_some() {
if chart_changed {
queue_summary(&state, &auth, &row).await;
}
Ok(Json(row.owner_view()))
@@ -322,11 +333,16 @@ async fn corrected_birth(
return Err(ApiError::conflict("person_locked", persons::LOCKED_MESSAGE));
}
let admin = auth.user.has_role(db::Role::Admin);
let (analysed, in_synastry): (bool, bool) = sqlx::query_as(
"SELECT EXISTS (SELECT 1 FROM analyses WHERE chart_id = $1 AND kind <> 'summary' AND status <> 'failed'), \
EXISTS (SELECT 1 FROM synastries WHERE chart1_id = $1 OR chart2_id = $1)",
// The user's own comparisons with the person are deleted on correction (they
// no longer match), unless a paid analysis was written for one of them.
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'), \
EXISTS (SELECT 1 FROM synastries WHERE (chart1_id = $1 OR chart2_id = $1) AND owner_id <> $2)",
)
.bind(chart.id)
.bind(auth.id())
.fetch_one(&state.db)
.await?;
if analysed && !admin {
@@ -335,10 +351,10 @@ async fn corrected_birth(
"Ehhez a személyhez már készült részletes elemzés, ezért az adatai nem módosíthatók.",
));
}
if in_synastry {
if foreign_synastry {
return Err(ApiError::conflict(
"person_in_synastry",
"A személy szerepel egy összevetésben, ezért az adatai nem módosíthatók.",
"A személy szerepel valaki más összevetésében, ezért az adatai nem módosíthatók.",
));
}
calculate(state, birth).await
+547
View File
@@ -0,0 +1,547 @@
//! Invitations to the closed site.
//!
//! While `SIGNUP_MODE=invite`, a new account needs an open invitation for its
//! e-mail address, or an invitation link (then any address will do, because
//! people often sign in with another Google account than the one their friend
//! knows). Only administrators invite; the worker sends the e-mails.
//!
//! People who asked for no more invitations are kept as the hash of their
//! address. People without an invitation can join the waitlist.
use axum::Json;
use axum::extract::{Path, Query, State};
use axum::http::StatusCode;
use axum_extra::extract::WithRejection;
use serde::Deserialize;
use serde_json::{Value, json};
use sqlx::PgConnection;
use time::OffsetDateTime;
use uuid::Uuid;
use super::auth::{normalize_email, queue_email_to, validate_locale};
use super::{Body, IdPath, St};
use crate::AppState;
use crate::auth::AdminUser;
use crate::config::SignupMode;
use crate::error::{ApiError, ApiResult};
use crate::views::{rfc3339, rfc3339_opt};
pub const INVITATION_TTL: time::Duration = time::Duration::days(30);
/// A resend is possible this often, and at most this many sendings in all.
const RESEND_GAP: time::Duration = time::Duration::hours(24);
const MAX_SENDINGS: i32 = 3;
const MAX_MESSAGE_CHARS: usize = 300;
const MAX_BATCH: usize = 50;
// --- the gate -------------------------------------------------------------------------------
/// Whether a new account may be created for `email` (with the invitation link
/// `token`, if the visitor came through one).
pub async fn admit(
state: &AppState,
conn: &mut PgConnection,
email: &str,
token: Option<&str>,
) -> Result<(), ApiError> {
if state.config.signup_mode == SignupMode::Open || state.config.bootstrap_admin_emails.iter().any(|e| e == email) {
return Ok(());
}
let hash = token.map(|t| db::token_hash(t.trim()));
let invited: bool = sqlx::query_scalar(
"SELECT EXISTS (SELECT 1 FROM invitations i WHERE i.accepted_at IS NULL AND i.revoked_at IS NULL \
AND i.expires_at > now() \
AND (i.email = $1 OR i.id IN (SELECT invitation_id FROM invitation_tokens WHERE token_hash = $2))) \
-- a \"how compatible are we?\" link also lets the invitee in
OR EXISTS (SELECT 1 FROM synastry_invites WHERE token_hash = $2 AND accepted_at IS NULL AND expires_at > now())",
)
.bind(email)
.bind(hash)
.fetch_one(&mut *conn)
.await?;
if invited {
Ok(())
} else {
Err(ApiError::Refused {
code: "not_invited",
message: "A Sorsfonalak jelenleg meghívásos: ehhez az e-mail-címhez nem tartozik meghívó.".into(),
})
}
}
/// After a new account is created: its invitations count as accepted, and it leaves the waitlist.
pub async fn mark_accepted(
conn: &mut PgConnection,
user_id: Uuid,
email: &str,
token: Option<&str>,
) -> Result<(), ApiError> {
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)))",
)
.bind(user_id)
.bind(email)
.bind(hash)
.execute(&mut *conn)
.await?;
sqlx::query("DELETE FROM waitlist WHERE email = $1").bind(email).execute(&mut *conn).await?;
Ok(())
}
// --- sending ---------------------------------------------------------------------------------
fn clean_message(message: Option<String>) -> Result<Option<String>, ApiError> {
let Some(message) = message.map(|m| m.replace("\r\n", "\n").trim().to_owned()).filter(|m| !m.is_empty()) else {
return Ok(None);
};
if message.chars().count() > MAX_MESSAGE_CHARS {
return Err(ApiError::BadRequest(format!("A személyes üzenet legfeljebb {MAX_MESSAGE_CHARS} karakter lehet.")));
}
// Links in a mail from our domain are what spammers would use this field for.
let lower = message.to_lowercase();
if lower.contains("://") || lower.contains("www.") {
return Err(ApiError::BadRequest("A személyes üzenetben nem lehet link.".into()));
}
Ok(Some(message))
}
fn links(state: &AppState, token: &str) -> (String, String, String) {
let base = &state.config.public_base_url;
(
format!("{base}/meghivo/{token}"),
format!("{base}/leiratkozas?token={token}"),
format!("{base}/api/v1/public/invitations/unsubscribe?token={token}"),
)
}
fn payload(
state: &AppState,
token: &str,
inviter: Option<&str>,
message: Option<&str>,
expires: OffsetDateTime,
) -> Value {
let (url, unsubscribe_url, unsubscribe_post_url) = links(state, token);
json!({
"url": url,
"unsubscribe_url": unsubscribe_url,
"unsubscribe_post_url": unsubscribe_post_url,
"inviter_name": inviter,
"message": message,
"expires_on": expires.date().to_string(),
})
}
/// Issues a new link token for an invitation and queues the e-mail; returns the link.
#[allow(clippy::too_many_arguments)]
async fn send(
state: &AppState,
conn: &mut PgConnection,
id: Uuid,
email: &str,
locale: &str,
inviter: Option<&str>,
message: Option<&str>,
expires: OffsetDateTime,
) -> Result<String, ApiError> {
let token = db::new_token();
sqlx::query("INSERT INTO invitation_tokens (token_hash, invitation_id) VALUES ($1, $2)")
.bind(db::token_hash(&token))
.bind(id)
.execute(&mut *conn)
.await?;
let payload = payload(state, &token, inviter, message, expires);
let url = payload["url"].as_str().unwrap_or_default().to_owned();
queue_email_to(conn, None, email, "invitation", locale, payload).await?;
Ok(url)
}
async fn opted_out(conn: &mut PgConnection, email: &str) -> Result<bool, ApiError> {
Ok(sqlx::query_scalar("SELECT EXISTS (SELECT 1 FROM email_optouts WHERE email_hash = $1)")
.bind(db::token_hash(email))
.fetch_one(conn)
.await?)
}
// --- admin ------------------------------------------------------------------------------------
#[derive(Deserialize)]
#[serde(deny_unknown_fields)]
pub struct CreateInvitations {
emails: Vec<String>,
message: Option<String>,
locale: Option<String>,
}
/// Invites a list of addresses. Each gets a result: `invited` (with the
/// link, to pass on by hand if needed), `already_user`, `already_invited`,
/// `opted_out` or `invalid`.
pub async fn create(
State(state): St,
AdminUser(admin): AdminUser,
WithRejection(Json(req), _): Body<CreateInvitations>,
) -> ApiResult<(StatusCode, Json<Value>)> {
if req.emails.is_empty() || req.emails.len() > MAX_BATCH {
return Err(ApiError::BadRequest(format!("1–{MAX_BATCH} e-mail-cím adható meg egyszerre.")));
}
let message = clean_message(req.message)?;
let locale = validate_locale(&state, req.locale.as_deref())?;
let inviter = admin.user.display_name.clone();
let mut results = Vec::new();
let mut seen = std::collections::HashSet::new();
let mut tx = state.db.begin().await?;
for raw in &req.emails {
let raw = raw.trim();
let Ok(email) = normalize_email(raw) else {
results.push(json!({ "email": raw, "status": "invalid" }));
continue;
};
if !seen.insert(email.clone()) {
continue;
}
let user: bool = sqlx::query_scalar("SELECT EXISTS (SELECT 1 FROM users WHERE email = $1)")
.bind(&email)
.fetch_one(&mut *tx)
.await?;
if user {
results.push(json!({ "email": email, "status": "already_user" }));
continue;
}
if opted_out(&mut tx, &email).await? {
results.push(json!({ "email": email, "status": "opted_out" }));
continue;
}
// An expired open invitation gives way to the new one.
sqlx::query(
"UPDATE invitations SET revoked_at = now() \
WHERE email = $1 AND accepted_at IS NULL AND revoked_at IS NULL AND expires_at <= now()",
)
.bind(&email)
.execute(&mut *tx)
.await?;
let id = Uuid::now_v7();
let expires = OffsetDateTime::now_utc() + INVITATION_TTL;
let inserted = sqlx::query(
"INSERT INTO invitations (id, email, message, locale, invited_by, expires_at) \
VALUES ($1, $2, $3, $4, $5, $6) ON CONFLICT DO NOTHING",
)
.bind(id)
.bind(&email)
.bind(&message)
.bind(&locale)
.bind(admin.id())
.bind(expires)
.execute(&mut *tx)
.await?
.rows_affected();
if inserted == 0 {
results.push(json!({ "email": email, "status": "already_invited" }));
continue;
}
let url = send(&state, &mut tx, id, &email, &locale, inviter.as_deref(), message.as_deref(), expires).await?;
results.push(json!({ "email": email, "status": "invited", "id": id, "url": url }));
}
tx.commit().await?;
Ok((StatusCode::CREATED, Json(json!({ "results": results }))))
}
#[derive(sqlx::FromRow)]
struct Row {
id: Uuid,
email: String,
message: Option<String>,
locale: String,
created_at: OffsetDateTime,
expires_at: OffsetDateTime,
sent_count: i32,
last_sent_at: OffsetDateTime,
accepted_at: Option<OffsetDateTime>,
revoked_at: Option<OffsetDateTime>,
invited_by_name: Option<String>,
accepted_by_name: Option<String>,
mail_created_at: Option<OffsetDateTime>,
mail_sent_at: Option<OffsetDateTime>,
mail_failed_at: Option<OffsetDateTime>,
mail_error: Option<String>,
}
fn status(accepted: Option<OffsetDateTime>, revoked: Option<OffsetDateTime>, expires: OffsetDateTime) -> &'static str {
if accepted.is_some() {
"accepted"
} else if revoked.is_some() {
"revoked"
} else if expires <= OffsetDateTime::now_utc() {
"expired"
} else {
"pending"
}
}
/// Every invitation (newest first) with the state of its last e-mail, and the waitlist.
pub async fn list(State(state): St, _admin: AdminUser) -> ApiResult<Json<Value>> {
let rows: Vec<Row> = sqlx::query_as(
"SELECT i.id, i.email, i.message, i.locale, i.created_at, i.expires_at, i.sent_count, i.last_sent_at, \
i.accepted_at, i.revoked_at, inv.display_name AS invited_by_name, \
coalesce(acc.display_name, acc.email) AS accepted_by_name, \
m.created_at AS mail_created_at, m.sent_at AS mail_sent_at, m.failed_at AS mail_failed_at, m.last_error AS mail_error \
FROM invitations i \
LEFT JOIN users inv ON inv.id = i.invited_by \
LEFT JOIN users acc ON acc.id = i.accepted_by \
LEFT JOIN LATERAL (SELECT created_at, sent_at, failed_at, last_error FROM email_outbox \
WHERE to_email = i.email AND template = 'invitation' \
ORDER BY created_at DESC LIMIT 1) m ON true \
ORDER BY i.created_at DESC LIMIT 500",
)
.fetch_all(&state.db)
.await?;
let now = OffsetDateTime::now_utc();
let invitations: Vec<Value> = rows
.into_iter()
.map(|r| {
let status = status(r.accepted_at, r.revoked_at, r.expires_at);
// Sent e-mails are removed from the outbox after a week.
let mail = match (r.mail_created_at, r.mail_sent_at, r.mail_failed_at) {
(None, _, _) => "archived",
(_, Some(_), _) => "sent",
(_, None, Some(_)) => "failed",
_ => "queued",
};
let can_resend = matches!(status, "pending" | "expired")
&& r.sent_count < MAX_SENDINGS
&& r.last_sent_at + RESEND_GAP <= now;
json!({
"id": r.id, "email": r.email, "message": r.message, "locale": r.locale, "status": status,
"created_at": rfc3339(r.created_at), "expires_at": rfc3339(r.expires_at),
"sent_count": r.sent_count, "last_sent_at": rfc3339(r.last_sent_at),
"accepted_at": rfc3339_opt(r.accepted_at), "accepted_by": r.accepted_by_name,
"invited_by": r.invited_by_name,
"mail": mail, "mail_error": r.mail_error, "can_resend": can_resend,
})
})
.collect();
let waitlist: Vec<(String, String, OffsetDateTime, Option<String>)> = sqlx::query_as(
"SELECT w.email, w.locale, w.created_at, \
(SELECT CASE WHEN accepted_at IS NOT NULL THEN 'accepted' WHEN expires_at > now() THEN 'pending' END \
FROM invitations WHERE email = w.email AND revoked_at IS NULL ORDER BY created_at DESC LIMIT 1) \
FROM waitlist w ORDER BY w.created_at",
)
.fetch_all(&state.db)
.await?;
let waitlist: Vec<Value> = waitlist
.into_iter()
.map(|(email, locale, created, invitation)| {
json!({ "email": email, "locale": locale, "created_at": rfc3339(created), "invitation": invitation })
})
.collect();
Ok(Json(
json!({ "invitations": invitations, "waitlist": waitlist, "signup_mode": state.config.signup_mode.as_str() }),
))
}
/// Sends the invitation again with a new link (the earlier links keep
/// working), and gives it another 30 days.
pub async fn resend(
State(state): St,
AdminUser(admin): AdminUser,
WithRejection(Path(id), _): IdPath,
) -> ApiResult<Json<Value>> {
let mut tx = state.db.begin().await?;
#[derive(sqlx::FromRow)]
struct Open {
email: String,
message: Option<String>,
locale: String,
sent_count: i32,
last_sent_at: OffsetDateTime,
closed: bool,
}
let Open { email, message, locale, sent_count, last_sent_at: last_sent, closed } = sqlx::query_as(
"SELECT email, message, locale, sent_count, last_sent_at, \
accepted_at IS NOT NULL OR revoked_at IS NOT NULL AS closed \
FROM invitations WHERE id = $1 FOR UPDATE",
)
.bind(id)
.fetch_optional(&mut *tx)
.await?
.ok_or(ApiError::NotFound("invitation"))?;
if closed {
return Err(ApiError::conflict("invitation_closed", "Ezt a meghívót már elfogadták vagy visszavonták."));
}
if sent_count >= MAX_SENDINGS {
return Err(ApiError::conflict(
"resend_limit",
format!("Egy meghívó legfeljebb {MAX_SENDINGS}-szor küldhető el (spamvédelem)."),
));
}
if last_sent + RESEND_GAP > OffsetDateTime::now_utc() {
return Err(ApiError::conflict("resend_too_soon", "Újraküldés legkorábban 24 órával az előző küldés után."));
}
if opted_out(&mut tx, &email).await? {
return Err(ApiError::conflict("opted_out", "Ez a cím leiratkozott a meghívókról."));
}
let expires = OffsetDateTime::now_utc() + INVITATION_TTL;
sqlx::query(
"UPDATE invitations SET sent_count = sent_count + 1, last_sent_at = now(), expires_at = $2 WHERE id = $1",
)
.bind(id)
.bind(expires)
.execute(&mut *tx)
.await?;
let inviter = admin.user.display_name.clone();
let url = send(&state, &mut tx, id, &email, &locale, inviter.as_deref(), message.as_deref(), expires).await?;
tx.commit().await?;
Ok(Json(json!({ "id": id, "url": url, "expires_at": rfc3339(expires) })))
}
pub async fn revoke(State(state): St, _admin: AdminUser, WithRejection(Path(id), _): IdPath) -> ApiResult<StatusCode> {
let done = sqlx::query(
"UPDATE invitations SET revoked_at = now() WHERE id = $1 AND accepted_at IS NULL AND revoked_at IS NULL",
)
.bind(id)
.execute(&state.db)
.await?
.rows_affected();
if done == 0 {
return Err(ApiError::NotFound("open invitation"));
}
Ok(StatusCode::NO_CONTENT)
}
pub async fn remove_from_waitlist(
State(state): St,
_admin: AdminUser,
WithRejection(Path(email), _): WithRejection<Path<String>, ApiError>,
) -> ApiResult<StatusCode> {
sqlx::query("DELETE FROM waitlist WHERE email = $1").bind(email.trim().to_lowercase()).execute(&state.db).await?;
Ok(StatusCode::NO_CONTENT)
}
#[derive(Deserialize)]
#[serde(deny_unknown_fields)]
pub struct PreviewRequest {
message: Option<String>,
locale: Option<String>,
/// Also send it to the admin's own address.
#[serde(default)]
send_to_me: bool,
}
/// The invitation e-mail with sample links (they lead nowhere), and
/// optionally a test copy to the admin.
pub async fn preview(
State(state): St,
AdminUser(admin): AdminUser,
WithRejection(Json(req), _): Body<PreviewRequest>,
) -> ApiResult<Json<Value>> {
let message = clean_message(req.message)?;
let locale = validate_locale(&state, req.locale.as_deref())?;
let payload = payload(
&state,
"minta",
admin.user.display_name.as_deref(),
message.as_deref(),
OffsetDateTime::now_utc() + INVITATION_TTL,
);
let mail = email_templates::render("invitation", &locale, &payload)
.map_err(|e| ApiError::Internal(format!("invitation template: {e}")))?;
if req.send_to_me {
let mut conn = state.db.acquire().await?;
queue_email_to(&mut conn, Some(admin.id()), &admin.user.email, "invitation", &locale, payload).await?;
}
Ok(Json(json!({
"subject": mail.subject, "text": mail.text, "html": mail.html,
"sent_to": req.send_to_me.then_some(&admin.user.email),
})))
}
// --- public -------------------------------------------------------------------------------------
/// Landing data of an invitation link.
pub async fn public_view(State(state): St, Path(token): Path<String>) -> ApiResult<Json<Value>> {
#[derive(sqlx::FromRow)]
struct Landing {
inviter: Option<String>,
message: Option<String>,
expires_at: OffsetDateTime,
accepted_at: Option<OffsetDateTime>,
revoked_at: Option<OffsetDateTime>,
}
let l: Landing = sqlx::query_as(
"SELECT u.display_name AS inviter, i.message, i.expires_at, i.accepted_at, i.revoked_at \
FROM invitation_tokens t JOIN invitations i ON i.id = t.invitation_id \
LEFT JOIN users u ON u.id = i.invited_by WHERE t.token_hash = $1",
)
.bind(db::token_hash(token.trim()))
.fetch_optional(&state.db)
.await?
.ok_or(ApiError::NotFound("invitation"))?;
Ok(Json(json!({
"inviter_name": l.inviter,
"message": l.message,
"status": status(l.accepted_at, l.revoked_at, l.expires_at),
"expires_at": rfc3339(l.expires_at),
})))
}
#[derive(Deserialize)]
pub struct TokenQuery {
token: String,
}
/// "No more invitations": from the page behind the footer link, or straight
/// from the mail client's unsubscribe button (RFC 8058 one-click POST).
pub async fn unsubscribe(
State(state): St,
WithRejection(Query(q), _): WithRejection<Query<TokenQuery>, ApiError>,
) -> ApiResult<Json<Value>> {
let mut tx = state.db.begin().await?;
let email: Option<String> = sqlx::query_scalar(
"SELECT i.email FROM invitation_tokens t JOIN invitations i ON i.id = t.invitation_id WHERE t.token_hash = $1",
)
.bind(db::token_hash(q.token.trim()))
.fetch_optional(&mut *tx)
.await?;
let email = email.ok_or(ApiError::NotFound("invitation"))?;
sqlx::query("INSERT INTO email_optouts (email_hash) VALUES ($1) ON CONFLICT DO NOTHING")
.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",
)
.bind(&email)
.execute(&mut *tx)
.await?;
tx.commit().await?;
Ok(Json(json!({ "unsubscribed": true })))
}
#[derive(Deserialize)]
#[serde(deny_unknown_fields)]
pub struct WaitlistRequest {
email: String,
locale: Option<String>,
}
/// Joins the waitlist. Always answers the same, so it does not reveal who has an account.
pub async fn join_waitlist(
State(state): St,
WithRejection(Json(req), _): Body<WaitlistRequest>,
) -> ApiResult<(StatusCode, Json<Value>)> {
let email = normalize_email(&req.email)?;
let locale = validate_locale(&state, req.locale.as_deref())?;
sqlx::query(
"INSERT INTO waitlist (email, locale) SELECT $1, $2 \
WHERE NOT EXISTS (SELECT 1 FROM users WHERE email = $1) \
AND (SELECT count(*) FROM waitlist) < 10000 \
ON CONFLICT DO NOTHING",
)
.bind(&email)
.bind(&locale)
.execute(&state.db)
.await?;
Ok((StatusCode::ACCEPTED, Json(json!({ "ok": true }))))
}
+18 -1
View File
@@ -10,7 +10,9 @@ mod admin;
mod analyses;
mod auth;
mod charts;
mod invitations;
mod payments;
mod prompts;
mod shares;
mod synastries;
@@ -49,6 +51,7 @@ pub fn router(state: Arc<AppState>) -> Router {
Router::new()
.route("/healthz", get(health))
.route("/v1/config", get(public_config))
.route("/v1/packages", get(payments::catalog))
// login
.route("/v1/auth/register", post(auth::register))
.route("/v1/auth/login", post(auth::login))
@@ -85,10 +88,23 @@ pub fn router(state: Arc<AppState>) -> Router {
// public, no login
.route("/v1/public/shares/{slug}", get(shares::public_view))
.route("/v1/public/invites/{token}", get(synastries::public_invite))
.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))
// administration
.route("/v1/admin/users", get(admin::list_users))
.route("/v1/admin/users/{id}", patch(admin::update_user))
.route("/v1/admin/users/{id}/credits", post(admin::adjust_credits))
.route("/v1/admin/users/{id}/packages", post(admin::grant_package))
.route("/v1/admin/invitations", get(invitations::list).post(invitations::create))
.route("/v1/admin/invitations/preview", post(invitations::preview))
.route("/v1/admin/invitations/{id}", delete(invitations::revoke))
.route("/v1/admin/invitations/{id}/resend", post(invitations::resend))
.route("/v1/admin/waitlist/{email}", delete(invitations::remove_from_waitlist))
.route("/v1/admin/prompts", get(prompts::list))
.route("/v1/admin/prompts/{kind}/{language}", axum::routing::put(prompts::save))
.route("/v1/admin/prompts/{kind}/{language}/preview", post(prompts::start_preview))
.route("/v1/admin/previews/{id}", get(prompts::get_preview))
.layer(cors(&state.config.cors_allowed_origins))
.layer(
TraceLayer::new_for_http()
@@ -122,7 +138,8 @@ async fn public_config(State(state): St) -> Json<Value> {
"summary_model": c.summary_model,
"password_login": c.password_login,
"mock_payments": c.mock_payments,
"person_pack_size": c.person_pack_size,
"unlimited_daily_limit": c.unlimited_daily_limit,
"signup_mode": c.signup_mode.as_str(),
"password_min_length": crate::auth::MIN_PASSWORD_LEN,
}))
}
+35 -45
View File
@@ -1,38 +1,49 @@
//! Payments. Until Stripe is connected, `MOCK_PAYMENTS=true` turns on a
//! stand-in: "paying" grants what was bought right away (an analysis unit or
//! a person package), so the paid flow can be used end to end.
//! 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.
use axum::Json;
use axum::extract::State;
use axum_extra::extract::WithRejection;
use serde::Deserialize;
use serde_json::{Value, json};
use uuid::Uuid;
use super::{Body, St};
use crate::auth::AuthUser;
use crate::credits::{self, Unit};
use crate::error::{ApiError, ApiResult};
use crate::packages::{self, CATALOG, Source};
use crate::persons;
use crate::views::rfc3339;
/// The package catalog (public).
pub async fn catalog() -> Json<Value> {
Json(json!({ "packages": CATALOG.iter().map(packages::Package::view).collect::<Vec<_>>() }))
}
#[derive(Deserialize)]
#[serde(deny_unknown_fields)]
pub struct MockPayment {
/// One analysis unit.
/// A package id from the catalog.
package: Option<String>,
/// Shorthand: the cheapest package with one unit of this kind.
unit: Option<Unit>,
package: Option<Package>,
}
#[derive(Debug, Clone, Copy, Deserialize)]
#[serde(rename_all = "snake_case")]
pub enum Package {
/// `PERSON_PACK_SIZE` more persons.
Persons,
/// Any number of persons.
PersonsUnlimited,
/// What the user has now: units left, person slots, the unlimited package.
pub async fn holdings(state: &crate::AppState, auth: &AuthUser) -> Result<Value, ApiError> {
let mut conn = state.db.acquire().await?;
let balance = credits::balance(&mut conn, auth.id()).await?;
let persons = persons::slots(&mut conn, auth, state.config.free_person_slots).await?;
let until = packages::unlimited_until(&mut conn, auth.id()).await?;
Ok(json!({
"analyses_left": balance.view(),
"persons": persons.view(),
"unlimited_until": until.map(rfc3339),
}))
}
/// Grants an analysis unit or a person package as a (pretend) purchase.
/// Grants a package as a (pretend) purchase.
pub async fn mock(
State(state): St,
auth: AuthUser,
@@ -41,38 +52,17 @@ pub async fn mock(
if !state.config.mock_payments {
return Err(ApiError::NotFound("payment method"));
}
let (unit, delta) = match (req.unit, req.package) {
(Some(unit), None) => (Some(unit), 1),
(None, Some(Package::Persons)) => (Some(Unit::Person), state.config.person_pack_size),
(None, Some(Package::PersonsUnlimited)) => (None, 0),
_ => return Err(ApiError::BadRequest("give either unit or package".into())),
let id = match (req.package.as_deref(), req.unit) {
(Some(id), None) => id,
(None, Some(Unit::Natal)) => "single",
(None, Some(Unit::Synastry)) => "addon_synastry",
(None, Some(Unit::Person)) => "addon_persons",
_ => return Err(ApiError::BadRequest("give either package or unit".into())),
};
let package = packages::find(id).ok_or(ApiError::NotFound("package"))?;
let mut tx = state.db.begin().await?;
match unit {
Some(unit) => {
sqlx::query(
"INSERT INTO credit_ledger (id, user_id, unit, delta, reason, note) \
VALUES ($1, $2, $3, $4, 'purchase', 'mock payment')",
)
.bind(Uuid::now_v7())
.bind(auth.id())
.bind(unit.as_str())
.bind(delta as i32)
.execute(&mut *tx)
.await?;
}
None => {
sqlx::query(
"INSERT INTO entitlements (user_id, entitlement, note) VALUES ($1, 'unlimited_persons', 'mock payment') \
ON CONFLICT DO NOTHING",
)
.bind(auth.id())
.execute(&mut *tx)
.await?;
}
}
let balance = credits::balance(&mut tx, auth.id()).await?;
let persons = persons::slots(&mut tx, &auth, state.config.free_person_slots).await?;
packages::grant(&mut tx, auth.id(), package, Source::Mock, Some(auth.id()), Some("mock payment")).await?;
tx.commit().await?;
Ok(Json(json!({ "analyses_left": balance.view(), "persons": persons.view() })))
tracing::info!(user = %auth.id(), package = package.id, "mock payment");
Ok(Json(holdings(&state, &auth).await?))
}
+280
View File
@@ -0,0 +1,280 @@
//! Editable system prompts of the analyses (admin only).
//!
//! Every save adds a row to `prompt_revisions`; the newest row of a
//! (kind, language) is in force, `system` NULL meaning the built-in text.
//! New analyses record the revision in `prompt_version`, so analyses that
//! are already written or queued keep the text they were started with.
//!
//! A draft can be tried on one of the admin's own charts first: a row in
//! `prompt_previews` that the worker writes like an analysis, but it is never
//! shown to users, cached or charged.
use analysis_prompt::{Kind, default_system, user_template};
use axum::Json;
use axum::extract::{Path, State};
use axum::http::StatusCode;
use axum_extra::extract::WithRejection;
use serde::Deserialize;
use serde_json::{Value, json};
use sqlx::PgPool;
use time::OffsetDateTime;
use uuid::Uuid;
use super::{Body, IdPath, St};
use crate::AppState;
use crate::auth::AdminUser;
use crate::error::{ApiError, ApiResult};
use crate::views::{rfc3339, rfc3339_opt};
/// The kinds whose prompt the admin page edits.
const EDITABLE: [Kind; 3] = [Kind::Summary, Kind::Natal, Kind::Synastry];
const MAX_CHARS: usize = 50_000;
const HISTORY: i64 = 20;
/// Test runs of one admin waiting or being written at the same time.
const MAX_OPEN_PREVIEWS: i64 = 3;
/// The revision id of an admin-edited prompt in force, `None` for the built-in one.
pub async fn current_revision(db: &PgPool, kind: &str, language: &str) -> Result<Option<i64>, sqlx::Error> {
let row: Option<(i64, bool)> = sqlx::query_as(
"SELECT id, system IS NOT NULL FROM prompt_revisions WHERE kind = $1 AND language = $2 ORDER BY id DESC LIMIT 1",
)
.bind(kind)
.bind(language)
.fetch_optional(db)
.await?;
Ok(row.filter(|(_, custom)| *custom).map(|(id, _)| id))
}
type RevisionRow = (i64, Option<String>, OffsetDateTime, Option<String>);
async fn entry(db: &PgPool, kind: Kind, language: &str) -> Result<Value, sqlx::Error> {
let rows: Vec<RevisionRow> = sqlx::query_as(
"SELECT r.id, r.system, r.created_at, u.email FROM prompt_revisions r \
LEFT JOIN users u ON u.id = r.created_by \
WHERE r.kind = $1 AND r.language = $2 ORDER BY r.id DESC LIMIT $3",
)
.bind(kind.as_str())
.bind(language)
.bind(HISTORY)
.fetch_all(db)
.await?;
let default = default_system(kind, language);
let current = rows.first();
let history: Vec<Value> = rows
.iter()
.map(|(id, system, at, by)| {
json!({"id": id, "custom": system.is_some(), "system": system, "created_at": rfc3339(*at), "created_by": by})
})
.collect();
Ok(json!({
"kind": kind.as_str(),
"language": language,
"system": current.and_then(|r| r.1.clone()).unwrap_or_else(|| default.clone()),
"custom": current.is_some_and(|r| r.1.is_some()),
"updated_at": current.map(|r| rfc3339(r.2)),
"updated_by": current.and_then(|r| r.3.clone()),
"default": default,
"user_template": user_template(kind),
"history": history,
}))
}
pub async fn list(State(state): St, _admin: AdminUser) -> ApiResult<Json<Value>> {
let mut prompts = Vec::new();
for kind in EDITABLE {
for language in &state.config.supported_locales {
prompts.push(entry(&state.db, kind, language).await?);
}
}
Ok(Json(json!({ "prompts": prompts })))
}
#[derive(Deserialize)]
#[serde(deny_unknown_fields)]
pub struct SavePrompt {
/// The new system prompt; `null` restores the built-in one.
system: Option<String>,
}
fn parse_target(state: &AppState, kind: &str, language: &str) -> Result<Kind, ApiError> {
let kind = Kind::parse(kind).filter(|k| EDITABLE.contains(k)).ok_or(ApiError::NotFound("prompt"))?;
if !state.config.supported_locales.iter().any(|l| l == language) {
return Err(ApiError::NotFound("prompt"));
}
Ok(kind)
}
/// Trims a submitted prompt and checks its length.
fn clean_system(text: &str) -> Result<String, ApiError> {
let text = text.trim().replace("\r\n", "\n");
if text.is_empty() {
return Err(ApiError::BadRequest("the prompt must not be empty".into()));
}
if text.chars().count() > MAX_CHARS {
return Err(ApiError::BadRequest(format!("the prompt is longer than {MAX_CHARS} characters")));
}
Ok(text)
}
pub async fn save(
State(state): St,
AdminUser(admin): AdminUser,
WithRejection(Path((kind, language)), _): WithRejection<Path<(String, String)>, ApiError>,
WithRejection(Json(req), _): Body<SavePrompt>,
) -> ApiResult<Json<Value>> {
let kind = parse_target(&state, &kind, &language)?;
let default = default_system(kind, &language);
// The built-in text is stored as NULL, so later code changes reach it.
let system = match req.system.as_deref().map(clean_system).transpose()? {
Some(s) if s == default.trim() => None,
other => other,
};
let current: Option<(Option<String>,)> = sqlx::query_as(
"SELECT system FROM prompt_revisions WHERE kind = $1 AND language = $2 ORDER BY id DESC LIMIT 1",
)
.bind(kind.as_str())
.bind(&language)
.fetch_optional(&state.db)
.await?;
let unchanged = match &current {
Some((text,)) => *text == system,
None => system.is_none(),
};
if !unchanged {
sqlx::query("INSERT INTO prompt_revisions (kind, language, system, created_by) VALUES ($1, $2, $3, $4)")
.bind(kind.as_str())
.bind(&language)
.bind(&system)
.bind(admin.id())
.execute(&state.db)
.await?;
tracing::info!(admin = %admin.id(), kind = kind.as_str(), %language, custom = system.is_some(), "prompt changed");
}
Ok(Json(entry(&state.db, kind, &language).await?))
}
#[derive(Deserialize)]
#[serde(deny_unknown_fields)]
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.
chart_id: Option<Uuid>,
/// One of the admin's own comparisons, for a synastry analysis.
synastry_id: Option<Uuid>,
}
#[derive(sqlx::FromRow)]
struct PreviewRow {
id: Uuid,
kind: String,
chart_id: Option<Uuid>,
synastry_id: Option<Uuid>,
language: String,
model: String,
status: String,
content: Option<Value>,
error: Option<String>,
model_used: Option<String>,
input_tokens: Option<i32>,
output_tokens: Option<i32>,
cost_usd: Option<f64>,
created_at: OffsetDateTime,
started_at: Option<OffsetDateTime>,
completed_at: Option<OffsetDateTime>,
}
const PREVIEW_COLUMNS: &str = "id, kind, chart_id, synastry_id, language, model, status, content, error, model_used, \
input_tokens, output_tokens, cost_usd, created_at, started_at, completed_at";
impl PreviewRow {
fn view(self) -> Value {
let seconds = self.started_at.zip(self.completed_at).map(|(s, c)| (c - s).whole_seconds());
json!({
"id": self.id, "kind": self.kind, "chart_id": self.chart_id, "synastry_id": self.synastry_id,
"language": self.language, "model": self.model, "status": self.status, "content": self.content,
"error": self.error, "model_used": self.model_used, "input_tokens": self.input_tokens,
"output_tokens": self.output_tokens, "cost_usd": self.cost_usd, "created_at": rfc3339(self.created_at),
"completed_at": rfc3339_opt(self.completed_at), "seconds": seconds,
})
}
}
pub async fn start_preview(
State(state): St,
AdminUser(admin): AdminUser,
WithRejection(Path((kind, language)), _): WithRejection<Path<(String, String)>, ApiError>,
WithRejection(Json(req), _): Body<StartPreview>,
) -> ApiResult<(StatusCode, Json<Value>)> {
let kind = parse_target(&state, &kind, &language)?;
let system = clean_system(&req.system)?;
// The target must be the admin's own: a chart, or for a synastry analysis a comparison.
let (chart_id, synastry_id, found) = match (kind, req.chart_id, req.synastry_id) {
(Kind::Synastry, None, Some(id)) => {
let row: Option<(Uuid,)> = sqlx::query_as("SELECT id FROM synastries WHERE id = $1 AND owner_id = $2")
.bind(id)
.bind(admin.id())
.fetch_optional(&state.db)
.await?;
(None, Some(id), row.map(|_| "synastry"))
}
(Kind::Summary | Kind::Natal, Some(id), None) => {
let row: Option<(Uuid,)> = sqlx::query_as("SELECT id FROM charts WHERE id = $1 AND owner_id = $2")
.bind(id)
.bind(admin.id())
.fetch_optional(&state.db)
.await?;
(Some(id), None, row.map(|_| "chart"))
}
(Kind::Synastry, ..) => return Err(ApiError::BadRequest("a synastry analysis needs synastry_id".into())),
_ => return Err(ApiError::BadRequest("this analysis needs chart_id".into())),
};
if found.is_none() {
return Err(ApiError::NotFound(if synastry_id.is_some() { "synastry" } else { "chart" }));
}
let (open,): (i64,) = sqlx::query_as(
"SELECT count(*) FROM prompt_previews WHERE created_by = $1 AND status IN ('pending', 'running')",
)
.bind(admin.id())
.fetch_one(&state.db)
.await?;
if open >= MAX_OPEN_PREVIEWS {
return Err(ApiError::conflict(
"too_many_previews",
"Egyszerre legfeljebb három próba futhat. Várd meg, amíg valamelyik elkészül.",
));
}
let model = match kind {
Kind::Summary => &state.config.summary_model,
_ => &state.config.analysis_model,
};
let row: PreviewRow = sqlx::query_as(&format!(
"INSERT INTO prompt_previews (id, kind, chart_id, synastry_id, language, model, system, created_by) \
VALUES ($1, $2, $3, $4, $5, $6, $7, $8) RETURNING {PREVIEW_COLUMNS}"
))
.bind(Uuid::now_v7())
.bind(kind.as_str())
.bind(chart_id)
.bind(synastry_id)
.bind(&language)
.bind(model)
.bind(&system)
.bind(admin.id())
.fetch_one(&state.db)
.await?;
Ok((StatusCode::ACCEPTED, Json(row.view())))
}
pub async fn get_preview(
State(state): St,
AdminUser(admin): AdminUser,
WithRejection(Path(id), _): IdPath,
) -> ApiResult<Json<Value>> {
let row: Option<PreviewRow> =
sqlx::query_as(&format!("SELECT {PREVIEW_COLUMNS} FROM prompt_previews WHERE id = $1 AND created_by = $2"))
.bind(id)
.bind(admin.id())
.fetch_optional(&state.db)
.await?;
Ok(Json(row.ok_or(ApiError::NotFound("preview"))?.view()))
}
+437 -12
View File
@@ -755,11 +755,7 @@ async fn admins_get_free_analyses_and_mock_payments_add_units(pool: PgPool) {
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn persons_use_package_slots(pool: PgPool) {
let app = TestApp::with_config(pool, |c| {
c.free_person_slots = 1;
c.person_pack_size = 2;
})
.await;
let app = TestApp::with_config(pool, |c| c.free_person_slots = 1).await;
let anna = app.register("anna@example.com", "Anna").await;
let own = app.chart(&anna, "Saját", true, "1990-03-15").await;
assert_eq!(own["kind"], "own");
@@ -780,16 +776,15 @@ async fn persons_use_package_slots(pool: PgPool) {
assert_eq!(r.status, StatusCode::NO_CONTENT);
assert_eq!(persons(app.get("/v1/me", Some(&anna)).await.body)["left"], 0);
// a package adds two slots
let r = app.post("/v1/payments/mock", Some(&anna), json!({"package": "persons"})).await;
assert_eq!(r.body["persons"], json!({"used": 1, "limit": 3, "left": 2, "unlimited": false}), "{}", r.body);
// a person package adds five slots
let r = app.post("/v1/payments/mock", Some(&anna), json!({"package": "addon_persons"})).await;
assert_eq!(r.body["persons"], json!({"used": 1, "limit": 6, "left": 5, "unlimited": false}), "{}", r.body);
let second = app.chart(&anna, "Cili", false, "1986-01-01").await;
app.chart(&anna, "Dani", false, "1987-01-01").await;
let r = app.post("/v1/charts", Some(&anna), new_person("1988-01-01")).await;
assert_eq!(r.status, StatusCode::CONFLICT);
assert_eq!(persons(app.get("/v1/me", Some(&anna)).await.body)["left"], 3);
// the unlimited package
let r = app.post("/v1/payments/mock", Some(&anna), json!({"package": "persons_unlimited"})).await;
let r = app.post("/v1/payments/mock", Some(&anna), json!({"package": "unlimited"})).await;
assert_eq!(r.body["persons"], json!({"used": 3, "limit": null, "left": null, "unlimited": true}));
app.chart(&anna, "Emma", false, "1988-01-01").await;
let list = app.get("/v1/charts", Some(&anna)).await.body;
@@ -807,7 +802,8 @@ async fn persons_use_package_slots(pool: PgPool) {
.execute(&app.pool)
.await
.unwrap();
let r = app.call("PATCH", &format!("/v1/charts/{id}"), Some(&anna), Some(corrected.clone())).await;
let again = json!({"birth": {"date": "1986-01-03", "time": "10:00", "country": "HU", "place": "Szeged"}});
let r = app.call("PATCH", &format!("/v1/charts/{id}"), Some(&anna), Some(again)).await;
assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::CONFLICT, Some("person_locked")));
let r =
app.call("PATCH", &format!("/v1/charts/{}", own["id"].as_str().unwrap()), Some(&anna), Some(corrected)).await;
@@ -827,3 +823,432 @@ async fn persons_use_package_slots(pool: PgPool) {
let r = app.call("PATCH", &format!("/v1/charts/{pid}"), Some(&admin), Some(corrected)).await;
assert_eq!(r.status, StatusCode::OK, "{}", r.body);
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn admins_edit_analysis_prompts(pool: PgPool) {
let app = TestApp::new(pool.clone()).await;
let admin = app.register("admin@example.com", "Admin").await;
let anna = app.register("anna@example.com", "Anna").await;
assert_eq!(app.get("/v1/admin/prompts", Some(&anna)).await.status, StatusCode::FORBIDDEN);
let r = app.get("/v1/admin/prompts", Some(&admin)).await;
assert_eq!(r.status, StatusCode::OK, "{}", r.body);
let prompts = r.body["prompts"].as_array().unwrap();
let keys: Vec<String> =
prompts.iter().map(|p| format!("{}/{}", p["kind"], p["language"]).replace('"', "")).collect();
assert_eq!(keys, ["summary/hu", "summary/en", "natal/hu", "natal/en", "synastry/hu", "synastry/en"]);
let natal = &prompts[2];
assert_eq!((&natal["custom"], &natal["system"]), (&json!(false), &natal["default"]));
assert!(natal["user_template"].as_str().unwrap().contains("{chart data}"));
let default = natal["default"].as_str().unwrap().to_string();
let put = |body: Value, uri: &'static str| app.call("PUT", uri, Some(&admin), Some(body));
assert_eq!(put(json!({"system": " "}), "/v1/admin/prompts/natal/hu").await.status, StatusCode::BAD_REQUEST);
assert_eq!(put(json!({"system": "x"}), "/v1/admin/prompts/composite/hu").await.status, StatusCode::NOT_FOUND);
assert_eq!(put(json!({"system": "x"}), "/v1/admin/prompts/natal/de").await.status, StatusCode::NOT_FOUND);
// saving the built-in text keeps the built-in prompt
let r = put(json!({"system": default}), "/v1/admin/prompts/natal/hu").await;
assert_eq!(
(r.status, &r.body["custom"], r.body["history"].as_array().unwrap().len()),
(StatusCode::OK, &json!(false), 0)
);
// an analysis written with the built-in prompt
let chart = app.chart(&anna, "Saját", true, "1990-03-15").await;
let uri = format!("/v1/charts/{}/analyses", chart["id"].as_str().unwrap());
grant_units(&app, &anna, "natal", 1).await;
let r = app.call("POST", &uri, Some(&anna), None).await;
assert_eq!((r.status, r.body["prompt_version"].as_str()), (StatusCode::ACCEPTED, Some("v1")));
let first = r.body["id"].as_str().unwrap().to_string();
sqlx::query("UPDATE analyses SET status = 'done', content = '{}', completed_at = now() WHERE id = $1::uuid")
.bind(&first)
.execute(&pool)
.await
.unwrap();
let r = put(json!({"system": "Saját szabályok.\r\n"}), "/v1/admin/prompts/natal/hu").await;
assert_eq!(
(&r.body["custom"], r.body["system"].as_str(), r.body["updated_by"].as_str()),
(&json!(true), Some("Saját szabályok."), Some("admin@example.com"))
);
let revision = r.body["history"][0]["id"].as_i64().unwrap();
let r = put(json!({"system": "Saját szabályok."}), "/v1/admin/prompts/natal/hu").await;
assert_eq!(r.body["history"].as_array().unwrap().len(), 1); // unchanged: no new revision
// the chart keeps its analysis; the same birth data elsewhere is written anew with the edited prompt
let r = app.call("POST", &uri, Some(&anna), None).await;
assert_eq!((r.status, r.body["id"].as_str()), (StatusCode::OK, Some(first.as_str())));
let bela = app.register("bela@example.com", "Béla").await;
let same = app.chart(&bela, "Saját", true, "1990-03-15").await;
grant_units(&app, &bela, "natal", 1).await;
let r = app.call("POST", &format!("/v1/charts/{}/analyses", same["id"].as_str().unwrap()), Some(&bela), None).await;
let expected = format!("v1-r{revision}");
assert_eq!((r.status, r.body["prompt_version"].as_str()), (StatusCode::ACCEPTED, Some(expected.as_str())));
// back to the built-in prompt
let r = put(json!({"system": null}), "/v1/admin/prompts/natal/hu").await;
assert_eq!((&r.body["custom"], r.body["system"].as_str()), (&json!(false), Some(default.as_str())));
assert_eq!(r.body["history"].as_array().unwrap().len(), 2);
}
/// Starts a summary prompt test run on `chart`.
async fn start_preview(app: &TestApp, chart: &Value, token: &str) -> Response {
let body = json!({"system": " Próba szabályok. ", "chart_id": chart["id"]});
app.call("POST", "/v1/admin/prompts/summary/hu/preview", Some(token), Some(body)).await
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn admins_try_prompt_drafts_on_own_charts(pool: PgPool) {
let app = TestApp::new(pool.clone()).await;
let admin = app.register("admin@example.com", "Admin").await;
let anna = app.register("anna@example.com", "Anna").await;
let own = app.chart(&admin, "Saját", true, "1990-03-15").await;
let annas = app.chart(&anna, "Saját", true, "1991-05-01").await;
assert_eq!(start_preview(&app, &own, &anna).await.status, StatusCode::FORBIDDEN);
assert_eq!(start_preview(&app, &annas, &admin).await.status, StatusCode::NOT_FOUND); // only own charts
let r = start_preview(&app, &own, &admin).await;
assert_eq!(r.status, StatusCode::ACCEPTED, "{}", r.body);
assert_eq!(
(r.body["status"].as_str(), r.body["kind"].as_str(), r.body["model"].as_str()),
(Some("pending"), Some("summary"), Some("anthropic/claude-summary"))
);
let id = r.body["id"].as_str().unwrap().to_string();
let (system,): (String,) = sqlx::query_as("SELECT system FROM prompt_previews WHERE id = $1::uuid")
.bind(&id)
.fetch_one(&pool)
.await
.unwrap();
assert_eq!(system, "Próba szabályok.");
// nothing reaches the chart's analyses, and the saved prompt is unchanged
let r = app.get(&format!("/v1/charts/{}/analyses", own["id"].as_str().unwrap()), Some(&admin)).await;
assert!(
r.body["analyses"].as_array().unwrap().iter().all(|a| a["kind"] == "summary" && a["prompt_version"] == "v1")
);
assert_eq!(app.get("/v1/admin/prompts", Some(&admin)).await.body["prompts"][0]["custom"], json!(false));
let r = app.get(&format!("/v1/admin/previews/{id}"), Some(&admin)).await;
assert_eq!((r.status, r.body["status"].as_str()), (StatusCode::OK, Some("pending")));
assert_eq!(app.get(&format!("/v1/admin/previews/{id}"), Some(&anna)).await.status, StatusCode::FORBIDDEN);
// at most three at a time
start_preview(&app, &own, &admin).await;
start_preview(&app, &own, &admin).await;
let r = start_preview(&app, &own, &admin).await;
assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::CONFLICT, Some("too_many_previews")));
let body = json!({"system": "Részletes próba.", "chart_id": own["id"]});
sqlx::query("UPDATE prompt_previews SET status = 'done'").execute(&pool).await.unwrap();
let r = app.call("POST", "/v1/admin/prompts/natal/hu/preview", Some(&admin), Some(body)).await;
assert_eq!((r.status, r.body["model"].as_str()), (StatusCode::ACCEPTED, Some("anthropic/claude-test")));
// a relationship analysis is tried on one of the admin's comparisons
let other = app.chart(&admin, "Béla", false, "1985-08-02").await;
let syn = app.post("/v1/synastries", Some(&admin), json!({"chart1_id": own["id"], "chart2_id": other["id"]})).await;
let uri = "/v1/admin/prompts/synastry/hu/preview";
let r = app.call("POST", uri, Some(&admin), Some(json!({"system": "Próba.", "chart_id": own["id"]}))).await;
assert_eq!(r.status, StatusCode::BAD_REQUEST);
let r = app.call("POST", uri, Some(&admin), Some(json!({"system": "Próba.", "synastry_id": syn.body["id"]}))).await;
assert_eq!(
(r.status, r.body["synastry_id"].as_str()),
(StatusCode::ACCEPTED, syn.body["id"].as_str()),
"{}",
r.body
);
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn comparisons_with_persons(pool: PgPool) {
let app = TestApp::new(pool).await;
let anna = app.register("anna@example.com", "Anna").await;
let own = app.chart(&anna, "Saját", true, "1990-03-15").await;
let bela = app.chart(&anna, "Béla", false, "1985-08-02").await;
let compare = || app.post("/v1/synastries", Some(&anna), json!({"chart1_id": own["id"], "chart2_id": bela["id"]}));
let r = compare().await;
assert_eq!(r.status, StatusCode::CREATED, "{}", r.body);
let first = r.body["id"].as_str().unwrap().to_string();
assert_eq!((&r.body["chart1"]["is_primary"], &r.body["chart2"]["label"]), (&json!(true), &json!("Béla")));
// correcting the person removes the comparison that no longer matches
let uri = format!("/v1/charts/{}", bela["id"].as_str().unwrap());
let corrected = |date: &str| json!({"birth": {"date": date, "time": "10:00", "country": "HU", "place": "Szeged"}});
let r = app.call("PATCH", &uri, Some(&anna), Some(corrected("1985-08-03"))).await;
assert_eq!(r.status, StatusCode::OK, "{}", r.body);
assert_eq!(app.get(&format!("/v1/synastries/{first}"), Some(&anna)).await.status, StatusCode::NOT_FOUND);
// after a paid relationship analysis the person is fixed
let r = compare().await;
assert_eq!(r.status, StatusCode::CREATED);
let id = r.body["id"].as_str().unwrap();
grant_units(&app, &anna, "synastry", 1).await;
let r = app.call("POST", &format!("/v1/synastries/{id}/analyses"), Some(&anna), None).await;
assert_eq!(r.status, StatusCode::ACCEPTED, "{}", r.body);
let r = app.call("PATCH", &uri, Some(&anna), Some(corrected("1985-08-04"))).await;
assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::CONFLICT, Some("person_analysed")));
assert_eq!(app.get("/v1/synastries", Some(&anna)).await.body["synastries"].as_array().unwrap().len(), 1);
}
/// An admin (or not) gives `user` a package.
async fn grant_package(app: &TestApp, token: &str, user: &str, package: &str) -> Response {
let body = json!({"package": package, "note": "ajándék"});
app.call("POST", &format!("/v1/admin/users/{user}/packages"), Some(token), Some(body)).await
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn packages_grant_units_and_unlimited(pool: PgPool) {
let app = TestApp::new(pool.clone()).await;
let admin = app.register("admin@example.com", "Admin").await;
let anna = app.register("anna@example.com", "Anna").await;
let anna_id = app.get("/v1/me", Some(&anna)).await.body["user"]["id"].as_str().unwrap().to_string();
assert_eq!(app.get("/v1/me", Some(&anna)).await.body["package"], Value::Null);
// the catalog is public
let r = app.get("/v1/packages", None).await;
let ids: Vec<&str> = r.body["packages"].as_array().unwrap().iter().map(|p| p["id"].as_str().unwrap()).collect();
assert_eq!(ids, ["single", "couple", "family", "unlimited", "addon_synastry", "addon_persons"]);
assert_eq!(
(&r.body["packages"][2]["badge"], &r.body["packages"][2]["per_analysis_huf"]),
(&json!("Legnépszerűbb"), &json!(1090))
);
// an admin gives a package as a gift
assert_eq!(grant_package(&app, &anna, &anna_id, "family").await.status, StatusCode::FORBIDDEN);
assert_eq!(grant_package(&app, &admin, &anna_id, "gold").await.status, StatusCode::NOT_FOUND);
let r = grant_package(&app, &admin, &anna_id, "family").await;
assert_eq!(
(r.status, &r.body["analyses_left"]),
(StatusCode::CREATED, &json!({"natal": 6, "synastry": 5})),
"{}",
r.body
);
let me = app.get("/v1/me", Some(&anna)).await.body;
assert_eq!((&me["persons"]["limit"], &me["unlimited_until"]), (&json!(10), &Value::Null)); // 5 free + 5
let (source, price): (String, i32) =
sqlx::query_as("SELECT source, price_huf FROM package_orders WHERE package = 'family'")
.fetch_one(&pool)
.await
.unwrap();
assert_eq!((source.as_str(), price), ("admin", 0));
// a (mock) purchase adds to it and records the price
let r = app.post("/v1/payments/mock", Some(&anna), json!({"package": "couple"})).await;
assert_eq!(r.body["analyses_left"], json!({"natal": 8, "synastry": 6}), "{}", r.body);
let (price,): (i32,) =
sqlx::query_as("SELECT price_huf FROM package_orders WHERE package = 'couple'").fetch_one(&pool).await.unwrap();
assert_eq!(price, 6990);
// the header shows the latest main package; a top-up does not change it
app.post("/v1/payments/mock", Some(&anna), json!({"package": "addon_persons"})).await;
assert_eq!(app.get("/v1/me", Some(&anna)).await.body["package"]["name"], "Páros");
// unlimited: a year, and a second one extends it
let bela = app.register("bela@example.com", "Béla").await;
let bela_id = app.get("/v1/me", Some(&bela)).await.body["user"]["id"].as_str().unwrap().to_string();
grant_package(&app, &admin, &bela_id, "unlimited").await;
let r = grant_package(&app, &admin, &bela_id, "unlimited").await;
let until = time::OffsetDateTime::parse(
r.body["unlimited_until"].as_str().unwrap(),
&time::format_description::well_known::Rfc3339,
)
.unwrap();
let days = (until - time::OffsetDateTime::now_utc()).whole_days();
assert!((725..=733).contains(&days), "{days}");
assert_eq!(app.get("/v1/me", Some(&bela)).await.body["persons"]["unlimited"], true);
assert_eq!(app.get("/v1/me", Some(&bela)).await.body["package"]["id"], "unlimited");
// analyses use no unit, up to the daily cap (3 in tests)
for (i, date) in ["1980-01-01", "1981-01-01", "1982-01-01"].into_iter().enumerate() {
let chart = app.chart(&bela, &format!("P{i}"), i == 0, date).await;
let r = app
.call("POST", &format!("/v1/charts/{}/analyses", chart["id"].as_str().unwrap()), Some(&bela), None)
.await;
assert_eq!((r.status, &r.body["credits_charged"]), (StatusCode::ACCEPTED, &json!(0)), "{}", r.body);
}
let fourth = app.chart(&bela, "P3", false, "1983-01-01").await;
let uri = format!("/v1/charts/{}/analyses", fourth["id"].as_str().unwrap());
let r = app.call("POST", &uri, Some(&bela), None).await;
assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::TOO_MANY_REQUESTS, Some("fair_use_limit")));
// after it ends, units are needed again
sqlx::query("UPDATE entitlements SET expires_at = now() - interval '1 day'").execute(&pool).await.unwrap();
let r = app.call("POST", &uri, Some(&bela), None).await;
assert_eq!(r.status, StatusCode::PAYMENT_REQUIRED);
assert_eq!(app.get("/v1/me", Some(&bela)).await.body["unlimited_until"], Value::Null);
assert_eq!(app.get("/v1/me", Some(&bela)).await.body["package"], Value::Null); // ended
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn renaming_a_person_keeps_chart_and_analyses(pool: PgPool) {
let app = TestApp::new(pool.clone()).await;
let anna = app.register("anna@example.com", "Anna").await;
let own = app.chart(&anna, "Saját", true, "1990-03-15").await;
let bela = app.chart(&anna, "Béla", false, "1985-08-02").await;
let id = bela["id"].as_str().unwrap();
let syn = app.post("/v1/synastries", Some(&anna), json!({"chart1_id": own["id"], "chart2_id": id})).await;
assert_eq!(syn.status, StatusCode::CREATED);
let summaries = || async {
let (n,): (i64,) = sqlx::query_as("SELECT count(*) FROM analyses WHERE chart_id = $1::uuid")
.bind(id)
.fetch_one(&pool)
.await
.unwrap();
n
};
assert_eq!(summaries().await, 1);
// the edit form sends the unchanged birth data with the new name
let same = json!({"label": "Béla bácsi",
"birth": {"date": "1985-08-02", "time": "14:30", "country": "HU", "place": "Szeged"}});
let r = app.call("PATCH", &format!("/v1/charts/{id}"), Some(&anna), Some(same.clone())).await;
assert_eq!(
(r.status, &r.body["label"], &r.body["chart_hash"]),
(StatusCode::OK, &json!("Béla bácsi"), &bela["chart_hash"])
);
assert_eq!(summaries().await, 1);
let r = app.get(&format!("/v1/synastries/{}", syn.body["id"].as_str().unwrap()), Some(&anna)).await;
assert_eq!(r.status, StatusCode::OK);
// after the correction window the name can still change
sqlx::query("UPDATE charts SET created_at = now() - interval '2 hours' WHERE id = $1::uuid")
.bind(id)
.execute(&pool)
.await
.unwrap();
let r = app.call("PATCH", &format!("/v1/charts/{id}"), Some(&anna), Some(json!({"label": "Béla"}))).await;
assert_eq!((r.status, &r.body["label"]), (StatusCode::OK, &json!("Béla")));
let r = app.call("PATCH", &format!("/v1/charts/{id}"), Some(&anna), Some(same)).await;
assert_eq!(r.status, StatusCode::OK, "{}", r.body);
}
async fn google_signup(app: &TestApp, sub: &str, email: &str, invite: Option<&str>) -> Response {
app.post(
"/v1/auth/google",
None,
json!({"id_token": google_token(sub, email, GOOGLE_CLIENT), "invite_token": invite}),
)
.await
}
fn invite_token(url: &str) -> String {
url.rsplit('/').next().unwrap().to_string()
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn invitation_only_signup(pool: PgPool) {
let app = TestApp::with_config(pool.clone(), |c| c.signup_mode = crate::config::SignupMode::Invite).await;
assert_eq!(app.get("/v1/config", None).await.body["signup_mode"], "invite");
// nobody gets in uninvited, except the bootstrap admin
let r = google_signup(&app, "g-x", "stranger@gmail.com", None).await;
assert_eq!((r.status, r.body["error"]["code"].as_str()), (StatusCode::FORBIDDEN, Some("not_invited")));
let admin = app.register("admin@example.com", "Admin").await;
// an existing user (from before the invitation-only times) is not an admin
let user = {
let open = TestApp::new(pool.clone()).await;
open.register("anna@example.com", "Anna").await
};
// inviting: duplicates, invalid addresses and existing users are sorted out
let r = app
.post(
"/v1/admin/invitations",
Some(&admin),
json!({"emails": ["Guest@Example.com", "guest@example.com", "nope", "anna@example.com", "kata@example.com"],
"message": "Gyere, nézd meg!"}),
)
.await;
assert_eq!(r.status, StatusCode::CREATED, "{}", r.body);
let statuses: Vec<&str> =
r.body["results"].as_array().unwrap().iter().map(|x| x["status"].as_str().unwrap()).collect();
assert_eq!(statuses, ["invited", "invalid", "already_user", "invited"]);
let guest_url = r.body["results"][0]["url"].as_str().unwrap().to_string();
let guest_id = r.body["results"][0]["id"].as_str().unwrap().to_string();
let guest_token = invite_token(&guest_url);
let r = app.post("/v1/admin/invitations", Some(&admin), json!({"emails": ["guest@example.com"]})).await;
assert_eq!(r.body["results"][0]["status"], "already_invited");
let r = app
.post(
"/v1/admin/invitations",
Some(&admin),
json!({"emails": ["x@example.com"], "message": "nézd: www.spam.hu"}),
)
.await;
assert_eq!(r.status, StatusCode::BAD_REQUEST);
assert_eq!(app.get("/v1/admin/invitations", Some(&user)).await.status, StatusCode::FORBIDDEN);
// the e-mail and the landing page
let (payload,): (Value,) = sqlx::query_as(
"SELECT payload FROM email_outbox WHERE to_email = 'guest@example.com' AND template = 'invitation'",
)
.fetch_one(&pool)
.await
.unwrap();
assert_eq!(payload["url"], guest_url.as_str());
assert_eq!(payload["inviter_name"], "Admin");
assert!(
payload["unsubscribe_post_url"].as_str().unwrap().contains("/api/v1/public/invitations/unsubscribe?token=")
);
let r = app.get(&format!("/v1/public/invitations/{guest_token}"), None).await;
assert_eq!((r.body["inviter_name"].as_str(), r.body["status"].as_str()), (Some("Admin"), Some("pending")));
// a resend: not too soon, then with a new link; the old one keeps working
let r = app.post(&format!("/v1/admin/invitations/{guest_id}/resend"), Some(&admin), json!({})).await;
assert_eq!(r.body["error"]["code"], "resend_too_soon");
sqlx::query("UPDATE invitations SET last_sent_at = now() - interval '25 hours'").execute(&pool).await.unwrap();
let r = app.post(&format!("/v1/admin/invitations/{guest_id}/resend"), Some(&admin), json!({})).await;
assert_eq!(r.status, StatusCode::OK, "{}", r.body);
assert_ne!(r.body["url"], guest_url.as_str());
// the link lets in any Google account, once
let r = google_signup(&app, "g-1", "guests.other.account@gmail.com", Some(&guest_token)).await;
assert_eq!(r.status, StatusCode::CREATED, "{}", r.body);
let r = google_signup(&app, "g-2", "third@gmail.com", Some(&guest_token)).await;
assert_eq!(r.body["error"]["code"], "not_invited");
// the invited address itself gets in without the link
assert_eq!(google_signup(&app, "g-3", "kata@example.com", None).await.status, StatusCode::CREATED);
// revoked: no entry
let r = app
.post("/v1/admin/invitations", Some(&admin), json!({"emails": ["zoli@example.com", "mari@example.com"]}))
.await;
let zoli_id = r.body["results"][0]["id"].as_str().unwrap().to_string();
let mari_token = invite_token(r.body["results"][1]["url"].as_str().unwrap());
assert_eq!(
app.call("DELETE", &format!("/v1/admin/invitations/{zoli_id}"), Some(&admin), None).await.status,
StatusCode::NO_CONTENT
);
assert_eq!(google_signup(&app, "g-4", "zoli@example.com", None).await.status, StatusCode::FORBIDDEN);
// unsubscribing (one-click POST): the invitation closes and no new one can be sent
let r = app.call("POST", &format!("/v1/public/invitations/unsubscribe?token={mari_token}"), None, None).await;
assert_eq!(r.status, StatusCode::OK);
assert_eq!(google_signup(&app, "g-5", "mari@example.com", None).await.status, StatusCode::FORBIDDEN);
let r = app.post("/v1/admin/invitations", Some(&admin), json!({"emails": ["MARI@example.com"]})).await;
assert_eq!(r.body["results"][0]["status"], "opted_out");
// the waitlist: joining reveals nothing, an invited and accepted address leaves it
for email in ["wait@example.com", "anna@example.com"] {
let r = app.post("/v1/public/waitlist", None, json!({"email": email})).await;
assert_eq!(r.status, StatusCode::ACCEPTED);
}
let list = app.get("/v1/admin/invitations", Some(&admin)).await.body;
assert_eq!(list["waitlist"].as_array().unwrap().len(), 1);
let statuses: Vec<(&str, &str)> = list["invitations"]
.as_array()
.unwrap()
.iter()
.map(|i| (i["email"].as_str().unwrap(), i["status"].as_str().unwrap()))
.collect();
assert!(
statuses.contains(&("guest@example.com", "accepted")) && statuses.contains(&("zoli@example.com", "revoked"))
);
app.post("/v1/admin/invitations", Some(&admin), json!({"emails": ["wait@example.com"]})).await;
assert_eq!(google_signup(&app, "g-6", "wait@example.com", None).await.status, StatusCode::CREATED);
assert!(app.get("/v1/admin/invitations", Some(&admin)).await.body["waitlist"].as_array().unwrap().is_empty());
// preview and a test copy to the admin
let r =
app.post("/v1/admin/invitations/preview", Some(&admin), json!({"message": "Szia!", "send_to_me": true})).await;
assert_eq!(r.body["subject"], "Admin meghívott a Sorsfonalakra");
assert!(r.body["html"].as_str().unwrap().contains("Szia!") && r.body["text"].as_str().unwrap().contains("> Szia!"));
assert_eq!(app.outbox_url("admin@example.com", "invitation").await, "https://sorsfonalak.test/meghivo/minta");
}
+6 -1
View File
@@ -11,10 +11,15 @@ Next.js (App Router, TypeScript) webes felület. A compose-ban a **3001-es** por
- **saját születési adatok**: dátum, idő (vagy „nem tudom”), ország és település helykeresővel. Mentéskor kiszámolja a képletet, és megmutatja a pozíciókat (bolygók, tengelyek, házcsúcsok).
- A javított adatokból új képlet lesz (a backend a születési adatot nem módosítja), és az lesz a saját képlet.
- Ha a megadott időpont az óraátállítás miatt kétszer is előfordult, a felület megkérdezi, melyikről van szó.
- **Összevetések** (`/osszevetesek`, szinasztria): a saját és a felvett személyek képletei közül bármelyik kettő összevethető; a személykártyán és a személy képletoldalán „Összevetés velem” gomb is van. Az összevetés oldala (`/osszevetesek/{id}`):
- kettős kör: belül az első fél bolygói és házai, kívül a második fél bolygói, középen a köztük lévő főfényszögek;
- a fényszögek jelleg szerint (harmonikus, feszültebb, együttállás);
- fülek: fizetős kapcsolati elemzés (`synastry` egység), a két fél közti fényszögmátrix, házátfedések, kompozit, részletes lista.
- **Admin** (`/admin`, csak `admin` szerepkörrel; másnak 404):
- felhasználók keresése;
- szerepkörök be- és kikapcsolása (felhasználó, prémium, VIP, szerző, admin);
- elemzések jóváírása típusonként (képlet, szinasztria).
- elemzések jóváírása típusonként (képlet, szinasztria);
- **Promptok** (`/admin/promptok`): a tömör összefoglaló, a részletes és a kapcsolati elemzés system promptja szerkeszthető, változatokkal; mentés előtt egy saját képleten vagy összevetésen kipróbálható.
- **Jogosultság:** a belépést nem igénylő oldalakon kívül minden oldal a szerveren ellenőrzi a munkamenetet; belépés nélkül a belépőoldalra irányít, majd vissza.
## Felépítés
@@ -76,6 +76,21 @@ 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>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>
<td>Jogos érdek (6. cikk (1) f)</td>
</tr>
<tr>
<td>A várólistán megadott e-mail-cím</td>
<td>Értesítés, ha megnyílik az oldal, vagy meghívót küldünk</td>
<td>Hozzájárulás (6. cikk (1) a)</td>
</tr>
<tr>
<td>Azok a címek, amelyek leiratkoztak a meghívókról (csak a cím egyirányú lenyomata, hash-e)</td>
<td>Hogy ezekre a címekre ne küldjünk több meghívót</td>
<td>Jogos érdek (6. cikk (1) f)</td>
</tr>
<tr>
<td>IP-cím, böngésző adatai, a kérések ideje (szervernaplók)</td>
<td>Biztonság, hibakeresés, visszaélések kiszűrése</td>
@@ -123,6 +138,10 @@ export default async function PrivacyPage() {
<li>
<strong>Google LLC</strong> – bejelentkezés Google-fiókkal.
</li>
<li>
<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>OpenRouter, Inc.</strong> és az általa elért modellszolgáltató (jelenleg{" "}
<strong>Anthropic PBC</strong>) – az elemzések megírása, kizárólag a 3. pontban leírt csillagászati
@@ -142,6 +161,11 @@ export default async function PrivacyPage() {
<li>Fiókod adatait, képleteidet és elemzéseidet a fiókod törléséig.</li>
<li>A biztonsági mentésekből a törölt adatok legkésőbb 14 nap után tűnnek el.</li>
<li>A szervernaplókat legfeljebb 30 napig őrizzük.</li>
<li>
Az el nem fogadott meghívókat a lejáratuk vagy visszavonásuk után 30 nappal töröljük. A meghívólevelekben
bármikor leiratkozhatsz.
</li>
<li>A várólistán megadott címet a regisztrációdig, vagy amíg nem kéred a törlését.</li>
<li>A számlázáshoz szükséges adatokat a számviteli törvény szerinti ideig (8 évig) őrizzük.</li>
</ul>
</section>
+91 -2
View File
@@ -2,9 +2,10 @@
import { useCallback, useEffect, useState } from "react";
import { huf, usePackages } from "@/components/PackageCards";
import { api, errorText } from "@/lib/api";
import { ROLE_LABELS, formatDate } from "@/lib/astro";
import type { AdminUser, Role } from "@/lib/types";
import type { AdminUser, Package, Role } from "@/lib/types";
const EDITABLE_ROLES: Role[] = ["user", "creator", "admin"];
const UNITS: { value: "natal" | "synastry"; label: string }[] = [
@@ -16,6 +17,7 @@ export function AdminUsers({ selfId }: { selfId: string }) {
const [query, setQuery] = useState("");
const [users, setUsers] = useState<AdminUser[] | null>(null);
const [error, setError] = useState<string | null>(null);
const packages = usePackages() ?? [];
const load = useCallback(async (q: string) => {
try {
@@ -62,6 +64,7 @@ export function AdminUsers({ selfId }: { selfId: string }) {
<th scope="col">Felhasználó</th>
<th scope="col">Szerepkörök</th>
<th scope="col">Részletes elemzések</th>
<th scope="col">Csomag</th>
<th scope="col">Képletek</th>
<th scope="col">Regisztrált</th>
<th scope="col">Utoljára belépett</th>
@@ -73,6 +76,7 @@ export function AdminUsers({ selfId }: { selfId: string }) {
key={u.id}
user={u}
isSelf={u.id === selfId}
packages={packages}
onChange={(next) => setUsers((list) => list?.map((x) => (x.id === next.id ? next : x)) ?? null)}
/>
))}
@@ -84,7 +88,17 @@ export function AdminUsers({ selfId }: { selfId: string }) {
);
}
function UserRow({ user, isSelf, onChange }: { user: AdminUser; isSelf: boolean; onChange: (u: AdminUser) => void }) {
function UserRow({
user,
isSelf,
packages,
onChange,
}: {
user: AdminUser;
isSelf: boolean;
packages: Package[];
onChange: (u: AdminUser) => void;
}) {
const [status, setStatus] = useState<{ ok: boolean; text: string } | null>(null);
const [busy, setBusy] = useState(false);
const [delta, setDelta] = useState("");
@@ -200,9 +214,84 @@ function UserRow({ user, isSelf, onChange }: { user: AdminUser; isSelf: boolean;
</span>
)}
</td>
<td>
<PackageGrant user={user} packages={packages} onChange={onChange} />
</td>
<td className="num">{user.charts}</td>
<td className="num">{formatDate(user.created_at)}</td>
<td className="num">{formatDate(user.last_login_at, true)}</td>
</tr>
);
}
/** Gives the user a package from the catalog (a gift: nothing is paid). */
function PackageGrant({
user,
packages,
onChange,
}: {
user: AdminUser;
packages: Package[];
onChange: (u: AdminUser) => void;
}) {
const [id, setId] = useState("");
const [busy, setBusy] = useState(false);
const [status, setStatus] = useState<{ ok: boolean; text: string } | null>(null);
async function give(e: React.FormEvent) {
e.preventDefault();
const pkg = packages.find((p) => p.id === id);
if (!pkg) return;
setBusy(true);
setStatus(null);
try {
const res = await api<{ analyses_left: AdminUser["analyses_left"]; unlimited_until: string | null }>(
`/admin/users/${user.id}/packages`,
{ body: { package: pkg.id, note: "admin ajándék" } },
);
onChange({ ...user, analyses_left: res.analyses_left, unlimited_until: res.unlimited_until });
setStatus({ ok: true, text: `${pkg.name} kiosztva` });
setId("");
} catch (err) {
setStatus({ ok: false, text: errorText(err) });
} finally {
setBusy(false);
}
}
return (
<form onSubmit={give} className="field" style={{ gap: 6 }}>
{user.unlimited_until && (
<span className="badge badge-gold">Korlátlan {formatDate(user.unlimited_until).replace(/\.$/, "")}-ig</span>
)}
<div className="row" style={{ gap: 6, flexWrap: "nowrap" }}>
<label className="sr-only" htmlFor={`pkg-${user.id}`}>
Kiosztandó csomag
</label>
<select
id={`pkg-${user.id}`}
className="inp"
style={{ width: 190, minHeight: 36 }}
value={id}
onChange={(e) => setId(e.target.value)}
disabled={busy || packages.length === 0}
>
<option value="">Válassz csomagot…</option>
{packages.map((p) => (
<option key={p.id} value={p.id}>
{p.name} ({huf(p.price_huf)})
</option>
))}
</select>
<button type="submit" className="btn btn-sm" disabled={busy || !id}>
{busy ? "…" : "Kiosztás"}
</button>
</div>
{status && (
<span className={status.ok ? "msg msg-ok" : "msg msg-error"} role="status">
{status.text}
</span>
)}
</form>
);
}
@@ -0,0 +1,472 @@
"use client";
import { useCallback, useEffect, useState } from "react";
import { api, errorText } from "@/lib/api";
import { formatDate } from "@/lib/astro";
import type { AdminInvitation, InvitationResult, WaitlistEntry } from "@/lib/types";
const MAX_MESSAGE = 300;
const STATUS: Record<AdminInvitation["status"], string> = {
pending: "Függőben",
accepted: "Elfogadva",
expired: "Lejárt",
revoked: "Visszavonva",
};
const MAIL: Record<AdminInvitation["mail"], string> = {
sent: "Elküldve",
queued: "Sorban vár",
failed: "Sikertelen",
archived: "Elküldve (archív)",
};
const RESULT: Record<InvitationResult["status"], string> = {
invited: "meghívva",
invalid: "érvénytelen cím",
already_user: "már felhasználó",
already_invited: "már van élő meghívója (újraküldés a listában)",
opted_out: "leiratkozott a meghívókról",
};
interface ListData {
invitations: AdminInvitation[];
waitlist: WaitlistEntry[];
signup_mode: "invite" | "open";
}
function CopyLink({ url }: { url: string }) {
const [copied, setCopied] = useState(false);
return (
<button
type="button"
className="btn btn-sm btn-ghost"
onClick={async () => {
try {
await navigator.clipboard.writeText(url);
setCopied(true);
} catch {
window.prompt("A meghívólink:", url);
}
}}
>
{copied ? "Kimásolva" : "Link másolása"}
</button>
);
}
/** Addresses from free text: one per line, or separated by commas, semicolons or spaces. */
function parseEmails(text: string): string[] {
return text
.split(/[\s,;]+/)
.map((s) => s.trim())
.filter(Boolean);
}
export function AdminInvitations() {
const [data, setData] = useState<ListData | null>(null);
const [error, setError] = useState<string | null>(null);
const load = useCallback(async () => {
try {
setData(await api<ListData>("/admin/invitations"));
setError(null);
} catch (e) {
setError(errorText(e));
}
}, []);
useEffect(() => {
load();
}, [load]);
return (
<div className="field" style={{ gap: 24 }}>
{data?.signup_mode === "open" && (
<p className="msg" role="status">
A regisztráció most nyitott (<code>SIGNUP_MODE=open</code>): bárki beléphet, a meghívó csak értesítés.
</p>
)}
<InviteForm onSent={load} />
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
{data && <InvitationList invitations={data.invitations} onChange={load} />}
{data && <WaitlistTable waitlist={data.waitlist} onChange={load} />}
</div>
);
}
function InviteForm({ onSent }: { onSent: () => Promise<void> }) {
const [emails, setEmails] = useState("");
const [message, setMessage] = useState("");
const [locale, setLocale] = useState("hu");
const [busy, setBusy] = useState(false);
const [error, setError] = useState<string | null>(null);
const [results, setResults] = useState<InvitationResult[] | null>(null);
const count = parseEmails(emails).length;
async function submit(e: React.FormEvent) {
e.preventDefault();
setBusy(true);
setError(null);
setResults(null);
try {
const res = await api<{ results: InvitationResult[] }>("/admin/invitations", {
body: { emails: parseEmails(emails), message: message.trim() || null, locale },
});
setResults(res.results);
if (res.results.some((r) => r.status === "invited")) setEmails("");
await onSent();
} catch (err) {
setError(errorText(err));
} finally {
setBusy(false);
}
}
return (
<section className="card field" style={{ gap: 16 }} aria-labelledby="invite-title">
<h2 id="invite-title" style={{ margin: 0 }}>
Új meghívó
</h2>
<form onSubmit={submit} className="field" style={{ gap: 14 }}>
<div className="field">
<label htmlFor="invite-emails">E-mail-címek</label>
<textarea
id="invite-emails"
className="inp"
rows={3}
required
value={emails}
onChange={(e) => setEmails(e.target.value)}
placeholder={"kata@pelda.hu\nbela@pelda.hu"}
/>
<span className="hint">Soronként egy, vagy vesszővel elválasztva; egyszerre legfeljebb 50.</span>
</div>
<div className="field">
<label htmlFor="invite-message">Személyes üzenet (nem kötelező)</label>
<textarea
id="invite-message"
className="inp"
rows={3}
maxLength={MAX_MESSAGE}
value={message}
onChange={(e) => setMessage(e.target.value)}
placeholder="Szia! Ezt nézd meg, szerintem tetszeni fog."
/>
<span className="hint">
{message.length}/{MAX_MESSAGE} karakter. Link nem lehet benne (spamszűrők miatt).
</span>
</div>
<div className="row" style={{ gap: 12, alignItems: "flex-end", flexWrap: "wrap" }}>
<div className="field" style={{ width: 160 }}>
<label htmlFor="invite-locale">A levél nyelve</label>
<select id="invite-locale" className="inp" value={locale} onChange={(e) => setLocale(e.target.value)}>
<option value="hu">magyar</option>
<option value="en">angol</option>
</select>
</div>
<button type="submit" className="btn btn-primary" disabled={busy || count === 0}>
{busy ? "Küldés…" : count > 1 ? `${count} meghívó küldése` : "Meghívó küldése"}
</button>
</div>
</form>
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
{results && (
<ul className="invite-results" aria-label="Eredmény">
{results.map((r) => (
<li key={r.email}>
<span className={r.status === "invited" ? "msg-ok" : "muted"}>
{r.email}: {RESULT[r.status]}
</span>
{r.url && <CopyLink url={r.url} />}
</li>
))}
</ul>
)}
<MailPreview message={message} locale={locale} />
</section>
);
}
/** The invitation e-mail as the recipient sees it, and a test copy to the admin. */
function MailPreview({ message, locale }: { message: string; locale: string }) {
const [mail, setMail] = useState<{ subject: string; html: string; text: string } | null>(null);
const [view, setView] = useState<"html" | "text">("html");
const [busy, setBusy] = useState(false);
const [note, setNote] = useState<{ ok: boolean; text: string } | null>(null);
async function show(sendToMe: boolean) {
setBusy(true);
setNote(null);
try {
const res = await api<{ subject: string; html: string; text: string; sent_to: string | null }>(
"/admin/invitations/preview",
{ body: { message: message.trim() || null, locale, send_to_me: sendToMe } },
);
setMail(res);
if (res.sent_to) setNote({ ok: true, text: `Tesztlevél a sorban: ${res.sent_to}. A linkjei nem működnek.` });
} catch (e) {
setNote({ ok: false, text: errorText(e) });
} finally {
setBusy(false);
}
}
return (
<div className="field mail-preview" style={{ gap: 10 }}>
<div className="row" style={{ gap: 8, flexWrap: "wrap" }}>
<button type="button" className="btn btn-sm" onClick={() => show(false)} disabled={busy}>
{mail ? "Előnézet frissítése" : "Levél előnézete"}
</button>
<button type="button" className="btn btn-sm btn-ghost" onClick={() => show(true)} disabled={busy}>
Teszt küldése magamnak
</button>
</div>
{note && (
<p className={note.ok ? "msg msg-ok" : "msg msg-error"} role={note.ok ? "status" : "alert"}>
{note.text}
</p>
)}
{mail && (
<>
<p style={{ margin: 0 }}>
<span className="muted">Tárgy:</span> <strong>{mail.subject}</strong>
</p>
<div className="row" role="group" aria-label="Változat" style={{ gap: 4 }}>
{(["html", "text"] as const).map((v) => (
<button
key={v}
type="button"
className={view === v ? "btn btn-sm" : "btn btn-sm btn-ghost"}
aria-pressed={view === v}
onClick={() => setView(v)}
>
{v === "html" ? "HTML" : "Szöveges"}
</button>
))}
</div>
{view === "html" ? (
<iframe title="A levél HTML-változata" className="mail-frame" srcDoc={mail.html} sandbox="" />
) : (
<pre className="mail-text">{mail.text}</pre>
)}
</>
)}
</div>
);
}
function InvitationList({ invitations, onChange }: { invitations: AdminInvitation[]; onChange: () => Promise<void> }) {
return (
<section className="card" aria-labelledby="invitations-title">
<h2 id="invitations-title" style={{ marginTop: 0 }}>
Meghívók
</h2>
{invitations.length === 0 ? (
<p className="muted">Még nincs meghívó.</p>
) : (
<div className="table-wrap">
<table>
<thead>
<tr>
<th scope="col">Cím</th>
<th scope="col">Állapot</th>
<th scope="col">Levél</th>
<th scope="col">Küldve</th>
<th scope="col">Lejár</th>
<th scope="col">
<span className="sr-only">Műveletek</span>
</th>
</tr>
</thead>
<tbody>
{invitations.map((i) => (
<InvitationRow key={i.id} invitation={i} onChange={onChange} />
))}
</tbody>
</table>
</div>
)}
</section>
);
}
function InvitationRow({ invitation: i, onChange }: { invitation: AdminInvitation; onChange: () => Promise<void> }) {
const [busy, setBusy] = useState(false);
const [note, setNote] = useState<string | null>(null);
const [url, setUrl] = useState<string | null>(null);
async function act(kind: "resend" | "revoke") {
if (kind === "revoke" && !window.confirm(`Visszavonod a meghívót (${i.email})?`)) return;
setBusy(true);
setNote(null);
try {
if (kind === "resend") {
const res = await api<{ url: string }>(`/admin/invitations/${i.id}/resend`, { body: {} });
setUrl(res.url);
} else {
await api(`/admin/invitations/${i.id}`, { method: "DELETE" });
}
await onChange();
} catch (e) {
setNote(errorText(e));
} finally {
setBusy(false);
}
}
return (
<tr>
<td>
<div>{i.email}</div>
{i.message && (
<div className="hint invite-msg" title={i.message}>
„{i.message}”
</div>
)}
</td>
<td>
<span className={`badge invite-${i.status}`}>{STATUS[i.status]}</span>
{i.accepted_by && <div className="hint">{i.accepted_by}</div>}
</td>
<td>
<span className={i.mail === "failed" ? "msg-error" : i.mail === "queued" ? "muted" : undefined}>
{MAIL[i.mail]}
</span>
{i.mail_error && <div className="hint">{i.mail_error.slice(0, 120)}</div>}
</td>
<td className="num">
{formatDate(i.last_sent_at)}
{i.sent_count > 1 && <div className="hint">{i.sent_count}× küldve</div>}
</td>
<td className="num">{i.status === "pending" || i.status === "expired" ? formatDate(i.expires_at) : "–"}</td>
<td>
<div className="row" style={{ gap: 4, flexWrap: "nowrap", justifyContent: "flex-end" }}>
{url && <CopyLink url={url} />}
{i.can_resend && (
<button type="button" className="btn btn-sm" onClick={() => act("resend")} disabled={busy}>
Újraküldés
</button>
)}
{(i.status === "pending" || i.status === "expired") && (
<button type="button" className="btn btn-sm btn-ghost" onClick={() => act("revoke")} disabled={busy}>
Visszavonás
</button>
)}
</div>
{note && (
<div className="msg-error" role="alert" style={{ fontSize: 13 }}>
{note}
</div>
)}
</td>
</tr>
);
}
function WaitlistTable({ waitlist, onChange }: { waitlist: WaitlistEntry[]; onChange: () => Promise<void> }) {
const [busy, setBusy] = useState<string | null>(null);
const [note, setNote] = useState<string | null>(null);
async function invite(w: WaitlistEntry) {
setBusy(w.email);
setNote(null);
try {
const res = await api<{ results: InvitationResult[] }>("/admin/invitations", {
body: { emails: [w.email], locale: w.locale },
});
const r = res.results[0];
if (r && r.status !== "invited") setNote(`${r.email}: ${RESULT[r.status]}`);
await onChange();
} catch (e) {
setNote(errorText(e));
} finally {
setBusy(null);
}
}
async function remove(w: WaitlistEntry) {
setBusy(w.email);
setNote(null);
try {
await api(`/admin/waitlist/${encodeURIComponent(w.email)}`, { method: "DELETE" });
await onChange();
} catch (e) {
setNote(errorText(e));
} finally {
setBusy(null);
}
}
return (
<section className="card" aria-labelledby="waitlist-title">
<h2 id="waitlist-title" style={{ marginTop: 0 }}>
Várólista
</h2>
<p className="hint">Akik meghívó nélkül próbáltak belépni, és kérték, hogy szóljunk nekik.</p>
{note && (
<p className="msg msg-error" role="alert">
{note}
</p>
)}
{waitlist.length === 0 ? (
<p className="muted">Üres.</p>
) : (
<div className="table-wrap">
<table>
<thead>
<tr>
<th scope="col">Cím</th>
<th scope="col">Feliratkozott</th>
<th scope="col">Meghívó</th>
<th scope="col">
<span className="sr-only">Műveletek</span>
</th>
</tr>
</thead>
<tbody>
{waitlist.map((w) => (
<tr key={w.email}>
<td>{w.email}</td>
<td className="num">{formatDate(w.created_at)}</td>
<td>{w.invitation === "pending" ? "elküldve" : w.invitation === "accepted" ? "elfogadva" : "–"}</td>
<td>
<div className="row" style={{ gap: 4, flexWrap: "nowrap", justifyContent: "flex-end" }}>
{w.invitation === null && (
<button
type="button"
className="btn btn-sm"
onClick={() => invite(w)}
disabled={busy !== null}
>
Meghívás
</button>
)}
<button
type="button"
className="btn btn-sm btn-ghost"
onClick={() => remove(w)}
disabled={busy !== null}
>
Törlés
</button>
</div>
</td>
</tr>
))}
</tbody>
</table>
</div>
)}
</section>
);
}
@@ -0,0 +1,27 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { AdminNav } from "@/components/AdminNav";
import { requireMe } from "@/lib/server";
import { AdminInvitations } from "./AdminInvitations";
export const metadata: Metadata = { title: "Meghívók" };
export default async function AdminInvitationsPage() {
const me = await requireMe("/admin/meghivok");
if (!me.user.roles.includes("admin")) notFound();
return (
<main className="page" style={{ maxWidth: 1180 }}>
<AdminNav current="/admin/meghivok" />
<div className="page-head">
<h1>Meghívók</h1>
<p className="muted">
Az oldalra csak meglévő felhasználó vagy meghívott léphet be. A meghívó 30 napig érvényes, és a linkkel bármelyik
Google-fiókkal elfogadható.
</p>
</div>
<AdminInvitations />
</main>
);
}
+3 -1
View File
@@ -1,6 +1,7 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { AdminNav } from "@/components/AdminNav";
import { requireMe } from "@/lib/server";
import { AdminUsers } from "./AdminUsers";
@@ -13,9 +14,10 @@ export default async function AdminPage() {
if (!me.user.roles.includes("admin")) notFound();
return (
<main className="page" style={{ maxWidth: 1180 }}>
<AdminNav current="/admin" />
<div className="page-head">
<h1>Felhasználók</h1>
<p className="muted">Szerepkörök kezelése és részletes elemzések jóváírása (ajándék, reklamáció). A vásárlások is ide könyvelődnek majd.</p>
<p className="muted">Szerepkörök kezelése, csomagok kiosztása és elemzések jóváírása (ajándék, reklamáció).</p>
</div>
<AdminUsers selfId={me.user.id} />
</main>
@@ -0,0 +1,283 @@
"use client";
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 { PromptTrial } from "./PromptTrial";
const KINDS: { kind: PromptKind; id: string; label: string; about: string }[] = [
{
kind: "summary",
id: "osszefoglalo",
label: "Tömör összefoglaló",
about: "Ingyenes, a képlet oldalán a „Röviden” blokk: egy cím és 3–4 mondat. Minden új képlethez magától elkészül.",
},
{
kind: "natal",
id: "reszletes",
label: "Részletes elemzés",
about: "Fizetős, hat fejezet, erősségek, kihívások és útravaló. Kérésre készül.",
},
{
kind: "synastry",
id: "kapcsolati",
label: "Kapcsolati elemzés",
about: "Fizetős összevetés-elemzés két képletről: öt fejezet, erősségek, kihívások és útravaló. Kérésre készül.",
},
];
const LANGUAGES: Record<string, string> = { hu: "Magyar", en: "Angol" };
export function AdminPrompts() {
const [prompts, setPrompts] = useState<AdminPrompt[] | null>(null);
const [charts, setCharts] = useState<ChartListItem[]>([]);
const [error, setError] = useState<string | null>(null);
useEffect(() => {
api<{ prompts: AdminPrompt[] }>("/admin/prompts")
.then((d) => setPrompts(d.prompts))
.catch((e) => setError(errorText(e)));
api<{ charts: ChartListItem[] }>("/charts")
.then((d) => setCharts(d.charts))
.catch(() => setCharts([]));
}, []);
if (error) {
return (
<p className="msg msg-error" role="alert">
{error}
</p>
);
}
if (!prompts) return <p className="muted">Betöltés…</p>;
const replace = (next: AdminPrompt) =>
setPrompts((all) => all?.map((p) => (p.kind === next.kind && p.language === next.language ? next : p)) ?? null);
return (
<section className="card">
<Tabs
label="Elemzésfajták"
tabs={KINDS.map((k) => ({
id: k.id,
label: k.label,
content: (
<KindPrompts
about={k.about}
prompts={prompts.filter((p) => p.kind === k.kind)}
charts={charts}
onSaved={replace}
/>
),
}))}
/>
</section>
);
}
function KindPrompts({
about,
prompts,
charts,
onSaved,
}: {
about: string;
prompts: AdminPrompt[];
charts: ChartListItem[];
onSaved: (p: AdminPrompt) => void;
}) {
const [language, setLanguage] = useState(prompts[0]?.language ?? "hu");
const prompt = prompts.find((p) => p.language === language) ?? prompts[0];
if (!prompt) return null;
return (
<div className="prompt-kind">
<div className="prompt-kind-head">
<p className="muted">{about}</p>
{prompts.length > 1 && (
<div className="field prompt-lang">
<label htmlFor={`lang-${prompt.kind}`}>Nyelv</label>
<select
id={`lang-${prompt.kind}`}
className="inp"
value={language}
onChange={(e) => setLanguage(e.target.value)}
>
{prompts.map((p) => (
<option key={p.language} value={p.language}>
{LANGUAGES[p.language] ?? p.language}
{p.custom ? " (szerkesztett)" : ""}
</option>
))}
</select>
</div>
)}
</div>
<PromptEditor key={`${prompt.kind}-${prompt.language}`} prompt={prompt} charts={charts} onSaved={onSaved} />
</div>
);
}
function PromptEditor({
prompt,
charts,
onSaved,
}: {
prompt: AdminPrompt;
charts: ChartListItem[];
onSaved: (p: AdminPrompt) => void;
}) {
const [draft, setDraft] = useState(prompt.system);
const [busy, setBusy] = useState(false);
const [error, setError] = useState<string | null>(null);
const [saved, setSaved] = useState(false);
const dirty = draft.trim() !== prompt.system.trim();
const id = `prompt-${prompt.kind}-${prompt.language}`;
useEffect(() => {
if (!dirty) return;
const warn = (e: BeforeUnloadEvent) => e.preventDefault();
window.addEventListener("beforeunload", warn);
return () => window.removeEventListener("beforeunload", warn);
}, [dirty]);
async function save(system: string | null) {
setBusy(true);
setError(null);
setSaved(false);
try {
const next = await api<AdminPrompt>(`/admin/prompts/${prompt.kind}/${prompt.language}`, {
method: "PUT",
body: { system },
});
onSaved(next);
setDraft(next.system);
setSaved(true);
} catch (e) {
setError(errorText(e));
} finally {
setBusy(false);
}
}
return (
<div className="prompt-editor">
<div className="prompt-status">
{prompt.custom ? (
<span className="badge badge-gold">Szerkesztett</span>
) : (
<span className="badge">Alapértelmezett</span>
)}
{prompt.updated_at && (
<span className="hint">
Utoljára mentve: {formatDate(prompt.updated_at, true)}
{prompt.updated_by ? ` · ${prompt.updated_by}` : ""}
</span>
)}
</div>
<div className="field">
<label htmlFor={id}>Utasítások a modellnek (system prompt)</label>
<textarea
id={id}
className="inp prompt-text"
value={draft}
onChange={(e) => {
setDraft(e.target.value);
setSaved(false);
}}
spellCheck={false}
rows={24}
/>
<span className="hint">
{draft.length.toLocaleString("hu-HU")} karakter
{dirty ? " · mentetlen változás" : ""}
</span>
</div>
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
{saved && !dirty && (
<p className="msg msg-ok" role="status">
Elmentve. Az ezután kért elemzések már ezzel készülnek.
</p>
)}
<div className="form-actions">
<button type="button" className="btn btn-primary" onClick={() => save(draft)} disabled={busy || !dirty}>
{busy ? "Mentés…" : "Mentés"}
</button>
<button type="button" className="btn" onClick={() => setDraft(prompt.system)} disabled={busy || !dirty}>
Változások elvetése
</button>
{(prompt.custom || draft.trim() !== prompt.default.trim()) && (
<button
type="button"
className="btn btn-ghost"
onClick={() => setDraft(prompt.default)}
disabled={busy || draft.trim() === prompt.default.trim()}
>
Alapértelmezett szöveg betöltése
</button>
)}
</div>
<PromptTrial
kind={prompt.kind}
language={prompt.language}
draft={draft}
charts={charts}
onLoad={(system) => {
setDraft(system);
setSaved(false);
}}
/>
<details className="details">
<summary>Amit a modell ezen felül kap</summary>
<div className="prompt-extra">
<p className="hint">
Ezt a kód állítja össze, nem szerkeszthető. A <code>{"{chart data}"}</code> helyére a képlet pozíciói kerülnek
(név, dátum és hely nélkül). A válasz formáját (mezők, fejezetek) egy rögzített JSON-séma írja elő.
</p>
<pre className="prompt-pre">{prompt.user_template}</pre>
</div>
</details>
{prompt.history.length > 0 && (
<details className="details">
<summary>Korábbi változatok ({prompt.history.length})</summary>
<ul className="prompt-history">
{prompt.history.map((h, i) => (
<li key={h.id}>
<span>
{formatDate(h.created_at, true)}
{h.created_by ? ` · ${h.created_by}` : ""}
</span>
<span className="hint">
{i === 0 ? "érvényben · " : ""}
{h.custom ? `${(h.system ?? "").length.toLocaleString("hu-HU")} karakter` : "alapértelmezett"}
</span>
<button
type="button"
className="btn btn-sm"
onClick={() => setDraft(h.system ?? prompt.default)}
disabled={busy}
>
Betöltés
</button>
</li>
))}
</ul>
<p className="hint">A betöltött változat a szerkesztőbe kerül; a mentéssel lesz érvényes.</p>
</details>
)}
</div>
);
}
@@ -0,0 +1,240 @@
"use client";
import { useCallback, useEffect, useState } from "react";
import { AnalysisLoading } from "@/components/AnalysisLoading";
import { AnalysisView } from "@/components/AnalysisView";
import { api, errorText } from "@/lib/api";
import { formatDate } from "@/lib/astro";
import { listName } from "@/lib/synastry";
import type { ChartListItem, PromptKind, PromptPreview, SynastryListItem } from "@/lib/types";
const POLL_MS = 4000;
const MAX_POLLS = 150; // 10 minutes
interface Trial {
preview: PromptPreview;
/** The draft it was written with, to load it back. */
system: string;
}
/**
* Writes an analysis with the draft in the editor (saved or not) on one of
* the admin's charts. Nothing is stored with the chart.
*/
export function PromptTrial({
kind,
language,
draft,
charts,
onLoad,
}: {
kind: PromptKind;
language: string;
draft: string;
charts: ChartListItem[];
onLoad: (system: string) => void;
}) {
const synastry = kind === "synastry";
const [chartId, setChartId] = useState(charts.find((c) => c.is_primary)?.id ?? charts[0]?.id ?? "");
const [synastries, setSynastries] = useState<SynastryListItem[]>([]);
const [synastryId, setSynastryId] = useState("");
useEffect(() => {
if (!synastry) return;
api<{ synastries: SynastryListItem[] }>("/synastries")
.then((d) => {
const own = d.synastries.filter((s) => s.owned);
setSynastries(own);
setSynastryId((current) => current || own[0]?.id || "");
})
.catch(() => setSynastries([]));
}, [synastry]);
const targetId = synastry ? synastryId : chartId;
const comparisonName = (s: SynastryListItem) => `${listName(s.chart1, charts)} és ${listName(s.chart2, charts)}`;
const [trials, setTrials] = useState<Trial[]>([]);
const [busy, setBusy] = useState(false);
const [error, setError] = useState<string | null>(null);
const selectId = `trial-chart-${kind}-${language}`;
async function start() {
setBusy(true);
setError(null);
try {
const preview = await api<PromptPreview>(`/admin/prompts/${kind}/${language}/preview`, {
body: synastry ? { system: draft, synastry_id: synastryId } : { system: draft, chart_id: chartId },
});
setTrials((all) => [{ preview, system: draft }, ...all]);
} catch (e) {
setError(errorText(e));
} finally {
setBusy(false);
}
}
const update = useCallback(
(next: PromptPreview) =>
setTrials((all) => all.map((t) => (t.preview.id === next.id ? { ...t, preview: next } : t))),
[],
);
return (
<section className="prompt-trial" aria-labelledby={`${selectId}-title`}>
<div className="prompt-trial-head">
<h2 id={`${selectId}-title`}>Kipróbálás</h2>
<p className="hint">
A szerkesztőben lévő szöveggel (mentés nélkül is) megírja az elemzést egy saját{" "}
{synastry ? "összevetésedre" : "képletedre"}. Az eredmény nem kerül {synastry ? "az összevetéshez" : "a képlethez"},
csak itt látod. Valódi modellhívás, ezért költsége van.
</p>
</div>
{synastry && synastries.length === 0 ? (
<p className="muted">
Kipróbáláshoz előbb készíts egy összevetést az <a href="/osszevetesek">Összevetések</a> oldalon.
</p>
) : synastry ? (
<div className="prompt-trial-form">
<div className="field">
<label htmlFor={selectId}>Összevetés</label>
<select id={selectId} className="inp" value={synastryId} onChange={(e) => setSynastryId(e.target.value)}>
{synastries.map((s) => (
<option key={s.id} value={s.id}>
{comparisonName(s)}
</option>
))}
</select>
</div>
<button type="button" className="btn btn-primary" onClick={start} disabled={busy || !targetId || !draft.trim()}>
{busy ? "Indítás…" : "Kipróbálás"}
</button>
</div>
) : charts.length === 0 ? (
<p className="muted">Kipróbáláshoz előbb legyen legalább egy képleted.</p>
) : (
<div className="prompt-trial-form">
<div className="field">
<label htmlFor={selectId}>Képlet</label>
<select id={selectId} className="inp" value={chartId} onChange={(e) => setChartId(e.target.value)}>
{charts.map((c) => (
<option key={c.id} value={c.id}>
{c.is_primary ? `Én (${c.label})` : c.label}
{c.birth.time ? "" : " – idő nélkül"}
</option>
))}
</select>
</div>
<button type="button" className="btn btn-primary" onClick={start} disabled={busy || !chartId || !draft.trim()}>
{busy ? "Indítás…" : "Kipróbálás"}
</button>
</div>
)}
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
{trials.map((t) => (
<TrialResult
key={t.preview.id}
trial={t}
chartLabel={
t.preview.synastry_id
? (() => {
const s = synastries.find((x) => x.id === t.preview.synastry_id);
return s ? comparisonName(s) : "Összevetés";
})()
: (charts.find((c) => c.id === t.preview.chart_id)?.label ?? "Képlet")
}
changed={t.system.trim() !== draft.trim()}
onUpdate={update}
onLoad={() => onLoad(t.system)}
/>
))}
</section>
);
}
function TrialResult({
trial,
chartLabel,
changed,
onUpdate,
onLoad,
}: {
trial: Trial;
chartLabel: string;
changed: boolean;
onUpdate: (p: PromptPreview) => void;
onLoad: () => void;
}) {
const p = trial.preview;
const waiting = p.status === "pending" || p.status === "running";
useEffect(() => {
if (!waiting) return;
let polls = 0;
let stopped = false;
let timer: ReturnType<typeof setTimeout> | undefined;
const tick = async () => {
try {
const next = await api<PromptPreview>(`/admin/previews/${p.id}`);
if (stopped) return;
onUpdate(next);
if (next.status === "done" || next.status === "failed") return;
} catch {
// try again on the next tick
}
if (++polls < MAX_POLLS) timer = setTimeout(tick, POLL_MS);
};
timer = setTimeout(tick, POLL_MS);
return () => {
stopped = true;
clearTimeout(timer);
};
}, [waiting, p.id, onUpdate]);
const meta = [
p.model_used ?? p.model,
p.seconds !== null ? `${p.seconds} mp` : null,
p.input_tokens !== null && p.output_tokens !== null
? `${p.input_tokens.toLocaleString("hu-HU")} + ${p.output_tokens.toLocaleString("hu-HU")} token`
: null,
p.cost_usd !== null ? `$${p.cost_usd.toFixed(4)}` : null,
].filter(Boolean);
return (
<article className="trial" aria-busy={waiting}>
<header className="trial-head">
<div>
<strong>{chartLabel}</strong>
<span className="hint"> · {formatDate(p.created_at, true)}</span>
</div>
{changed && (
<button type="button" className="btn btn-sm" onClick={onLoad}>
Ennek a szövegnek a betöltése
</button>
)}
</header>
{waiting ? (
<AnalysisLoading
compact
text={p.kind === "summary" ? "Készül az összefoglaló, kb. 10–30 másodperc." : "Készül az elemzés, kb. 1–3 perc."}
/>
) : p.status === "failed" ? (
<p className="msg msg-error" role="alert">
Nem sikerült: {p.error ?? "ismeretlen hiba"}
</p>
) : p.content ? (
p.kind === "summary" ? (
<div className="trial-summary">
<h3 className="summary-title">{p.content.title}</h3>
<p className="summary-text">{p.content.summary}</p>
</div>
) : (
<AnalysisView content={p.content} kind={p.kind === "synastry" ? "synastry" : "natal"} />
)
) : null}
{meta.length > 0 && !waiting && <p className="hint">{meta.join(" · ")}</p>}
</article>
);
}
@@ -0,0 +1,27 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { AdminNav } from "@/components/AdminNav";
import { requireMe } from "@/lib/server";
import { AdminPrompts } from "./AdminPrompts";
export const metadata: Metadata = { title: "Promptok" };
export default async function AdminPromptsPage() {
const me = await requireMe("/admin/promptok");
if (!me.user.roles.includes("admin")) notFound();
return (
<main className="page" style={{ maxWidth: 1180 }}>
<AdminNav current="/admin/promptok" />
<div className="page-head">
<h1>Promptok</h1>
<p className="muted">
Az elemzéseket író modell utasításai. A változás az ezután kért elemzésekre hat; a már elkészültek
változatlanok maradnak.
</p>
</div>
<AdminPrompts />
</main>
);
}
@@ -4,7 +4,8 @@ import Script from "next/script";
import { useRouter } from "next/navigation";
import { useCallback, useEffect, useRef, useState } from "react";
import { api, errorText } from "@/lib/api";
import { Waitlist } from "@/components/Waitlist";
import { ApiError, api, errorText } from "@/lib/api";
/** Google's "G" mark (branding guidelines: unmodified, on the left of the label). */
function GoogleMark() {
@@ -30,32 +31,57 @@ function GoogleMark() {
);
}
/** The e-mail address inside Google's ID token (only for prefilling a form; the backend verifies the token). */
function tokenEmail(credential: string): string {
try {
const part = credential.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 Google" in the site's own button style. Google's real
* (rendered, invisible) button lies on top of it and receives the click, so
* the sign-in still returns an ID token.
*/
export function GoogleLogin({ clientId, target }: { clientId: string; target: string }) {
export function GoogleLogin({
clientId,
target,
inviteToken = null,
}: {
clientId: string;
target: string;
/** From an invitation link: lets in any Google account. */
inviteToken?: string | null;
}) {
const router = useRouter();
const slot = useRef<HTMLDivElement>(null);
const [ready, setReady] = useState(false);
const [error, setError] = useState<string | null>(null);
const [busy, setBusy] = useState(false);
/** Set when the address has no invitation: offer the waitlist for it. */
const [uninvited, setUninvited] = useState<string | null>(null);
const onCredential = useCallback(
async (response: GoogleCredentialResponse) => {
setBusy(true);
setError(null);
setUninvited(null);
try {
await api("/auth/google", { body: { id_token: response.credential } });
await api("/auth/google", { body: { id_token: response.credential, invite_token: inviteToken } });
router.replace(target);
router.refresh();
} catch (e) {
setError(errorText(e));
if (e instanceof ApiError && e.code === "not_invited") setUninvited(tokenEmail(response.credential));
else setError(errorText(e));
setBusy(false);
}
},
[router, target],
[router, target, inviteToken],
);
useEffect(() => {
@@ -94,6 +120,16 @@ export function GoogleLogin({ clientId, target }: { clientId: string; target: st
{error}
</p>
)}
{uninvited !== null && (
<>
<p className="msg msg-error" role="alert">
{inviteToken
? "Ez a meghívó már nem érvényes, és ehhez a Google-fiókhoz sem tartozik másik."
: `A Sorsfonalak jelenleg meghívásos, és ${uninvited ? `a(z) ${uninvited} címhez` : "ehhez a fiókhoz"} nem tartozik meghívó. Ha kaptál meghívót egy másik címre, lépj be azzal a Google-fiókkal, vagy nyisd meg a levélben kapott linket.`}
</p>
<Waitlist email={uninvited} />
</>
)}
</div>
);
}
+71 -7
View File
@@ -5,7 +5,8 @@ import { redirect } from "next/navigation";
import { Logo } from "@/components/SiteHeader";
import { ZodiacWheel } from "@/components/ZodiacWheel";
import { BACKEND_URL, getMe } from "@/lib/server";
import type { PublicConfig } from "@/lib/types";
import { formatDate } from "@/lib/astro";
import type { InvitationLanding, PublicConfig } from "@/lib/types";
import { GoogleLogin } from "./GoogleLogin";
@@ -26,11 +27,63 @@ async function loadConfig(): Promise<PublicConfig | null> {
}
}
async function loadInvitation(token: string): Promise<InvitationLanding | null> {
try {
const res = await fetch(`${BACKEND_URL}/v1/public/invitations/${encodeURIComponent(token)}`, { cache: "no-store" });
return res.ok ? ((await res.json()) as InvitationLanding) : null;
} catch {
return null;
}
}
const CLOSED: Record<string, string> = {
accepted: "Ezt a meghívót már felhasználták. Ha a tiéd volt, egyszerűen lépj be ugyanazzal a Google-fiókkal.",
expired: "Ez a meghívó lejárt. Kérj újat attól, aki meghívott.",
revoked: "Ezt a meghívót visszavonták.",
};
/** The invitation the visitor came with: who sent it and what they wrote. */
function InvitationCard({ invitation }: { invitation: InvitationLanding | null }) {
if (!invitation) {
return (
<p className="msg msg-error" role="alert">
Ez a meghívólink érvénytelen. Ellenőrizd, hogy a teljes linket nyitottad-e meg a levélből.
</p>
);
}
if (invitation.status !== "pending") {
return (
<p className="msg msg-error" role="alert">
{CLOSED[invitation.status]}
</p>
);
}
return (
<div className="card invite-card">
<span className="eyebrow">Meghívó</span>
<p style={{ margin: 0 }}>
{invitation.inviter_name ? <strong>{invitation.inviter_name}</strong> : "Valaki"} meghívott a Sorsfonalakra.
</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.
</p>
</div>
);
}
export default async function LoginPage({ searchParams }: { searchParams: Promise<Record<string, string | string[]>> }) {
const target = safeTarget((await searchParams).vissza);
const params = await searchParams;
const target = safeTarget(params.vissza);
if (await getMe()) redirect(target);
const config = await loadConfig();
const rawToken = Array.isArray(params.meghivo) ? params.meghivo[0] : params.meghivo;
const inviteToken = rawToken && /^[A-Za-z0-9_-]{8,200}$/.test(rawToken) ? rawToken : null;
const [config, invitation] = await Promise.all([
loadConfig(),
inviteToken ? loadInvitation(inviteToken) : Promise.resolve(null),
]);
const clientId = config?.google_login.enabled ? config.google_login.client_id : null;
const inviteOnly = config?.signup_mode === "invite";
return (
<div className="auth">
@@ -47,21 +100,32 @@ export default async function LoginPage({ searchParams }: { searchParams: Promis
<main className="auth-main">
<div className="auth-box">
<div className="page-head">
<h1 style={{ fontSize: 44 }}>Belépés</h1>
<p className="muted">Üdv újra! Lépj be a fiókodba.</p>
<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} />}
{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} />
<GoogleLogin
clientId={clientId}
target={target}
inviteToken={invitation?.status === "pending" ? inviteToken : null}
/>
) : (
<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).
</p>
)}
<p className="auth-foot">Még nincs fiókod? Az első belépéskor létrejön.</p>
<p className="auth-foot">
{rawToken
? "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."}
</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>.
@@ -0,0 +1,97 @@
import type { Metadata } from "next";
import { PackageCards } from "@/components/PackageCards";
import { formatDate } from "@/lib/astro";
import { backendGet, requireMe } from "@/lib/server";
import type { Package, PublicConfig } from "@/lib/types";
export const metadata: Metadata = { title: "Csomagok" };
const faq = (dailyLimit: number): [string, string][] => [
[
"Lejárnak a megvett elemzések?",
"Nem. A csomagokban kapott elemzések és személyhelyek addig megmaradnak, amíg fel nem használod őket. Csak a Korlátlan csomag szól egy évre.",
],
[
"Mi a különbség a képletelemzés és a kapcsolati elemzés között?",
"A képletelemzés egy ember születési képletét írja le hat fejezetben. A kapcsolati elemzés két képletet vet össze: mi vonz, hol súrlódtok, és mit ad a kapcsolat.",
],
[
"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.",
],
[
"Van korlát a Korlátlan csomagban?",
`Méltányos használat: naponta legfeljebb ${dailyLimit} új részletes elemzés kérhető. Ha még tart, egy újabb Korlátlan csomag a lejárathoz ad hozzá egy évet.`,
],
];
/** The packages: the main ladder, top-ups, and what the user has now. */
export default async function PackagesPage() {
const me = await requireMe("/csomagok");
const [catalog, config] = await Promise.all([
backendGet<{ packages: Package[] }>("/v1/packages"),
backendGet<PublicConfig>("/v1/config"),
]);
const packages = catalog?.packages ?? [];
const canPay = config?.mock_payments ?? false;
const left = me.analyses_left;
const slots = me.persons;
return (
<main className="page" style={{ maxWidth: 1180 }}>
<div className="page-head">
<h1>Csomagok</h1>
<p className="muted">
Minél többen vagytok, annál kevesebbe kerül egy elemzés. A megvett elemzések nem járnak le.
</p>
</div>
<section className="card holdings" aria-label="Amid most van">
<span className="eyebrow">Most</span>
{me.unlimited_until ? (
<p>
<strong>Korlátlan csomag</strong> {formatDate(me.unlimited_until).replace(/\.$/, "")}-ig.
</p>
) : (
<p>
<strong>{left.natal}</strong> képletelemzés · <strong>{left.synastry}</strong> kapcsolati elemzés ·{" "}
{slots.unlimited ? (
"korlátlan személy"
) : (
<>
<strong>{slots.left}</strong> szabad személyhely
</>
)}
</p>
)}
</section>
<PackageCards packages={packages} canPay={canPay} />
<section className="field" aria-labelledby="addon-title" style={{ gap: 12 }}>
<h2 id="addon-title">Kiegészítők</h2>
<p className="muted">Ha már van csomagod, és csak egy kicsi kell még.</p>
<PackageCards
packages={packages}
ids={packages.filter((p) => p.tier === "addon").map((p) => p.id)}
canPay={canPay}
compact
/>
</section>
<section className="card" aria-labelledby="faq-title">
<h2 id="faq-title">Gyakori kérdések</h2>
<dl className="faq">
{faq(config?.unlimited_daily_limit ?? 5).map(([q, a]) => (
<div key={q}>
<dt>{q}</dt>
<dd className="muted">{a}</dd>
</div>
))}
</dl>
<p className="hint">Az árak bruttó árak, az áfát tartalmazzák.</p>
</section>
</main>
);
}
+182 -9
View File
@@ -16,6 +16,7 @@
--harmonic: #7fb0e0;
--tense: #e38b8b;
--square: #f0a35e;
--p2: #c3a6f0; /* the second person of a comparison */
--radius: 10px;
--font-display: var(--font-cormorant), "Cormorant Garamond", Georgia, serif;
--font-body: var(--font-inter), Inter, system-ui, sans-serif;
@@ -56,6 +57,14 @@ 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; }
.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;
}
.pkg-pill:hover { background: rgba(217, 180, 106, 0.08); color: var(--gold); }
.pkg-pill-detail { color: var(--muted); }
.pkg-pill-detail::before { content: "·"; margin-right: 6px; }
.pkg-pill-empty { border-color: var(--line-2); color: var(--ink-2); }
/* Layout */
.page { max-width: 960px; margin: 0 auto; padding: 32px 16px 64px; display: flex; flex-direction: column; gap: 24px; }
@@ -215,8 +224,8 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
@media (max-width: 640px) { .loading { flex-direction: column; text-align: center; } }
/* Payment step */
.pay-box { display: flex; flex-direction: column; gap: 16px; padding: 20px; max-width: 520px; border: 1px solid var(--line-2); border-radius: var(--radius); background: var(--panel-2); }
.pay-line { display: flex; justify-content: space-between; gap: 12px; }
.pay-box { display: flex; flex-direction: column; gap: 16px; padding: 20px; border: 1px solid var(--line-2); border-radius: var(--radius); background: var(--panel-2); }
.pay-lead { margin: 0; }
.chart-layout { display: grid; grid-template-columns: minmax(0, 1.35fr) minmax(280px, 1fr); gap: 24px; align-items: stretch; }
.chart-side { gap: 16px; }
.chart-side .summary-card { flex: 1 1 auto; }
@@ -306,6 +315,7 @@ 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; }
.card { padding: 18px; }
.auth-aside { padding: 28px 20px; min-height: 0; }
.wheel { width: 60%; }
@@ -352,13 +362,6 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
.person-actions { display: flex; flex-wrap: wrap; align-items: center; gap: 4px 6px; padding: 0 12px 12px; border-top: 1px solid var(--line); padding-top: 8px; margin: 0 8px; }
.btn-danger { border-color: var(--danger); color: var(--danger); }
.btn-danger:hover { background: rgba(242, 160, 160, 0.08); color: var(--danger); border-color: var(--danger); }
.packs { display: grid; grid-template-columns: repeat(auto-fit, minmax(220px, 1fr)); gap: 12px; }
.pack {
display: flex; flex-direction: column; gap: 6px; align-items: flex-start; padding: 16px 18px;
background: var(--panel-2); border: 1px solid var(--line-2); border-radius: var(--radius);
}
.pack strong { font-family: var(--font-display); font-size: 22px; font-weight: 600; }
.pack .btn { margin-top: 8px; }
/* Chart switcher (the chart page title) */
.switcher { position: relative; align-self: flex-start; }
@@ -404,3 +407,173 @@ td.num { font-variant-numeric: tabular-nums; white-space: nowrap; }
.legal a { color: var(--gold); }
.legal-table td { vertical-align: top; line-height: 1.5; }
.danger-box { display: flex; flex-direction: column; gap: 12px; padding: 16px; border: 1px solid var(--danger); border-radius: var(--radius); }
/* Admin */
.admin-nav { display: flex; gap: 4px; border-bottom: 1px solid var(--line); margin-bottom: 4px; overflow-x: auto; }
.admin-nav a {
padding: 10px 14px; min-height: 44px; display: inline-flex; align-items: center; color: var(--muted);
text-decoration: none; border-bottom: 2px solid transparent; margin-bottom: -1px; white-space: nowrap;
}
.admin-nav a:hover { color: var(--ink); }
.admin-nav a[aria-current="page"] { color: var(--gold); border-bottom-color: var(--gold); }
.prompt-kind { display: flex; flex-direction: column; gap: 20px; }
.prompt-kind-head { display: flex; gap: 16px 24px; align-items: flex-end; justify-content: space-between; flex-wrap: wrap; }
.prompt-kind-head > p { flex: 1 1 360px; margin: 0; }
.prompt-lang { width: 200px; }
.prompt-editor { display: flex; flex-direction: column; gap: 16px; }
.prompt-status { display: flex; gap: 8px 12px; align-items: center; flex-wrap: wrap; }
.prompt-text {
min-height: 420px; padding: 12px 14px; resize: vertical; line-height: 1.55;
font: 400 13.5px/1.55 ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
}
.prompt-extra { display: flex; flex-direction: column; gap: 10px; }
.prompt-pre {
margin: 0; padding: 12px 14px; border: 1px solid var(--line); border-radius: var(--radius); background: var(--panel-2);
white-space: pre-wrap; overflow-wrap: anywhere; font: 400 13px/1.5 ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
color: var(--ink-2);
}
.prompt-history { list-style: none; margin: 0 0 8px; padding: 0; display: flex; flex-direction: column; }
.prompt-history li {
display: grid; grid-template-columns: 1fr auto auto; gap: 12px; align-items: center;
padding: 8px 0; border-bottom: 1px solid var(--line);
}
@media (max-width: 640px) {
.prompt-text { min-height: 320px; font-size: 13px; }
.prompt-lang { width: 100%; }
.prompt-history li { grid-template-columns: 1fr auto; }
.prompt-history li .hint { grid-column: 1; }
.prompt-history li .btn { grid-column: 2; grid-row: 1 / span 2; }
}
.prompt-trial {
display: flex; flex-direction: column; gap: 16px; padding: 20px; border: 1px solid var(--line);
border-radius: var(--radius); background: rgba(255, 255, 255, 0.015);
}
.prompt-trial-head { display: flex; flex-direction: column; gap: 6px; }
.prompt-trial-head h2 { font-size: 18px; margin: 0; }
.prompt-trial-head .hint { margin: 0; }
.prompt-trial-form { display: flex; gap: 12px; align-items: flex-end; flex-wrap: wrap; }
.prompt-trial-form .field { flex: 0 1 360px; }
.trial { display: flex; flex-direction: column; gap: 14px; padding-top: 16px; border-top: 1px solid var(--line); }
.trial-head { display: flex; gap: 8px 12px; align-items: center; justify-content: space-between; flex-wrap: wrap; }
.trial-summary { display: flex; flex-direction: column; gap: 8px; }
.trial-summary .summary-title, .trial-summary .summary-text { margin: 0; }
@media (max-width: 640px) {
.prompt-trial { padding: 16px; }
.prompt-trial-form .field { flex-basis: 100%; }
.prompt-trial-form .btn { width: 100%; }
}
/* Comparisons (synastry) */
.w-p2 .w-point-glyph { fill: var(--p2); }
.w-p2 .w-point-tick { stroke: var(--p2); }
.w-p2 .w-point:hover .w-point-glyph { fill: var(--gold); }
.w-end-p2 { fill: var(--p2); }
.w-p2-band { stroke-dasharray: 2 4; }
.legend-dot, .pair-dot { display: inline-block; width: 10px; height: 10px; border-radius: 50%; flex: none; }
.legend-p1 { background: var(--ink); }
.legend-p2 { background: var(--p2); }
.p2-text, .cross-grid th.p2-head { color: var(--p2); }
.cross-grid td.cross-corner { position: relative; min-width: 76px; height: 44px; font: 500 11px var(--font-body); color: var(--muted); }
.cross-col { position: absolute; top: 2px; right: 4px; color: var(--p2); white-space: nowrap; }
.cross-row { position: absolute; bottom: 2px; left: 2px; white-space: nowrap; }
.nature { display: flex; flex-direction: column; gap: 12px; }
.nature-bar { display: flex; gap: 3px; height: 10px; border-radius: 999px; overflow: hidden; }
.nature-bar-sm { height: 6px; margin-top: 4px; }
.nature-seg { flex-basis: 0; min-width: 4px; }
.nature-harmonious { background: var(--harmonic); }
.nature-challenging { background: var(--tense); }
.nature-neutral { background: var(--gold); }
.nature-list { margin: 0; display: flex; flex-direction: column; gap: 8px; }
.nature-list > div { display: grid; grid-template-columns: 128px 1fr; gap: 8px; align-items: baseline; }
.nature-list dt { display: inline-flex; align-items: center; gap: 8px; font-size: 14px; color: var(--ink-2); }
.nature-list dd { margin: 0; }
.nature-dot { width: 10px; height: 10px; border-radius: 50%; display: inline-block; }
.pair-card { gap: 4px; }
.pair-row {
display: grid; grid-template-columns: auto 1fr auto; gap: 12px; align-items: center; padding: 10px 0;
color: inherit; text-decoration: none; border-bottom: 1px solid var(--line);
}
.pair-row:last-child { border-bottom: 0; padding-bottom: 0; }
a.pair-row:hover strong { color: var(--gold); }
.pair-text { display: flex; flex-direction: column; gap: 2px; min-width: 0; }
.pair-text strong { font-family: var(--font-display); font-size: 21px; font-weight: 600; }
.compare-new { gap: 16px; }
.compare-form { display: grid; grid-template-columns: 1fr auto 1fr auto; gap: 12px; align-items: end; }
.compare-swap { font-size: 20px; padding: 0 10px; }
.compare-tile { gap: 6px; padding: 16px 20px; }
.compare-tile strong { font-family: var(--font-display); font-size: 21px; font-weight: 600; }
.compare-tile .muted { font-size: 14px; }
.compare-tile .form-actions { margin-top: 6px; }
.back-link { font-size: 14px; text-decoration: none; align-self: flex-start; }
@media (max-width: 640px) {
.compare-form { grid-template-columns: 1fr auto; }
.compare-form .field:first-child { grid-column: 1; }
.compare-swap { grid-column: 2; grid-row: 1 / span 2; align-self: center; }
.compare-form .field:nth-child(3) { grid-column: 1; }
.compare-form > .btn-primary { grid-column: 1 / -1; width: 100%; }
.nature-list > div { grid-template-columns: 1fr; gap: 2px; }
.nav { overflow-x: auto; scrollbar-width: none; }
.nav a { white-space: nowrap; padding: 10px 9px; }
.cross-grid td.cross-corner { min-width: 56px; font-size: 9px; }
}
/* Packages */
.pkg-grid { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 16px; align-items: stretch; }
.pkg-grid-compact { grid-template-columns: repeat(auto-fit, minmax(210px, 1fr)); gap: 12px; }
.pkg {
position: relative; display: flex; flex-direction: column; gap: 10px; padding: 22px 20px 20px;
background: var(--panel); border: 1px solid var(--line-2); border-radius: var(--radius);
}
.pkg-grid-compact .pkg { padding: 18px 16px 16px; gap: 8px; background: var(--panel-2); }
.pkg-featured { border-color: var(--gold); box-shadow: 0 0 0 1px var(--gold), 0 12px 32px rgba(217, 180, 106, 0.12); }
.pkg-tags { display: flex; gap: 6px; min-height: 22px; flex-wrap: wrap; }
.pkg-badge, .pkg-save {
display: inline-flex; align-items: center; min-height: 22px; padding: 0 9px; border-radius: 999px;
font-size: 12px; font-weight: 600; letter-spacing: 0.3px;
}
.pkg-badge { background: var(--gold); color: var(--gold-ink); }
.pkg-save { border: 1px solid rgba(159, 216, 176, 0.5); color: var(--ok); }
.pkg-name { font-size: 26px; }
.pkg-grid-compact .pkg-name { font-size: 22px; }
.pkg-tagline { margin: 0; font-size: 14px; min-height: 42px; }
.pkg-price { display: flex; align-items: baseline; gap: 10px; flex-wrap: wrap; }
.pkg-price strong { font-family: var(--font-display); font-size: 32px; font-weight: 600; color: var(--ink); }
.pkg-grid-compact .pkg-price strong { font-size: 26px; }
.pkg-list { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 6px; font-size: 14px; color: var(--ink-2); flex: 1; }
.pkg-list li { padding-left: 22px; position: relative; }
.pkg-list li::before { content: "✓"; position: absolute; left: 0; color: var(--gold); }
.pkg-per { margin: 0; }
.pkg-step { margin: 0; font-size: 13px; color: var(--gold); }
.pkg .btn { margin-top: 4px; width: 100%; }
.holdings { gap: 6px; padding: 16px 20px; }
.holdings p { margin: 0; color: var(--ink-2); }
.faq { margin: 0; display: flex; flex-direction: column; gap: 14px; }
.faq dt { font-weight: 600; margin-bottom: 4px; }
.faq dd { margin: 0; }
@media (max-width: 1000px) { .pkg-grid { grid-template-columns: repeat(2, minmax(0, 1fr)); } }
@media (max-width: 640px) {
.pkg-grid, .pkg-grid-compact { grid-template-columns: 1fr; }
.pkg-tagline { min-height: 0; }
}
/* Invitations */
.invite-card { display: flex; flex-direction: column; gap: 8px; }
.invite-quote {
margin: 0; padding: 2px 0 2px 14px; border-left: 3px solid var(--gold);
font-style: italic; white-space: pre-line; color: var(--ink);
}
.waitlist { display: flex; flex-direction: column; gap: 10px; }
.invite-results { margin: 0; padding: 0; list-style: none; display: flex; flex-direction: column; gap: 4px; }
.invite-results li { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; }
.invite-msg { max-width: 280px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
.invite-accepted { border-color: color-mix(in srgb, var(--ok) 50%, transparent); color: var(--ok); }
.invite-pending { border-color: rgba(217, 180, 106, 0.5); color: var(--gold); }
.invite-expired, .invite-revoked { color: var(--muted); }
.mail-frame { width: 100%; height: 640px; border: 1px solid var(--line); border-radius: 8px; background: #f4f1ea; }
.mail-text {
margin: 0; padding: 16px; border: 1px solid var(--line); border-radius: 8px; max-height: 640px; overflow: auto;
white-space: pre-wrap; font-size: 13px; line-height: 1.5;
}
@@ -0,0 +1,59 @@
"use client";
import { useRouter } from "next/navigation";
import { useState } from "react";
import { api, errorText } from "@/lib/api";
/** Changes only a person's name (any time; the chart and analyses stay). */
export function RenamePerson({ id, name }: { id: string; name: string }) {
const router = useRouter();
const [value, setValue] = useState(name);
const [busy, setBusy] = useState(false);
const [error, setError] = useState<string | null>(null);
async function save(e: React.FormEvent) {
e.preventDefault();
if (!value.trim()) return setError("Add meg a nevét.");
setBusy(true);
setError(null);
try {
await api(`/charts/${id}`, { method: "PATCH", body: { label: value.trim() } });
router.push(`/kepletek/${id}`);
router.refresh();
} catch (err) {
setError(errorText(err));
setBusy(false);
}
}
return (
<form onSubmit={save} className="field" style={{ gap: 16 }} noValidate>
<div className="field" style={{ maxWidth: 420 }}>
<label htmlFor="rename">Név</label>
<input
id="rename"
className="inp"
value={value}
maxLength={100}
autoComplete="off"
onChange={(e) => setValue(e.target.value)}
required
/>
</div>
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
<div className="form-actions">
<button type="submit" className="btn btn-primary" disabled={busy || value.trim() === name}>
{busy ? "Mentés…" : "Név mentése"}
</button>
<button type="button" className="btn btn-ghost" onClick={() => router.push(`/kepletek/${id}`)} disabled={busy}>
Mégse
</button>
</div>
</form>
);
}
@@ -1,17 +1,17 @@
import type { Metadata } from "next";
import Link from "next/link";
import { notFound } from "next/navigation";
import { backendGet, requireMe } from "@/lib/server";
import type { Chart } from "@/lib/types";
import { EditPerson } from "./EditPerson";
import { RenamePerson } from "./RenamePerson";
export const metadata: Metadata = { title: "Adatok javítása" };
const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
/** Correcting a person's birth data (within an hour of adding them; admins any time). */
/** Correcting a person: name any time, birth data within an hour of adding them (admins any time). */
export default async function EditPersonPage({ params }: { params: Promise<{ id: string }> }) {
const { id } = await params;
const me = await requireMe(`/kepletek/${id}/javitas`);
@@ -26,7 +26,9 @@ export default async function EditPersonPage({ params }: { params: Promise<{ id:
<div className="page-head">
<h1>{chart.label} adatai</h1>
<p className="muted">
A javítás után újraszámoljuk a képletet és a rövid összefoglalót.
{editable
? "Ha a születési adatokon változtatsz, újraszámoljuk a képletet és a rövid összefoglalót. A név módosítása a képletet és az elemzéseket nem érinti."
: "A név bármikor módosítható; a képlet és az elemzések maradnak."}
</p>
</div>
<section className="card" aria-label="Születési adatok">
@@ -42,10 +44,8 @@ export default async function EditPersonPage({ params }: { params: Promise<{ id:
/>
) : (
<>
<p className="muted">A személy születési adatai csak a felvételt követő egy órán belül javíthatók.</p>
<Link href={`/kepletek/${id}`} className="btn" style={{ alignSelf: "flex-start" }}>
Vissza a képlethez
</Link>
<RenamePerson id={id} name={chart.label} />
<p className="hint">A születési adatok csak a felvételt követő egy órán belül javíthatók.</p>
</>
)}
</section>
@@ -7,6 +7,7 @@ import { ChartSummary } from "@/components/ChartSummary";
import { ChartSwitcher } from "@/components/ChartSwitcher";
import { DetailedAnalysis } from "@/components/DetailedAnalysis";
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 { backendGet, requireMe } from "@/lib/server";
@@ -31,6 +32,7 @@ export default async function ChartPage({ params }: { params: Promise<{ id: stri
]);
const charts = chartList?.charts ?? [];
const persons = charts.filter((c) => c.kind === "person");
const own = charts.find((c) => c.is_primary) ?? null;
if (!chart) notFound();
const list = analyses?.analyses ?? [];
const summary = list.find((a) => a.kind === "summary" && a.status !== "failed") ?? null;
@@ -51,7 +53,7 @@ export default async function ChartPage({ params }: { params: Promise<{ id: stri
<ChartSwitcher
title={chart.is_primary ? "Születési képletem" : chart.label}
currentId={chart.id}
own={charts.find((c) => c.is_primary) ?? null}
own={own}
persons={persons}
canAdd={me.persons.left !== 0}
/>
@@ -116,6 +118,16 @@ export default async function ChartPage({ params }: { params: Promise<{ id: stri
)}
</div>
)}
{!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>
@@ -144,10 +156,11 @@ export default async function ChartPage({ params }: { params: Promise<{ id: stri
label: "Elemzés",
content: (
<DetailedAnalysis
chartId={chart.id}
target={{ kind: "natal", chartId: chart.id }}
initial={detailed}
left={me.analyses_left.natal}
isAdmin={me.user.roles.includes("admin")}
unlimited={me.unlimited_until !== null}
canPay={config?.mock_payments ?? false}
/>
),
@@ -0,0 +1,57 @@
"use client";
import { useState } from "react";
import { api, errorText } from "@/lib/api";
// A button, not an automatic request: link scanners of mail providers open
// every link, and they must not unsubscribe anyone.
export function Unsubscribe({ token }: { token: string | null }) {
const [state, setState] = useState<"idle" | "busy" | "done">("idle");
const [error, setError] = useState<string | null>(null);
if (!token) {
return (
<p className="msg msg-error" role="alert">
Hiányzik a link vége. Nyisd meg a teljes linket a levélből.
</p>
);
}
if (state === "done") {
return (
<p className="msg msg-ok" role="status">
Leiratkoztál: erre a címre nem küldünk több meghívót.
</p>
);
}
async function confirm() {
setState("busy");
setError(null);
try {
await api(`/public/invitations/unsubscribe?token=${encodeURIComponent(token!)}`, { method: "POST" });
setState("done");
} catch (e) {
setError(errorText(e));
setState("idle");
}
}
return (
<div className="card field" style={{ gap: 12 }}>
<p style={{ margin: 0 }}>
Ha leiratkozol, erre az e-mail-címre többé nem küldünk meghívót, és a mostani meghívód is érvényét veszti.
</p>
<div>
<button type="button" className="btn btn-primary" onClick={confirm} disabled={state === "busy"}>
{state === "busy" ? "Leiratkozás…" : "Leiratkozom"}
</button>
</div>
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
</div>
);
}
@@ -0,0 +1,20 @@
import type { Metadata } from "next";
import { Unsubscribe } from "./Unsubscribe";
export const metadata: Metadata = { title: "Leiratkozás", robots: { index: false } };
/** "No more invitations", from the link in the footer of an invitation e-mail. */
export default async function UnsubscribePage({ searchParams }: { searchParams: Promise<Record<string, string | string[]>> }) {
const raw = (await searchParams).token;
const token = Array.isArray(raw) ? raw[0] : raw;
return (
<main className="page" style={{ maxWidth: 560 }}>
<div className="page-head">
<h1>Leiratkozás</h1>
<p className="muted">Nem kérsz több meghívót a Sorsfonalakra.</p>
</div>
<Unsubscribe token={token ?? null} />
</main>
);
}
@@ -0,0 +1,7 @@
import { redirect } from "next/navigation";
/** The link in the invitation e-mail: the login page shows the invitation. */
export default async function InvitationLink({ params }: { params: Promise<{ token: string }> }) {
const { token } = await params;
redirect(`/belepes?meghivo=${encodeURIComponent(token)}`);
}
@@ -0,0 +1,51 @@
"use client";
import { useRouter } from "next/navigation";
import { useState } from "react";
import { api, errorText } from "@/lib/api";
/** Deletes a comparison (and its analysis). */
export function ComparisonActions({ id, name }: { id: string; name: string }) {
const router = useRouter();
const [confirm, setConfirm] = useState(false);
const [busy, setBusy] = useState(false);
const [error, setError] = useState<string | null>(null);
async function remove() {
setBusy(true);
setError(null);
try {
await api(`/synastries/${id}`, { method: "DELETE" });
router.refresh();
} catch (e) {
setError(errorText(e));
setBusy(false);
}
}
return (
<div className="person-actions">
{confirm ? (
<>
<span className="hint">Törlöd a(z) {name} összevetést és az elemzését?</span>
<button type="button" className="btn btn-sm btn-danger" onClick={remove} disabled={busy}>
{busy ? "Törlés…" : "Igen, törlöm"}
</button>
<button type="button" className="btn btn-sm btn-ghost" onClick={() => setConfirm(false)} disabled={busy}>
Mégse
</button>
</>
) : (
<button type="button" className="btn btn-sm btn-ghost" onClick={() => setConfirm(true)}>
Törlés
</button>
)}
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
</div>
);
}
@@ -0,0 +1,78 @@
"use client";
import Link from "next/link";
import { useState } from "react";
import { CompareButton } from "@/components/CompareButton";
import { sideName } from "@/lib/synastry";
import type { ChartListItem } from "@/lib/types";
/** Picks two of the user's charts to compare. */
export function NewComparison({ charts }: { charts: ChartListItem[] }) {
const own = charts.find((c) => c.is_primary);
const [first, setFirst] = useState(own?.id ?? charts[0]?.id ?? "");
const [second, setSecond] = useState(charts.find((c) => c.id !== (own?.id ?? charts[0]?.id))?.id ?? "");
if (charts.length < 2) {
return (
<section className="card compare-new" aria-labelledby="compare-title">
<h2 id="compare-title">Új összevetés</h2>
<p className="muted">
Összevetéshez legalább két képlet kell. Vedd fel társad, családtagod vagy barátod születési adatait, és nézd meg,
hogyan hatnak egymásra a képleteitek.
</p>
<div className="form-actions">
<Link href="/szemelyek/uj" className="btn btn-primary">
Új személy felvétele
</Link>
</div>
</section>
);
}
const option = (c: ChartListItem) => (
<option key={c.id} value={c.id}>
{sideName(c)}
{c.birth.time ? "" : " (idő nélkül)"}
</option>
);
const swap = () => {
setFirst(second);
setSecond(first);
};
return (
<section className="card compare-new" aria-labelledby="compare-title">
<h2 id="compare-title">Új összevetés</h2>
<div className="compare-form">
<div className="field">
<label htmlFor="compare-first">Első fél</label>
<select id="compare-first" className="inp" value={first} onChange={(e) => setFirst(e.target.value)}>
{charts.map(option)}
</select>
</div>
<button type="button" className="btn btn-ghost compare-swap" onClick={swap} aria-label="A két fél felcserélése">
⇄
</button>
<div className="field">
<label htmlFor="compare-second">Második fél</label>
<select id="compare-second" className="inp" value={second} onChange={(e) => setSecond(e.target.value)}>
{charts.map(option)}
</select>
</div>
{first && second && first !== second ? (
<CompareButton chart1={first} chart2={second} label="Összevetés" className="btn btn-primary" />
) : (
<button type="button" className="btn btn-primary" disabled>
Összevetés
</button>
)}
</div>
<p className="hint">
{first === second
? "Két különböző képletet válassz."
: "A körön az első fél képlete és házai vannak belül, a második fél bolygói kívül."}
</p>
</section>
);
}
@@ -0,0 +1,167 @@
import type { Metadata } from "next";
import Link from "next/link";
import { notFound } from "next/navigation";
import { SignTrio } from "@/components/ChartCard";
import { DetailedAnalysis } from "@/components/DetailedAnalysis";
import { CompositeTables, CrossGrid, HouseOverlays, InterAspectList, NatureBar } from "@/components/SynastryTables";
import { SynastryLegend, SynastryWheel } from "@/components/SynastryWheel";
import { Tabs } from "@/components/Tabs";
import { ASPECTS, formatBirthDate } from "@/lib/astro";
import { backendGet, requireMe } from "@/lib/server";
import { sideName, sideTimeKnown } from "@/lib/synastry";
import type { Analysis, ChartListItem, PublicConfig, Synastry, SynastrySide } from "@/lib/types";
export const metadata: Metadata = { title: "Összevetés" };
const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
const GRID_LEGEND = ["conjunction", "sextile", "square", "trine", "opposition"];
function Person({ side, which }: { side: SynastrySide; which: "p1" | "p2" }) {
const time = sideTimeKnown(side);
const birth = side.birth_data;
const name = sideName(side);
const body = (
<>
<span className={`pair-dot legend-${which}`} aria-hidden="true" />
<span className="pair-text">
<strong>{name}</strong>
{birth && (
<span className="hint">
{formatBirthDate(birth.date)}
{time && birth.time ? `, ${birth.time.slice(0, 5)}` : ", ismeretlen időpont"}
</span>
)}
</span>
{side.highlights && (
<SignTrio chart={{ highlights: { ...side.highlights, time_known: time } } as ChartListItem} />
)}
</>
);
return side.owned ? (
<Link href={`/kepletek/${side.id}`} className="pair-row">
{body}
</Link>
) : (
<div className="pair-row">{body}</div>
);
}
/** One comparison of two charts: the double wheel, the numbers, the analysis and the tables. */
export default async function ComparisonPage({ params }: { params: Promise<{ id: string }> }) {
const { id } = await params;
const me = await requireMe(`/osszevetesek/${id}`);
if (!UUID.test(id)) notFound();
const [synastry, analyses, config] = await Promise.all([
backendGet<Synastry>(`/v1/synastries/${id}`),
backendGet<{ analyses: Analysis[] }>(`/v1/synastries/${id}/analyses`),
backendGet<PublicConfig>("/v1/config"),
]);
if (!synastry) notFound();
const list = analyses?.analyses ?? [];
const detailed = list.find((a) => a.status !== "failed") ?? list[0] ?? null;
const { chart1, chart2 } = synastry;
const name1 = sideName(chart1);
const name2 = sideName(chart2);
const time1 = sideTimeKnown(chart1);
const time2 = sideTimeKnown(chart2);
const result = synastry.synastry;
const unknown = [!time1 && name1, !time2 && name2].filter(Boolean);
return (
<main className="page" style={{ maxWidth: 1180 }}>
<div className="page-head">
<Link href="/osszevetesek" className="back-link">
← Összevetések
</Link>
<h1>
{name1} és {name2}
</h1>
<p className="muted">Összevetés · két képlet egymásra vetítve</p>
</div>
<section className="chart-layout" aria-label="Kettős képletrajz">
<div className="card chart-wheel-card">
<SynastryWheel
chart1={chart1.chart}
chart2={chart2.chart}
time1={time1}
time2={time2}
aspects={result.aspects}
name1={name1}
name2={name2}
/>
<SynastryLegend name1={name1} name2={name2} time1={time1} />
</div>
<div className="field chart-side">
<div className="card pair-card">
<span className="eyebrow">A két fél</span>
<Person side={chart1} which="p1" />
<Person side={chart2} which="p2" />
</div>
<div className="card summary-card">
<span className="eyebrow">Számokban</span>
<h2 className="summary-title">{result.summary.aspect_count} fényszög köztetek</h2>
<NatureBar summary={result.summary} />
{unknown.length > 0 && (
<p className="hint">
{unknown.join(" és ")} születési ideje ismeretlen: az ő tengelyei és házai kimaradnak, a Hold helyzete
közelítő.
</p>
)}
</div>
</div>
</section>
<section className="card chart-tabs" aria-label="Elemzés és táblázatok">
<Tabs
label="Összevetés részletei"
tabs={[
{
id: "elemzes",
label: "Elemzés",
content: (
<DetailedAnalysis
target={{ kind: "synastry", synastryId: synastry.id }}
initial={detailed}
left={me.analyses_left.synastry}
isAdmin={me.user.roles.includes("admin")}
unlimited={me.unlimited_until !== null}
canPay={config?.mock_payments ?? false}
note={`Az elemzésben az első fél: ${name1}, a második fél: ${name2}.`}
/>
),
},
{
id: "fenyszogek",
label: "Fényszögek",
content: (
<div className="field" style={{ gap: 16 }}>
<CrossGrid synastry={synastry} name1={name1} name2={name2} />
<ul className="grid-legend" aria-label="Jelmagyarázat">
{GRID_LEGEND.map((k) => (
<li key={k}>
<span className={`sym asp asp-${k}`} aria-hidden="true">
{ASPECTS[k]?.glyph}
</span>{" "}
{ASPECTS[k]?.hu}
</li>
))}
</ul>
</div>
),
},
{ id: "hazak", label: "Házak", content: <HouseOverlays synastry={synastry} name1={name1} name2={name2} /> },
{ id: "kompozit", label: "Kompozit", content: <CompositeTables synastry={synastry} /> },
{
id: "reszletek",
label: "Részletek",
content: <InterAspectList synastry={synastry} name1={name1} name2={name2} />,
},
]}
/>
</section>
</main>
);
}
@@ -0,0 +1,71 @@
import type { Metadata } from "next";
import Link from "next/link";
import { formatDate } from "@/lib/astro";
import { backendGet, requireMe } from "@/lib/server";
import { listName } from "@/lib/synastry";
import type { ChartListItem, SynastryListItem } from "@/lib/types";
import { ComparisonActions } from "./ComparisonActions";
import { NewComparison } from "./NewComparison";
export const metadata: Metadata = { title: "Összevetések" };
/** The user's comparisons, and a form for a new one. */
export default async function ComparisonsPage() {
await requireMe("/osszevetesek");
const [chartList, synastryList] = await Promise.all([
backendGet<{ charts: ChartListItem[] }>("/v1/charts"),
backendGet<{ synastries: SynastryListItem[] }>("/v1/synastries"),
]);
const charts = chartList?.charts ?? [];
const synastries = synastryList?.synastries ?? [];
return (
<main className="page" style={{ maxWidth: 1080 }}>
<div className="page-head">
<h1>Összevetések</h1>
<p className="muted">
Két képlet egymásra vetítve: mi vonz, hol súrlódtok, és mit ad a kapcsolat. A saját és a felvett személyek
képletei közül bármelyik kettőt összevetheted.
</p>
</div>
<NewComparison charts={charts} />
{synastries.length > 0 && (
<section className="field" aria-labelledby="list-title" style={{ gap: 12 }}>
<h2 id="list-title">Korábbi összevetések</h2>
<div className="chart-cards">
{synastries.map((s) => {
const name = `${listName(s.chart1, charts)} és ${listName(s.chart2, charts)}`;
const n = s.summary?.by_nature;
const total = s.summary?.aspect_count || 1;
return (
<div key={s.id} className="chart-card">
<Link href={`/osszevetesek/${s.id}`} className="chart-card-link">
<strong className="chart-card-name">{name}</strong>
<span className="muted">{formatDate(s.created_at)}</span>
{n && (
<>
<span className="nature-bar nature-bar-sm" aria-hidden="true">
<span className="nature-seg nature-harmonious" style={{ flexGrow: n.harmonious / total }} />
<span className="nature-seg nature-challenging" style={{ flexGrow: n.challenging / total }} />
<span className="nature-seg nature-neutral" style={{ flexGrow: n.neutral / total }} />
</span>
<span className="hint">
{n.harmonious} harmonikus · {n.challenging} feszültebb · {n.neutral} együttállás
</span>
</>
)}
</Link>
{s.owned && <ComparisonActions id={s.id} name={name} />}
</div>
);
})}
</div>
</section>
)}
</main>
);
}
+10 -1
View File
@@ -69,10 +69,19 @@ export function BirthForm({
geonames_id: place.geonames_id,
...(ambiguous ? { ambiguous_time: ambiguity } : {}),
};
// Correcting a person: the birth data only when it changed, so a new
// name alone does not recalculate the chart or drop its analyses.
const birthChanged =
!initial ||
ambiguous ||
date !== initial.date ||
(timeUnknown ? null : time) !== (initial.time?.slice(0, 5) ?? null) ||
country !== (initial.country ?? "HU") ||
place.geonames_id !== initial.geonames_id;
const saved = person?.chartId
? await api<{ id: string }>(`/charts/${person.chartId}`, {
method: "PATCH",
body: { label: name.trim(), birth },
body: birthChanged ? { label: name.trim(), birth } : { label: name.trim() },
})
: await api<{ id: string }>("/charts", {
body: person
+4 -1
View File
@@ -46,7 +46,10 @@ export default async function ProfilePage() {
<dd>{me.providers.map((p) => PROVIDERS[p] ?? p).join(", ") || "–"}</dd>
<dt>Részletes elemzések</dt>
<dd>
{me.analyses_left.natal} képlet, {me.analyses_left.synastry} szinasztria
{me.unlimited_until
? `Korlátlan, ${formatDate(me.unlimited_until).replace(/\.$/, "")}-ig`
: `${me.analyses_left.natal} képlet, ${me.analyses_left.synastry} kapcsolati`}{" "}
· <Link href="/csomagok">Csomagok</Link>
</dd>
<dt>Személyek</dt>
<dd>
+5 -3
View File
@@ -18,6 +18,7 @@ export default async function PersonsPage() {
]);
const charts = list?.charts ?? [];
const persons = charts.filter((c) => c.kind === "person");
const ownId = charts.find((c) => c.is_primary)?.id ?? null;
const isAdmin = me.user.roles.includes("admin");
const slots = me.persons;
const full = slots.left === 0;
@@ -28,8 +29,8 @@ export default async function PersonsPage() {
<div className="page-head">
<h1>Személyek</h1>
<p className="muted">
Társad, családtagjaid, barátaid képlete. Mindegyikhez kérhetsz részletes elemzést, és a képletoldal címére
kattintva válthatsz köztük.
Társad, családtagjaid, barátaid képlete. Mindegyikhez kérhetsz részletes elemzést, összevetheted a sajátoddal,
és a képletoldal címére kattintva válthatsz köztük.
</p>
</div>
@@ -39,6 +40,7 @@ export default async function PersonsPage() {
<PersonActions
id={p.id}
name={p.label}
ownId={ownId}
editable={isAdmin || (p.editable_until !== null && Date.parse(p.editable_until) > now)}
/>
</ChartCard>
@@ -70,7 +72,7 @@ export default async function PersonsPage() {
? "Elfogytak a helyeid. Újabb személyhez válassz csomagot."
: "A felvett személyek képletét és elemzéseit itt éred el. Egy törölt személy helye nem szabadul fel."}
</p>
<PersonPacks packSize={config?.person_pack_size ?? 5} canPay={config?.mock_payments ?? false} />
<PersonPacks canPay={config?.mock_payments ?? false} />
</section>
)}
</main>
@@ -26,7 +26,7 @@ export default async function NewPersonPage() {
{slots.left === 0 ? (
<>
<p className="muted">Elfogytak a helyeid. Újabb személyhez válassz csomagot.</p>
<PersonPacks packSize={config?.person_pack_size ?? 5} canPay={config?.mock_payments ?? false} />
<PersonPacks canPay={config?.mock_payments ?? false} />
</>
) : (
<>
@@ -0,0 +1,20 @@
import Link from "next/link";
const PAGES = [
{ href: "/admin", label: "Felhasználók" },
{ href: "/admin/meghivok", label: "Meghívók" },
{ href: "/admin/promptok", label: "Promptok" },
];
/** Switches between the admin pages. */
export function AdminNav({ current }: { current: string }) {
return (
<nav className="admin-nav" aria-label="Admin oldalak">
{PAGES.map((p) => (
<Link key={p.href} href={p.href} aria-current={p.href === current ? "page" : undefined}>
{p.label}
</Link>
))}
</nav>
);
}
@@ -1,7 +1,7 @@
import { ANGLES, ASPECTS, POINTS, SIGNS, dms, orbText, pointName, signName } from "@/lib/astro";
import type { Aspect, Chart, Position } from "@/lib/types";
function Pos({ p }: { p: Position }) {
export function Pos({ p }: { p: Position }) {
return (
<>
{dms(p.degree_in_sign_dms)} <span className="sym">{SIGNS[p.sign]?.glyph}</span> {signName(p.sign)}
@@ -47,7 +47,7 @@ export function BigThree({ chart }: { chart: Chart }) {
}
// Rows and columns of the aspect grid: the points drawn on the wheel, then the angles.
const GRID_POINTS = [
export const GRID_POINTS = [
"sun",
"moon",
"mercury",
+10 -10
View File
@@ -2,7 +2,7 @@ import { ASPECTS, POINTS, SIGNS, dms, orbText, pointName, signName } from "@/lib
import type { ChartResult, Position } from "@/lib/types";
// Radii of the rings (viewBox is SIZE × SIZE, centre C).
const SIZE = 680;
export const SIZE = 680;
const C = SIZE / 2;
const R_LABEL = 322; // ASC / MC labels
const R_OUT = 300; // outer edge of the zodiac ring
@@ -13,7 +13,7 @@ const R_HOUSE = 172; // outer edge of the house-number ring
const R_INNER = 146; // aspect circle
// Points drawn on the wheel; the asteroids and the south node are only in the tables.
const WHEEL_POINTS = [
export const WHEEL_POINTS = [
"sun",
"moon",
"mercury",
@@ -30,10 +30,10 @@ const WHEEL_POINTS = [
];
// Aspects drawn on the wheel, between these points; the rest (minor aspects,
// nodes, Lilith, Chiron) are only in the aspect table.
const WHEEL_ASPECTS = ["opposition", "square", "trine", "sextile"];
const ASPECT_POINTS = ["sun", "moon", "mercury", "venus", "mars", "jupiter", "saturn", "uranus", "neptune", "pluto"];
const SIGN_ORDER = Object.keys(SIGNS);
const SIGN_ELEMENT = ["fire", "earth", "air", "water"];
export const WHEEL_ASPECTS = ["opposition", "square", "trine", "sextile"];
export const ASPECT_POINTS = ["sun", "moon", "mercury", "venus", "mars", "jupiter", "saturn", "uranus", "neptune", "pluto"];
export const SIGN_ORDER = Object.keys(SIGNS);
export const SIGN_ELEMENT = ["fire", "earth", "air", "water"];
const ANGLE_LABELS: [string, string][] = [
["ascendant", "ASC"],
["midheaven", "MC"],
@@ -42,15 +42,15 @@ const ANGLE_LABELS: [string, string][] = [
];
/** Screen point of an ecliptic longitude: the ascendant (or 0° Aries) is on the left. */
function xy(lon: number, r: number, start: number): [number, number] {
export function xy(lon: number, r: number, start: number): [number, number] {
const a = ((180 + lon - start) * Math.PI) / 180;
return [C + r * Math.cos(a), C - r * Math.sin(a)];
}
const f = (n: number) => n.toFixed(2);
export const f = (n: number) => n.toFixed(2);
/** Pushes glyphs apart so that neighbours are at least `min` degrees from each other. */
function spread(lons: number[], min: number): number[] {
export function spread(lons: number[], min: number): number[] {
const n = lons.length;
const order = lons.map((_, i) => i).sort((a, b) => lons[a] - lons[b]);
const pos = order.map((i) => lons[i]);
@@ -73,7 +73,7 @@ function spread(lons: number[], min: number): number[] {
return out;
}
function arcPath(r1: number, r2: number, from: number, to: number, start: number): string {
export function arcPath(r1: number, r2: number, from: number, to: number, start: number): string {
const [x1, y1] = xy(from, r2, start);
const [x2, y2] = xy(to, r2, start);
const [x3, y3] = xy(to, r1, start);
@@ -0,0 +1,48 @@
"use client";
import { useRouter } from "next/navigation";
import { useState } from "react";
import { api, errorText } from "@/lib/api";
/** Compares two charts (or opens their existing comparison). */
export function CompareButton({
chart1,
chart2,
label = "Összevetés velem",
className = "btn btn-sm btn-ghost",
}: {
chart1: string;
chart2: string;
label?: string;
className?: string;
}) {
const router = useRouter();
const [busy, setBusy] = useState(false);
const [error, setError] = useState<string | null>(null);
async function compare() {
setBusy(true);
setError(null);
try {
const s = await api<{ id: string }>("/synastries", { body: { chart1_id: chart1, chart2_id: chart2 } });
router.push(`/osszevetesek/${s.id}`);
} catch (e) {
setError(errorText(e));
setBusy(false);
}
}
return (
<>
<button type="button" className={className} onClick={compare} disabled={busy}>
{busy ? "Számolás…" : label}
</button>
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
</>
);
}
@@ -7,6 +7,7 @@ import { api, errorText } from "@/lib/api";
import type { Analysis } from "@/lib/types";
import { AnalysisLoading } from "./AnalysisLoading";
import { PackageChooser } from "./PackageCards";
import { AnalysisView } from "./AnalysisView";
const POLL_MS = 5000;
@@ -14,30 +15,70 @@ const MAX_POLLS = 120; // 10 minutes
type Step = "offer" | "confirm" | "pay";
/** What is analysed: a natal chart, or a comparison of two charts. */
export type AnalysisTarget = { kind: "natal"; chartId: string } | { kind: "synastry"; synastryId: string };
const TEXTS = {
natal: {
eyebrow: "Részletes elemzés",
title: "Az egész képleted, fejezetekre bontva",
about:
"Kb. 1500 szó hat fejezetben: személyiség, érzelmek, gondolkodás, szerelem és kapcsolatok, hivatás, fejlődési út. " +
"A végén erősségek, kihívások és útravaló. Csak a képleted pozíciói alapján készül.",
loadingTitle: "Készül az elemzésed",
loading:
"Most íródik a hat fejezet a képleted alapján. Ez általában 1–3 perc; nyugodtan elhagyhatod az oldalt, az elemzés elkészül és itt vár.",
item: "Részletes képletelemzés",
unitName: "képletelemzés",
packages: ["single", "couple", "family"],
},
synastry: {
eyebrow: "Kapcsolati elemzés",
title: "Kettőtök képlete, fejezetekre bontva",
about:
"Kb. 1300 szó öt fejezetben: mi vonz egymáshoz, kommunikáció, érzelmi kötődés, súrlódások, hosszú távú lehetőségek " +
"(a kompozit képlettel). A végén erősségek, kihívások és útravaló. Csak a két képlet pozíciói alapján készül.",
loadingTitle: "Készül a kapcsolati elemzés",
loading:
"Most íródik az öt fejezet a két képlet alapján. Ez általában 1–3 perc; nyugodtan elhagyhatod az oldalt, az elemzés elkészül és itt vár.",
item: "Részletes kapcsolati elemzés",
unitName: "kapcsolati elemzés",
packages: ["addon_synastry", "couple", "family"],
},
};
/**
* The detailed analysis of a chart. A saved one is shown at once; otherwise
* The detailed analysis of a chart or a comparison. A saved one is shown at once; otherwise
* the offer: admins start it free, users with units confirm, others pay
* (a stand-in payment for now). While the worker writes it, a loading wheel.
*/
export function DetailedAnalysis({
chartId,
target,
initial,
left,
isAdmin,
unlimited = false,
canPay,
note,
}: {
chartId: string;
target: AnalysisTarget;
initial: Analysis | null;
left: number;
isAdmin: boolean;
/** A running unlimited package: no unit is needed. */
unlimited?: boolean;
/** The stand-in payment is on (MOCK_PAYMENTS). */
canPay: boolean;
/** Shown above a finished analysis (e.g. who is the first and the second person). */
note?: string;
}) {
const [analysis, setAnalysis] = useState<Analysis | null>(initial);
const [step, setStep] = useState<Step>("offer");
const [busy, setBusy] = useState(false);
const [error, setError] = useState<string | null>(null);
const waiting = analysis?.status === "pending" || analysis?.status === "running";
const t = TEXTS[target.kind];
const path = target.kind === "natal" ? `/charts/${target.chartId}` : `/synastries/${target.synastryId}`;
useEffect(() => {
if (!waiting || !analysis) return;
@@ -62,12 +103,11 @@ export function DetailedAnalysis({
};
}, [waiting, analysis]);
async function start(pay: boolean) {
async function start() {
setBusy(true);
setError(null);
try {
if (pay) await api("/payments/mock", { body: { unit: "natal" } });
setAnalysis(await api<Analysis>(`/charts/${chartId}/analyses`, { method: "POST" }));
setAnalysis(await api<Analysis>(`${path}/analyses`, { method: "POST" }));
setStep("offer");
} catch (e) {
setError(errorText(e));
@@ -78,21 +118,19 @@ export function DetailedAnalysis({
if (analysis?.status === "done" && analysis.content) {
return (
<section className="analysis-card" aria-label="Részletes elemzés">
<span className="eyebrow">Részletes elemzés</span>
<AnalysisView content={analysis.content} />
<section className="analysis-card" aria-label={t.eyebrow}>
<span className="eyebrow">{t.eyebrow}</span>
{note && <p className="hint">{note}</p>}
<AnalysisView content={analysis.content} kind={target.kind} />
</section>
);
}
if (waiting) {
return (
<section className="analysis-card" aria-label="Részletes elemzés" aria-busy="true">
<span className="eyebrow">Részletes elemzés</span>
<AnalysisLoading
title="Készül az elemzésed"
text="Most íródik a hat fejezet a képleted alapján. Ez általában 1–3 perc; nyugodtan elhagyhatod az oldalt, az elemzés elkészül és itt vár."
/>
<section className="analysis-card" aria-label={t.eyebrow} aria-busy="true">
<span className="eyebrow">{t.eyebrow}</span>
<AnalysisLoading title={t.loadingTitle} text={t.loading} />
</section>
);
}
@@ -100,13 +138,10 @@ export function DetailedAnalysis({
return (
<section className="analysis-card analysis-offer" aria-labelledby="detailed-title">
<div className="offer-head">
<span className="eyebrow">Részletes elemzés</span>
<h2 id="detailed-title">Az egész képleted, fejezetekre bontva</h2>
<span className="eyebrow">{t.eyebrow}</span>
<h2 id="detailed-title">{t.title}</h2>
</div>
<p className="muted">
Kb. 1500 szó hat fejezetben: személyiség, érzelmek, gondolkodás, szerelem és kapcsolatok, hivatás, fejlődési út.
A végén erősségek, kihívások és útravaló. Csak a képleted pozíciói alapján készül.
</p>
<p className="muted">{t.about}</p>
{analysis?.status === "failed" && (
<p className="msg msg-error" role="alert">
Az előző kérés nem sikerült{isAdmin ? "" : ", az elemzést visszaadtuk a keretedbe"}. Próbáld újra.
@@ -118,64 +153,68 @@ export function DetailedAnalysis({
</p>
)}
{isAdmin ? (
{isAdmin || unlimited ? (
<div className="form-actions">
<button type="button" className="btn btn-primary" onClick={() => start(false)} disabled={busy}>
{busy ? "Indítás…" : "Részletes elemzés készítése"}
<button type="button" className="btn btn-primary" onClick={start} disabled={busy}>
{busy ? "Indítás…" : `${t.item} készítése`}
</button>
<span className="hint">Adminként ingyenes.</span>
<span className="hint">{isAdmin ? "Adminként ingyenes." : "A korlátlan csomagod része."}</span>
</div>
) : left > 0 ? (
step === "confirm" ? (
<div className="form-actions">
<button type="button" className="btn btn-primary" onClick={() => start(false)} disabled={busy}>
<button type="button" className="btn btn-primary" onClick={start} disabled={busy}>
{busy ? "Indítás…" : "Igen, kérem az elemzést"}
</button>
<button type="button" className="btn btn-ghost" onClick={() => setStep("offer")} disabled={busy}>
Mégse
</button>
<span className="hint">Ez felhasznál 1-et a {left} képletelemzésedből.</span>
<span className="hint">
Ez felhasznál 1-et a {left} {t.unitName}edből.
</span>
</div>
) : (
<div className="form-actions">
<button type="button" className="btn btn-primary" onClick={() => setStep("confirm")}>
Részletes elemzés kérése
</button>
<span className="hint">Még {left} képletelemzésed van.</span>
<span className="hint">
Még {left} {t.unitName}ed van.
</span>
</div>
)
) : canPay ? (
step === "pay" ? (
<div className="pay-box">
<div className="pay-line">
<span>Részletes képletelemzés</span>
<strong>1 db</strong>
</div>
<p className="pay-lead">
Válassz csomagot. A vásárlás után az elemzés azonnal elindul, a maradék elemzések pedig nem járnak le.
</p>
<PackageChooser ids={t.packages} canPay={canPay} onBought={start} />
<div className="form-actions">
<button type="button" className="btn btn-primary" onClick={() => start(true)} disabled={busy}>
{busy ? "Fizetés…" : "Fizetés"}
</button>
<button type="button" className="btn btn-ghost" onClick={() => setStep("offer")} disabled={busy}>
Mégse
</button>
</div>
<p className="hint">Tesztüzem: a fizetés még nincs bekötve, a gomb nem terhel semmit.</p>
</div>
) : (
<div className="form-actions">
<button type="button" className="btn btn-primary" onClick={() => setStep("pay")}>
Részletes elemzés kérése
</button>
<Link href="/pelda" className="btn btn-ghost">
Példa megtekintése
</Link>
{target.kind === "natal" && (
<Link href="/pelda" className="btn btn-ghost">
Példa megtekintése
</Link>
)}
</div>
)
) : (
<div className="form-actions">
<Link href="/pelda" className="btn">
Példa megtekintése
</Link>
{target.kind === "natal" && (
<Link href="/pelda" className="btn">
Példa megtekintése
</Link>
)}
<span className="hint">A részletes elemzés fizetős; a csomagok hamarosan elérhetők.</span>
</div>
)}
@@ -0,0 +1,180 @@
"use client";
import Link from "next/link";
import { useRouter } from "next/navigation";
import { useEffect, useState } from "react";
import { api, errorText } from "@/lib/api";
import type { Package } from "@/lib/types";
export const huf = (n: number) => `${n.toLocaleString("hu-HU")} Ft`;
/** What a package contains, as short lines. */
export function contents(p: Package): string[] {
if (p.unlimited_months) {
return [
"Korlátlan képletelemzés",
"Korlátlan kapcsolati elemzés",
"Korlátlan számú személy",
`${p.unlimited_months} hónapig`,
];
}
const lines: string[] = [];
if (p.natal) lines.push(`${p.natal} részletes képletelemzés`);
if (p.synastry) lines.push(`${p.synastry} kapcsolati elemzés`);
if (p.persons) lines.push(`${p.persons} személy felvétele`);
return lines;
}
/**
* Package cards with a buy button. Bigger packages show what they save and
* how little more they cost than the previous one. Until Stripe is connected
* the payment is a stand-in (MOCK_PAYMENTS) that grants the package at once.
*/
export function PackageCards({
packages,
ids,
canPay,
compact = false,
onBought,
}: {
packages: Package[];
/** Which packages, in this order (default: the main ladder). */
ids?: string[];
canPay: boolean;
compact?: boolean;
/** After a purchase (default: reload the page data). */
onBought?: (p: Package) => Promise<void> | void;
}) {
const router = useRouter();
const [busy, setBusy] = useState<string | null>(null);
const [error, setError] = useState<string | null>(null);
const [done, setDone] = useState<string | null>(null);
const shown = ids
? ids.map((id) => packages.find((p) => p.id === id)).filter((p): p is Package => p !== undefined)
: packages.filter((p) => p.tier === "main");
async function buy(p: Package) {
setBusy(p.id);
setError(null);
setDone(null);
try {
await api("/payments/mock", { body: { package: p.id } });
if (onBought) await onBought(p);
else {
setDone(p.name);
router.refresh();
}
} catch (e) {
setError(errorText(e));
} finally {
setBusy(null);
}
}
return (
<div className="field" style={{ gap: 12 }}>
<div className={compact ? "pkg-grid pkg-grid-compact" : "pkg-grid"}>
{shown.map((p, i) => {
const prev = i > 0 ? shown[i - 1] : null;
const step = prev && p.tier === "main" && prev.tier === "main" ? p.price_huf - prev.price_huf : null;
return (
<article key={p.id} className={p.badge ? "pkg pkg-featured" : "pkg"} aria-labelledby={`pkg-${p.id}`}>
<div className="pkg-tags">
{p.badge && <span className="pkg-badge">{p.badge}</span>}
{p.savings_percent ? <span className="pkg-save">−{p.savings_percent}%</span> : null}
</div>
<h3 id={`pkg-${p.id}`} className="pkg-name">
{p.name}
</h3>
{!compact && <p className="muted pkg-tagline">{p.tagline}</p>}
<div className="pkg-price">
<strong>{huf(p.price_huf)}</strong>
{p.list_price_huf && p.list_price_huf > p.price_huf && (
<s className="hint" aria-label={`Külön megvéve ${huf(p.list_price_huf)}`}>
{huf(p.list_price_huf)}
</s>
)}
</div>
<ul className="pkg-list">
{contents(p).map((line) => (
<li key={line}>{line}</li>
))}
</ul>
<p className="hint pkg-per">
{p.unlimited_months
? "Aki sokakat vesz fel: családot, barátokat."
: p.per_analysis_huf
? `Elemzésenként ${huf(p.per_analysis_huf)}`
: " "}
</p>
{step !== null && step > 0 && prev && (
<p className="pkg-step">
Csak +{huf(step)} a(z) {prev.name} csomaghoz képest
</p>
)}
{canPay ? (
<button
type="button"
className={p.badge ? "btn btn-primary" : "btn"}
onClick={() => buy(p)}
disabled={busy !== null}
>
{busy === p.id ? "Fizetés…" : "Megveszem"}
</button>
) : (
<button type="button" className="btn" disabled>
Hamarosan
</button>
)}
</article>
);
})}
</div>
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
{done && (
<p className="msg msg-ok" role="status">
A(z) {done} csomag jóváírva.
</p>
)}
{canPay && <p className="hint">Tesztüzem: a fizetés még nincs bekötve, a gomb nem terhel semmit.</p>}
</div>
);
}
/** Loads the catalog in the browser (for choosers inside other components). */
export function usePackages(): Package[] | null {
const [packages, setPackages] = useState<Package[] | null>(null);
useEffect(() => {
api<{ packages: Package[] }>("/packages")
.then((d) => setPackages(d.packages))
.catch(() => setPackages([]));
}, []);
return packages;
}
/** A few packages to choose from, loaded on demand, with a link to all of them. */
export function PackageChooser({
ids,
canPay,
onBought,
}: {
ids: string[];
canPay: boolean;
onBought?: (p: Package) => Promise<void> | void;
}) {
const packages = usePackages();
if (packages === null) return <p className="muted">Csomagok betöltése…</p>;
return (
<div className="field" style={{ gap: 8 }}>
<PackageCards packages={packages} ids={ids} canPay={canPay} compact onBought={onBought} />
<Link href="/csomagok" className="hint">
Összes csomag és a részletek →
</Link>
</div>
);
}
@@ -6,8 +6,21 @@ import { useState } from "react";
import { api, errorText } from "@/lib/api";
/** Correct (while allowed) or delete a person. */
export function PersonActions({ id, name, editable }: { id: string; name: string; editable: boolean }) {
import { CompareButton } from "./CompareButton";
/** Compare with the own chart, correct (while allowed) or delete a person. */
export function PersonActions({
id,
name,
editable,
ownId,
}: {
id: string;
name: string;
editable: boolean;
/** The user's own chart, for "compare with me". */
ownId?: string | null;
}) {
const router = useRouter();
const [confirm, setConfirm] = useState(false);
const [busy, setBusy] = useState(false);
@@ -39,11 +52,10 @@ export function PersonActions({ id, name, editable }: { id: string; name: string
</>
) : (
<>
{editable && (
<Link href={`/kepletek/${id}/javitas`} className="btn btn-sm btn-ghost">
Adatok javítása
</Link>
)}
{ownId && <CompareButton chart1={ownId} chart2={id} />}
<Link href={`/kepletek/${id}/javitas`} className="btn btn-sm btn-ghost">
{editable ? "Adatok javítása" : "Átnevezés"}
</Link>
<button type="button" className="btn btn-sm btn-ghost" onClick={() => setConfirm(true)}>
Törlés
</button>
@@ -1,64 +1,8 @@
"use client";
import { useRouter } from "next/navigation";
import { useState } from "react";
import { PackageChooser } from "./PackageCards";
import { api, errorText } from "@/lib/api";
/**
* Person packages: a few more persons, or any number. Until Stripe is
* connected the payment is a stand-in (MOCK_PAYMENTS) that grants it at once.
*/
export function PersonPacks({ packSize, canPay }: { packSize: number; canPay: boolean }) {
const router = useRouter();
const [busy, setBusy] = useState<string | null>(null);
const [error, setError] = useState<string | null>(null);
async function buy(pkg: "persons" | "persons_unlimited") {
setBusy(pkg);
setError(null);
try {
await api("/payments/mock", { body: { package: pkg } });
router.refresh();
} catch (e) {
setError(errorText(e));
} finally {
setBusy(null);
}
}
if (!canPay) {
return <p className="hint">További személyekhez csomag kell; a csomagok hamarosan elérhetők.</p>;
}
return (
<div className="field" style={{ gap: 12 }}>
<div className="packs">
<div className="pack">
<strong>+{packSize} személy</strong>
<span className="muted">Még {packSize} ember képlete és elemzése.</span>
<button type="button" className="btn btn-primary btn-sm" onClick={() => buy("persons")} disabled={busy !== null}>
{busy === "persons" ? "Fizetés…" : "Fizetés"}
</button>
</div>
<div className="pack">
<strong>Korlátlan</strong>
<span className="muted">Bárkit felvehetsz, nincs felső határ.</span>
<button
type="button"
className="btn btn-primary btn-sm"
onClick={() => buy("persons_unlimited")}
disabled={busy !== null}
>
{busy === "persons_unlimited" ? "Fizetés…" : "Fizetés"}
</button>
</div>
</div>
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
<p className="hint">Tesztüzem: a fizetés még nincs bekötve, a gomb nem terhel semmit.</p>
</div>
);
/** Packages that give more persons: a few more, the family package, or unlimited. */
export function PersonPacks({ canPay }: { canPay: boolean }) {
return <PackageChooser ids={["addon_persons", "family", "unlimited"]} canPay={canPay} />;
}
@@ -1,5 +1,6 @@
import Link from "next/link";
import { formatDate } from "@/lib/astro";
import type { Me } from "@/lib/types";
import { LogoutButton } from "./LogoutButton";
@@ -13,10 +14,47 @@ export function Logo() {
);
}
/** The user's package and what is left of it; leads to the packages page. */
function PackageBadge({ me }: { me: Me }) {
const { natal, synastry } = me.analyses_left;
const left = natal + synastry;
let name: string;
let detail: string | null;
if (me.unlimited_until) {
name = "Korlátlan";
detail = `${formatDate(me.unlimited_until).replace(/\.$/, "")}-ig`;
} else if (me.package) {
name = me.package.name;
detail = left > 0 ? `${left} elemzés` : "elfogyott";
} else if (left > 0) {
name = `${left} elemzés`;
detail = null;
} else {
return null;
}
const units = me.unlimited_until
? "Korlátlan elemzés és összevetés"
: `Képletelemzés: ${natal}, kapcsolati elemzés: ${synastry}`;
const empty = !me.unlimited_until && left === 0;
return (
<Link
href="/csomagok"
className={empty ? "pkg-pill pkg-pill-empty" : "pkg-pill"}
title={units}
aria-label={`Csomagod: ${name}${detail ? `, ${detail}` : ""}. ${units}.`}
>
<span className="pkg-pill-name">{name}</span>
{detail && <span className="pkg-pill-detail">{detail}</span>}
</Link>
);
}
export function SiteHeader({ me }: { me: Me }) {
const links = [
{ href: "/keplet", label: "Képletem" },
{ href: "/szemelyek", label: "Személyek" },
{ href: "/osszevetesek", label: "Összevetések" },
{ href: "/csomagok", label: "Csomagok" },
{ href: "/profil", label: "Profil" },
];
if (me.user.roles.includes("admin")) links.push({ href: "/admin", label: "Admin" });
@@ -25,7 +63,8 @@ export function SiteHeader({ me }: { me: Me }) {
<Logo />
<NavLinks links={links} />
<div className="who">
<span>{me.user.display_name || me.user.email}</span>
<PackageBadge me={me} />
<span className="who-name">{me.user.display_name || me.user.email}</span>
<LogoutButton />
</div>
</header>
@@ -0,0 +1,314 @@
import { ASPECTS, POINTS, SIGNS, dms, orbText, pointName, signName } from "@/lib/astro";
import type { HouseOverlay, InterAspect, Synastry, SynastryResult } from "@/lib/types";
import { GRID_POINTS, Pos } from "./ChartTables";
const NATURES: { key: keyof SynastryResult["summary"]["by_nature"]; label: string; hint: string }[] = [
{ key: "harmonious", label: "Harmonikus", hint: "trigon, szextil: ami könnyen megy köztetek" },
{ key: "challenging", label: "Feszültebb", hint: "kvadrát, szembenállás: súrlódás, de mozgatóerő is" },
{ key: "neutral", label: "Együttállás", hint: "összeolvadás: erős, a bolygóktól függő hatás" },
];
/** The inter-chart aspects by character, as a bar and counts. */
export function NatureBar({ summary }: { summary: SynastryResult["summary"] }) {
const total = summary.aspect_count || 1;
return (
<div className="nature">
<div className="nature-bar" aria-hidden="true">
{NATURES.map((n) => (
<span
key={n.key}
className={`nature-seg nature-${n.key}`}
style={{ flexGrow: summary.by_nature[n.key] / total }}
/>
))}
</div>
<dl className="nature-list">
{NATURES.map((n) => (
<div key={n.key}>
<dt>
<span className={`nature-dot nature-${n.key}`} aria-hidden="true" /> {n.label}
</dt>
<dd>
<strong>{summary.by_nature[n.key]}</strong> <span className="hint">{n.hint}</span>
</dd>
</div>
))}
</dl>
</div>
);
}
const GRID_ANGLES: [string, string][] = [
["ascendant", "AC"],
["midheaven", "MC"],
];
function gridPoints(s: Synastry["chart1"]): [string, string][] {
const present = new Set(s.chart.points.map((p) => p.id));
const rows: [string, string][] = GRID_POINTS.filter((id) => present.has(id)).map((id) => [id, POINTS[id]?.glyph ?? id]);
if (s.highlights.time_known) {
for (const [key, label] of GRID_ANGLES) if (s.chart.angles?.[key]) rows.push([key, label]);
}
return rows;
}
/** The aspects between the two charts: the first person in the rows, the second in the columns. */
export function CrossGrid({ synastry, name1, name2 }: { synastry: Synastry; name1: string; name2: string }) {
const rows = gridPoints(synastry.chart1);
const cols = gridPoints(synastry.chart2);
const byPair = new Map<string, InterAspect>();
for (const a of synastry.synastry.aspects) byPair.set(`${a.person1}|${a.person2}`, a);
const label = ([id, text]: [string, string], who: string) => (
<span className={text.length > 2 ? "sym" : "grid-angle"} aria-label={`${who}: ${pointName(id)}`} role="img">
{text}
</span>
);
return (
<div className="aspect-grid-wrap">
<table className="aspect-grid cross-grid" aria-label={`Fényszögek: sorokban ${name1}, oszlopokban ${name2}`}>
<thead>
<tr>
<td className="corner cross-corner">
<span className="cross-col">{name2} →</span>
<span className="cross-row">↓ {name1}</span>
</td>
{cols.map((c) => (
<th key={c[0]} scope="col" title={`${name2}: ${pointName(c[0])}`} className="p2-head">
{label(c, name2)}
</th>
))}
</tr>
</thead>
<tbody>
{rows.map((row) => {
const [id] = row;
return (
<tr key={id}>
<th scope="row" title={`${name1}: ${pointName(id)}`}>
{label(row, name1)}
</th>
{cols.map(([other]) => {
const a = byPair.get(`${id}|${other}`);
const info = a ? ASPECTS[a.aspect] : undefined;
const text = a
? `${name1} ${pointName(id)} ${info?.hu ?? a.aspect} ${name2} ${pointName(other)}, orbis ${orbText(a.orb)}`
: undefined;
return (
<td key={other} title={text}>
{a && (
<span className={`sym asp asp-${a.aspect}`} aria-label={text} role="img">
{info?.glyph ?? "?"}
</span>
)}
</td>
);
})}
</tr>
);
})}
</tbody>
</table>
</div>
);
}
function OverlayTable({ title, overlays, missing }: { title: string; overlays: HouseOverlay[] | null; missing: string }) {
return (
<div className="table-wrap">
<h3 style={{ marginBottom: 8 }}>{title}</h3>
{overlays ? (
<table>
<thead>
<tr>
<th scope="col">Pont</th>
<th scope="col">Jegy</th>
<th scope="col">Ház</th>
</tr>
</thead>
<tbody>
{overlays.map((o) => (
<tr key={o.point}>
<td>
<span className="sym" aria-hidden="true">
{POINTS[o.point]?.glyph}
</span>{" "}
{pointName(o.point)}
</td>
<td>
<span className="sym" aria-hidden="true">
{SIGNS[o.sign]?.glyph}
</span>{" "}
{signName(o.sign)}
</td>
<td className="num">{o.house}.</td>
</tr>
))}
</tbody>
</table>
) : (
<p className="muted">{missing}</p>
)}
</div>
);
}
/** Each person's points in the other's houses (needs the other's birth time). */
export function HouseOverlays({ synastry, name1, name2 }: { synastry: Synastry; name1: string; name2: string }) {
const o = synastry.synastry.house_overlays;
return (
<div className="field" style={{ gap: 16 }}>
<p className="hint">
Melyik életterületét érinti a másik: az egyik fél bolygói a másik házaiban. Ehhez a ház „gazdájának” pontos
születési ideje kell.
</p>
<div className="grid-2" style={{ alignItems: "start" }}>
<OverlayTable
title={`${name2} bolygói ${name1} házaiban`}
overlays={o.person2_in_person1}
missing={`${name1} születési ideje ismeretlen, ezért a házai nem számolhatók.`}
/>
<OverlayTable
title={`${name1} bolygói ${name2} házaiban`}
overlays={o.person1_in_person2}
missing={`${name2} születési ideje ismeretlen, ezért a házai nem számolhatók.`}
/>
</div>
</div>
);
}
/** The composite chart (midpoints of the two charts). */
export function CompositeTables({ synastry }: { synastry: Synastry }) {
const c = synastry.synastry.composite;
const hasHouses = Boolean(c.houses);
const angles = (
[
["ascendant", "ASC"],
["midheaven", "MC"],
] as const
).filter(([key]) => c.angles?.[key]);
const aspects = [...c.aspects].filter((a) => a.orb <= 3).sort((a, b) => a.orb - b.orb);
return (
<div className="field" style={{ gap: 16 }}>
<p className="hint">
A kompozit képlet a két képlet felezőpontjaiból áll: a kapcsolatot mint önálló harmadik „személyt” írja le.
{!c.angles && " Tengelyek és házak nélkül, mert legalább az egyik születési idő ismeretlen."}
</p>
<div className="grid-2" style={{ alignItems: "start" }}>
<div className="table-wrap">
<h3 style={{ marginBottom: 8 }}>Pontok</h3>
<table>
<thead>
<tr>
<th scope="col">Pont</th>
<th scope="col">Pozíció</th>
{hasHouses && <th scope="col">Ház</th>}
</tr>
</thead>
<tbody>
{c.points.map((p) => (
<tr key={p.id}>
<td>
<span className="sym" aria-hidden="true">
{POINTS[p.id]?.glyph}
</span>{" "}
{pointName(p.id)}
</td>
<td className="num">
<Pos p={p} />
</td>
{hasHouses && <td className="num">{p.house ? `${p.house}.` : "–"}</td>}
</tr>
))}
{angles.map(([key, label]) => (
<tr key={key}>
<td>{label}</td>
<td className="num">
{dms(c.angles![key].degree_in_sign_dms)} <span className="sym">{SIGNS[c.angles![key].sign]?.glyph}</span>{" "}
{signName(c.angles![key].sign)}
</td>
{hasHouses && <td />}
</tr>
))}
</tbody>
</table>
</div>
<div className="table-wrap">
<h3 style={{ marginBottom: 8 }}>Szoros fényszögek</h3>
{aspects.length === 0 ? (
<p className="muted">Nincs 3°-nál szorosabb fényszög.</p>
) : (
<table>
<tbody>
{aspects.map((a) => (
<tr key={`${a.point1}-${a.point2}-${a.aspect}`}>
<td>
{pointName(a.point1)} <AspectTag aspect={a.aspect} /> {pointName(a.point2)}
</td>
<td className="num">{orbText(a.orb)}</td>
</tr>
))}
</tbody>
</table>
)}
</div>
</div>
</div>
);
}
function AspectTag({ aspect }: { aspect: string }) {
const info = ASPECTS[aspect];
return (
<span className={`aspect-tag aspect-${info?.kind ?? "neutral"}`}>
<span className="sym" aria-hidden="true">
{info?.glyph}
</span>{" "}
{info?.hu ?? aspect}
</span>
);
}
/** Every aspect between the two charts, closest first. */
export function InterAspectList({ synastry, name1, name2 }: { synastry: Synastry; name1: string; name2: string }) {
const aspects = [...synastry.synastry.aspects].sort((a, b) => a.orb - b.orb);
if (aspects.length === 0) return <p className="muted">Nincs fényszög a két képlet között.</p>;
return (
<div className="table-wrap">
<table>
<thead>
<tr>
<th scope="col">{name1}</th>
<th scope="col">Fényszög</th>
<th scope="col">{name2}</th>
<th scope="col">Orbisz</th>
</tr>
</thead>
<tbody>
{aspects.map((a) => (
<tr key={`${a.person1}-${a.person2}-${a.aspect}`}>
<td>
<span className="sym" aria-hidden="true">
{POINTS[a.person1]?.glyph}
</span>{" "}
{pointName(a.person1)}
</td>
<td>
<AspectTag aspect={a.aspect} />
</td>
<td>
<span className="sym p2-text" aria-hidden="true">
{POINTS[a.person2]?.glyph}
</span>{" "}
{pointName(a.person2)}
</td>
<td className="num">{orbText(a.orb)}</td>
</tr>
))}
</tbody>
</table>
</div>
);
}
@@ -0,0 +1,308 @@
import { ASPECTS, POINTS, SIGNS, dms, orbText, pointName, signName } from "@/lib/astro";
import type { ChartPoint, ChartResult, InterAspect, Position } from "@/lib/types";
import {
ASPECT_POINTS,
SIGN_ELEMENT,
SIGN_ORDER,
SIZE,
WHEEL_ASPECTS,
WHEEL_POINTS,
arcPath,
f,
spread,
xy,
} from "./ChartWheel";
const C = SIZE / 2;
const R_LABEL = 322; // ASC / MC labels of the first person
const R_OUT = 300; // outer edge of the zodiac ring
const R_ZOD = 262; // inner edge of the zodiac ring
const R2_GLYPH = 238; // second person: glyphs
const R2_DEG = 214;
const R_MID = 198; // border of the two rings
const R1_GLYPH = 176; // first person: glyphs
const R1_DEG = 154;
const R_HOUSE = 138; // house-number ring of the first person
const R_INNER = 114; // aspect circle
const ANGLE_LABELS: [string, string][] = [
["ascendant", "ASC"],
["midheaven", "MC"],
["descendant", "DSC"],
["imum_coeli", "IC"],
];
function angleOf(chart: ChartResult, key: string): Position | null {
const a = chart.angles?.[key];
return typeof a === "object" && a !== null ? a : null;
}
/** One person's planets on a ring: tick on the outer edge, glyph, degree. */
function Ring({
points,
placed,
edge,
glyphR,
degR,
start,
who,
timeKnown,
className,
}: {
points: ChartPoint[];
placed: number[];
edge: number;
glyphR: number;
degR: number;
start: number;
who: string;
timeKnown: boolean;
className: string;
}) {
return (
<g className={className}>
{points.map((p, i) => {
const [t1x, t1y] = xy(p.longitude, edge, start);
const [t2x, t2y] = xy(p.longitude, edge - 8, start);
const [lx, ly] = xy(placed[i], glyphR + 13, start);
const [gx, gy] = xy(placed[i], glyphR, start);
const [dx, dy] = xy(placed[i], degR, start);
const deg = Number.parseInt(p.degree_in_sign_dms, 10);
return (
<g key={p.id} className="w-point">
<title>
{who}: {pointName(p.id)} {dms(p.degree_in_sign_dms)} {signName(p.sign)}
{p.retrograde ? ", retrográd" : ""}
{timeKnown && p.house ? `, ${p.house}. ház` : ""}
</title>
<line x1={f(t1x)} y1={f(t1y)} x2={f(t2x)} y2={f(t2y)} className="w-point-tick" />
<line x1={f(t2x)} y1={f(t2y)} x2={f(lx)} y2={f(ly)} className="w-leader" />
<text x={f(gx)} y={f(gy)} className="w-point-glyph" dominantBaseline="central" textAnchor="middle">
{POINTS[p.id]?.glyph ?? p.id}
</text>
<text x={f(dx)} y={f(dy)} className="w-point-deg" dominantBaseline="central" textAnchor="middle">
{deg}°{p.retrograde ? "℞" : ""}
</text>
</g>
);
})}
</g>
);
}
/**
* Two charts on one wheel: the first person's planets and houses inside, the
* second person's planets in the outer ring, the aspects between them in the middle.
*/
export function SynastryWheel({
chart1,
chart2,
time1,
time2,
aspects,
name1,
name2,
}: {
chart1: ChartResult;
chart2: ChartResult;
time1: boolean;
time2: boolean;
aspects: InterAspect[];
name1: string;
name2: string;
}) {
const asc = time1 ? angleOf(chart1, "ascendant") : null;
const start = asc?.longitude ?? 0;
const cusps = time1 ? (chart1.houses?.cusps ?? []) : [];
const pick = (chart: ChartResult) =>
WHEEL_POINTS.map((id) => chart.points.find((p) => p.id === id)).filter((p) => p !== undefined);
const points1 = pick(chart1);
const points2 = pick(chart2);
// The inner ring is shorter, so its glyphs need a wider angle.
const placed1 = spread(
points1.map((p) => p.longitude),
12,
);
const placed2 = spread(
points2.map((p) => p.longitude),
8,
);
const endsOf = (points: ChartPoint[], placed: number[], chart: ChartResult, timeKnown: boolean) => {
const ends = new Map<string, number>();
points.forEach((p, i) => {
if (ASPECT_POINTS.includes(p.id)) ends.set(p.id, placed[i]);
});
if (timeKnown) {
for (const key of ["ascendant", "midheaven"]) {
const a = angleOf(chart, key);
if (a) ends.set(key, a.longitude);
}
}
return ends;
};
const ends1 = endsOf(points1, placed1, chart1, time1);
const ends2 = endsOf(points2, placed2, chart2, time2);
const lines = aspects
.filter((a) => WHEEL_ASPECTS.includes(a.aspect) && ends1.has(a.person1) && ends2.has(a.person2))
.map((a) => ({ ...a, strength: a.max_orb > 0 ? 1 - Math.min(a.orb / a.max_orb, 1) : 0.5 }))
.sort((x, y) => x.strength - y.strength);
return (
<svg className="chart-wheel" viewBox={`0 0 ${SIZE} ${SIZE}`} role="img" aria-labelledby="biwheel-title biwheel-desc">
<title id="biwheel-title">
{name1} és {name2} képlete egy körön
</title>
<desc id="biwheel-desc">
Belül {name1} bolygói{time1 ? " és házai" : ""}, kívül {name2} bolygói; középen a kettejük közti főfényszögek.
</desc>
{/* Zodiac ring */}
<circle cx={C} cy={C} r={R_OUT} className="w-ring" />
{SIGN_ORDER.map((sign, i) => {
const [gx, gy] = xy(i * 30 + 15, (R_OUT + R_ZOD) / 2, start);
return (
<g key={sign}>
<path d={arcPath(R_ZOD, R_OUT, i * 30, i * 30 + 30, start)} className={`w-sign w-${SIGN_ELEMENT[i % 4]}`} />
<text x={f(gx)} y={f(gy)} className="w-sign-glyph" dominantBaseline="central" textAnchor="middle">
<title>{SIGNS[sign].hu}</title>
{SIGNS[sign].glyph}
</text>
</g>
);
})}
{Array.from({ length: 72 }, (_, k) => {
const d = k * 5;
const [x1, y1] = xy(d, R_ZOD, start);
const [x2, y2] = xy(d, R_ZOD + (d % 10 === 0 ? 8 : 5), start);
return <line key={d} x1={f(x1)} y1={f(y1)} x2={f(x2)} y2={f(y2)} className="w-tick" />;
})}
<circle cx={C} cy={C} r={R_ZOD} className="w-ring" />
<circle cx={C} cy={C} r={R_MID} className="w-ring w-faint w-p2-band" />
{/* The first person's houses */}
{cusps.length === 12 && (
<g>
<circle cx={C} cy={C} r={R_HOUSE} className="w-ring w-faint" />
{cusps.map((c, i) => {
const isAngle = i % 3 === 0;
const [x1, y1] = xy(c.longitude, R_INNER, start);
const [x2, y2] = xy(c.longitude, isAngle ? R_OUT : R_MID, start);
const next = cusps[(i + 1) % 12].longitude;
const mid = c.longitude + ((next - c.longitude + 360) % 360) / 2;
const [nx, ny] = xy(mid, (R_HOUSE + R_INNER) / 2, start);
return (
<g key={c.house}>
<line x1={f(x1)} y1={f(y1)} x2={f(x2)} y2={f(y2)} className={isAngle ? "w-axis" : "w-cusp"} />
<text x={f(nx)} y={f(ny)} className="w-house-num" dominantBaseline="central" textAnchor="middle">
{c.house}
</text>
</g>
);
})}
{ANGLE_LABELS.map(([key, label]) => {
const a = angleOf(chart1, key);
if (!a) return null;
const [x, y] = xy(a.longitude, R_LABEL, start);
return (
<text key={key} x={f(x)} y={f(y)} className="w-axis-label" dominantBaseline="central" textAnchor="middle">
<title>
{name1}: {pointName(key)} {dms(a.degree_in_sign_dms)} {signName(a.sign)}
</title>
{label}
</text>
);
})}
</g>
)}
{/* Aspects between the two */}
<circle cx={C} cy={C} r={R_INNER} className="w-ring w-inner" />
{lines.map((a) => {
const [x1, y1] = xy(ends1.get(a.person1)!, R_INNER, start);
const [x2, y2] = xy(ends2.get(a.person2)!, R_INNER, start);
const s = a.strength;
return (
<line
key={`${a.person1}-${a.person2}-${a.aspect}`}
x1={f(x1)}
y1={f(y1)}
x2={f(x2)}
y2={f(y2)}
className={`w-aspect w-asp-${a.aspect}`}
strokeOpacity={(0.2 + 0.8 * s * s).toFixed(2)}
strokeWidth={(0.6 + 1.9 * s).toFixed(2)}
>
<title>
{name1} {pointName(a.person1)} {ASPECTS[a.aspect]?.hu ?? a.aspect} {name2} {pointName(a.person2)} (orbis{" "}
{orbText(a.orb)})
</title>
</line>
);
})}
{[...ends1].map(([id, lon]) => {
const [x, y] = xy(lon, R_INNER, start);
return <circle key={`e1-${id}`} cx={f(x)} cy={f(y)} r={2.2} className="w-end" />;
})}
{[...ends2].map(([id, lon]) => {
const [x, y] = xy(lon, R_INNER, start);
return <circle key={`e2-${id}`} cx={f(x)} cy={f(y)} r={2.2} className="w-end w-end-p2" />;
})}
<Ring
points={points1}
placed={placed1}
edge={R_MID}
glyphR={R1_GLYPH}
degR={R1_DEG}
start={start}
who={name1}
timeKnown={time1}
className="w-p1"
/>
<Ring
points={points2}
placed={placed2}
edge={R_ZOD}
glyphR={R2_GLYPH}
degR={R2_DEG}
start={start}
who={name2}
timeKnown={false}
className="w-p2"
/>
</svg>
);
}
/** Key to the two rings and the aspect lines. */
export function SynastryLegend({ name1, name2, time1 }: { name1: string; name2: string; time1: boolean }) {
return (
<div className="hint wheel-legend">
<p className="wheel-legend-items">
<span className="legend-item">
<span className="legend-dot legend-p1" aria-hidden="true" /> belül: {name1}
{time1 ? " (bolygók és házak)" : ""}
</span>
<span className="legend-item">
<span className="legend-dot legend-p2" aria-hidden="true" /> kívül: {name2}
</span>
</p>
<p className="wheel-legend-items">
{[
["trine", "trigon"],
["sextile", "szextil"],
["square", "kvadrát"],
["opposition", "szembenállás"],
].map(([aspect, label]) => (
<span key={aspect} className="legend-item">
<span className={`legend-line legend-${aspect}`} aria-hidden="true" /> {label}
</span>
))}
</p>
<p>A vonalak a két fél bolygói közti főfényszögek; vastagabb vonal: szorosabb fényszög. Az összes a táblázatokban.</p>
</div>
);
}
@@ -0,0 +1,67 @@
"use client";
import { useState } from "react";
import { api, errorText } from "@/lib/api";
/** "Tell me when it opens": for visitors without an invitation. */
export function Waitlist({ email: initial = "" }: { email?: string }) {
const [email, setEmail] = useState(initial);
const [busy, setBusy] = useState(false);
const [done, setDone] = useState(false);
const [error, setError] = useState<string | null>(null);
async function submit(e: React.FormEvent) {
e.preventDefault();
setBusy(true);
setError(null);
try {
await api("/public/waitlist", { body: { email, locale: "hu" } });
setDone(true);
} catch (err) {
setError(errorText(err));
} finally {
setBusy(false);
}
}
if (done) {
return (
<p className="msg msg-ok" role="status">
Felírtunk. Ha megnyílik az oldal, vagy meghívót küldünk, ide írunk: <strong>{email}</strong>
</p>
);
}
return (
<form onSubmit={submit} className="card waitlist">
<p style={{ margin: 0 }}>
<strong>Szólunk, ha megnyílik.</strong>{" "}
<span className="muted">Add meg az e-mail-címed, és felírunk a várólistára.</span>
</p>
<div className="row" style={{ gap: 8, flexWrap: "wrap" }}>
<label htmlFor="waitlist-email" className="sr-only">
E-mail-cím
</label>
<input
id="waitlist-email"
className="inp"
type="email"
required
autoComplete="email"
value={email}
onChange={(e) => setEmail(e.target.value)}
placeholder="nev@pelda.hu"
style={{ flex: "1 1 220px" }}
/>
<button type="submit" className="btn" disabled={busy}>
{busy ? "Küldés…" : "Feliratkozom"}
</button>
</div>
{error && (
<p className="msg msg-error" role="alert">
{error}
</p>
)}
</form>
);
}
+20
View File
@@ -0,0 +1,20 @@
import type { ChartListItem, Synastry, SynastrySide } from "./types";
/** Short name of one side of a comparison: "Én" for the own chart. */
export function sideName(side: { label: string; is_primary?: boolean }): string {
return side.is_primary ? "Én" : side.label;
}
/** Whether a side's birth time is known (another user's chart has fewer fields). */
export function sideTimeKnown(side: SynastrySide): boolean {
const chart = side.chart as SynastrySide["chart"] & { time_known?: boolean };
return side.highlights?.time_known ?? chart.time?.time_known ?? chart.time_known ?? false;
}
/** Name of a chart in the comparison list, from the user's chart list. */
export function listName(ref: { id: string; label: string }, charts: ChartListItem[]): string {
const chart = charts.find((c) => c.id === ref.id);
return chart ? sideName(chart) : ref.label;
}
export type { Synastry };
+177 -1
View File
@@ -19,6 +19,27 @@ export interface Me {
analyses_left: UnitBalance;
birth_change: BirthChange;
persons: PersonSlots;
/** The unlimited package runs until then (null: none). */
unlimited_until: string | null;
/** The running unlimited package, or the latest main package bought or given (null: none). */
package: { id: string; name: string; since: string } | null;
}
/** A package from the catalog (`GET /v1/packages`). */
export interface Package {
id: string;
name: string;
tagline: string;
tier: "main" | "addon";
price_huf: number;
natal: number;
synastry: number;
persons: number;
unlimited_months: number | null;
badge: string | null;
list_price_huf: number | null;
savings_percent: number | null;
per_analysis_huf: number | null;
}
/** How many persons the user may still add (`left`/`limit` null: no limit). */
@@ -50,7 +71,10 @@ export interface PublicConfig {
password_login: boolean;
password_min_length: number;
mock_payments: boolean;
person_pack_size: number;
/** New detailed analyses a day with the unlimited package. */
unlimited_daily_limit: number;
/** "invite": new accounts need an invitation. */
signup_mode: "invite" | "open";
}
export interface Position {
@@ -124,6 +148,67 @@ export interface ChartListItem {
created_at: string;
}
/** An aspect between a point of the first chart and one of the second. */
export interface InterAspect {
person1: string;
person2: string;
aspect: string;
nature: "harmonious" | "challenging" | "neutral";
major: boolean;
orb: number;
max_orb: number;
}
export interface HouseOverlay {
point: string;
sign: string;
house: number;
}
export interface SynastryResult {
aspects: InterAspect[];
house_overlays: {
/** The first person's points in the second person's houses (null: second time unknown). */
person1_in_person2: HouseOverlay[] | null;
person2_in_person1: HouseOverlay[] | null;
};
summary: {
aspect_count: number;
by_nature: { harmonious: number; challenging: number; neutral: number };
by_aspect: Record<string, number>;
};
composite: {
method: string;
points: ChartPoint[];
angles: Record<string, Position> | null;
houses: { cusps: (Position & { house: number })[] } | null;
aspects: Aspect[];
};
warnings: string[];
}
/** One side of a comparison: the full chart when it is the viewer's own. */
export type SynastrySide = Chart & { owned: true };
export interface Synastry {
id: string;
owned: boolean;
chart1: SynastrySide;
chart2: SynastrySide;
synastry: SynastryResult;
created_at: string;
}
/** A comparison in the list (`GET /v1/synastries`). */
export interface SynastryListItem {
id: string;
owned: boolean;
chart1: { id: string; label: string; owned: boolean };
chart2: { id: string; label: string; owned: boolean };
summary: SynastryResult["summary"] | null;
created_at: string;
}
export interface Analysis {
id: string;
kind: "natal" | "synastry" | "summary";
@@ -147,6 +232,53 @@ export interface AdminUser {
last_login_at: string | null;
charts: number;
analyses_left: UnitBalance;
unlimited_until: string | null;
}
export type PromptKind = "summary" | "natal" | "synastry";
export interface PromptRevision {
id: number;
custom: boolean;
/** `null`: the built-in text was restored. */
system: string | null;
created_at: string;
created_by: string | null;
}
/** An editable analysis system prompt (admin). */
export interface AdminPrompt {
kind: PromptKind;
language: string;
/** The text in force. */
system: string;
custom: boolean;
updated_at: string | null;
updated_by: string | null;
default: string;
/** The fixed user message; `{chart data}` stands for the chart. */
user_template: string;
history: PromptRevision[];
}
/** A test run of a draft prompt on one of the admin's charts. */
export interface PromptPreview {
id: string;
kind: PromptKind;
chart_id: string | null;
synastry_id: string | null;
language: string;
model: string;
status: "pending" | "running" | "done" | "failed";
content: AnalysisContent | null;
error: string | null;
model_used: string | null;
input_tokens: number | null;
output_tokens: number | null;
cost_usd: number | null;
created_at: string;
completed_at: string | null;
seconds: number | null;
}
export interface AnalysisContent {
@@ -170,3 +302,47 @@ export interface Country {
iso2: string;
name: string;
}
export type InvitationStatus = "pending" | "accepted" | "expired" | "revoked";
/** What an invitation link shows before login. */
export interface InvitationLanding {
inviter_name: string | null;
message: string | null;
status: InvitationStatus;
expires_at: string;
}
export interface AdminInvitation {
id: string;
email: string;
message: string | null;
locale: string;
status: InvitationStatus;
created_at: string;
expires_at: string;
sent_count: number;
last_sent_at: string;
accepted_at: string | null;
accepted_by: string | null;
invited_by: string | null;
/** The last e-mail: sent, waiting, failed, or already removed from the outbox. */
mail: "sent" | "queued" | "failed" | "archived";
mail_error: string | null;
can_resend: boolean;
}
export interface WaitlistEntry {
email: string;
locale: string;
created_at: string;
/** The address's latest invitation, if any. */
invitation: "pending" | "accepted" | null;
}
export interface InvitationResult {
email: string;
status: "invited" | "invalid" | "already_user" | "already_invited" | "opted_out";
id?: string;
url?: string;
}
+5
View File
@@ -8,14 +8,19 @@ publish.workspace = true
[dependencies]
db.workspace = true
analysis-prompt.workspace = true
email-templates.workspace = true
service-kit.workspace = true
anyhow.workspace = true
axum.workspace = true
base64.workspace = true
hmac.workspace = true
lettre.workspace = true
rand.workspace = true
reqwest.workspace = true
serde.workspace = true
serde_json.workspace = true
sha2.workspace = true
sqlx.workspace = true
time.workspace = true
tokio.workspace = true
+8 -3
View File
@@ -9,24 +9,27 @@ Háttérmunkák a közös PostgreSQL-adatbázis fölött: e-mail-küldés, szöv
- A sorokat `FOR UPDATE SKIP LOCKED` zárolással veszi fel, ezért több worker is futhat egyszerre, és nem küldik el kétszer ugyanazt. A kézbesítés „legalább egyszer” elvű: ha a worker éppen küldés közben áll le, a levél újra kimehet.
- Átmeneti hibánál (hálózat, SMTP 4xx) újrapróbálja 1, 2, 4, … percenként, legfeljebb 6 óránként. `MAX_EMAIL_ATTEMPTS` próbálkozás után a levelet sikertelennek jelöli (`failed_at`, `last_error`).
- Végleges hibánál nem próbálja újra: ilyen a hibás cím, az SMTP 5xx és az ismeretlen sablon.
- Sablonok magyarul és angolul, a felhasználó nyelve szerint (`src/templates.rs`): `verify_email`, `reset_password`, `invite_accepted`. Mindegyik szöveges és HTML-változatban megy ki; a felhasználó nevét HTML-ben escape-eli, és a vezérlőkaraktereket eltávolítja belőle.
- Sablonok magyarul és angolul, a címzett nyelve szerint (`crates/email-templates`, a backend admin-előnézete is ezt használja): `verify_email`, `reset_password`, `invite_accepted`, `invitation`. Mindegyik szöveges és HTML-változatban megy ki; a felhasználói szöveget HTML-ben escape-eli, és a vezérlőkaraktereket eltávolítja belőle.
- A spamszűrők miatt a `Message-ID` a feladó domainjén van (`<outbox-id@domain>`), a meghívóknál pedig `List-Unsubscribe` és `List-Unsubscribe-Post` fejléc is megy (egykattintásos leiratkozás). Élesítés: `docs/levelkuldes.md`.
- Ha nincs `SMTP_URL`, a worker nem küld semmit, a levelek az outboxban várnak.
**Takarítás** (induláskor, majd óránként)
- lejárt munkamenetek és e-mail-tokenek;
- elküldött e-mailek 7 nap után (tokenes linkek vannak bennük), sikertelenek 30 nap után;
- el nem fogadott meghívók 30 nappal a lejáratuk után.
- el nem fogadott „Mennyire illünk össze?” meghívók 30 nappal a lejáratuk után;
- el nem fogadott oldalmeghívók 30 nappal a lezárásuk (lejárat vagy visszavonás) után, az elfogadottak pedig, ha a fiókot törölték.
**Szöveges elemzések** (`analyses`, `pending` → `running` → `done`/`failed`)
- A backend létrehozza a `pending` sort, és levon egy elemzési egységet. Egy trigger (`NOTIFY analyses`) felébreszti a workert; egyszerre `ANALYSIS_CONCURRENCY` elemzés készül.
- A prompt a tárolt képletből készül (`src/analysis/compact.rs`). Ez egy tömör szöveg, amely csak a pozíciókat tartalmazza: jegyek, fokok, házak, fényszögek, elemek. **Név, születési dátum, idő, hely és koordináta nem megy ki.** Ismeretlen születési időnél nincsenek házak, Aszcendens és MC.
- A modell OpenRouteren keresztül válaszol, azzal a modellel, amely a sor `model` mezőjében áll. A válasznak kötött JSON-sémát kell követnie (`src/analysis/prompt.rs`, `PROMPT_VERSION = v2`):
- A modell OpenRouteren keresztül válaszol, azzal a modellel, amely a sor `model` mezőjében áll. A válasznak kötött JSON-sémát kell követnie (`crates/analysis-prompt`, `PROMPT_VERSION = v2`; ha a sor `prompt_version`-je `v2-r<id>`, a system prompt az admin által szerkesztett `prompt_revisions` sorból jön):
- `title`, `summary`;
- `sections`, radixnál: `personality`, `emotions`, `mind`, `love`, `work`, `growth`; szinasztriánál: `attraction`, `communication`, `emotional_bond`, `friction`, `long_term`;
- `strengths`, `challenges`, `advice`;
- a rövid összefoglalónál (`summary`) csak `title` és egy 3–4 mondatos `summary`.
A worker a választ maga is ellenőrzi a sémán. Magyar szövegben az egyenes idézőjelpárokat („…”) alakra cseréli.
- Ha nincs esedékes elemzés, a worker az admin próbafuttatásait írja (`prompt_previews`): a mentetlen system prompttal, egyetlen próbálkozással, egység nélkül. 30 nap után a takarítás törli őket.
- Eltárolja a ténylegesen válaszoló modellt (`model_used`; az `openrouter/auto` mögött ez más lehet), a tokenszámot és a költséget (`cost_usd`).
- **Átmeneti hiba** (hálózat, 429, 5xx, elfogyott OpenRouter-egyenleg, hibás vagy csonka válasz): újrapróbálja 30 mp, 2 perc, majd 8 perc múlva.
- **Végleges hiba** (például ismeretlen modell), vagy ha elfogyott a `MAX_ANALYSIS_ATTEMPTS` próbálkozás: az elemzés `failed` lesz, és az egység visszajár (`refund`, elemzésenként legfeljebb egyszer).
@@ -60,6 +63,8 @@ Ugyanazt a radix-elemzést több modellel is megírja, véletlenszerű betűkkel
|---|---|---|
| `DATABASE_URL` | – (kötelező) | PostgreSQL kapcsolat |
| `SMTP_URL` | – | `smtp://mailpit:1025` (fejlesztés), `smtp://user:pass@host:587?tls=required` (STARTTLS), `smtps://user:pass@host:465` (TLS) |
| `AWS_ACCESS_KEY_ID` + `AWS_SECRET_ACCESS_KEY` | – | Amazon SES, ha nincs `SMTP_URL` (a `.env.secrets` fájlból; más nevek is jók, lásd `src/ses.rs`). A titkos kulcsból a worker kiszámolja az SMTP-jelszót. Helyettük `SES_SMTP_USERNAME` + `SES_SMTP_PASSWORD` is megadható |
| `SES_REGION`, `SES_SMTP_PORT` | `eu-central-1`, `2587` | SES-régió és port (a DigitalOcean a 25-ös, 465-ös és 587-es portot tiltja) |
| `MAIL_FROM` | `Sorsfonalak <noreply@sorsfonalak.local>` | feladó |
| `POLL_INTERVAL_SECS` | `30` | tartalék lekérdezési időköz |
| `MAX_EMAIL_ATTEMPTS` | `8` | ennyi próbálkozás után sikertelen a levél |
+154 -23
View File
@@ -5,6 +5,9 @@
//! through OpenRouter and stores the structured answer (`done`). Temporary
//! failures are retried with backoff; after the last attempt, or on a
//! permanent error, the analysis is `failed` and the unit is refunded.
//!
//! Admin test runs of an edited prompt (`prompt_previews`) go through the
//! same loop when no analysis is due: one attempt, no credits, no retries.
pub mod compact;
pub mod openrouter;
@@ -37,12 +40,24 @@ pub struct Job {
pub attempts: i32,
}
/// A test run of an edited system prompt on a chart.
#[derive(Debug, sqlx::FromRow)]
pub struct PreviewJob {
pub id: Uuid,
pub kind: String,
pub chart_id: Option<Uuid>,
pub synastry_id: Option<Uuid>,
pub language: String,
pub model: String,
pub system: String,
}
pub struct Analyzer {
pub db: PgPool,
pub llm: OpenRouter,
pub max_attempts: i32,
pub concurrency: usize,
/// Analyses being written right now (put back to `pending` on shutdown).
/// Analyses and previews being written right now (released on shutdown).
running: Mutex<HashSet<Uuid>>,
}
@@ -77,34 +92,118 @@ impl Analyzer {
pub async fn prompt_for(&self, job: &Job) -> Result<Prompt, LlmError> {
let kind = Kind::parse(&job.kind).ok_or_else(|| LlmError::Permanent(format!("unknown kind '{}'", job.kind)))?;
let db_err = |e: sqlx::Error| LlmError::Transient(format!("database: {e}"));
let gone = || LlmError::Permanent("the chart was deleted".into());
let text = match kind {
Kind::Natal | Kind::Summary => {
let (chart,): (Value,) = sqlx::query_as("SELECT result FROM charts WHERE id = $1")
.bind(job.chart_id)
.fetch_optional(&self.db)
.await
.map_err(db_err)?
.ok_or_else(gone)?;
compact::natal(&chart)
}
Kind::Synastry => {
let (result, chart1, chart2): (Value, Value, Value) = sqlx::query_as(
"SELECT s.result, c1.result, c2.result FROM synastries s \
JOIN charts c1 ON c1.id = s.chart1_id JOIN charts c2 ON c2.id = s.chart2_id WHERE s.id = $1",
)
.bind(job.synastry_id)
Kind::Natal | Kind::Summary => self.natal_text(job.chart_id).await?,
Kind::Synastry => self.synastry_text(job.synastry_id).await?,
};
let (base, revision) = prompt::split_version(&job.prompt_version);
if base != PROMPT_VERSION {
tracing::warn!(id = %job.id, requested = %job.prompt_version, current = PROMPT_VERSION, "prompt version differs");
}
// An admin-edited system prompt; NULL (or a missing row) means the built-in one.
let system: Option<String> = match revision {
Some(id) => sqlx::query_scalar("SELECT system FROM prompt_revisions WHERE id = $1")
.bind(id)
.fetch_optional(&self.db)
.await
.map_err(db_err)?
.ok_or_else(gone)?;
compact::synastry(&chart1, &chart2, &result)
.flatten(),
None => None,
};
Ok(prompt::build(kind, &job.language, &text, system.as_deref()))
}
/// The compact text of a stored natal chart.
async fn natal_text(&self, chart_id: Option<Uuid>) -> Result<String, LlmError> {
let (chart,): (Value,) = sqlx::query_as("SELECT result FROM charts WHERE id = $1")
.bind(chart_id)
.fetch_optional(&self.db)
.await
.map_err(|e| LlmError::Transient(format!("database: {e}")))?
.ok_or_else(|| LlmError::Permanent("the chart was deleted".into()))?;
Ok(compact::natal(&chart))
}
/// The compact text of a stored synastry with its two charts.
async fn synastry_text(&self, synastry_id: Option<Uuid>) -> Result<String, LlmError> {
let (result, chart1, chart2): (Value, Value, Value) = sqlx::query_as(
"SELECT s.result, c1.result, c2.result FROM synastries s \
JOIN charts c1 ON c1.id = s.chart1_id JOIN charts c2 ON c2.id = s.chart2_id WHERE s.id = $1",
)
.bind(synastry_id)
.fetch_optional(&self.db)
.await
.map_err(|e| LlmError::Transient(format!("database: {e}")))?
.ok_or_else(|| LlmError::Permanent("the synastry was deleted".into()))?;
Ok(compact::synastry(&chart1, &chart2, &result))
}
/// Takes the oldest waiting prompt test run, if any.
pub async fn claim_preview(&self) -> Result<Option<PreviewJob>, sqlx::Error> {
let job: Option<PreviewJob> = sqlx::query_as(
"UPDATE prompt_previews SET status = 'running', started_at = now() \
WHERE id = (SELECT id FROM prompt_previews WHERE status = 'pending' \
ORDER BY created_at LIMIT 1 FOR UPDATE SKIP LOCKED) \
RETURNING id, kind, chart_id, synastry_id, language, model, system",
)
.fetch_optional(&self.db)
.await?;
if let Some(job) = &job {
self.running.lock().unwrap().insert(job.id);
}
Ok(job)
}
/// Writes one test run with the edited system prompt (a single attempt).
pub async fn handle_preview(&self, job: PreviewJob) {
let started = Instant::now();
let result = async {
let kind =
Kind::parse(&job.kind).ok_or_else(|| LlmError::Permanent(format!("unknown kind '{}'", job.kind)))?;
let text = match kind {
Kind::Synastry => self.synastry_text(job.synastry_id).await?,
_ => self.natal_text(job.chart_id).await?,
};
let built = prompt::build(kind, &job.language, &text, Some(&job.system));
let mut c = self.llm.complete(&job.model, &built).await?;
prompt::polish(&job.language, &mut c.content);
Ok::<_, LlmError>(c)
}
.await;
let saved = match &result {
Ok(c) => {
sqlx::query(
"UPDATE prompt_previews SET status = 'done', content = $2, model_used = $3, input_tokens = $4, \
output_tokens = $5, cost_usd = $6, completed_at = now() WHERE id = $1 AND status = 'running'",
)
.bind(job.id)
.bind(&c.content)
.bind(&c.model)
.bind(c.input_tokens)
.bind(c.output_tokens)
.bind(c.cost_usd)
.execute(&self.db)
.await
}
Err(e) => {
sqlx::query(
"UPDATE prompt_previews SET status = 'failed', error = $2, completed_at = now() \
WHERE id = $1 AND status = 'running'",
)
.bind(job.id)
.bind(e.message())
.execute(&self.db)
.await
}
};
if job.prompt_version != PROMPT_VERSION {
tracing::warn!(id = %job.id, requested = %job.prompt_version, current = PROMPT_VERSION, "prompt version differs");
match (&result, saved) {
(_, Err(e)) => tracing::error!(id = %job.id, error = %e, "saving the prompt preview failed"),
(Ok(c), Ok(_)) => tracing::info!(
id = %job.id, model = %c.model, cost_usd = c.cost_usd, secs = started.elapsed().as_secs(), "prompt preview done"
),
(Err(e), Ok(_)) => tracing::warn!(id = %job.id, error = %e.message(), "prompt preview failed"),
}
Ok(prompt::build(kind, &job.language, &text))
self.running.lock().unwrap().remove(&job.id);
}
/// Writes one claimed analysis and records the outcome.
@@ -204,6 +303,14 @@ impl Analyzer {
.bind(STUCK_AFTER_MINUTES)
.execute(&self.db)
.await?;
// A test run is not retried: the admin can start it again.
sqlx::query(
"UPDATE prompt_previews SET status = 'failed', error = 'interrupted', completed_at = now() \
WHERE status = 'running' AND started_at < now() - make_interval(mins => $1)",
)
.bind(STUCK_AFTER_MINUTES)
.execute(&self.db)
.await?;
Ok(result.rows_affected())
}
@@ -224,6 +331,16 @@ impl Analyzer {
Ok(r) => tracing::info!(released = r.rows_affected(), "unfinished analyses put back in the queue"),
Err(e) => tracing::error!(error = %e, "releasing unfinished analyses"),
}
let result = sqlx::query(
"UPDATE prompt_previews SET status = 'failed', error = 'interrupted', completed_at = now() \
WHERE id = ANY($1) AND status = 'running'",
)
.bind(&ids)
.execute(&self.db)
.await;
if let Err(e) = result {
tracing::error!(error = %e, "releasing unfinished prompt previews");
}
}
}
@@ -254,7 +371,21 @@ pub async fn run(analyzer: Arc<Analyzer>, poll: Duration, stop: watch::Receiver<
drop(permit);
});
}
Ok(None) => break,
// No analysis is due: a prompt test run, if one waits.
Ok(None) => match analyzer.claim_preview().await {
Ok(Some(job)) => {
let analyzer = analyzer.clone();
tasks.spawn(async move {
analyzer.handle_preview(job).await;
drop(permit);
});
}
Ok(None) => break,
Err(e) => {
tracing::error!(error = %e, "claiming a prompt preview");
break;
}
},
Err(e) => {
tracing::error!(error = %e, "claiming an analysis");
break;
+7 -2
View File
@@ -55,8 +55,13 @@ impl Serialize for Ordered<'_> {
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
match self.0 {
Value::Object(map) => {
let order: Vec<&str> =
map.get("required").and_then(Value::as_array).into_iter().flatten().filter_map(Value::as_str).collect();
let order: Vec<&str> = map
.get("required")
.and_then(Value::as_array)
.into_iter()
.flatten()
.filter_map(Value::as_str)
.collect();
let mut out = serializer.serialize_map(Some(map.len()))?;
for (key, value) in map {
match (key.as_str(), value) {
+2 -337
View File
@@ -1,338 +1,3 @@
//! Prompts and output schemas of the analyses (prompt version [`PROMPT_VERSION`]).
//!
//! The model answers with one JSON object (OpenRouter structured output);
//! [`validate`] checks it against the same schema before it is stored.
//! Prompts and answer schemas live in the shared `analysis-prompt` crate.
use serde_json::{Value, json};
/// Matches the backend's `ANALYSIS_PROMPT_VERSION` (part of the cache key).
pub const PROMPT_VERSION: &str = "v2";
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Kind {
Natal,
Synastry,
/// A free teaser of a natal chart: a title and a few sentences.
Summary,
}
impl Kind {
pub fn parse(s: &str) -> Option<Kind> {
match s {
"natal" => Some(Kind::Natal),
"synastry" => Some(Kind::Synastry),
"summary" => Some(Kind::Summary),
_ => None,
}
}
}
pub struct Prompt {
pub system: String,
pub user: String,
pub schema_name: &'static str,
pub schema: Value,
}
/// (key, what the section covers) in reading order.
const NATAL_SECTIONS: [(&str, &str); 6] = [
("personality", "Core identity: the Sun, Moon, Ascendant and chart ruler read together"),
("emotions", "Emotional needs, security and inner life (Moon, 4th house, water emphasis)"),
("mind", "Thinking, communication and learning (Mercury, 3rd and 9th houses)"),
("love", "Love, attraction and relationships (Venus, Mars, 5th and 7th houses, Descendant)"),
("work", "Calling, career, money and daily work (MC, 10th, 2nd and 6th houses, Saturn, Jupiter)"),
(
"growth",
"Main inner tensions, life lessons and the path of growth (tight squares and oppositions, Saturn, Chiron, Nodes)",
),
];
const SYNASTRY_SECTIONS: [(&str, &str); 5] = [
("attraction", "What draws them together: Sun, Moon, Venus, Mars and Ascendant contacts"),
("communication", "How they think and talk together (Mercury contacts, air emphasis, 3rd house overlays)"),
("emotional_bond", "Emotional closeness, safety and care (Moon contacts, 4th and 8th house overlays)"),
("friction", "Where they rub against each other and how to handle it (challenging aspects, Saturn, Pluto, Mars)"),
("long_term", "Long-term potential and shared purpose, including the composite chart"),
];
fn sections(kind: Kind) -> &'static [(&'static str, &'static str)] {
match kind {
Kind::Natal => &NATAL_SECTIONS,
Kind::Synastry => &SYNASTRY_SECTIONS,
Kind::Summary => &[],
}
}
/// The JSON schema of the answer (strict mode: every property required).
pub fn schema(kind: Kind) -> Value {
if kind == Kind::Summary {
return json!({
"type": "object",
"additionalProperties": false,
"required": ["title", "summary"],
"properties": {
"title": {"type": "string", "description": "Short, evocative title for this chart (at most 6 words)"},
"summary": {"type": "string", "description": "3-4 sentences, 60-100 words, one paragraph"}
}
});
}
let mut props = serde_json::Map::new();
for (key, about) in sections(kind) {
props.insert(
(*key).into(),
json!({
"type": "object",
"description": about,
"additionalProperties": false,
"required": ["title", "body"],
"properties": {
"title": {"type": "string", "description": "Short, specific section title (not just the topic name)"},
"body": {"type": "string", "description": "2-4 paragraphs separated by a blank line"}
}
}),
);
}
let keys: Vec<&str> = sections(kind).iter().map(|(k, _)| *k).collect();
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)"},
"summary": {"type": "string", "description": "3-4 sentence overview"},
"sections": {"type": "object", "additionalProperties": false, "required": keys, "properties": props},
"strengths": {"type": "array", "items": {"type": "string"}, "description": "3-5 key strengths, one sentence each"},
"challenges": {"type": "array", "items": {"type": "string"}, "description": "3-5 key challenges, one sentence each"},
"advice": {"type": "string", "description": "A closing, encouraging paragraph with concrete guidance"}
}
})
}
const HUNGARIAN_STYLE: &str = "\
Write natural, idiomatic Hungarian, as a native Hungarian author would; it must not read like a translation from English. \
Use correct Hungarian suffixes and vowel harmony, Hungarian quotation marks („…”) and the en dash (–). \
Use the usual Hungarian astrological terms:
- signs: Kos, Bika, Ikrek, Rák, Oroszlán, Szűz, Mérleg, Skorpió, Nyilas, Bak, Vízöntő, Halak (\"a Nap a Rák jegyében\", \"Kos Aszcendens\");
- planets and points: Nap, Hold, Merkúr, Vénusz, Mars, Jupiter, Szaturnusz, Uránusz, Neptunusz, Plútó, Chiron (Kiron), \
Észak-Holdcsomópont, Dél-Holdcsomópont, Lilith (Fekete Hold), Aszcendens, Descendens, Medium Coeli (MC), Imum Coeli (IC), Szerencsepont;
- aspects: együttállás (konjunkció), szextil, kvadrát (négyzet), trigon, szembenállás (oppozíció);
- elements and modalities: tűz, föld, levegő, víz (\"tűz elem\", \"a föld hiánya\"); kardinális, fix, változó;
Never leave English words (e.g. fire, earth, air, water) in the Hungarian text.
- other: \"a 3. házban\", \"a horoszkóp uralkodója\", retrográd, uralom (domicilium), száműzetés, exaltáció, esés, nappali/éjszakai horoszkóp.";
fn language_name(language: &str) -> &'static str {
match language {
"hu" => "Hungarian",
_ => "English",
}
}
fn rules(kind: Kind, language: &str) -> String {
let (role, reader) = match kind {
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\").",
),
Kind::Summary => (
"a short free summary of a natal chart (a teaser shown before the detailed, paid analysis)",
"Speak to the owner of the chart directly, in the informal second person singular (in Hungarian: tegező forma, \"te\").",
),
Kind::Synastry => (
"a relationship (synastry) interpretation for two people",
"Write for both people at once, in the informal second person plural (in Hungarian: \"ti\", \"kettőtök\"). \
When you must tell them apart, call them Person 1 and Person 2 (in Hungarian: \"az első fél\" and \"a második fél\"). \
Do not assume their genders or the type of relationship.",
),
};
let mut text = format!(
"You are an experienced, warm and psychologically minded astrologer. You write {role} for the Sorsfonalak app.
Write in {lang}.
Rules:
- Base every statement on the chart data given. Never invent positions, aspects or houses that are not listed.
- When you interpret a placement, name its astrological basis in a short clause, but keep the focus on the person, not on jargon.
- Synthesize: weave signs, houses, aspects and rulers into one coherent portrait; show how tensions can be integrated. \
Give the most weight to the Sun, Moon, Ascendant, chart ruler, tight aspects (orb under 3°) and strong emphases or gaps in elements and modalities.
- If a birth time is unknown, do not mention houses, the Ascendant or the Midheaven for that chart, and be careful with the Moon's sign.
- {reader}
- Tone: warm, honest, empowering and concrete. Not fatalistic: no predictions of illness, death, accidents or specific events, \
and no medical, legal or financial advice.
- Avoid generic horoscope clichés and filler: every paragraph must say something specific to this chart.
- Texts are plain paragraphs separated by a blank line, without headings or lists inside; **bold** may be used sparingly.
- {length}
- Answer with a single JSON object that matches the given schema, and nothing else.",
lang = language_name(language),
length = match kind {
Kind::Summary => "Length: one paragraph of 3-4 sentences (60-100 words). Pick the Sun, Moon and Ascendant \
(if the birth time is known) and the single most striking feature of the chart (a very tight aspect, \
a stellium, a strong element emphasis or gap). It must be complete in itself and specific to this chart: \
no sales talk, and do not mention a longer analysis.",
_ => "Length: each section 2-4 paragraphs (about 150-250 words); the whole analysis about 1300-1800 words.",
},
);
if language == "hu" {
text.push_str("\n\n");
text.push_str(HUNGARIAN_STYLE);
}
text
}
pub fn build(kind: Kind, language: &str, chart_text: &str) -> Prompt {
let mut user = String::from("Chart data:\n\n");
user.push_str(chart_text);
if kind == Kind::Summary {
user.push_str("\nWrite the short summary now.");
} else {
user.push_str("\nSections to write, in this order:\n");
for (key, about) in sections(kind) {
user.push_str(&format!("- {key}: {about}\n"));
}
user.push_str("\nWrite the analysis now.");
}
Prompt {
system: rules(kind, language),
user,
schema_name: match kind {
Kind::Natal => "natal_analysis",
Kind::Synastry => "synastry_analysis",
Kind::Summary => "chart_summary",
},
schema: schema(kind),
}
}
/// 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.
pub fn validate(schema: &Value, value: &Value) -> Result<(), String> {
fn walk(schema: &Value, value: &Value, path: &str) -> Result<(), String> {
match schema["type"].as_str() {
Some("object") => {
let obj = value.as_object().ok_or_else(|| format!("{path}: expected an object"))?;
for key in schema["required"].as_array().into_iter().flatten().filter_map(Value::as_str) {
let child = obj.get(key).ok_or_else(|| format!("{path}.{key}: missing"))?;
walk(&schema["properties"][key], child, &format!("{path}.{key}"))?;
}
Ok(())
}
Some("array") => {
let items = value.as_array().ok_or_else(|| format!("{path}: expected an array"))?;
if items.len() < 2 {
return Err(format!("{path}: too few items"));
}
items.iter().enumerate().try_for_each(|(i, v)| walk(&schema["items"], v, &format!("{path}[{i}]")))
}
Some("string") => match value.as_str() {
Some(s) if s.chars().filter(|c| c.is_alphabetic()).nth(2).is_some() => Ok(()),
_ => Err(format!("{path}: expected a non-empty string")),
},
_ => Ok(()),
}
}
walk(schema, value, "$")
}
/// Fixes typography the models often get wrong. In Hungarian, pairs of
/// straight double quotes become „…” (only when they pair up evenly).
pub fn polish(language: &str, content: &mut Value) {
fn hungarian_quotes(text: &str) -> Option<String> {
if !text.contains('"') || !text.matches('"').count().is_multiple_of(2) {
return None;
}
let mut open = true;
Some(
text.chars()
.map(|c| match c {
'"' => {
let q = if open { '„' } else { '”' };
open = !open;
q
}
c => c,
})
.collect(),
)
}
match content {
Value::String(s) if language == "hu" => {
if let Some(fixed) = hungarian_quotes(s) {
*s = fixed;
}
}
Value::Array(items) => items.iter_mut().for_each(|v| polish(language, v)),
Value::Object(map) => map.values_mut().for_each(|v| polish(language, v)),
_ => {}
}
}
/// The analysis as Markdown (for reading and comparing outputs).
pub fn to_markdown(kind: Kind, language: &str, content: &Value) -> String {
let (strengths, challenges, advice) = if language == "hu" {
("Erősségek", "Kihívások", "Útravaló")
} else {
("Strengths", "Challenges", "Advice")
};
let mut md =
format!("# {}\n\n_{}_\n\n", content["title"].as_str().unwrap_or(""), content["summary"].as_str().unwrap_or(""));
if kind == Kind::Summary {
return md;
}
for (key, _) in sections(kind) {
let s = &content["sections"][*key];
md.push_str(&format!("## {}\n\n{}\n\n", s["title"].as_str().unwrap_or(key), s["body"].as_str().unwrap_or("")));
}
for (title, key) in [(strengths, "strengths"), (challenges, "challenges")] {
md.push_str(&format!("## {title}\n\n"));
for item in content[key].as_array().into_iter().flatten().filter_map(Value::as_str) {
md.push_str(&format!("- {item}\n"));
}
md.push('\n');
}
md.push_str(&format!("## {advice}\n\n{}\n", content["advice"].as_str().unwrap_or("")));
md
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn summary_prompt_is_short() {
let p = build(Kind::Summary, "hu", "SUN: Cancer");
assert_eq!(p.schema_name, "chart_summary");
assert!(p.system.contains("3-4 sentences") && p.system.contains("tegező"));
assert!(!p.user.contains("Sections to write"));
assert_eq!(validate(&p.schema, &json!({"title": "Érzékeny mag", "summary": "Rövid szöveg."})), Ok(()));
assert!(validate(&p.schema, &json!({"title": "Érzékeny mag"})).is_err());
let md = to_markdown(Kind::Summary, "hu", &json!({"title": "Cím", "summary": "Szöveg."}));
assert_eq!(md, "# Cím\n\n_Szöveg._\n\n");
}
#[test]
fn validate_rejects_placeholder_titles() {
let schema = schema(Kind::Synastry);
let section = json!({"title": "Rák-szívek", "body": "Két bekezdés szöveg."});
let mut answer = json!({
"title": "Két Rák-szív", "summary": "Összefoglaló.", "advice": "Útravaló.",
"strengths": ["Egyik erősség.", "Másik erősség."], "challenges": ["Egy kihívás.", "Még egy."],
"sections": {"attraction": section, "communication": section, "emotional_bond": section,
"friction": section, "long_term": section},
});
assert_eq!(validate(&schema, &answer), Ok(()));
answer["sections"]["attraction"]["title"] = json!("x");
assert_eq!(validate(&schema, &answer), Err("$.sections.attraction.title: expected a non-empty string".into()));
}
#[test]
fn polish_turns_straight_quotes_hungarian() {
let mut v = json!({"a": "a \"hazai pálya\" és a \"sorok\"", "b": ["egy \" pár nélkül"], "c": {"d": "nincs"}});
polish("hu", &mut v);
assert_eq!(v["a"], "a „hazai pálya” és a „sorok”");
assert_eq!(v["b"][0], "egy \" pár nélkül");
assert_eq!(v["c"]["d"], "nincs");
let mut en = json!({"a": "the \"home\" ground"});
polish("en", &mut en);
assert_eq!(en["a"], "the \"home\" ground");
}
}
pub use analysis_prompt::*;
+9 -1
View File
@@ -8,7 +8,7 @@ use tokio::sync::watch;
const INTERVAL: Duration = Duration::from_secs(3600);
/// (what, statement) pairs; each returns the number of deleted rows.
const STATEMENTS: [(&str, &str); 4] = [
const STATEMENTS: [(&str, &str); 6] = [
("sessions", "DELETE FROM sessions WHERE expires_at < now()"),
("auth_tokens", "DELETE FROM auth_tokens WHERE expires_at < now()"),
// Sent e-mails contain links with tokens; keep them a week for support.
@@ -18,6 +18,14 @@ const STATEMENTS: [(&str, &str); 4] = [
OR failed_at < now() - interval '30 days'",
),
("invites", "DELETE FROM synastry_invites WHERE accepted_at IS NULL AND expires_at < now() - interval '30 days'"),
// Unused invitations 30 days after they closed; accepted ones once the account is deleted.
(
"invitations",
"DELETE FROM invitations WHERE (accepted_at IS NULL \
AND least(coalesce(revoked_at, expires_at), expires_at) < now() - interval '30 days') \
OR (accepted_at IS NOT NULL AND accepted_by IS NULL)",
),
("prompt_previews", "DELETE FROM prompt_previews WHERE created_at < now() - interval '30 days'"),
];
pub async fn run_once(db: &PgPool) -> Result<Vec<(&'static str, u64)>, sqlx::Error> {
+1 -1
View File
@@ -83,7 +83,7 @@ pub async fn main(args: Vec<String>) -> anyhow::Result<()> {
prompt::Kind::Synastry => compact::synastry(&input["person1"], &input["person2"], &input),
_ => compact::natal(&input),
};
let built = prompt::build(args.kind, &args.language, &data);
let built = prompt::build(args.kind, &args.language, &data, None);
std::fs::create_dir_all(&args.out)?;
std::fs::write(
+13 -2
View File
@@ -8,8 +8,11 @@ use lettre::message::Mailbox;
pub struct Config {
pub database_url: String,
/// `smtp://host:port` (plain, e.g. Mailpit), `smtp://user:pass@host:587?tls=required`
/// (STARTTLS) or `smtps://...` (TLS). Unset: e-mails stay in the outbox.
/// (STARTTLS) or `smtps://...` (TLS). Without it, Amazon SES from the AWS
/// variables (see `ses.rs`). Neither: e-mails stay in the outbox.
pub smtp_url: Option<String>,
/// For the log: where the SMTP address came from (no secrets).
pub smtp_about: Option<String>,
/// Sender, e.g. `Sorsfonalak <noreply@sorsfonalak.hu>`.
pub mail_from: Mailbox,
/// Fallback polling interval; new e-mails are picked up at once via LISTEN/NOTIFY.
@@ -44,9 +47,17 @@ where
impl Config {
pub fn from_env() -> anyhow::Result<Self> {
let mail_from = var("MAIL_FROM").unwrap_or_else(|| "Sorsfonalak <noreply@sorsfonalak.local>".into());
let (smtp_url, smtp_about) = match var("SMTP_URL") {
Some(url) => (Some(url), None),
None => match crate::ses::smtp_url(|name| std::env::var(name).ok())? {
Some((url, about)) => (Some(url), Some(about)),
None => (None, None),
},
};
Ok(Self {
database_url: var("DATABASE_URL").context("DATABASE_URL is required")?,
smtp_url: var("SMTP_URL"),
smtp_url,
smtp_about,
mail_from: mail_from.parse().with_context(|| format!("invalid MAIL_FROM '{mail_from}'"))?,
poll_interval: Duration::from_secs(parsed("POLL_INTERVAL_SECS", 30)?),
max_email_attempts: parsed("MAX_EMAIL_ATTEMPTS", 8)?,
+48 -6
View File
@@ -6,6 +6,7 @@
use std::time::Duration;
use lettre::message::header::{Header, HeaderName, HeaderValue};
use lettre::message::{Mailbox, MultiPart};
use lettre::{AsyncSmtpTransport, AsyncTransport, Message, Tokio1Executor};
use serde_json::Value;
@@ -24,7 +25,8 @@ pub enum Mailer {
/// Collects messages instead of sending; fails for addresses listed in `fail`.
#[cfg(test)]
Memory {
sent: std::sync::Mutex<Vec<(String, Rendered)>>,
/// Recipient, rendered mail and the whole message as sent.
sent: std::sync::Mutex<Vec<(String, Rendered, String)>>,
fail: Vec<(String, bool)>,
},
}
@@ -58,12 +60,19 @@ impl Mailer {
Ok(Mailer::Smtp(transport))
}
async fn send(&self, from: &Mailbox, to: &str, mail: &Rendered) -> Result<(), SendError> {
async fn send(&self, id: Uuid, from: &Mailbox, to: &str, mail: &Rendered) -> Result<(), SendError> {
let to_mailbox: Mailbox = to.parse().map_err(SendError::permanent)?;
let message = Message::builder()
// A Message-ID on our own domain (lettre would use the container's
// host name, which spam filters dislike); the same on every retry.
let mut builder = Message::builder()
.message_id(Some(format!("<{id}@{}>", from.email.domain())))
.from(from.clone())
.to(to_mailbox)
.subject(&mail.subject)
.subject(&mail.subject);
if let Some(url) = &mail.unsubscribe_post_url {
builder = builder.header(ListUnsubscribe(url.clone())).header(ListUnsubscribePost);
}
let message = builder
.multipart(MultiPart::alternative_plain_html(mail.text.clone(), mail.html.clone()))
.map_err(SendError::permanent)?;
match self {
@@ -77,13 +86,46 @@ impl Mailer {
if let Some((_, permanent)) = fail.iter().find(|(addr, _)| addr == to) {
return Err(SendError { permanent: *permanent, message: "test failure".into() });
}
sent.lock().unwrap().push((to.to_owned(), mail.clone()));
let raw = String::from_utf8_lossy(&message.formatted()).into_owned();
sent.lock().unwrap().push((to.to_owned(), mail.clone(), raw));
Ok(())
}
}
}
}
/// `List-Unsubscribe: <url>`: mail clients show an unsubscribe button.
#[derive(Clone)]
struct ListUnsubscribe(String);
impl Header for ListUnsubscribe {
fn name() -> HeaderName {
HeaderName::new_from_ascii_str("List-Unsubscribe")
}
fn parse(s: &str) -> Result<Self, Box<dyn std::error::Error + Send + Sync>> {
Ok(Self(s.trim().trim_start_matches('<').trim_end_matches('>').to_owned()))
}
fn display(&self) -> HeaderValue {
HeaderValue::new(Self::name(), format!("<{}>", self.0))
}
}
/// `List-Unsubscribe-Post`: the button unsubscribes with one POST (RFC 8058).
#[derive(Clone)]
struct ListUnsubscribePost;
impl Header for ListUnsubscribePost {
fn name() -> HeaderName {
HeaderName::new_from_ascii_str("List-Unsubscribe-Post")
}
fn parse(_: &str) -> Result<Self, Box<dyn std::error::Error + Send + Sync>> {
Ok(Self)
}
fn display(&self) -> HeaderValue {
HeaderValue::new(Self::name(), "List-Unsubscribe=One-Click".into())
}
}
pub struct Delivery {
pub db: PgPool,
pub mailer: Mailer,
@@ -127,7 +169,7 @@ impl Delivery {
for row in &rows {
let attempts = row.attempts + 1;
let result = match templates::render(&row.template, &row.locale, &row.payload) {
Ok(mail) => self.mailer.send(&self.from, &row.to_email, &mail).await,
Ok(mail) => self.mailer.send(row.id, &self.from, &row.to_email, &mail).await,
Err(e) => Err(SendError::permanent(e)),
};
match result {
+7 -3
View File
@@ -15,7 +15,10 @@ mod cleanup;
mod compare;
mod config;
mod email;
mod templates;
mod ses;
mod templates {
pub use email_templates::*;
}
use std::sync::Arc;
use std::time::Duration;
@@ -91,10 +94,11 @@ async fn main() -> anyhow::Result<()> {
match &config.smtp_url {
Some(url) => {
let delivery = email::Delivery::new(pool.clone(), email::Mailer::smtp(url)?, &config);
tracing::info!(host = %email::smtp_host(url), "e-mail delivery enabled");
let via = config.smtp_about.clone().unwrap_or_else(|| "SMTP_URL".into());
tracing::info!(host = %email::smtp_host(url), via = %via, from = %config.mail_from, "e-mail delivery enabled");
jobs.spawn(email::run(delivery, config.poll_interval, stop.clone()));
}
None => tracing::warn!("SMTP_URL is not set: e-mails stay in the outbox"),
None => tracing::warn!("neither SMTP_URL nor SES credentials are set: e-mails stay in the outbox"),
}
match &config.openrouter_api_key {
Some(key) => {
+172
View File
@@ -0,0 +1,172 @@
//! Amazon SES over SMTP, configured from AWS-style variables when `SMTP_URL`
//! is not set (so the credentials can sit in `.env.secrets` as they are).
//!
//! Accepted (upper or lower case):
//! * `SES_SMTP_USERNAME` + `SES_SMTP_PASSWORD`: SMTP credentials from the SES console;
//! * or `AWS_ACCESS_KEY_ID` + `AWS_SECRET_ACCESS_KEY` (or another name from
//! `KEY_NAMES` / `SECRET_NAMES`, e.g. `ses_auth_key` + `ses_secret`): an IAM
//! key allowed `ses:SendRawEmail`; the SMTP
//! password is derived from it as AWS documents. If the "secret" already is
//! an SMTP password, it is used as it is.
//! * `SES_REGION` / `AWS_REGION` / `AWS_DEFAULT_REGION` (default `eu-central-1`),
//! `SES_SMTP_PORT` (default 2587, STARTTLS: DigitalOcean blocks 25, 465 and 587).
use base64::Engine;
use base64::engine::general_purpose::STANDARD;
use hmac::{Hmac, Mac};
use sha2::Sha256;
pub const DEFAULT_REGION: &str = "eu-central-1";
/// Names the access key id may have in a secrets file.
const KEY_NAMES: &[&str] = &[
"SES_ACCESS_KEY_ID",
"AWS_ACCESS_KEY_ID",
"SES_AUTH_KEY",
"SES_ACCESS_KEY",
"SES_KEY",
"AWS_AUTH_KEY",
"AWS_ACCESS_KEY",
"AUTH_KEY",
];
/// Names the secret access key may have.
const SECRET_NAMES: &[&str] = &[
"SES_SECRET_ACCESS_KEY",
"AWS_SECRET_ACCESS_KEY",
"SES_SECRET",
"SES_SECRET_KEY",
"SES_AUTH_SECRET",
"AWS_SECRET",
"AWS_SECRET_KEY",
"AUTH_SECRET",
];
const DEFAULT_PORT: u16 = 2587;
/// The first set variable among `names`, each tried in upper and lower case.
fn var(lookup: &impl Fn(&str) -> Option<String>, names: &[&str]) -> Option<(String, String)> {
names.iter().find_map(|name| {
[name.to_string(), name.to_lowercase()]
.into_iter()
.find_map(|n| lookup(&n).map(|v| v.trim().to_owned()).filter(|v| !v.is_empty()).map(|v| (n, v)))
})
}
/// The SES SMTP address and a description for the log (no secrets), if credentials are set.
pub fn smtp_url(lookup: impl Fn(&str) -> Option<String>) -> anyhow::Result<Option<(String, String)>> {
let region =
var(&lookup, &["SES_REGION", "AWS_REGION", "AWS_DEFAULT_REGION"]).map_or(DEFAULT_REGION.into(), |(_, v)| v);
if !region.chars().all(|c| c.is_ascii_alphanumeric() || c == '-') {
anyhow::bail!("invalid SES region '{region}'");
}
let port: u16 = match var(&lookup, &["SES_SMTP_PORT"]) {
Some((_, p)) => p.parse().map_err(|e| anyhow::anyhow!("invalid SES_SMTP_PORT '{p}': {e}"))?,
None => DEFAULT_PORT,
};
let smtp = var(&lookup, &["SES_SMTP_USERNAME", "SES_SMTP_USER"]).zip(var(&lookup, &["SES_SMTP_PASSWORD"]));
let (user, password, source) = if let Some(((name, user), (_, password))) = smtp {
(user, password, name)
} else {
let key = var(&lookup, KEY_NAMES);
let secret = var(&lookup, SECRET_NAMES);
match (key, secret) {
(Some((name, key)), Some((_, secret))) => {
let password = if is_smtp_password(&secret) { secret } else { smtp_password(&secret, &region) };
(key, password, name)
}
(None, None) => return Ok(None),
_ => anyhow::bail!("SES: both the access key id and the secret access key are needed"),
}
};
let url =
format!("smtp://{}:{}@email-smtp.{region}.amazonaws.com:{port}?tls=required", encode(&user), encode(&password));
Ok(Some((url, format!("Amazon SES {region}:{port}, credentials from {source}"))))
}
/// The SES SMTP password of an IAM secret access key (AWS docs, "Obtaining
/// Amazon SES SMTP credentials": signature version 4, `SendRawEmail`).
pub fn smtp_password(secret: &str, region: &str) -> String {
fn sign(key: &[u8], msg: &str) -> Vec<u8> {
let mut mac = Hmac::<Sha256>::new_from_slice(key).expect("HMAC takes any key length");
mac.update(msg.as_bytes());
mac.finalize().into_bytes().to_vec()
}
let mut signature = sign(format!("AWS4{secret}").as_bytes(), "11111111");
for part in [region, "ses", "aws4_request", "SendRawEmail"] {
signature = sign(&signature, part);
}
let mut bytes = vec![0x04];
bytes.extend(signature);
STANDARD.encode(bytes)
}
/// An SMTP password is a version byte (4) and a 32-byte signature, in base64;
/// an IAM secret key is 40 characters.
fn is_smtp_password(s: &str) -> bool {
s.len() == 44 && STANDARD.decode(s).is_ok_and(|b| b.len() == 33 && b[0] == 0x04)
}
/// Percent-encoding for the user and password part of a URL.
fn encode(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()
}
#[cfg(test)]
mod tests {
use std::collections::HashMap;
use super::*;
fn env(pairs: &[(&str, &str)]) -> impl Fn(&str) -> Option<String> {
let map: HashMap<String, String> = pairs.iter().map(|(k, v)| (k.to_string(), v.to_string())).collect();
move |k| map.get(k).cloned()
}
#[test]
fn derives_the_smtp_password() {
// The value of AWS's Python example (docs: "Obtaining Amazon SES SMTP credentials") for this made-up key.
let password = smtp_password("wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY", "eu-central-1");
assert_eq!(password, "BF0/eIJm0ruTHsSjOkRuOGzGF+zeSyE3aiRzrzUQ8LwG");
assert!(is_smtp_password(&password));
assert!(!is_smtp_password("wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"));
}
#[test]
fn url_from_variables() {
assert!(smtp_url(env(&[])).unwrap().is_none());
let (url, about) = smtp_url(env(&[
("aws_access_key_id", "AKIAEXAMPLE"),
("aws_secret_access_key", "BF0/eIJm0ruTHsSjOkRuOGzGF+zeSyE3aiRzrzUQ8LwG"),
]))
.unwrap()
.unwrap();
// already an SMTP password: kept, with + and / encoded
assert_eq!(
url,
"smtp://AKIAEXAMPLE:BF0%2FeIJm0ruTHsSjOkRuOGzGF%2BzeSyE3aiRzrzUQ8LwG@email-smtp.eu-central-1.amazonaws.com:2587?tls=required"
);
assert_eq!(about, "Amazon SES eu-central-1:2587, credentials from aws_access_key_id");
let (url, _) = smtp_url(env(&[
("SES_SMTP_USERNAME", "AKIA2"),
("SES_SMTP_PASSWORD", "a/b+c="),
("SES_REGION", "eu-west-1"),
]))
.unwrap()
.unwrap();
assert_eq!(url, "smtp://AKIA2:a%2Fb%2Bc%3D@email-smtp.eu-west-1.amazonaws.com:2587?tls=required");
assert!(smtp_url(env(&[("AWS_ACCESS_KEY_ID", "AKIA")])).is_err());
// other common names; a real secret key is turned into the SMTP password
let (url, about) =
smtp_url(env(&[("ses_auth_key", "AKIA3"), ("ses_secret", "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY")]))
.unwrap()
.unwrap();
assert!(
url.starts_with("smtp://AKIA3:BF0%2FeIJm0ruTHsSjOkRuOGzGF%2BzeSyE3aiRzrzUQ8LwG@email-smtp.eu-central-1.")
);
assert!(about.ends_with("from ses_auth_key"));
}
}
-197
View File
@@ -1,197 +0,0 @@
//! E-mail texts (Hungarian and English), as plain text and HTML.
//!
//! The payloads are written by the backend (`queue_email`); the validity
//! periods in the texts match the token lifetimes there.
use serde_json::Value;
#[derive(Debug, Clone, PartialEq)]
pub struct Rendered {
pub subject: String,
pub text: String,
pub html: String,
}
#[derive(Debug, PartialEq)]
pub enum TemplateError {
UnknownTemplate(String),
MissingField(&'static str),
}
impl std::fmt::Display for TemplateError {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
TemplateError::UnknownTemplate(t) => write!(f, "unknown e-mail template '{t}'"),
TemplateError::MissingField(field) => write!(f, "e-mail payload has no '{field}'"),
}
}
}
#[derive(Clone, Copy, PartialEq)]
enum Lang {
Hu,
En,
}
/// One e-mail: greeting, paragraphs, a button and a closing note.
struct Content {
subject: String,
greeting: String,
intro: String,
button: &'static str,
url: String,
note: &'static str,
}
pub fn render(template: &str, locale: &str, payload: &Value) -> Result<Rendered, TemplateError> {
let lang = if locale.eq_ignore_ascii_case("hu") { Lang::Hu } else { Lang::En };
let url = payload["url"].as_str().filter(|u| !u.is_empty()).ok_or(TemplateError::MissingField("url"))?.to_owned();
let greeting = |name: Option<String>| match (lang, name) {
(Lang::Hu, Some(n)) => format!("Szia {n}!"),
(Lang::Hu, None) => "Szia!".to_owned(),
(Lang::En, Some(n)) => format!("Hi {n},"),
(Lang::En, None) => "Hi,".to_owned(),
};
let content = match (template, lang) {
("verify_email", Lang::Hu) => Content {
subject: "Erősítsd meg az e-mail-címed".into(),
greeting: greeting(name(payload, "display_name")),
intro: "Köszönjük, hogy regisztráltál a Sorsfonalakon! Az alábbi gombbal erősítsd meg az e-mail-címed."
.into(),
button: "E-mail-cím megerősítése",
url,
note: "A link 3 napig érvényes. Ha nem te regisztráltál, nyugodtan hagyd figyelmen kívül ezt a levelet.",
},
("verify_email", Lang::En) => Content {
subject: "Confirm your e-mail address".into(),
greeting: greeting(name(payload, "display_name")),
intro: "Thanks for signing up for Sorsfonalak! Please confirm your e-mail address with the button below."
.into(),
button: "Confirm e-mail address",
url,
note: "The link is valid for 3 days. If you did not sign up, you can safely ignore this e-mail.",
},
("reset_password", Lang::Hu) => Content {
subject: "Új jelszó megadása".into(),
greeting: greeting(name(payload, "display_name")),
intro: "Jelszó-visszaállítást kértél a Sorsfonalak-fiókodhoz. Az alábbi gombbal adhatsz meg új jelszót."
.into(),
button: "Új jelszó megadása",
url,
note: "A link 1 óráig érvényes, és csak egyszer használható. Ha nem te kérted, hagyd figyelmen kívül ezt a levelet: a jelszavad nem változik.",
},
("reset_password", Lang::En) => Content {
subject: "Set a new password".into(),
greeting: greeting(name(payload, "display_name")),
intro:
"You asked to reset the password of your Sorsfonalak account. Use the button below to set a new one."
.into(),
button: "Set a new password",
url,
note: "The link is valid for 1 hour and can be used once. If you did not ask for this, ignore this e-mail: your password stays the same.",
},
("invite_accepted", Lang::Hu) => {
let who = name(payload, "invitee_name");
Content {
subject: match &who {
Some(n) => format!("{n} elfogadta a meghívásod"),
None => "Elfogadták a meghívásod".into(),
},
greeting: greeting(None),
intro: format!(
"{} elfogadta a „Mennyire illünk össze?” meghívásod, és elkészült a szinasztriátok.",
who.as_deref().unwrap_or("A meghívott")
),
button: "Szinasztria megnyitása",
url,
note: "A szinasztriát mindketten látjátok, de egymás születési adatait nem.",
}
}
("invite_accepted", Lang::En) => {
let who = name(payload, "invitee_name");
Content {
subject: match &who {
Some(n) => format!("{n} accepted your invitation"),
None => "Your invitation was accepted".into(),
},
greeting: greeting(None),
intro: format!(
"{} accepted your “How compatible are we?” invitation, and your synastry is ready.",
who.as_deref().unwrap_or("Your invitee")
),
button: "Open synastry",
url,
note: "You both see the synastry, but not each other's birth data.",
}
}
_ => return Err(TemplateError::UnknownTemplate(template.to_owned())),
};
Ok(content.render(lang))
}
/// A user-supplied name, safe for a subject line.
fn name(payload: &Value, field: &str) -> Option<String> {
let name: String = payload[field].as_str()?.chars().filter(|c| !c.is_control()).take(60).collect();
let name = name.trim();
(!name.is_empty()).then(|| name.to_owned())
}
fn escape(s: &str) -> String {
let mut out = String::with_capacity(s.len());
for c in s.chars() {
match c {
'&' => out.push_str("&amp;"),
'<' => out.push_str("&lt;"),
'>' => out.push_str("&gt;"),
'"' => out.push_str("&quot;"),
'\'' => out.push_str("&#39;"),
_ => out.push(c),
}
}
out
}
impl Content {
fn render(self, lang: Lang) -> Rendered {
let footer = match lang {
Lang::Hu => "Ezt a levelet a Sorsfonalak küldte.",
Lang::En => "This e-mail was sent by Sorsfonalak.",
};
let text = format!(
"{}\n\n{}\n\n{}:\n{}\n\n{}\n\n-- \nSorsfonalak\n",
self.greeting, self.intro, self.button, self.url, self.note
);
let html = format!(
r#"<!doctype html>
<html lang="{lang}">
<head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><title>{subject}</title></head>
<body style="margin:0;padding:0;background:#f4f1ea;font-family:Georgia,'Times New Roman',serif;color:#2a2620">
<table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="background:#f4f1ea;padding:32px 16px">
<tr><td align="center">
<table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="max-width:520px;background:#ffffff;border-radius:8px;padding:32px">
<tr><td style="font-size:20px;letter-spacing:2px;color:#9a7b3c;padding-bottom:24px">SORSFONALAK</td></tr>
<tr><td style="font-size:16px;line-height:1.6;padding-bottom:12px">{greeting}</td></tr>
<tr><td style="font-size:16px;line-height:1.6;padding-bottom:24px">{intro}</td></tr>
<tr><td style="padding-bottom:24px"><a href="{url}" style="display:inline-block;background:#9a7b3c;color:#ffffff;text-decoration:none;padding:12px 24px;border-radius:6px;font-size:16px">{button}</a></td></tr>
<tr><td style="font-size:14px;line-height:1.6;color:#6b645a;padding-bottom:16px">{note}</td></tr>
<tr><td style="font-size:12px;line-height:1.5;color:#9b948a;word-break:break-all">{url_text}</td></tr>
</table>
<p style="font-size:12px;color:#9b948a;max-width:520px">{footer}</p>
</td></tr>
</table>
</body>
</html>
"#,
lang = if lang == Lang::Hu { "hu" } else { "en" },
subject = escape(&self.subject),
greeting = escape(&self.greeting),
intro = escape(&self.intro),
url = escape(&self.url),
button = escape(self.button),
note = escape(self.note),
url_text = escape(&self.url),
footer = escape(footer),
);
Rendered { subject: self.subject, text, html }
}
}
+166 -6
View File
@@ -60,7 +60,7 @@ fn delivery(db: PgPool, fail: Vec<(&str, bool)>) -> Delivery {
fn sent(d: &Delivery) -> Vec<(String, String)> {
let Mailer::Memory { sent, .. } = &d.mailer else { unreachable!() };
sent.lock().unwrap().iter().map(|(to, m)| (to.clone(), m.subject.clone())).collect()
sent.lock().unwrap().iter().map(|(to, m, _)| (to.clone(), m.subject.clone())).collect()
}
async fn queue(db: &PgPool, to: &str, template: &str) -> Uuid {
@@ -123,6 +123,35 @@ async fn delivers_retries_and_gives_up(db: PgPool) {
assert_eq!(sent(&d).len(), 1);
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn invitation_headers_for_spam_filters(db: PgPool) {
let id = Uuid::now_v7();
sqlx::query(
"INSERT INTO email_outbox (id, to_email, template, locale, payload) VALUES ($1, $2, 'invitation', 'hu', $3)",
)
.bind(id)
.bind("guest@example.com")
.bind(json!({
"url": "https://example.com/meghivo/t",
"inviter_name": "Kata",
"message": null,
"expires_on": "2026-12-17",
"unsubscribe_url": "https://example.com/leiratkozas?token=t",
"unsubscribe_post_url": "https://example.com/api/v1/public/invitations/unsubscribe?token=t",
}))
.execute(&db)
.await
.unwrap();
let d = delivery(db.clone(), vec![]);
assert_eq!(d.deliver_due().await.unwrap(), 1);
let Mailer::Memory { sent, .. } = &d.mailer else { unreachable!() };
let raw = sent.lock().unwrap()[0].2.clone();
assert!(raw.contains(&format!("Message-ID: <{id}@example.com>")), "{raw}");
assert!(raw.contains("List-Unsubscribe: <https://example.com/api/v1/public/invitations/unsubscribe?token=t>"));
assert!(raw.contains("List-Unsubscribe-Post: List-Unsubscribe=One-Click"));
assert!(raw.contains("multipart/alternative") && raw.contains("text/plain") && raw.contains("text/html"));
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn concurrent_workers_do_not_send_twice(db: PgPool) {
for i in 0..15 {
@@ -175,7 +204,17 @@ async fn cleanup_removes_only_expired_data(db: PgPool) {
sqlx::query("UPDATE email_outbox SET sent_at = now() WHERE id = $1").bind(recent).execute(&db).await.unwrap();
let deleted = crate::cleanup::run_once(&db).await.unwrap();
assert_eq!(deleted, vec![("sessions", 1), ("auth_tokens", 0), ("emails", 1), ("invites", 0)]);
assert_eq!(
deleted,
vec![
("sessions", 1),
("auth_tokens", 0),
("emails", 1),
("invites", 0),
("invitations", 0),
("prompt_previews", 0)
]
);
let (left,): (Vec<Uuid>,) =
sqlx::query_as("SELECT array_agg(id ORDER BY id) FROM email_outbox").fetch_one(&db).await.unwrap();
assert_eq!(left, vec![recent, unsent]);
@@ -369,6 +408,107 @@ mod analyses {
}
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn uses_the_admin_edited_system_prompt(db: PgPool) {
let s = setup(&db).await;
let (revision,): (i64,) = sqlx::query_as(
"INSERT INTO prompt_revisions (kind, language, system) VALUES ('natal', 'hu', 'Saját szabályok.') RETURNING id",
)
.fetch_one(&db)
.await
.unwrap();
// a newer revision is not used: the analysis records the one it was requested with
sqlx::query("INSERT INTO prompt_revisions (kind, language, system) VALUES ('natal', 'hu', 'Újabb.')")
.execute(&db)
.await
.unwrap();
let id = request_analysis(&db, &s).await;
sqlx::query("UPDATE analyses SET prompt_version = $1 WHERE id = $2")
.bind(format!("v1-r{revision}"))
.bind(id)
.execute(&db)
.await
.unwrap();
let (fake, url) = fake_openrouter(vec![reply(&content(Kind::Natal))]).await;
assert!(run_once(&analyzer(&db, &url)).await);
assert_eq!(row(&db, id).await.0, "done");
let requests = fake.requests.lock().unwrap();
assert_eq!(requests[0]["messages"][0]["content"], "Saját szabályok.");
assert!(requests[0]["messages"][1]["content"].as_str().unwrap().contains("- personality: "));
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn prompt_previews_run_after_analyses(db: PgPool) {
let s = setup(&db).await;
let preview = Uuid::now_v7();
sqlx::query(
"INSERT INTO prompt_previews (id, kind, chart_id, language, model, system, created_by) \
VALUES ($1, 'summary', $2, 'hu', 'test/summary', 'Próba szabályok.', $3)",
)
.bind(preview)
.bind(s.chart)
.bind(s.user)
.execute(&db)
.await
.unwrap();
let analysis = request_analysis(&db, &s).await;
let (fake, url) = fake_openrouter(vec![
reply(&content(Kind::Natal)),
reply(&json!({"title": "Érzékeny mag", "summary": "Rövid összefoglaló szöveg."})),
(500, json!({})),
])
.await;
let a = analyzer(&db, &url);
// the analysis goes first; the preview only when nothing else is due
let job = a.claim().await.unwrap().expect("the analysis");
assert_eq!(job.id, analysis);
a.handle(job).await;
assert!(a.claim().await.unwrap().is_none());
let job = a.claim_preview().await.unwrap().expect("the preview");
a.handle_preview(job).await;
let (status, title, model, credits): (String, Option<String>, Option<String>, i64) = sqlx::query_as(
"SELECT status, content->>'title', model_used, \
(SELECT count(*) FROM credit_ledger WHERE user_id = p.created_by) \
FROM prompt_previews p WHERE id = $1",
)
.bind(preview)
.fetch_one(&db)
.await
.unwrap();
assert_eq!((status.as_str(), title.is_some(), model.as_deref()), ("done", true, Some("test/model-2026")));
let before = credits;
{
let requests = fake.requests.lock().unwrap();
assert_eq!(requests[1]["model"], "test/summary");
assert_eq!(requests[1]["messages"][0]["content"], "Próba szabályok.");
}
// one attempt only: an error fails the preview at once, without refunds
let second = Uuid::now_v7();
sqlx::query(
"INSERT INTO prompt_previews (id, kind, chart_id, language, model, system, created_by) \
VALUES ($1, 'natal', $2, 'hu', 'test/model', 'Másik.', $3)",
)
.bind(second)
.bind(s.chart)
.bind(s.user)
.execute(&db)
.await
.unwrap();
a.handle_preview(a.claim_preview().await.unwrap().unwrap()).await;
let (status, error, credits): (String, Option<String>, i64) = sqlx::query_as(
"SELECT status, error, (SELECT count(*) FROM credit_ledger WHERE user_id = p.created_by) \
FROM prompt_previews p WHERE id = $1",
)
.bind(second)
.fetch_one(&db)
.await
.unwrap();
assert_eq!((status.as_str(), error.is_some(), credits), ("failed", true, before));
assert!(a.claim_preview().await.unwrap().is_none());
}
#[sqlx::test(migrator = "db::MIGRATOR")]
async fn retries_bad_answers_then_fails_and_refunds(db: PgPool) {
let s = setup(&db).await;
@@ -463,11 +603,31 @@ mod analyses {
assert!(run_once(&a).await);
assert_eq!(row(&db, id).await.0, "done");
{
let requests = fake.requests.lock().unwrap();
let user = requests[0]["messages"][1]["content"].as_str().unwrap();
assert!(user.starts_with("Chart data:\n\nSYNASTRY") && user.contains("- attraction: "));
assert!(requests[0]["messages"][0]["content"].as_str().unwrap().contains("Write in English."));
assert!(!user.contains("Szeged") && !user.contains("Pécs"));
}
// a prompt test run on the comparison
sqlx::query(
"INSERT INTO prompt_previews (id, kind, synastry_id, language, model, system, created_by) \
VALUES ($1, 'synastry', $2, 'hu', 'test/model', 'Kapcsolati próba.', $3)",
)
.bind(Uuid::now_v7())
.bind(synastry)
.bind(s.user)
.execute(&db)
.await
.unwrap();
a.handle_preview(a.claim_preview().await.unwrap().expect("the preview")).await;
let (status,): (String,) = sqlx::query_as("SELECT status FROM prompt_previews").fetch_one(&db).await.unwrap();
assert_eq!(status, "done");
let requests = fake.requests.lock().unwrap();
let user = requests[0]["messages"][1]["content"].as_str().unwrap();
assert!(user.starts_with("Chart data:\n\nSYNASTRY") && user.contains("- attraction: "));
assert!(requests[0]["messages"][0]["content"].as_str().unwrap().contains("Write in English."));
assert!(!user.contains("Szeged") && !user.contains("Pécs"));
assert_eq!(requests[1]["messages"][0]["content"], "Kapcsolati próba.");
assert!(requests[1]["messages"][1]["content"].as_str().unwrap().contains("SYNASTRY"));
}
#[test]