Answer what we may do in one place: Permissions
The rules were spread over ServerSession's can* methods, ServerModel's permits/mayHavePower/canDelete*, TeamspeakConnection and AvatarAdmin, and Swing dialogs and Android's ServerController passed raw permission names. Permissions now holds the server's permission table and the rules (offered until the server says, unreported powers unknown until asked) and answers one named question per capability. ServerSession.permissions() is the gate for frontends: Permissions.NONE, allowing nothing, while disconnected. ServerController's forwarding properties go the same way. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -10,6 +10,7 @@ import eu.lixko.ts3j.client.net.ChannelSettings
|
||||
import eu.lixko.ts3j.client.net.ConnectionStats
|
||||
import eu.lixko.ts3j.client.net.Details
|
||||
import eu.lixko.ts3j.client.net.GroupChoice
|
||||
import eu.lixko.ts3j.client.net.Permissions
|
||||
import eu.lixko.ts3j.client.net.RequestException
|
||||
import eu.lixko.ts3j.client.net.Whisper
|
||||
import eu.lixko.ts3j.client.net.ban.BanEntry
|
||||
@@ -194,7 +195,8 @@ class ServerController internal constructor(
|
||||
|
||||
fun expand(channelIds: Collection<Int>) = _collapsed.update { it - channelIds.toSet() }
|
||||
|
||||
val canMoveClients: Boolean get() = session.canMoveClients()
|
||||
/** What we may do on this server; nothing while not connected. */
|
||||
val permissions: Permissions get() = session.permissions()
|
||||
|
||||
/** The channel kicked clients go back to; 0 until the server named it. */
|
||||
val defaultChannelId: Int get() = conn.model.defaultChannelId()
|
||||
@@ -241,10 +243,6 @@ class ServerController internal constructor(
|
||||
|
||||
// ---- channel administration ----
|
||||
|
||||
val canCreateChannels: Boolean get() = session.canCreateChannels()
|
||||
val canEditChannels: Boolean get() = session.canEditChannels()
|
||||
val canDeleteChannels: Boolean get() = session.canDeleteChannels()
|
||||
|
||||
/** The channels a channel can sort after: its siblings, or [parentId]'s children for a new one. */
|
||||
fun sortChoices(channelId: Int, parentId: Int): List<ChannelNode> =
|
||||
if (channelId > 0) conn.model.siblingsOf(channelId) else conn.model.childrenOf(parentId)
|
||||
@@ -283,17 +281,7 @@ class ServerController internal constructor(
|
||||
|
||||
// ---- moderation ----
|
||||
|
||||
val canKickFromChannel: Boolean get() = session.canKickFromChannel()
|
||||
val canKickFromServer: Boolean get() = session.canKickFromServer()
|
||||
val canBanClients: Boolean get() = session.canBanClients()
|
||||
val canGrantTalkPower: Boolean get() = session.canGrantTalkPower()
|
||||
val canRequestTalkPower: Boolean get() = session.canRequestTalkPower()
|
||||
val canViewBanList: Boolean get() = session.canViewBanList()
|
||||
val canBrowseFiles: Boolean get() = session.canBrowseFiles()
|
||||
val canCreateBans: Boolean get() = session.isConnected && conn.model.permits("b_client_ban_create")
|
||||
|
||||
/** The longest ban we may hand out in seconds; 0 or -1 for no limit. */
|
||||
val maxBanSeconds: Long get() = conn.model.maxBanSeconds()
|
||||
|
||||
fun kickFromChannel(clientIds: Collection<Int>, reason: String) {
|
||||
if (session.isConnected) conn.kickFromChannel(clientIds, reason)
|
||||
@@ -345,9 +333,9 @@ class ServerController internal constructor(
|
||||
|
||||
suspend fun deleteBans(banIds: Collection<Int>): Result<Unit> = conn.deleteBans(banIds).done()
|
||||
|
||||
fun canDeleteBans(bans: Collection<BanEntry>): Boolean = conn.model.canDeleteBans(bans, conn.selfUniqueId)
|
||||
fun canDeleteBans(bans: Collection<BanEntry>): Boolean = permissions.canDeleteBans(bans, conn.selfUniqueId)
|
||||
|
||||
fun canEditBan(ban: BanEntry): Boolean = conn.model.canEditBan(ban, conn.selfUniqueId)
|
||||
fun canEditBan(ban: BanEntry): Boolean = permissions.canEditBan(ban, conn.selfUniqueId)
|
||||
|
||||
fun isOwnBan(ban: BanEntry): Boolean = ban.createdBy(conn.selfUniqueId)
|
||||
|
||||
|
||||
@@ -102,7 +102,7 @@ fun BanListScreen(server: ServerController, presets: BanReasonPresets, onBack: (
|
||||
|
||||
edit?.let { e ->
|
||||
val existing = (e as? BanEdit.Existing)?.ban
|
||||
BanEditor(existing, presets, server.maxBanSeconds, onBack = { edit = null }) { rule ->
|
||||
BanEditor(existing, presets, server.permissions.maxBanSeconds(), onBack = { edit = null }) { rule ->
|
||||
edit = null
|
||||
if (existing == null) change({ server.addBan(rule) }, "Error adding ban")
|
||||
else change({ server.replaceBan(existing.id, rule) }, "Error editing ban")
|
||||
@@ -113,7 +113,7 @@ fun BanListScreen(server: ServerController, presets: BanReasonPresets, onBack: (
|
||||
SubScreen(
|
||||
"Ban list", onBack,
|
||||
actions = {
|
||||
if (server.canCreateBans) IconButton(onClick = { edit = BanEdit.New }) { PackIcon("ADD", "Add") }
|
||||
if (server.permissions.canCreateBans()) IconButton(onClick = { edit = BanEdit.New }) { PackIcon("ADD", "Add") }
|
||||
IconButton(onClick = { generation++ }) { PackIcon("REFRESH", "Reload") }
|
||||
},
|
||||
snackbar = snackbar,
|
||||
|
||||
@@ -190,10 +190,10 @@ fun GroupsDialog(
|
||||
fun clientModeration(server: ServerController, client: ClientItem, onDone: () -> Unit): (@Composable () -> Unit)? {
|
||||
val serverGroups = remember(client) { server.serverGroupChoices(client.id) }
|
||||
val channelGroups = remember(client) { server.channelGroupChoices(client.id) }
|
||||
val kickChannel = !client.self && server.canKickFromChannel
|
||||
val kickServer = !client.self && server.canKickFromServer
|
||||
val ban = !client.self && server.canBanClients
|
||||
val talker = server.canGrantTalkPower && (client.talker || client.lacksTalkPower)
|
||||
val kickChannel = !client.self && server.permissions.canKickFromChannel()
|
||||
val kickServer = !client.self && server.permissions.canKickFromServer()
|
||||
val ban = !client.self && server.permissions.canBanClients()
|
||||
val talker = server.permissions.canGrantTalkPower() && (client.talker || client.lacksTalkPower)
|
||||
val showServerGroups = serverGroups.any { it.allowed() }
|
||||
val showChannelGroups = channelGroups.any { it.allowed() && !it.assigned() }
|
||||
if (!(talker || kickChannel || kickServer || ban || showServerGroups || showChannelGroups)) return null
|
||||
@@ -242,7 +242,7 @@ private fun ClientModeration(
|
||||
}
|
||||
}
|
||||
if (banning) {
|
||||
BanPrompt(client.name, server.maxBanSeconds, onDismiss = { banning = false }) { seconds, reason ->
|
||||
BanPrompt(client.name, server.permissions.maxBanSeconds(), onDismiss = { banning = false }) { seconds, reason ->
|
||||
banning = false
|
||||
server.ban(client.id, seconds, reason)
|
||||
onDone()
|
||||
|
||||
@@ -350,10 +350,10 @@ fun ServerScreen(
|
||||
val outside = tree.channel(state.channelId)?.clients.orEmpty().map { it.id }.let { selection - it.toSet() }
|
||||
SelectionBar(
|
||||
count = selection.size,
|
||||
onMove = if (server.canMoveClients) ({ moving = selection }) else null,
|
||||
onMoveHere = if (server.canMoveClients && outside.isNotEmpty()) ({ moveTo(state.channelId, outside) }) else null,
|
||||
onKickChannel = if (server.canKickFromChannel && kickable(false).isNotEmpty()) ({ kickingSelection = false }) else null,
|
||||
onKickServer = if (server.canKickFromServer && kickable(true).isNotEmpty()) ({ kickingSelection = true }) else null,
|
||||
onMove = if (server.permissions.canMoveClients()) ({ moving = selection }) else null,
|
||||
onMoveHere = if (server.permissions.canMoveClients() && outside.isNotEmpty()) ({ moveTo(state.channelId, outside) }) else null,
|
||||
onKickChannel = if (server.permissions.canKickFromChannel() && kickable(false).isNotEmpty()) ({ kickingSelection = false }) else null,
|
||||
onKickServer = if (server.permissions.canKickFromServer() && kickable(true).isNotEmpty()) ({ kickingSelection = true }) else null,
|
||||
onClear = { picked = emptySet() },
|
||||
)
|
||||
}
|
||||
@@ -402,7 +402,7 @@ fun ServerScreen(
|
||||
foundCurrent = treeAt?.takeIf { it in treeHits }?.let { TreeRef(treeFind.channels, it) },
|
||||
listState = treeList,
|
||||
selected = selection,
|
||||
onClientLongPress = if (server.canMoveClients || server.canKickFromChannel || server.canKickFromServer) {
|
||||
onClientLongPress = if (server.permissions.canMoveClients() || server.permissions.canKickFromChannel() || server.permissions.canKickFromServer()) {
|
||||
{ picked = selection + it.id }
|
||||
} else null,
|
||||
onShowSelf = {
|
||||
@@ -467,8 +467,8 @@ fun ServerScreen(
|
||||
clientSheet = null
|
||||
server.clientRef(id)?.let { ref -> toWhisperList = client.name to { it.clients.add(ref) } }
|
||||
}) else null,
|
||||
onMove = if (server.canMoveClients) ({ clientSheet = null; moving = setOf(id) }) else null,
|
||||
onMoveToOwnChannel = if (server.canMoveClients && tree.channel(state.channelId)?.clients?.none { it.id == id } == true) {
|
||||
onMove = if (server.permissions.canMoveClients()) ({ clientSheet = null; moving = setOf(id) }) else null,
|
||||
onMoveToOwnChannel = if (server.permissions.canMoveClients() && tree.channel(state.channelId)?.clients?.none { it.id == id } == true) {
|
||||
{ server.moveClients(listOf(id), state.channelId); clientSheet = null }
|
||||
} else null,
|
||||
onFindInTree = if (clientSheetFromTree) null else ({
|
||||
@@ -497,13 +497,13 @@ fun ServerScreen(
|
||||
channelSheet = null
|
||||
server.channelRef(id)?.let { ref -> toWhisperList = channel.name to { it.channels.add(ref) } }
|
||||
}) else null,
|
||||
onFiles = if (server.canBrowseFiles) ({
|
||||
onFiles = if (server.permissions.canBrowseFiles()) ({
|
||||
channelSheet = null
|
||||
if (channel.locked) filesLocked = id else files = FilesOf(id, channel.name, "")
|
||||
}) else null,
|
||||
onCreateSub = if (server.canCreateChannels) ({ channelSheet = null; channelEdit = ChannelEdit(0, id) }) else null,
|
||||
onEdit = if (server.canEditChannels) ({ channelSheet = null; channelEdit = ChannelEdit(id) }) else null,
|
||||
onDelete = if (server.canDeleteChannels) ({ channelSheet = null; deletingChannel = id }) else null,
|
||||
onCreateSub = if (server.permissions.canCreateChannels()) ({ channelSheet = null; channelEdit = ChannelEdit(0, id) }) else null,
|
||||
onEdit = if (server.permissions.canEditChannels()) ({ channelSheet = null; channelEdit = ChannelEdit(id) }) else null,
|
||||
onDelete = if (server.permissions.canDeleteChannels()) ({ channelSheet = null; deletingChannel = id }) else null,
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -567,8 +567,8 @@ fun ServerScreen(
|
||||
remember(tree, infoUpdates) { server.serverDetails() }?.let {
|
||||
ServerSheet(it, onLink, onDismiss = { serverSheet = false },
|
||||
onBookmark = { serverSheet = false; bookmarkHere(state.channelId) },
|
||||
onBanList = if (server.canViewBanList) ({ serverSheet = false; banList = true }) else null,
|
||||
onCreateChannel = if (server.canCreateChannels) ({ serverSheet = false; channelEdit = ChannelEdit(0, 0) }) else null)
|
||||
onBanList = if (server.permissions.canViewBanList()) ({ serverSheet = false; banList = true }) else null,
|
||||
onCreateChannel = if (server.permissions.canCreateChannels()) ({ serverSheet = false; channelEdit = ChannelEdit(0, 0) }) else null)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user