Compare commits

...

48 Commits

Author SHA1 Message Date
JonKazama-Hellion 55120e6572 Merge branch 'feature/v1.4.8'
Security / scan (push) Successful in 23s
Build / Build (Release) (push) Successful in 29s
Forge Announce / Post changelog to Hellion Forge (push) Successful in 7s
Release / Build and attach release ZIP (push) Successful in 37s
2026-05-14 12:12:06 +02:00
JonKazama-Hellion 7542d48983 perf(dbviewer): dispatch FTS filter to worker thread
FullTextSearch + LoadByGuids could stall the draw thread for 100-300 ms
on large databases with a popular search term. The two hot trigger sites
(FTS toggle, search input) now route via TriggerFilterRefresh, which
dispatches the FTS path to Task.Run; the in-memory page-filter path
stays inline because it is sub-ms on the loaded page array.

_ftsFilterSeq is bumped per trigger so a late worker recognises itself
as stale and drops its result instead of overwriting a newer one. The
date/channel and history workers already lived on Task.Run and are
untouched.

Surfaced during the v1.4.8 pre-tag review.
2026-05-14 11:48:40 +02:00
JonKazama-Hellion 7b36763359 docs: add v1.4.8 changelog and forge announcement post
- HellionChat.yaml: v1.4.8 changelog block above v1.4.7, v1.4.4
  dropped per slim-rule (verify-changelog-sync enforces max 4).
- repo.json: Changelog field synchronised with yaml, same slim-drop.
- .github/forge-posts/v1.4.8.md: bilingual announcement post (DE
  body, EN block resolved from yaml at workflow time). Frontmatter
  subtitle 32/60 chars, versionsnatur 12/40 chars, embed total
  ~2787/5500 chars.
2026-05-14 10:51:50 +02:00
JonKazama-Hellion eecedd9f97 chore: bump version to 1.4.8, sync manifest
- csproj <Version>, Plugin.cs schema-gate self-reference, repo.json
  (AssemblyVersion, TestingAssemblyVersion, 3x DownloadLink URLs).
- README.md shield badge, version header, Project Status body.
- docs/CHANGELOG.md gains a v1.4.8 section above v1.4.7.
- docs/ROADMAP.md flips Next Cycle to v1.4.9 (Plugin-Load Render
  Polish), v1.4.8 moves into the released history above v1.4.7.
- Config schema stays at v17, Migration v17 stays additive.

repo.json Changelog field and HellionChat.yaml changelog block plus
the new forge-posts/v1.4.8.md follow in a separate commit (slim-drop
of v1.4.4 happens there).
2026-05-14 10:28:51 +02:00
JonKazama-Hellion 1003a88cad fix(messagestore): match TEXT-stored UUID form in FTS bulk insert and LoadByGuids
messages.Id is declared BLOB but stored as TEXT because Microsoft.Data.Sqlite
binds Guid parameters as UUID strings (UpsertMessage uses AddWithValue with
a Guid). RebuildFtsIndex cast reader.GetValue(0) to byte[] and threw
InvalidCastException at the first row. LoadByGuids bound byte[] params
against the TEXT-stored Id and would have returned no rows once the index
had built.

- RebuildFtsIndex reads via GetGuid and stores ToString() in
  messages_fts.message_guid.
- LoadByGuids parses incoming UUID strings and binds them as Guid so
  Microsoft.Data.Sqlite re-serialises to TEXT, matching the messages.Id
  storage form.
- DbViewer caller variable renamed hexIds -> guidHits for clarity.
2026-05-14 09:58:58 +02:00
JonKazama-Hellion 299fd59cbb refactor(retention): use Framework.RunOnTick instead of synchronous .Wait()
Retention sweep no longer blocks for ~194ms on Framework.Run().Wait().
The clear+refilter pair is now scheduled on the next framework tick, so
it still runs on the framework thread (keeping the Tabs-list mutation
serialisation invariant -- Plugin.Config.Tabs is plain List<Tab> and
AutoTellTabsService can mutate it from background paths) but does not
block the sweep thread while the framework finishes the current frame.

A new _isDisposing volatile bool is set as the first statement in
DisposeAsync so a deferred tick that fires after teardown bails before
it touches MessageManager / Log / static fields the dispose path has
already cleared. The retention worker is IsBackground=true so plugin
unload can race against a still-pending tick.

The existing RetentionSweepLock / RetentionSweepRunning serialisation
covers the not-two-sweeps-at-once invariant; we don't add a CTS here
because RunOnTick is fire-and-forget and the framework service owns
the tick lifecycle.

v1.4.8 B3. Coverage via in-game smoke (frame-time trace during a
retention sweep run) in Task 9 -- no Build-Suite test because the
suite has no FakeFramework fixture and the change is a schedule-form
swap rather than new behaviour.
2026-05-14 00:00:53 +02:00
JonKazama-Hellion 74bcb91b65 feat(themes): auto-reload active custom theme on disk change
When the user edits their active custom theme JSON in an external editor
and saves, the change now propagates to HellionChat within ~1 second
without re-selecting the theme in the picker.

RefreshActiveIfStale runs from Plugin.Draw on every frame but the actual
File.GetLastWriteTimeUtc stat is 1Hz-throttled -- 60fps would otherwise
mean 3600 stats/min, more on Wine. Built-in themes short-circuit on the
IsBuiltIn check; custom themes without a captured source path (Switch
fell to default) short-circuit on the null check.

Switch() now captures the source path of custom themes via an out-param
on LoadCustomBySlug, which now reverse-looks-up against the existing
_customCache (no re-parse, no extra disk IO). Plugin.LoadAsync warms the
cache via AllCustom() once before the first Switch so a Config.Theme
pointing at a custom slug does not fall through to the built-in default
on a cold registry.

Switch's lookup order is now built-in-first to match Get(slug), so a
user-authored JSON that declares a built-in slug is consistently
ignored in both code paths.

Pure-helper ThemeStampDiff isolates the stamp-diff rules for the
Build-Suite (covers DateTime.MinValue hold-the-line semantics).

v1.4.8 B2.
2026-05-13 23:22:14 +02:00
JonKazama-Hellion 2c64aaa251 fix(statusbar): make height DPI-aware via GetTextLineHeightWithSpacing
Replace the fixed 22px const Height with a computed property that bakes
in the ImGui font line height plus a GlobalScale-rounded 2px spacer.
The constant clipped the bottom bar on Windows display-scaling >100%
because ImGui rendered the actual font taller than 22px; the bar then
got pushed off the window edge.

ChatLogWindow.cs:423 reservation drops the explicit +2 because the
spacer now lives inside Height. Same idiom as the v1.4.6 F7.2 underline
pill in ChatLogWindow.cs:1639-1653.

v1.4.8 B1. Coverage via in-game smoke on Windows (Jin) and Linux/Wayland
in Task 9 -- DrawList-coupled, no Build-Suite test.
2026-05-13 22:42:40 +02:00
JonKazama-Hellion 607d2c7241 feat(dbviewer): full-text-search toggle wired to FTS5 query API
New UseFullTextSearch transient UI bool flips DbViewer.Filter() between
the existing local page filter (default) and the FTS5 MATCH path across
the whole database. ImRaii.Disabled blocks the toggle while the bulk-insert
worker is still building the index; the HelpMarker swaps between two
hints, one for the indexing state and one for the phrase-match advisory
once the index is ready.

Three new HellionStrings entries cover EN + DE + the Designer accessor:
- DbViewer_FullTextToggle (label)
- DbViewer_FullTextToggle_Hint_Indexing (tooltip while indexing)
- DbViewer_FullTextToggle_Hint_PhraseMode (tooltip once ready, warns
  multi-word terms match as phrases and how to opt into raw MATCH syntax)

Filter() short-circuits to the local fallback if the toggle is on but
ftsReady has flipped back to false -- defensive against a mid-session
Dispose-and-reopen during indexing.

v1.4.8 H2 Sub-Task 4.4.
2026-05-13 22:08:32 +02:00
JonKazama-Hellion b2a0f3a77c feat(messagestore): add FullTextSearch + LoadByGuids with MATCH-syntax escape
Two new public query methods plus an internal EscapeFtsTerm helper:
- FullTextSearch(term, limit) runs MATCH against messages_fts and returns
  hex-encoded GUIDs sorted by FTS5 rank. Empty/whitespace short-circuits
  to an empty list so callers can fall back to the local page filter.
- LoadByGuids(hexIds) resolves the hex GUIDs back to Message rows via
  WHERE Id IN (...). Chunked at 500 to stay below SQLite's 999-parameter
  cap, and the BLOB-PK autoindex means the join is O(log n) per id.
- EscapeFtsTerm wraps user input in double-quotes so multi-word queries
  match as a phrase, not as per-word AND. Users opt into raw MATCH
  syntax by writing their own quotes.

Plus _readLock serialises every Connection-touching internal method
(UpsertMessage, MessageCount, all readers, retention writers, etc.).
The DbViewer filter worker now runs FullTextSearch on a Task.Run thread
while the PendingMessageThread keeps calling UpsertMessage; SqliteConnection
is not safe for concurrent use, so this single lock is the minimal
architecture change that closes the race. The Lazy-Enumerator methods
(StreamForExport, GetDateRange, GetPagedDateRange) hold the lock only
through command-setup + ExecuteReader; v1.4.8 doc-notes the caveat for
the v1.5.x DI cycle to address with a snapshot-to-list or connection pool.

RebuildFtsIndex stays outside the lock -- it owns its own SqliteConnection
via OpenSecondaryConnection.
2026-05-13 21:27:17 +02:00
JonKazama-Hellion d26c4701fa feat(messagestore): async background FTS5 bulk-insert with progress notification
Adds the worker that fills the messages_fts virtual table after Migrate4.
The bulk-insert runs off the framework thread on its own SqliteConnection
opened via OpenSecondaryConnection -- WAL lets the live UpsertMessage
path on the primary Connection keep flowing, and the worker's writer
lock yields every 500 rows with a 5ms breather so PendingMessageThread
does not hit "database is locked" after DefaultTimeout=5s.

InitFtsReadyCache runs in the ctor and short-circuits to ready=true when
the index is already populated or when the messages table is empty. The
DbViewer (Task 4.4) reads IsFtsIndexBuilt per frame as a single volatile
field read.

Plugin.cs LoadAsync kicks the worker after FilterAllTabsAsync, gated on
IsFtsIndexBuilt and a CancellationTokenSource that DisposeAsync cancels
before MessageManager tears down. Progress reports back via IActiveNotification,
marshalled onto the framework thread via Framework.RunOnTick. Success path
finishes the notification as Success with a 5s linger; cancellation
dismisses it; an error swaps the type to Error with a fallback hint.
2026-05-13 20:38:05 +02:00
JonKazama-Hellion 7f317a2b18 refactor(messagestore): extract BuildConnectionString and ApplyPragmas helpers
Pre-step for the v1.4.8 FTS5 bulk-insert worker. The worker opens its
own secondary SqliteConnection on the same db path so the WAL journal
lets parallel reads/writes through, and it has to apply the exact same
connection-string options and PRAGMAs as Connect() -- otherwise the
worker connection drifts the moment Connect grows a new pragma.

Splitting BuildConnectionString + ApplyPragmas out lets both Connect()
and the upcoming OpenSecondaryConnection() share the same source of
truth instead of duplicating the body. No behaviour change.
2026-05-13 20:31:43 +02:00
JonKazama-Hellion 38149059c3 feat(messagestore): add Migrate4 with standalone FTS5 virtual table
Lays down a messages_fts virtual table with message_guid (UNINDEXED, hex
TEXT of the BLOB primary key), sender_text and content_text columns
using the unicode61 tokenizer with diacritic folding. Standalone FTS5
without content='messages' linking, because messages.Id is BLOB and
FTS5's content_rowid contract requires an INTEGER rowid alias.

LoadByGuids (Task 4.3) will resolve the hex GUIDs back to messages rows
via WHERE Id IN (...) joins. Schema step only -- the bulk-insert worker
that fills the index lives in Task 4.2.

Internal Connection property exposure plus a HasMessagesFtsTable helper
let the Build-Suite verify Migrate4 without raw PRAGMA glue in each test.

v1.4.8 H2 Sub-Task 4.1.
2026-05-13 19:51:54 +02:00
JonKazama-Hellion 67175419a9 refactor(messagestore): extract ReadMessageRow as shared deserialiser
Pure deserialisation helper that pulls one row from the current reader
position into a Message. The MessageEnumerator load path delegates to
it, and the upcoming FTS-join LoadByGuids (Task 4.3) will share the
same code so both stay in lockstep when the column layout shifts.

Pre-step for v1.4.8 H2 FTS5 full-text search.
2026-05-13 19:20:55 +02:00
JonKazama-Hellion d3fdcdf43d Merge branch 'feature/v1.4.7'
Security / scan (push) Successful in 23s
Build / Build (Release) (push) Successful in 30s
Forge Announce / Post changelog to Hellion Forge (push) Successful in 7s
Release / Build and attach release ZIP (push) Successful in 39s
2026-05-13 11:07:32 +02:00
JonKazama-Hellion f4ea460644 chore: bump version to 1.4.7, sync changelog and forge post
- csproj <Version> -> 1.4.7
- repo.json AssemblyVersion + TestingAssemblyVersion -> 1.4.7.0
- repo.json DownloadLink{Install,Update,Testing} URLs -> /v1.4.7/
- repo.json + HellionChat.yaml changelog: prepend v1.4.7 block, retire
  v1.4.3 (slim rule keeps the last 3-4 versions)
- docs/CHANGELOG.md + docs/ROADMAP.md: v1.4.7 section, next-cycle
  pointer flipped to v1.4.8 Hook-Layer-Cycle
- README.md release badge + version stamps + Project Status block
  rewritten for v1.4.7
- .github/forge-posts/v1.4.7.md (new): DE body with subtitle
  "Backlog Cleanup and Mid-Features" / versionsnatur "Mid-Feature-Patch"
- Pin diagnostic logs (RehydratePinnedTabs / TryPin / Unpin /
  PromoteToPermanent) downgraded from Info to Debug so non-debug
  console stays quiet on release builds
2026-05-13 11:00:25 +02:00
JonKazama-Hellion d5735d8dcc fix(tabs): preserve runtime channel across Settings Save, deep-clone seeded CurrentChannel
Smoke-test round 4 surfaced a clean reproducer: a Party or Linkshell
tab with channel /p, then Settings → Save, popped the input back to
/tell <pinned-partner> on the next interaction. Two bugs combined:

1. Configuration.UpdateFrom captured only Messages+LastSendUnread from
   the live state during the persistent-tab merge. CurrentChannel was
   not preserved, so a Settings save overwrote the runtime channel
   state with the settings-time snapshot. If the user switched channel
   in-game between Settings-open and Settings-save, that switch was
   lost. Live CurrentChannel now joins Messages and LastSendUnread in
   the per-Identifier preservation tuple.

2. TabSwitched seeded a new tab's CurrentChannel from previousTab via
   reference copy (`newTab.CurrentChannel = previousTab.CurrentChannel`).
   That left both tabs sharing the same UsedChannel instance, so a
   later mutation on one bled into the other — exactly the path that
   carried a pinned tell-target onto Party. Switched to a deep clone
   (UsedChannel.Clone(), same Cherry-Pick-Patch-B pattern from v1.4.6)
   plus a Debug log so the next smoke can confirm at a glance which
   previous tab donated its channel state.

Pre-existing ChatTwo upstream pattern; v1.4.7 just made it visible
because pinned tabs are now the kind of long-lived tell-target that
sticks around for the seed path to grab.
2026-05-13 10:31:21 +02:00
JonKazama-Hellion 80b48ac3ad feat(sidebar): pinned section, dimmed pin glyph, configurable width
Smoke-test round 3 feedback from Jin:

- Sidebar now groups tabs into three sections rendered in this order:
  persistent → pinned TempTabs → unpinned TempTabs. Each TempTab
  section carries its own divider header ("Angepinnt (n)" / "Aktive
  Tells (n)"). Plugin.Config.Tabs order is untouched — only the
  display order changes, so tabI still mirrors the real index and
  LastTab/WantedTab stay consistent.

- The thumbtack glyph overlay on a pinned tab dropped from accent
  colour at full alpha to TextMuted at ~47% alpha. The section header
  is now the primary discoverability cue; the glyph is just a per-tab
  confirmation hint.

- Sidebar width is now a Config field (default 44, range 44-160).
  Slider lives in Theme & Layout under the existing Sidebar-Tab-View
  toggle. The icon button inside each row stretches with the width so
  a widened sidebar doesn't leave the icon floating in dead space.
2026-05-13 10:16:53 +02:00
JonKazama-Hellion cddd29a986 fix(tabs): pin indicator, history preload, drop Promote from temp menu
Smoke-test round 2 feedback from Jin:
- Promote-to-permanent label "Dauerhaft behalten" was indistinguishable
  from Pin in German, leading to misclicks that dropped the tell-target.
  Removed the menu entry from TempTabs entirely — Promote stays as a
  service method for future use, but the user-facing path is gone. Anyone
  who wants a regular tab can still create one via the existing
  "neuen Tab anlegen" flow.
- No visual confirmation that pin took effect. Added a FontAwesome
  thumbtack overlay top-left of the sidebar icon, accent-coloured, and
  appended a "Pinned — survives relog" line to the hover tooltip.
- Pinned tabs came back empty after a full disable/enable cycle because
  Tab.Messages is NonSerialized. RehydratePinnedTabs now also runs the
  same MessageStore-backed PreloadHistory the spawn path uses, so the
  recent conversation window reappears alongside the rehydrated
  TellTarget.

Diagnose-logging on TryPin/Unpin/Promote/Rehydrate stays in so the next
smoke can confirm at a glance which path fired from the Dalamud console.
2026-05-13 10:08:33 +02:00
JonKazama-Hellion 799fdb67cc fix(tabs): rehydrate pinned TempTab tell-targets after reload
Smoke-test (Jin's scenario) surfaced two coupled bugs in v1.4.7 pin
persistence:

1. The chat input couldn't send to the pinned partner after a reload.
   Tab.CurrentChannel is NonSerialized, so it came back as a fresh
   UsedChannel with TellTarget=null even though tab.TellTarget (the
   persisted twin) was intact. The game-side channel hook only repaints
   CurrentChannel on a /tell or channel switch, so the pinned tab sat
   there mute until the user manually re-bounced the channel.

2. An incoming tell from the pinned partner spawned a *second* TempTab
   instead of routing into the existing pinned one. The Name+World
   lookup in FindTempTab was vulnerable to any round-trip nuance on
   tab.TellTarget — the fallback path now matches by tab name, which
   FormatTabName pins at spawn time.

Fix:
- AutoTellTabsService.Initialize now calls RehydratePinnedTabs() after
  the Phase-2 wiring lands, seeding tab.CurrentChannel.TellTarget +
  Channel from the persisted tab.TellTarget. Channel is also defaulted
  to InputChannel.Tell on the tab record so the chat-input bar paints
  Tell mode immediately on first selection.
- FindTempTab gained a Name-based fallback for the case where the
  primary TellTarget lookup misses (e.g. a pinned tab whose TellTarget
  didn't round-trip cleanly through an old save).
- HandleTell self-heals: when the fallback matches a pinned tab with a
  missing TellTarget, the tab is repaired from the live partner data
  and persisted, so subsequent messages take the fast path.

Build-suite coverage was attempted (PinnedTabJsonRoundtripTests) but
Tab + TellTarget are both Dalamud-coupled — Newtonsoft's reflection
walk loads Dalamud.dll which isn't available in the xUnit AppDomain
(documented in feedback_dalamud_test_isolation). Verification stays on
the ingame smoke path.
2026-05-13 09:53:27 +02:00
JonKazama-Hellion 69fa0fecbd feat(honorific): render glow outline as opt-in (gradient deferred)
Honorific's TitleData carries Glow / Color3 / GradientColourSet /
GradientAnimationStyle beyond the Title + Color we parsed in Cycle 1.
The DTO now mirrors all four so the JSON roundtrip doesn't silently
drop fields.

Rendering for v1.4.7 covers Glow only: when Config.ShowHonorificGlow
is on and the title has a Glow colour, the chat header title gets an
8-direction ±1px draw-list outline pre-pass in the glow colour at 0.4
alpha, then the primary text on top.

Gradient (Color3 / GradientColourSet / GradientAnimationStyle) is parsed
and stashed for a later cycle — porting the full animation needs
Honorific's hardcoded Pride-palette list and GradientSystem.cs (or an
upstream IPC PR exposing the resolved frame colour). Tracked as
"Honorific Full Gradient Port" in the vault backlog.

ShowHonorificGlow defaults OFF — keeps v1.4.6 visuals untouched and
dodges per-frame DrawList overhead on low-end hardware. Tooltip flags
the gradient deferral so users aren't surprised by static rendering.
2026-05-13 09:34:43 +02:00
JonKazama-Hellion fd5f970a8b feat(tabs): add IsPinned with separate pool and 5-tab cap
Tester-Request from Jin (2026-05-03): TempTabs should be pinnable so a
key conversation partner survives a relog. Right-click a TempTab and
choose Pin Tab / Unpin Tab / Promote to permanent.

Pool semantics:
- AutoTellTabsLimit (15) still gates the auto-managed unpinned pool.
- Pinned TempTabs live in their own pool, hard-capped at 5.
- The 6th pin attempt fails with a notification; users can unpin first
  or promote to permanent.
- Unpinning into a full unpinned pool drops the oldest unpinned (no
  user friction).

Mechanics:
- Tab.IsPinned (default false); Tab.Clone() carries it.
- Migration v16 -> v17 (additive; existing tabs default to unpinned).
- Three strip-sites synchronised through TabLifecycleHelpers:
  Plugin.cs load-time, Plugin.SaveConfig, Configuration.UpdateFrom.
- AutoTellTabsService:
  * MaxPinnedTempTabs constant.
  * F2.1 _activeTempTabCount counter retired — ActiveTempTabCount is
    now Tabs.Count(predicate). Pin/Unpin/Promote transitions are
    cold-path and don't need lock-free reads.
  * DropOldestTempTab filters on IsInUnpinnedPool so pinned tabs are
    never drop candidates.
  * OnLogout strips only the unpinned pool; pinned popouts and the
    active-tab switch behave correspondingly.
  * TryPin / Unpin / PromoteToPermanent service methods.
- ChatLogWindow tab context menu: Pin / Unpin / Promote with disabled-
  state at-cap tooltip + Promote tooltip explaining the channel-filter
  side effect.
- HellionStrings (EN+DE) for menu labels, tooltips, the limit warning.
- AutoTellTabsLimit slider description now flags the separate pinned
  pool so users aren't surprised by 18 tabs when the limit reads 15.
2026-05-13 09:06:14 +02:00
JonKazama-Hellion fee2459e73 refactor(services): route logging through IPluginLogProxy
F12.2 step 5b — service cluster (~42 sites in 16 files):
MessageManager, GameFunctions/{Chat, GameFunctions, KeybindManager},
EmoteCache, PayloadHandler, AutoTellTabsService, FontManager, Commands,
Util/{WrapperUtil, AutoTranslate, MemoryUtil}, Message, Themes/ThemeRegistry,
Ipc/ExtraChat, Configuration.

The proxy interface gained Dalamud's params-overload signature
(messageTemplate + params object[]) to cover Configuration.cs:86 which
relies on Serilog-style placeholders.

Verified: zero remaining Plugin.Log.X(...) call-sites in HellionChat/,
build green, build-suite 690/690.
2026-05-13 08:38:40 +02:00
JonKazama-Hellion 63cad62c89 refactor(ui): route logging through IPluginLogProxy
F12.2 step 5a — UI cluster (~40 sites in 6 files):
ChatLogWindow, DbViewer, Popout, SettingsTabs/{DataManagement,
FontsAndColours, ThemeAndLayout}. Plugin.Log.X(...) → Plugin.LogProxy.X(...).
No behaviour change; the proxy delegates 1:1 to the original IPluginLog.
2026-05-13 08:22:12 +02:00
JonKazama-Hellion dca5de4085 refactor(messagestore): inject IPluginLogProxy for test isolation
MessageStore's Migrate0 (and the Migrate1/2/3 siblings) called
Plugin.Log.Information directly, which prevented an isolated xUnit
construction test from running — Dalamud.dll cannot load in the test
AppDomain. With IPluginLogProxy threaded through the ctor and the inner
MessageEnumerator, the whole MessageStore.cs file is now Dalamud-static
free and the Build-Suite covers it (Floor 688 -> 690).

This is the second half of F12.2; the remaining ~82 Plugin.Log call
sites in the rest of the plugin will be routed through the static
Plugin.LogProxy wrapper in a follow-up commit.
2026-05-13 08:15:20 +02:00
JonKazama-Hellion 8edc3c70d3 feat(util): add IPluginLogProxy interface and production wrapper
F12.2 closes the gap that F12.1 left open: MessageStore's ctor calls
Plugin.Log.Information inside Migrate0, which prevents an isolated xUnit
construction test (Dalamud.dll cannot load in the test AppDomain).

The proxy mirrors IPluginLog's full surface (Verbose/Debug/Information/
Info/Warning/Error/Fatal — both Info and Information as Dalamud exposes
them) with both single-string and Exception+string overloads, so the
~91 existing Plugin.Log.* call-sites become a drop-in rewrite to
Plugin.LogProxy.*.

A later DI-container adoption cycle (v1.5.x) may swap this for
Microsoft.Extensions.Logging's ILogger<T>; this commit is the
intermediate decorator step.
2026-05-13 08:11:34 +02:00
JonKazama-Hellion 3c33acf6d7 fix(util): pin operator precedence in DrawArrows IconButton id
`id + 1.ToString()` resolves as `id.ToString() + "1"`, producing "01"
instead of "1" for the ArrowRight button. The single live caller
(DbViewer page navigation) still produced unique IDs by accident, but
the semantics were wrong. Explicit parentheses fix it.
2026-05-13 08:08:52 +02:00
JonKazama-Hellion c8ba8c1cd0 docs: linting Docs
Security / scan (push) Successful in 22s
Build / Build (Release) (push) Successful in 29s
2026-05-12 22:41:54 +02:00
JonKazama-Hellion 94e4828aeb fix: update forge-announce.yml to use the correct branch
Security / scan (push) Successful in 21s
Build / Build (Release) (push) Successful in 27s
2026-05-12 22:33:53 +02:00
JonKazama-Hellion 1d88cb4c42 Merge feature/v1.4.6 — Code Hygiene and Refactor
Security / scan (push) Successful in 22s
Build / Build (Release) (push) Successful in 29s
Release / Build and attach release ZIP (push) Successful in 37s
Forge Announce / Post changelog to Hellion Forge (push) Failing after 7s
2026-05-12 21:28:29 +02:00
JonKazama-Hellion c5fe69f0d3 feat(themes): swap Moonlit Bloom for Crystal Nocturne, sort built-ins by colour family
Crystal Nocturne (royal sapphire + electric magenta on obsidian, by
CRYSTALLITE) replaces Moonlit Bloom in the built-in roster. The same
chat-channel tinting convention applies: sapphire-blue identity on
party/team channels, accent-magenta on tells, and an alternating
mint/yellow/peach palette across the eight linkshell slots so each
LS stays individually distinguishable on the dark obsidian background.

Users who had Moonlit Bloom selected fall back to the default Hellion
Arctic on the first plugin load. A custom JSON copy of Moonlit Bloom
dropped into pluginConfigs/HellionChat/themes/ keeps working as a
user theme.

Plus a cosmetic re-sort of the registry: insertion order now drives a
deliberate Theme-Picker grid layout (3 columns) — blue family in row 1,
purple to magenta in row 2, green/warm/classic in row 3, Synthwave
Sunset alone in row 4 as a retro bonus.
2026-05-12 21:28:16 +02:00
JonKazama-Hellion b46d3ad0a8 chore: bump schema-gate message to v1.4.6
Plugin.cs:171-172 hardcoded the version into the schema-gate
InvalidOperationException string. The follow-up rename in v1.4.7 will
move this to Plugin.Interface.Manifest.AssemblyVersion so this commit
stops happening every cycle, but for v1.4.6 the bare version bump is
the smallest change.

Also picks up a one-line csharpier reflow on UrlValidation.cs
collapsed by the format pass.
2026-05-12 20:59:56 +02:00
JonKazama-Hellion e33cf0dcb9 ci(forge): add v1.4.6 forge announcement post
DE body for the Hellion Forge Discord embed; subtitle and
versionsnatur frontmatter fields within the 60/40 char caps;
embed-total ~2267/5500 per the changelog-sync verifier.
2026-05-12 20:58:59 +02:00
JonKazama-Hellion 0d016aaa5d docs: log v1.4.6 release notes
CHANGELOG.md gets the full per-bullet block, ROADMAP.md gets the
released-cycle summary plus a v1.4.7 next-cycle placeholder, README
status section and version badge updated.
2026-05-12 20:58:57 +02:00
JonKazama-Hellion 5b972238bb chore: bump version to 1.4.6
csproj <Version>, yaml changelog block (v1.4.6 added on top, v1.4.2
rotated out per the slim-4-versions rule), repo.json AssemblyVersion
+ TestingAssemblyVersion + the three DownloadLink URLs + Changelog
string, all in sync.
2026-05-12 20:58:52 +02:00
JonKazama-Hellion 7ac1eb3fd4 fix(ui): pass measured width straight through IconButton, drop broken subtract
Inspired by ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12).

Upstream dropped the width parameter entirely because nothing called
it. We keep the parameter — two ChatLogWindow header buttons (Cog,
EyeSlash) size themselves to match the preceding ChannelIcon button.

The actual bug is local: the previous size = width - 2 * CellPadding.X
mixed a raw int (HUD-scale unaware) with CellPadding.X (HUD-scaled),
so the button shrank under elevated HUD scale. ImGui.Button handles
its own frame padding internally, so the measured width passes
through unchanged.
2026-05-12 20:42:17 +02:00
JonKazama-Hellion db48f27842 fix(chat): release Utf8String when linkshell check rejects channel
Cherry-pick from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12).

Chat.SetChannel allocates a native Utf8String for the target name and
then runs a validity check. The previous early return on an invalid
linkshell skipped Dtor and leaked the native allocation; every invalid
linkshell switch added one Utf8String to the unmanaged heap.

- Renamed ValidAnyLinkshell to IsChannelOrExistingLinkshell so the
  call-site reads naturally.
- Wrapped ChangeChatChannel in the validity check instead of
  early-returning. Dtor now runs on every path.
- ChatLogWindow follows the rename at its single call-site.
2026-05-12 20:39:23 +02:00
JonKazama-Hellion f8b5c14509 fix(config): deep-clone UsedChannel and TellTarget in Tab.Clone
Cherry-pick from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12).

Tab.Clone() used to assign CurrentChannel = CurrentChannel and run
TellTarget.From(TellTarget). The first was a plain reference copy of
the UsedChannel — the clone and the source shared the same channel
state, so a channel switch or TellTarget update on a PopOut/Temp tab
also mutated its origin tab. The second was a static factory call
that read like a constructor where every other place uses Clone().

- TellTarget: static From(t) replaced by instance Clone(); only
  call-site swapped to TellTarget.Clone().
- UsedChannel: new Clone() that copies the scalar fields and runs
  Clone() on the two TellTarget references (null-safe).
- Tab.Clone(): CurrentChannel goes through UsedChannel.Clone().
2026-05-12 20:38:12 +02:00
JonKazama-Hellion 28e4b30cd6 refactor(ui): route OpenLink call-sites through Plugin.PlatformUtil (F12.1)
Ten Util.OpenLink call-sites across five files now go through the
IPlatformUtil indirection: WrapperUtil.TryOpenUri, the Settings Ko-Fi
buttons (x2), the Information tab (issues link plus media/upstream
links, x3), the Integrations tab (Honorific repo/author plus forge
discord, x3), and the ThemeAndLayout 'open themes folder' button.

A future addition to this pattern only needs to plug into IPlatformUtil
instead of touching Dalamud.Utility.Util directly.
2026-05-12 20:32:17 +02:00
JonKazama-Hellion 4510c1e404 refactor(store): route MessageStore IsWine probe through IPlatformUtil (F12.1)
MessageStore.Connect used to call Util.IsWine() directly via a
DalamudUtil alias, which made the ctor unreachable from the xUnit
test AppDomain: any test that allocated a MessageStore tripped a
FileNotFoundException on Dalamud.dll before reaching the assertion.

The ctor now takes an IPlatformUtil and reads the cached IsWine
property. MessageManager passes Plugin.PlatformUtil in. Production
behaviour is identical; the test path can now substitute a fake
and exercise the SQLite migration logic in isolation.
2026-05-12 20:29:22 +02:00
JonKazama-Hellion 6b44f549b4 feat(util): add IPlatformUtil indirection over Dalamud.Utility.Util (F12.1)
Introduces a thin interface around Util.IsWine and Util.OpenLink so
services can be constructed in an isolated xUnit AppDomain without
forcing Dalamud.dll onto the assembly search path. Production wiring
(DalamudPlatformUtil) caches IsWine at ctor time — it's a runtime
probe that never changes for the lifetime of a plugin instance,
mirroring the Lightless DalamudUtilService pattern.

Plugin.PlatformUtil is wired in the Phase-1 ctor so any service that
LoadAsync allocates can resolve the platform indirection without
plumbing the instance through additional constructor params.

Follow-up commits route MessageStore and the OpenLink call-sites
through this interface.
2026-05-12 20:10:40 +02:00
JonKazama-Hellion ae1436b103 perf(config): clone only temp tabs in SaveConfig snapshot/restore (F2.2)
The pre-serialization snapshot used to clone the entire Config.Tabs
list, then Clear/AddRange the snapshot back. With a typical config of
~30 user-defined tabs plus up to 15 session-only temp tabs, that's a
45-item clone on every save. The persistent tabs never leave the list
during this routine, so cloning only the temp subset is functionally
identical and keeps the allocation proportional to AutoTellTabsLimit.
2026-05-12 19:35:17 +02:00
JonKazama-Hellion 2684c31f10 fix(ui): scale active-tab underline with DPI for crisp rendering (F7.2)
The 2px underline pill was hardcoded — at 125/150% DPI the surrounding
tab layout scaled with ImGuiHelpers.GlobalScale but the pill stayed
2px, so the line landed on sub-pixel boundaries and rendered as a
fuzzy band. Now: height scales with GlobalScale (clamped to >=1px),
and the DrawList coordinates round to physical pixels via MathF.Round
so the rect aligns with the framebuffer grid.
2026-05-12 19:09:43 +02:00
JonKazama-Hellion bdd64cad07 perf(ui): cache GetWindowDrawList per frame in SettingsOverview (F7.3)
DrawCard used to call ImGui.GetWindowDrawList once per card, so a frame
with 10 settings cards took 10 draw-list lookups. The list is the same
for every card in the same frame, so Draw() now resolves it once and
passes the pointer down. Pattern parity with ChatLogWindow's frame-local
draw-list handling.
2026-05-12 18:43:05 +02:00
JonKazama-Hellion 28ea2fa553 refactor(theme): extract ChildBgAlpha threshold logic to testable helper (F1.2)
HellionStyle.PushGlobal had two lines that resolved the child-bg alpha
based on window opacity. Moves the 0.999f threshold and the alpha-mask
into HellionStyleHelpers.ResolveChildBgAlpha so the logic is reachable
from the build suite without touching the ImGui surface.
2026-05-12 18:19:15 +02:00
JonKazama-Hellion dd597fca44 feat(branding): validate URL constants on module init (F11.2)
BrandingLinks (5 Hellion-owned URLs) and IntegrationLinks (2 third-party
plugin URLs) now run through UrlValidation.ValidateAll from a
[ModuleInitializer] hook. A malformed URL throws InvalidOperationException
at plugin load with the source class and the broken URL in the message,
instead of silently failing when a user clicks the button.

CA2255 is suppressed at the attribute sites — the warning is for library
code shipped to unknown consumers, but the plugin DLL is loaded directly
by Dalamud, which makes module-init the right one-shot hook.
2026-05-12 17:48:51 +02:00
JonKazama-Hellion b9d3ff8f26 fix(fonts): broaden font fallback catch to handle atlas-toolkit throws (G2)
The atlas-toolkit pipeline can throw InvalidOperationException or
ArgumentException when a configured font is structurally broken (e.g.
unreadable header, unsupported glyph table). Previously only IO-shaped
throws routed to the NotoSansCjkRegular fallback, so a corrupt font
config would take down the entire atlas build instead of degrading
gracefully. The warning log now carries the exception type name so the
diagnostic path can tell which class of throw triggered the fallback.
2026-05-12 17:19:28 +02:00
JonKazama-Hellion df3d5d78d6 build(preflight): add csharpier and markdownlint blocks (G1)
Block E runs 'dotnet csharpier check' against the HellionChat/ tree,
catching reflow drift before push. Block F runs markdownlint-cli2 over
the repo's *.md files; MD036 is disabled because forge-post bodies use
bold emphasis as section headings (the auto-announce workflow renders
those as Discord embeds, so the bold pattern is required). The .claude
directory is excluded from the lint scope to match its gitignore status.

.markdownlint.json also gains MD024 with siblings_only:true so per-release
'### Internal' sub-headers in CHANGELOG.md don't trip the rule across
sibling H2 sections.
2026-05-12 16:53:22 +02:00
61 changed files with 2525 additions and 653 deletions
+35 -10
View File
@@ -120,17 +120,37 @@ jobs:
$enBlock = $rest.TrimEnd() $enBlock = $rest.TrimEnd()
} }
# ---------- Char-Cap-Check (5500 Total auf title + description + footer) ---------- # ---------- Embed-Felder + Per-Field-Caps (Discord-Hard-Limits) ----------
# Discord enforces per-embed-field limits separately from the
# combined-total limit. We split the DE and EN blocks into two
# embeds that share the same release URL so Discord stitches
# them into one visual card. Hard caps per Discord docs:
# description: 4096 per embed
# title: 256 per embed
# footer.text: 2048 per embed
# combined sum across all embeds: 6000
$title = "Hellion Chat $version — $subtitle" $title = "Hellion Chat $version — $subtitle"
$description = "**Deutsch**`n`n$deBody`n`n**English**`n`n$enBlock" $deDesc = "**Deutsch**`n`n$deBody"
$enDesc = "**English**`n`n$enBlock"
$footerText = "Hellion Forge · $versionsnatur" $footerText = "Hellion Forge · $versionsnatur"
$totalChars = $title.Length + $description.Length + $footerText.Length $releaseUrl = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/$tag"
if ($totalChars -gt 5500) {
throw "V6: Total char count $totalChars exceeds 5500 limit. Major-Release detected — please post manually via Bot/Multi-Embed (see forge style §8). Forge-Auto-Announce stays off for this tag."
}
Write-Host "Char-Cap OK: $totalChars / 5500"
# ---------- Embed-Payload bauen ---------- if ($deDesc.Length -gt 4096) {
throw "V6a: DE-Body too long for one embed ($($deDesc.Length) chars, max 4096). Trim .github/forge-posts/$tag.md or post the announcement manually (see forge style §8)."
}
if ($enDesc.Length -gt 4096) {
throw "V6b: EN-Block too long for one embed ($($enDesc.Length) chars, max 4096). Trim the changelog entry in HellionChat/HellionChat.yaml or post manually."
}
$totalChars = $title.Length + $deDesc.Length + $enDesc.Length + $footerText.Length
if ($totalChars -gt 6000) {
throw "V6c: Combined embed chars $totalChars exceed Discord's 6000-total limit. Major-Release detected — post manually via Bot/Multi-Embed (see forge style §8)."
}
Write-Host "Embed-Caps OK: de=$($deDesc.Length)/4096, en=$($enDesc.Length)/4096, total=$totalChars/6000"
# ---------- Embed-Payload bauen (zwei Embeds, gleiche url) ----------
# Sharing the same `url` tells Discord to render both embeds as a
# single contiguous card block. The title sits on the first embed,
# the footer + timestamp on the last so it reads as one post.
$payload = [ordered]@{ $payload = [ordered]@{
username = "Forge Herald" username = "Forge Herald"
avatar_url = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/icon.png" avatar_url = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/icon.png"
@@ -142,9 +162,14 @@ jobs:
embeds = @( embeds = @(
[ordered]@{ [ordered]@{
title = $title title = $title
url = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/$tag" url = $releaseUrl
color = 12730636 color = 12730636
description = $description description = $deDesc
},
[ordered]@{
url = $releaseUrl
color = 12730636
description = $enDesc
footer = [ordered]@{ text = $footerText } footer = [ordered]@{ text = $footerText }
timestamp = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ") timestamp = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ")
} }
+33
View File
@@ -0,0 +1,33 @@
---
subtitle: Code Hygiene and Refactor
versionsnatur: Maintenance-Cycle
---
Wartungs-Patch ohne User-sichtbare Änderungen. Saubere Code-Basis als Vorbereitung auf das v1.4.7-Backlog-Cleanup, plus
zwei geerbte Bugfixes aus dem ChatTwo-Upstream `f35b7d3`.
- **preflight.sh härter**: csharpier-Reflow-Check (Block E) und markdownlint (Block F) laufen jetzt im Pre-Push-Gate,
statt erst beim Pre-Merge-Review aufzufallen.
- **FontManager-Fallback robuster**: Atlas-Toolkit-Throws aus kaputten Font-Configs (IO, InvalidOperation,
ArgumentException) fallen jetzt zuverlässig auf NotoSansCjkRegular, statt den Atlas-Build mitzureißen. Der
Exception-Typ wird im Log mitgegeben für die Diagnose.
- **URL-Validation beim Plugin-Load**: BrandingLinks (5 URLs) und IntegrationLinks (2 URLs) werden via
`[ModuleInitializer]` geprüft. Ein Tippfehler bei einer künftigen URL-Rotation wirft jetzt sofort beim Plugin-Load,
statt still beim Klick zu scheitern.
- **Cherry-Pick aus ChatTwo `f35b7d3`** — Memory-Leak in `Chat.SetChannel`: der native `Utf8String` wird jetzt auch dann
freigegeben, wenn der Linkshell-Check den Channel ablehnt (vorher gefangen im early-return).
- **Cherry-Pick aus ChatTwo `f35b7d3`** — `Tab.Clone()` Deep-cloned jetzt `UsedChannel` und `TellTarget`. Vorher
Reference-Share-Bug: PopOut- und Temp-Tabs mutierten sich gegenseitig.
- **Aktive-Tab-Underline pixel-perfect bei DPI-Scaling**: Die Underline-Pill skaliert jetzt mit
`ImGuiHelpers.GlobalScale` und rundet die DrawList-Koordinaten auf physische Pixel. Kein Sub-Pixel-Blur mehr auf
125/150%-Setups.
- **IconButton-Width-Fix**: der manuelle `width - 2 * CellPadding.X`-Subtract verlor den HUD-Scale (Padding skaliert,
der raw int nicht). Gemessene Breite läuft jetzt unverändert durch.
- **Test-Isolation für MessageStore**: `Dalamud.Utility.Util`-Surface (IsWine, OpenLink) läuft jetzt durch eine
`IPlatformUtil`-Indirektion. MessageStores `IsWine`-Probe ist isoliert testbar in der Build-Suite. Plus:
HellionStyle-ChildBgAlpha als Pure-Helper extrahiert, Plugin.SaveConfig kopiert nur Session-Tabs statt der ganzen
Tab-Liste, SettingsOverview cached den DrawList einmal pro Frame.
- **Built-in-Theme-Roster**: Crystal Nocturne (Royal Sapphire + Electric Magenta auf Obsidian, von CRYSTALLITE) ersetzt
Moonlit Bloom. User mit Moonlit Bloom als aktivem Theme fallen beim ersten Plugin-Load auf Hellion Arctic zurück.
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+29
View File
@@ -0,0 +1,29 @@
---
subtitle: Backlog Cleanup and Mid-Features
versionsnatur: Mid-Feature-Patch
---
Achter Sub-Patch der v1.4.x Polish-Sweep-Serie. Erstes User-sichtbares Feature-Bundle seit v1.4.5 — angepinnte Tell-Tabs
die Relog überleben, opt-in Honorific-Glow, plus eine konfigurierbare Sidebar.
- **TempTell anpinnen**: Rechtsklick auf einen TempTell-Tab in der Sidebar → „Tab anpinnen". Angepinnte Tabs überleben
Plugin-Reload und Char-Logout, behalten ihre Konversations-Historie (wird beim Rehydrate aus dem MessageStore
nachgeladen) und bleiben an die gleiche /tell-Person gebunden. Hard-Cap 5 angepinnte Tabs in einem separaten Pool —
die normalen Auto-Tell-Tabs (15er Cap) sind davon entkoppelt, Gesamt-Decke 20. Die Sidebar gruppiert angepinnte Tabs
in einer eigenen „Angepinnt"-Sektion mit eigenem Trenner.
- **Honorific Glow-Outline**: rendert jetzt eine 8-Richtungs-DrawList-Outline wenn der Honorific-Titel eine Glow-Farbe
trägt. Opt-in via **Settings → Integrationen → Glow-Outline rendern (Honorific)** (Default OFF). Gradient (Color3 /
GradientColourSet / Wave / Pulse) wird geparst und im DTO weitergereicht, rendert aktuell aber statisch als
Primärfarbe — der volle Gradient-Port (Animations-Algorithmus + Pride-Palette) kommt als eigener Cycle nach.
- **Sidebar-Breite konfigurierbar**: in **Theme & Layout** ein Slider 44160 px. Default bleibt 44 px (icon-only), aber
breiter machen damit Sektion-Header wie „Aktive Tells (3)" oder „Angepinnt (2)" nicht abgeschnitten werden.
- **Settings-Save Channel-Fix**: ein Save mit aktivem Party- oder Linkshell-Tab konnte den Chat-Input zurück auf
`/tell <angepinnte Person>` springen lassen. `Configuration.UpdateFrom` bewahrt jetzt den Runtime-`CurrentChannel`
über den persistent-Tab-Merge hinweg, und `TabSwitched` deep-cloned den Seed-Channel statt sich den `UsedChannel` mit
dem vorigen Tab zu teilen.
- **Internal**: `IPluginLogProxy`-Indirektion vor Dalamud's `IPluginLog` über alle ~91 `Plugin.Log`-Call-Sites. Damit
läuft `MessageStore.Migrate0` voll-isoliert in xUnit (F12.1-Lücke aus v1.4.6 geschlossen). Plus: TempTab-Counter als
abgeleitete Property statt gecachtes Interlocked-Feld — die neuen Pin/Unpin-Übergänge sind Cold-Path, kein
Lock-Free-Vorteil mehr. Migration v16 → v17 ist rein additiv (neues `Tab.IsPinned`-Bool, Default false).
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
+21
View File
@@ -0,0 +1,21 @@
---
subtitle: Hook-Layer und Polish-Quick-Wins
versionsnatur: Polish-Patch
---
- DbViewer Volltext-Suche: optionaler FTS5-Index über die ganze Chat-Historie.
Wird beim ersten v1.4.8-Start asynchron im Hintergrund gebaut, Progress als
Toast. Lokale Page-Suche bleibt Default. Such-Eingaben werden als exakte
Wortfolge gematcht; mehrere Wörter werden nur gefunden, wenn sie zusammen
und in der Reihenfolge stehen. Wer rohe FTS5-MATCH-Syntax nutzen will, setzt
eigene Anführungszeichen um den Suchbegriff.
- Custom-Theme-Files laden sich beim Speichern automatisch neu, wenn das Theme
aktiv ist. Kein Picker-Klick mehr nötig.
- Retention-Sweep blockt nicht mehr den Framework-Thread. Der Mini-Hitch von
~194ms pro Sweep ist weg.
- Statusleiste rendert sauber bei Windows-Skalierung über 100%.
- Receive-Suppressed-Tells-Routing wurde in diesem Cycle untersucht und auf
v1.5.x verschoben: wenn andere Plugins Tells via CheckMessageHandled
unterdrücken, überspringt FFXIVs Chat-Pipeline den RaptureLogModule-Resolver
und HellionChats Tab-Routing verliert den Tell-Partner. Der Fix liegt
architektonisch neben dem geplanten Ad-Block-Hook-Layer und kommt dort mit.
+2
View File
@@ -1,7 +1,9 @@
{ {
"MD007": { "indent": 4 }, "MD007": { "indent": 4 },
"MD013": false, "MD013": false,
"MD024": { "siblings_only": true },
"MD029": false, "MD029": false,
"MD033": false, "MD033": false,
"MD036": false,
"MD041": false "MD041": false
} }
+162 -36
View File
@@ -4,6 +4,7 @@ using System.Linq;
using System.Threading; using System.Threading;
using Dalamud.Game.Text; using Dalamud.Game.Text;
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Interface.ImGuiNotification;
using HellionChat.Code; using HellionChat.Code;
using HellionChat.GameFunctions.Types; using HellionChat.GameFunctions.Types;
using HellionChat.Resources; using HellionChat.Resources;
@@ -20,13 +21,11 @@ internal sealed class AutoTellTabsService : IDisposable
private readonly MessageStore _store; private readonly MessageStore _store;
private readonly object _tempTabsLock = new(); private readonly object _tempTabsLock = new();
// F2.1: lock-free counter mirrors Config.Tabs.Count(IsTempTab) so the // Hard cap on pinned TempTabs so the sidebar doesn't inflate over years
// hot-path getter doesn't contend with HandleTell on every render frame. // of usage. Separate pool from AutoTellTabsLimit (15) — pinned tabs live
// Bumped from inside the existing mutation paths so it stays consistent // in their own bucket. A configurable cap is a vault-backlog anchor for
// with the underlying list — see SpawnTempTab, DropOldestTempTab, OnLogout // a later cycle if tester feedback demands it.
// and ResyncTempTabCounter (used by Plugin.cs snapshot-restore). internal const int MaxPinnedTempTabs = 5;
// TEST-MIRROR: ../../Hellion Build test/_Helpers/TempTabCounterTests.cs
private int _activeTempTabCount;
private bool _initialized; private bool _initialized;
@@ -37,7 +36,14 @@ internal sealed class AutoTellTabsService : IDisposable
_store = store; _store = store;
} }
internal int ActiveTempTabCount => Volatile.Read(ref _activeTempTabCount); // Derived from the tab list on read. Pin/Unpin/Promote/Logout simply
// mutate IsPinned or remove tabs — the count adapts automatically.
// Replaces the F2.1 Interlocked counter because the new pin-state
// transitions are cold-path and don't need lock-free reads.
internal int ActiveTempTabCount =>
Plugin.Config.Tabs.Count(TabLifecycleHelpers.IsInUnpinnedPool);
internal int PinnedTempTabCount => Plugin.Config.Tabs.Count(TabLifecycleHelpers.IsInPinnedPool);
internal void Initialize() internal void Initialize()
{ {
@@ -46,23 +52,51 @@ internal sealed class AutoTellTabsService : IDisposable
return; return;
} }
// Seed the counter from the persisted Tabs list so a config that already // Pinned tabs come out of the JSON with TellTarget set but
// contains TempTabs from a prior session starts in sync. Plugin.cs:168 // CurrentChannel reset (NonSerialized). Without re-seeding, the chat
// crash-recovery has already dropped TempTabs by the time we get here, // input has no tell-target on the active pinned tab, and the
// so the snapshot reflects post-recovery reality. // game-side channel hook only repaints CurrentChannel once the user
Interlocked.Exchange(ref _activeTempTabCount, Plugin.Config.Tabs.Count(t => t.IsTempTab)); // triggers a /tell or channel switch.
RehydratePinnedTabs();
_messageManager.MessageProcessed += HandleTell; _messageManager.MessageProcessed += HandleTell;
Plugin.ClientState.Logout += OnLogout; Plugin.ClientState.Logout += OnLogout;
_initialized = true; _initialized = true;
} }
// F2.1: callable from outside paths that mutate Config.Tabs directly private void RehydratePinnedTabs()
// (Plugin.cs snapshot-restore). Atomically re-pegs the counter to the
// live IsTempTab count.
internal void ResyncTempTabCounter()
{ {
Interlocked.Exchange(ref _activeTempTabCount, Plugin.Config.Tabs.Count(t => t.IsTempTab)); var pinned = Plugin.Config.Tabs.Count(TabLifecycleHelpers.IsInPinnedPool);
Plugin.LogProxy.Debug($"[Pin] Rehydrate scan: {pinned} pinned tab(s) found");
foreach (var tab in Plugin.Config.Tabs)
{
if (!TabLifecycleHelpers.IsInPinnedPool(tab))
continue;
if (tab.TellTarget is null || !tab.TellTarget.IsSet())
{
Plugin.LogProxy.Warning(
$"[Pin] Pinned tab '{tab.Name}' has no usable TellTarget "
+ $"(Name={tab.TellTarget?.Name ?? "<null>"} World={tab.TellTarget?.World ?? 0}). "
+ "Chat input on this tab will be empty until the partner sends a tell or you /tell manually."
);
continue;
}
tab.Channel ??= InputChannel.Tell;
tab.CurrentChannel.Channel = InputChannel.Tell;
tab.CurrentChannel.TellTarget = tab.TellTarget.Clone();
// MessageList is NonSerialized so pinned tabs come back empty.
// Preload the same history window the spawn path uses so the user
// sees the recent conversation, not a blank tab.
PreloadHistory(tab, tab.TellTarget.Name, tab.TellTarget.World, Guid.Empty);
Plugin.LogProxy.Debug(
$"[Pin] Rehydrated '{tab.Name}' -> Tell target {tab.TellTarget.Name}@{tab.TellTarget.World}"
);
}
} }
public void Dispose() public void Dispose()
@@ -96,7 +130,7 @@ internal sealed class AutoTellTabsService : IDisposable
if (partner == null) if (partner == null)
{ {
// Diagnostics: helps detect regressions (FFXIV payload changes, new edge cases) // Diagnostics: helps detect regressions (FFXIV payload changes, new edge cases)
Plugin.Log.Warning( Plugin.LogProxy.Warning(
$"[AutoTellTabs] Could not extract tell partner. type={message.Code.Type}, " $"[AutoTellTabs] Could not extract tell partner. type={message.Code.Type}, "
+ $"senderChunks={message.Sender.Count}, contentChunks={message.Content.Count}, " + $"senderChunks={message.Sender.Count}, contentChunks={message.Content.Count}, "
+ $"senderSourcePayloads={message.SenderSource?.Payloads?.Count ?? 0}, " + $"senderSourcePayloads={message.SenderSource?.Payloads?.Count ?? 0}, "
@@ -110,7 +144,23 @@ internal sealed class AutoTellTabsService : IDisposable
var existing = FindTempTab(partner.Value.Name, partner.Value.World); var existing = FindTempTab(partner.Value.Name, partner.Value.World);
if (existing != null) if (existing != null)
{ {
// Already routed via MessageManager pipeline // Already routed via MessageManager pipeline. Repair the
// tell-target if the fallback hit a pinned tab whose
// TellTarget didn't survive a previous round-trip — keeps
// FindTempTab fast on the next message.
if (
existing.IsPinned
&& (existing.TellTarget is null || !existing.TellTarget.IsSet())
)
{
existing.TellTarget = new TellTarget(
partner.Value.Name,
partner.Value.World,
0,
TellReason.Direct
);
_plugin.SaveConfig();
}
return; return;
} }
@@ -160,22 +210,35 @@ internal sealed class AutoTellTabsService : IDisposable
return null; return null;
} }
private Tab? FindTempTab(string name, uint world) private static Tab? FindTempTab(string name, uint world)
{ {
return Plugin.Config.Tabs.FirstOrDefault(t => var byTarget = Plugin.Config.Tabs.FirstOrDefault(t =>
t.IsTempTab t.IsTempTab
&& t.TellTarget != null && t.TellTarget != null
&& string.Equals(t.TellTarget.Name, name, StringComparison.OrdinalIgnoreCase) && string.Equals(t.TellTarget.Name, name, StringComparison.OrdinalIgnoreCase)
&& t.TellTarget.World == world && t.TellTarget.World == world
); );
if (byTarget != null)
return byTarget;
// Fallback: match by tab name. Pinned tabs are named via
// FormatTabName(player, world) at spawn time, so the name is a
// stable secondary key when TellTarget didn't survive a save/load
// (older configs from a renamed pin, malformed migrations, etc.).
var expectedName = FormatTabName(name, world);
return Plugin.Config.Tabs.FirstOrDefault(t =>
t.IsTempTab && string.Equals(t.Name, expectedName, StringComparison.OrdinalIgnoreCase)
);
} }
private void DropOldestTempTab() internal void DropOldestTempTab()
{ {
// Prioritize greeted tabs for drop; within each bucket, drop by oldest LastActivity // Pinned tabs live in their own bucket (MaxPinnedTempTabs) and are
// never drop candidates. They leave the bucket only via Unpin or
// PromoteToPermanent.
var victim = Plugin var victim = Plugin
.Config.Tabs.Select((tab, idx) => (Tab: tab, Index: idx)) .Config.Tabs.Select((tab, idx) => (Tab: tab, Index: idx))
.Where(t => t.Tab.IsTempTab) .Where(t => TabLifecycleHelpers.IsInUnpinnedPool(t.Tab))
.OrderByDescending(t => t.Tab.IsGreeted) .OrderByDescending(t => t.Tab.IsGreeted)
.ThenBy(t => t.Tab.LastActivity) .ThenBy(t => t.Tab.LastActivity)
.FirstOrDefault(); .FirstOrDefault();
@@ -198,7 +261,6 @@ internal sealed class AutoTellTabsService : IDisposable
} }
Plugin.Config.Tabs.RemoveAt(victim.Index); Plugin.Config.Tabs.RemoveAt(victim.Index);
Interlocked.Decrement(ref _activeTempTabCount);
// Re-anchor active tab to avoid silent switch when tab is dropped // Re-anchor active tab to avoid silent switch when tab is dropped
if (victim.Index <= _plugin.LastTab) if (victim.Index <= _plugin.LastTab)
@@ -223,7 +285,6 @@ internal sealed class AutoTellTabsService : IDisposable
} }
Plugin.Config.Tabs.Add(tab); Plugin.Config.Tabs.Add(tab);
Interlocked.Increment(ref _activeTempTabCount);
} }
private static Tab BuildTempTab(string playerName, uint worldRowId) private static Tab BuildTempTab(string playerName, uint worldRowId)
@@ -300,7 +361,7 @@ internal sealed class AutoTellTabsService : IDisposable
catch (Exception ex) catch (Exception ex)
{ {
// Non-fatal: tab still spawns with visible error notice instead of silent history loss // Non-fatal: tab still spawns with visible error notice instead of silent history loss
Plugin.Log.Error(ex, "[AutoTellTabs] History preload failed"); Plugin.LogProxy.Error(ex, "[AutoTellTabs] History preload failed");
tab.Messages.AddPrune( tab.Messages.AddPrune(
MakeSystemMarker(HellionStrings.AutoTellTabs_HistoryLoadError), MakeSystemMarker(HellionStrings.AutoTellTabs_HistoryLoadError),
MessageManager.MessageDisplayLimit MessageManager.MessageDisplayLimit
@@ -354,14 +415,16 @@ internal sealed class AutoTellTabsService : IDisposable
{ {
lock (_tempTabsLock) lock (_tempTabsLock)
{ {
// Snapshot active tab index before mutating list // Pinned TempTabs must survive char-switch — that's the whole point
// of pinning. Only unpinned ones get stripped.
var lastIndex = _plugin.LastTab; var lastIndex = _plugin.LastTab;
var lastIndexValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count; var lastIndexValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count;
var currentWasTempTab = lastIndexValid && Plugin.Config.Tabs[lastIndex].IsTempTab; var currentWasUnpinnedTempTab =
lastIndexValid
&& TabLifecycleHelpers.IsInUnpinnedPool(Plugin.Config.Tabs[lastIndex]);
// Clean up pop-out windows before removing temp tabs
var poppedTempTabIds = Plugin var poppedTempTabIds = Plugin
.Config.Tabs.Where(t => t.IsTempTab && t.PopOut) .Config.Tabs.Where(t => TabLifecycleHelpers.IsInUnpinnedPool(t) && t.PopOut)
.Select(t => t.Identifier) .Select(t => t.Identifier)
.ToList(); .ToList();
if (poppedTempTabIds.Count > 0) if (poppedTempTabIds.Count > 0)
@@ -377,15 +440,78 @@ internal sealed class AutoTellTabsService : IDisposable
} }
} }
var removed = Plugin.Config.Tabs.RemoveAll(t => t.IsTempTab); Plugin.Config.Tabs.RemoveAll(TabLifecycleHelpers.IsInUnpinnedPool);
Interlocked.Add(ref _activeTempTabCount, -removed);
// Force switch to tab 0 if active tab was temp or index is now out of range // Force switch to tab 0 if active tab was an unpinned temp tab or
// index is now out of range. Pinned tabs survive — no switch needed.
var stillValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count; var stillValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count;
if (currentWasTempTab || !stillValid) if (currentWasUnpinnedTempTab || !stillValid)
{ {
_plugin.WantedTab = 0; _plugin.WantedTab = 0;
} }
} }
} }
internal bool TryPin(Tab tab)
{
if (!tab.IsTempTab || tab.IsPinned)
{
Plugin.LogProxy.Debug(
$"[Pin] TryPin skipped: IsTempTab={tab.IsTempTab} IsPinned={tab.IsPinned}"
);
return false;
}
if (PinnedTempTabCount >= MaxPinnedTempTabs)
{
WrapperUtil.AddNotification(
string.Format(HellionStrings.PinTab_LimitReached, MaxPinnedTempTabs),
NotificationType.Warning
);
return false;
}
tab.IsPinned = true;
Plugin.LogProxy.Debug(
$"[Pin] Pinned tab '{tab.Name}' target={tab.TellTarget?.Name}@{tab.TellTarget?.World}"
);
_plugin.SaveConfig();
return true;
}
internal void Unpin(Tab tab)
{
if (!tab.IsPinned)
{
return;
}
// If the unpinned pool is already full, dropping the oldest before
// flipping the flag avoids counting the just-unpinned tab as a drop
// candidate.
if (ActiveTempTabCount >= Plugin.Config.AutoTellTabsLimit)
{
DropOldestTempTab();
}
tab.IsPinned = false;
Plugin.LogProxy.Debug("[Pin] Unpinned tab '{tab.Name}'");
_plugin.SaveConfig();
}
internal void PromoteToPermanent(Tab tab)
{
if (!tab.IsTempTab)
{
return;
}
tab.IsTempTab = false;
tab.IsPinned = false;
tab.TellTarget = TellTarget.Empty();
Plugin.LogProxy.Debug(
$"[Pin] Promoted tab '{tab.Name}' to permanent (tell-binding dropped)"
);
_plugin.SaveConfig();
}
} }
+21
View File
@@ -1,3 +1,6 @@
using System.Runtime.CompilerServices;
using HellionChat.Util;
namespace HellionChat.Branding; namespace HellionChat.Branding;
// Centralised — a future invite/URL rotation only touches this file. // Centralised — a future invite/URL rotation only touches this file.
@@ -9,4 +12,22 @@ internal static class BrandingLinks
"https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat"; "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat";
public const string HellionForgeWebsite = "https://hellion-forge.cloud"; public const string HellionForgeWebsite = "https://hellion-forge.cloud";
public const string HellionMediaWebsite = "https://hellion-media.de/de"; public const string HellionMediaWebsite = "https://hellion-media.de/de";
// CA2255 warns against [ModuleInitializer] in library code, but Dalamud
// loads the plugin DLL directly so the module-init pass is the right hook
// for a one-shot URL sanity check at plugin load.
#pragma warning disable CA2255
[ModuleInitializer]
#pragma warning restore CA2255
internal static void ValidateUrls()
{
UrlValidation.ValidateAll(
nameof(BrandingLinks),
HellionForgeDiscordInvite,
HellionForgeGitea,
HellionChatRepo,
HellionForgeWebsite,
HellionMediaWebsite
);
}
} }
+2 -2
View File
@@ -52,7 +52,7 @@ internal sealed class Commands : IDisposable
{ {
if (!Registered.TryGetValue(command, out var wrapper)) if (!Registered.TryGetValue(command, out var wrapper))
{ {
Plugin.Log.Warning($"Missing registration for command {command}"); Plugin.LogProxy.Warning($"Missing registration for command {command}");
return; return;
} }
@@ -62,7 +62,7 @@ internal sealed class Commands : IDisposable
} }
catch (Exception ex) catch (Exception ex)
{ {
Plugin.Log.Error(ex, $"Error while executing command {command}"); Plugin.LogProxy.Error(ex, $"Error while executing command {command}");
} }
} }
} }
+61 -13
View File
@@ -34,7 +34,7 @@ public class ConfigKeyBind
[Serializable] [Serializable]
public class Configuration : IPluginConfiguration public class Configuration : IPluginConfiguration
{ {
private const int LatestVersion = 16; private const int LatestVersion = 17;
public int Version { get; set; } = LatestVersion; public int Version { get; set; } = LatestVersion;
@@ -83,7 +83,7 @@ public class Configuration : IPluginConfiguration
// silently, like before. // silently, like before.
if (!Enum.IsDefined(typeof(ChatType), type) && _warnedUnknownChannels.Add(type)) if (!Enum.IsDefined(typeof(ChatType), type) && _warnedUnknownChannels.Add(type))
{ {
Plugin.Log.Warning( Plugin.LogProxy.Warning(
"PrivacyFilter: unrecognised ChatType {Type} — falling back to PrivacyPersistUnknownChannels={Persist}.", "PrivacyFilter: unrecognised ChatType {Type} — falling back to PrivacyPersistUnknownChannels={Persist}.",
type, type,
PrivacyPersistUnknownChannels PrivacyPersistUnknownChannels
@@ -102,10 +102,22 @@ public class Configuration : IPluginConfiguration
public bool FirstRunCompleted; public bool FirstRunCompleted;
public bool UseHellionFont = true; public bool UseHellionFont = true;
public bool ShowHonorificTitleInHeader = true; public bool ShowHonorificTitleInHeader = true;
// v1.4.7 opt-in: renders the Honorific glow outline when the title carries
// a Glow colour. Default OFF — keeps v1.4.6 visuals untouched for users
// who don't care, and dodges the per-frame DrawList overhead on low-end
// hardware. Gradient (Color3 / GradientColourSet) is parsed but rendered
// as the primary Color until a later cycle ports the animation.
public bool ShowHonorificGlow;
public bool EnableAutoTellTabs = true; public bool EnableAutoTellTabs = true;
public int AutoTellTabsLimit = 15; public int AutoTellTabsLimit = 15;
public bool AutoTellTabsCompactDisplay; public bool AutoTellTabsCompactDisplay;
public int AutoTellTabsHistoryPreload = 20; public int AutoTellTabsHistoryPreload = 20;
// Sidebar width in pixels. Default 44 mirrors the icon-only layout from
// v1.2.0; users can widen up to 160 to fit a section-header line like
// "Active Tells (3)" without truncation.
public int SidebarWidth = 44;
public bool AutoTellTabsShowGreetedToggle; public bool AutoTellTabsShowGreetedToggle;
public bool SeenPopOutInputHint; public bool SeenPopOutInputHint;
public bool PopOutInputEnabled = true; public bool PopOutInputEnabled = true;
@@ -278,16 +290,20 @@ public class Configuration : IPluginConfiguration
ColorSelectedInputChannelButton = other.ColorSelectedInputChannelButton; ColorSelectedInputChannelButton = other.ColorSelectedInputChannelButton;
// Keep live temp tabs alive across UpdateFrom — a settings save must // Keep live temp tabs alive across UpdateFrom — a settings save must
// not destroy open tell conversations. For persistent tabs, capture // not destroy open tell conversations. Pinned TempTabs are persistent
// the live MessageList and LastSendUnread by Identifier before the // and come through `other` like regular tabs; unpinned TempTabs are
// replace and restore them onto the freshly cloned tabs; new tabs // session-only and held from the local state. For persistent tabs
// get an empty MessageList, deleted tabs lose their history (intended). // (incl. pinned), capture live runtime state by Identifier and restore
var liveTempTabs = Tabs.Where(t => t.IsTempTab).ToList(); // it onto the freshly cloned tabs — CurrentChannel is critical because
var livePersistentSession = Tabs.Where(t => !t.IsTempTab) // the user may have switched channel in-game between settings-open
.ToDictionary(t => t.Identifier, t => (t.Messages, t.LastSendUnread)); // and settings-save, and we'd otherwise overwrite that with the
// settings-time snapshot.
var liveUnpinnedTempTabs = Tabs.Where(TabLifecycleHelpers.IsInUnpinnedPool).ToList();
var livePersistentSession = Tabs.Where(t => !TabLifecycleHelpers.IsInUnpinnedPool(t))
.ToDictionary(t => t.Identifier, t => (t.Messages, t.LastSendUnread, t.CurrentChannel));
Tabs = other Tabs = other
.Tabs.Where(t => !t.IsTempTab) .Tabs.Where(t => !t.IsTempTab || t.IsPinned)
.Select(t => .Select(t =>
{ {
var clone = t.Clone(); var clone = t.Clone();
@@ -295,11 +311,12 @@ public class Configuration : IPluginConfiguration
{ {
clone.Messages = live.Messages; clone.Messages = live.Messages;
clone.LastSendUnread = live.LastSendUnread; clone.LastSendUnread = live.LastSendUnread;
clone.CurrentChannel = live.CurrentChannel;
} }
return clone; return clone;
}) })
.ToList(); .ToList();
Tabs.AddRange(liveTempTabs); Tabs.AddRange(liveUnpinnedTempTabs);
ChatTabForward = other.ChatTabForward; ChatTabForward = other.ChatTabForward;
ChatTabBackward = other.ChatTabBackward; ChatTabBackward = other.ChatTabBackward;
@@ -319,6 +336,7 @@ public class Configuration : IPluginConfiguration
FirstRunCompleted = other.FirstRunCompleted; FirstRunCompleted = other.FirstRunCompleted;
UseHellionFont = other.UseHellionFont; UseHellionFont = other.UseHellionFont;
ShowHonorificTitleInHeader = other.ShowHonorificTitleInHeader; ShowHonorificTitleInHeader = other.ShowHonorificTitleInHeader;
ShowHonorificGlow = other.ShowHonorificGlow;
// v1.1.0 theme engine fields // v1.1.0 theme engine fields
Theme = other.Theme; Theme = other.Theme;
@@ -330,6 +348,7 @@ public class Configuration : IPluginConfiguration
AutoTellTabsLimit = other.AutoTellTabsLimit; AutoTellTabsLimit = other.AutoTellTabsLimit;
AutoTellTabsCompactDisplay = other.AutoTellTabsCompactDisplay; AutoTellTabsCompactDisplay = other.AutoTellTabsCompactDisplay;
AutoTellTabsHistoryPreload = other.AutoTellTabsHistoryPreload; AutoTellTabsHistoryPreload = other.AutoTellTabsHistoryPreload;
SidebarWidth = other.SidebarWidth;
AutoTellTabsShowGreetedToggle = other.AutoTellTabsShowGreetedToggle; AutoTellTabsShowGreetedToggle = other.AutoTellTabsShowGreetedToggle;
SeenPopOutInputHint = other.SeenPopOutInputHint; SeenPopOutInputHint = other.SeenPopOutInputHint;
@@ -404,6 +423,11 @@ public class Tab
public bool HideWhenInactive; public bool HideWhenInactive;
public bool IsTempTab; public bool IsTempTab;
// Pinned TempTabs survive plugin reload and logout — tester feedback from
// Jin (v1.4.7). Pinned tabs live in their own pool (MaxPinnedTempTabs)
// separate from the AutoTellTabsLimit bucket.
public bool IsPinned;
public bool AllSenderMessages; public bool AllSenderMessages;
public TellTarget TellTarget = TellTarget.Empty(); public TellTarget TellTarget = TellTarget.Empty();
@@ -500,7 +524,7 @@ public class Tab
Opacity = Opacity, Opacity = Opacity,
Identifier = Identifier, Identifier = Identifier,
InputDisabled = InputDisabled, InputDisabled = InputDisabled,
CurrentChannel = CurrentChannel, CurrentChannel = CurrentChannel.Clone(),
CanMove = CanMove, CanMove = CanMove,
CanResize = CanResize, CanResize = CanResize,
IndependentHide = IndependentHide, IndependentHide = IndependentHide,
@@ -511,8 +535,9 @@ public class Tab
HideInBattle = HideInBattle, HideInBattle = HideInBattle,
HideWhenInactive = HideWhenInactive, HideWhenInactive = HideWhenInactive,
IsTempTab = IsTempTab, IsTempTab = IsTempTab,
IsPinned = IsPinned,
AllSenderMessages = AllSenderMessages, AllSenderMessages = AllSenderMessages,
TellTarget = TellTarget.From(TellTarget), TellTarget = TellTarget.Clone(),
IsGreeted = IsGreeted, IsGreeted = IsGreeted,
}; };
} }
@@ -690,6 +715,29 @@ public class UsedChannel
{ {
Channel = channel; Channel = channel;
} }
// ---------------------------------------------------------------
// Cherry-picked from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12)
// - Deep-clone the UsedChannel so Tab.Clone() no longer shares
// channel state (incl. TellTarget) with its origin Tab. Previously
// a reference copy: PopOut and Temp tabs mutated each other.
// - Name is intentionally a reference copy (matches upstream); it
// gets reassigned on every channel switch anyway.
// TEST-MIRROR: ../../Hellion Build test/_Helpers/UsedChannelCloneTests.cs
// ---------------------------------------------------------------
public UsedChannel Clone()
{
return new UsedChannel
{
Channel = Channel,
Name = Name,
TellTarget = TellTarget?.Clone(),
UseTempChannel = UseTempChannel,
TempChannel = TempChannel,
TempTellTarget = TempTellTarget?.Clone(),
};
}
} }
[Serializable] [Serializable]
+8 -5
View File
@@ -101,7 +101,10 @@ public static class EmoteCache
t => t =>
{ {
if (t.IsFaulted) if (t.IsFaulted)
Plugin.Log.Error(t.Exception!, $"EmoteCache load failed for {emoteCode}"); Plugin.LogProxy.Error(
t.Exception!,
$"EmoteCache load failed for {emoteCode}"
);
}, },
TaskScheduler.Default TaskScheduler.Default
) )
@@ -158,7 +161,7 @@ public static class EmoteCache
{ {
// Reset to Unloaded so a later trigger can retry without a plugin reload. // Reset to Unloaded so a later trigger can retry without a plugin reload.
State = LoadingState.Unloaded; State = LoadingState.Unloaded;
Plugin.Log.Error(ex, "BetterTTV cache wasn't initialized"); Plugin.LogProxy.Error(ex, "BetterTTV cache wasn't initialized");
} }
} }
@@ -214,7 +217,7 @@ public static class EmoteCache
} }
catch catch
{ {
Plugin.Log.Error("Failed to convert"); Plugin.LogProxy.Error("Failed to convert");
return null; return null;
} }
} }
@@ -304,7 +307,7 @@ public static class EmoteCache
catch (Exception ex) catch (Exception ex)
{ {
Failed = true; Failed = true;
Plugin.Log.Error(ex, $"Unable to load {emote.Code} with id {emote.Id}"); Plugin.LogProxy.Error(ex, $"Unable to load {emote.Code} with id {emote.Id}");
} }
} }
@@ -408,7 +411,7 @@ public static class EmoteCache
catch (Exception ex) catch (Exception ex)
{ {
Failed = true; Failed = true;
Plugin.Log.Error(ex, $"Unable to load {emote.Code} with id {emote.Id}"); Plugin.LogProxy.Error(ex, $"Unable to load {emote.Code} with id {emote.Id}");
} }
} }
} }
+14 -4
View File
@@ -58,7 +58,7 @@ public class FontManager
); );
if (stream is null) if (stream is null)
{ {
Plugin.Log.Warning( Plugin.LogProxy.Warning(
"Hellion font resource missing — falling back to system default font." "Hellion font resource missing — falling back to system default font."
); );
return null; return null;
@@ -226,11 +226,21 @@ public class FontManager
return fontId.AddToBuildToolkit(tk, config); return fontId.AddToBuildToolkit(tk, config);
} }
catch (Exception e) catch (Exception e)
when (e is FileNotFoundException or DirectoryNotFoundException or IOException) when (e
is FileNotFoundException
or DirectoryNotFoundException
or IOException
or InvalidOperationException
or ArgumentException
)
{ {
Plugin.Log.Warning( // Atlas-toolkit throws span IO and validation failures; routing the
// wider set through the fallback keeps a corrupt font config from
// taking down the whole atlas build.
Plugin.LogProxy.Warning(
e, e,
$"Configured {slot} font unavailable, falling back to NotoSansCjkRegular" $"Configured {slot} font failed to load ({e.GetType().Name}), "
+ "falling back to NotoSansCjkRegular"
); );
var fallback = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular); var fallback = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular);
return fallback.AddToBuildToolkit(tk, config); return fallback.AddToBuildToolkit(tk, config);
+30 -17
View File
@@ -236,7 +236,7 @@ internal sealed unsafe class Chat : IDisposable
} }
catch (Exception ex) catch (Exception ex)
{ {
Plugin.Log.Error(ex, "Error in chat Activated event"); Plugin.LogProxy.Error(ex, "Error in chat Activated event");
} }
}); });
} }
@@ -266,7 +266,7 @@ internal sealed unsafe class Chat : IDisposable
} }
catch (Exception ex) catch (Exception ex)
{ {
Plugin.Log.Error(ex, "Error in chat Activated event"); Plugin.LogProxy.Error(ex, "Error in chat Activated event");
} }
return 1; // Prevent vanilla chat log from gaining focus return 1; // Prevent vanilla chat log from gaining focus
@@ -299,7 +299,7 @@ internal sealed unsafe class Chat : IDisposable
{ {
playerName = SeString.Parse(agent->TellPlayerName).TextValue; playerName = SeString.Parse(agent->TellPlayerName).TextValue;
worldId = agent->TellWorldId; worldId = agent->TellWorldId;
Plugin.Log.Debug($"Detected tell target '[redacted]'@{worldId}"); Plugin.LogProxy.Debug($"Detected tell target '[redacted]'@{worldId}");
} }
Plugin.CurrentTab.CurrentChannel = new UsedChannel Plugin.CurrentTab.CurrentChannel = new UsedChannel
@@ -358,7 +358,7 @@ internal sealed unsafe class Chat : IDisposable
} }
catch (Exception ex) catch (Exception ex)
{ {
Plugin.Log.Error(ex, "Error in chat Activated event"); Plugin.LogProxy.Error(ex, "Error in chat Activated event");
} }
} }
@@ -408,7 +408,7 @@ internal sealed unsafe class Chat : IDisposable
} }
catch (Exception ex) catch (Exception ex)
{ {
Plugin.Log.Error(ex, "Error in chat Activated event"); Plugin.LogProxy.Error(ex, "Error in chat Activated event");
} }
} }
@@ -423,16 +423,24 @@ internal sealed unsafe class Chat : IDisposable
); );
} }
// Check if channel is valid (non-linkshell or existing linkshell) // ---------------------------------------------------------------
internal static bool ValidAnyLinkshell(InputChannel channel) // Cherry-picked from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12)
// - Renamed ValidAnyLinkshell -> IsChannelOrExistingLinkshell. The
// name now states intent: returns true for any non-linkshell
// channel, or a linkshell index that actually exists.
// ---------------------------------------------------------------
internal static bool IsChannelOrExistingLinkshell(InputChannel channel)
{ {
var idx = channel.LinkshellIndex(); var idx = channel.LinkshellIndex();
if (idx == uint.MaxValue || channel.IsExtraChatLinkshell()) if (idx == uint.MaxValue || channel.IsExtraChatLinkshell())
return true; return true;
if (channel.IsLinkshell() && ValidLinkshell(idx))
return true; if (channel.IsLinkshell())
if (channel.IsCrossLinkshell() && ValidCrossLinkshell(idx)) return ValidLinkshell(idx);
return true;
if (channel.IsCrossLinkshell())
return ValidCrossLinkshell(idx);
return false; return false;
} }
@@ -531,12 +539,17 @@ internal sealed unsafe class Chat : IDisposable
if (idx == uint.MaxValue) if (idx == uint.MaxValue)
idx = 0; idx = 0;
if (!ValidAnyLinkshell(channel)) // ---------------------------------------------------------------
return; // Cherry-picked from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12)
// - Wrap ChangeChatChannel in the validity check instead of
// early-returning. The previous early return skipped Dtor and
// leaked the native Utf8String allocated a few lines above.
// ---------------------------------------------------------------
if (IsChannelOrExistingLinkshell(channel))
RaptureShellModule
.Instance()
->ChangeChatChannel(tellTarget != null ? 17 : (int)channel, idx, target, true);
RaptureShellModule
.Instance()
->ChangeChatChannel(tellTarget != null ? 17 : (int)channel, idx, target, true);
target->Dtor(true); target->Dtor(true);
} }
@@ -611,7 +624,7 @@ internal sealed unsafe class Chat : IDisposable
if (contentId == 0) if (contentId == 0)
{ {
Plugin.ChatGui.PrintError(Language.Chat_SendTell_Error); Plugin.ChatGui.PrintError(Language.Chat_SendTell_Error);
Plugin.Log.Warning( Plugin.LogProxy.Warning(
"Tried to send a tell with ContentId being 0, sorry this is an internal error." "Tried to send a tell with ContentId being 0, sorry this is an internal error."
); );
return; return;
+2 -2
View File
@@ -215,7 +215,7 @@ internal unsafe class GameFunctions : IDisposable
} }
catch (Exception e) catch (Exception e)
{ {
Plugin.Log.Warning(e, "Unable to open adventurer plate"); Plugin.LogProxy.Warning(e, "Unable to open adventurer plate");
return false; return false;
} }
} }
@@ -255,7 +255,7 @@ internal unsafe class GameFunctions : IDisposable
var byteCount = System.Text.Encoding.UTF8.GetByteCount(ReplacementName); var byteCount = System.Text.Encoding.UTF8.GetByteCount(ReplacementName);
if (byteCount >= PlaceholderBufferSize) if (byteCount >= PlaceholderBufferSize)
{ {
Plugin.Log.Warning( Plugin.LogProxy.Warning(
$"Replacement name too long for placeholder buffer ({byteCount} bytes >= {PlaceholderBufferSize}); falling back to original." $"Replacement name too long for placeholder buffer ({byteCount} bytes >= {PlaceholderBufferSize}); falling back to original."
); );
ReplacementName = null; ReplacementName = null;
+1 -1
View File
@@ -507,7 +507,7 @@ internal unsafe class KeybindManager : IDisposable
} }
catch (Exception ex) catch (Exception ex)
{ {
Plugin.Log.Error(ex, "Error in chat Activated event"); Plugin.LogProxy.Error(ex, "Error in chat Activated event");
} }
} }
@@ -40,5 +40,11 @@ public class TellTarget
public static TellTarget Empty() => new(string.Empty, 0, 0, TellReason.Direct); public static TellTarget Empty() => new(string.Empty, 0, 0, TellReason.Direct);
public static TellTarget From(TellTarget t) => new(t.Name, t.World, t.ContentId, t.Reason); // ---------------------------------------------------------------
// Cherry-picked from ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12)
// - Replaced static From(t) with an instance-style Clone() so call
// sites read like a copy operation, not a factory.
// TEST-MIRROR: ../../../Hellion Build test/_Helpers/TellTargetCloneTests.cs
// ---------------------------------------------------------------
public TellTarget Clone() => new(Name, World, ContentId, Reason);
} }
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Dalamud.NET.Sdk/15.0.0"> <Project Sdk="Dalamud.NET.Sdk/15.0.0">
<PropertyGroup> <PropertyGroup>
<!-- Independent versioning; see yaml changelog for upstream Chat 2 base --> <!-- Independent versioning; see yaml changelog for upstream Chat 2 base -->
<Version>1.4.5</Version> <Version>1.4.8</Version>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<!-- Use lock file to pin exact versions --> <!-- Use lock file to pin exact versions -->
+116 -46
View File
@@ -35,6 +35,122 @@ tags:
- Replacement - Replacement
- Privacy - Privacy
changelog: |- changelog: |-
**v1.4.8 — Hook-Layer and Polish Quick-Wins (2026-05-14)**
Ninth sub-patch of the v1.4.x polish-sweep series. Hook-layer
cluster (DbViewer FTS5 full-text search, ad-block foundation
investigation) plus three polish quick-wins.
- DbViewer full-text search: optional FTS5 index across the full
chat history. Built asynchronously on first load after the
update with a progress toast. The local page-filter remains
available as the default mode. Queries match as exact phrases
-- multi-word terms must appear together in order; advanced
users can opt into raw FTS5 MATCH syntax by wrapping their own
double-quotes.
- Custom theme files now auto-reload when edited while the theme
is active -- no need to re-click the theme in the picker.
- Retention sweep no longer blocks the framework thread, removing
the ~194ms mini-hitch per sweep.
- Status bar renders correctly at Windows display scaling > 100%.
- Receive-suppressed-tells routing investigated this cycle and
postponed to v1.5.x: when other plugins suppress tells via
CheckMessageHandled, the FFXIV chat pipeline skips the
RaptureLogModule.AddMsgSourceEntry path so HellionChat's
ContentIdResolverHook does not fire and tell-partner
identification breaks. The fix belongs next to the planned
ad-block hook layer where the same patch surface comes up.
- Internal: messages.Id is declared BLOB but stored as TEXT
(Microsoft.Data.Sqlite Guid binding). FTS bulk insert and
LoadByGuids match the TEXT storage form on both sides.
Migration v17 stays (no schema bump).
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
---
**v1.4.7 — Backlog Cleanup and Mid-Features (2026-05-13)**
Eighth sub-patch of the v1.4.x polish-sweep series. First
user-visible feature bundle since v1.4.5 — pinned tell tabs that
survive relog, opt-in Honorific glow rendering, and a configurable
sidebar.
- TempTell Pin: right-click a TempTell tab in the sidebar to pin
it. Pinned tabs survive relog, keep their conversation history
(loaded on demand from the message store), and stay bound to
the same /tell partner. Hard cap of 5 pinned tabs in a pool
separate from the 15-tab auto-tell pool — total ceiling is 20
tabs. New 'Pinned' section in the sidebar with its own divider
header
- Honorific Glow outline now renders when the title carries a
Glow colour. Opt-in via Settings → Integrations → 'Render glow
outlines (Honorific)' (default off, dodges the per-frame
DrawList overhead on low-end hardware). Gradient (Color3 /
GradientColourSet / Wave / Pulse) is parsed but rendered
statically — a later cycle will port the full animation
- Sidebar width is now configurable in Theme & Layout (range
44160 px). Default stays icon-only; widen to fit section
headers like 'Active Tells (3)' without truncation
- Settings Save no longer pops the chat input back to /tell with
a pinned partner — Configuration.UpdateFrom now preserves the
runtime CurrentChannel across the persistent-tab merge, and
TabSwitched deep-clones the seeded channel instead of sharing
the previous tab's UsedChannel
- Util/ImGuiUtil.cs DrawArrows IconButton id now uses
(id + 1).ToString() instead of the operator-precedence quirk
id + 1.ToString() — generated IDs stay numerically stable
- Internal: IPluginLogProxy indirection over Dalamud's IPluginLog
routes all ~91 Plugin.Log call sites through a testable proxy.
MessageStore.Migrate0 can now run in xUnit without loading
Dalamud.dll, closing the gap F12.1 left in v1.4.6
- Internal: TempTab counter switched from an Interlocked cached
field to a derived Tabs.Count(predicate) — pin-state transitions
are cold-path and don't need lock-free reads
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
---
**v1.4.6 — Code Hygiene and Refactor (2026-05-12)**
Maintenance patch. No user-visible behaviour changes; tightens the
development feedback loop, fixes two upstream-inherited bugs, and
prepares the code for the v1.4.7 backlog cleanup.
- preflight.sh gains a csharpier reflow check and a markdownlint
pass so style drift and markdown violations are caught at the
pre-push gate
- FontManager fallback catches the full set of atlas-toolkit
throws (IO, InvalidOperation, ArgumentException) — a corrupt
font config no longer takes down the whole atlas build
- BrandingLinks and IntegrationLinks URLs validated on plugin
load — a typo in a future URL rotation now throws at startup
- Cherry-picked from ChatTwo upstream f35b7d3: Chat.SetChannel
no longer leaks the native Utf8String when the linkshell check
rejects the channel
- Cherry-picked from ChatTwo upstream f35b7d3: Tab.Clone now
deep-clones UsedChannel and TellTarget — PopOut and Temp tabs
no longer mutate each other's channel state
- Active-tab underline scales with DPI and rounds to physical
pixels for crisp rendering above 100% scaling
- IconButton width parameter no longer subtracts HUD-scaled
padding from a raw int (measured width passes through verbatim)
- Internal: HellionStyle ChildBgAlpha extracted to a testable
helper; Plugin.SaveConfig clones only the temp tabs;
SettingsOverview caches the draw-list per frame;
Dalamud.Utility.Util surface routed through an IPlatformUtil
indirection (MessageStore IsWine probe is now testable in
isolation)
- Built-in themes: Crystal Nocturne (sapphire and electric
magenta over obsidian, by CRYSTALLITE) replaces Moonlit Bloom.
Users with Moonlit Bloom selected fall back to Hellion Arctic
on first load
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
---
**v1.4.5 — UX and Robustness (2026-05-12)** **v1.4.5 — UX and Robustness (2026-05-12)**
Sixth sub-patch of the v1.4.x polish-sweep series. Chat-log draw Sixth sub-patch of the v1.4.x polish-sweep series. Chat-log draw
@@ -58,50 +174,4 @@ changelog: |-
--- ---
**v1.4.4 — Threading and IPC safety polish (2026-05-12)**
Fifth sub-patch of the v1.4.x polish-sweep series. Threading
assumptions are documented per-method, a hot-path lock falls
away, and the privacy filter speaks up when an unknown ChatType
shows up.
- AutoTellTabs hot-path getter uses an Interlocked counter
instead of taking the lock on every read
- Honorific integration: per-method threading banners, plus
Warning-level log on unsubscribe failure
- AutoTranslate warmup thread marked IsBackground so plugin
unload doesn't wait for it
- PrivacyFilter logs once per unknown ChatType so a future
patch's added channel doesn't drop off the radar
- New installs persist unknown channels by default; existing
configs keep their explicit choice
---
**v1.4.3 — Faster plugin load + new repo (2026-05-08)**
Heavy startup work (migrations, hooks, windows) now runs async so
Dalamud's UI stays responsive during load. Load time is comparable
to v1.4.2 — this is the foundation for v1.4.4 optimisations.
- Two-phase async load via IAsyncDalamudPlugin
- Schema-gate replaces the v9→v16 migration chain; old configs
require a v1.4.2 install first
- AutoTranslate cache loads on first use instead of every startup
- Custom font (Hellion-Exo2) appears with a brief pop after load
- Repo moved to gitea.hellion-forge.cloud — update your custom-repo URL
---
**v1.4.2 — Smoother frames in the chat log**
Per-frame allocations in the chat-log render path eliminated.
25% frame-time recovery in typical scenes, more on pop-out-heavy setups.
- Card-mode: theme/border invariants hoisted out of the per-message loop
- Auto-tell tab tint and icon cached per tab
- Status bar aggregation runs on ~1% of frames instead of every frame
---
Full history: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases Full history: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases
+11 -2
View File
@@ -4,10 +4,19 @@ namespace HellionChat.Integrations;
// Local DTO mirroring Honorific's TitleData — no hard reference to Honorific.dll // Local DTO mirroring Honorific's TitleData — no hard reference to Honorific.dll
// so HellionChat loads cleanly when Honorific is absent. // so HellionChat loads cleanly when Honorific is absent.
// Glow/gradient fields omitted; Cycle 1 renders primary Color only. //
// v1.4.7: render Glow only. Gradient (Color3 / GradientColourSet / Style) is
// parsed and stashed so a future cycle can render it without re-shaping the
// JSON roundtrip — see vault anchor "Honorific Full Gradient Port" (would
// need GradientSystem.cs + the hardcoded Pride-palette list ported, or an
// upstream IPC PR exposing the resolved frame colour).
internal sealed record HonorificTitleData( internal sealed record HonorificTitleData(
string? Title, string? Title,
bool IsPrefix, bool IsPrefix,
bool IsOriginal, bool IsOriginal,
Vector3? Color Vector3? Color,
Vector3? Glow,
Vector3? Color3,
int? GradientColourSet,
string? GradientAnimationStyle
); );
@@ -1,3 +1,6 @@
using System.Runtime.CompilerServices;
using HellionChat.Util;
namespace HellionChat.Integrations; namespace HellionChat.Integrations;
// Third-party plugin URLs — separate from BrandingLinks (Hellion-owned URLs). // Third-party plugin URLs — separate from BrandingLinks (Hellion-owned URLs).
@@ -5,4 +8,13 @@ internal static class IntegrationLinks
{ {
public const string HonorificRepo = "https://github.com/Caraxi/Honorific"; public const string HonorificRepo = "https://github.com/Caraxi/Honorific";
public const string HonorificAuthor = "https://github.com/Caraxi"; public const string HonorificAuthor = "https://github.com/Caraxi";
// See BrandingLinks.ValidateUrls for the CA2255 rationale.
#pragma warning disable CA2255
[ModuleInitializer]
#pragma warning restore CA2255
internal static void ValidateUrls()
{
UrlValidation.ValidateAll(nameof(IntegrationLinks), HonorificRepo, HonorificAuthor);
}
} }
+4 -1
View File
@@ -62,7 +62,10 @@ public sealed class ExtraChat : IDisposable
catch (Exception ex) catch (Exception ex)
{ {
// ExtraChat is optional; IPC failure is normal when the plugin isn't loaded. // ExtraChat is optional; IPC failure is normal when the plugin isn't loaded.
Plugin.Log.Verbose(ex, "ExtraChat IPC initial state query failed (peer not loaded?)"); Plugin.LogProxy.Verbose(
ex,
"ExtraChat IPC initial state query failed (peer not loaded?)"
);
} }
} }
+4 -4
View File
@@ -153,8 +153,8 @@ public partial class Message
} }
catch (ArgumentException ex) catch (ArgumentException ex)
{ {
Plugin.Log.Error(ex, "Failed to parse extra chat channel GUID"); Plugin.LogProxy.Error(ex, "Failed to parse extra chat channel GUID");
Plugin.Log.Error($"Byte Array: ${string.Join(", ", data[4..^1])}"); Plugin.LogProxy.Error($"Byte Array: ${string.Join(", ", data[4..^1])}");
return Guid.Empty; return Guid.Empty;
} }
} }
@@ -251,7 +251,7 @@ public partial class Message
AddChunkWithMessage( AddChunkWithMessage(
text.NewWithStyle(chunk.Source, chunk.Link, token.Value) text.NewWithStyle(chunk.Source, chunk.Link, token.Value)
); );
Plugin.Log.Debug( Plugin.LogProxy.Debug(
$"Invalid URL accepted by Regex but failed URI parsing: '{token.Value}'" $"Invalid URL accepted by Regex but failed URI parsing: '{token.Value}'"
); );
} }
@@ -416,7 +416,7 @@ public partial class Message
catch (Exception) catch (Exception)
{ {
AddChunkWithMessage(text.NewWithStyle(chunk.Source, chunk.Link, split)); AddChunkWithMessage(text.NewWithStyle(chunk.Source, chunk.Link, split));
Plugin.Log.Debug($"Failed to parse the text param: '{split}'"); Plugin.LogProxy.Debug($"Failed to parse the text param: '{split}'");
} }
} }
} }
+10 -8
View File
@@ -52,7 +52,7 @@ internal class MessageManager : IAsyncDisposable
{ {
Plugin = plugin; Plugin = plugin;
Store = new MessageStore(DatabasePath()); Store = new MessageStore(DatabasePath(), Plugin.PlatformUtil, Plugin.LogProxy);
PendingMessageThread = new Thread(() => PendingMessageThread = new Thread(() =>
ProcessPendingMessages(PendingThreadCancellationToken.Token) ProcessPendingMessages(PendingThreadCancellationToken.Token)
@@ -91,7 +91,7 @@ internal class MessageManager : IAsyncDisposable
await Task.Delay(100); await Task.Delay(100);
if (PendingMessageThread.IsAlive) if (PendingMessageThread.IsAlive)
Plugin.Log.Warning( Plugin.LogProxy.Warning(
"PendingMessageThread did not observe cancellation within 10s. " "PendingMessageThread did not observe cancellation within 10s. "
+ "Worker remains on background thread; next plugin reload releases it." + "Worker remains on background thread; next plugin reload releases it."
); );
@@ -137,7 +137,7 @@ internal class MessageManager : IAsyncDisposable
} }
catch (Exception ex) catch (Exception ex)
{ {
Plugin.Log.Error(ex, "Error processing pending message"); Plugin.LogProxy.Error(ex, "Error processing pending message");
} }
} }
else else
@@ -182,10 +182,12 @@ internal class MessageManager : IAsyncDisposable
// Mark failed messages as deleted to prevent retry attempts // Mark failed messages as deleted to prevent retry attempts
var failedIds = messages.FailedMessageIds(); var failedIds = messages.FailedMessageIds();
Plugin.Log.Info($"Marking {failedIds.Count} messages as deleted due to parse failures"); Plugin.LogProxy.Info(
$"Marking {failedIds.Count} messages as deleted due to parse failures"
);
foreach (var msgId in messages.FailedMessageIds()) foreach (var msgId in messages.FailedMessageIds())
{ {
Plugin.Log.Debug($"Marking message '{msgId}' as deleted due to parse failure"); Plugin.LogProxy.Debug($"Marking message '{msgId}' as deleted due to parse failure");
Store.DeleteMessage(msgId); Store.DeleteMessage(msgId);
} }
} }
@@ -201,10 +203,10 @@ internal class MessageManager : IAsyncDisposable
} }
catch (Exception ex) catch (Exception ex)
{ {
Plugin.Log.Error(ex, "Error in FilterAllTabs"); Plugin.LogProxy.Error(ex, "Error in FilterAllTabs");
} }
Plugin.Log.Debug($"FilterAllTabs took {stopwatch.ElapsedMilliseconds}ms"); Plugin.LogProxy.Debug($"FilterAllTabs took {stopwatch.ElapsedMilliseconds}ms");
}); });
} }
@@ -259,7 +261,7 @@ internal class MessageManager : IAsyncDisposable
} }
catch (Exception ex) catch (Exception ex)
{ {
Plugin.Log.Error(ex, "Error in ContentIdResolver"); Plugin.LogProxy.Error(ex, "Error in ContentIdResolver");
} }
} }
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -131,7 +131,7 @@ public sealed class PayloadHandler
} }
catch (Exception ex) catch (Exception ex)
{ {
Plugin.Log.Error(ex, "Error executing integration"); Plugin.LogProxy.Error(ex, "Error executing integration");
} }
} }
@@ -535,7 +535,7 @@ public sealed class PayloadHandler
) )
) )
{ {
Plugin.Log.Warning("Could not find DalamudLinkHandlers"); Plugin.LogProxy.Warning("Could not find DalamudLinkHandlers");
return; return;
} }
@@ -546,7 +546,7 @@ public sealed class PayloadHandler
} }
catch (Exception ex) catch (Exception ex)
{ {
Plugin.Log.Error(ex, "Error executing DalamudLinkPayload handler"); Plugin.LogProxy.Error(ex, "Error executing DalamudLinkPayload handler");
} }
} }
+206 -24
View File
@@ -14,6 +14,7 @@ using HellionChat.Ipc;
using HellionChat.Resources; using HellionChat.Resources;
using HellionChat.Ui; using HellionChat.Ui;
using HellionChat.Util; using HellionChat.Util;
using Microsoft.Data.Sqlite;
namespace HellionChat; namespace HellionChat;
@@ -113,11 +114,32 @@ public sealed class Plugin : IAsyncDalamudPlugin
internal Ui.StatusBar StatusBar { get; private set; } = null!; internal Ui.StatusBar StatusBar { get; private set; } = null!;
internal Integrations.HonorificService HonorificService { get; private set; } = null!; internal Integrations.HonorificService HonorificService { get; private set; } = null!;
// Platform indirection over Dalamud.Utility.Util. Wired in Phase-1 ctor so
// any service allocated in LoadAsync can read Plugin.PlatformUtil.
internal static IPlatformUtil PlatformUtil { get; private set; } = null!;
// Log indirection over Dalamud's IPluginLog. Same rationale as PlatformUtil:
// call-sites read through LogProxy so MessageStore can be tested in
// isolation. Wired immediately after Dalamud injects Log.
internal static IPluginLogProxy LogProxy { get; private set; } = null!;
// Idempotency guard — Dalamud may fire DisposeAsync twice in a reload race. // Idempotency guard — Dalamud may fire DisposeAsync twice in a reload race.
private int _disposeStarted; private int _disposeStarted;
// Set in the first DisposeAsync statement so async callbacks scheduled
// via Framework.RunOnTick (v1.4.8 B3 retention sweep) can early-bail
// before they touch state that has already been torn down. Volatile
// because the tick reads it from a different thread than the writer.
private volatile bool _isDisposing;
internal int DeferredSaveFrames = -1; internal int DeferredSaveFrames = -1;
// Cancels the v1.4.8 FTS5 bulk-insert worker on plugin teardown. The
// worker runs off the framework thread on its own SqliteConnection, so a
// Dispose mid-rebuild must signal cancellation before MessageManager
// tears down (the worker logs "rebuild failed" via Log on error paths).
private CancellationTokenSource? _ftsRebuildCts;
// Serialises retention sweeps so a manual trigger and the 24h auto-sweep // Serialises retention sweeps so a manual trigger and the 24h auto-sweep
// can't run in parallel. Volatile because the ImGui thread reads it outside // can't run in parallel. Volatile because the ImGui thread reads it outside
// the lock to gate the manual button. // the lock to gate the manual button.
@@ -154,20 +176,28 @@ public sealed class Plugin : IAsyncDalamudPlugin
Config = Interface.GetPluginConfig() as Configuration ?? new Configuration(); Config = Interface.GetPluginConfig() as Configuration ?? new Configuration();
// Schema gate: v1.4.x requires config v16. Users on older schemas // Wire platform indirection before LoadAsync allocates anything that
// must install v1.4.2 first to run the migration chain. // needs Util.* — services then read Plugin.PlatformUtil instead of
// hitting the Dalamud static surface directly.
PlatformUtil = new DalamudPlatformUtil();
LogProxy = new DalamudPluginLogProxy(Log);
// Schema gate: v1.4.x requires config v16+. Users on older schemas
// must install v1.4.2 first to run the migration chain. v17 adds
// Tab.IsPinned (additive, no data migration needed) so v16 configs
// load cleanly and get their Version stamp bumped after the gate.
if (Config.Version < 16) if (Config.Version < 16)
{ {
throw new InvalidOperationException( throw new InvalidOperationException(
$"HellionChat v1.4.5 requires config schema v16, got v{Config.Version}. " $"HellionChat v1.4.8 requires config schema v16, got v{Config.Version}. "
+ "Please install v1.4.2 first to migrate the configuration, then upgrade to v1.4.5." + "Please install v1.4.2 first to migrate the configuration, then upgrade to v1.4.8."
); );
} }
Config.Version = 17;
// Session-only tabs are stripped on every load; AutoTellTabsService.Initialize // Unpinned TempTabs are session-only and dropped on every load. Pinned
// then re-pegs TempTabCounter from the stripped list, not the pre-strip snapshot. // TempTabs survive reload — Jin's tester feedback (v1.4.7).
// TEST-MIRROR: ../../Hellion Build test/_Helpers/TempTabCounterTests.cs Config.Tabs.RemoveAll(TabLifecycleHelpers.ShouldStripOnLoad);
Config.Tabs.RemoveAll(t => t.IsTempTab);
LanguageChanged(Interface.UiLanguage); LanguageChanged(Interface.UiLanguage);
ImGuiUtil.Initialize(this); ImGuiUtil.Initialize(this);
@@ -204,6 +234,12 @@ public sealed class Plugin : IAsyncDalamudPlugin
Directory.CreateDirectory(customThemesDir); Directory.CreateDirectory(customThemesDir);
SeedExampleThemeIfEmpty(customThemesDir); SeedExampleThemeIfEmpty(customThemesDir);
ThemeRegistry = new Themes.ThemeRegistry(customThemesDir); ThemeRegistry = new Themes.ThemeRegistry(customThemesDir);
// Warm up the custom-theme cache before the first Switch.
// LoadCustomBySlug is a reverse-lookup over _customCache; on a
// cold cache a Config.Theme that points at a custom slug would
// fall through to the built-in default. AllCustom is a lazy
// enumerable, so iterate it explicitly to materialise the cache.
foreach (var _ in ThemeRegistry.AllCustom()) { }
ThemeRegistry.Switch(Config.Theme); ThemeRegistry.Switch(Config.Theme);
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
@@ -265,6 +301,113 @@ public sealed class Plugin : IAsyncDalamudPlugin
if (Interface.Reason is not PluginLoadReason.Boot) if (Interface.Reason is not PluginLoadReason.Boot)
MessageManager.FilterAllTabsAsync(); MessageManager.FilterAllTabsAsync();
// Kick the FTS5 rebuild worker if Migrate4 just added the schema or
// a previous run was cut short (InitFtsReadyCache leaves _ftsReady
// false in that case). Runs off the framework thread on its own
// SqliteConnection so the live UpsertMessage path keeps flowing
// through the chunked-commit windows.
_ftsRebuildCts = new CancellationTokenSource();
if (!MessageManager.Store.IsFtsIndexBuilt)
{
var token = _ftsRebuildCts.Token;
_ = Task.Run(
async () =>
{
// FQN: Plugin.Notification (Z.74) shadows the type name.
Dalamud.Interface.ImGuiNotification.IActiveNotification? notif = null;
try
{
notif = Notification.AddNotification(
new Dalamud.Interface.ImGuiNotification.Notification
{
Title = "Hellion Chat",
Content = "Indexing chat history for full-text search...",
Type = Dalamud
.Interface
.ImGuiNotification
.NotificationType
.Info,
Minimized = false,
InitialDuration = TimeSpan.FromMinutes(10),
}
);
// Progress<T> raises this callback on the captured
// sync-context (Task.Run worker pool). IActiveNotification
// is ImGui-backed and mutates the UI, so marshal the
// mutation onto the framework thread via RunOnTick.
var progress = new Progress<long>(done =>
{
Framework.RunOnTick(() =>
{
if (notif is { } n)
n.Content = $"Indexing chat history: {done:N0} messages...";
});
});
// Worker-owned connection. Closed+disposed before we
// flip the readiness flag so the DbViewer never sees
// IsFtsIndexBuilt=true while the worker connection
// is still alive.
SqliteConnection? workerConn = null;
try
{
workerConn = MessageManager.Store.OpenSecondaryConnection();
var total = await Task.Run(
() =>
MessageManager.Store.RebuildFtsIndex(
workerConn,
progress,
token
),
token
)
.ConfigureAwait(false);
workerConn.Close();
workerConn.Dispose();
workerConn = null;
MessageManager.Store.MarkFtsIndexBuilt();
if (notif is { } final)
{
final.Content = $"Indexed {total:N0} messages.";
final.Type = Dalamud
.Interface
.ImGuiNotification
.NotificationType
.Success;
final.InitialDuration = TimeSpan.FromSeconds(5);
}
}
finally
{
workerConn?.Dispose();
}
}
catch (OperationCanceledException)
{
notif?.DismissNow();
}
catch (Exception ex)
{
Log.Error(ex, "FTS index rebuild failed");
if (notif is { } err)
{
err.Content =
"Full-text indexing failed -- search will use local filter only.";
err.Type = Dalamud
.Interface
.ImGuiNotification
.NotificationType
.Error;
}
}
},
_ftsRebuildCts.Token
);
}
Interface.UiBuilder.DisableCutsceneUiHide = true; Interface.UiBuilder.DisableCutsceneUiHide = true;
Interface.UiBuilder.DisableGposeUiHide = true; Interface.UiBuilder.DisableGposeUiHide = true;
@@ -303,6 +446,12 @@ public sealed class Plugin : IAsyncDalamudPlugin
if (Interlocked.Exchange(ref _disposeStarted, 1) != 0) if (Interlocked.Exchange(ref _disposeStarted, 1) != 0)
return; return;
// Set before any cleanup so deferred Framework.RunOnTick callbacks
// (B3 retention sweep) see the flag and bail out before they touch
// MessageManager / Log / static fields that the rest of this method
// is about to tear down.
_isDisposing = true;
Exception? failure = null; Exception? failure = null;
// Unsubscribe hooks first — mirrors the hooks-last subscribe order in LoadAsync. // Unsubscribe hooks first — mirrors the hooks-last subscribe order in LoadAsync.
@@ -311,6 +460,19 @@ public sealed class Plugin : IAsyncDalamudPlugin
failure = CaptureFailure(failure, () => Interface.UiBuilder.Draw -= Draw); failure = CaptureFailure(failure, () => Interface.UiBuilder.Draw -= Draw);
failure = CaptureFailure(failure, () => Framework.Update -= FrameworkUpdate); failure = CaptureFailure(failure, () => Framework.Update -= FrameworkUpdate);
// Signal the FTS rebuild worker to bail. Runs before MessageManager
// tears down so the worker's "rebuild failed" log path still finds
// a live Log static. Worker owns its own SqliteConnection and disposes
// it itself; we only flip the cancellation flag here.
failure = CaptureFailure(
failure,
() =>
{
_ftsRebuildCts?.Cancel();
_ftsRebuildCts?.Dispose();
}
);
// Flush a pending DeferredSave — FrameworkUpdate won't fire it anymore. // Flush a pending DeferredSave — FrameworkUpdate won't fire it anymore.
failure = CaptureFailure( failure = CaptureFailure(
failure, failure,
@@ -561,15 +723,31 @@ public sealed class Plugin : IAsyncDalamudPlugin
if (deleted > 0) if (deleted > 0)
{ {
Log.Information($"Retention sweep deleted {deleted} expired messages."); Log.Information($"Retention sweep deleted {deleted} expired messages.");
// Run clear+refilter on the framework thread — FilterAllTabsAsync // Schedule on the next framework tick to avoid the ~194ms
// is fire-and-forget and would race the next sweep cycle. // hitch from blocking with .Wait() while the framework
Framework // finishes the current frame. Tabs-list mutation must
.Run(() => // stay on the framework thread because Plugin.Config.Tabs
// (Configuration.cs:222) is not lock-protected and
// AutoTellTabsService can mutate it from background paths.
// Pattern reference: SimpleTweaks
// Tweaks/Chat/CaseInsensitiveCommands.cs:45.
Framework.RunOnTick(() =>
{
// The retention thread is IsBackground=true so plugin
// unload can fire while a scheduled tick is still
// pending; bail before touching anything torn down.
if (_isDisposing)
return;
try
{ {
MessageManager.ClearAllTabs(); MessageManager.ClearAllTabs();
MessageManager.FilterAllTabs(); MessageManager.FilterAllTabs();
}) }
.Wait(); catch (Exception ex)
{
Log.Error(ex, "Retention sweep clear+refilter failed");
}
});
} }
else else
{ {
@@ -593,6 +771,12 @@ public sealed class Plugin : IAsyncDalamudPlugin
private void Draw() private void Draw()
{ {
// v1.4.8 B2: pick up external edits of the active custom theme JSON
// without forcing the user to re-click the picker. The disk-stat is
// 1Hz-throttled inside RefreshActiveIfStale, so this is essentially
// free on built-in themes and ~1 stat/second on custom themes.
ThemeRegistry.RefreshActiveIfStale();
// Theme engine is always active; Classic is a theme, not a disabled state. // Theme engine is always active; Classic is a theme, not a disabled state.
using IDisposable _style = HellionStyle.PushGlobal( using IDisposable _style = HellionStyle.PushGlobal(
ThemeRegistry.Active, ThemeRegistry.Active,
@@ -637,19 +821,17 @@ public sealed class Plugin : IAsyncDalamudPlugin
internal void SaveConfig() internal void SaveConfig()
{ {
// Strip session-only Auto-Tell-Tabs before serialization; restore after. // Only unpinned TempTabs are session-only — they move aside before
var snapshot = Config.Tabs.ToList(); // serialization and re-attach after. Pinned TempTabs stay in
Config.Tabs.RemoveAll(t => t.IsTempTab); // Config.Tabs across the save so JSON includes them. Cloning only the
// unpinned subset keeps the allocation proportional to
// AutoTellTabsLimit (<=15) instead of the full tab list.
var unpinnedTempTabs = Config.Tabs.Where(TabLifecycleHelpers.IsInUnpinnedPool).ToList();
Config.Tabs.RemoveAll(TabLifecycleHelpers.ShouldStripOnSave);
Interface.SavePluginConfig(Config); Interface.SavePluginConfig(Config);
Config.Tabs.Clear(); Config.Tabs.AddRange(unpinnedTempTabs);
Config.Tabs.AddRange(snapshot);
// F2.1: snapshot-restore preserves IsTempTab tabs but the mid-step
// RemoveAll bypasses AutoTellTabsService, so re-peg the counter.
// Null-conditional because SaveConfig can fire before Phase-2 init.
AutoTellTabsService?.ResyncTempTabCounter();
} }
internal void LanguageChanged(string langCode) internal void LanguageChanged(string langCode)
+17
View File
@@ -170,6 +170,16 @@ internal class HellionStrings
internal static string AutoTellTabs_HistoryLoadError => Get(nameof(AutoTellTabs_HistoryLoadError)); internal static string AutoTellTabs_HistoryLoadError => Get(nameof(AutoTellTabs_HistoryLoadError));
internal static string AutoTellTabs_GreetedTooltip => Get(nameof(AutoTellTabs_GreetedTooltip)); internal static string AutoTellTabs_GreetedTooltip => Get(nameof(AutoTellTabs_GreetedTooltip));
internal static string AutoTellTabs_UnGreetedTooltip => Get(nameof(AutoTellTabs_UnGreetedTooltip)); internal static string AutoTellTabs_UnGreetedTooltip => Get(nameof(AutoTellTabs_UnGreetedTooltip));
internal static string PinTab_MenuPin => Get(nameof(PinTab_MenuPin));
internal static string PinTab_MenuUnpin => Get(nameof(PinTab_MenuUnpin));
internal static string PinTab_MenuPromote => Get(nameof(PinTab_MenuPromote));
internal static string PinTab_PromoteTooltip => Get(nameof(PinTab_PromoteTooltip));
internal static string PinTab_LimitReached => Get(nameof(PinTab_LimitReached));
internal static string PinTab_PinnedTooltip => Get(nameof(PinTab_PinnedTooltip));
internal static string PinTab_PinTooltip => Get(nameof(PinTab_PinTooltip));
internal static string PinTab_SectionHeader => Get(nameof(PinTab_SectionHeader));
internal static string Settings_ThemeAndLayout_SidebarWidth_Name => Get(nameof(Settings_ThemeAndLayout_SidebarWidth_Name));
internal static string Settings_ThemeAndLayout_SidebarWidth_Description => Get(nameof(Settings_ThemeAndLayout_SidebarWidth_Description));
// Hellion Chat — Auto-Tell-Tabs Chat settings tab // Hellion Chat — Auto-Tell-Tabs Chat settings tab
internal static string ChatLog_AutoTellTabs_Section_Title => Get(nameof(ChatLog_AutoTellTabs_Section_Title)); internal static string ChatLog_AutoTellTabs_Section_Title => Get(nameof(ChatLog_AutoTellTabs_Section_Title));
@@ -370,6 +380,8 @@ internal class HellionStrings
internal static string Settings_Integrations_Honorific_Status_Incompatible => Get(nameof(Settings_Integrations_Honorific_Status_Incompatible)); internal static string Settings_Integrations_Honorific_Status_Incompatible => Get(nameof(Settings_Integrations_Honorific_Status_Incompatible));
internal static string Settings_Integrations_Honorific_Toggle => Get(nameof(Settings_Integrations_Honorific_Toggle)); internal static string Settings_Integrations_Honorific_Toggle => Get(nameof(Settings_Integrations_Honorific_Toggle));
internal static string Settings_Integrations_Honorific_ToggleHint => Get(nameof(Settings_Integrations_Honorific_ToggleHint)); internal static string Settings_Integrations_Honorific_ToggleHint => Get(nameof(Settings_Integrations_Honorific_ToggleHint));
internal static string Settings_Integrations_Honorific_Glow_Toggle => Get(nameof(Settings_Integrations_Honorific_Glow_Toggle));
internal static string Settings_Integrations_Honorific_Glow_Hint => Get(nameof(Settings_Integrations_Honorific_Glow_Hint));
internal static string Settings_Integrations_Honorific_LinkRepo => Get(nameof(Settings_Integrations_Honorific_LinkRepo)); internal static string Settings_Integrations_Honorific_LinkRepo => Get(nameof(Settings_Integrations_Honorific_LinkRepo));
internal static string Settings_Integrations_Honorific_LinkAuthor => Get(nameof(Settings_Integrations_Honorific_LinkAuthor)); internal static string Settings_Integrations_Honorific_LinkAuthor => Get(nameof(Settings_Integrations_Honorific_LinkAuthor));
internal static string Settings_Integrations_ComingSoon_SectionHeader => Get(nameof(Settings_Integrations_ComingSoon_SectionHeader)); internal static string Settings_Integrations_ComingSoon_SectionHeader => Get(nameof(Settings_Integrations_ComingSoon_SectionHeader));
@@ -390,4 +402,9 @@ internal class HellionStrings
// Hellion Chat — v1.3.0 Honorific title slot tooltip // Hellion Chat — v1.3.0 Honorific title slot tooltip
internal static string ChatHeader_HonorificTitle_Tooltip => Get(nameof(ChatHeader_HonorificTitle_Tooltip)); internal static string ChatHeader_HonorificTitle_Tooltip => Get(nameof(ChatHeader_HonorificTitle_Tooltip));
// Hellion Chat — v1.4.8 DbViewer full-text search toggle
internal static string DbViewer_FullTextToggle => Get(nameof(DbViewer_FullTextToggle));
internal static string DbViewer_FullTextToggle_Hint_Indexing => Get(nameof(DbViewer_FullTextToggle_Hint_Indexing));
internal static string DbViewer_FullTextToggle_Hint_PhraseMode => Get(nameof(DbViewer_FullTextToggle_Hint_PhraseMode));
} }
+46 -1
View File
@@ -383,6 +383,36 @@
<data name="AutoTellTabs_UnGreetedTooltip" xml:space="preserve"> <data name="AutoTellTabs_UnGreetedTooltip" xml:space="preserve">
<value>Als begrüßt markieren.</value> <value>Als begrüßt markieren.</value>
</data> </data>
<data name="PinTab_MenuPin" xml:space="preserve">
<value>Tab anpinnen</value>
</data>
<data name="PinTab_MenuUnpin" xml:space="preserve">
<value>Tab lösen</value>
</data>
<data name="PinTab_MenuPromote" xml:space="preserve">
<value>In Standard-Tab umwandeln</value>
</data>
<data name="PinTab_PromoteTooltip" xml:space="preserve">
<value>Wandelt den TempTell in einen regulären Tab um. Die Tell-Bindung an die Person geht verloren, der Tab fängt dann Nachrichten anhand der Channel-Filter ein. Für „Tab überlebt Relog" stattdessen „Tab anpinnen" wählen.</value>
</data>
<data name="PinTab_LimitReached" xml:space="preserve">
<value>Maximal {0} angepinnte Tell-Tabs erreicht. Erst einen lösen oder dauerhaft behalten.</value>
</data>
<data name="PinTab_PinnedTooltip" xml:space="preserve">
<value>Angepinnt — überlebt Relog.</value>
</data>
<data name="PinTab_PinTooltip" xml:space="preserve">
<value>Angepinnte Tabs überleben Relog und behalten die Bindung an die Tell-Person.</value>
</data>
<data name="PinTab_SectionHeader" xml:space="preserve">
<value>Angepinnt</value>
</data>
<data name="Settings_ThemeAndLayout_SidebarWidth_Name" xml:space="preserve">
<value>Sidebar-Breite</value>
</data>
<data name="Settings_ThemeAndLayout_SidebarWidth_Description" xml:space="preserve">
<value>Breite der Tab-Sidebar in Pixeln. Default (44 px) ist Icon-only; breiter machen damit Sektion-Header wie „Aktive Tells (3)" nicht abgeschnitten werden.</value>
</data>
<!-- Hellion Chat — Auto-Tell-Tabs (Chat-Einstellungstab) --> <!-- Hellion Chat — Auto-Tell-Tabs (Chat-Einstellungstab) -->
<data name="ChatLog_AutoTellTabs_Section_Title" xml:space="preserve"> <data name="ChatLog_AutoTellTabs_Section_Title" xml:space="preserve">
@@ -398,7 +428,7 @@
<value>Maximale Anzahl der Auto-Tell-Tabs</value> <value>Maximale Anzahl der Auto-Tell-Tabs</value>
</data> </data>
<data name="ChatLog_AutoTellTabs_Limit_Description" xml:space="preserve"> <data name="ChatLog_AutoTellTabs_Limit_Description" xml:space="preserve">
<value>Beim Erreichen werden begrüßte Tabs mit der ältesten Aktivität zuerst geschlossen. Änderungen greifen beim nächsten /tell.</value> <value>Beim Erreichen werden begrüßte Tabs mit der ältesten Aktivität zuerst geschlossen. Änderungen greifen beim nächsten /tell. Diese Grenze gilt nur für den automatisch verwalteten Pool. Angepinnte Tell-Tabs (Rechtsklick → Tab anpinnen) leben in einem separaten Pool von bis zu 5 Tabs und überleben Relog.</value>
</data> </data>
<data name="ChatLog_AutoTellTabs_Compact_Name" xml:space="preserve"> <data name="ChatLog_AutoTellTabs_Compact_Name" xml:space="preserve">
<value>Kompakte Anzeige</value> <value>Kompakte Anzeige</value>
@@ -827,6 +857,12 @@
<data name="Settings_Integrations_Honorific_ToggleHint" xml:space="preserve"> <data name="Settings_Integrations_Honorific_ToggleHint" xml:space="preserve">
<value>Zeigt deinen Custom-Titel aus Honorific im Header über dem Chat-Log an, in der von dir gewählten Farbe.</value> <value>Zeigt deinen Custom-Titel aus Honorific im Header über dem Chat-Log an, in der von dir gewählten Farbe.</value>
</data> </data>
<data name="Settings_Integrations_Honorific_Glow_Toggle" xml:space="preserve">
<value>Glow-Outline rendern (Honorific)</value>
</data>
<data name="Settings_Integrations_Honorific_Glow_Hint" xml:space="preserve">
<value>Kann die Framerate auf schwacher Hardware drücken. Rendert die Glow-Outline für Honorific-Titel, die sie nutzen. Gradient-Animation wird noch nicht unterstützt und wird stattdessen als Primärfarbe gezeichnet.</value>
</data>
<data name="Settings_Integrations_Honorific_LinkRepo" xml:space="preserve"> <data name="Settings_Integrations_Honorific_LinkRepo" xml:space="preserve">
<value>Honorific auf GitHub</value> <value>Honorific auf GitHub</value>
</data> </data>
@@ -881,4 +917,13 @@
<data name="ChatHeader_HonorificTitle_Tooltip" xml:space="preserve"> <data name="ChatHeader_HonorificTitle_Tooltip" xml:space="preserve">
<value>Custom-Titel von Honorific</value> <value>Custom-Titel von Honorific</value>
</data> </data>
<data name="DbViewer_FullTextToggle" xml:space="preserve">
<value>Volltext-Suche</value>
</data>
<data name="DbViewer_FullTextToggle_Hint_Indexing" xml:space="preserve">
<value>Der Volltext-Index wird noch gebaut. Die lokale Suche bleibt verfügbar.</value>
</data>
<data name="DbViewer_FullTextToggle_Hint_PhraseMode" xml:space="preserve">
<value>Sucht nach der exakten Wortfolge. Mehrere Wörter werden nur gefunden, wenn sie zusammen und in dieser Reihenfolge stehen. Wer rohe FTS5-MATCH-Syntax nutzen will, setzt eigene Anführungszeichen um den Suchbegriff.</value>
</data>
</root> </root>
+46 -1
View File
@@ -383,6 +383,36 @@
<data name="AutoTellTabs_UnGreetedTooltip" xml:space="preserve"> <data name="AutoTellTabs_UnGreetedTooltip" xml:space="preserve">
<value>Mark as greeted.</value> <value>Mark as greeted.</value>
</data> </data>
<data name="PinTab_MenuPin" xml:space="preserve">
<value>Pin Tab</value>
</data>
<data name="PinTab_MenuUnpin" xml:space="preserve">
<value>Unpin Tab</value>
</data>
<data name="PinTab_MenuPromote" xml:space="preserve">
<value>Promote to permanent</value>
</data>
<data name="PinTab_PromoteTooltip" xml:space="preserve">
<value>Turns this TempTell into a regular tab. The tell binding to the partner is dropped — the tab will catch messages by its channel filters from now on. For "tab survives relog while staying bound to this partner", use Pin Tab instead.</value>
</data>
<data name="PinTab_PinTooltip" xml:space="preserve">
<value>Pinned tabs survive relog and stay bound to this conversation partner.</value>
</data>
<data name="PinTab_SectionHeader" xml:space="preserve">
<value>Pinned</value>
</data>
<data name="Settings_ThemeAndLayout_SidebarWidth_Name" xml:space="preserve">
<value>Sidebar width</value>
</data>
<data name="Settings_ThemeAndLayout_SidebarWidth_Description" xml:space="preserve">
<value>Width of the tab sidebar in pixels. The default (44 px) is icon-only; widen it to fit the section headers like "Active Tells (3)" without truncation.</value>
</data>
<data name="PinTab_LimitReached" xml:space="preserve">
<value>Maximum of {0} pinned tell tabs reached. Unpin one first, or use Promote to permanent.</value>
</data>
<data name="PinTab_PinnedTooltip" xml:space="preserve">
<value>Pinned — survives relog.</value>
</data>
<!-- Hellion Chat — Auto-Tell-Tabs (Chat settings tab) --> <!-- Hellion Chat — Auto-Tell-Tabs (Chat settings tab) -->
<data name="ChatLog_AutoTellTabs_Section_Title" xml:space="preserve"> <data name="ChatLog_AutoTellTabs_Section_Title" xml:space="preserve">
@@ -398,7 +428,7 @@
<value>Maximum number of auto-tell tabs</value> <value>Maximum number of auto-tell tabs</value>
</data> </data>
<data name="ChatLog_AutoTellTabs_Limit_Description" xml:space="preserve"> <data name="ChatLog_AutoTellTabs_Limit_Description" xml:space="preserve">
<value>When the limit is reached, greeted tabs with the oldest activity are closed first. Changes take effect on the next /tell.</value> <value>When the limit is reached, greeted tabs with the oldest activity are closed first. Changes take effect on the next /tell. This limit applies to the auto-managed pool. Pinned tell tabs (right-click → Pin Tab) live in a separate pool of up to 5 and survive relog.</value>
</data> </data>
<data name="ChatLog_AutoTellTabs_Compact_Name" xml:space="preserve"> <data name="ChatLog_AutoTellTabs_Compact_Name" xml:space="preserve">
<value>Compact display</value> <value>Compact display</value>
@@ -827,6 +857,12 @@
<data name="Settings_Integrations_Honorific_ToggleHint" xml:space="preserve"> <data name="Settings_Integrations_Honorific_ToggleHint" xml:space="preserve">
<value>Shows your custom title from Honorific in the header above the chat log, in the colour you have chosen.</value> <value>Shows your custom title from Honorific in the header above the chat log, in the colour you have chosen.</value>
</data> </data>
<data name="Settings_Integrations_Honorific_Glow_Toggle" xml:space="preserve">
<value>Render glow outlines (Honorific)</value>
</data>
<data name="Settings_Integrations_Honorific_Glow_Hint" xml:space="preserve">
<value>May reduce frame rate on low-end hardware. Renders glow outlines for Honorific titles that use them. Gradient animation is not yet supported and will render as the primary colour.</value>
</data>
<data name="Settings_Integrations_Honorific_LinkRepo" xml:space="preserve"> <data name="Settings_Integrations_Honorific_LinkRepo" xml:space="preserve">
<value>Honorific on GitHub</value> <value>Honorific on GitHub</value>
</data> </data>
@@ -881,4 +917,13 @@
<data name="ChatHeader_HonorificTitle_Tooltip" xml:space="preserve"> <data name="ChatHeader_HonorificTitle_Tooltip" xml:space="preserve">
<value>Custom title from Honorific</value> <value>Custom title from Honorific</value>
</data> </data>
<data name="DbViewer_FullTextToggle" xml:space="preserve">
<value>Full-text search</value>
</data>
<data name="DbViewer_FullTextToggle_Hint_Indexing" xml:space="preserve">
<value>The full-text index is still being built. The local filter remains available.</value>
</data>
<data name="DbViewer_FullTextToggle_Hint_PhraseMode" xml:space="preserve">
<value>Searches for the exact phrase. Multi-word queries match only when the words appear together in order. To use raw FTS5 MATCH syntax, wrap your term in double quotes yourself.</value>
</data>
</root> </root>
@@ -0,0 +1,82 @@
using HellionChat.Util;
namespace HellionChat.Themes.Builtin;
internal static class CrystalNocturne
{
public const string Slug = "crystal-nocturne";
public static Theme Build() =>
new(
Slug: Slug,
Name: "Crystal Nocturne",
Author: "CRYSTALLITE",
Description: "Royal sapphire and electric magenta over obsidian — a nocturne for the crystal-lit dance floor.",
Colors: new ThemeColors(
PrimaryDark: ColourUtil.HexToRgba("#1D4ED8"),
Primary: ColourUtil.HexToRgba("#3B82F6"),
PrimaryLight: ColourUtil.HexToRgba("#93C5FD"),
PrimaryGlow: ColourUtil.HexToRgba("#3B82F699"),
AccentDark: ColourUtil.HexToRgba("#A21CAF"),
Accent: ColourUtil.HexToRgba("#D946EF"),
AccentLight: ColourUtil.HexToRgba("#F0ABFC"),
Identity: ColourUtil.HexToRgba("#3B82F6"),
WindowBg: ColourUtil.HexToRgba("#08070F"),
ChildBg: ColourUtil.HexToRgba("#11101F"),
FrameBg: ColourUtil.HexToRgba("#1C1A33"),
Surface: ColourUtil.HexToRgba("#262340"),
SurfaceHover: ColourUtil.HexToRgba("#332D55"),
Border: ColourUtil.HexToRgba("#D946EF55"),
TextPrimary: ColourUtil.HexToRgba("#F5F3FF"),
TextMuted: ColourUtil.HexToRgba("#A5A0C0"),
TextDim: ColourUtil.HexToRgba("#4B4763"),
StatusSuccess: ColourUtil.HexToRgba("#10B981"),
StatusDanger: ColourUtil.HexToRgba("#F43F5E"),
StatusWarning: ColourUtil.HexToRgba("#FACC15"),
StatusInfo: ColourUtil.HexToRgba("#3B82F6")
),
Layout: new ThemeLayout(
WindowRounding: 2f,
ChildRounding: 1f,
PopupRounding: 2f,
FrameRounding: 1f,
GrabRounding: 1f,
TabRounding: 1f,
ScrollbarRounding: 2f,
WindowBorderSize: 1f,
FrameBorderSize: 1f
),
Typography: new ThemeTypography(),
IsBuiltIn: true,
ChatColors: new ThemeChatColors(
new Dictionary<HellionChat.Code.ChatType, uint>
{
// Crystal Nocturne — sapphire-blue identity for party/team channels,
// accent-magenta for tells, with mint/peach accents on linkshells
// so the eight LS slots stay individually distinguishable on the
// dark obsidian background.
[HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#F5F3FF"),
[HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#FACC15"),
[HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#F0B090"),
[HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#F0ABFC"),
[HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#F0ABFC"),
[HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#93C5FD"),
[HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#F0B090"),
[HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#A8C8E8"),
[HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#10B981"),
[HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#93C5FD"),
[HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#10B981"),
[HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#FACC15"),
[HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#F0ABFC"),
[HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#93C5FD"),
[HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#F0B090"),
[HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#A5A0C0"),
[HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#D946EF"),
[HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#3B82F6"),
[HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#F0B090"),
[HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#F0B090"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#A5A0C0"),
}
)
);
}
@@ -1,80 +0,0 @@
using HellionChat.Util;
namespace HellionChat.Themes.Builtin;
internal static class MoonlitBloom
{
public const string Slug = "moonlit-bloom";
public static Theme Build() =>
new(
Slug: Slug,
Name: "Moonlit Bloom",
Author: "Hellion Forge",
Description: "Bloom Magenta + Soft Sage auf Deep Violet Night.",
Colors: new ThemeColors(
PrimaryDark: ColourUtil.HexToRgba("#C957D0"),
Primary: ColourUtil.HexToRgba("#E374E8"),
PrimaryLight: ColourUtil.HexToRgba("#EF8AF4"),
PrimaryGlow: ColourUtil.HexToRgba("#E374E899"),
AccentDark: ColourUtil.HexToRgba("#7AAC5C"),
Accent: ColourUtil.HexToRgba("#9CCB7C"),
AccentLight: ColourUtil.HexToRgba("#B6E297"),
Identity: ColourUtil.HexToRgba("#E374E8"),
WindowBg: ColourUtil.HexToRgba("#0E0C1F"),
ChildBg: ColourUtil.HexToRgba("#15122B"),
FrameBg: ColourUtil.HexToRgba("#1F1A38"),
Surface: ColourUtil.HexToRgba("#28224A"),
SurfaceHover: ColourUtil.HexToRgba("#332B5B"),
Border: ColourUtil.HexToRgba("#E374E844"),
TextPrimary: ColourUtil.HexToRgba("#ECE6F5"),
TextMuted: ColourUtil.HexToRgba("#9A8BB0"),
TextDim: ColourUtil.HexToRgba("#554B6E"),
StatusSuccess: ColourUtil.HexToRgba("#7AAC5C"),
StatusDanger: ColourUtil.HexToRgba("#E85C6A"),
StatusWarning: ColourUtil.HexToRgba("#E8B590"),
StatusInfo: ColourUtil.HexToRgba("#6278FF")
),
Layout: new ThemeLayout(
WindowRounding: 6f,
ChildRounding: 5f,
PopupRounding: 5f,
FrameRounding: 4f,
GrabRounding: 4f,
TabRounding: 4f,
ScrollbarRounding: 4f,
WindowBorderSize: 1f,
FrameBorderSize: 1f
),
Typography: new ThemeTypography(),
IsBuiltIn: true,
ChatColors: new ThemeChatColors(
new Dictionary<HellionChat.Code.ChatType, uint>
{
// Moonlit Bloom — Bloom-Magenta-Tönung. Sage-Drift in NoviceNetwork
// und Linkshell4. Tell-Pink-Identität bleibt sichtbar.
[HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#ECE6F5"),
[HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#F0D080"),
[HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#F09A60"),
[HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#EF8AF4"),
[HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#EF8AF4"),
[HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#A0B0F0"),
[HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#F0B090"),
[HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#A8C8E8"),
[HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#9CCB7C"),
[HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#A0B0F0"),
[HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#9CCB7C"),
[HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#F0BC92"),
[HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#F0D080"),
[HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#B6E297"),
[HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#A0B0F0"),
[HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#C098D8"),
[HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#EF8AF4"),
[HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#E8B0E8"),
[HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8B590"),
[HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8B590"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#9A8BB0"),
}
)
);
}
+108 -16
View File
@@ -6,6 +6,13 @@ public sealed class ThemeRegistry
{ {
public const string DefaultSlug = HellionArctic.Slug; public const string DefaultSlug = HellionArctic.Slug;
// 1Hz throttle for the v1.4.8 B2 auto-refresh-on-active path. The
// Plugin.Draw hook calls RefreshActiveIfStale every frame, but the
// actual File.GetLastWriteTimeUtc disk-stat only runs once per second
// -- 60fps would otherwise mean 3600 stats/min on the same path (more
// on Wine). Same idiom as the StatusBar 1Hz cache.
private const long ActiveStampPollIntervalMs = 1000;
private readonly Dictionary<string, Theme> _builtIns; private readonly Dictionary<string, Theme> _builtIns;
private readonly Dictionary<string, (Theme Theme, DateTime Stamp)> _customCache = new( private readonly Dictionary<string, (Theme Theme, DateTime Stamp)> _customCache = new(
StringComparer.OrdinalIgnoreCase StringComparer.OrdinalIgnoreCase
@@ -13,19 +20,32 @@ public sealed class ThemeRegistry
private readonly string? _customThemesDir; private readonly string? _customThemesDir;
private Theme _active; private Theme _active;
// v1.4.8 B2: source path of the currently active custom theme. Captured
// at Switch() time so RefreshActiveIfStale does not have to reconstruct
// a filename from the slug -- custom theme filenames are not required
// to match the slug they declare in the JSON body. Null when the active
// theme is built-in or no custom-themes directory is configured.
private string? _activeCustomPath;
private long _lastActiveStampCheckMs = -ActiveStampPollIntervalMs;
private DateTime _lastActiveStamp = DateTime.MinValue;
public ThemeRegistry(string? customThemesDir = null) public ThemeRegistry(string? customThemesDir = null)
{ {
// Insertion order drives the Theme-Picker grid layout (3 columns).
// Row 1: blue family. Row 2: purple to magenta family.
// Row 3: green / warm / classic. Row 4: Synthwave Sunset as a
// retro bonus on its own line.
_builtIns = new Dictionary<string, Theme>(StringComparer.OrdinalIgnoreCase) _builtIns = new Dictionary<string, Theme>(StringComparer.OrdinalIgnoreCase)
{ {
{ HellionArctic.Slug, HellionArctic.Build() }, { HellionArctic.Slug, HellionArctic.Build() },
{ HellionSpectrum.Slug, HellionSpectrum.Build() }, { HellionSpectrum.Slug, HellionSpectrum.Build() },
{ Chat2Classic.Slug, Chat2Classic.Build() },
{ EventHorizon.Slug, EventHorizon.Build() },
{ MoonlitBloom.Slug, MoonlitBloom.Build() },
{ NightBlue.Slug, NightBlue.Build() }, { NightBlue.Slug, NightBlue.Build() },
{ EventHorizon.Slug, EventHorizon.Build() },
{ IndigoViolet.Slug, IndigoViolet.Build() }, { IndigoViolet.Slug, IndigoViolet.Build() },
{ ForgeMerchantman.Slug, ForgeMerchantman.Build() }, { CrystalNocturne.Slug, CrystalNocturne.Build() },
{ MintGrove.Slug, MintGrove.Build() }, { MintGrove.Slug, MintGrove.Build() },
{ ForgeMerchantman.Slug, ForgeMerchantman.Build() },
{ Chat2Classic.Slug, Chat2Classic.Build() },
{ SynthwaveSunset.Slug, SynthwaveSunset.Build() }, { SynthwaveSunset.Slug, SynthwaveSunset.Build() },
}; };
@@ -44,7 +64,9 @@ public sealed class ThemeRegistry
if (_builtIns.TryGetValue(slug, out var b)) if (_builtIns.TryGetValue(slug, out var b))
return b; return b;
var custom = LoadCustomBySlug(slug); // Discard the source path here; Switch is the only call-site that
// needs to remember it for the auto-refresh hook.
var custom = LoadCustomBySlug(slug, out _);
if (custom != null) if (custom != null)
return custom; return custom;
@@ -55,12 +77,70 @@ public sealed class ThemeRegistry
public IEnumerable<Theme> AllCustom() => RefreshCustomCache(); public IEnumerable<Theme> AllCustom() => RefreshCustomCache();
// Built-in-first to match Get(slug)'s lookup order. A user theme JSON
// that declares the same slug as a built-in is ignored deliberately --
// having Switch prefer custom and Get prefer built-in would produce
// a state where _active and Get(_active.Slug) disagree.
public void Switch(string slug) public void Switch(string slug)
{ {
var theme = Get(slug); if (_builtIns.TryGetValue(slug, out var builtin))
// Defensive — ensures any future theme source always gets a populated cache. {
theme.RecomputeAbgrCache(); _active = builtin;
_active = theme; _active.RecomputeAbgrCache();
_activeCustomPath = null;
return;
}
var customTheme = LoadCustomBySlug(slug, out var customPath);
if (customTheme is not null)
{
_active = customTheme;
// Defensive — ensures any future theme source always gets a populated cache.
_active.RecomputeAbgrCache();
_activeCustomPath = customPath;
// Force a first-tick reload-check after the switch so the stamp
// baseline is established on the next RefreshActiveIfStale call.
_lastActiveStamp = DateTime.MinValue;
return;
}
// Fallback: neither built-in nor custom matched. Drop to default
// and clear the active custom path so RefreshActiveIfStale stays idle.
_active = _builtIns[DefaultSlug];
_active.RecomputeAbgrCache();
_activeCustomPath = null;
}
// 1Hz-throttled disk-stat on the currently active custom theme file.
// When the file's LastWriteTime moves forward (editor save), reload the
// theme via Get() so the user sees the edit immediately without
// re-selecting in the picker. Built-in themes short-circuit; custom
// themes without an _activeCustomPath (e.g. Switch fell to default)
// short-circuit too.
public void RefreshActiveIfStale()
{
var now = Environment.TickCount64;
if (now - _lastActiveStampCheckMs < ActiveStampPollIntervalMs)
return;
_lastActiveStampCheckMs = now;
if (_active.IsBuiltIn)
return;
var path = _activeCustomPath;
if (path is null || !File.Exists(path))
return;
var stamp = File.GetLastWriteTimeUtc(path);
if (!ThemeStampDiff.IsStale(_lastActiveStamp, stamp))
return;
_lastActiveStamp = stamp;
// Get() re-runs RefreshCustomCache which picks up the new content
// (the cache keys by path + LastWriteTime, so a mtime bump invalidates).
// RecomputeAbgrCache happens inside RefreshCustomCache on cache miss.
var reloaded = Get(_active.Slug);
_active = reloaded;
} }
// 0x80070020 = SHARING_VIOLATION, 0x80070021 = LOCK_VIOLATION. // 0x80070020 = SHARING_VIOLATION, 0x80070021 = LOCK_VIOLATION.
@@ -73,18 +153,30 @@ public sealed class ThemeRegistry
return code == 0x80070020u || code == 0x80070021u; return code == 0x80070020u || code == 0x80070021u;
} }
// Custom themes are loaded lazily, cached by LastWriteTime. // Slug -> Theme lookup with the source path as an out-param so the
// A changed JSON is reloaded on the next lookup. // Switch path can remember which file backs the active custom theme.
private Theme? LoadCustomBySlug(string slug) // Pure reverse-lookup over the existing _customCache: that cache is
// already Path -> (Theme, Stamp), so iterating it costs nothing,
// avoids a re-parse of every JSON, and keeps the parse logic (and
// the recoverable-file-lock recovery) confined to RefreshCustomCache.
// The cache must be warm before this runs; Plugin.LoadAsync triggers
// a one-time warm-up via AllCustom() before the first Switch call.
private Theme? LoadCustomBySlug(string slug, out string? sourcePath)
{ {
sourcePath = null;
if (_customThemesDir is null) if (_customThemesDir is null)
return null; return null;
if (!Directory.Exists(_customThemesDir)) if (!Directory.Exists(_customThemesDir))
return null; return null;
foreach (var theme in RefreshCustomCache()) foreach (var kvp in _customCache)
if (string.Equals(theme.Slug, slug, StringComparison.OrdinalIgnoreCase)) {
return theme; if (string.Equals(kvp.Value.Theme.Slug, slug, StringComparison.OrdinalIgnoreCase))
{
sourcePath = kvp.Key;
return kvp.Value.Theme;
}
}
return null; return null;
} }
@@ -114,7 +206,7 @@ public sealed class ThemeRegistry
catch (Exception ex) when (IsRecoverableFileLock(ex)) catch (Exception ex) when (IsRecoverableFileLock(ex))
{ {
// Editor mid-save: keep last known good, retry on next refresh. // Editor mid-save: keep last known good, retry on next refresh.
Plugin.Log.Debug( Plugin.LogProxy.Debug(
$"Custom theme {Path.GetFileName(path)} is locked, keeping last known good" $"Custom theme {Path.GetFileName(path)} is locked, keeping last known good"
); );
if (cached.Theme is not null) if (cached.Theme is not null)
+20
View File
@@ -0,0 +1,20 @@
namespace HellionChat.Themes;
// Pure stale-check for the v1.4.8 B2 theme-auto-refresh-on-active path.
// Lives in a free helper class so the Build-Suite can exercise the diff
// rules without instantiating ThemeRegistry (which touches the Dalamud
// log proxy and the filesystem). The rules:
// - DateTime.MinValue on the current stat means we could not read the
// file -- hold the last known good (return false).
// - Equal stamps mean no change since we last saw it.
// - Any other difference, including the first observation where lastSeen
// is MinValue, counts as stale and triggers a reload.
internal static class ThemeStampDiff
{
public static bool IsStale(System.DateTime lastSeen, System.DateTime current)
{
if (current == System.DateTime.MinValue)
return false;
return current != lastSeen;
}
}
+194 -34
View File
@@ -272,9 +272,12 @@ public sealed class ChatLogWindow : Window
} }
} }
if (targetChannel == null || !GameFunctions.Chat.ValidAnyLinkshell(targetChannel.Value)) if (
targetChannel == null
|| !GameFunctions.Chat.IsChannelOrExistingLinkshell(targetChannel.Value)
)
{ {
Plugin.Log.Warning( Plugin.LogProxy.Warning(
$"Channel was set to an invalid value '{targetChannel}', ignoring" $"Channel was set to an invalid value '{targetChannel}', ignoring"
); );
return; return;
@@ -328,11 +331,11 @@ public sealed class ChatLogWindow : Window
{ {
case "hide": case "hide":
CurrentHideState = HideState.User; CurrentHideState = HideState.User;
Plugin.Log.Verbose("HideState: → User (chat hide command)"); Plugin.LogProxy.Verbose("HideState: → User (chat hide command)");
break; break;
case "show": case "show":
CurrentHideState = HideState.None; CurrentHideState = HideState.None;
Plugin.Log.Verbose("HideState: → None (chat show command)"); Plugin.LogProxy.Verbose("HideState: → None (chat show command)");
break; break;
case "toggle": case "toggle":
CurrentHideState = CurrentHideState switch CurrentHideState = CurrentHideState switch
@@ -342,7 +345,7 @@ public sealed class ChatLogWindow : Window
HideState.None => HideState.User, HideState.None => HideState.User,
_ => CurrentHideState, _ => CurrentHideState,
}; };
Plugin.Log.Verbose($"HideState: → {CurrentHideState} (chat toggle command)"); Plugin.LogProxy.Verbose($"HideState: → {CurrentHideState} (chat toggle command)");
break; break;
} }
} }
@@ -416,8 +419,9 @@ public sealed class ChatLogWindow : Window
// The hint banner renders before this block so ImGui already accounts for it. // The hint banner renders before this block so ImGui already accounts for it.
height -= ImGui.GetFrameHeightWithSpacing(); height -= ImGui.GetFrameHeightWithSpacing();
// Status bar at the window bottom reserves 22px + 2px spacing. // StatusBar.Height now bakes in its own DPI-aware 2px spacer, so the
height -= StatusBar.Height + 2; // window reservation is just Height -- no extra +2 (v1.4.8 B1).
height -= StatusBar.Height;
return height; return height;
} }
@@ -438,11 +442,24 @@ public sealed class ChatLogWindow : Window
private void TabSwitched(Tab newTab, Tab previousTab) private void TabSwitched(Tab newTab, Tab previousTab)
{ {
// Use the fixed channel if set by the user, or set it to the current tabs channel if this tab wasn't accessed before // Use the fixed channel if set by the user. Otherwise, if the new tab
// has no channel state yet (fresh from JSON, never selected this
// session), seed from the previous tab — but deep-clone so we don't
// share TellTarget with the previous tab. Without the clone, a later
// /tell on the new tab would mutate the pinned tab's TellTarget and
// the Party/Linkshell channel would pop back to the pinned tell-mark.
if (newTab.Channel is not null) if (newTab.Channel is not null)
{
newTab.CurrentChannel.Channel = newTab.Channel.Value; newTab.CurrentChannel.Channel = newTab.Channel.Value;
}
else if (newTab.CurrentChannel.Channel is InputChannel.Invalid) else if (newTab.CurrentChannel.Channel is InputChannel.Invalid)
newTab.CurrentChannel = previousTab.CurrentChannel; {
newTab.CurrentChannel = previousTab.CurrentChannel.Clone();
Plugin.LogProxy.Debug(
$"[Tab] '{newTab.Name}' seeded channel from '{previousTab.Name}' "
+ $"(Channel={newTab.CurrentChannel.Channel}, TellTarget={newTab.CurrentChannel.TellTarget?.ToTargetString() ?? "null"})"
);
}
SetChannel(newTab.CurrentChannel.Channel); SetChannel(newTab.CurrentChannel.Channel);
} }
@@ -466,14 +483,14 @@ public sealed class ChatLogWindow : Window
if (Plugin.Config.HideInBattle && CurrentHideState == HideState.None && Plugin.InBattle) if (Plugin.Config.HideInBattle && CurrentHideState == HideState.None && Plugin.InBattle)
{ {
CurrentHideState = HideState.Battle; CurrentHideState = HideState.Battle;
Plugin.Log.Verbose("HideState: None → Battle"); Plugin.LogProxy.Verbose("HideState: None → Battle");
} }
// If the chat is hidden because of battle, we reset it here // If the chat is hidden because of battle, we reset it here
if (CurrentHideState is HideState.Battle && !Plugin.InBattle) if (CurrentHideState is HideState.Battle && !Plugin.InBattle)
{ {
CurrentHideState = HideState.None; CurrentHideState = HideState.None;
Plugin.Log.Verbose("HideState: Battle → None"); Plugin.LogProxy.Verbose("HideState: Battle → None");
} }
// if the chat has no hide state and in a cutscene, set the hide state to cutscene // if the chat has no hide state and in a cutscene, set the hide state to cutscene
@@ -486,7 +503,7 @@ public sealed class ChatLogWindow : Window
if (Plugin.Functions.Chat.CheckHideFlags()) if (Plugin.Functions.Chat.CheckHideFlags())
{ {
CurrentHideState = HideState.Cutscene; CurrentHideState = HideState.Cutscene;
Plugin.Log.Verbose("HideState: None → Cutscene"); Plugin.LogProxy.Verbose("HideState: None → Cutscene");
} }
} }
@@ -497,7 +514,7 @@ public sealed class ChatLogWindow : Window
&& !Plugin.GposeActive && !Plugin.GposeActive
) )
{ {
Plugin.Log.Verbose($"HideState: {CurrentHideState} → None (cutscene/gpose ended)"); Plugin.LogProxy.Verbose($"HideState: {CurrentHideState} → None (cutscene/gpose ended)");
CurrentHideState = HideState.None; CurrentHideState = HideState.None;
} }
@@ -505,14 +522,14 @@ public sealed class ChatLogWindow : Window
if (CurrentHideState == HideState.Cutscene && Activate) if (CurrentHideState == HideState.Cutscene && Activate)
{ {
CurrentHideState = HideState.CutsceneOverride; CurrentHideState = HideState.CutsceneOverride;
Plugin.Log.Verbose("HideState: Cutscene → CutsceneOverride (user activate)"); Plugin.LogProxy.Verbose("HideState: Cutscene → CutsceneOverride (user activate)");
} }
// if the user hid the chat and is now activating chat, reset the hide state // if the user hid the chat and is now activating chat, reset the hide state
if (CurrentHideState == HideState.User && Activate) if (CurrentHideState == HideState.User && Activate)
{ {
CurrentHideState = HideState.None; CurrentHideState = HideState.None;
Plugin.Log.Verbose("HideState: User → None (activate)"); Plugin.LogProxy.Verbose("HideState: User → None (activate)");
} }
if ( if (
@@ -630,7 +647,7 @@ public sealed class ChatLogWindow : Window
} }
catch (Exception ex) catch (Exception ex)
{ {
Plugin.Log.Error(ex, "Error drawing Chat Log window"); Plugin.LogProxy.Error(ex, "Error drawing Chat Log window");
if (!NotifiedDrawFailure) if (!NotifiedDrawFailure)
{ {
Plugin.Notification.AddNotification( Plugin.Notification.AddNotification(
@@ -1605,7 +1622,7 @@ public sealed class ChatLogWindow : Window
} }
catch (Exception ex) catch (Exception ex)
{ {
Plugin.Log.Warning(ex, "Error drawing chat log"); Plugin.LogProxy.Warning(ex, "Error drawing chat log");
} }
} }
@@ -1637,17 +1654,21 @@ public sealed class ChatLogWindow : Window
continue; continue;
// Active-tab underline pill (2px accent). No native ImGui underline API, // Active-tab underline pill (2px accent). No native ImGui underline API,
// so we use a direct DrawList pass. // so we use a direct DrawList pass. Pill height scales with GlobalScale
// and all coordinates round to physical pixels so the line stays crisp
// on 125/150% DPI setups instead of bleeding into a sub-pixel blur.
{ {
var theme = Plugin.ThemeRegistry.Active; var theme = Plugin.ThemeRegistry.Active;
var min = ImGui.GetItemRectMin(); var min = ImGui.GetItemRectMin();
var max = ImGui.GetItemRectMax(); var max = ImGui.GetItemRectMax();
const float pillHeight = 2f; var pillHeight = MathF.Max(1f, MathF.Round(2f * ImGuiHelpers.GlobalScale));
var yBottom = MathF.Round(max.Y);
var yTop = yBottom - pillHeight;
ImGui ImGui
.GetWindowDrawList() .GetWindowDrawList()
.AddRectFilled( .AddRectFilled(
new Vector2(min.X, max.Y - pillHeight), new Vector2(MathF.Round(min.X), yTop),
new Vector2(max.X, max.Y), new Vector2(MathF.Round(max.X), yBottom),
ColourUtil.RgbaToAbgr(theme.Colors.Accent) ColourUtil.RgbaToAbgr(theme.Colors.Accent)
); );
} }
@@ -1666,6 +1687,30 @@ public sealed class ChatLogWindow : Window
Plugin.WantedTab = null; Plugin.WantedTab = null;
} }
// Sidebar render order: persistent tabs in their original Plugin.Config.Tabs
// position, then pinned TempTabs, then unpinned TempTabs. Returns indices
// into Plugin.Config.Tabs so tabI in the loop body still mirrors the real
// list position (LastTab / WantedTab stay consistent).
private static List<int> BuildSidebarRenderOrder()
{
var tabs = Plugin.Config.Tabs;
var persistent = new List<int>(tabs.Count);
var pinned = new List<int>();
var unpinned = new List<int>();
for (var i = 0; i < tabs.Count; i++)
{
if (TabLifecycleHelpers.IsInPinnedPool(tabs[i]))
pinned.Add(i);
else if (TabLifecycleHelpers.IsInUnpinnedPool(tabs[i]))
unpinned.Add(i);
else
persistent.Add(i);
}
persistent.AddRange(pinned);
persistent.AddRange(unpinned);
return persistent;
}
private void DrawTabSidebar() private void DrawTabSidebar()
{ {
var currentTab = -1; var currentTab = -1;
@@ -1678,7 +1723,8 @@ public sealed class ChatLogWindow : Window
if (!tabTable.Success) if (!tabTable.Success)
return; return;
ImGui.TableSetupColumn("tabs", ImGuiTableColumnFlags.WidthFixed, 44f); var sidebarWidth = Math.Clamp(Plugin.Config.SidebarWidth, 44, 160);
ImGui.TableSetupColumn("tabs", ImGuiTableColumnFlags.WidthFixed, sidebarWidth);
ImGui.TableSetupColumn("chat", ImGuiTableColumnFlags.WidthStretch, 1); ImGui.TableSetupColumn("chat", ImGuiTableColumnFlags.WidthStretch, 1);
ImGui.TableNextColumn(); ImGui.TableNextColumn();
@@ -1697,23 +1743,42 @@ public sealed class ChatLogWindow : Window
ImGui.Dummy(new Vector2(0, ImGui.GetFrameHeightWithSpacing())); ImGui.Dummy(new Vector2(0, ImGui.GetFrameHeightWithSpacing()));
var previousTab = Plugin.CurrentTab; var previousTab = Plugin.CurrentTab;
// Divider rendered once before the first temp tab with a live unit counter. // Render order: persistent → pinned TempTabs → unpinned TempTabs.
// Underlying Plugin.Config.Tabs order is untouched (tabI mirrors
// the real list index), only the display sequence groups by
// section so each section can carry its own divider header.
var renderOrder = BuildSidebarRenderOrder();
var pinnedHeaderRendered = false;
var tempTabHeaderRendered = false; var tempTabHeaderRendered = false;
var tempTabCount = Plugin.Config.Tabs.Count(t => t.IsTempTab); var pinnedCount = Plugin.Config.Tabs.Count(TabLifecycleHelpers.IsInPinnedPool);
var unpinnedTempCount = Plugin.Config.Tabs.Count(
TabLifecycleHelpers.IsInUnpinnedPool
);
for (var tabI = 0; tabI < Plugin.Config.Tabs.Count; tabI++) foreach (var tabI in renderOrder)
{ {
var tab = Plugin.Config.Tabs[tabI]; var tab = Plugin.Config.Tabs[tabI];
if (tab.PopOut) if (tab.PopOut)
continue; continue;
if (tab.IsTempTab && !tempTabHeaderRendered) if (TabLifecycleHelpers.IsInPinnedPool(tab) && !pinnedHeaderRendered)
{ {
ImGui.Separator(); ImGui.Separator();
if (!Plugin.Config.AutoTellTabsCompactDisplay) if (!Plugin.Config.AutoTellTabsCompactDisplay)
{ {
ImGui.TextDisabled( ImGui.TextDisabled(
$"{HellionStrings.AutoTellTabs_SectionHeader} ({tempTabCount})" $"{HellionStrings.PinTab_SectionHeader} ({pinnedCount})"
);
}
pinnedHeaderRendered = true;
}
else if (TabLifecycleHelpers.IsInUnpinnedPool(tab) && !tempTabHeaderRendered)
{
ImGui.Separator();
if (!Plugin.Config.AutoTellTabsCompactDisplay)
{
ImGui.TextDisabled(
$"{HellionStrings.AutoTellTabs_SectionHeader} ({unpinnedTempCount})"
); );
} }
tempTabHeaderRendered = true; tempTabHeaderRendered = true;
@@ -1802,9 +1867,12 @@ public sealed class ChatLogWindow : Window
using (ImRaii.PushColor(ImGuiCol.Text, ColourUtil.RgbaToAbgr(iconColor))) using (ImRaii.PushColor(ImGuiCol.Text, ColourUtil.RgbaToAbgr(iconColor)))
using (Plugin.FontManager.FontAwesome.Push()) using (Plugin.FontManager.FontAwesome.Push())
{ {
// Button stretches with the configured sidebar width so a
// user-widened sidebar feels intentional, not a 36px icon
// floating in empty space.
clicked = ImGui.Button( clicked = ImGui.Button(
$"{icon.ToIconString()}##sidebar-tab-{tabI}", $"{icon.ToIconString()}##sidebar-tab-{tabI}",
new Vector2(36f, ImGui.GetFrameHeight()) new Vector2(sidebarWidth - 8f, ImGui.GetFrameHeight())
); );
} }
@@ -1864,11 +1932,35 @@ public sealed class ChatLogWindow : Window
); );
} }
// Pin indicator: subtle thumbtack glyph top-left of the icon.
// Muted colour because the "Pinned" section header already
// groups these tabs visually — this is just a per-tab
// confirmation glyph, not the primary discoverability cue.
if (tab.IsPinned)
{
var min = ImGui.GetItemRectMin();
const float pinPadding = 1f;
var pinPos = new Vector2(min.X + pinPadding, min.Y + pinPadding);
var pinColor = theme.Colors.TextMuted;
// Dim further so the glyph reads as a hint, not a badge.
var pinAbgr = ColourUtil.RgbaToAbgr(pinColor) & 0x77FFFFFFu;
using (Plugin.FontManager.FontAwesome.Push())
{
ImGui
.GetWindowDrawList()
.AddText(pinPos, pinAbgr, FontAwesomeIcon.Thumbtack.ToIconString());
}
}
// Tooltip mit Tab-Name + Unread-Counter beim Hover. // Tooltip mit Tab-Name + Unread-Counter beim Hover.
if (ImGui.IsItemHovered()) if (ImGui.IsItemHovered())
{ {
using var tt = ImRaii.Tooltip(); using var tt = ImRaii.Tooltip();
ImGui.TextUnformatted($"{tab.Name}{unread}"); ImGui.TextUnformatted($"{tab.Name}{unread}");
if (tab.IsPinned)
{
ImGui.TextUnformatted(HellionStrings.PinTab_PinnedTooltip);
}
} }
DrawTabContextMenu(tab, tabI); DrawTabContextMenu(tab, tabI);
@@ -1992,10 +2084,7 @@ public sealed class ChatLogWindow : Window
ImGui.TextUnformatted(FontAwesomeIcon.Crown.ToIconString()); ImGui.TextUnformatted(FontAwesomeIcon.Crown.ToIconString());
} }
ImGui.SameLine(0f, gapAfterCrown); ImGui.SameLine(0f, gapAfterCrown);
using (ImRaii.PushColor(ImGuiCol.Text, titleColor)) DrawHonorificTitleText(rendered, titleColor, title.Glow);
{
ImGui.TextUnformatted(rendered);
}
ImGui.EndGroup(); ImGui.EndGroup();
if (ImGui.IsItemHovered()) if (ImGui.IsItemHovered())
@@ -2006,6 +2095,35 @@ public sealed class ChatLogWindow : Window
ImGui.SameLine(); ImGui.SameLine();
} }
// Renders the title text, optionally with a glow outline pre-pass. Glow is
// drawn at 8 cardinal offsets (±1 px) in the glow colour at reduced alpha,
// then the primary text on top. The pre-pass uses the window draw list so
// it composites correctly with the regular ImGui text that follows.
private void DrawHonorificTitleText(string rendered, Vector4 titleColor, Vector3? glow)
{
if (Plugin.Config.ShowHonorificGlow && glow is { } g)
{
var pos = ImGui.GetCursorScreenPos();
var glowColor = new Vector4(g.X, g.Y, g.Z, 0.4f);
var glowAbgr = ImGui.ColorConvertFloat4ToU32(glowColor);
var drawList = ImGui.GetWindowDrawList();
for (var dy = -1; dy <= 1; dy++)
{
for (var dx = -1; dx <= 1; dx++)
{
if (dx == 0 && dy == 0)
continue;
drawList.AddText(new Vector2(pos.X + dx, pos.Y + dy), glowAbgr, rendered);
}
}
}
using (ImRaii.PushColor(ImGuiCol.Text, titleColor))
{
ImGui.TextUnformatted(rendered);
}
}
// One-time hint banner for the pop-out header button and right-click pathway. // One-time hint banner for the pop-out header button and right-click pathway.
private float DrawV061HintBannerIfNeeded() private float DrawV061HintBannerIfNeeded()
{ {
@@ -2052,7 +2170,7 @@ public sealed class ChatLogWindow : Window
{ {
Plugin.Config.SeenPopOutHeaderHint = true; Plugin.Config.SeenPopOutHeaderHint = true;
Plugin.SaveConfig(); Plugin.SaveConfig();
Plugin.Log.Debug("v0.6.1 pop-out header hint dismissed"); Plugin.LogProxy.Debug("v0.6.1 pop-out header hint dismissed");
if (openSettings) if (openSettings)
Plugin.SettingsWindow.Toggle(); Plugin.SettingsWindow.Toggle();
} }
@@ -2117,10 +2235,52 @@ public sealed class ChatLogWindow : Window
anyChanged = true; anyChanged = true;
} }
if (tab.IsTempTab)
{
ImGui.Separator();
DrawPinControls(tab);
}
if (anyChanged) if (anyChanged)
Plugin.SaveConfig(); Plugin.SaveConfig();
} }
private void DrawPinControls(Tab tab)
{
var svc = Plugin.AutoTellTabsService;
if (svc == null)
return;
if (tab.IsPinned)
{
if (ImGui.MenuItem(HellionStrings.PinTab_MenuUnpin))
{
svc.Unpin(tab);
ImGui.CloseCurrentPopup();
}
}
else
{
var atCap = svc.PinnedTempTabCount >= AutoTellTabsService.MaxPinnedTempTabs;
if (ImGui.MenuItem(HellionStrings.PinTab_MenuPin, enabled: !atCap))
{
if (svc.TryPin(tab))
ImGui.CloseCurrentPopup();
}
if (ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenDisabled))
{
ImGui.SetTooltip(
atCap
? string.Format(
HellionStrings.PinTab_LimitReached,
AutoTellTabsService.MaxPinnedTempTabs
)
: HellionStrings.PinTab_PinTooltip
);
}
}
}
internal readonly List<bool> PopOutDocked = []; internal readonly List<bool> PopOutDocked = [];
internal readonly HashSet<Guid> PopOutWindows = []; internal readonly HashSet<Guid> PopOutWindows = [];
@@ -2665,7 +2825,7 @@ public sealed class ChatLogWindow : Window
var viewport = ImGui.GetMainViewport(); var viewport = ImGui.GetMainViewport();
var safePos = viewport.WorkPos + SafeDefaultOffset; var safePos = viewport.WorkPos + SafeDefaultOffset;
Position = safePos; Position = safePos;
Plugin.Log.Info( Plugin.LogProxy.Info(
$"[Window-Recovery] {source}: snapping main window from {LastWindowPos} (size {LastWindowSize}) to {safePos}." $"[Window-Recovery] {source}: snapping main window from {LastWindowPos} (size {LastWindowSize}) to {safePos}."
); );
+74 -3
View File
@@ -2,6 +2,7 @@
using System.Globalization; using System.Globalization;
using System.Numerics; using System.Numerics;
using System.Text; using System.Text;
using System.Threading;
using Dalamud.Bindings.ImGui; using Dalamud.Bindings.ImGui;
using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Interface; using Dalamud.Interface;
@@ -33,11 +34,21 @@ public class DbViewer : Window
private int CurrentPage = 1; private int CurrentPage = 1;
private string SimpleSearchTerm = ""; private string SimpleSearchTerm = "";
// v1.4.8 H2: opt-in full-text search across the whole DB via FTS5.
// Transient UI state (per-session), not persisted -- users opt in fresh
// every time so they always see the page-filter as the default mode.
private bool UseFullTextSearch;
private bool OnlyCurrentCharacter = true; private bool OnlyCurrentCharacter = true;
private readonly Dictionary<ChatType, (ChatSource, ChatSource)> SelectedChannels; private readonly Dictionary<ChatType, (ChatSource, ChatSource)> SelectedChannels;
private bool IsProcessing; private bool IsProcessing;
private long ProcessingStart = Environment.TickCount64; private long ProcessingStart = Environment.TickCount64;
// Bumped per trigger so a late worker drops itself instead of overwriting
// a newer result.
private long _ftsFilterSeq;
private (DateTime Min, DateTime Max, int Page, bool Local, int ChannelCount) LastProcessed; private (DateTime Min, DateTime Max, int Page, bool Local, int ChannelCount) LastProcessed;
private string MinDateString = ""; private string MinDateString = "";
@@ -233,6 +244,24 @@ public class DbViewer : Window
tooltipRight: Language.Page_ArrowRight_Tooltip tooltipRight: Language.Page_ArrowRight_Tooltip
); );
// Full-text search toggle (v1.4.8 H2). IsFtsIndexBuilt is a cached
// volatile bool in MessageStore -- single field read per frame, no
// SELECT count(*). ImRaii.Disabled blocks any click while the index
// is still being built, so no defensive force-off branch needed
// inside the if-body. UseFullTextSearch is transient UI state, so we
// do not call SaveConfig here.
var ftsReady = Plugin.MessageManager.Store.IsFtsIndexBuilt;
using (ImRaii.Disabled(!ftsReady))
{
if (ImGui.Checkbox(HellionStrings.DbViewer_FullTextToggle, ref UseFullTextSearch))
TriggerFilterRefresh();
}
ImGuiUtil.HelpMarker(
ftsReady
? HellionStrings.DbViewer_FullTextToggle_Hint_PhraseMode
: HellionStrings.DbViewer_FullTextToggle_Hint_Indexing
);
ImGui.SameLine(ImGui.GetContentRegionMax().X - width); ImGui.SameLine(ImGui.GetContentRegionMax().X - width);
ImGui.SetNextItemWidth(width); ImGui.SetNextItemWidth(width);
if ( if (
@@ -243,7 +272,7 @@ public class DbViewer : Window
30 30
) )
) )
Filtered = Filter(Messages); TriggerFilterRefresh();
// Third row // Third row
@@ -307,7 +336,7 @@ public class DbViewer : Window
} }
catch (Exception ex) catch (Exception ex)
{ {
Plugin.Log.Error(ex, "Failed reading messages from database"); Plugin.LogProxy.Error(ex, "Failed reading messages from database");
} }
finally finally
{ {
@@ -447,11 +476,53 @@ public class DbViewer : Window
} }
} }
// FTS path hits SQLite per keystroke -- dispatch to a worker, drop stale
// results via _ftsFilterSeq. Page-filter path is in-memory LINQ, stays
// inline.
private void TriggerFilterRefresh()
{
if (!UseFullTextSearch || !Plugin.MessageManager.Store.IsFtsIndexBuilt)
{
Filtered = Filter(Messages);
return;
}
var snapshot = Messages;
var mySeq = Interlocked.Increment(ref _ftsFilterSeq);
Task.Run(() =>
{
try
{
var result = Filter(snapshot);
if (Interlocked.Read(ref _ftsFilterSeq) == mySeq)
Filtered = result;
}
catch (Exception ex)
{
Plugin.LogProxy.Error(ex, "FTS filter worker failed");
}
});
}
private ConcurrentStack<Message> Filter(Message[] messages) private ConcurrentStack<Message> Filter(Message[] messages)
{ {
if (SimpleSearchTerm == "") if (SimpleSearchTerm == "")
return new ConcurrentStack<Message>(messages.Reverse().OrderByDescending(m => m.Date)); return new ConcurrentStack<Message>(messages.Reverse().OrderByDescending(m => m.Date));
// Full-text mode bypasses the page-bounded messages array and queries
// the FTS5 index across the whole DB. IsFtsIndexBuilt re-check guards
// against the (rare) case of the toggle being on while the index is
// mid-rebuild -- ImRaii.Disabled prevents the user from flipping it,
// but a Dispose-and-reopen during indexing could leave UseFullTextSearch
// true while ftsReady flipped back to false; the local fallback below
// still serves the page.
if (UseFullTextSearch && Plugin.MessageManager.Store.IsFtsIndexBuilt)
{
var guidHits = Plugin.MessageManager.Store.FullTextSearch(SimpleSearchTerm);
var resolved = Plugin.MessageManager.Store.LoadByGuids(guidHits);
return new ConcurrentStack<Message>(resolved.OrderByDescending(m => m.Date));
}
return new ConcurrentStack<Message>( return new ConcurrentStack<Message>(
messages messages
.Reverse() .Reverse()
@@ -570,7 +641,7 @@ public class DbViewer : Window
} }
catch (Exception ex) catch (Exception ex)
{ {
Plugin.Log.Error(ex, "Failed creating txt backup"); Plugin.LogProxy.Error(ex, "Failed creating txt backup");
Notification.Content = "Error ..."; Notification.Content = "Error ...";
Notification.Type = NotificationType.Error; Notification.Type = NotificationType.Error;
+4 -7
View File
@@ -43,13 +43,10 @@ internal static class HellionStyle
var alphaByte = (uint)Math.Clamp((int)(windowOpacity * 255f), 0x55, 0xFF); var alphaByte = (uint)Math.Clamp((int)(windowOpacity * 255f), 0x55, 0xFF);
var windowBgWithAlpha = (c.WindowBg & 0xFFFFFF00u) | alphaByte; var windowBgWithAlpha = (c.WindowBg & 0xFFFFFF00u) | alphaByte;
// ChildBg alpha: child areas rendered inside ChatLogWindow would // ChildBg alpha resolution lives in HellionStyleHelpers so the
// multiply their alpha with WindowBg, making 50% opacity appear // threshold logic can be covered by a pure-helper test in the
// ~75% solid. At full opacity the theme's alpha is preserved; below // build suite.
// it ChildBg goes fully transparent so only WindowBg sets the final var childBgWithAlpha = HellionStyleHelpers.ResolveChildBgAlpha(c.ChildBg, windowOpacity);
// coverage.
var childBgAlpha = windowOpacity >= 0.999f ? (c.ChildBg & 0xFFu) : 0u;
var childBgWithAlpha = (c.ChildBg & 0xFFFFFF00u) | childBgAlpha;
// Layout // Layout
stack.PushStyleVar(ImGuiStyleVar.WindowRounding, l.WindowRounding); stack.PushStyleVar(ImGuiStyleVar.WindowRounding, l.WindowRounding);
+17
View File
@@ -0,0 +1,17 @@
namespace HellionChat.Ui;
internal static class HellionStyleHelpers
{
// Child surfaces are drawn over WindowBg, so at partial window opacity
// the theme's own ChildBg alpha would double-multiply and read too solid.
// Above ~full opacity we preserve the theme alpha; below it we wipe to 0
// so WindowBg alone carries the coverage. The 0.999f threshold is a
// float-imprecision guard around the user-facing 100% slider value.
// TEST-MIRROR: ../../Hellion Build test/_Helpers/HellionStyleHelpersTests.cs
public static uint ResolveChildBgAlpha(uint themeChildBgRgba, float windowOpacity)
{
var alphaPreserved = windowOpacity >= 0.999f;
var childBgAlpha = alphaPreserved ? (themeChildBgRgba & 0xFFu) : 0u;
return (themeChildBgRgba & 0xFFFFFF00u) | childBgAlpha;
}
}
+7 -7
View File
@@ -175,7 +175,7 @@ internal class Popout : Window
{ {
Plugin.Config.SeenPopOutInputHint = true; Plugin.Config.SeenPopOutInputHint = true;
ChatLogWindow.Plugin.SaveConfig(); ChatLogWindow.Plugin.SaveConfig();
Plugin.Log.Debug("Pop-Out input hint dismissed"); Plugin.LogProxy.Debug("Pop-Out input hint dismissed");
if (openSettings) if (openSettings)
ChatLogWindow.Plugin.SettingsWindow.Toggle(); ChatLogWindow.Plugin.SettingsWindow.Toggle();
} }
@@ -214,13 +214,13 @@ internal class Popout : Window
if (Tab.HideInBattle && CurrentHideState == HideState.None && Plugin.InBattle) if (Tab.HideInBattle && CurrentHideState == HideState.None && Plugin.InBattle)
{ {
CurrentHideState = HideState.Battle; CurrentHideState = HideState.Battle;
Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: None -> Battle"); Plugin.LogProxy.Verbose($"Popout HideState [{Tab.Name}]: None -> Battle");
} }
if (CurrentHideState is HideState.Battle && !Plugin.InBattle) if (CurrentHideState is HideState.Battle && !Plugin.InBattle)
{ {
CurrentHideState = HideState.None; CurrentHideState = HideState.None;
Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: Battle -> None"); Plugin.LogProxy.Verbose($"Popout HideState [{Tab.Name}]: Battle -> None");
} }
if ( if (
@@ -232,7 +232,7 @@ internal class Popout : Window
if (ChatLogWindow.Plugin.Functions.Chat.CheckHideFlags()) if (ChatLogWindow.Plugin.Functions.Chat.CheckHideFlags())
{ {
CurrentHideState = HideState.Cutscene; CurrentHideState = HideState.Cutscene;
Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: None -> Cutscene"); Plugin.LogProxy.Verbose($"Popout HideState [{Tab.Name}]: None -> Cutscene");
} }
} }
@@ -242,7 +242,7 @@ internal class Popout : Window
&& !Plugin.GposeActive && !Plugin.GposeActive
) )
{ {
Plugin.Log.Verbose( Plugin.LogProxy.Verbose(
$"Popout HideState [{Tab.Name}]: {CurrentHideState} -> None (cutscene/gpose ended)" $"Popout HideState [{Tab.Name}]: {CurrentHideState} -> None (cutscene/gpose ended)"
); );
CurrentHideState = HideState.None; CurrentHideState = HideState.None;
@@ -251,7 +251,7 @@ internal class Popout : Window
if (CurrentHideState == HideState.Cutscene && ChatLogWindow.Activate) if (CurrentHideState == HideState.Cutscene && ChatLogWindow.Activate)
{ {
CurrentHideState = HideState.CutsceneOverride; CurrentHideState = HideState.CutsceneOverride;
Plugin.Log.Verbose( Plugin.LogProxy.Verbose(
$"Popout HideState [{Tab.Name}]: Cutscene -> CutsceneOverride (user activate)" $"Popout HideState [{Tab.Name}]: Cutscene -> CutsceneOverride (user activate)"
); );
} }
@@ -259,7 +259,7 @@ internal class Popout : Window
if (CurrentHideState == HideState.User && ChatLogWindow.Activate) if (CurrentHideState == HideState.User && ChatLogWindow.Activate)
{ {
CurrentHideState = HideState.None; CurrentHideState = HideState.None;
Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: User -> None (activate)"); Plugin.LogProxy.Verbose($"Popout HideState [{Tab.Name}]: User -> None (activate)");
} }
return CurrentHideState is HideState.Cutscene or HideState.User or HideState.Battle return CurrentHideState is HideState.Cutscene or HideState.User or HideState.Battle
+2 -2
View File
@@ -199,12 +199,12 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
); );
if (ImGui.Button(buttonLabel2)) if (ImGui.Button(buttonLabel2))
Dalamud.Utility.Util.OpenLink("https://ko-fi.com/infiii"); Plugin.PlatformUtil.OpenLink("https://ko-fi.com/infiii");
ImGui.SameLine(); ImGui.SameLine();
if (ImGui.Button(buttonLabel)) if (ImGui.Button(buttonLabel))
Dalamud.Utility.Util.OpenLink("https://ko-fi.com/lojewalo"); Plugin.PlatformUtil.OpenLink("https://ko-fi.com/lojewalo");
} }
if (!save) if (!save)
+9 -7
View File
@@ -79,11 +79,13 @@ internal sealed class SettingsOverview
// 110f accommodates two-line subtexts; wrap width is matched in DrawCard. // 110f accommodates two-line subtexts; wrap width is matched in DrawCard.
var cardHeight = 110f; var cardHeight = 110f;
// One draw-list lookup per frame instead of one per card.
var drawList = ImGui.GetWindowDrawList();
var cardDefs = BuildCardDefs(); var cardDefs = BuildCardDefs();
for (var i = 0; i < cardDefs.Length; i++) for (var i = 0; i < cardDefs.Length; i++)
{ {
var (icon, title, subtext) = cardDefs[i]; var (icon, title, subtext) = cardDefs[i];
DrawCard(i, icon, title, subtext, cardWidth, cardHeight); DrawCard(i, icon, title, subtext, cardWidth, cardHeight, drawList);
if ((i + 1) % columns != 0 && i != cardDefs.Length - 1) if ((i + 1) % columns != 0 && i != cardDefs.Length - 1)
ImGui.SameLine(); ImGui.SameLine();
@@ -96,7 +98,8 @@ internal sealed class SettingsOverview
string title, string title,
string subtext, string subtext,
float w, float w,
float h float h,
ImDrawListPtr drawList
) )
{ {
// BeginGroup makes the card a single layout item so SameLine works // BeginGroup makes the card a single layout item so SameLine works
@@ -108,8 +111,7 @@ internal sealed class SettingsOverview
var hovered = ImGui.IsItemHovered(); var hovered = ImGui.IsItemHovered();
var bgColor = hovered ? 0xFF22303Fu : 0xFF1A2538u; var bgColor = hovered ? 0xFF22303Fu : 0xFF1A2538u;
var draw = ImGui.GetWindowDrawList(); drawList.AddRectFilled(cursorBefore, cursorBefore + new Vector2(w, h), bgColor, 4f);
draw.AddRectFilled(cursorBefore, cursorBefore + new Vector2(w, h), bgColor, 4f);
var iconPos = cursorBefore + new Vector2(16f, 12f); var iconPos = cursorBefore + new Vector2(16f, 12f);
var titlePos = cursorBefore + new Vector2(16f, 40f); var titlePos = cursorBefore + new Vector2(16f, 40f);
@@ -120,15 +122,15 @@ internal sealed class SettingsOverview
using (_window.Plugin.FontManager.FontAwesome.Push()) using (_window.Plugin.FontManager.FontAwesome.Push())
{ {
draw.AddText(iconPos, titleColor, icon.ToIconString()); drawList.AddText(iconPos, titleColor, icon.ToIconString());
} }
draw.AddText(titlePos, titleColor, title); drawList.AddText(titlePos, titleColor, title);
// Subtext wraps at card inner width (16px padding each side) via DrawList // Subtext wraps at card inner width (16px padding each side) via DrawList
// to avoid expanding the group bounds and breaking SameLine in the card row. // to avoid expanding the group bounds and breaking SameLine in the card row.
var subtextWrapWidth = w - 32f; var subtextWrapWidth = w - 32f;
draw.AddText( drawList.AddText(
ImGui.GetFont(), ImGui.GetFont(),
ImGui.GetFontSize(), ImGui.GetFontSize(),
subtextPos, subtextPos,
+19 -15
View File
@@ -229,7 +229,7 @@ internal sealed class DataManagement : ISettingsTab
} }
catch (Exception e) catch (Exception e)
{ {
Plugin.Log.Error(e, "Unable to delete old database"); Plugin.LogProxy.Error(e, "Unable to delete old database");
WrapperUtil.AddNotification( WrapperUtil.AddNotification(
Language.Options_Database_Old_Delete_Error, Language.Options_Database_Old_Delete_Error,
NotificationType.Error NotificationType.Error
@@ -391,7 +391,9 @@ internal sealed class DataManagement : ISettingsTab
Plugin.Config.RetentionLastRunAt = DateTimeOffset.UtcNow; Plugin.Config.RetentionLastRunAt = DateTimeOffset.UtcNow;
Plugin.SaveConfig(); Plugin.SaveConfig();
Plugin.Log.Information($"Manual retention run deleted {deleted} expired messages."); Plugin.LogProxy.Information(
$"Manual retention run deleted {deleted} expired messages."
);
if (deleted > 0) if (deleted > 0)
{ {
@@ -405,7 +407,7 @@ internal sealed class DataManagement : ISettingsTab
.Wait(TimeSpan.FromSeconds(5)) .Wait(TimeSpan.FromSeconds(5))
) )
{ {
Plugin.Log.Warning( Plugin.LogProxy.Warning(
"Retention sweep: framework refresh timed out after 5s." "Retention sweep: framework refresh timed out after 5s."
); );
} }
@@ -418,7 +420,7 @@ internal sealed class DataManagement : ISettingsTab
} }
catch (Exception e) catch (Exception e)
{ {
Plugin.Log.Error(e, "Manual retention run failed"); Plugin.LogProxy.Error(e, "Manual retention run failed");
WrapperUtil.AddNotification(HellionStrings.Retention_Error, NotificationType.Error); WrapperUtil.AddNotification(HellionStrings.Retention_Error, NotificationType.Error);
} }
finally finally
@@ -566,7 +568,7 @@ internal sealed class DataManagement : ISettingsTab
} }
catch (Exception e) catch (Exception e)
{ {
Plugin.Log.Error(e, "Failed to compute cleanup preview"); Plugin.LogProxy.Error(e, "Failed to compute cleanup preview");
WrapperUtil.AddNotification( WrapperUtil.AddNotification(
HellionStrings.Cleanup_PreviewError, HellionStrings.Cleanup_PreviewError,
NotificationType.Error NotificationType.Error
@@ -587,7 +589,7 @@ internal sealed class DataManagement : ISettingsTab
try try
{ {
var deleted = Plugin.MessageManager.Store.CleanupRetainOnly(allowed); var deleted = Plugin.MessageManager.Store.CleanupRetainOnly(allowed);
Plugin.Log.Information($"Privacy cleanup: deleted {deleted} messages"); Plugin.LogProxy.Information($"Privacy cleanup: deleted {deleted} messages");
if ( if (
!Plugin !Plugin
@@ -599,7 +601,9 @@ internal sealed class DataManagement : ISettingsTab
.Wait(TimeSpan.FromSeconds(5)) .Wait(TimeSpan.FromSeconds(5))
) )
{ {
Plugin.Log.Warning("Privacy cleanup: framework refresh timed out after 5s."); Plugin.LogProxy.Warning(
"Privacy cleanup: framework refresh timed out after 5s."
);
} }
WrapperUtil.AddNotification( WrapperUtil.AddNotification(
@@ -609,7 +613,7 @@ internal sealed class DataManagement : ISettingsTab
} }
catch (Exception e) catch (Exception e)
{ {
Plugin.Log.Error(e, "Privacy cleanup failed"); Plugin.LogProxy.Error(e, "Privacy cleanup failed");
WrapperUtil.AddNotification(HellionStrings.Cleanup_Error, NotificationType.Error); WrapperUtil.AddNotification(HellionStrings.Cleanup_Error, NotificationType.Error);
} }
finally finally
@@ -769,7 +773,7 @@ internal sealed class DataManagement : ISettingsTab
} }
catch (Exception e) catch (Exception e)
{ {
Plugin.Log.Error(e, "Export failed"); Plugin.LogProxy.Error(e, "Export failed");
WrapperUtil.AddNotification(HellionStrings.Export_Error, NotificationType.Error); WrapperUtil.AddNotification(HellionStrings.Export_Error, NotificationType.Error);
} }
finally finally
@@ -849,7 +853,7 @@ internal sealed class DataManagement : ISettingsTab
) )
) )
{ {
Plugin.Log.Warning("Clearing messages from database"); Plugin.LogProxy.Warning("Clearing messages from database");
Plugin.MessageManager.Store.ClearMessages(); Plugin.MessageManager.Store.ClearMessages();
Plugin.MessageManager.ClearAllTabs(); Plugin.MessageManager.ClearAllTabs();
@@ -907,7 +911,7 @@ internal sealed class DataManagement : ISettingsTab
private void InsertMessages(int count) private void InsertMessages(int count)
{ {
Plugin.Log.Info($"Inserting {count} messages due to user request"); Plugin.LogProxy.Info($"Inserting {count} messages due to user request");
var stopwatch = Stopwatch.StartNew(); var stopwatch = Stopwatch.StartNew();
var playerName = Plugin.PlayerState.CharacterName; var playerName = Plugin.PlayerState.CharacterName;
@@ -952,7 +956,7 @@ internal sealed class DataManagement : ISettingsTab
var elapsedTicks = stopwatch.ElapsedTicks; var elapsedTicks = stopwatch.ElapsedTicks;
stopwatch.Stop(); stopwatch.Stop();
Plugin.Log.Info( Plugin.LogProxy.Info(
$"Crafted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)" $"Crafted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"
); );
@@ -962,7 +966,7 @@ internal sealed class DataManagement : ISettingsTab
elapsedTicks = stopwatch.ElapsedTicks; elapsedTicks = stopwatch.ElapsedTicks;
stopwatch.Stop(); stopwatch.Stop();
Plugin.Log.Info( Plugin.LogProxy.Info(
$"Upserted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)" $"Upserted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"
); );
@@ -973,7 +977,7 @@ internal sealed class DataManagement : ISettingsTab
Plugin.MessageManager.ClearAllTabs(); Plugin.MessageManager.ClearAllTabs();
elapsedTicks = stopwatch.ElapsedTicks; elapsedTicks = stopwatch.ElapsedTicks;
stopwatch.Stop(); stopwatch.Stop();
Plugin.Log.Info( Plugin.LogProxy.Info(
$"Cleared {Plugin.Config.Tabs.Count} tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)" $"Cleared {Plugin.Config.Tabs.Count} tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"
); );
}) })
@@ -986,7 +990,7 @@ internal sealed class DataManagement : ISettingsTab
Plugin.MessageManager.FilterAllTabs(); Plugin.MessageManager.FilterAllTabs();
elapsedTicks = stopwatch.ElapsedTicks; elapsedTicks = stopwatch.ElapsedTicks;
stopwatch.Stop(); stopwatch.Stop();
Plugin.Log.Info( Plugin.LogProxy.Info(
$"Fetched and filtered all tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)" $"Fetched and filtered all tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"
); );
}) })
@@ -312,6 +312,6 @@ internal sealed class FontsAndColours : ISettingsTab
} }
Plugin.SaveConfig(); Plugin.SaveConfig();
GlobalParametersCache.Refresh(); GlobalParametersCache.Refresh();
Plugin.Log.Debug($"Applied chat colour preset: {preset.DisplayName}"); Plugin.LogProxy.Debug($"Applied chat colour preset: {preset.DisplayName}");
} }
} }
+3 -3
View File
@@ -97,7 +97,7 @@ internal sealed class Information : ISettingsTab
ImGui.TextUnformatted(Language.Options_About_Github_Issues); ImGui.TextUnformatted(Language.Options_About_Github_Issues);
ImGui.SameLine(); ImGui.SameLine();
if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "githubIssues")) if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "githubIssues"))
Dalamud.Utility.Util.OpenLink( Plugin.PlatformUtil.OpenLink(
"https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/issues" "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/issues"
); );
} }
@@ -116,7 +116,7 @@ internal sealed class Information : ISettingsTab
ImGui.TextUnformatted(HellionStrings.About_Maintainer_Website_Label); ImGui.TextUnformatted(HellionStrings.About_Maintainer_Website_Label);
ImGui.SameLine(); ImGui.SameLine();
if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "hellionMedia")) if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "hellionMedia"))
Dalamud.Utility.Util.OpenLink("https://hellion-media.de"); Plugin.PlatformUtil.OpenLink("https://hellion-media.de");
ImGuiHelpers.ScaledDummy(10.0f); ImGuiHelpers.ScaledDummy(10.0f);
@@ -137,7 +137,7 @@ internal sealed class Information : ISettingsTab
ImGui.TextUnformatted(HellionStrings.About_BuiltOn_Upstream_Label); ImGui.TextUnformatted(HellionStrings.About_BuiltOn_Upstream_Label);
ImGui.SameLine(); ImGui.SameLine();
if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "chatTwoUpstream")) if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "chatTwoUpstream"))
Dalamud.Utility.Util.OpenLink("https://github.com/Infiziert90/ChatTwo"); Plugin.PlatformUtil.OpenLink("https://github.com/Infiziert90/ChatTwo");
ImGuiHelpers.ScaledDummy(10.0f); ImGuiHelpers.ScaledDummy(10.0f);
+14 -3
View File
@@ -71,6 +71,17 @@ internal sealed class Integrations : ISettingsTab
{ {
ImGui.TextWrapped(HellionStrings.Settings_Integrations_Honorific_ToggleHint); ImGui.TextWrapped(HellionStrings.Settings_Integrations_Honorific_ToggleHint);
} }
if (
ImGui.Checkbox(
HellionStrings.Settings_Integrations_Honorific_Glow_Toggle,
ref Mutable.ShowHonorificGlow
)
)
{
Plugin.SaveConfig();
}
ImGuiUtil.HelpMarker(HellionStrings.Settings_Integrations_Honorific_Glow_Hint);
} }
// Honorific has no LICENSE in its repo so we link upstream and author // Honorific has no LICENSE in its repo so we link upstream and author
@@ -79,12 +90,12 @@ internal sealed class Integrations : ISettingsTab
ImGui.Spacing(); ImGui.Spacing();
if (ImGui.Button(HellionStrings.Settings_Integrations_Honorific_LinkRepo)) if (ImGui.Button(HellionStrings.Settings_Integrations_Honorific_LinkRepo))
{ {
Dalamud.Utility.Util.OpenLink(IntegrationLinks.HonorificRepo); Plugin.PlatformUtil.OpenLink(IntegrationLinks.HonorificRepo);
} }
ImGui.SameLine(); ImGui.SameLine();
if (ImGui.Button(HellionStrings.Settings_Integrations_Honorific_LinkAuthor)) if (ImGui.Button(HellionStrings.Settings_Integrations_Honorific_LinkAuthor))
{ {
Dalamud.Utility.Util.OpenLink(IntegrationLinks.HonorificAuthor); Plugin.PlatformUtil.OpenLink(IntegrationLinks.HonorificAuthor);
} }
} }
@@ -193,7 +204,7 @@ internal sealed class Integrations : ISettingsTab
if (ImGui.Button(HellionStrings.Settings_Integrations_GotAnIdea_LinkLabel)) if (ImGui.Button(HellionStrings.Settings_Integrations_GotAnIdea_LinkLabel))
{ {
Dalamud.Utility.Util.OpenLink(BrandingLinks.HellionForgeDiscordInvite); Plugin.PlatformUtil.OpenLink(BrandingLinks.HellionForgeDiscordInvite);
} }
} }
+22 -2
View File
@@ -78,7 +78,7 @@ internal sealed class ThemeAndLayout : ISettingsTab
{ {
var dir = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "themes"); var dir = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "themes");
Directory.CreateDirectory(dir); Directory.CreateDirectory(dir);
Dalamud.Utility.Util.OpenLink(dir); Plugin.PlatformUtil.OpenLink(dir);
} }
ImGui.SameLine(); ImGui.SameLine();
@@ -90,7 +90,7 @@ internal sealed class ThemeAndLayout : ISettingsTab
var path = Path.Combine(dir, fileName); var path = Path.Combine(dir, fileName);
var json = ThemeJsonWriter.Serialize(active); var json = ThemeJsonWriter.Serialize(active);
File.WriteAllText(path, json); File.WriteAllText(path, json);
Plugin.Log.Information($"Exported active theme '{active.Slug}' to {path}"); Plugin.LogProxy.Information($"Exported active theme '{active.Slug}' to {path}");
} }
} }
} }
@@ -250,6 +250,26 @@ internal sealed class ThemeAndLayout : ISettingsTab
string.Format(Language.Options_SidebarTabView_Description, Plugin.PluginName) string.Format(Language.Options_SidebarTabView_Description, Plugin.PluginName)
); );
if (Mutable.SidebarTabView)
{
var sidebarWidth = Mutable.SidebarWidth;
if (
ImGui.SliderInt(
HellionStrings.Settings_ThemeAndLayout_SidebarWidth_Name,
ref sidebarWidth,
44,
160,
$"{sidebarWidth} px"
)
)
{
Mutable.SidebarWidth = sidebarWidth;
}
ImGuiUtil.HelpMarker(
HellionStrings.Settings_ThemeAndLayout_SidebarWidth_Description
);
}
ImGui.Spacing(); ImGui.Spacing();
ImGui.Separator(); ImGui.Separator();
ImGui.Spacing(); ImGui.Spacing();
+13 -4
View File
@@ -2,6 +2,7 @@ using System.Globalization;
using System.Numerics; using System.Numerics;
using Dalamud.Bindings.ImGui; using Dalamud.Bindings.ImGui;
using Dalamud.Interface; using Dalamud.Interface;
using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using HellionChat.Code; using HellionChat.Code;
using HellionChat.Resources; using HellionChat.Resources;
@@ -9,12 +10,20 @@ using HellionChat.Util;
namespace HellionChat.Ui; namespace HellionChat.Ui;
// Bottom status bar, 22px tall. Slots left to right: channel indicator, // Bottom status bar. Slots left to right: channel indicator, privacy badge,
// privacy badge, counts, tells (hidden at 0), version (right-aligned). // counts, tells (hidden at 0), version (right-aligned). Updates at 1Hz;
// Updates at 1Hz; format strings are cached between updates. // format strings are cached between updates.
internal sealed class StatusBar internal sealed class StatusBar
{ {
public const float Height = 22f; // DPI-aware bar height. The previous fixed 22px constant clipped on
// Windows display-scaling >100% because ImGui renders the font bigger
// than the reservation. GetTextLineHeightWithSpacing scales with the
// current ImGui font; the 2px spacer is GlobalScale-rounded to stay
// on integer pixel boundaries (same idiom as v1.4.6 F7.2 underline-pill
// in ChatLogWindow.cs:1639-1653).
public static float Height =>
ImGui.GetTextLineHeightWithSpacing() + MathF.Round(2f * ImGuiHelpers.GlobalScale);
private const long UpdateIntervalMs = 1000; private const long UpdateIntervalMs = 1000;
// Initially outdated so the first frame always computes fresh. // Initially outdated so the first frame always computes fresh.
+2 -2
View File
@@ -62,7 +62,7 @@ internal static class AutoTranslate
{ {
var sw = Stopwatch.StartNew(); var sw = Stopwatch.StartNew();
AllEntries(); AllEntries();
Plugin.Log.Debug($"Warming up auto-translate took {sw.ElapsedMilliseconds}ms"); Plugin.LogProxy.Debug($"Warming up auto-translate took {sw.ElapsedMilliseconds}ms");
}) })
{ {
IsBackground = true, IsBackground = true,
@@ -197,7 +197,7 @@ internal static class AutoTranslate
} }
catch (Exception ex) catch (Exception ex)
{ {
Plugin.Log.Error(ex, $"failed to translate: {lookup}"); Plugin.LogProxy.Error(ex, $"failed to translate: {lookup}");
} }
} }
+16
View File
@@ -0,0 +1,16 @@
namespace HellionChat.Util;
internal sealed class DalamudPlatformUtil : IPlatformUtil
{
public DalamudPlatformUtil()
{
// Util.IsWine probes the host process and never changes for the
// lifetime of a plugin instance, so we cache it once at ctor.
// Mirrors LightlessSync/Services/DalamudUtilService:154.
IsWine = Dalamud.Utility.Util.IsWine();
}
public bool IsWine { get; }
public void OpenLink(string url) => Dalamud.Utility.Util.OpenLink(url);
}
+61
View File
@@ -0,0 +1,61 @@
using System;
using Dalamud.Plugin.Services;
namespace HellionChat.Util;
internal sealed class DalamudPluginLogProxy : IPluginLogProxy
{
private readonly IPluginLog _log;
public DalamudPluginLogProxy(IPluginLog log) => _log = log;
public void Verbose(string message) => _log.Verbose(message);
public void Verbose(Exception exception, string message) => _log.Verbose(exception, message);
public void Verbose(string messageTemplate, params object[] values) =>
_log.Verbose(messageTemplate, values);
public void Debug(string message) => _log.Debug(message);
public void Debug(Exception exception, string message) => _log.Debug(exception, message);
public void Debug(string messageTemplate, params object[] values) =>
_log.Debug(messageTemplate, values);
public void Information(string message) => _log.Information(message);
public void Information(Exception exception, string message) =>
_log.Information(exception, message);
public void Information(string messageTemplate, params object[] values) =>
_log.Information(messageTemplate, values);
public void Info(string message) => _log.Info(message);
public void Info(Exception exception, string message) => _log.Info(exception, message);
public void Info(string messageTemplate, params object[] values) =>
_log.Info(messageTemplate, values);
public void Warning(string message) => _log.Warning(message);
public void Warning(Exception exception, string message) => _log.Warning(exception, message);
public void Warning(string messageTemplate, params object[] values) =>
_log.Warning(messageTemplate, values);
public void Error(string message) => _log.Error(message);
public void Error(Exception exception, string message) => _log.Error(exception, message);
public void Error(string messageTemplate, params object[] values) =>
_log.Error(messageTemplate, values);
public void Fatal(string message) => _log.Fatal(message);
public void Fatal(Exception exception, string message) => _log.Fatal(exception, message);
public void Fatal(string messageTemplate, params object[] values) =>
_log.Fatal(messageTemplate, values);
}
+11
View File
@@ -0,0 +1,11 @@
namespace HellionChat.Util;
// Indirection over Dalamud.Utility.Util's static surface so services can be
// constructed in an isolated xUnit AppDomain without loading Dalamud.dll.
// Production wiring lives in DalamudPlatformUtil; tests substitute a fake.
internal interface IPlatformUtil
{
bool IsWine { get; }
void OpenLink(string url);
}
+40
View File
@@ -0,0 +1,40 @@
using System;
namespace HellionChat.Util;
// Indirection over Dalamud's IPluginLog so MessageStore can be constructed
// in an isolated xUnit AppDomain without loading Dalamud.dll — same pattern
// as IPlatformUtil from F12.1. A later DI-container cycle (v1.5.x) may
// replace this with Microsoft.Extensions.Logging's ILogger<T>.
internal interface IPluginLogProxy
{
void Verbose(string message);
void Verbose(Exception exception, string message);
void Verbose(string messageTemplate, params object[] values);
void Debug(string message);
void Debug(Exception exception, string message);
void Debug(string messageTemplate, params object[] values);
void Information(string message);
void Information(Exception exception, string message);
void Information(string messageTemplate, params object[] values);
// IPluginLog exposes Info as a distinct method (short alias of
// Information) — both are present so call-sites stay drop-in.
void Info(string message);
void Info(Exception exception, string message);
void Info(string messageTemplate, params object[] values);
void Warning(string message);
void Warning(Exception exception, string message);
void Warning(string messageTemplate, params object[] values);
void Error(string message);
void Error(Exception exception, string message);
void Error(string messageTemplate, params object[] values);
void Fatal(string message);
void Fatal(Exception exception, string message);
void Fatal(string messageTemplate, params object[] values);
}
+15 -5
View File
@@ -254,6 +254,17 @@ internal static class ImGuiUtil
return end; return end;
} }
// ---------------------------------------------------------------
// Inspired by ChatTwo upstream f35b7d3 (Infiziert90, 2026-05-12).
// Upstream dropped the width parameter (no callers there); we keep
// it because two ChatLogWindow header buttons size themselves to
// match the ChannelIcon button's frame. The actual bug is the
// manual size = width - 2 * CellPadding.X subtraction: CellPadding
// scales with HUD scale, the raw int does not, so the button
// shrank under high HUD scales. ImGui.Button already handles its
// own frame padding internally — pass the measured width straight
// through.
// ---------------------------------------------------------------
internal static bool IconButton( internal static bool IconButton(
FontAwesomeIcon icon, FontAwesomeIcon icon,
string? id = null, string? id = null,
@@ -268,10 +279,7 @@ internal static class ImGuiUtil
bool ret; bool ret;
using (Plugin.FontManager.FontAwesome.Push()) using (Plugin.FontManager.FontAwesome.Push())
{ {
var size = Vector2.Zero; var size = width > 0 ? new Vector2(width, 0f) : Vector2.Zero;
if (width > 0)
size.X = width - 2 * ImGui.GetStyle().CellPadding.X;
ret = ImGui.Button(label, size); ret = ImGui.Button(label, size);
} }
@@ -575,7 +583,9 @@ internal static class ImGuiUtil
using (ImRaii.Disabled(isMax)) using (ImRaii.Disabled(isMax))
{ {
if (IconButton(FontAwesomeIcon.ArrowRight, id + 1.ToString())) // Parentheses pin the operator precedence: without them this resolves as
// id.ToString() + "1" (e.g. "01" instead of "1").
if (IconButton(FontAwesomeIcon.ArrowRight, (id + 1).ToString()))
selected++; selected++;
} }
+1 -1
View File
@@ -42,6 +42,6 @@ public static class MemoryUtil
str.Append(' '); str.Append(' ');
} }
Plugin.Log.Information(str.ToString()); Plugin.LogProxy.Information(str.ToString());
} }
} }
+16
View File
@@ -0,0 +1,16 @@
namespace HellionChat.Util;
// Pure predicates for the TempTab pin lifecycle. Extracted from the strip
// sites in Plugin.cs and Configuration.cs so they stay in lockstep — a
// load-time strip that disagrees with the save-time strip is exactly how
// pinned tabs would silently fall out of the JSON.
internal static class TabLifecycleHelpers
{
public static bool IsInUnpinnedPool(Tab t) => t.IsTempTab && !t.IsPinned;
public static bool IsInPinnedPool(Tab t) => t.IsTempTab && t.IsPinned;
public static bool ShouldStripOnLoad(Tab t) => IsInUnpinnedPool(t);
public static bool ShouldStripOnSave(Tab t) => IsInUnpinnedPool(t);
}
+21
View File
@@ -0,0 +1,21 @@
namespace HellionChat.Util;
internal static class UrlValidation
{
// Used by BrandingLinks/IntegrationLinks at module init. A typo in a URL
// rotation throws loudly at plugin load instead of silently failing when
// a user clicks the broken button.
public static void ValidateAll(string source, params string[] urls)
{
foreach (var url in urls)
{
if (
!Uri.TryCreate(url, UriKind.Absolute, out var uri)
|| (uri.Scheme is not "https" and not "http")
)
{
throw new InvalidOperationException($"{source} contains malformed URL: {url}");
}
}
}
}
+3 -3
View File
@@ -21,12 +21,12 @@ public static class WrapperUtil
{ {
try try
{ {
Plugin.Log.Debug($"Opening URI {uri} in default browser"); Plugin.LogProxy.Debug($"Opening URI {uri} in default browser");
Dalamud.Utility.Util.OpenLink(uri.ToString()); Plugin.PlatformUtil.OpenLink(uri.ToString());
} }
catch (Exception ex) catch (Exception ex)
{ {
Plugin.Log.Error($"Error opening URI: {ex}"); Plugin.LogProxy.Error($"Error opening URI: {ex}");
AddNotification(Language.Context_OpenInBrowserError, NotificationType.Error); AddNotification(Language.Context_OpenInBrowserError, NotificationType.Error);
} }
} }
+16 -15
View File
@@ -2,7 +2,7 @@
[![Build](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/actions/workflows/build.yml/badge.svg?branch=main)](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/actions/workflows/build.yml) [![Build](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/actions/workflows/build.yml/badge.svg?branch=main)](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/actions/workflows/build.yml)
[![License: EUPL-1.2](https://img.shields.io/badge/License-EUPL--1.2-blue.svg)](LICENSE) [![License: EUPL-1.2](https://img.shields.io/badge/License-EUPL--1.2-blue.svg)](LICENSE)
[![Latest release](https://img.shields.io/badge/release-v1.4.5-brightgreen)](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/latest) [![Latest release](https://img.shields.io/badge/release-v1.4.8-brightgreen)](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/latest)
[![Dalamud API](https://img.shields.io/badge/Dalamud-API_15-purple)](https://github.com/goatcorp/Dalamud) [![Dalamud API](https://img.shields.io/badge/Dalamud-API_15-purple)](https://github.com/goatcorp/Dalamud)
[![.NET](https://img.shields.io/badge/.NET-10.0-512BD4)](https://dotnet.microsoft.com/) [![.NET](https://img.shields.io/badge/.NET-10.0-512BD4)](https://dotnet.microsoft.com/)
[![FFXIV](https://img.shields.io/badge/FFXIV-Dawntrail-c3a37f)](https://www.finalfantasyxiv.com/) [![FFXIV](https://img.shields.io/badge/FFXIV-Dawntrail-c3a37f)](https://www.finalfantasyxiv.com/)
@@ -11,7 +11,7 @@
<img src="docs/images/hellion-forge.png" alt="Hellion Forge" width="180" /> <img src="docs/images/hellion-forge.png" alt="Hellion Forge" width="180" />
</p> </p>
**Version 1.4.5** — Privacy-first chat plugin for FINAL FANTASY XIV / Dalamud, built on **Version 1.4.8** — Privacy-first chat plugin for FINAL FANTASY XIV / Dalamud, built on
[Chat 2](https://github.com/Infiziert90/ChatTwo) (EUPL-1.2). [Chat 2](https://github.com/Infiziert90/ChatTwo) (EUPL-1.2).
Hellion Chat is a privacy-first plugin built on the Chat 2 foundation. The majority of the engine comes from Chat 2 Hellion Chat is a privacy-first plugin built on the Chat 2 foundation. The majority of the engine comes from Chat 2
@@ -102,7 +102,7 @@ Hellion Chat is developed under **Hellion Forge**, the specialized modding and p
#### Custom Themes (v1.1.0) #### Custom Themes (v1.1.0)
HellionChat ships a theme engine with ten built-in themes (Hellion Arctic, Hellion Spectrum, Chat 2 Classic, Event HellionChat ships a theme engine with ten built-in themes (Hellion Arctic, Hellion Spectrum, Chat 2 Classic, Event
Horizon, Moonlit Bloom, Mint Grove, Night Blue, Indigo Violet, Forge Merchantman, Synthwave Sunset) and a JSON-based Horizon, Crystal Nocturne, Mint Grove, Night Blue, Indigo Violet, Forge Merchantman, Synthwave Sunset) and a JSON-based
authoring format for custom themes. Schema and step-by-step guide in authoring format for custom themes. Schema and step-by-step guide in
[`docs/THEME-AUTHORING.md`](docs/THEME-AUTHORING.md). Hellion Spectrum is Deuteranopia/Protanopia-safe (red-green color [`docs/THEME-AUTHORING.md`](docs/THEME-AUTHORING.md). Hellion Spectrum is Deuteranopia/Protanopia-safe (red-green color
blindness) based on the Wong/Okabe-Ito palette. blindness) based on the Wong/Okabe-Ito palette.
@@ -286,18 +286,19 @@ An optional submission to the Dalamud main plugin repo (in addition to the custo
## Project Status ## Project Status
**Version 1.4.5**User-visible robustness polish on top of the v1.4.4 threading work. The chat log no longer fails **Version 1.4.8**Hook-Layer and Polish Quick-Wins. The Database Viewer now has an optional FTS5 full-text search
silently: a draw-path exception now triggers a one-shot warning notification that points users at `/xllog`, while the across the entire chat history. Toggle "Full-text search" next to the search bar; the index is built asynchronously on
stack trace itself keeps going through `Plugin.Log.Error` as before. The first-run wizard splits accept from close — first run after the update with a progress toast, and the toggle stays disabled until the build completes. Multi-word
`OnClose` no longer silently sets `FirstRunCompleted`, so closing the X leaves the wizard pending and it reopens on the terms match as exact phrases by default; power users can opt into raw FTS5 `MATCH` syntax by wrapping their own
next plugin load; a new footer "Later — keep defaults" button is the explicit path to dismiss without picking a profile. double-quotes. Custom theme files auto-reload when edited while the theme is active — save the JSON in your editor and
`InputHistoryService` clears on plugin dispose alongside the existing pure-memory cleanups, so the previous session's the live render picks up the change within a second, no picker click. Retention sweep no longer blocks the framework
typed commands don't bleed into the next load. `FontManager.GetHellionFontBytes` becomes a `Try`-variant that falls back thread (`Framework.Run(...).Wait()` replaced by `Framework.RunOnTick(...)`), removing the ~194 ms hitch per sweep. Status
to the system-font path when the embedded resource is missing (broken csproj / dev build) instead of throwing through bar height is now derived from `GetTextLineHeightWithSpacing()` plus a DPI-aware spacer so the bar renders correctly at
the UiBuilder. The status bar drops the right-aligned version slot when the chat window is below the threshold needed to Windows display scaling above 100 %. Receive-suppressed-tells routing is postponed to v1.5.x; the investigation in this
fit all five slots without overlap. Internal: explicit session-only Auto-Tell-Tab invariant comment with a cycle showed that the FFXIV `ContentIdResolverHook` does not fire when other plugins suppress tells via
`TempTabCounter.InitFromList` pin in the Build-Suite. No schema bump, no migration. Sixth sub-patch of the v1.4.x polish `CheckMessageHandled`, which means tell-partner identification breaks for AutoTellTab routing — the fix lives next to
sweep series (as of 2026-05-12). the planned ad-block hook layer where the same `RaptureLogModule` patch surface comes up anyway. Migration v17 stays
(no schema bump). Ninth sub-patch of the v1.4.x polish sweep series (as of 2026-05-14).
Hellion Chat is a standalone plugin, no longer a fork in the repository sense. Fully completed: Hellion Chat is a standalone plugin, no longer a fork in the repository sense. Fully completed:
+116
View File
@@ -10,6 +10,122 @@ to the release pages for details.
--- ---
## Hellion Chat 1.4.8 — Hook-Layer and Polish Quick-Wins (2026-05-14)
Ninth sub-patch of the v1.4.x polish-sweep series. Hook-layer cluster (FTS5 full-text search, ad-block foundation
investigation) plus three polish quick-wins.
- DbViewer full-text search: optional FTS5 index across the full chat history. Built asynchronously on first run after
the update with a progress toast (UI stays responsive, the toggle is disabled until the build completes). The local
page-filter remains the default mode. Multi-word queries match as exact phrases; power users can opt into raw FTS5
`MATCH` syntax by wrapping their own double-quotes around the term.
- Custom theme files now auto-reload when edited while the theme is active. Save the JSON in your editor and the live
render picks up the change within a second — no need to re-click the theme in the picker. Disk-stat is throttled to
1 Hz so per-frame cost stays free.
- Retention sweep no longer blocks the framework thread. `Framework.Run(...).Wait()` is replaced by
`Framework.RunOnTick(...)`, which removes the ~194 ms hitch the sweep used to add per run.
- Status bar height is derived from `GetTextLineHeightWithSpacing()` plus a DPI-aware spacer so the bar renders
correctly at Windows display scaling above 100 %. Linux/Wayland default of 100 % is unaffected.
- Receive-suppressed-tells routing was investigated this cycle and **postponed to v1.5.x**. When other plugins suppress
tells via `CheckMessageHandled`, FFXIV's chat pipeline skips the `RaptureLogModule.AddMsgSourceEntry` path, which means
HellionChat's `ContentIdResolverHook` does not fire and tell-partner identification breaks for AutoTellTab routing.
The proper fix sits next to the planned ad-block hook layer (`RaptureLogModule.ShowMiniTalkPlayer` and friends) where
the same patch surface comes up anyway.
- Internal: storage form of `messages.Id` clarified (declared BLOB but Microsoft.Data.Sqlite stores Guid parameters as
TEXT). FTS bulk insert and `LoadByGuids` join now match the TEXT storage form on both sides. Migration v17 stays
(no schema bump).
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
---
## Hellion Chat 1.4.7 — Backlog Cleanup and Mid-Features (2026-05-13)
Eighth sub-patch of the v1.4.x polish-sweep series. First user-visible feature bundle since v1.4.5 — pinned tell tabs
that survive relog, opt-in Honorific glow rendering, a configurable sidebar, plus a Settings-Save channel-preservation
fix surfaced during smoke testing.
- TempTell Pin: right-click a TempTell tab in the sidebar and choose "Pin Tab" / "Tab anpinnen". Pinned tabs survive
plugin reload and character logout, keep their conversation history (loaded on demand from the message store on
rehydrate), and stay bound to the same `/tell` partner. Hard cap of 5 pinned tabs in a pool separate from the 15-tab
auto-tell pool — total ceiling is 20 tabs. The sidebar groups pinned tabs into their own section with a divider header
- Honorific glow outlines now render via an 8-direction DrawList pre-pass when the title carries a Glow colour. Opt-in
via **Settings → Integrations → Render glow outlines (Honorific)** (default off). Honorific's gradient surface
(`Color3`, `GradientColourSet`, `GradientAnimationStyle`) is parsed and stashed for a later cycle but renders as the
primary colour until then — the v1.4.7 DTO already mirrors all four extra fields so the JSON roundtrip doesn't
silent-drop them
- Sidebar width configurable in **Theme & Layout** (44160 px, default 44 stays icon-only). The icon button stretches
with the configured width so a widened sidebar looks intentional, not a 36 px icon floating in empty space
- `Configuration.UpdateFrom` now preserves the runtime `CurrentChannel` across the persistent-tab merge alongside
`Messages` and `LastSendUnread`. `TabSwitched` deep-clones the seeded channel from the previous tab instead of sharing
the same `UsedChannel` instance. Together these fix a regression where Settings-Save on a Party or Linkshell tab
popped the chat input back to `/tell <pinned-partner>` on the next interaction
- `Util/ImGuiUtil.cs` `DrawArrows` IconButton id uses `(id + 1).ToString()` with explicit parentheses instead of the
operator-precedence quirk `id + 1.ToString()` (which resolved to `id.ToString() + "1"`). Single live caller is
`Ui/DbViewer.cs:227` page-navigation
- Internal: `IPluginLogProxy` indirection over Dalamud's `IPluginLog` routes all ~91 `Plugin.Log` call sites through a
testable proxy. `MessageStore.Migrate0` can now run in xUnit without loading `Dalamud.dll`, closing the gap F12.1 left
in v1.4.6. Production wrapper `DalamudPluginLogProxy` and Build-Suite `FakePluginLogProxy` mirror the full
`IPluginLog` surface (`Verbose`/`Debug`/`Information`/`Info`/`Warning`/`Error`/`Fatal`) with single-string,
`Exception+string`, and `params object[]` overloads
- Internal: TempTab counter switched from an `Interlocked` cached field to a derived `Tabs.Count(predicate)`. Pin-state
transitions (TryPin / Unpin / Promote) are cold-path and don't need lock-free reads; counter mutation surface dropped
from 5 to 0 sites. Build-Suite floor 688 → 710 (+22)
- Schema bump v16 → v17 is additive: new `Tab.IsPinned` bool, default false. Existing v16 configs load cleanly and get
their `Version` stamp bumped after the gate check
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
---
## Hellion Chat 1.4.6 — Code Hygiene and Refactor (2026-05-12)
Maintenance patch. No user-visible behaviour changes; tightens the development feedback loop, fixes two
upstream-inherited bugs from ChatTwo `f35b7d3`, and prepares the code for the v1.4.7 backlog cleanup.
- `scripts/preflight.sh` gains Block E (`dotnet csharpier check`) and Block F (`markdownlint-cli2`) so reflow drift and
markdown violations are caught at the pre-push gate. `.markdownlint.json` adds `MD024 siblings_only` and disables
`MD036` so the bilingual forge-post bold-emphasis headings pass linting; the `.claude/` directory is excluded from the
scan
- `FontManager.AddFontWithFallback` catch-filter now covers `InvalidOperationException` and `ArgumentException` on top
of the existing IO triad. The warning log carries the exception type name, so the diagnostic path knows which class of
atlas-toolkit throw triggered the NotoSansCjkRegular fallback
- `BrandingLinks` (5 URLs) and `Integrations/IntegrationLinks` (2 URLs) validate themselves on first module load via
`[ModuleInitializer]` + a shared `UrlValidation.ValidateAll` helper. A malformed URL now throws
`InvalidOperationException` at plugin load with the source class and the broken URL in the message
- Cherry-picked from ChatTwo upstream `f35b7d3`: `Chat.SetChannel` no longer leaks the native `Utf8String` when the
linkshell check rejects the channel. The validity check is now wrapped around the `ChangeChatChannel` call instead of
short-circuiting before `Dtor`. `ValidAnyLinkshell` is renamed to `IsChannelOrExistingLinkshell` and the
`ChatLogWindow` call-site follows the rename
- Cherry-picked from ChatTwo upstream `f35b7d3`: `Tab.Clone` now deep-clones `UsedChannel` and `TellTarget`. The old
`CurrentChannel = CurrentChannel` was a reference copy, so PopOut and Temp tabs mutated each other's channel state
(incl. tell target). `TellTarget.From(t)` static factory is replaced with an instance `Clone()`; `UsedChannel.Clone()`
is new and runs deep-clone on both TellTarget references
- `ChatLogWindow` active-tab underline pill now scales with `ImGuiHelpers.GlobalScale` and rounds its DrawList
coordinates to physical pixels via `MathF.Round`, so the 2 px line stays crisp on 125 % and 150 % DPI setups instead
of bleeding into a sub-pixel blur
- `ImGuiUtil.IconButton` width parameter no longer subtracts HUD-scaled `CellPadding.X * 2` from the raw `int` width.
`ImGui.Button` handles its own frame padding internally, so the measured `buttonWidth` now passes through verbatim
(inspired-by upstream `f35b7d3`, but our two call-sites need the parameter, so the param itself stays)
- Internal: `HellionStyle` ChildBgAlpha threshold logic extracted to `HellionStyleHelpers.ResolveChildBgAlpha` with a
build-suite mirror test that pins the 0.999f cutoff. `Plugin.SaveConfig` clones only the temp-tab subset in the
pre-serialization snapshot instead of the full tab list. `SettingsOverview` caches `ImGui.GetWindowDrawList()` once
per frame and passes the pointer down to `DrawCard`
- Internal: `Dalamud.Utility.Util` static surface (`IsWine`, `OpenLink`) routed through a new `IPlatformUtil`
indirection. `MessageStore`'s `IsWine` probe is now reachable from the xUnit AppDomain via a `FakePlatformUtil`
fixture (full isolated MessageStore construction still pending — `Plugin.Log.Information` in `Migrate0` is a separate
Dalamud-static surface, slated for v1.4.7)
- Built-in themes: Crystal Nocturne (royal sapphire and electric magenta over obsidian, by CRYSTALLITE) replaces Moonlit
Bloom in the built-in roster. Users who had Moonlit Bloom selected fall back to the default Hellion Arctic on the
first plugin load; an existing custom JSON copy of Moonlit Bloom under `pluginConfigs/HellionChat/themes/` keeps
working unchanged
Modding & support: join Hellion Forge — <https://discord.gg/X9V7Kcv5gR>
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
---
## Hellion Chat 1.4.5 — UX and Robustness (2026-05-12) ## Hellion Chat 1.4.5 — UX and Robustness (2026-05-12)
Sixth sub-patch of the v1.4.x polish-sweep series. User-visible robustness fixes plus two doc/test polish items from the Sixth sub-patch of the v1.4.x polish-sweep series. User-visible robustness fixes plus two doc/test polish items from the
+60 -4
View File
@@ -10,14 +10,70 @@ the plugin's privacy-first scope during brainstorming.
--- ---
## Next Cycle (v1.4.6) ## Next Cycle (v1.4.9)
**Code-Hygiene + Refactor.** Build-side pre-commit hook with csharpier-check as a hard gate so format drift can't reach **Plugin-Load Render Polish.** Erststart-Frame-Hitch (~110 ms UiBuilder) and the related Font-Atlas + Auto-Translate
a commit (~30 min). Plus the cycle absorbs whatever surfaces from v1.4.5 smoke that doesn't justify a hotfix. Concrete warmup costs surface every load and are reproducible in `/xlstats`. The cycle also unblocks the lazy-window refactor
scope is consolidated in the v1.4.6 brainstorm. sketched in `feedback_lazy_window_dalamud` and the slash-command centralisation that comes with it.
--- ---
## v1.4.8 — Hook-Layer and Polish Quick-Wins (released 2026-05-14)
Ninth sub-patch of the v1.4.x Polish Sweep series. Database Viewer gains an optional FTS5 full-text search across the
full chat history, built asynchronously on first run after the update with a progress toast; the local page-filter
remains the default mode. Custom theme files auto-reload when edited while the theme is active (1 Hz disk-stat throttle,
so per-frame cost is free). Retention sweep no longer blocks the framework thread — `Framework.Run(...).Wait()` is
replaced by `Framework.RunOnTick(...)`, removing the ~194 ms hitch per sweep. Status-bar height is now derived from
`GetTextLineHeightWithSpacing()` plus a DPI-aware spacer so the bar renders correctly at Windows display scaling above
100 %. Receive-suppressed-tells routing was investigated and **postponed to v1.5.x**: when other plugins suppress tells
via `CheckMessageHandled`, FFXIV's chat-pipeline skips the `RaptureLogModule.AddMsgSourceEntry` path, which means the
`ContentIdResolverHook` does not fire and tell-partner identification breaks. The fix belongs next to the planned ad-block
hook layer where the same patch surface comes up anyway. Migration v17 stays (no schema bump). H3 leaves a foundation
note in the Vault (`Projekte/FFXIV/Hellion Chat/v1.5.x Ad-Block Foundation.md`) covering the NoSoliciting filter +
bubble-layer hook pattern as a ready-made template for the v1.5.x cycle.
---
## v1.4.7 — Backlog Cleanup and Mid-Features (released 2026-05-13)
Eighth sub-patch of the v1.4.x Polish Sweep series. First user-visible feature bundle since v1.4.5. TempTell tabs can
now be pinned via right-click; pinned tabs survive plugin reload and character logout, keep their conversation history
(loaded on demand from the message store on rehydrate), and stay bound to the same `/tell` partner. A hard cap of 5
pinned tabs lives in a pool separate from the 15-tab auto-tell pool, total ceiling 20. The sidebar groups pinned tabs
into their own section with a divider header, and the sidebar width itself is now configurable in **Theme & Layout**
between 44 and 160 px. Honorific glow outlines render when the title carries a Glow colour, opt-in via **Settings →
Integrations → Render glow outlines (Honorific)** (default off). Honorific's gradient (Color3 / GradientColourSet / Wave
/ Pulse) is parsed but rendered statically — a later cycle will port the full animation algorithm or land an upstream
IPC PR for the resolved frame colour. `Configuration.UpdateFrom` now preserves the runtime `CurrentChannel` across the
persistent-tab merge, and `TabSwitched` deep-clones the seeded channel instead of sharing the previous tab's
`UsedChannel` — together they fix a Settings-Save regression where the chat input could pop back to
`/tell <pinned-partner>` after touching settings on a Party or Linkshell tab. Internal items: `IPluginLogProxy`
indirection over Dalamud's `IPluginLog` routes all ~91 `Plugin.Log` call sites through a testable proxy, closing the
F12.1 test-isolation gap (`MessageStore.Migrate0` runs in xUnit now). TempTab counter switched from `Interlocked` cached
field to derived `Tabs.Count(predicate)`. Migration v16 → v17 is additive (new `Tab.IsPinned` flag). Build-Suite floor
688 → 710 (+22 tests across Pin-lifecycle predicates, pool limits, Tab.Clone roundtrip, MessageStore Migrate0
construction, and Honorific TitleData JSON roundtrip).
## v1.4.6 — Code Hygiene and Refactor (released 2026-05-12)
Seventh sub-patch of the v1.4.x Polish Sweep series. Maintenance patch — no user-visible behaviour changes; tightens the
development feedback loop and pulls in two ChatTwo upstream bugfixes. `scripts/preflight.sh` gains a csharpier reflow
check (Block E) and a markdownlint pass (Block F), so style drift and markdown violations are blocked at the pre-push
gate. `FontManager.AddFontWithFallback` catch-filter now spans `InvalidOperationException` and `ArgumentException` on
top of the existing IO triad, with the exception type name in the warning log so the diagnostic path can see which
atlas-toolkit throw triggered the fallback. `BrandingLinks` and `IntegrationLinks` run a `[ModuleInitializer]` URL
validation pass on plugin load; a typo in a future URL rotation now throws at startup instead of failing silently when a
user clicks the broken button. Cherry-picked from ChatTwo upstream `f35b7d3`: `Chat.SetChannel` no longer leaks the
native `Utf8String` when the linkshell check rejects the channel (rename to `IsChannelOrExistingLinkshell` plus
wrap-not-return), and `Tab.Clone` now deep-clones `UsedChannel` and `TellTarget` (the previous reference copy let PopOut
and Temp tabs mutate each other's channel state). The `ChatLogWindow` active-tab underline pill scales with
`ImGuiHelpers.GlobalScale` and rounds to physical pixels for crisp rendering above 100 % DPI. Internal items:
`HellionStyle` ChildBgAlpha extracted to a testable helper, `Plugin.SaveConfig` clones only the temp-tab subset in the
snapshot path, `SettingsOverview` caches the draw-list per frame, `Dalamud.Utility.Util` static surface routed through
an `IPlatformUtil` indirection (`MessageStore`'s `IsWine` probe is now testable in isolation). No schema bump, no
migration.
## v1.4.5 — UX and Robustness (released 2026-05-12) ## v1.4.5 — UX and Robustness (released 2026-05-12)
Sixth sub-patch of the v1.4.x Polish Sweep series. User-visible robustness polish plus two doc/test polish items from Sixth sub-patch of the v1.4.x Polish Sweep series. User-visible robustness polish plus two doc/test polish items from
+1 -1
View File
@@ -141,7 +141,7 @@ A theme can tint these toward its brand family (e.g., a purple theme can shift T
**don't** flip them (Tell suddenly green, Yell suddenly cyan). RP groups and combat-spec setups depend on the visual **don't** flip them (Tell suddenly green, Yell suddenly cyan). RP groups and combat-spec setups depend on the visual
hierarchy. hierarchy.
The eight colored built-in themes (Hellion Arctic, Hellion Spectrum, Event Horizon, Moonlit Bloom, Mint Grove, Night The eight colored built-in themes (Hellion Arctic, Hellion Spectrum, Event Horizon, Crystal Nocturne, Mint Grove, Night
Blue, Indigo Violet, Forge Merchantman) all follow this rule — read their source for reference. Chat 2 Klassik Blue, Indigo Violet, Forge Merchantman) all follow this rule — read their source for reference. Chat 2 Klassik
intentionally ships without `chatChannels` so the user keeps their existing picks. intentionally ships without `chatChannels` so the user keeps their existing picks.
+6 -6
View File
File diff suppressed because one or more lines are too long
+12 -2
View File
@@ -1,7 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# preflight.sh — pre-push gate. Blocks A/B/C verify config drift; Block D is a # preflight.sh — pre-push gate. Blocks A/B/C verify config drift; Block D is a
# headless `dotnet build` to catch compile-time API drift. Test execution lives # headless `dotnet build` to catch compile-time API drift; Block E runs
# in the local Build-Suite repo and is NOT part of this preflight. # `dotnet csharpier check` against HellionChat/; Block F runs markdownlint
# against the repo's *.md files. Test execution lives in the local Build-Suite
# repo and is NOT part of this preflight.
set -euo pipefail set -euo pipefail
ROOT="$(cd "$(dirname "$0")/.." && pwd)" ROOT="$(cd "$(dirname "$0")/.." && pwd)"
@@ -19,4 +21,12 @@ echo "==> preflight: Block C — changelog sync"
echo "==> preflight: Block D — plugin compile health" echo "==> preflight: Block D — plugin compile health"
dotnet build HellionChat/HellionChat.csproj --configuration Release --nologo --verbosity quiet dotnet build HellionChat/HellionChat.csproj --configuration Release --nologo --verbosity quiet
echo "==> preflight: Block E — csharpier reflow check"
dotnet csharpier check HellionChat/
echo "==> preflight: Block F — markdownlint"
# npx --yes avoids a global install; first run caches into ~/.npm/_npx/.
# Subsequent runs are sub-second.
npx --yes markdownlint-cli2 "**/*.md" "#node_modules" "#bin" "#obj" "#.claude"
echo "==> preflight: ALL GREEN" echo "==> preflight: ALL GREEN"