diff --git a/HANDOFF.md b/HANDOFF.md index ef2b389..9c4fe4b 100644 --- a/HANDOFF.md +++ b/HANDOFF.md @@ -7,17 +7,66 @@ ## Session state (last updated: 2026-08-12) -- **Finished:** Webcam resource validation (merged `e1d9e13`) + Social bar v1 (merged `8868f98`). 85 tests, 0 warnings. On `main`, pushed. -- **In flight:** Social bar UX is WRONG — the user was re-explaining what they actually want when ctrl+enter cut them off. The correction was NOT received. Do NOT continue the social bar until the user re-states their requirements. What I shipped vs. what they asked differs — they said "did you not understand what I asked for? It's pretty goddamn simple" but the message was lost. -- **What I shipped (may be wrong):** YT auto-add from connected account, two-box dialog (YT handle + URL/handle for other), service auto-detection from domain, fediverse `@user@domain` support, footer Social button + [+/-] on the LEFT under scenes/sources, meter centered under preview, colored initials badges (not real service logos). -- **What the user explicitly asked for (from their message before the cut-off):** - 1. If creator is logged into YT, YT should be the first social by default (✅ done but UX may be wrong) - 2. YT icon placemarker + text box asking for YT handle (I did auto-add — they may have wanted the placemarker + input flow instead) - 3. Second box: URL or identifying string (`@gramps@llamachile.tube` is just as unique as a URL) (✅ done) - 4. Pull the SERVICE logo, not the user's account logo, to represent the service (I used initials badges — they want actual brand logos) - 5. Finding the user's account on the service validates the input (✅ done) - 6. Socials bar should appear on the LEFT side of the volume control, centered under the scenes and sources listboxes (✅ done) - - **Something in this list is wrong** — the user said "did you not understand what I asked for?" but the correction was lost to ctrl+enter. -- **Landmine:** 19041 SDK projection gaps (Exclusive/DeviceLost not projected; CameraStreamState.Failed by int). The social dialog uses sync `.GetAwaiter().GetResult()` — fine for now. `HttpSocialValidator` hits real network — tests must fake it. -- **Next step:** WAIT for the user to re-state what they actually want for the social bar. Do NOT guess. Then fix it. -- **Secret/DB/port facts live:** OAuth client id/secret in `Helpers/OAuthCredentials.cs`; OAuth session token in `Helpers/TokenStore.cs` (DPAPI → `%APPDATA%\ytLlive\ytLlive.auth`); layout DB `%APPDATA%\ytLlive\ytLlive.db` (schema v7); OAuth callback `http://localhost:8765/oauth2/callback`; crash log `%APPDATA%\ytLlive\startup.log`. +- **Branch:** `main` (work UNCOMMITTED — see dirty list). Includes the previous + session's socials v2 fixes + this session's fediverse-service-icon work. +- **Finished this session (round 3):** user's live-test report said the mastodon + icon still didn't show for `@gramps@llamachile.tube`. Root cause: the identity + domain `llamachile.tube` is YunoHost-SSO-gated — `/.well-known/nodeinfo`, + `/@gramps`, and webfinger all answer with the SSO login page, so nodeinfo + returned nothing and the icon fell back to the honeycomb glyph. The real + instance lives at `mastodon.llamachile.tube`, and only the bare root + `https://llamachile.tube/` 302s to it ("default app" redirect). Fix: + `HttpSocialValidator.TryFetchFediverseSoftwareAsync` now, when nodeinfo on the + identity domain fails, follows the root redirect (`ResolveInstanceHostAsync`, + reads `resp.RequestMessage.RequestUri.Host`) and re-runs the nodeinfo lookup + on the resolved host. New test `FediverseHandle_RootRedirectToSubdomain_ResolvesSoftware`. + Build: **0 warnings**. Tests: **111 passing**. +- **What landed (all rounds this session):** + 1. **Fediverse icon resolution** — `DetectService` maps `@user@domain` to the + new `SocialService.Fediverse` (was `Link`/chain icon). On validate, + `HttpSocialValidator` best-effort GETs `https://{domain}/.well-known/nodeinfo`, + follows the first nodeinfo `links[].href`, reads `software.name`, and returns + it in `SocialLookupResult.FediverseSoftware`. `SocialEntry`/`SocialSlotViewModel` + carry `FediverseSoftware`; `SocialServiceIcons.LogoDataForFediverse(software)` + maps it to a bundled logo (mastodon/peertube/pixelfed/misskey/lemmy/pleroma/ + firefish — Simple Icons CC0), falling back to the `FediverseIconData` + honeycomb glyph for unknown software (GoToSocial/Sharkey/Akkoma aren't in + Simple Icons). Nodeinfo failure still validates — the glyph falls back. + 2. **Redirect resolution (round 3)** — identity domains that 302 their root + to the real instance (YunoHost default-app subdomains) resolve software via + the root redirect when identity-domain nodeinfo is SSO-blocked. + 3. **Persistence** — new `SocialEntry.Software TEXT` column via + `MigrateSocialEntryTable()` (column-presence pattern, same as the others); + saved/loaded alongside Service/Handle/ProfileUrl. + 4. **Icon colors** — `IconButton` style gains `Foreground="#d0d0d0"` + (`Themes/Controls.xaml`); the dialog's trash button overrides + `Foreground="#e94560"` (`SocialsDialog.xaml`). All other `IconButton` + usages are `Path` content with explicit `Fill`, so unaffected. +- **Landmines:** + - `LayoutStore.Socials` is only populated by `Load()` — tests must call + `store.Load()` before asserting it. + - `DetectService("justaname")` → **Website** with empty handle; only + unparseable input or `@user@domain` yields Link/Fediverse. + - Dialog sign-in provider is `Func>`; test fakes must + return `Task.FromResult` (sync-completed) so the fire-and-forget command + settles before the next assert. + - `SocialBarBottomTop = 1040` literal lives in `MainWindow.xaml.cs` (the VM's + `MasterFrameHeight` is private). + - `Cancel_AbortsInFlightValidation_WithoutMutatingSlot` relies on the + BlockingValidator's gate completing synchronously (no + `RunContinuationsAsynchronously`) — the assertions run after + `Gate.TrySetResult` returns because the awaited continuation executes inline. + - Nodeinfo cancellation test cancels mid-lookup via a counting stub; the + post-fetch `ct.IsCancellationRequested` check is what reports `Canceled`. + - Round-3 redirect fallback fires only when identity-domain nodeinfo fails; + the root follow happens automatically (HttpClient default auto-redirect), + and `RequestMessage.RequestUri.Host` is read from the final response. +- **Next step:** show the user the fixes and let them decide whether to commit. + Nothing queued beyond that — do not expand the task queue on your own. + (`ytLive.Tests`/`bin` + `/obj` are dirty build artifacts, not hand-authored.) + +- **Secret/DB/port facts live:** OAuth client id/secret in `Helpers/OAuthCredentials.cs`; + OAuth session token in `Helpers/TokenStore.cs` (DPAPI → `%APPDATA%\ytLlive\ytLlive.auth`); + layout DB `%APPDATA%\ytLlive\ytLlive.db` (schema v8; the new `SocialEntry.Software` + column is a column-presence migration like the others, no version bump); OAuth callback + `http://localhost:8765/oauth2/callback`; crash log `%APPDATA%\ytLlive\startup.log`. diff --git a/MainWindow.xaml b/MainWindow.xaml index 485b725..960eae5 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -652,13 +652,22 @@ - - + + + + + + HorizontalAlignment="Center" Margin="40,8" + IsHitTestVisible="False"> @@ -667,19 +676,13 @@ - - - + + TextTrimming="CharacterEllipsis" + MaxWidth="200"/> @@ -810,29 +813,15 @@ - diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 5c2cde9..889140a 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -254,6 +254,44 @@ public partial class MainWindow : Window private void OpacitySlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs e) => OpacityValueText.Text = $"{Math.Round(e.NewValue * 100)}%"; + // ─── Social bar drag: vertical only, snaps to top/bottom on release ─── + private const double SocialBarBottomTop = 1040; + private bool _isDraggingSocialBar; + private double _socialBarGrabOffsetY; + + private void SocialBar_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + var bar = (FrameworkElement)sender; + _isDraggingSocialBar = true; + var toCanvas = CanvasGrid.TransformToVisual(bar).Inverse; + var p = toCanvas.Transform(e.GetPosition(bar)); + _socialBarGrabOffsetY = p.Y - Canvas.GetTop(bar); + bar.CaptureMouse(); + e.Handled = true; + } + + private void SocialBar_PreviewMouseMove(object sender, MouseEventArgs e) + { + if (!_isDraggingSocialBar) return; + var bar = (FrameworkElement)sender; + var toCanvas = CanvasGrid.TransformToVisual(bar).Inverse; + var p = toCanvas.Transform(e.GetPosition(bar)); + Canvas.SetTop(bar, Math.Clamp(p.Y - _socialBarGrabOffsetY, 0, SocialBarBottomTop)); + e.Handled = true; + } + + private void SocialBar_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e) + { + if (!_isDraggingSocialBar) return; + var bar = (FrameworkElement)sender; + var top = Canvas.GetTop(bar); + bar.ReleaseMouseCapture(); + _isDraggingSocialBar = false; + var position = top <= SocialBarBottomTop / 2.0 ? SocialBarPosition.Top : SocialBarPosition.Bottom; + _viewModel.SetSocialBarPosition(position); + e.Handled = true; + } + private void Preview_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) { if (OpacityChip.IsMouseOver) return; diff --git a/Models/Socials.cs b/Models/Socials.cs index 2899723..f59b9fb 100644 --- a/Models/Socials.cs +++ b/Models/Socials.cs @@ -8,11 +8,10 @@ public enum SocialService { YouTube, Twitch, X, Instagram, TikTok, Facebook, Discord, Kick, Threads, Bluesky, GitHub, LinkedIn, Pinterest, Snapchat, Reddit, - WhatsApp, Telegram, Link, Website + WhatsApp, Telegram, Link, Website, Fediverse } public enum SocialBarPosition { Top, Bottom } -public enum SocialBarJustify { Left, Center, Right } public sealed class SocialEntry : INotifyPropertyChanged { @@ -20,9 +19,13 @@ public sealed class SocialEntry : INotifyPropertyChanged public string Handle { get; init; } = string.Empty; public string ProfileUrl { get; init; } = string.Empty; + /// Fediverse instance software (nodeinfo) for = Fediverse. + public string? FediverseSoftware { get; init; } + public string ServiceName => Service.ToString(); - public string Initials => SocialServiceIcons.InitialsFor(Service); - public string AccentColor => SocialServiceIcons.ColorFor(Service); + public string LogoData => Service == SocialService.Fediverse + ? SocialServiceIcons.LogoDataForFediverse(FediverseSoftware) + : SocialServiceIcons.LogoDataFor(Service); public event PropertyChangedEventHandler? PropertyChanged; private void Raise([CallerMemberName] string? name = null) @@ -30,15 +33,22 @@ public sealed class SocialEntry : INotifyPropertyChanged } /// -/// The app-wide social bar config — a global resource (like the webcam) whose -/// per-scene presence is toggled by . The creator -/// provides handles/URLs; the app validates each by looking up the social page -/// before adding it. Freemium: YT + 1 other. Premium: as many as fit one line. +/// The app-wide social bar config — a global resource (like the webcam) that +/// every scene shows when is on and entries exist. The +/// dialog provides the handles; the app validates each by looking up the social +/// page before committing. Freemium: YT + 1 other. Premium: all six slots. /// public sealed class SocialsConfig : INotifyPropertyChanged { public ObservableCollection Entries { get; } = new(); + private bool _barEnabled = true; + public bool BarEnabled + { + get => _barEnabled; + set => Set(ref _barEnabled, value); + } + private SocialBarPosition _barPosition = SocialBarPosition.Bottom; public SocialBarPosition BarPosition { @@ -46,13 +56,6 @@ public sealed class SocialsConfig : INotifyPropertyChanged set => Set(ref _barPosition, value); } - private SocialBarJustify _barJustify = SocialBarJustify.Center; - public SocialBarJustify BarJustify - { - get => _barJustify; - set => Set(ref _barJustify, value); - } - public event PropertyChangedEventHandler? PropertyChanged; private bool Set(ref T field, T value, [CallerMemberName] string? name = null) { @@ -63,56 +66,100 @@ public sealed class SocialsConfig : INotifyPropertyChanged } } +/// +/// Brand logo path data (Simple Icons, CC0) plus the small utility glyphs the +/// social dialog uses — lock (Premium gate), do-not (empty/invalid slot) and a +/// generic link (bare Link/Website entries). All strings are 24x24 path data +/// consumed by a Path.Data binding (the Geometry type converter handles the string). +/// public static class SocialServiceIcons { - public static string InitialsFor(SocialService service) => service switch + public const string LockedIconData = "M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"; + public const string DoNotIconData = "M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zM4 12c0-4.42 3.58-8 8-8 1.85 0 3.55.63 4.9 1.69L5.69 16.9C4.63 15.55 4 13.85 4 12zm8 8c-1.85 0-3.55-.63-4.9-1.69L18.31 7.1C19.37 8.45 20 10.15 20 12c0 4.42-3.58 8-8 8z"; + public const string LinkIconData = "M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z"; + + private const string YouTubePath = "M23.498 6.186a3.016 3.016 0 0 0-2.122-2.136C19.505 3.545 12 3.545 12 3.545s-7.505 0-9.377.505A3.017 3.017 0 0 0 .502 6.186C0 8.07 0 12 0 12s0 3.93.502 5.814a3.016 3.016 0 0 0 2.122 2.136c1.871.505 9.376.505 9.376.505s7.505 0 9.377-.505a3.015 3.015 0 0 0 2.122-2.136C24 15.93 24 12 24 12s0-3.93-.502-5.814zM9.545 15.568V8.432L15.818 12l-6.273 3.568z"; + private const string TwitchPath = "M11.571 4.714h1.715v5.143H11.57zm4.715 0H18v5.143h-1.714zM6 0L1.714 4.286v15.428h5.143V24l4.286-4.286h3.428L22.286 12V0zm14.571 11.143l-3.428 3.428h-3.429l-3 3v-3H6.857V1.714h13.714Z"; + private const string XPath = "M14.234 10.162 22.977 0h-2.072l-7.591 8.824L7.251 0H.258l9.168 13.343L.258 24H2.33l8.016-9.318L16.749 24h6.993zm-2.837 3.299-.929-1.329L3.076 1.56h3.182l5.965 8.532.929 1.329 7.754 11.09h-3.182z"; + private const string InstagramPath = "M7.0301.084c-1.2768.0602-2.1487.264-2.911.5634-.7888.3075-1.4575.72-2.1228 1.3877-.6652.6677-1.075 1.3368-1.3802 2.127-.2954.7638-.4956 1.6365-.552 2.914-.0564 1.2775-.0689 1.6882-.0626 4.947.0062 3.2586.0206 3.6671.0825 4.9473.061 1.2765.264 2.1482.5635 2.9107.308.7889.72 1.4573 1.388 2.1228.6679.6655 1.3365 1.0743 2.1285 1.38.7632.295 1.6361.4961 2.9134.552 1.2773.056 1.6884.069 4.9462.0627 3.2578-.0062 3.668-.0207 4.9478-.0814 1.28-.0607 2.147-.2652 2.9098-.5633.7889-.3086 1.4578-.72 2.1228-1.3881.665-.6682 1.0745-1.3378 1.3795-2.1284.2957-.7632.4966-1.636.552-2.9124.056-1.2809.0692-1.6898.063-4.948-.0063-3.2583-.021-3.6668-.0817-4.9465-.0607-1.2797-.264-2.1487-.5633-2.9117-.3084-.7889-.72-1.4568-1.3876-2.1228C21.2982 1.33 20.628.9208 19.8378.6165 19.074.321 18.2017.1197 16.9244.0645 15.6471.0093 15.236-.005 11.977.0014 8.718.0076 8.31.0215 7.0301.0839m.1402 21.6932c-1.17-.0509-1.8053-.2453-2.2287-.408-.5606-.216-.96-.4771-1.3819-.895-.422-.4178-.6811-.8186-.9-1.378-.1644-.4234-.3624-1.058-.4171-2.228-.0595-1.2645-.072-1.6442-.079-4.848-.007-3.2037.0053-3.583.0607-4.848.05-1.169.2456-1.805.408-2.2282.216-.5613.4762-.96.895-1.3816.4188-.4217.8184-.6814 1.3783-.9003.423-.1651 1.0575-.3614 2.227-.4171 1.2655-.06 1.6447-.072 4.848-.079 3.2033-.007 3.5835.005 4.8495.0608 1.169.0508 1.8053.2445 2.228.408.5608.216.96.4754 1.3816.895.4217.4194.6816.8176.9005 1.3787.1653.4217.3617 1.056.4169 2.2263.0602 1.2655.0739 1.645.0796 4.848.0058 3.203-.0055 3.5834-.061 4.848-.051 1.17-.245 1.8055-.408 2.2294-.216.5604-.4763.96-.8954 1.3814-.419.4215-.8181.6811-1.3783.9-.4224.1649-1.0577.3617-2.2262.4174-1.2656.0595-1.6448.072-4.8493.079-3.2045.007-3.5825-.006-4.848-.0608M16.953 5.5864A1.44 1.44 0 1 0 18.39 4.144a1.44 1.44 0 0 0-1.437 1.4424M5.8385 12.012c.0067 3.4032 2.7706 6.1557 6.173 6.1493 3.4026-.0065 6.157-2.7701 6.1506-6.1733-.0065-3.4032-2.771-6.1565-6.174-6.1498-3.403.0067-6.156 2.771-6.1496 6.1738M8 12.0077a4 4 0 1 1 4.008 3.9921A3.9996 3.9996 0 0 1 8 12.0077"; + private const string TikTokPath = "M12.525.02c1.31-.02 2.61-.01 3.91-.02.08 1.53.63 3.09 1.75 4.17 1.12 1.11 2.7 1.62 4.24 1.79v4.03c-1.44-.05-2.89-.35-4.2-.97-.57-.26-1.1-.59-1.62-.93-.01 2.92.01 5.84-.02 8.75-.08 1.4-.54 2.79-1.35 3.94-1.31 1.92-3.58 3.17-5.91 3.21-1.43.08-2.86-.31-4.08-1.03-2.02-1.19-3.44-3.37-3.65-5.71-.02-.5-.03-1-.01-1.49.18-1.9 1.12-3.72 2.58-4.96 1.66-1.44 3.98-2.13 6.15-1.72.02 1.48-.04 2.96-.04 4.44-.99-.32-2.15-.23-3.02.37-.63.41-1.11 1.04-1.36 1.75-.21.51-.15 1.07-.14 1.61.24 1.64 1.82 3.02 3.5 2.87 1.12-.01 2.19-.66 2.77-1.61.19-.33.4-.67.41-1.06.1-1.79.06-3.57.07-5.36.01-4.03-.01-8.05.02-12.07z"; + private const string FacebookPath = "M9.101 23.691v-7.98H6.627v-3.667h2.474v-1.58c0-4.085 1.848-5.978 5.858-5.978.401 0 .955.042 1.468.103a8.68 8.68 0 0 1 1.141.195v3.325a8.623 8.623 0 0 0-.653-.036 26.805 26.805 0 0 0-.733-.009c-.707 0-1.259.096-1.675.309a1.686 1.686 0 0 0-.679.622c-.258.42-.374.995-.374 1.752v1.297h3.919l-.386 2.103-.287 1.564h-3.246v8.245C19.396 23.238 24 18.179 24 12.044c0-6.627-5.373-12-12-12s-12 5.373-12 12c0 5.628 3.874 10.35 9.101 11.647Z"; + private const string DiscordPath = "M20.317 4.3698a19.7913 19.7913 0 00-4.8851-1.5152.0741.0741 0 00-.0785.0371c-.211.3753-.4447.8648-.6083 1.2495-1.8447-.2762-3.68-.2762-5.4868 0-.1636-.3933-.4058-.8742-.6177-1.2495a.077.077 0 00-.0785-.037 19.7363 19.7363 0 00-4.8852 1.515.0699.0699 0 00-.0321.0277C.5334 9.0458-.319 13.5799.0992 18.0578a.0824.0824 0 00.0312.0561c2.0528 1.5076 4.0413 2.4228 5.9929 3.0294a.0777.0777 0 00.0842-.0276c.4616-.6304.8731-1.2952 1.226-1.9942a.076.076 0 00-.0416-.1057c-.6528-.2476-1.2743-.5495-1.8722-.8923a.077.077 0 01-.0076-.1277c.1258-.0943.2517-.1923.3718-.2914a.0743.0743 0 01.0776-.0105c3.9278 1.7933 8.18 1.7933 12.0614 0a.0739.0739 0 01.0785.0095c.1202.099.246.1981.3728.2924a.077.077 0 01-.0066.1276 12.2986 12.2986 0 01-1.873.8914.0766.0766 0 00-.0407.1067c.3604.698.7719 1.3628 1.225 1.9932a.076.076 0 00.0842.0286c1.961-.6067 3.9495-1.5219 6.0023-3.0294a.077.077 0 00.0313-.0552c.5004-5.177-.8382-9.6739-3.5485-13.6604a.061.061 0 00-.0312-.0286zM8.02 15.3312c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9555-2.4189 2.157-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.9555 2.4189-2.1569 2.4189zm7.9748 0c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9554-2.4189 2.1569-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.946 2.4189-2.1568 2.4189Z"; + private const string KickPath = "M1.333 0h8v5.333H12V2.667h2.667V0h8v8H20v2.667h-2.667v2.666H20V16h2.667v8h-8v-2.667H12v-2.666H9.333V24h-8Z"; + private const string ThreadsPath = "M12.186 24h-.007c-3.581-.024-6.334-1.205-8.184-3.509C2.35 18.44 1.5 15.586 1.472 12.01v-.017c.03-3.579.879-6.43 2.525-8.482C5.845 1.205 8.6.024 12.18 0h.014c2.746.02 5.043.725 6.826 2.098 1.677 1.29 2.858 3.13 3.509 5.467l-2.04.569c-1.104-3.96-3.898-5.984-8.304-6.015-2.91.022-5.11.936-6.54 2.717C4.307 6.504 3.616 8.914 3.589 12c.027 3.086.718 5.496 2.057 7.164 1.43 1.783 3.631 2.698 6.54 2.717 2.623-.02 4.358-.631 5.8-2.045 1.647-1.613 1.618-3.593 1.09-4.798-.31-.71-.873-1.3-1.634-1.75-.192 1.352-.622 2.446-1.284 3.272-.886 1.102-2.14 1.704-3.73 1.79-1.202.065-2.361-.218-3.259-.801-1.063-.689-1.685-1.74-1.752-2.964-.065-1.19.408-2.285 1.33-3.082.88-.76 2.119-1.207 3.583-1.291a13.853 13.853 0 0 1 3.02.142c-.126-.742-.375-1.332-.75-1.757-.513-.586-1.308-.883-2.359-.89h-.029c-.844 0-1.992.232-2.721 1.32L7.734 7.847c.98-1.454 2.568-2.256 4.478-2.256h.044c3.194.02 5.097 1.975 5.287 5.388.108.046.216.094.321.142 1.49.7 2.58 1.761 3.154 3.07.797 1.82.871 4.79-1.548 7.158-1.85 1.81-4.094 2.628-7.277 2.65Zm1.003-11.69c-.242 0-.487.007-.739.021-1.836.103-2.98.946-2.916 2.143.067 1.256 1.452 1.839 2.784 1.767 1.224-.065 2.818-.543 3.086-3.71a10.5 10.5 0 0 0-2.215-.221z"; + private const string BlueskyPath = "M5.202 2.857C7.954 4.922 10.913 9.11 12 11.358c1.087-2.247 4.046-6.436 6.798-8.501C20.783 1.366 24 .213 24 3.883c0 .732-.42 6.156-.667 7.037-.856 3.061-3.978 3.842-6.755 3.37 4.854.826 6.089 3.562 3.422 6.299-5.065 5.196-7.28-1.304-7.847-2.97-.104-.305-.152-.448-.153-.327 0-.121-.05.022-.153.327-.568 1.666-2.782 8.166-7.847 2.97-2.667-2.737-1.432-5.473 3.422-6.3-2.777.473-5.899-.308-6.755-3.369C.42 10.04 0 4.615 0 3.883c0-3.67 3.217-2.517 5.202-1.026"; + private const string GitHubPath = "M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"; + private const string LinkedInPath = "M20.447 20.452h-3.554v-5.569c0-1.328-.027-3.037-1.852-3.037-1.853 0-2.136 1.445-2.136 2.939v5.667H9.351V9h3.414v1.561h.046c.477-.9 1.637-1.85 3.37-1.85 3.601 0 4.267 2.37 4.267 5.455v6.286zM5.337 7.433c-1.144 0-2.063-.926-2.063-2.065 0-1.138.92-2.063 2.063-2.063 1.14 0 2.064.925 2.064 2.063 0 1.139-.925 2.065-2.064 2.065zm1.782 13.019H3.555V9h3.564v11.452zM22.225 0H1.771C.792 0 0 .774 0 1.729v20.542C0 23.227.792 24 1.771 24h20.451C23.2 24 24 23.227 24 22.271V1.729C24 .774 23.2 0 22.222 0h.003z"; + private const string PinterestPath = "M12.017 0C5.396 0 .029 5.367.029 11.987c0 5.079 3.158 9.417 7.618 11.162-.105-.949-.199-2.403.041-3.439.219-.937 1.406-5.957 1.406-5.957s-.359-.72-.359-1.781c0-1.663.967-2.911 2.168-2.911 1.024 0 1.518.769 1.518 1.688 0 1.029-.653 2.567-.992 3.992-.285 1.193.6 2.165 1.775 2.165 2.128 0 3.768-2.245 3.768-5.487 0-2.861-2.063-4.869-5.008-4.869-3.41 0-5.409 2.562-5.409 5.199 0 1.033.394 2.143.889 2.741.099.12.112.225.085.345-.09.375-.293 1.199-.334 1.363-.053.225-.172.271-.401.165-1.495-.69-2.433-2.878-2.433-4.646 0-3.776 2.748-7.252 7.92-7.252 4.158 0 7.392 2.967 7.392 6.923 0 4.135-2.607 7.462-6.233 7.462-1.214 0-2.354-.629-2.758-1.379l-.749 2.848c-.269 1.045-1.004 2.352-1.498 3.146 1.123.345 2.306.535 3.55.535 6.607 0 11.985-5.365 11.985-11.987C23.97 5.39 18.592.026 11.985.026L12.017 0z"; + private const string SnapchatPath = "M12.206.793c.99 0 4.347.276 5.93 3.821.529 1.193.403 3.219.299 4.847l-.003.06c-.012.18-.022.345-.03.51.075.045.203.09.401.09.3-.016.659-.12 1.033-.301.165-.088.344-.104.464-.104.182 0 .359.029.509.09.45.149.734.479.734.838.015.449-.39.839-1.213 1.168-.089.029-.209.075-.344.119-.45.135-1.139.36-1.333.81-.09.224-.061.524.12.868l.015.015c.06.136 1.526 3.475 4.791 4.014.255.044.435.27.42.509 0 .075-.015.149-.045.225-.24.569-1.273.988-3.146 1.271-.059.091-.12.375-.164.57-.029.179-.074.36-.134.553-.076.271-.27.405-.555.405h-.03c-.135 0-.313-.031-.538-.074-.36-.075-.765-.135-1.273-.135-.3 0-.599.015-.913.074-.6.104-1.123.464-1.723.884-.853.599-1.826 1.288-3.294 1.288-.06 0-.119-.015-.18-.015h-.149c-1.468 0-2.427-.675-3.279-1.288-.599-.42-1.107-.779-1.707-.884-.314-.045-.629-.074-.928-.074-.54 0-.958.089-1.272.149-.211.043-.391.074-.54.074-.374 0-.523-.224-.583-.42-.061-.192-.09-.389-.135-.567-.046-.181-.105-.494-.166-.57-1.918-.222-2.95-.642-3.189-1.226-.031-.063-.052-.15-.055-.225-.015-.243.165-.465.42-.509 3.264-.54 4.73-3.879 4.791-4.02l.016-.029c.18-.345.224-.645.119-.869-.195-.434-.884-.658-1.332-.809-.121-.029-.24-.074-.346-.119-1.107-.435-1.257-.93-1.197-1.273.09-.479.674-.793 1.168-.793.146 0 .27.029.383.074.42.194.789.3 1.104.3.234 0 .384-.06.465-.105l-.046-.569c-.098-1.626-.225-3.651.307-4.837C7.392 1.077 10.739.807 11.727.807l.419-.015h.06z"; + private const string RedditPath = "M12 0C5.373 0 0 5.373 0 12c0 3.314 1.343 6.314 3.515 8.485l-2.286 2.286C.775 23.225 1.097 24 1.738 24H12c6.627 0 12-5.373 12-12S18.627 0 12 0Zm4.388 3.199c1.104 0 1.999.895 1.999 1.999 0 1.105-.895 2-1.999 2-.946 0-1.739-.657-1.947-1.539v.002c-1.147.162-2.032 1.15-2.032 2.341v.007c1.776.067 3.4.567 4.686 1.363.473-.363 1.064-.58 1.707-.58 1.547 0 2.802 1.254 2.802 2.802 0 1.117-.655 2.081-1.601 2.531-.088 3.256-3.637 5.876-7.997 5.876-4.361 0-7.905-2.617-7.998-5.87-.954-.447-1.614-1.415-1.614-2.538 0-1.548 1.255-2.802 2.803-2.802.645 0 1.239.218 1.712.585 1.275-.79 2.881-1.291 4.64-1.365v-.01c0-1.663 1.263-3.034 2.88-3.207.188-.911.993-1.595 1.959-1.595Zm-8.085 8.376c-.784 0-1.459.78-1.506 1.797-.047 1.016.64 1.429 1.426 1.429.786 0 1.371-.369 1.418-1.385.047-1.017-.553-1.841-1.338-1.841Zm7.406 0c-.786 0-1.385.824-1.338 1.841.047 1.017.634 1.385 1.418 1.385.785 0 1.473-.413 1.426-1.429-.046-1.017-.721-1.797-1.506-1.797Zm-3.703 4.013c-.974 0-1.907.048-2.77.135-.147.015-.241.168-.183.305.483 1.154 1.622 1.964 2.953 1.964 1.33 0 2.47-.81 2.953-1.964.057-.137-.037-.29-.184-.305-.863-.087-1.795-.135-2.769-.135Z"; + private const string WhatsAppPath = "M17.472 14.382c-.297-.149-1.758-.867-2.03-.967-.273-.099-.471-.148-.67.15-.197.297-.767.966-.94 1.164-.173.199-.347.223-.644.075-.297-.15-1.255-.463-2.39-1.475-.883-.788-1.48-1.761-1.653-2.059-.173-.297-.018-.458.13-.606.134-.133.298-.347.446-.52.149-.174.198-.298.298-.497.099-.198.05-.371-.025-.52-.075-.149-.669-1.612-.916-2.207-.242-.579-.487-.5-.669-.51-.173-.008-.371-.01-.57-.01-.198 0-.52.074-.792.372-.272.297-1.04 1.016-1.04 2.479 0 1.462 1.065 2.875 1.213 3.074.149.198 2.096 3.2 5.077 4.487.709.306 1.262.489 1.694.625.712.227 1.36.195 1.871.118.571-.085 1.758-.719 2.006-1.413.248-.694.248-1.289.173-1.413-.074-.124-.272-.198-.57-.347m-5.421 7.403h-.004a9.87 9.87 0 01-5.031-1.378l-.361-.214-3.741.982.998-3.648-.235-.374a9.86 9.86 0 01-1.51-5.26c.001-5.45 4.436-9.884 9.888-9.884 2.64 0 5.122 1.03 6.988 2.898a9.825 9.825 0 012.893 6.994c-.003 5.45-4.437 9.884-9.885 9.884m8.413-18.297A11.815 11.815 0 0012.05 0C5.495 0 .16 5.335.157 11.892c0 2.096.547 4.142 1.588 5.945L.057 24l6.305-1.654a11.882 11.882 0 005.683 1.448h.005c6.554 0 11.89-5.335 11.893-11.893a11.821 11.821 0 00-3.48-8.413Z"; + private const string TelegramPath = "M11.944 0A12 12 0 0 0 0 12a12 12 0 0 0 12 12 12 12 0 0 0 12-12A12 12 0 0 0 12 0a12 12 0 0 0-.056 0zm4.962 7.224c.1-.002.321.023.465.14a.506.506 0 0 1 .171.325c.016.093.036.306.02.472-.18 1.898-.962 6.502-1.36 8.627-.168.9-.499 1.201-.82 1.23-.696.065-1.225-.46-1.9-.902-1.056-.693-1.653-1.124-2.678-1.8-1.185-.78-.417-1.21.258-1.91.177-.184 3.247-2.977 3.307-3.23.007-.032.014-.15-.056-.212s-.174-.041-.249-.024c-.106.024-1.793 1.14-5.061 3.345-.48.33-.913.49-1.302.48-.428-.008-1.252-.241-1.865-.44-.752-.245-1.349-.374-1.297-.789.027-.216.325-.437.893-.663 3.498-1.524 5.83-2.529 6.998-3.014 3.332-1.386 4.025-1.627 4.476-1.635z"; + + // Fediverse instance software logos (Simple Icons, CC0). Resolved at + // validate-time from each instance's nodeinfo `software.name`; unknown + // software falls back to the generic fediverse glyph below. + private const string MastodonPath = "M23.268 5.313c-.35-2.578-2.617-4.61-5.304-5.004C17.51.242 15.792 0 11.813 0h-.03c-3.98 0-4.835.242-5.288.309C3.882.692 1.496 2.518.917 5.127.64 6.412.61 7.837.661 9.143c.074 1.874.088 3.745.26 5.611.118 1.24.325 2.47.62 3.68.55 2.237 2.777 4.098 4.96 4.857 2.336.792 4.849.923 7.256.38.265-.061.527-.132.786-.213.585-.184 1.27-.39 1.774-.753a.057.057 0 0 0 .023-.043v-1.809a.052.052 0 0 0-.02-.041.053.053 0 0 0-.046-.01 20.282 20.282 0 0 1-4.709.545c-2.73 0-3.463-1.284-3.674-1.818a5.593 5.593 0 0 1-.319-1.433.053.053 0 0 1 .066-.054c1.517.363 3.072.546 4.632.546.376 0 .75 0 1.125-.01 1.57-.044 3.224-.124 4.768-.422.038-.008.077-.015.11-.024 2.435-.464 4.753-1.92 4.989-5.604.008-.145.03-1.52.03-1.67.002-.512.167-3.63-.024-5.545zm-3.748 9.195h-2.561V8.29c0-1.309-.55-1.976-1.67-1.976-1.23 0-1.846.79-1.846 2.35v3.403h-2.546V8.663c0-1.56-.617-2.35-1.848-2.35-1.112 0-1.668.668-1.67 1.977v6.218H4.822V8.102c0-1.31.337-2.35 1.011-3.12.696-.77 1.608-1.164 2.74-1.164 1.311 0 2.302.5 2.962 1.498l.638 1.06.638-1.06c.66-.999 1.65-1.498 2.96-1.498 1.13 0 2.043.395 2.74 1.164.675.77 1.012 1.81 1.012 3.12z"; + private const string PeerTubePath = "M12 6.545v10.91L20.727 12M3.273 12v12L12 17.455M3.273 0v12L12 6.545"; + private const string PixelfedPath = "M12 24C5.3726 24 0 18.6274 0 12S5.3726 0 12 0s12 5.3726 12 12-5.3726 12-12 12m-.9526-9.3802h2.2014c2.0738 0 3.7549-1.6366 3.7549-3.6554S15.3226 7.309 13.2488 7.309h-3.1772c-1.1964 0-2.1663.9442-2.1663 2.1089v8.208z"; + private const string MisskeyPath = "M8.91076 16.8915c-1.03957.0038-1.93213-.6294-2.35267-1.366-.22516-.3217-.66989-.4364-.6761 0v2.0148c0 .8094-.29152 1.5097-.87581 2.1002-.56755.573-1.25977.8595-2.0779.8595-.80014 0-1.49298-.2865-2.07727-.8601C.28408 19.05 0 18.3497 0 17.5403V6.45968c0-.62378.17553-1.18863.52599-1.69455.36657-.52284.83426-.88582 1.4018-1.08769a2.84574 2.84574 0 0 1 1.00049-.17742c.90125 0 1.65239.35421 2.25281 1.06262l2.99713 3.51572c.06699.05016.263.43696.73192.43696.47016 0 .6916-.3868.75796-.43758l2.9717-3.5151c.6178-.70841 1.377-1.06262 2.2782-1.06262.3337 0 .6675.05893 1.0012.17742.5669.20187 1.0259.56422 1.377 1.08769.3665.50592.5501 1.07077.5501 1.69455V17.5403c0 .8094-.2915 1.5097-.8758 2.1002-.5675.573-1.2604.8595-2.0779.8595-.8008 0-1.493-.2865-2.0779-.8601-.5669-.5899-.8504-1.2902-.8504-2.0996v-2.0148c-.0496-.5499-.5303-.2032-.7009 0-.4503.8431-1.31369 1.3616-2.35264 1.366ZM21.447 8.60998c-.7009 0-1.3015-.24449-1.8019-.73348-.4838-.50571-.7257-1.11277-.7257-1.82118s.2419-1.30711.7257-1.79611c.5004-.50571 1.101-.75856 1.8019-.75856.7009 0 1.3017.25285 1.8025.75856.5003.489.7505 1.0877.7505 1.79611 0 .70841-.2502 1.31547-.7505 1.82118-.5008.48899-1.1016.73348-1.8025.73348Zm.0248.50655c.7009 0 1.2935.25285 1.7777.75856.5003.50571.7505 1.11301.7505 1.82181v6.2484c0 .7084-.2502 1.3155-.7505 1.8212-.4838.489-1.0764.7335-1.7777.7335-.7005 0-1.3011-.2445-1.8019-.7335-.5003-.5057-.7505-1.1128-.7505-1.8212v-6.2484c0-.7084.2502-1.3157.7505-1.82181.5004-.50571 1.101-.75856 1.8019-.75856Z"; + private const string LemmyPath = "M2.9595 4.2228a3.9132 3.9132 0 0 0-.332.019c-.8781.1012-1.67.5699-2.155 1.3862-.475.8-.5922 1.6809-.35 2.4971.2421.8162.8297 1.5575 1.6982 2.1449.0053.0035.0106.0076.0163.0114.746.4498 1.492.7431 2.2877.8994-.02.3318-.0272.6689-.006 1.0181.0634 1.0432.4368 2.0006.996 2.8492l-2.0061.8189a.4163.4163 0 0 0-.2276.2239.416.416 0 0 0 .0879.455.415.415 0 0 0 .2941.1231.4156.4156 0 0 0 .1595-.0312l2.2093-.9035c.408.4859.8695.9315 1.3723 1.318.0196.0151.0407.0264.0603.0423l-1.2918 1.7103a.416.416 0 0 0 .664.501l1.314-1.7385c.7185.4548 1.4782.7927 2.2294 1.0242.3833.7209 1.1379 1.1871 2.0202 1.1871.8907 0 1.6442-.501 2.0242-1.2072.744-.2347 1.4959-.5729 2.2073-1.0262l1.332 1.7606a.4157.4157 0 0 0 .7439-.1936.4165.4165 0 0 0-.0799-.3074l-1.3099-1.7345c.0083-.0075.0178-.0113.0261-.0188.4968-.3803.9549-.8175 1.3622-1.2939l2.155.8794a.4156.4156 0 0 0 .5412-.2276.4151.4151 0 0 0-.2273-.5432l-1.9438-.7928c.577-.8538.9697-1.8183 1.0504-2.8693.0268-.3507.0242-.6914.0079-1.0262.7905-.1572 1.5321-.4502 2.2737-.8974.0053-.0033.011-.0076.0163-.0113.8684-.5874 1.456-1.3287 1.6982-2.145.2421-.8161.125-1.697-.3501-2.497-.4849-.8163-1.2768-1.2852-2.155-1.3863a3.2175 3.2175 0 0 0-.332-.0189c-.7852-.0151-1.6231.229-2.4286.6942-.5926.342-1.1252.867-1.5433 1.4387-1.1699-.6703-2.6923-1.0476-4.5635-1.0785a15.5768 15.5768 0 0 0-.5111 0c-2.085.034-3.7537.43-5.0142 1.1449-.0033-.0038-.0045-.0114-.008-.0152-.4233-.5916-.973-1.1365-1.5835-1.489-.8055-.465-1.6434-.7083-2.4286-.6941Zm.2858.7365c.5568.042 1.1696.2358 1.7787.5875.485.28.9757.7554 1.346 1.2696a5.6875 5.6875 0 0 0-.4969.4085c-.9201.8516-1.4615 1.9597-1.668 3.2335-.6809-.1402-1.3183-.3945-1.984-.7948-.7553-.5128-1.2159-1.1225-1.4004-1.7445-.1851-.624-.1074-1.2712.2776-1.9196.3743-.63.9275-.9534 1.6118-1.0322a2.796 2.796 0 0 1 .5352-.0076Zm17.5094 0a2.797 2.797 0 0 1 .5353.0075c.6842.0786 1.2374.4021 1.6117 1.0322.385.6484.4627 1.2957.2776 1.9196-.1845.622-.645 1.2317-1.4004 1.7445-.6578.3955-1.2881.6472-1.9598.7888-.1942-1.2968-.7375-2.4338-1.666-3.302a5.5639 5.5639 0 0 0-.4709-.3923c.3645-.49.8287-.9428 1.2938-1.2113.6091-.3515 1.2219-.5454 1.7787-.5875ZM12.006 6.0036a14.832 14.832 0 0 1 .487 0c2.3901.0393 4.0848.67 5.1631 1.678 1.1501 1.0754 1.6423 2.6006 1.499 4.467-.1311 1.7079-1.2203 3.2281-2.652 4.324-.694.5313-1.4626.9354-2.2254 1.2294.0031-.0453.014-.0888.014-.1349.0029-1.1964-.9313-2.2133-2.2918-2.2133-1.3606 0-2.3222 1.0154-2.2918 2.2213.0013.0507.014.0972.0181.1471-.781-.2933-1.5696-.7013-2.2777-1.2456-1.4239-1.0945-2.4997-2.6129-2.6037-4.322-.1129-1.8567.3778-3.3382 1.5212-4.3965C7.5094 6.7 9.352 6.047 12.006 6.0036Zm-3.6419 6.8291c-.6053 0-1.0966.4903-1.0966 1.0966 0 .6063.4913 1.0986 1.0966 1.0986s1.0966-.4923 1.0966-1.0986c0-.6063-.4913-1.0966-1.0966-1.0966zm7.2819.0113c-.5998 0-1.0866.4859-1.0866 1.0866s.4868 1.0885 1.0866 1.0885c.5997 0 1.0865-.4878 1.0865-1.0885s-.4868-1.0866-1.0865-1.0866zM12 16.0835c1.0237 0 1.5654.638 1.5634 1.4829-.0018.7849-.6723 1.485-1.5634 1.485-.9167 0-1.54-.5629-1.5634-1.493-.0212-.8347.5397-1.4749 1.5634-1.4749Z"; + private const string PleromaPath = "M6.36 0A1.868 1.868 0 004.49 1.868V24h5.964V0zm7.113 0v12h4.168a1.868 1.868 0 001.868-1.868V0zm0 18.036V24h4.168a1.868 1.868 0 001.868-1.868v-4.096Z"; + private const string FirefishPath = "M16.771 0c-.68-.016-1.342.507-1.342 1.304V7.27c0 .719.582 1.301 1.3 1.301h5.967c1.16 0 1.74-1.401.92-2.22L17.65.383a1.275 1.275 0 0 0-.879-.383ZM6.573.106c-.672-.017-1.326.5-1.326 1.287v5.892c0 .71.575 1.285 1.285 1.285h5.892c1.145 0 1.718-1.384.908-2.194L7.44.484a1.259 1.259 0 0 0-.867-.379ZM1.286 10.287c-.71 0-1.286.576-1.286 1.286v11.142C0 23.425.576 24 1.286 24h11.143c.71 0 1.285-.575 1.285-1.285V11.573c0-.71-.575-1.286-1.285-1.286zm15.485 0c-.68-.017-1.342.507-1.342 1.304v5.966c0 .718.582 1.3 1.3 1.3h5.967c1.16 0 1.74-1.4.92-2.22L17.65 10.67a1.275 1.275 0 0 0-.879-.384zM3.43 17.144a1.714 1.714 0 1 1 0 3.428 1.714 1.714 0 0 1 0-3.428zm4.285 0a1.714 1.714 0 1 1 0 3.428 1.714 1.714 0 0 1 0-3.428z"; + + /// Generic fediverse glyph (honeycomb) for instances whose software isn't in our icon set. + public const string FediverseIconData = "M12 4A1.3 1.3 0 1 0 12 6.6 1.3 1.3 0 1 0 12 4ZM12 10.7A1.3 1.3 0 1 0 12 13.3 1.3 1.3 0 1 0 12 10.7ZM12 17.4A1.3 1.3 0 1 0 12 20 1.3 1.3 0 1 0 12 17.4ZM5.4 6.05A1.3 1.3 0 1 0 5.4 8.65 1.3 1.3 0 1 0 5.4 6.05ZM5.4 15.35A1.3 1.3 0 1 0 5.4 17.95 1.3 1.3 0 1 0 5.4 15.35ZM18.6 6.05A1.3 1.3 0 1 0 18.6 8.65 1.3 1.3 0 1 0 18.6 6.05ZM18.6 15.35A1.3 1.3 0 1 0 18.6 17.95 1.3 1.3 0 1 0 18.6 15.35Z"; + + public static string LogoDataFor(SocialService service) => service switch { - SocialService.YouTube => "YT", - SocialService.Twitch => "TW", - SocialService.X => "X", - SocialService.Instagram => "IG", - SocialService.TikTok => "TT", - SocialService.Facebook => "FB", - SocialService.Discord => "DC", - SocialService.Kick => "K", - SocialService.Threads => "TH", - SocialService.Bluesky => "BS", - SocialService.GitHub => "GH", - SocialService.LinkedIn => "LI", - SocialService.Pinterest => "PN", - SocialService.Snapchat => "SC", - SocialService.Reddit => "RD", - SocialService.WhatsApp => "WA", - SocialService.Telegram => "TG", - SocialService.Link => "L", - _ => "★", + SocialService.YouTube => YouTubePath, + SocialService.Twitch => TwitchPath, + SocialService.X => XPath, + SocialService.Instagram => InstagramPath, + SocialService.TikTok => TikTokPath, + SocialService.Facebook => FacebookPath, + SocialService.Discord => DiscordPath, + SocialService.Kick => KickPath, + SocialService.Threads => ThreadsPath, + SocialService.Bluesky => BlueskyPath, + SocialService.GitHub => GitHubPath, + SocialService.LinkedIn => LinkedInPath, + SocialService.Pinterest => PinterestPath, + SocialService.Snapchat => SnapchatPath, + SocialService.Reddit => RedditPath, + SocialService.WhatsApp => WhatsAppPath, + SocialService.Telegram => TelegramPath, + SocialService.Fediverse => FediverseIconData, + _ => LinkIconData, }; - public static string ColorFor(SocialService service) => service switch + /// + /// The logo for a fediverse instance given its nodeinfo software name + /// (e.g. "peertube", "mastodon"). Unknown software gets the generic + /// fediverse glyph. + /// + public static string LogoDataForFediverse(string? software) => software?.Trim().ToLowerInvariant() switch { - SocialService.YouTube => "#FF0000", - SocialService.Twitch => "#9146FF", - SocialService.X => "#000000", - SocialService.Instagram => "#E4405F", - SocialService.TikTok => "#010101", - SocialService.Facebook => "#1877F2", - SocialService.Discord => "#5865F2", - SocialService.Kick => "#53FC18", - SocialService.Threads => "#010101", - SocialService.Bluesky => "#0085FF", - SocialService.GitHub => "#181717", - SocialService.LinkedIn => "#0A66C2", - SocialService.Pinterest => "#BD081C", - SocialService.Snapchat => "#FFFC00", - SocialService.Reddit => "#FF4500", - SocialService.WhatsApp => "#25D366", - SocialService.Telegram => "#26A5E4", - _ => "#e94560", + "mastodon" => MastodonPath, + "peertube" => PeerTubePath, + "pixelfed" => PixelfedPath, + "misskey" => MisskeyPath, + "lemmy" => LemmyPath, + "pleroma" => PleromaPath, + "firefish" => FirefishPath, + _ => FediverseIconData, }; + /// + /// The canonical profile URL for a service handle. Fediverse handles + /// (@user@domain) are recognized first — their identity carries its own host. + /// public static string CanonicalUrlFor(SocialService service, string handle) { - var h = handle.Trim().TrimStart('@'); + var input = handle.Trim(); + if (TryParseFediverse(input, out var fedUser, out var fedDomain)) + return $"https://{fedDomain}/@{fedUser}"; + var h = input.TrimStart('@'); return service switch { SocialService.YouTube => $"https://www.youtube.com/@{h}", @@ -147,16 +194,9 @@ public static class SocialServiceIcons { var trimmed = input.Trim(); - // Fediverse handle: @user@domain - if (trimmed.StartsWith("@") && trimmed.IndexOf('@', 1) > 0) - { - var parts = trimmed.TrimStart('@').Split('@', 2); - if (parts.Length == 2) - { - var (user, domain) = (parts[0], parts[1]); - return (SocialService.Link, user, $"https://{domain}/@{user}"); - } - } + // Fediverse handle: @user@domain — the full handle IS the identity. + if (TryParseFediverse(trimmed, out var fedUser, out var fedDomain)) + return (SocialService.Fediverse, trimmed, $"https://{fedDomain}/@{fedUser}"); // Strip protocol for domain parsing var url = trimmed; @@ -196,4 +236,16 @@ public static class SocialServiceIcons return (SocialService.Link, trimmed.TrimStart('@'), SocialServiceIcons.CanonicalUrlFor(SocialService.Link, trimmed)); } } + + /// True when the input is a fediverse handle (@user@domain); out the parts. + private static bool TryParseFediverse(string input, out string user, out string domain) + { + user = domain = string.Empty; + if (string.IsNullOrWhiteSpace(input) || input[0] != '@') return false; + var secondAt = input.IndexOf('@', 1); + if (secondAt <= 1 || secondAt == input.Length - 1) return false; + user = input[1..secondAt]; + domain = input[(secondAt + 1)..]; + return true; + } } diff --git a/Models/index.md b/Models/index.md index 863da21..7f8717a 100644 --- a/Models/index.md +++ b/Models/index.md @@ -14,7 +14,7 @@ Plain data types. No logic beyond what a property can carry. See | `QualityOption.cs` | Resolution tier record `(Display, Fps, Bitrate, Width, Height)`; `Label` formats as `1080p60 (8Mbps)` — drives the bottom-bar dropdown and the output-rect math | | `StreamConfig.cs` | `StreamConfig` (note: `TargetBitrate`/`Resolution` defaults are stale — not yet wired to the dropdown), `StreamHealth` (bitrate/FPS/dropped/duration), `StreamStatus` enum | | `YouTube.cs` | `YouTubeChannel` and `ChatMessage` (chat feed) | -| `Socials.cs` | **Social bar** (global resource, per-scene presence): `SocialService` enum (YouTube/Twitch/X/Instagram/TikTok/Facebook/Discord/Kick/Threads/Bluesky/GitHub/LinkedIn/Pinterest/Snapchat/Reddit/WhatsApp/Telegram/Link/Website), `SocialEntry` (Service/Handle/ProfileUrl + Initials/AccentColor), `SocialsConfig` (Entries + BarPosition Top/Bottom + BarJustify LCR), `SocialServiceIcons` (canonical URL builder + initials/color per service) | +| `Socials.cs` | **Social bar** (global layer, never a Source): `SocialService` enum (YouTube/Twitch/X/Instagram/TikTok/Facebook/Discord/Kick/Threads/Bluesky/GitHub/LinkedIn/Pinterest/Snapchat/Reddit/WhatsApp/Telegram/Link/Website/**Fediverse**), `SocialEntry` (Service/Handle/ProfileUrl/`FediverseSoftware`), `SocialsConfig` (Entries + `BarPosition` Top/Bottom + `BarEnabled` on/off — `BarJustify` dropped, column back-compat), `SocialServiceIcons` (canonical URL builder + `DetectService` (URL domain / fediverse `@user@domain` → **Fediverse** / bare→Website) + bundled SVG logo path data per service (`LogoDataFor`) + `LogoDataForFediverse(software)` mapping nodeinfo software names (mastodon/peertube/pixelfed/misskey/lemmy/pleroma/firefish) to logos with a generic fediverse glyph fallback (`FediverseIconData`) + `LockedIconData`/`DoNotIconData` — initials/colors gone) | Related: [`ViewModels/index.md`](../ViewModels/index.md) consume these; [`Services/LayoutStore.cs`](../Services/LayoutStore.cs) persists `Scene`/`Source`. diff --git a/Services/LayoutStore.cs b/Services/LayoutStore.cs index d91c00e..1336de6 100644 --- a/Services/LayoutStore.cs +++ b/Services/LayoutStore.cs @@ -135,11 +135,13 @@ public class LayoutStore : IDisposable MigrateWebcamConfigTable(); MigrateSceneTable(); MigrateSceneSocialBarColumn(); + MigrateSocialsTable(); + MigrateSocialEntryTable(); if (GetUserVersion() < 3) MigrateToV3(); using (var cmd = _connection.CreateCommand()) { - cmd.CommandText = "PRAGMA user_version = 7;"; + cmd.CommandText = "PRAGMA user_version = 8;"; cmd.ExecuteNonQuery(); } } @@ -360,6 +362,46 @@ public class LayoutStore : IDisposable alter.ExecuteNonQuery(); } + // v7 → v8: Socials gains BarEnabled (the dialog's show/hide switch). The old + // BarJustify column stays for back-compat but is no longer read or written. + private void MigrateSocialsTable() + { + var columns = new HashSet(StringComparer.OrdinalIgnoreCase); + using (var cmd = _connection.CreateCommand()) + { + cmd.CommandText = "PRAGMA table_info(Socials);"; + using var reader = cmd.ExecuteReader(); + while (reader.Read()) + columns.Add(reader.GetString(1)); + } + + if (columns.Contains("BarEnabled")) return; + + using var alter = _connection.CreateCommand(); + alter.CommandText = "ALTER TABLE Socials ADD COLUMN BarEnabled INTEGER NOT NULL DEFAULT 1;"; + alter.ExecuteNonQuery(); + } + + // v8 → v9: SocialEntry gains Software (the fediverse instance's nodeinfo + // software name) so a reloaded entry still shows the right service logo. + private void MigrateSocialEntryTable() + { + var columns = new HashSet(StringComparer.OrdinalIgnoreCase); + using (var cmd = _connection.CreateCommand()) + { + cmd.CommandText = "PRAGMA table_info(SocialEntry);"; + using var reader = cmd.ExecuteReader(); + while (reader.Read()) + columns.Add(reader.GetString(1)); + } + + if (columns.Contains("Software")) return; + + using var alter = _connection.CreateCommand(); + alter.CommandText = "ALTER TABLE SocialEntry ADD COLUMN Software TEXT;"; + alter.ExecuteNonQuery(); + } + public List Load() { Webcam = null; @@ -403,19 +445,19 @@ public class LayoutStore : IDisposable using (var cmd = _connection.CreateCommand()) { - cmd.CommandText = "SELECT Id, BarPosition, BarJustify FROM Socials LIMIT 1;"; + cmd.CommandText = "SELECT Id, BarPosition, BarEnabled FROM Socials LIMIT 1;"; using var reader = cmd.ExecuteReader(); if (reader.Read()) { Socials = new SocialsConfig { BarPosition = Enum.TryParse(reader.GetString(1), out var pos) ? pos : SocialBarPosition.Bottom, - BarJustify = Enum.TryParse(reader.GetString(2), out var just) ? just : SocialBarJustify.Center, + BarEnabled = reader.FieldCount > 2 && !reader.IsDBNull(2) && reader.GetInt32(2) != 0, }; var socialsId = reader.GetString(0); using var entryCmd = _connection.CreateCommand(); - entryCmd.CommandText = "SELECT Service, Handle, ProfileUrl FROM SocialEntry WHERE SocialsId = $id ORDER BY SortOrder;"; + entryCmd.CommandText = "SELECT Service, Handle, ProfileUrl, Software FROM SocialEntry WHERE SocialsId = $id ORDER BY SortOrder;"; entryCmd.Parameters.AddWithValue("$id", socialsId); using var entryReader = entryCmd.ExecuteReader(); while (entryReader.Read()) @@ -425,6 +467,7 @@ public class LayoutStore : IDisposable Service = Enum.TryParse(entryReader.GetString(0), out var svc) ? svc : SocialService.Link, Handle = entryReader.GetString(1), ProfileUrl = entryReader.GetString(2), + FediverseSoftware = entryReader.FieldCount > 3 && !entryReader.IsDBNull(3) ? entryReader.GetString(3) : null, }); } } @@ -717,18 +760,18 @@ public class LayoutStore : IDisposable var socialsId = Guid.NewGuid().ToString(); using (var cmd = _connection.CreateCommand()) { - cmd.CommandText = "INSERT INTO Socials (Id, BarPosition, BarJustify) VALUES ($id, $pos, $just);"; + cmd.CommandText = "INSERT INTO Socials (Id, BarPosition, BarEnabled) VALUES ($id, $pos, $enabled);"; cmd.Transaction = tx; cmd.Parameters.AddWithValue("$id", socialsId); cmd.Parameters.AddWithValue("$pos", socials.BarPosition.ToString()); - cmd.Parameters.AddWithValue("$just", socials.BarJustify.ToString()); + cmd.Parameters.AddWithValue("$enabled", socials.BarEnabled ? 1 : 0); cmd.ExecuteNonQuery(); } using var entryCmd = _connection.CreateCommand(); entryCmd.CommandText = """ - INSERT INTO SocialEntry (Id, SocialsId, Service, Handle, ProfileUrl, SortOrder) - VALUES ($id, $socialsId, $service, $handle, $url, $sort) + INSERT INTO SocialEntry (Id, SocialsId, Service, Handle, ProfileUrl, Software, SortOrder) + VALUES ($id, $socialsId, $service, $handle, $url, $software, $sort) """; entryCmd.Transaction = tx; var eId = entryCmd.Parameters.Add("$id", SqliteType.Text); @@ -736,6 +779,7 @@ public class LayoutStore : IDisposable var eService = entryCmd.Parameters.Add("$service", SqliteType.Text); var eHandle = entryCmd.Parameters.Add("$handle", SqliteType.Text); var eUrl = entryCmd.Parameters.Add("$url", SqliteType.Text); + var eSoftware = entryCmd.Parameters.Add("$software", SqliteType.Text); var eSort = entryCmd.Parameters.Add("$sort", SqliteType.Integer); var entrySort = 0; @@ -746,6 +790,7 @@ public class LayoutStore : IDisposable eService.Value = entry.Service.ToString(); eHandle.Value = entry.Handle; eUrl.Value = entry.ProfileUrl; + eSoftware.Value = (object?)entry.FediverseSoftware ?? DBNull.Value; eSort.Value = entrySort++; entryCmd.ExecuteNonQuery(); } diff --git a/Services/SocialValidator.cs b/Services/SocialValidator.cs index d28bbd3..eb38b66 100644 --- a/Services/SocialValidator.cs +++ b/Services/SocialValidator.cs @@ -1,4 +1,5 @@ using System.Net.Http; +using System.Text.Json; using System.Threading; using System.Threading.Tasks; using ytLive.Models; @@ -11,11 +12,17 @@ public sealed class SocialLookupResult public string ProfileUrl { get; init; } = string.Empty; public string Handle { get; init; } = string.Empty; public string Error { get; init; } = string.Empty; + + /// Fediverse instance software (nodeinfo `software.name`), when the handle is federated. + public string? FediverseSoftware { get; init; } + + /// True when the caller canceled the lookup before it finished. + public bool Canceled { get; init; } } public interface ISocialValidator { - Task LookupAsync(SocialService service, string handleOrUrl); + Task LookupAsync(SocialService service, string handleOrUrl, CancellationToken ct); } /// @@ -36,12 +43,39 @@ public sealed class HttpSocialValidator : ISocialValidator "Mozilla/5.0 (compatible; ytLlive social validator)"); } - public async Task LookupAsync(SocialService service, string handleOrUrl) + public async Task LookupAsync(SocialService service, string handleOrUrl, CancellationToken ct) { var input = handleOrUrl.Trim(); if (string.IsNullOrWhiteSpace(input)) return new SocialLookupResult { Error = "Enter a handle or URL." }; + // Fediverse handle (@user@domain): the domain is part of the identity, + // so the canonical URL can't be rebuilt from a bare handle. After the + // profile validates, ask the instance which software it runs (nodeinfo) + // so the caller can show the right service logo. + if (input.StartsWith('@') && input.IndexOf('@', 1) > 0) + { + var at = input.IndexOf('@', 1); + var user = input[1..at]; + var domain = input[(at + 1)..]; + if (user.Length > 0 && domain.Length > 0) + { + var url = $"https://{domain}/@{user}"; + var result = await CheckAsync(service, input, url, ct); + if (!result.Success) return result; + var software = await TryFetchFediverseSoftwareAsync(domain, ct); + if (ct.IsCancellationRequested) + return new SocialLookupResult { Canceled = true }; + return new SocialLookupResult + { + Success = true, + ProfileUrl = result.ProfileUrl, + Handle = result.Handle, + FediverseSoftware = software, + }; + } + } + var handle = input; if (input.StartsWith("http://", System.StringComparison.OrdinalIgnoreCase) || input.StartsWith("https://", System.StringComparison.OrdinalIgnoreCase)) @@ -50,23 +84,31 @@ public sealed class HttpSocialValidator : ISocialValidator handle = uri.AbsolutePath.Trim('/'); } - var url = SocialServiceIcons.CanonicalUrlFor(service, handle); + var canonical = SocialServiceIcons.CanonicalUrlFor(service, handle); + return await CheckAsync(service, handle, canonical, ct); + } + private async Task CheckAsync(SocialService service, string handle, string url, CancellationToken ct) + { try { - using var resp = await _client.GetAsync(url, CancellationToken.None); + using var resp = await _client.GetAsync(url, ct); if (resp.IsSuccessStatusCode || (int)resp.StatusCode is 301 or 302 or 303 or 307 or 308) return new SocialLookupResult { Success = true, ProfileUrl = url, - Handle = handle.TrimStart('@'), + Handle = handle, }; return new SocialLookupResult { Error = $"{service} returned {resp.StatusCode} for '{handle}'. The handle may be wrong or the page doesn't exist.", }; } + catch (System.OperationCanceledException) when (ct.IsCancellationRequested) + { + return new SocialLookupResult { Canceled = true }; + } catch (System.Net.Http.HttpRequestException) { return new SocialLookupResult @@ -79,4 +121,78 @@ public sealed class HttpSocialValidator : ISocialValidator return new SocialLookupResult { Error = ex.Message }; } } + + /// + /// Best-effort nodeinfo lookup: GET /.well-known/nodeinfo, follow the first + /// nodeinfo link, read `software.name`. If the identity domain is itself a + /// redirect (e.g. a YunoHost domain whose default app lives on a subdomain), + /// the bare root 302s to the real instance — follow it and ask that host. + /// Failures return null — validation still succeeds, the icon just falls + /// back to the generic fediverse glyph. + /// + private async Task TryFetchFediverseSoftwareAsync(string domain, CancellationToken ct) + { + try + { + var software = await FetchSoftwareNameAsync(domain, ct); + if (software != null) return software; + + var resolved = await ResolveInstanceHostAsync(domain, ct); + if (resolved == null + || string.Equals(resolved, domain, System.StringComparison.OrdinalIgnoreCase)) + return null; + return await FetchSoftwareNameAsync(resolved, ct); + } + catch (System.OperationCanceledException) when (ct.IsCancellationRequested) + { + return null; // caller checks ct.IsCancellationRequested and reports Canceled + } + catch + { + return null; + } + } + + private async Task FetchSoftwareNameAsync(string domain, CancellationToken ct) + { + var nodeInfoUrl = await FetchNodeInfoUrlAsync(domain, ct); + if (nodeInfoUrl == null) return null; + using var resp = await _client.GetAsync(nodeInfoUrl, ct); + if (!resp.IsSuccessStatusCode) return null; + var json = await resp.Content.ReadAsStringAsync(ct); + using var doc = JsonDocument.Parse(json); + if (doc.RootElement.TryGetProperty("software", out var software) + && software.TryGetProperty("name", out var name)) + return name.GetString(); + return null; + } + + /// Follows the bare-domain root redirect (HttpClient follows 3xx automatically) + /// and returns the final host — the "default app" behind an identity domain. + private async Task ResolveInstanceHostAsync(string domain, CancellationToken ct) + { + using var resp = await _client.GetAsync($"https://{domain}/", ct); + return resp.RequestMessage?.RequestUri?.Host; + } + + private async Task FetchNodeInfoUrlAsync(string domain, CancellationToken ct) + { + using var resp = await _client.GetAsync($"https://{domain}/.well-known/nodeinfo", ct); + if (!resp.IsSuccessStatusCode) return null; + var json = await resp.Content.ReadAsStringAsync(ct); + using var doc = JsonDocument.Parse(json); + if (!doc.RootElement.TryGetProperty("links", out var links)) return null; + foreach (var link in links.EnumerateArray()) + { + if (!link.TryGetProperty("rel", out var rel)) continue; + var relStr = rel.GetString() ?? string.Empty; + if (!relStr.Contains("nodeinfo", System.StringComparison.OrdinalIgnoreCase)) continue; + if (!link.TryGetProperty("href", out var href) || href.GetString() is not { } hrefStr) continue; + if (System.Uri.TryCreate(hrefStr, System.UriKind.RelativeOrAbsolute, out var parsed)) + return parsed.IsAbsoluteUri + ? parsed.AbsoluteUri + : new System.Uri(new System.Uri($"https://{domain}"), parsed).AbsoluteUri; + } + return null; + } } diff --git a/Services/index.md b/Services/index.md index 5530992..b44c756 100644 --- a/Services/index.md +++ b/Services/index.md @@ -32,7 +32,7 @@ External-facing logic: YouTube API, persistence. See | `Compositor/StretchMath.cs` | Pure pixel math: the WPF `UniformToFill` cover-crop, clamped bilinear sample/scale (unit-tested half of the compositor) | | `Compositor/StaticPixelCache.cs` | Asset bytes → cached BGRA8 `VideoFrame`, decoded once per content hash — the output path's raw-pixel source (the preview uses ImageCache's `BitmapImage`) | | `Encoder/IFfmpegLocator.cs` | **TASK 4 ship step 2 seam**: resolves an absolute path to `ffmpeg.exe` (PATH first → cached `%APPDATA%\ytLlive\tools\ffmpeg.exe` → pinned BtbN LGPL-shared zip download). The encoder step and tests fake it | -| `SocialValidator.cs` | `ISocialValidator` seam + `HttpSocialValidator` default: validates a social handle/URL by constructing the canonical profile URL and issuing an HTTP GET — the "act of validation" before adding to the bar. 200/redirect = exists; 404/connection failure = rejected. Constructor takes optional `HttpClient` for tests | +| `SocialValidator.cs` | `ISocialValidator` seam + `HttpSocialValidator` default: validates a social handle/URL by constructing the canonical profile URL and issuing an HTTP GET — the "act of validation" before adding to the bar. 200/redirect = exists; 404/connection failure = rejected. Fediverse `@user@domain` additionally does a best-effort nodeinfo lookup (`/.well-known/nodeinfo` → `software.name`) so the entry can show the instance's real logo; nodeinfo failure still validates (generic fediverse glyph). If the identity domain's nodeinfo is blocked (SSO) but the bare root 302s to the real instance (YunoHost default-app subdomains), the lookup follows the redirect and asks that host instead. Constructor takes optional `HttpClient` for tests | | `Encoder/FfmpegLocator.cs` | The default locator: PATH probe wins, then the cache, then pull+extract (`ffmpeg.exe` **+ the `libav*.dll` family** via a staging dir, failures via `AppLog`). Pinned to BtbN `autobuild-2026-08-09-13-03` **lgpl-shared** (dynamic linking = LGPL compliance without static-relink §6 material; no GPL libx264; NVENC/QSV/AMF + libopenh264 + native AAC — see `ai.md` → Licensing). Search dirs / tools dir / downloader constructor-injected for hermetic tests. Not yet constructed by the app (the encoder step wires it) | Related: constructed in [`ViewModels/MainViewModel.cs`](../ViewModels/MainViewModel.cs) diff --git a/SocialsDialog.xaml b/SocialsDialog.xaml new file mode 100644 index 0000000..3201093 --- /dev/null +++ b/SocialsDialog.xaml @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +