Skip to content

Commit

Permalink
web/timeline: add better messages for knocks
Browse files Browse the repository at this point in the history
  • Loading branch information
tulir committed Mar 3, 2025
1 parent e20f316 commit d234981
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions web/src/ui/timeline/content/MemberBody.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,22 +87,27 @@ function useChangeDescription(
} else if (content.membership === "join") {
return "joined the room"
} else if (content.membership === "invite") {
if (prevContent?.membership === "knock") {
return <>accepted {makeTargetElem()}'s join request</>
}
return <>invited {makeTargetElem()}</>
} else if (content.membership === "ban") {
return <>banned {makeTargetElem()}</>
} else if (content.membership === "knock") {
return "knocked on the room"
return "requested to join the room"
} else if (content.membership === "leave") {
if (sender === target) {
if (prevContent?.membership === "knock") {
return "cancelled their knock"
return "cancelled their join request"
}
return "left the room"
}
if (prevContent?.membership === "ban") {
return <>unbanned {makeTargetElem()}</>
} else if (prevContent?.membership === "invite") {
return <>disinvited {makeTargetElem()}</>
} else if (prevContent?.membership === "knock") {
return <>rejected {makeTargetElem()}'s join request</>
}
return <>kicked {makeTargetElem()}</>
}
Expand Down

0 comments on commit d234981

Please sign in to comment.