Merge branch 'collaborator'

Mivik · Mivik · commit c8b59c1524e0 · 2026-04-08T13:38:09.000+08:00
diff --git a/phira/locales/en-US/song.ftl b/phira/locales/en-US/song.ftl
@@ -78,10 +78,16 @@ info-composer = Composer
 info-charter = Charter
 info-difficulty = Difficulty
 info-desc = Description
+info-collaborators = Collaborators
 info-rating = Rating
 info-type = Type
 info-tags = Tags
 
+collab-autocomplete-title = Complete Collaborators
+collab-autocomplete-content = Detected collaborator(s) missing user IDs: { $mentions }. Auto-complete?
+collab-autocomplete-failed = Failed to resolve "@{ $name }": user not found or ambiguous.
+collab-autocomplete-done = Collaborators completed.
+
 reviewed = Reviewed
 unreviewed = Unreviewed
 
diff --git a/phira/locales/zh-CN/song.ftl b/phira/locales/zh-CN/song.ftl
@@ -76,10 +76,16 @@ info-composer = 曲师
 info-charter = 谱师
 info-difficulty = 难度
 info-desc = 简介
+info-collaborators = 协作者
 info-rating = 评分
 info-type = 种类
 info-tags = 标签
 
+collab-autocomplete-title = 协作者补全
+collab-autocomplete-content = 检测到缺少用户 ID 的协作者：{ $mentions }，是否自动补全？
+collab-autocomplete-failed = 无法解析 "@{ $name }"：用户不存在或有多个匹配。
+collab-autocomplete-done = 协作者已补全
+
 reviewed = 已审核
 unreviewed = 未审核
 
diff --git a/phira/locales/zh-TW/song.ftl b/phira/locales/zh-TW/song.ftl
@@ -65,9 +65,16 @@ info-composer = 曲師
 info-charter = 譜師
 info-difficulty = 難度
 info-desc = 簡介
+info-collaborators = 協作者
 info-rating = 評分
 info-type = 類型
 info-tags = 標籤
+
+collab-autocomplete-title = 協作者補全
+collab-autocomplete-content = 偵測到缺少使用者 ID 的協作者：{ $mentions }，是否自動補全？
+collab-autocomplete-failed = 無法解析「@{ $name }」：使用者不存在或有多個匹配。
+collab-autocomplete-done = 協作者已補全
+
 reviewed = 已審核
 unreviewed = 未審核
 review-approve = 通過
diff --git a/phira/src/scene/song.rs b/phira/src/scene/song.rs
@@ -8,7 +8,7 @@ use super::{
 use crate::{
     charts_view::NEED_UPDATE,
     client::{
-        basic_client_builder, recv_raw, Chart, ChartRef, ChartRefChartInfo, Client, Collection, CollectionUpdate, Permissions, Ptr, Record,
+        basic_client_builder, recv_raw, Chart, ChartRef, ChartRefChartInfo, Client, Collection, CollectionUpdate, Permissions, Ptr, Record, User,
         UserManager, CLIENT_TOKEN,
     },
     data::{BriefChartInfo, LocalChart},
@@ -31,6 +31,7 @@ use core::f32;
 use futures_util::StreamExt;
 use inputbox::{InputBox, InputMode};
 use macroquad::prelude::*;
+use once_cell::sync::Lazy;
 use phira_mp_common::{ClientCommand, CompactPos, JudgeEvent, TouchFrame};
 use prpr::{
     config::Mods,
@@ -50,6 +51,7 @@ use prpr::{
     time::TimeManager,
     ui::{button_hit, render_chart_info, ChartInfoEdit, DRectButton, Dialog, LoadingParams, LongTouchState, RectButton, Scroll, Ui, UI_AUDIO},
 };
+use regex::Regex;
 use reqwest::Method;
 use sanitize_filename::sanitize;
 use sasa::{AudioClip, Frame, Music, MusicParams};
@@ -59,7 +61,7 @@ use sha2::{Digest, Sha256};
 use std::{
     any::Any,
     borrow::Cow,
-    collections::{hash_map, HashMap, VecDeque},
+    collections::{hash_map, BTreeMap, HashMap, VecDeque},
     fs::File,
     io::{BufWriter, Cursor, Seek, Write},
     path::Path,
@@ -83,8 +85,57 @@ static CONFIRM_CKSUM: AtomicBool = AtomicBool::new(false);
 static UPLOAD_NOT_SAVED: AtomicBool = AtomicBool::new(false);
 static CONFIRM_OVERWRITE: AtomicBool = AtomicBool::new(false);
 static CONFIRM_UPLOAD: AtomicBool = AtomicBool::new(false);
+static CONFIRM_AUTOCOMPLETE: AtomicBool = AtomicBool::new(false);
+static SKIP_AUTOCOMPLETE: AtomicBool = AtomicBool::new(false);
 pub static RECORD_ID: AtomicI32 = AtomicI32::new(-1);
 
+/// Matches any `@name#id (role)` or `@name#id` or `@name (role)` or `@name`.
+/// Parentheses may be ASCII `()` or fullwidth `（）`; whitespace before `(` is optional.
+/// Groups: 1=name, 2=id (optional), 3=role (optional)
+static MENTION_RE: Lazy<Regex> = Lazy::new(|| Regex::new(r"@([^\s#@(（]+)(?:#(\d+))?(?:\s*[（(]([^)）]+)[)）])?").unwrap());
+
+/// Parse all `@name#id` resolved collaborator mentions and return `(id, role)` pairs.
+fn parse_collaborators(intro: &str) -> BTreeMap<i32, Option<String>> {
+    use std::collections::btree_map::Entry;
+
+    let mut result = BTreeMap::new();
+    for (id, role) in MENTION_RE.captures_iter(intro).filter_map(|cap| {
+        let id: i32 = cap.get(2)?.as_str().parse().ok()?;
+        let role = cap.get(3).map(|m| m.as_str().to_owned());
+        Some((id, role))
+    }) {
+        match result.entry(id) {
+            Entry::Vacant(e) => {
+                e.insert(role);
+            }
+            Entry::Occupied(mut e) => {
+                if e.get().is_none() && role.is_some() {
+                    e.insert(role);
+                }
+            }
+        }
+    }
+    result
+}
+
+/// Find all unresolved `@name` or `@name (role)` mentions (those missing `#id`).
+/// Returns `(start, end, name)` byte-offset pairs into `intro`.
+/// Processing right-to-left preserves earlier offsets during replacement.
+fn find_unresolved_mentions(intro: &str) -> Vec<(usize, usize, String)> {
+    MENTION_RE
+        .captures_iter(intro)
+        .filter_map(|cap| {
+            if cap.get(2).is_some() {
+                // Already has #id — resolved
+                return None;
+            }
+            let m = cap.get(0)?;
+            let name = cap.get(1)?.as_str().to_owned();
+            Some((m.start(), m.end(), name))
+        })
+        .collect()
+}
+
 fn fade_in_time() -> Option<f32> {
     if get_data().prefer_reduced_motion {
         None
@@ -357,6 +408,9 @@ pub struct SongScene {
 
     confirm_cancel_edit: Arc<AtomicBool>,
 
+    collaborators: BTreeMap<i32, Option<String>>,
+    autocomplete_task: Option<Task<Result<String>>>,
+
     export_task: Option<mpsc::Receiver<Result<()>>>,
 }
 
@@ -544,6 +598,9 @@ impl SongScene {
 
             confirm_cancel_edit: Arc::default(),
 
+            collaborators: BTreeMap::new(),
+            autocomplete_task: None,
+
             export_task: None,
         }
     }
@@ -1099,7 +1156,7 @@ impl SongScene {
         }
         r.x += dx;
         if ui.button("save", r, tl!("edit-save")) {
-            self.save_edit();
+            self.try_save_with_autocomplete();
         }
 
         ui.ensure_touches()
@@ -1204,6 +1261,34 @@ impl SongScene {
                 }
                 dy!(0.14);
             }
+            if !self.collaborators.is_empty() {
+                dy!(ui.text(tl!("info-collaborators")).size(0.4).color(semi_white(0.7)).draw().h + 0.02);
+                for (collab_id, role) in &self.collaborators {
+                    let c = 0.06;
+                    let s = 0.05;
+                    let r = ui.avatar(c, c, s, rt, UserManager::opt_avatar(*collab_id, &self.icons.user));
+                    if let Some((name, color)) = UserManager::name_and_color(*collab_id) {
+                        let name_r = ui
+                            .text(name)
+                            .pos(r.right() + 0.02, r.center().y - if role.is_some() { 0.01 } else { 0. })
+                            .anchor(0., 0.5)
+                            .no_baseline()
+                            .max_width(width - 0.15)
+                            .size(0.5)
+                            .color(color)
+                            .draw();
+                        if let Some(role_text) = role {
+                            ui.text(role_text.as_str())
+                                .pos(r.right() + 0.02, name_r.bottom() + 0.005)
+                                .size(0.35)
+                                .color(semi_white(0.6))
+                                .draw();
+                        }
+                    }
+                    dy!(0.14);
+                }
+            }
+
             let mut item = |title: Cow<'_, str>, content: Cow<'_, str>| {
                 dy!(ui.text(title).size(0.4).color(semi_white(0.7)).draw().h + 0.02);
                 dy!(ui.text(content).pos(pad, 0.).size(0.6).multiline().max_width(mw).draw().h + 0.03);
@@ -1347,6 +1432,61 @@ impl SongScene {
         }));
     }
 
+    fn try_save_with_autocomplete(&mut self) {
+        let intro = &self.info_edit.as_ref().unwrap().info.intro;
+        let unresolved = find_unresolved_mentions(intro);
+        if unresolved.is_empty() {
+            self.save_edit();
+        } else {
+            let mentions_list = unresolved
+                .iter()
+                .map(|(start, end, _)| &intro[*start..*end])
+                .collect::<Vec<_>>()
+                .join(", ");
+            let content = tl!("collab-autocomplete-content", "mentions" => mentions_list);
+            Dialog::plain(tl!("collab-autocomplete-title"), content)
+                .buttons(vec![ttl!("cancel").into_owned(), ttl!("confirm").into_owned()])
+                .listener(|_dialog, pos| {
+                    if pos == 1 {
+                        CONFIRM_AUTOCOMPLETE.store(true, Ordering::SeqCst);
+                    } else if pos == 0 {
+                        SKIP_AUTOCOMPLETE.store(true, Ordering::SeqCst);
+                    }
+                    false
+                })
+                .show();
+        }
+    }
+
+    fn start_autocomplete(&mut self) {
+        let intro = self.info_edit.as_ref().unwrap().info.intro.clone();
+        self.autocomplete_task = Some(Task::new(async move {
+            let unresolved = find_unresolved_mentions(&intro);
+            // Resolve each mention (bail on first failure), then apply right-to-left
+            // so earlier byte offsets stay valid.
+            let mut resolved: Vec<(usize, usize, String)> = Vec::new();
+            for (start, end, name) in unresolved {
+                let name_owned = name.clone();
+                let (users, _) = Client::query::<User>().search(name_owned).send().await?;
+                let matched = users.into_iter().find(|u| u.name == name);
+                let Some(user) = matched else {
+                    bail!(tl!("collab-autocomplete-failed", "name" => name));
+                };
+                // Replacement: insert `#id` right after `@name`, keep the rest of
+                // the original match (bracket/role if any).
+                let suffix = &intro[start + 1 + name.len()..end];
+                let new_text = format!("@{}#{}{}", name, user.id, suffix);
+                resolved.push((start, end, new_text));
+            }
+            // Apply right-to-left so replacement lengths don't shift pending offsets.
+            let mut result = intro.into_bytes();
+            for (start, end, new_text) in resolved.into_iter().rev() {
+                result.splice(start..end, new_text.into_bytes());
+            }
+            Ok(String::from_utf8(result).unwrap())
+        }));
+    }
+
     fn update_chart_info(&self) -> Result<()> {
         Self::global_update_chart_info(self.local_path.as_ref().unwrap(), self.info.clone())
     }
@@ -1524,6 +1664,7 @@ impl Scene for SongScene {
             || self.update_cksum_task.is_some()
             || self.toggle_fav_task.is_some()
             || self.export_task.is_some()
+            || self.autocomplete_task.is_some()
         {
             return Ok(true);
         }
@@ -1692,6 +1833,10 @@ impl Scene for SongScene {
             if let Some(uploader) = &self.info.uploader {
                 UserManager::request(uploader.id);
             }
+            self.collaborators = parse_collaborators(&self.info.intro);
+            for id in self.collaborators.keys() {
+                UserManager::request(*id);
+            }
             self.side_content = SideContent::Info;
             self.side_enter_time = tm.real_time() as _;
             return Ok(true);
@@ -1748,6 +1893,30 @@ impl Scene for SongScene {
         if self.side_enter_time < 0. && -tm.real_time() as f32 + edit_transit().unwrap_or_default() < self.side_enter_time {
             self.side_enter_time = f32::INFINITY;
         }
+        if CONFIRM_AUTOCOMPLETE.fetch_and(false, Ordering::SeqCst) {
+            self.start_autocomplete();
+        }
+        if SKIP_AUTOCOMPLETE.fetch_and(false, Ordering::SeqCst) {
+            self.save_edit();
+        }
+        if let Some(task) = &mut self.autocomplete_task {
+            if let Some(res) = task.take() {
+                self.autocomplete_task = None;
+                match res {
+                    Err(err) => {
+                        show_error(err);
+                    }
+                    Ok(new_intro) => {
+                        if let Some(edit) = self.info_edit.as_mut() {
+                            edit.info.intro = new_intro;
+                            edit.updated = true;
+                        }
+                        show_message(tl!("collab-autocomplete-done")).duration(1.).ok();
+                        self.save_edit();
+                    }
+                }
+            }
+        }
         if let Some(task) = &mut self.load_task {
             if let Some(res) = task.take() {
                 match res {
@@ -2644,6 +2813,7 @@ impl Scene for SongScene {
             || self.overwrite_task.is_some()
             || self.update_cksum_task.is_some()
             || self.toggle_fav_task.is_some()
+            || self.autocomplete_task.is_some()
         {
             ui.full_loading("", t);
         }
