Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

feat(admin): show API profile badges and verification level

Hampusee4b5f494f19
diff --git a/fluxer_admin/src/api/types/common.rs b/fluxer_admin/src/api/types/common.rs
index 53824e8ba..dee9c7577 100644
--- a/fluxer_admin/src/api/types/common.rs
+++ b/fluxer_admin/src/api/types/common.rs
@@ -2,6 +2,12 @@
use serde::{Deserialize, Deserializer, Serialize};
+use crate::api::generated::types::AccountTierSchema;
+
+fn default_true() -> bool {
+ true
+}
+
pub fn deserialize_discriminator<'de, D: Deserializer<'de>>(d: D) -> Result<String, D::Error> {
let v: serde_json::Value = Deserialize::deserialize(d)?;
match v {
@@ -104,7 +110,17 @@ pub struct AdminUser {
pub premium_grace_ends_at: Option<String>,
pub premium_lifetime_sequence: Option<i32>,
#[serde(default)]
+ pub profile_badges: Vec<AdminProfileBadge>,
+ #[serde(default)]
pub has_totp: bool,
+ #[serde(default = "default_true")]
+ pub has_password: bool,
+ #[serde(default = "default_true")]
+ pub claimed: bool,
+ #[serde(default)]
+ pub account_tier: Option<AccountTierSchema>,
+ #[serde(default)]
+ pub date_of_birth_required: bool,
#[serde(default)]
pub authenticator_types: Vec<i32>,
pub temp_banned_until: Option<String>,
@@ -126,6 +142,28 @@ pub struct AdminUser {
pub last_active_location: Option<String>,
}
+pub fn account_tier_label(tier: AccountTierSchema) -> &'static str {
+ match tier {
+ AccountTierSchema::Unclaimed => "Unclaimed",
+ AccountTierSchema::Unverified => "Unverified",
+ AccountTierSchema::Verified => "Verified",
+ }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct AdminProfileBadge {
+ pub kind: String,
+ pub label: String,
+ pub asset: Option<String>,
+ #[serde(default)]
+ pub small_asset: Option<String>,
+ #[serde(default)]
+ pub aspect_ratio: Option<f64>,
+ pub caption: Option<String>,
+ pub href: Option<String>,
+ pub suppressed: bool,
+}
+
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct GuildInfo {
pub id: String,
diff --git a/fluxer_admin/src/templates/components/user_profile_badges.rs b/fluxer_admin/src/templates/components/user_profile_badges.rs
index 04be013a3..421d0cdca 100644
--- a/fluxer_admin/src/templates/components/user_profile_badges.rs
+++ b/fluxer_admin/src/templates/components/user_profile_badges.rs
@@ -1,104 +1,72 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-use crate::admin_flags::user_flag_bits;
-use crate::utils::timestamps::format_admin_timestamp;
+use crate::api::types::AdminProfileBadge;
use maud::{Markup, html};
-pub mod premium_types {
- pub const NONE: i32 = 0;
- pub const LIFETIME: i32 = 2;
+#[derive(Clone, Copy)]
+pub enum BadgeSize {
+ Detail,
+ Dense,
}
-struct BadgeDef {
- icon_url: String,
- tooltip: String,
-}
+impl BadgeSize {
+ fn image_class(self, aspect_ratio: Option<f64>) -> &'static str {
+ match (self, aspect_ratio.is_some()) {
+ (BadgeSize::Detail, false) => "h-6 w-6 shrink-0",
+ (BadgeSize::Detail, true) => "h-6 w-auto shrink-0",
+ (BadgeSize::Dense, false) => "h-5 w-5 shrink-0",
+ (BadgeSize::Dense, true) => "h-5 w-auto shrink-0",
+ }
+ }
-fn premium_tooltip(
- premium_type: i32,
- premium_since: Option<&str>,
- is_self_hosted: bool,
- self_hosted_premium_name: Option<&str>,
-) -> Option<String> {
- if is_self_hosted {
- let name = self_hosted_premium_name?;
- return Some(match premium_since {
- Some(since) => format!("{name} subscriber since {}", format_admin_timestamp(since)),
- None => name.to_owned(),
- });
+ fn asset(self, badge: &AdminProfileBadge) -> Option<&str> {
+ match self {
+ BadgeSize::Detail => badge.asset.as_deref(),
+ BadgeSize::Dense => badge.small_asset.as_deref().or(badge.asset.as_deref()),
+ }
}
- Some(if premium_type == premium_types::LIFETIME {
- match premium_since {
- Some(since) => format!("Fluxer Visionary since {}", format_admin_timestamp(since)),
- None => "Fluxer Visionary".into(),
+
+ fn caption_class(self) -> &'static str {
+ match self {
+ BadgeSize::Detail => "inline-flex h-6 items-center text-base",
+ BadgeSize::Dense => "inline-flex h-5 items-center text-sm",
}
+ }
+}
+
+fn badge_title(badge: &AdminProfileBadge) -> String {
+ if badge.suppressed {
+ format!("{} (hidden from public)", badge.label)
} else {
- match premium_since {
- Some(since) => format!(
- "Fluxer Plutonium subscriber since {}",
- format_admin_timestamp(since)
- ),
- None => "Fluxer Plutonium".into(),
- }
- })
+ badge.label.clone()
+ }
}
pub fn user_profile_badges(
static_cdn_endpoint: &str,
- flags: u64,
- premium_type: Option<i32>,
- premium_since: Option<&str>,
- is_self_hosted: bool,
- self_hosted_premium_name: Option<&str>,
- size_sm: bool,
+ badges: &[AdminProfileBadge],
+ size: BadgeSize,
) -> Markup {
- let cdn = static_cdn_endpoint.trim_end_matches('/');
- let mut badges: Vec<BadgeDef> = Vec::new();
-
- if flags & user_flag_bits::STAFF != 0 {
- badges.push(BadgeDef {
- icon_url: format!("{cdn}/badges/staff.svg?v=2"),
- tooltip: "Fluxer Staff".into(),
- });
- }
- if !is_self_hosted && flags & user_flag_bits::PARTNER != 0 {
- badges.push(BadgeDef {
- icon_url: format!("{cdn}/badges/partner.svg"),
- tooltip: "Fluxer Partner".into(),
- });
- }
- if !is_self_hosted && flags & user_flag_bits::BUG_HUNTER != 0 {
- badges.push(BadgeDef {
- icon_url: format!("{cdn}/badges/bug-hunter.svg"),
- tooltip: "Fluxer Bug Hunter".into(),
- });
- }
- if let Some(pt) = premium_type
- && pt != premium_types::NONE
- && let Some(tooltip) =
- premium_tooltip(pt, premium_since, is_self_hosted, self_hosted_premium_name)
- {
- badges.push(BadgeDef {
- icon_url: format!("{cdn}/badges/plutonium.svg"),
- tooltip,
- });
- }
-
if badges.is_empty() {
return html! {};
}
-
- let (badge_size, container_gap) = if size_sm {
- ("h-4 w-4 shrink-0", "flex items-center gap-1.5")
- } else {
- ("h-5 w-5 shrink-0", "flex items-center gap-2")
- };
-
+ let cdn = static_cdn_endpoint.trim_end_matches('/');
html! {
- div class=(container_gap) {
- @for b in &badges {
- img src=(b.icon_url) alt=(b.tooltip) title=(b.tooltip)
- class=(badge_size);
+ div class="flex items-center gap-1.5" {
+ @for badge in badges {
+ @let title = badge_title(badge);
+ @let opacity = if badge.suppressed { " opacity-50" } else { "" };
+ @if let Some(asset) = size.asset(badge) {
+ img src={(cdn) "/badges/" (asset) ".webp"}
+ alt=(badge.caption.as_deref().unwrap_or(&title)) title=(title)
+ class={(size.image_class(badge.aspect_ratio)) (opacity)}
+ style=[badge.aspect_ratio.map(|ratio| format!("aspect-ratio: {ratio}"))];
+ } @else if let Some(caption) = &badge.caption {
+ span title=(title)
+ class={(size.caption_class()) " font-bold tabular-nums text-indigo-600" (opacity)} {
+ (caption)
+ }
+ }
}
}
}
diff --git a/fluxer_admin/src/templates/pages/user_detail.rs b/fluxer_admin/src/templates/pages/user_detail.rs
index c06a51f59..09ae9df0b 100644
--- a/fluxer_admin/src/templates/pages/user_detail.rs
+++ b/fluxer_admin/src/templates/pages/user_detail.rs
@@ -10,7 +10,7 @@ use crate::{
detail_tabs::{build_detail_tabs, detail_tabs},
empty_state::not_found_state,
media::{user_avatar_url, user_banner_url},
- user_profile_badges::user_profile_badges,
+ user_profile_badges::{BadgeSize, user_profile_badges},
},
layout::admin_layout,
pages::user_detail_tabs,
@@ -41,13 +41,10 @@ pub fn user_detail_with_tab(
user_id: &str,
active_tab: &str,
tab_body: Option<Markup>,
- premium_badge_name: Option<&str>,
is_htmx: bool,
) -> Markup {
let content = match user {
- Some(user) => {
- render_user_detail(config, auth, user, active_tab, tab_body, premium_badge_name)
- }
+ Some(user) => render_user_detail(config, auth, user, active_tab, tab_body),
None => not_found_state("User", user_id, None, None),
};
let title = user
@@ -73,7 +70,6 @@ fn render_user_detail(
user: &AdminUser,
active_tab: &str,
tab_body: Option<Markup>,
- premium_badge_name: Option<&str>,
) -> Markup {
let display_name = user
.global_name
@@ -134,12 +130,8 @@ fn render_user_detail(
}
(user_profile_badges(
&config.static_cdn_endpoint,
- user.flags,
- user.premium_type,
- user.premium_since.as_deref(),
- config.self_hosted,
- premium_badge_name,
- false,
+ &user.profile_badges,
+ BadgeSize::Detail,
))
}
p class="break-words text-sm text-neutral-500" {
diff --git a/fluxer_admin/src/templates/pages/user_peek.rs b/fluxer_admin/src/templates/pages/user_peek.rs
index 7d8b613d0..94195927b 100644
--- a/fluxer_admin/src/templates/pages/user_peek.rs
+++ b/fluxer_admin/src/templates/pages/user_peek.rs
@@ -2,13 +2,13 @@
use crate::{
acl,
- api::types::AdminUser,
+ api::types::{AdminUser, account_tier_label},
config::AdminConfig,
templates::components::{
badge::{BadgeVariant, badge},
data_field::{data_field_mono, data_field_muted, data_field_text, data_grid},
media::user_avatar_url,
- user_profile_badges::user_profile_badges,
+ user_profile_badges::{BadgeSize, user_profile_badges},
},
utils::{
bigint::format_discriminator, timestamps::snowflake_creation_date, user_tag::user_tag,
@@ -35,12 +35,7 @@ fn status_badge(user: &AdminUser) -> Markup {
}
}
-pub fn user_peek_fragment(
- config: &AdminConfig,
- user: &AdminUser,
- admin_acls: &[String],
- premium_badge_name: Option<&str>,
-) -> Markup {
+pub fn user_peek_fragment(config: &AdminConfig, user: &AdminUser, admin_acls: &[String]) -> Markup {
let base = &config.base_path;
let can_view_email = acl::has_permission(admin_acls, acl::USER_VIEW_EMAIL);
let display = user
@@ -65,12 +60,8 @@ pub fn user_peek_fragment(
}
(user_profile_badges(
&config.static_cdn_endpoint,
- user.flags,
- user.premium_type,
- user.premium_since.as_deref(),
- config.self_hosted,
- premium_badge_name,
- true,
+ &user.profile_badges,
+ BadgeSize::Dense,
))
}
p class="break-words text-sm text-neutral-500" {
@@ -92,6 +83,9 @@ pub fn user_peek_fragment(
(data_field_text("Email status", email_status_label(user)))
}
}
+ @if let Some(tier) = user.account_tier {
+ (data_field_text("Account tier", account_tier_label(tier)))
+ }
@if let Some(pt) = user.premium_type {
(data_field_text("Premium type", premium_type_label(pt)))
}