diff options
Diffstat (limited to 'src/federation')
| -rw-r--r-- | src/federation/party/status.rs | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/src/federation/party/status.rs b/src/federation/party/status.rs index 2428845..4c637fa 100644 --- a/src/federation/party/status.rs +++ b/src/federation/party/status.rs @@ -66,6 +66,7 @@ async fn model(node: &Node, options: &Options, party: Option<&str>) -> Result<Js json!({ "id": id, "name": of["names"][id], + "here": summary["node"].as_str() == Some(id.as_str()), "heard": of["heard"][id], "knows": of["knows"][id], }) @@ -112,6 +113,7 @@ async fn model(node: &Node, options: &Options, party: Option<&str>) -> Result<Js "stopped": summary["stopped"], }, "node": { + "id": summary["node"], "party": summary["party"], "votesByItself": summary["votesByItself"], "revisions": revisions, @@ -528,7 +530,7 @@ fn render(model: &JsonValue, paint: &Paint) -> Vec<String> { paint.paint(Style::Id, &text(&node["id"])) )); let heard = match node["heard"].as_u64() { - Some(0) => paint.paint(Style::Good, "this node"), + _ if node["here"].as_bool() == Some(true) => paint.paint(Style::Good, "this node"), Some(seconds) if seconds <= LATELY => { paint.paint(Style::Good, &format!("heard {}", ago(seconds))) } @@ -770,19 +772,29 @@ mod tests { "lass": { "keys": ["ssh-ed25519 AAAAone"], "keySet": ["ssh-ed25519 AAAAone"], - "nodes": [{ - "id": "continuum:9c07", - "name": "beta", - "heard": 0, - "knows": {"wire": [52, 52], "revision": {"named": "the base revision"}}, - }], + "nodes": [ + { + "id": "continuum:9c07", + "name": "beta", + "here": true, + "heard": 0, + "knows": {"wire": [52, 52], "revision": {"named": "the base revision"}}, + }, + { + "id": "continuum:3b1e", + "name": null, + "here": false, + "heard": 0, + "knows": {"wire": [52, 52], "revision": null}, + }, + ], }, "tv": { "keys": ["ssh-ed25519 AAAAtwo"], "keySet": ["ssh-ed25519 AAAAthree"], "nodes": [ - {"id": "continuum:5be1", "name": null, "heard": LATELY + 1, "knows": null}, - {"id": "continuum:77d0", "name": null, "heard": null, "knows": null}, + {"id": "continuum:5be1", "name": null, "here": false, "heard": LATELY + 1, "knows": null}, + {"id": "continuum:77d0", "name": null, "here": false, "heard": null, "knows": null}, ], }, }, @@ -839,6 +851,8 @@ mod tests { has(" tv"); has(" continuum:9c07 (beta)"); has(" this node; wire 52; the base revision"); + // Another node heard from within the second is no less another. + has(" heard 0 s ago; wire 52; no federation"); has(&format!( " heard {}; said nothing of what it runs", ago(LATELY + 1) |
