A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
feat(admin): let self-host assign premium, show sign-in state
Hampusf0af1af755b9
diff --git a/fluxer_admin/src/templates/pages/user_detail_tabs/overview.rs b/fluxer_admin/src/templates/pages/user_detail_tabs/overview.rsindex d406a34b8..c718a539a 100644--- a/fluxer_admin/src/templates/pages/user_detail_tabs/overview.rs+++ b/fluxer_admin/src/templates/pages/user_detail_tabs/overview.rs@@ -2,11 +2,11 @@use crate::{acl, admin_flags,- api::types::{AdminUser, LimitConfigResponse, ListUserChangeLogResponse},+ api::types::{AdminUser, LimitConfigResponse, ListUserChangeLogResponse, account_tier_label},config::AdminConfig,templates::components::{badge::{BadgeVariant, badge},- form::{checkbox, csrf_input, form_actions, submit_button},+ form::{Checkbox, csrf_input, form_actions, submit_button},page_container::{card_with_header, detail_row},},templates::pages::enforcement_decision::suspension_label,@@ -142,6 +142,24 @@ fn render_overview_tab(}}))}+ @if let Some(tier) = user.account_tier {+ (detail_row("Account Tier", html! {+ (account_tier_label(tier))+ }))+ }+ (detail_row("Sign-in", html! {+ @if user.claimed {+ "Can sign in from another device"+ } @else {+ span class="text-orange-600" { "Unclaimed, no way back in after sign-out" }+ }+ @if !user.has_password { span class="ml-1 text-neutral-500" { "(no password)" } }+ }))+ @if user.date_of_birth_required {+ (detail_row("Date of Birth Step", html! {+ span class="text-orange-600" { "Waiting for a date of birth" }+ }))+ }@if acl::has_permission(admin_acls, acl::USER_VIEW_DOB) {(detail_row("Date of Birth", html! {(user.date_of_birth.as_deref().unwrap_or("Not set"))@@ -302,13 +320,16 @@ fn flags_card(can_update_flags,html! {@for flag in admin_flags::USER_FLAGS {- (checkbox(- "flags[]",- &flag.value.to_string(),- flag.name,- user.flags & flag.value != 0,- can_update_flags && admin_flags::user_flag_is_editable(flag.value, user.flags, suspended),- ))+ div class="space-y-0.5" {+ (Checkbox {+ name: "flags[]",+ value: &flag.value.to_string(),+ label: flag.name,+ checked: user.flags & flag.value != 0,+ enabled: can_update_flags && admin_flags::user_flag_is_editable(flag.value, user.flags, suspended),+ }.render())+ p class="pl-6 text-xs text-neutral-500" { (flag.help) }+ }}},))@@ -321,13 +342,13 @@ fn flags_card(can_update_flags,html! {@for flag in admin_flags::PREMIUM_FLAGS {- (checkbox(- "flags[]",- &flag.value.to_string(),- flag.name,- user.premium_flags & flag.value != 0,- can_update_flags && admin_flags::premium_flag_is_editable(flag.value),- ))+ (Checkbox {+ name: "flags[]",+ value: &flag.value.to_string(),+ label: flag.name,+ checked: user.premium_flags & flag.value != 0,+ enabled: can_update_flags && admin_flags::premium_flag_is_editable(flag.value),+ }.render())}},))@@ -369,16 +390,6 @@ fn flag_form_shell()}-fn flag_checkbox(- input_name: &str,- value: String,- label: &str,- checked: bool,- can_edit: bool,-) -> Markup {- checkbox(input_name, &value, label, checked, can_edit)-}-fn acls_card(config: &AdminConfig,user: &AdminUser,@@ -396,7 +407,13 @@ fn acls_card(div class="grid grid-cols-1 gap-2 sm:grid-cols-2" {@for item in acl::ALL_ACLS {@let checked = user.acls.iter().any(|value| value == item);- (flag_checkbox("acls[]", item.to_string(), item, checked, true))+ (Checkbox {+ name: "acls[]",+ value: item,+ label: item,+ checked,+ enabled: true,+ }.render())}}@for item in &user.acls {@@ -434,8 +451,8 @@ fn traits_card(csrf_token: &str,limit_config: Option<&LimitConfigResponse>,) -> Markup {- let trait_definitions = parse_trait_definitions(limit_config);- let custom_traits = custom_traits(user, &trait_definitions);+ let trait_definitions = parse_trait_definitions(limit_config, config.self_hosted);+ let custom_traits = custom_traits(user, &trait_definitions, config.self_hosted);let can_edit = acl::has_permission(admin_acls, acl::USER_UPDATE_TRAITS);card_with_header("Traits",@@ -452,7 +469,7 @@ fn traits_card((assigned_traits(&user.traits))p class="text-sm text-red-700" { "Failed to load limit configuration." }}- @if trait_definitions.is_empty() {+ @if trait_definitions.iter().all(|definition| *definition == PREMIUM_TRAIT) {p class="text-neutral-500 text-xs" {"No trait definitions declared. "a href={(config.base_path) "/instance-config"} class="text-blue-600 underline" {@@ -493,13 +510,13 @@ fn traits_form(@if !trait_definitions.is_empty() {div class="grid grid-cols-1 gap-2 sm:grid-cols-2" {@for definition in trait_definitions {- (flag_checkbox(- "traits[]",- definition.to_string(),- definition,- user.traits.iter().any(|t| t == definition),- true,- ))+ (Checkbox {+ name: "traits[]",+ value: definition,+ label: definition,+ checked: user.traits.iter().any(|t| t == definition),+ enabled: true,+ }.render())}}}@@ -513,8 +530,13 @@ fn traits_form((custom_traits.join("\n"))}p class="text-neutral-500 text-xs" {- "The premium trait follows each member's subscription or gift and cannot be \- assigned here."+ @if config.self_hosted {+ "The premium trait gives this account premium limits. Accounts with a \+ subscription or gift get them without it."+ } @else {+ "The premium trait follows each member's subscription or gift and cannot be \+ assigned here."+ }}}(form_actions(html! {@@ -525,28 +547,48 @@ fn traits_form(}}-const DERIVED_TRAITS: [&str; 1] = ["premium"];+const PREMIUM_TRAIT: &str = "premium";++fn parse_trait_definitions(+ limit_config: Option<&LimitConfigResponse>,+ self_hosted: bool,+) -> Vec<&str> {+ let Some(response) = limit_config else {+ return Vec::new();+ };+ assignable_trait_definitions(+ response+ .limit_config+ .trait_definitions+ .iter()+ .map(|value| value.trim())+ .filter(|value| !value.is_empty()),+ self_hosted,+ )+}-fn parse_trait_definitions(limit_config: Option<&LimitConfigResponse>) -> Vec<&str> {- limit_config- .map(|response| {- response- .limit_config- .trait_definitions- .iter()- .map(|value| value.trim())- .filter(|value| !value.is_empty())- .filter(|value| !DERIVED_TRAITS.contains(value))- .collect()- })- .unwrap_or_default()+fn assignable_trait_definitions<'a>(+ definitions: impl Iterator<Item = &'a str>,+ self_hosted: bool,+) -> Vec<&'a str> {+ let mut assignable: Vec<&str> = definitions+ .filter(|value| self_hosted || *value != PREMIUM_TRAIT)+ .collect();+ if self_hosted && !assignable.contains(&PREMIUM_TRAIT) {+ assignable.insert(0, PREMIUM_TRAIT);+ }+ assignable}-fn custom_traits<'a>(user: &'a AdminUser, trait_definitions: &[&str]) -> Vec<&'a str> {+fn custom_traits<'a>(+ user: &'a AdminUser,+ trait_definitions: &[&str],+ self_hosted: bool,+) -> Vec<&'a str> {user.traits.iter().map(String::as_str).filter(|trait_name| !trait_definitions.contains(trait_name))- .filter(|trait_name| !DERIVED_TRAITS.contains(trait_name))+ .filter(|trait_name| self_hosted || *trait_name != PREMIUM_TRAIT).collect()}