community: a proposal on your board arrives as a toast, carried sealed through the inbox
This commit is contained in:
1 parent
4d03cf849b
commit
fd216ecd3d
6 files changed
+241
-1
No files matched your search
@@ -52,6 +52,17 @@ pub enum Cargo {
|
||||
Share(ShareCargo),
|
||||
SpaceInvite(SpaceInvite),
|
||||
SpaceKey(SpaceKeyCargo),
|
||||
ProposalPing(ProposalPing),
|
||||
}
|
||||
|
||||
/// "Someone put a proposal on your playlist's board." Carries only enough to
|
||||
/// name it in a toast — the board itself stays the truth, and this is a
|
||||
/// best-effort nudge: the proposal stands whether or not the ping lands.
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct ProposalPing {
|
||||
pub playlist_uuid: [u8; 16],
|
||||
pub name: String,
|
||||
pub proposal_id: [u8; 16],
|
||||
}
|
||||
|
||||
/// "You are on the roster now, here is where the Space is" — and, for a
|
||||
@@ -483,6 +494,7 @@ async fn dispatch(app: &tauri::AppHandle, sender: [u8; 32], cargo: Cargo) {
|
||||
Cargo::Share(s) => crate::shared_playlists::on_inbox_share(app, sender, s).await,
|
||||
Cargo::SpaceInvite(i) => crate::spaces::on_inbox_invite(app, sender, i).await,
|
||||
Cargo::SpaceKey(k) => crate::spaces::on_inbox_space_key(app, sender, k).await,
|
||||
Cargo::ProposalPing(p) => crate::proposals::on_inbox_proposal(app, sender, p),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -513,4 +525,44 @@ mod tests {
|
||||
assert_eq!(inbox.code_hash, "UjK4sLZqGSE2qEXwQYMvNFsTiuLSYjMJuwzVbhAtXKR");
|
||||
assert_eq!(desc.code_hash, "B4A2nMJgSKzgo72gaDJyTpFNTmjBynLFga3EiNoSVstv");
|
||||
}
|
||||
|
||||
/// The wire is the variant ORDER: bincode writes the index, so inserting a
|
||||
/// variant renumbers every one after it and silently breaks every sealed
|
||||
/// message already in flight. New cargo goes on the END, and this pins it.
|
||||
#[test]
|
||||
fn cargo_variant_indices_are_the_wire() {
|
||||
let index = |c: &Cargo| {
|
||||
let b = bincode::serialize(c).unwrap();
|
||||
u32::from_le_bytes(b[..4].try_into().unwrap())
|
||||
};
|
||||
let share = Cargo::Share(ShareCargo {
|
||||
owner: [1u8; 32],
|
||||
playlist_uuid: [2u8; 16],
|
||||
name: "n".into(),
|
||||
entry_count: 1,
|
||||
});
|
||||
let key = Cargo::SpaceKey(SpaceKeyCargo {
|
||||
space_id: [3u8; 16],
|
||||
owner: [4u8; 32],
|
||||
epoch: 9,
|
||||
key: [5u8; 32],
|
||||
});
|
||||
let ping = Cargo::ProposalPing(ProposalPing {
|
||||
playlist_uuid: [6u8; 16],
|
||||
name: "Late Night Ambient".into(),
|
||||
proposal_id: [7u8; 16],
|
||||
});
|
||||
assert_eq!(index(&share), 3, "Share moved — sealed shares in flight are now unreadable");
|
||||
assert_eq!(index(&key), 5, "SpaceKey moved — sealed keys in flight are now unreadable");
|
||||
assert_eq!(index(&ping), 6, "a new variant must be appended, never inserted");
|
||||
|
||||
let back: Cargo = bincode::deserialize(&bincode::serialize(&ping).unwrap()).unwrap();
|
||||
match back {
|
||||
Cargo::ProposalPing(p) => {
|
||||
assert_eq!(p.name, "Late Night Ambient");
|
||||
assert_eq!(p.proposal_id, [7u8; 16]);
|
||||
}
|
||||
other => panic!("round-tripped into {other:?}"),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -24,18 +24,21 @@ use library::{NewPlaylistItem, PlaylistItem};
|
||||
use persona_state::playlist as pl;
|
||||
use persona_state::proposals as pr;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use tauri::Manager;
|
||||
use tauri::{Emitter, Manager};
|
||||
|
||||
use crate::persona;
|
||||
use crate::pipeline::LibraryState;
|
||||
use crate::playlists;
|
||||
use crate::shared_playlists::{self, Published};
|
||||
use crate::inbox::{self, Cargo, ProposalPing};
|
||||
use crate::ledger;
|
||||
use crate::slsk_link;
|
||||
use crate::spaces;
|
||||
use crate::state::AppState;
|
||||
|
||||
const BOARD_WASM: &[u8] = include_bytes!("../assets/proposal_contract.wasm");
|
||||
/// A proposal landed on a board of ours. The UI answers with a toast.
|
||||
pub const EVENT: &str = "community:proposal";
|
||||
|
||||
#[derive(Default, Clone, Serialize, Deserialize)]
|
||||
struct BoardRecord {
|
||||
@@ -502,8 +505,22 @@ pub async fn propose(app: &tauri::AppHandle, space_owner_b58: &str, space_b58: &
|
||||
if !pr::proposal_valid(&p) {
|
||||
return Err("the proposal did not validate (a size or field cap)".into());
|
||||
}
|
||||
let pid = p.proposal_id;
|
||||
offer_board(app, &pin.owner, &pin.uuid, &partial(&pin.owner, &pin.uuid, None, vec![p], vec![]), false).await?;
|
||||
log::info!("proposals: offered a proposal to board {}", b58(&pin.uuid));
|
||||
// The board only gets read on open and Refresh, so tell the owner it is
|
||||
// there. Best-effort by design: it needs their published inbox, and the
|
||||
// proposal stands on the board whether or not this lands.
|
||||
if pin.owner != me {
|
||||
let ping = Cargo::ProposalPing(ProposalPing {
|
||||
playlist_uuid: pin.uuid,
|
||||
name: manifest.name.clone(),
|
||||
proposal_id: pid,
|
||||
});
|
||||
if let Err(e) = inbox::send(app, &pin.owner, &ping).await {
|
||||
log::info!("proposals: no ping to the owner ({e}) — the board still holds it");
|
||||
}
|
||||
}
|
||||
open(app, space_owner_b58, space_b58).await
|
||||
}
|
||||
|
||||
@@ -555,6 +572,25 @@ pub async fn decide(app: &tauri::AppHandle, space_owner_b58: &str, space_b58: &s
|
||||
open(app, space_owner_b58, space_b58).await
|
||||
}
|
||||
|
||||
/// Sealed cargo from inbox.rs: someone proposed against a playlist of ours.
|
||||
/// Nothing is stored — the board is the record; this only raises the toast.
|
||||
pub(crate) fn on_inbox_proposal(app: &tauri::AppHandle, sender: [u8; 32], ping: ProposalPing) {
|
||||
let key = b58(&sender);
|
||||
let who = slsk_link::username_for_key(app, &key).unwrap_or(key);
|
||||
log::info!("proposals: {who} proposed a change to {:?}", ping.name);
|
||||
let _ = app.emit(
|
||||
EVENT,
|
||||
ProposalPingEvent { from: who, playlist: ping.name, proposal_id: b58(&ping.proposal_id) },
|
||||
);
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize)]
|
||||
struct ProposalPingEvent {
|
||||
from: String,
|
||||
playlist: String,
|
||||
proposal_id: String,
|
||||
}
|
||||
|
||||
/// Bring the owner's local playlist to `entries`, then publish it as the
|
||||
/// next revision. Refused when the local copy has drifted from the base
|
||||
/// revision — the exact-base rule holds on this side too.
|
||||
|
||||
Reference in new issue
Block a user