Merge branch 'master' of http://82.157.175.59:3000/GenarrativeAI/Genarrative

server-rs/crates/shared-contracts/src/auth.rs

@@ -164,6 +164,8 @@ pub struct PhoneSendCodeResponse {
 pub struct PhoneLoginRequest {
     pub phone: String,
     pub code: String,
+    #[serde(default)]
+    pub invite_code: Option<String>,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
@@ -171,6 +173,19 @@ pub struct PhoneLoginRequest {
 pub struct PhoneLoginResponse {
     pub token: String,
     pub user: AuthUserPayload,
+    pub created: bool,
+    pub referral: Option<PhoneLoginReferralResponse>,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct PhoneLoginReferralResponse {
+    pub ok: bool,
+    pub message: Option<String>,
+    pub invitee_reward_granted: bool,
+    pub inviter_reward_granted: bool,
+    pub invitee_balance_after: Option<u64>,
+    pub inviter_balance_after: Option<u64>,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]

server-rs/crates/shared-contracts/src/match3d_agent.rs

@@ -55,8 +55,11 @@ pub struct Match3DCreatorConfigResponse {
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct Match3DResultDraftResponse {
+    pub profile_id: String,
     pub game_name: String,
     pub theme_text: String,
+    #[serde(default)]
+    pub summary_text: Option<String>,
     pub summary: String,
     pub tags: Vec<String>,
     #[serde(default)]
@@ -65,10 +68,28 @@ pub struct Match3DResultDraftResponse {
     pub reference_image_src: Option<String>,
     pub clear_count: u32,
     pub difficulty: u32,
+    pub total_item_count: u32,
     pub publish_ready: bool,
     pub blockers: Vec<String>,
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct Match3DAnchorItemResponse {
+    pub key: String,
+    pub label: String,
+    pub value: String,
+    pub status: String,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct Match3DAnchorPackResponse {
+    pub theme: Match3DAnchorItemResponse,
+    pub clear_count: Match3DAnchorItemResponse,
+    pub difficulty: Match3DAnchorItemResponse,
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct Match3DAgentMessageResponse {
@@ -86,6 +107,7 @@ pub struct Match3DAgentSessionSnapshotResponse {
     pub current_turn: u32,
     pub progress_percent: u32,
     pub stage: String,
+    pub anchor_pack: Match3DAnchorPackResponse,
     #[serde(default)]
     pub config: Option<Match3DCreatorConfigResponse>,
     #[serde(default)]

server-rs/crates/shared-contracts/src/match3d_works.rs

@@ -4,6 +4,8 @@ use serde::{Deserialize, Serialize};
 #[serde(rename_all = "camelCase")]
 pub struct PutMatch3DWorkRequest {
     pub game_name: String,
+    #[serde(default)]
+    pub theme_text: Option<String>,
     pub summary: String,
     pub tags: Vec<String>,
     #[serde(default)]
@@ -74,6 +76,7 @@ mod tests {
     fn match3d_work_request_uses_camel_case() {
         let payload = serde_json::to_value(PutMatch3DWorkRequest {
             game_name: "水果抓大鹅".to_string(),
+            theme_text: Some("水果".to_string()),
             summary: "水果主题".to_string(),
             tags: vec!["水果".to_string()],
             cover_image_src: None,

server-rs/crates/shared-contracts/src/runtime.rs

@@ -298,6 +298,14 @@ pub struct AdminUpsertProfileRedeemCodeRequest {
     pub allowed_public_user_codes: Vec<String>,
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+#[serde(rename_all = "camelCase")]
+pub struct AdminUpsertProfileInviteCodeRequest {
+    pub invite_code: String,
+    #[serde(default)]
+    pub metadata: Option<serde_json::Value>,
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub struct AdminDisableProfileRedeemCodeRequest {
@@ -319,6 +327,16 @@ pub struct ProfileRedeemCodeAdminResponse {
     pub updated_at: String,
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+#[serde(rename_all = "camelCase")]
+pub struct ProfileInviteCodeAdminResponse {
+    pub user_id: String,
+    pub invite_code: String,
+    pub metadata: serde_json::Value,
+    pub created_at: String,
+    pub updated_at: String,
+}
+
 fn default_true() -> bool {
     true
 }