1 files changed, 53 insertions, 0 deletions
diff --git a/packages/meshbay-hub/src/meshbay_hub/api/groups.py b/packages/meshbay-hub/src/meshbay_hub/api/groups.py
index a8a45c9..e0ea016 100644
--- a/packages/meshbay-hub/src/meshbay_hub/api/groups.py
+++ b/packages/meshbay-hub/src/meshbay_hub/api/groups.py
@@ -162,6 +162,59 @@ async def swarm_sources(
     }
 
 
+@router.get("/{group_id}/members")
+async def group_members(
+    group_id: str,
+    current_user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+):
+    group = await db.get(Group, group_id)
+    if not group:
+        raise HTTPException(status_code=404, detail="Group not found")
+
+    mem = await db.get(GroupMember, (group_id, current_user.id))
+    if not mem:
+        raise HTTPException(status_code=403, detail="Not a member")
+
+    result = await db.execute(
+        select(User.id, User.username)
+        .join(GroupMember, User.id == GroupMember.user_id)
+        .where(GroupMember.group_id == group_id)
+    )
+    members = [{"user_id": uid, "username": uname} for uid, uname in result.all()]
+    return {
+        "group_id": group_id,
+        "admin_id": group.admin_id,
+        "members": members,
+    }
+
+
+@router.post("/{group_id}/join")
+async def join_group(
+    group_id: str,
+    request: Request,
+    current_user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+):
+    group = await db.get(Group, group_id)
+    if not group:
+        raise HTTPException(status_code=404, detail="Group not found")
+    if group.status != "active":
+        raise HTTPException(status_code=403, detail="Group is not active")
+    if group.join_policy != "open":
+        raise HTTPException(status_code=403, detail="Group does not allow open joining")
+
+    existing = await db.get(GroupMember, (group_id, current_user.id))
+    if existing:
+        raise HTTPException(status_code=409, detail="Already a member")
+
+    db.add(GroupMember(group_id=group_id, user_id=current_user.id))
+    db.add(IPLog(user_id=current_user.id, event="group_join",
+                 ip_address=_ip(request), detail=group.name))
+    await db.commit()
+    return {"status": "joined", "group_id": group_id, "name": group.name}
+
+
 class GroupCreateRequest(BaseModel):
     name:        str
     visibility:  str = "private"   # public|private