Main #20
@@ -0,0 +1,19 @@
|
|||||||
|
-- Sharing pays in two steps: the first visit of a shared link earns a
|
||||||
|
-- question (`share_reward`, see shares.rs), and someone who signs up from a
|
||||||
|
-- shared link and makes their own chart earns the sharer a natal analysis
|
||||||
|
-- (`referral_reward`, at most three per user).
|
||||||
|
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',
|
||||||
|
'question', 'share_reward', 'referral_reward'));
|
||||||
|
|
||||||
|
-- Who came through whose shared link (one row per new user).
|
||||||
|
CREATE TABLE referrals (
|
||||||
|
user_id uuid PRIMARY KEY REFERENCES users (id) ON DELETE CASCADE,
|
||||||
|
referrer_id uuid NOT NULL REFERENCES users (id) ON DELETE CASCADE,
|
||||||
|
share_id uuid REFERENCES shares (id) ON DELETE SET NULL,
|
||||||
|
created_at timestamptz NOT NULL DEFAULT now(),
|
||||||
|
-- Set when the new user made their own chart (rewarded or over the limit).
|
||||||
|
rewarded_at timestamptz
|
||||||
|
);
|
||||||
|
CREATE INDEX referrals_referrer_idx ON referrals (referrer_id);
|
||||||
@@ -90,6 +90,8 @@ services:
|
|||||||
MOCK_PAYMENTS: ${MOCK_PAYMENTS:-false}
|
MOCK_PAYMENTS: ${MOCK_PAYMENTS:-false}
|
||||||
# Users inviting others ("Meghívom"): shown but off until the launch.
|
# Users inviting others ("Meghívom"): shown but off until the launch.
|
||||||
USER_INVITES: ${USER_INVITES:-false}
|
USER_INVITES: ${USER_INVITES:-false}
|
||||||
|
# A new user from a shared link earns the sharer an analysis: off until sign-up opens.
|
||||||
|
REFERRAL_REWARDS: ${REFERRAL_REWARDS:-false}
|
||||||
FREE_PERSON_SLOTS: ${FREE_PERSON_SLOTS:-0}
|
FREE_PERSON_SLOTS: ${FREE_PERSON_SLOTS:-0}
|
||||||
# invite: new accounts need an invitation (admin page "Meghívók"); open: anyone.
|
# invite: new accounts need an invitation (admin page "Meghívók"); open: anyone.
|
||||||
SIGNUP_MODE: ${SIGNUP_MODE:-invite}
|
SIGNUP_MODE: ${SIGNUP_MODE:-invite}
|
||||||
|
|||||||
+14
-6
@@ -6,20 +6,28 @@ A képletoldalon, a rövid összefoglaló alatt van a **Megosztás** gomb. Ez eg
|
|||||||
- **Visszavonás:** a „Link visszavonása” gomb után az oldal és a kép is 404-et ad.
|
- **Visszavonás:** a „Link visszavonása” gomb után az oldal és a kép is 404-et ad.
|
||||||
- **Keresők:** az oldal `noindex`, a keresők nem listázzák.
|
- **Keresők:** az oldal `noindex`, a keresők nem listázzák.
|
||||||
|
|
||||||
## Ajándék elemzés a megosztásért
|
## Jutalom a megosztásért
|
||||||
|
|
||||||
**Mit kap:** felhasználónként **egyszer** +1 képletelemzést, amikor valaki más először megnyitja a megosztott linkjét. A gomb apró betűvel kiírja: „+1 ajándék elemzés jár érte, ha valaki megnézi”. Ha már megkapta, ezt: „Az ajándék elemzést már megkaptad”.
|
Egy kattintás önmagában semmit nem bizonyít, ezért kétféle jutalom van:
|
||||||
|
|
||||||
**Hogyan számolunk:**
|
- **Ajándék kérdés (megtekintésért):** felhasználónként **egyszer** +1 kérdés, amikor valaki más először megnyitja a megosztott linkjét. A gomb apró betűvel: „+1 ajándék kérdés, ha valaki megnézi”.
|
||||||
|
- **Ajándék képletelemzés (új felhasználóért):** +1 képletelemzés, ha valaki a megosztott linkről regisztrál és elkészíti a saját képletét. Felhasználónként legfeljebb 3 (`REFERRAL_LIMIT`). Az élesítésig ki van kapcsolva (`REFERRAL_REWARDS=false`), mert meghívásos regisztrációnál a linkről úgysem lehet regisztrálni.
|
||||||
|
|
||||||
- **A böngésző jelez.** A látogatást a megosztott oldal betöltése után maga a látogató böngészője jelzi (`POST /v1/public/shares/{slug}/visit`). Az előnézet-robotok nem futtatják az oldal szkriptjét, így ők nem számítanak.
|
**Megtekintés számolása:**
|
||||||
|
|
||||||
|
- **A böngésző jelez:** a megosztott oldal betöltése után maga a látogató böngészője jelzi a látogatást (`POST /v1/public/shares/{slug}/visit`). Az előnézet-robotok nem futtatják az oldal szkriptjét, így ők nem számítanak.
|
||||||
- **Ami nem számít:**
|
- **Ami nem számít:**
|
||||||
- robotnak látszó vagy hiányzó böngészőazonosító;
|
- robotnak látszó vagy hiányzó böngészőazonosító;
|
||||||
- a belépett tulajdonos;
|
- a belépett tulajdonos;
|
||||||
- látogatás arról az IP-címről, ahonnan a linket létrehozták. A cím a sluggal sózva, hash-ként van tárolva (`shares.owner_ip_hash`).
|
- látogatás arról az IP-címről, ahonnan a linket létrehozták. A cím a sluggal sózva, hash-ként van tárolva (`shares.owner_ip_hash`).
|
||||||
- **Számláló:** a `shares.view_count` csak ezeket a valódi látogatásokat számolja.
|
- **Számláló:** a `shares.view_count` csak ezeket a valódi látogatásokat számolja.
|
||||||
- **Jutalom egyszer:** a `credit_ledger` `share_reward` sora egyedi indexszel felhasználónként csak egyszer jöhet létre (`credit_ledger_share_reward_once`).
|
- **Jutalom egyszer:** a `share_reward` sor egyedi indexszel felhasználónként egyszer jöhet létre.
|
||||||
- **`/v1/me`:** a `share_reward_granted` jelzi, ha már megkapta.
|
|
||||||
|
**Új felhasználó:**
|
||||||
|
|
||||||
|
- **Megjegyzés:** a megosztott oldal a böngészőben megjegyzi a link kódját (`localStorage` `sf_ref`). A Google-regisztráció elküldi (`referral`), és a backend a `referrals` táblába írja, hogy kit ki hozott. Saját link, visszavont link vagy kikapcsolt jutalom esetén nem írja be.
|
||||||
|
- **Jutalom:** amikor az új felhasználó elkészíti a saját képletét, a megosztó +1 képletelemzést kap (`referral_reward`), ha még nem érte el a hármat. Új felhasználónként egyszer.
|
||||||
|
- **`/v1/me`:** a `share_reward_granted` és a `referral_rewards` (`{earned, limit}`) mezők mutatják az állapotot.
|
||||||
|
|
||||||
## Robotok
|
## Robotok
|
||||||
|
|
||||||
|
|||||||
@@ -49,6 +49,10 @@ pub struct Config {
|
|||||||
/// compatible are we?" links, which also let the invitee sign up). Off
|
/// compatible are we?" links, which also let the invitee sign up). Off
|
||||||
/// until the launch; admins may always.
|
/// until the launch; admins may always.
|
||||||
pub user_invites: bool,
|
pub user_invites: bool,
|
||||||
|
/// `REFERRAL_REWARDS` (default `false`): someone who signs up from a
|
||||||
|
/// shared link and makes their own chart earns the sharer a natal
|
||||||
|
/// analysis (at most three). Off until sign-up opens.
|
||||||
|
pub referral_rewards: bool,
|
||||||
/// `GOOGLE_CLIENT_IDS`: comma-separated OAuth client ids accepted as the
|
/// `GOOGLE_CLIENT_IDS`: comma-separated OAuth client ids accepted as the
|
||||||
/// ID token audience; empty disables Google login.
|
/// ID token audience; empty disables Google login.
|
||||||
pub google_client_ids: Vec<String>,
|
pub google_client_ids: Vec<String>,
|
||||||
@@ -124,6 +128,7 @@ impl Config {
|
|||||||
password_login: parsed("PASSWORD_LOGIN", false)?,
|
password_login: parsed("PASSWORD_LOGIN", false)?,
|
||||||
mock_payments: parsed("MOCK_PAYMENTS", false)?,
|
mock_payments: parsed("MOCK_PAYMENTS", false)?,
|
||||||
user_invites: parsed("USER_INVITES", false)?,
|
user_invites: parsed("USER_INVITES", false)?,
|
||||||
|
referral_rewards: parsed("REFERRAL_REWARDS", false)?,
|
||||||
google_client_ids: list("GOOGLE_CLIENT_IDS"),
|
google_client_ids: list("GOOGLE_CLIENT_IDS"),
|
||||||
google_jwks_url: var("GOOGLE_JWKS_URL")
|
google_jwks_url: var("GOOGLE_JWKS_URL")
|
||||||
.unwrap_or_else(|| "https://www.googleapis.com/oauth2/v3/certs".into()),
|
.unwrap_or_else(|| "https://www.googleapis.com/oauth2/v3/certs".into()),
|
||||||
@@ -162,6 +167,7 @@ impl Config {
|
|||||||
password_login: true,
|
password_login: true,
|
||||||
mock_payments: true,
|
mock_payments: true,
|
||||||
user_invites: true,
|
user_invites: true,
|
||||||
|
referral_rewards: true,
|
||||||
google_client_ids: vec!["test-client.apps.googleusercontent.com".into()],
|
google_client_ids: vec!["test-client.apps.googleusercontent.com".into()],
|
||||||
google_jwks_url,
|
google_jwks_url,
|
||||||
bootstrap_admin_emails: vec!["admin@example.com".into()],
|
bootstrap_admin_emails: vec!["admin@example.com".into()],
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ pub async fn me(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
|
|||||||
let persons = crate::persons::slots(&mut conn, &auth, state.config.free_person_slots).await?;
|
let persons = crate::persons::slots(&mut conn, &auth, state.config.free_person_slots).await?;
|
||||||
let package = crate::packages::current(&mut conn, auth.id()).await?;
|
let package = crate::packages::current(&mut conn, auth.id()).await?;
|
||||||
let share_reward = super::shares::reward_granted(&state.db, auth.id()).await?;
|
let share_reward = super::shares::reward_granted(&state.db, auth.id()).await?;
|
||||||
|
let referrals = super::shares::referral_rewards(&mut conn, auth.id()).await?;
|
||||||
Ok(Json(json!({
|
Ok(Json(json!({
|
||||||
"user": UserView::from(&auth.user),
|
"user": UserView::from(&auth.user),
|
||||||
"providers": providers.into_iter().map(|(p,)| p).collect::<Vec<_>>(),
|
"providers": providers.into_iter().map(|(p,)| p).collect::<Vec<_>>(),
|
||||||
@@ -42,8 +43,10 @@ pub async fn me(State(state): St, auth: AuthUser) -> ApiResult<Json<Value>> {
|
|||||||
"birth_change": birth_change,
|
"birth_change": birth_change,
|
||||||
"persons": persons.view(),
|
"persons": persons.view(),
|
||||||
"package": package.map(|(p, since)| json!({ "id": p.id, "name": p.name, "since": rfc3339(since) })),
|
"package": package.map(|(p, since)| json!({ "id": p.id, "name": p.name, "since": rfc3339(since) })),
|
||||||
// The free analysis for a shared link is used up (once per user).
|
// The free question for a shared link is used up (once per user).
|
||||||
"share_reward_granted": share_reward,
|
"share_reward_granted": share_reward,
|
||||||
|
// Natal analyses earned by bringing new users, and how many can be.
|
||||||
|
"referral_rewards": { "earned": referrals, "limit": super::shares::REFERRAL_LIMIT },
|
||||||
})))
|
})))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -170,6 +170,8 @@ pub struct RegisterRequest {
|
|||||||
locale: Option<String>,
|
locale: Option<String>,
|
||||||
/// The invitation link's token, while sign-up needs an invitation.
|
/// The invitation link's token, while sign-up needs an invitation.
|
||||||
invite_token: Option<String>,
|
invite_token: Option<String>,
|
||||||
|
/// The slug of the shared link the visitor came from.
|
||||||
|
referral: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Password endpoints answer 403 while `PASSWORD_LOGIN` is off.
|
/// Password endpoints answer 403 while `PASSWORD_LOGIN` is off.
|
||||||
@@ -224,6 +226,7 @@ pub async fn register(
|
|||||||
state.config.free_person_slots,
|
state.config.free_person_slots,
|
||||||
)
|
)
|
||||||
.await?;
|
.await?;
|
||||||
|
super::shares::record_referral(&mut tx, state.config.referral_rewards, user_id, req.referral.as_deref()).await?;
|
||||||
let mut user = load_user(&mut tx, user_id).await?;
|
let mut user = load_user(&mut tx, user_id).await?;
|
||||||
apply_bootstrap_admin(&state, &mut tx, &mut user).await?;
|
apply_bootstrap_admin(&state, &mut tx, &mut user).await?;
|
||||||
queue_verification(&state, &mut tx, &user).await?;
|
queue_verification(&state, &mut tx, &user).await?;
|
||||||
@@ -291,6 +294,8 @@ pub struct GoogleRequest {
|
|||||||
id_token: String,
|
id_token: String,
|
||||||
/// The invitation link's token, while sign-up needs an invitation.
|
/// The invitation link's token, while sign-up needs an invitation.
|
||||||
invite_token: Option<String>,
|
invite_token: Option<String>,
|
||||||
|
/// The slug of the shared link the visitor came from.
|
||||||
|
referral: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Logs in with Google. An unknown Google account is linked to the existing
|
/// Logs in with Google. An unknown Google account is linked to the existing
|
||||||
@@ -362,6 +367,8 @@ pub async fn google(
|
|||||||
state.config.free_person_slots,
|
state.config.free_person_slots,
|
||||||
)
|
)
|
||||||
.await?;
|
.await?;
|
||||||
|
super::shares::record_referral(&mut tx, state.config.referral_rewards, id, req.referral.as_deref())
|
||||||
|
.await?;
|
||||||
(id, true)
|
(id, true)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -184,6 +184,7 @@ pub async fn create(
|
|||||||
birth_changes::record(&mut tx, &auth, row.id).await?;
|
birth_changes::record(&mut tx, &auth, row.id).await?;
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
queue_summary(&state, &auth, &row).await;
|
queue_summary(&state, &auth, &row).await;
|
||||||
|
super::shares::reward_referral(&state, auth.id()).await?;
|
||||||
return Ok((StatusCode::OK, Json(row.owner_view())));
|
return Ok((StatusCode::OK, Json(row.owner_view())));
|
||||||
}
|
}
|
||||||
queue_summary(&state, &auth, &chart).await;
|
queue_summary(&state, &auth, &chart).await;
|
||||||
@@ -231,6 +232,9 @@ pub async fn create(
|
|||||||
}
|
}
|
||||||
tx.commit().await?;
|
tx.commit().await?;
|
||||||
queue_summary(&state, &auth, &row).await;
|
queue_summary(&state, &auth, &row).await;
|
||||||
|
if row.is_primary {
|
||||||
|
super::shares::reward_referral(&state, auth.id()).await?;
|
||||||
|
}
|
||||||
Ok((StatusCode::CREATED, Json(row.owner_view())))
|
Ok((StatusCode::CREATED, Json(row.owner_view())))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -163,6 +163,7 @@ async fn public_config(State(state): St) -> Json<Value> {
|
|||||||
"password_login": c.password_login,
|
"password_login": c.password_login,
|
||||||
"mock_payments": c.mock_payments,
|
"mock_payments": c.mock_payments,
|
||||||
"user_invites": c.user_invites,
|
"user_invites": c.user_invites,
|
||||||
|
"referral_rewards": c.referral_rewards,
|
||||||
"signup_mode": c.signup_mode.as_str(),
|
"signup_mode": c.signup_mode.as_str(),
|
||||||
"password_min_length": crate::auth::MIN_PASSWORD_LEN,
|
"password_min_length": crate::auth::MIN_PASSWORD_LEN,
|
||||||
}))
|
}))
|
||||||
|
|||||||
@@ -9,8 +9,10 @@
|
|||||||
//! share page reports a visit from the visitor's browser
|
//! share page reports a visit from the visitor's browser
|
||||||
//! (`POST /v1/public/shares/{slug}/visit`): it is counted unless it comes
|
//! (`POST /v1/public/shares/{slug}/visit`): it is counted unless it comes
|
||||||
//! from a robot or from the sharer (logged in, or from the address the link
|
//! from a robot or from the sharer (logged in, or from the address the link
|
||||||
//! was made at). The sharer's first such visit earns one free natal analysis,
|
//! was made at). The sharer's first such visit earns one free question, once
|
||||||
//! once per user.
|
//! per user: a click proves little. A natal analysis is earned by bringing a
|
||||||
|
//! new user (`REFERRAL_REWARDS`): someone who signs up from a shared link and
|
||||||
|
//! makes their own chart, at most [`REFERRAL_LIMIT`] times.
|
||||||
|
|
||||||
use axum::Json;
|
use axum::Json;
|
||||||
use axum::extract::{Path, State};
|
use axum::extract::{Path, State};
|
||||||
@@ -332,7 +334,7 @@ pub async fn visit(
|
|||||||
sqlx::query("UPDATE shares SET view_count = view_count + 1 WHERE id = $1").bind(share.id).execute(&mut *tx).await?;
|
sqlx::query("UPDATE shares SET view_count = view_count + 1 WHERE id = $1").bind(share.id).execute(&mut *tx).await?;
|
||||||
let rewarded = sqlx::query(
|
let rewarded = sqlx::query(
|
||||||
"INSERT INTO credit_ledger (id, user_id, unit, delta, reason, note) \
|
"INSERT INTO credit_ledger (id, user_id, unit, delta, reason, note) \
|
||||||
VALUES ($1, $2, 'natal', 1, 'share_reward', $3) ON CONFLICT DO NOTHING",
|
VALUES ($1, $2, 'question', 1, 'share_reward', $3) ON CONFLICT DO NOTHING",
|
||||||
)
|
)
|
||||||
.bind(Uuid::now_v7())
|
.bind(Uuid::now_v7())
|
||||||
.bind(share.owner_id)
|
.bind(share.owner_id)
|
||||||
@@ -348,6 +350,72 @@ pub async fn visit(
|
|||||||
Ok(Json(json!({ "counted": true })))
|
Ok(Json(json!({ "counted": true })))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Natal analyses a user can earn by bringing new users through shared links.
|
||||||
|
pub const REFERRAL_LIMIT: i64 = 3;
|
||||||
|
|
||||||
|
/// A new user came from a shared link (`slug`): remembered for the reward,
|
||||||
|
/// unless rewards are off, the link is unknown or revoked, or it is their own.
|
||||||
|
pub(super) async fn record_referral(
|
||||||
|
conn: &mut sqlx::PgConnection,
|
||||||
|
enabled: bool,
|
||||||
|
user_id: Uuid,
|
||||||
|
slug: Option<&str>,
|
||||||
|
) -> Result<(), sqlx::Error> {
|
||||||
|
let Some(slug) = slug.map(str::trim).filter(|s| enabled && !s.is_empty()) else {
|
||||||
|
return Ok(());
|
||||||
|
};
|
||||||
|
sqlx::query(
|
||||||
|
"INSERT INTO referrals (user_id, referrer_id, share_id) \
|
||||||
|
SELECT $1, owner_id, id FROM shares WHERE slug = $2 AND revoked_at IS NULL AND owner_id <> $1 \
|
||||||
|
ON CONFLICT DO NOTHING",
|
||||||
|
)
|
||||||
|
.bind(user_id)
|
||||||
|
.bind(slug)
|
||||||
|
.execute(conn)
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The new user made their own chart: the sharer who brought them gets a
|
||||||
|
/// natal analysis, while under the limit. Runs once per new user.
|
||||||
|
pub(super) async fn reward_referral(state: &crate::AppState, user_id: Uuid) -> Result<(), ApiError> {
|
||||||
|
if !state.config.referral_rewards {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let mut tx = state.db.begin().await?;
|
||||||
|
let referrer: Option<Uuid> =
|
||||||
|
sqlx::query_scalar("SELECT referrer_id FROM referrals WHERE user_id = $1 AND rewarded_at IS NULL FOR UPDATE")
|
||||||
|
.bind(user_id)
|
||||||
|
.fetch_optional(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
let Some(referrer) = referrer else { return Ok(()) };
|
||||||
|
sqlx::query("SELECT id FROM users WHERE id = $1 FOR UPDATE").bind(referrer).execute(&mut *tx).await?;
|
||||||
|
let earned = referral_rewards(&mut tx, referrer).await?;
|
||||||
|
if earned < REFERRAL_LIMIT {
|
||||||
|
sqlx::query(
|
||||||
|
"INSERT INTO credit_ledger (id, user_id, unit, delta, reason, note) \
|
||||||
|
VALUES ($1, $2, 'natal', 1, 'referral_reward', $3)",
|
||||||
|
)
|
||||||
|
.bind(Uuid::now_v7())
|
||||||
|
.bind(referrer)
|
||||||
|
.bind(format!("new user {user_id} from a shared link"))
|
||||||
|
.execute(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
tracing::info!(referrer = %referrer, user = %user_id, "referral reward granted");
|
||||||
|
}
|
||||||
|
sqlx::query("UPDATE referrals SET rewarded_at = now() WHERE user_id = $1").bind(user_id).execute(&mut *tx).await?;
|
||||||
|
tx.commit().await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Natal analyses the user has earned by bringing new users.
|
||||||
|
pub async fn referral_rewards(conn: &mut sqlx::PgConnection, user_id: Uuid) -> Result<i64, sqlx::Error> {
|
||||||
|
sqlx::query_scalar("SELECT count(*) FROM credit_ledger WHERE user_id = $1 AND reason = 'referral_reward'")
|
||||||
|
.bind(user_id)
|
||||||
|
.fetch_one(conn)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
/// Whether the user has already received the reward for sharing.
|
/// Whether the user has already received the reward for sharing.
|
||||||
pub async fn reward_granted(db: &PgPool, user_id: Uuid) -> Result<bool, sqlx::Error> {
|
pub async fn reward_granted(db: &PgPool, user_id: Uuid) -> Result<bool, sqlx::Error> {
|
||||||
sqlx::query_scalar("SELECT EXISTS (SELECT 1 FROM credit_ledger WHERE user_id = $1 AND reason = 'share_reward')")
|
sqlx::query_scalar("SELECT EXISTS (SELECT 1 FROM credit_ledger WHERE user_id = $1 AND reason = 'share_reward')")
|
||||||
|
|||||||
@@ -801,7 +801,7 @@ const PUBLIC_ROUTES: [&str; 15] = [
|
|||||||
];
|
];
|
||||||
|
|
||||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||||
async fn a_visit_by_someone_else_earns_one_analysis_once(pool: PgPool) {
|
async fn a_visit_by_someone_else_earns_one_question_once(pool: PgPool) {
|
||||||
let app = TestApp::new(pool).await;
|
let app = TestApp::new(pool).await;
|
||||||
let anna = app.register("anna@example.com", "Anna").await;
|
let anna = app.register("anna@example.com", "Anna").await;
|
||||||
let chart = app.chart(&anna, "Saját", true, "1990-03-15").await;
|
let chart = app.chart(&anna, "Saját", true, "1990-03-15").await;
|
||||||
@@ -812,7 +812,7 @@ async fn a_visit_by_someone_else_earns_one_analysis_once(pool: PgPool) {
|
|||||||
let visit = format!("/v1/public/shares/{}/visit", r.body["slug"].as_str().unwrap());
|
let visit = format!("/v1/public/shares/{}/visit", r.body["slug"].as_str().unwrap());
|
||||||
let browser = ("user-agent", "Mozilla/5.0 (iPhone; CPU iPhone OS 18_0 like Mac OS X) Mobile/15E148");
|
let browser = ("user-agent", "Mozilla/5.0 (iPhone; CPU iPhone OS 18_0 like Mac OS X) Mobile/15E148");
|
||||||
let me = || async { app.get("/v1/me", Some(&anna)).await.body };
|
let me = || async { app.get("/v1/me", Some(&anna)).await.body };
|
||||||
let before = me().await["analyses_left"]["natal"].as_i64().unwrap();
|
let before = me().await["analyses_left"]["question"].as_i64().unwrap();
|
||||||
|
|
||||||
// robots, a missing user agent, the sharer's address and the sharer do not count
|
// robots, a missing user agent, the sharer's address and the sharer do not count
|
||||||
let elsewhere = ("x-forwarded-for", "198.51.100.1, 172.70.1.1");
|
let elsewhere = ("x-forwarded-for", "198.51.100.1, 172.70.1.1");
|
||||||
@@ -826,7 +826,10 @@ async fn a_visit_by_someone_else_earns_one_analysis_once(pool: PgPool) {
|
|||||||
assert_eq!((r.status, &r.body["counted"]), (StatusCode::OK, &json!(false)), "{headers:?}");
|
assert_eq!((r.status, &r.body["counted"]), (StatusCode::OK, &json!(false)), "{headers:?}");
|
||||||
}
|
}
|
||||||
let body = me().await;
|
let body = me().await;
|
||||||
assert_eq!((body["analyses_left"]["natal"].as_i64(), &body["share_reward_granted"]), (Some(before), &json!(false)));
|
assert_eq!(
|
||||||
|
(body["analyses_left"]["question"].as_i64(), &body["share_reward_granted"]),
|
||||||
|
(Some(before), &json!(false))
|
||||||
|
);
|
||||||
// reading the share counts nothing either
|
// reading the share counts nothing either
|
||||||
app.get(&visit.replace("/visit", ""), None).await;
|
app.get(&visit.replace("/visit", ""), None).await;
|
||||||
|
|
||||||
@@ -837,7 +840,7 @@ async fn a_visit_by_someone_else_earns_one_analysis_once(pool: PgPool) {
|
|||||||
}
|
}
|
||||||
let body = me().await;
|
let body = me().await;
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
(body["analyses_left"]["natal"].as_i64(), &body["share_reward_granted"]),
|
(body["analyses_left"]["question"].as_i64(), &body["share_reward_granted"]),
|
||||||
(Some(before + 1), &json!(true))
|
(Some(before + 1), &json!(true))
|
||||||
);
|
);
|
||||||
let r = app.get("/v1/shares", Some(&anna)).await;
|
let r = app.get("/v1/shares", Some(&anna)).await;
|
||||||
@@ -848,7 +851,7 @@ async fn a_visit_by_someone_else_earns_one_analysis_once(pool: PgPool) {
|
|||||||
app.post("/v1/shares", Some(&anna), json!({"kind": "chart", "target_id": chart["id"], "title": "Új"})).await;
|
app.post("/v1/shares", Some(&anna), json!({"kind": "chart", "target_id": chart["id"], "title": "Új"})).await;
|
||||||
let other = format!("/v1/public/shares/{}/visit", r.body["slug"].as_str().unwrap());
|
let other = format!("/v1/public/shares/{}/visit", r.body["slug"].as_str().unwrap());
|
||||||
app.call_with("POST", &other, None, None, &[browser, elsewhere]).await;
|
app.call_with("POST", &other, None, None, &[browser, elsewhere]).await;
|
||||||
assert_eq!(me().await["analyses_left"]["natal"].as_i64(), Some(before + 1));
|
assert_eq!(me().await["analyses_left"]["question"].as_i64(), Some(before + 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[sqlx::test(migrator = "db::MIGRATOR")]
|
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||||
@@ -2137,3 +2140,70 @@ async fn user_invitations_wait_for_the_launch(pool: PgPool) {
|
|||||||
app.chart(&admin, "Saját", true, "1980-01-01").await;
|
app.chart(&admin, "Saját", true, "1980-01-01").await;
|
||||||
assert_eq!(app.post("/v1/invites", Some(&admin), json!({})).await.status, StatusCode::CREATED);
|
assert_eq!(app.post("/v1/invites", Some(&admin), json!({})).await.status, StatusCode::CREATED);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[sqlx::test(migrator = "db::MIGRATOR")]
|
||||||
|
async fn a_new_user_from_a_shared_link_earns_an_analysis(pool: PgPool) {
|
||||||
|
let app = TestApp::new(pool.clone()).await;
|
||||||
|
let anna = app.register("anna@example.com", "Anna").await;
|
||||||
|
let chart = app.chart(&anna, "Saját", true, "1990-03-15").await;
|
||||||
|
let r = app.post("/v1/shares", Some(&anna), json!({"kind": "chart", "target_id": chart["id"]})).await;
|
||||||
|
let slug = r.body["slug"].as_str().unwrap().to_string();
|
||||||
|
let natal = |token: String| {
|
||||||
|
let app = &app;
|
||||||
|
async move { app.get("/v1/me", Some(&token)).await.body["analyses_left"]["natal"].as_i64().unwrap() }
|
||||||
|
};
|
||||||
|
let before = natal(anna.clone()).await;
|
||||||
|
let join = |email: String| {
|
||||||
|
let (app, slug) = (&app, slug.clone());
|
||||||
|
async move {
|
||||||
|
let r = app
|
||||||
|
.post(
|
||||||
|
"/v1/auth/register",
|
||||||
|
None,
|
||||||
|
json!({"email": email, "password": "titkos-jelszo-123", "referral": slug}),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
assert_eq!(r.status, StatusCode::CREATED, "{}", r.body);
|
||||||
|
r.body["token"].as_str().map(str::to_string).unwrap_or_else(|| {
|
||||||
|
let cookie = r.headers.get("set-cookie").unwrap().to_str().unwrap();
|
||||||
|
cookie.split(';').next().unwrap().split('=').nth(1).unwrap().to_string()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// signing up is not enough: the reward comes with their own chart
|
||||||
|
let bela = join("bela@example.com".into()).await;
|
||||||
|
assert_eq!(natal(anna.clone()).await, before);
|
||||||
|
app.chart(&bela, "Saját", true, "1985-08-02").await;
|
||||||
|
assert_eq!(natal(anna.clone()).await, before + 1);
|
||||||
|
// a second chart of theirs changes nothing
|
||||||
|
app.chart(&bela, "Másik", false, "1970-01-01").await;
|
||||||
|
assert_eq!(natal(anna.clone()).await, before + 1);
|
||||||
|
|
||||||
|
// at most three
|
||||||
|
for i in 0..3 {
|
||||||
|
let t = join(format!("p{i}@example.com")).await;
|
||||||
|
app.chart(&t, "Saját", true, "1980-05-05").await;
|
||||||
|
}
|
||||||
|
assert_eq!(natal(anna.clone()).await, before + 3);
|
||||||
|
let me = app.get("/v1/me", Some(&anna)).await.body;
|
||||||
|
assert_eq!(me["referral_rewards"], json!({"earned": 3, "limit": 3}));
|
||||||
|
|
||||||
|
// nothing while the rewards are off
|
||||||
|
let off = TestApp::with_config(pool, |c| c.referral_rewards = false).await;
|
||||||
|
let r = off
|
||||||
|
.post(
|
||||||
|
"/v1/auth/register",
|
||||||
|
None,
|
||||||
|
json!({"email": "late@example.com", "password": "titkos-jelszo-123", "referral": slug}),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
assert_eq!(r.status, StatusCode::CREATED);
|
||||||
|
let count: i64 = sqlx::query_scalar(
|
||||||
|
"SELECT count(*) FROM referrals r JOIN users u ON u.id = r.user_id WHERE u.email = 'late@example.com'",
|
||||||
|
)
|
||||||
|
.fetch_one(&off.pool)
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(count, 0);
|
||||||
|
}
|
||||||
|
|||||||
@@ -72,7 +72,18 @@ export function GoogleLogin({
|
|||||||
setError(null);
|
setError(null);
|
||||||
setUninvited(null);
|
setUninvited(null);
|
||||||
try {
|
try {
|
||||||
await api("/auth/google", { body: { id_token: response.credential, invite_token: inviteToken } });
|
let referral: string | null = null;
|
||||||
|
try {
|
||||||
|
referral = localStorage.getItem("sf_ref");
|
||||||
|
} catch {
|
||||||
|
// storage blocked
|
||||||
|
}
|
||||||
|
await api("/auth/google", { body: { id_token: response.credential, invite_token: inviteToken, referral } });
|
||||||
|
try {
|
||||||
|
localStorage.removeItem("sf_ref");
|
||||||
|
} catch {
|
||||||
|
// storage blocked
|
||||||
|
}
|
||||||
router.replace(target);
|
router.replace(target);
|
||||||
router.refresh();
|
router.refresh();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|||||||
@@ -78,6 +78,8 @@ export default async function ChartPage({ params }: { params: Promise<{ id: stri
|
|||||||
detailedDone={detailed?.status === "done"}
|
detailedDone={detailed?.status === "done"}
|
||||||
isAdmin={me.user.roles.includes("admin")}
|
isAdmin={me.user.roles.includes("admin")}
|
||||||
shareRewardGranted={me.share_reward_granted}
|
shareRewardGranted={me.share_reward_granted}
|
||||||
|
referralOpen={config?.referral_rewards ?? false}
|
||||||
|
referralsLeft={me.referral_rewards.limit - me.referral_rewards.earned}
|
||||||
/>
|
/>
|
||||||
<BigThree chart={chart} />
|
<BigThree chart={chart} />
|
||||||
{(elements || modalities || phase) && (
|
{(elements || modalities || phase) && (
|
||||||
|
|||||||
@@ -26,6 +26,8 @@ export function ChartSummary({
|
|||||||
detailedDone = false,
|
detailedDone = false,
|
||||||
isAdmin = false,
|
isAdmin = false,
|
||||||
shareRewardGranted = false,
|
shareRewardGranted = false,
|
||||||
|
referralOpen = false,
|
||||||
|
referralsLeft = 0,
|
||||||
}: {
|
}: {
|
||||||
chartId: string;
|
chartId: string;
|
||||||
initial: Analysis | null;
|
initial: Analysis | null;
|
||||||
@@ -33,8 +35,11 @@ export function ChartSummary({
|
|||||||
detailedDone?: boolean;
|
detailedDone?: boolean;
|
||||||
/** Admins can write the summary again. */
|
/** Admins can write the summary again. */
|
||||||
isAdmin?: boolean;
|
isAdmin?: boolean;
|
||||||
/** The free analysis for sharing is used up. */
|
/** The free question for sharing is used up. */
|
||||||
shareRewardGranted?: boolean;
|
shareRewardGranted?: boolean;
|
||||||
|
/** New users from shared links earn analyses, and how many more can be. */
|
||||||
|
referralOpen?: boolean;
|
||||||
|
referralsLeft?: number;
|
||||||
}) {
|
}) {
|
||||||
const [summary, setSummary] = useState<Analysis | null>(initial);
|
const [summary, setSummary] = useState<Analysis | null>(initial);
|
||||||
const [gaveUp, setGaveUp] = useState(false);
|
const [gaveUp, setGaveUp] = useState(false);
|
||||||
@@ -85,7 +90,12 @@ export function ChartSummary({
|
|||||||
<p className="summary-text" lang={summary?.language}>
|
<p className="summary-text" lang={summary?.language}>
|
||||||
<Rich text={content.summary ?? ""} />
|
<Rich text={content.summary ?? ""} />
|
||||||
</p>
|
</p>
|
||||||
<ShareChart chartId={chartId} rewardGranted={shareRewardGranted} />
|
<ShareChart
|
||||||
|
chartId={chartId}
|
||||||
|
rewardGranted={shareRewardGranted}
|
||||||
|
referralOpen={referralOpen}
|
||||||
|
referralsLeft={referralsLeft}
|
||||||
|
/>
|
||||||
<a
|
<a
|
||||||
href="#elemzes"
|
href="#elemzes"
|
||||||
className="summary-more"
|
className="summary-more"
|
||||||
|
|||||||
@@ -22,10 +22,27 @@ function ShareIcon() {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Share link of a chart with its short summary: copy, Facebook, the phone's
|
* Share link of a chart with its short summary: copy, Facebook, the phone's
|
||||||
* share menu, revoke. The first visit by someone else earns one free natal
|
* share menu, revoke. The first visit by someone else earns a free question,
|
||||||
* analysis, once per user (`rewardGranted`: already received).
|
* once per user (`rewardGranted`: already received); someone who signs up
|
||||||
|
* from the link and makes their chart earns an analysis (`referralsLeft`,
|
||||||
|
* while `referralOpen`).
|
||||||
*/
|
*/
|
||||||
export function ShareChart({ chartId, rewardGranted = false }: { chartId: string; rewardGranted?: boolean }) {
|
export function ShareChart({
|
||||||
|
chartId,
|
||||||
|
rewardGranted = false,
|
||||||
|
referralOpen = false,
|
||||||
|
referralsLeft = 0,
|
||||||
|
}: {
|
||||||
|
chartId: string;
|
||||||
|
rewardGranted?: boolean;
|
||||||
|
referralOpen?: boolean;
|
||||||
|
referralsLeft?: number;
|
||||||
|
}) {
|
||||||
|
const referral = referralOpen && referralsLeft > 0;
|
||||||
|
const perks = [
|
||||||
|
!rewardGranted && "+1 ajándék kérdés, ha valaki megnézi",
|
||||||
|
referral && "+1 elemzés, ha valaki a linkedről csatlakozik",
|
||||||
|
].filter(Boolean);
|
||||||
const [share, setShare] = useState<Share | null>(null);
|
const [share, setShare] = useState<Share | null>(null);
|
||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
const [copied, setCopied] = useState(false);
|
const [copied, setCopied] = useState(false);
|
||||||
@@ -88,11 +105,7 @@ export function ShareChart({ chartId, rewardGranted = false }: { chartId: string
|
|||||||
</span>
|
</span>
|
||||||
<span className="share-button-text">
|
<span className="share-button-text">
|
||||||
<strong>{busy ? "Link készül…" : "Oszd meg a képleted"}</strong>
|
<strong>{busy ? "Link készül…" : "Oszd meg a képleted"}</strong>
|
||||||
<small>
|
<small>{perks.length > 0 ? perks.join(" · ") : "Küldd el a barátaidnak, vagy tedd ki Facebookra"}</small>
|
||||||
{rewardGranted
|
|
||||||
? "Küldd el a barátaidnak, vagy tedd ki Facebookra"
|
|
||||||
: "+1 ajándék elemzés jár érte, ha valaki megnézi"}
|
|
||||||
</small>
|
|
||||||
</span>
|
</span>
|
||||||
</button>
|
</button>
|
||||||
{revoked && <p className="hint">A linket visszavontad.</p>}
|
{revoked && <p className="hint">A linket visszavontad.</p>}
|
||||||
@@ -114,8 +127,10 @@ export function ShareChart({ chartId, rewardGranted = false }: { chartId: string
|
|||||||
</p>
|
</p>
|
||||||
<p className="share-fine">
|
<p className="share-fine">
|
||||||
{rewardGranted
|
{rewardGranted
|
||||||
? "Az ajándék elemzést már megkaptad. Köszönjük, hogy megosztottad!"
|
? "Az ajándék kérdést már megkaptad. Köszönjük, hogy megosztottad!"
|
||||||
: "Ajándék képletelemzés egyszer jár: amikor valaki más először megnyitja a linkedet. A saját megnyitásod nem számít."}
|
: "Ajándék kérdés egyszer jár: amikor valaki más először megnyitja a linkedet. A saját megnyitásod nem számít."}
|
||||||
|
{referral &&
|
||||||
|
` Ha valaki a linkedről regisztrál és elkészíti a képletét, egy képletelemzést is kapsz (még ${referralsLeft} szerezhető).`}
|
||||||
</p>
|
</p>
|
||||||
<div className="share-link">
|
<div className="share-link">
|
||||||
<input
|
<input
|
||||||
|
|||||||
@@ -10,6 +10,12 @@ import { useEffect } from "react";
|
|||||||
export function ShareVisit({ slug }: { slug: string }) {
|
export function ShareVisit({ slug }: { slug: string }) {
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const key = `share-visit:${slug}`;
|
const key = `share-visit:${slug}`;
|
||||||
|
try {
|
||||||
|
// If they sign up later, the sharer who brought them is remembered.
|
||||||
|
localStorage.setItem("sf_ref", slug);
|
||||||
|
} catch {
|
||||||
|
// storage blocked
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
if (sessionStorage.getItem(key)) return;
|
if (sessionStorage.getItem(key)) return;
|
||||||
sessionStorage.setItem(key, "1");
|
sessionStorage.setItem(key, "1");
|
||||||
|
|||||||
@@ -21,8 +21,10 @@ export interface Me {
|
|||||||
persons: PersonSlots;
|
persons: PersonSlots;
|
||||||
/** The latest main package bought or given (null: none). */
|
/** The latest main package bought or given (null: none). */
|
||||||
package: { id: string; name: string; since: string } | null;
|
package: { id: string; name: string; since: string } | null;
|
||||||
/** The free analysis for a shared link is used up (once per user). */
|
/** The free question for a shared link is used up (once per user). */
|
||||||
share_reward_granted: boolean;
|
share_reward_granted: boolean;
|
||||||
|
/** Natal analyses earned by bringing new users through shared links. */
|
||||||
|
referral_rewards: { earned: number; limit: number };
|
||||||
}
|
}
|
||||||
|
|
||||||
/** A package from the catalog (`GET /v1/packages`). */
|
/** A package from the catalog (`GET /v1/packages`). */
|
||||||
@@ -94,6 +96,8 @@ export interface PublicConfig {
|
|||||||
signup_mode: "invite" | "open";
|
signup_mode: "invite" | "open";
|
||||||
/** Users may invite others (off until the launch; admins always may). */
|
/** Users may invite others (off until the launch; admins always may). */
|
||||||
user_invites: boolean;
|
user_invites: boolean;
|
||||||
|
/** A new user from a shared link earns the sharer an analysis (off until sign-up opens). */
|
||||||
|
referral_rewards: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface Position {
|
export interface Position {
|
||||||
|
|||||||
Reference in New Issue
Block a user