Mirrors/gomuks
1
0
Fork 1
mirror of https://github.com/tulir/gomuks.git synced 2025-04-20 18:43:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

web/timeline: render ACL changes in details tag (#613)

Browse source 
Signed-off-by: Sumner Evans <me@sumnerevans.com>
This commit is contained in:
Sumner Evans 2025-04-20 05:08:53 -06:00 • committed by GitHub
parent d6c4cdf716
commit af2fe22ec0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 42 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
web/src/ui/timeline/content/ACLBody.tsx
View file

@ -13,9 +13,10 @@
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
import { Fragment, JSX } from "react"
import { JSX } from "react"
import { ACLEventContent } from "@/api/types"
import { listDiff } from "@/util/diff.ts"
import { humanJoin } from "@/util/join.ts"
import { humanJoinReact, joinReact } from "@/util/reactjoin.tsx"
import { ensureArray, ensureStringArray } from "@/util/validation.ts"
import EventContentProps from "./props.ts"
@ -28,7 +29,7 @@ function makeACLChangeString(
addedAllow: string[], removedAllow: string[],
addedDeny: string[], removedDeny: string[],
prevAllowIP: boolean, newAllowIP: boolean,
) {
): JSX.Element[] {
const parts = []
if (addedDeny.length > 0) {
parts.push(<>Servers matching {joinServers(addedDeny)} are now banned.</>)
@ -50,6 +51,32 @@ function makeACLChangeString(
return joinReact(parts)
}
function makeACLChangeStringSummary(
addedAllow: string[], removedAllow: string[],
addedDeny: string[], removedDeny: string[],
prevAllowIP: boolean, newAllowIP: boolean,
): string {
const pluralEntryCount = (list: string[]) => `${list.length} ${list.length > 1 ? "entries" : "entry"}`
const parts = []
if (addedDeny.length > 0) {
parts.push(`added ${pluralEntryCount(addedDeny)} to the ban list`)
}
if (removedDeny.length > 0) {
parts.push(`removed ${pluralEntryCount(removedDeny)} from the ban list`)
}
if (addedAllow.length > 0) {
parts.push(`added ${pluralEntryCount(addedAllow)} to the allow list`)
}
if (removedAllow.length > 0) {
parts.push(`removed ${pluralEntryCount(removedAllow)} from the allow list`)
}
if (prevAllowIP !== newAllowIP) {
parts.push(
`${newAllowIP ? "allowed" : "banned"} participating from a server using an IP literal hostname`)
}
return humanJoin(parts)
}
const ACLBody = ({ event, sender }: EventContentProps) => {
const content = event.content as ACLEventContent
const prevContent = event.unsigned.prev_content as ACLEventContent | undefined
@ -66,14 +93,22 @@ const ACLBody = ({ event, sender }: EventContentProps) => {
{sender?.content.displayname ?? event.sender} sent a server ACL event with no changes
</div>
}
let changeString = makeACLChangeString(addedAllow, removedAllow, addedDeny, removedDeny, prevAllowIP, newAllowIP)
if (ensureArray(content.allow).length === 0) {
changeString = [<Fragment key="yay">
if (ensureArray(content.allow).length === 0 || ensureArray(content.deny).includes("*")) {
return <div className="acl-body">
{sender?.content.displayname ?? event.sender} changed the server ACLs:
🎉 All servers are banned from participating! This room can no longer be used.
</Fragment>]
</div>
}
const changeString = makeACLChangeString(addedAllow, removedAllow, addedDeny, removedDeny, prevAllowIP, newAllowIP)
const changeStringSummary = makeACLChangeStringSummary(
addedAllow, removedAllow, addedDeny, removedDeny, prevAllowIP, newAllowIP)
return <div className="acl-body">
{sender?.content.displayname ?? event.sender} changed the server ACLs: {changeString}
<details>
<summary>
{sender?.content.displayname ?? event.sender} {changeStringSummary}
</summary>
{changeString}
</details>
</div>
}