1 files changed, 19 insertions, 3 deletions
diff --git a/packages/meshbay-node/src/meshbay_node/ops.py b/packages/meshbay-node/src/meshbay_node/ops.py
index baea365..b680d43 100644
--- a/packages/meshbay-node/src/meshbay_node/ops.py
+++ b/packages/meshbay-node/src/meshbay_node/ops.py
@@ -243,13 +243,29 @@ async def revoke_member(state: dict, user_id: str, group_id: str) -> dict:
     Takes effect on their next connection: the key is wrapped on demand, so there
     is no stored bundle left behind that would outlive this. Rotating the group
     key is still required — they hold the current one.
+
+    **An unredeemed invite is a membership that has not happened yet**, so it is
+    revoked here too, and on its own it is enough for this to be a removal. A
+    member row appears only when a code is consumed: somebody invited to the
+    wrong group has none, this refused them with "no such member", and the
+    browser's removal — node half first, deliberately — died on that refusal
+    before it reached the hub half. They stayed a member on the hub, with a live
+    code, and the interface offered no other way to take either back.
     """
     roster = _roster(state)
-    if not await roster.set_status(group_id, user_id, "revoked"):
+    revoked = await roster.set_status(group_id, user_id, "revoked")
+    dropped = await roster.drop_invites(group_id, user_id)
+    if not revoked and not dropped:
         raise OpError("No such member in that group", status=404)
-    log.info("Member revoked: user=%s group=%s", user_id[:8], group_id[:8])
+    log.info("Member revoked: user=%s group=%s member=%s invites_dropped=%d",
+             user_id[:8], group_id[:8], revoked, dropped)
     return {"status": "revoked", "user_id": user_id, "group_id": group_id,
-            "reminder": "rotate the group key: meshbay-node gek rotate"}
+            "was_member": revoked, "invites_dropped": dropped,
+            # Only what is true: somebody who never redeemed a code never held
+            # the key, and telling an operator to rotate it teaches them that
+            # the advice is noise.
+            "reminder": ("rotate the group key: meshbay-node gek rotate"
+                         if revoked else "")}
 
 
 async def unpin_member(state: dict, user_id: str) -> dict: