Compare commits

..

25 Commits

Author SHA1 Message Date
JonKazama-Hellion f2a2daf39d Merge branch 'feature/v1.5.0'
Security / scan (push) Successful in 21s
Build / Build (Release) (push) Successful in 26s
Forge Announce / Post changelog to Hellion Forge (push) Successful in 5s
Release / Build and attach release ZIP (push) Successful in 33s
2026-05-17 11:45:16 +02:00
JonKazama-Hellion 7d87f1c4fe chore(release): v1.5.0 manifest bump
Version strings bumped across all eight tracked surfaces:

- HellionChat/HellionChat.csproj   <Version>1.5.0</Version>
- repo.json                        AssemblyVersion + TestingAssemblyVersion = 1.5.0.0
- repo.json                        three DownloadLink* URLs -> /v1.5.0/latest.zip
- repo.json                        Changelog field synced with yaml
- HellionChat/HellionChat.yaml     new v1.5.0 changelog block on top; v1.4.7
                                   drops out per the four-block slim rule
- docs/CHANGELOG.md                v1.5.0 entry prepended
- docs/ROADMAP.md                  Next Cycle pointer moves to v1.5.1, v1.5.0
                                   joins the released-cycle archive block
- README.md                        three status surfaces (badge, header,
                                   Project Status long-form) on v1.5.0
- .github/forge-posts/v1.5.0.md    Discord announcement body (German)

Preflight blocks A-F all green. Changelog embed total 2050 / 5500 chars
(four subblocks), forge-post frontmatter inside the 60/40 char caps.

Tag, push, merge are reserved for Flo.
2026-05-17 11:43:07 +02:00
JonKazama-Hellion fe84fd558e docs(di): trim cycle-internal codes and verbose block comments
Code comments were drifting into plan-internal shorthand (DI-2a,
Slice B, "see plan §9") that nobody outside the cycle authors can
decode. They also tended toward AI-generated paragraph blocks where a
two-line WHY would have done.

This commit tightens the comment surface from the v1.5.0 work:
- IPluginLogProxy header lists the consumer buckets without naming
  the cycle items that decided them.
- DalamudLogger / DalamudLoggingProvider provenance markers explain
  themselves in two lines each; the long EUPL-rationale paragraph
  moves to the commit message.
- PluginHostFactory block headers shrink to one line each, ASCII
  dividers come out, plan-internal codes go.
- Plugin.cs field doc and Phase-1 / DisposeAsync comments lose the
  cycle-name references; the file gains nothing from "C3 surfaced X"
  in code.
- FontManager / GameFunctions static-method notes shrink to one
  sentence each.
- InitHostedServices class header keeps the eager-resolve WHY in
  three lines, drops the constraint label.

Csharpier reformatted the .csproj layout (long PackageReference
multi-lined). No functional change, no behavior change.
2026-05-17 11:35:44 +02:00
JonKazama-Hellion 624ad20404 feat(logging): add dev signature to DalamudLogger output
EUPL-1.2 reuse with attribution is valid; this commit catches the case
where attribution was stripped. Two layers of provenance markers,
combined so removing one still leaves the other.

Layer 1 (subtle, kopier-resistent):
- DalamudLogger.Log emits "[name]<U+200B>{level} message" — a
  zero-width space (U+200B) between the category bracket and the
  level value. Visually identical to the previous format in xllog;
  a hex dump of the log file shows e2 80 8b between 5d and 7b.
  Survives 1:1 code copies. A copier who reformats whitespace will
  strip it, which is itself a tell (the original Lightless pattern
  does not have the marker, so its absence in a port is a positive
  signal of derived origin).

Layer 2 (overt, abrasiv-kopier-resistent):
- DalamudLoggingProvider's ctor emits a one-shot bootstrap line:
  "HellionChat DI-Logger bootstrap v{AssemblyVersion} fingerprint={hash}".
  Visible in xllog as the first plugin INFO line. Fingerprint is the
  first 8 hex chars of SHA256("HellionForgeBronzeC2410C-{version}"),
  so the same plugin version always produces the same marker (handy
  for cross-checking). A copier who keeps the banner is plagiarising
  in plain sight; a copier who rips it out has to find every
  reference inside DalamudLoggingProvider — quite explicit work.

Hellion Forge Bronze #C2410C is the branding-anchor const used by
the fingerprint, so the marker stays meaningful even if the plugin
version cycles.
2026-05-17 11:15:40 +02:00
JonKazama-Hellion 54ff88d6d4 refactor(di): migrate Root + Misc to ILogger<T> (DI-4 Slice D)
Slice D shrinks vs the original plan: three of the six files cannot
take an ILogger ctor arg without breaking external contracts.

Migrated (8 LogProxy sites across 4 files):
- Commands: 2 sites (Warning, Error). New ctor takes ILogger<Commands>.
- Themes/ThemeRegistry: 1 site (Debug). ILogger<ThemeRegistry>? is
  optional (default null) so the existing Build-Suite tests that
  construct `new ThemeRegistry()` parameterless keep working without
  changes. _logger?.LogDebug guards the call site.
- PayloadHandler: 3 sites (Error, Warning, Error). New ctor takes
  ILogger<PayloadHandler>. ChatLogWindow's two `new PayloadHandler(this)`
  sites (the direct field and the Lender lambda) now hand a fresh
  CreateLogger<PayloadHandler>() from the existing _loggerFactory.

Not migrated (5 sites stay on Plugin.LogProxy, plan drifts D12-D14):
- D12 - Configuration (1 site): IPluginConfiguration, instantiated by
  Dalamud's Interface.GetPluginConfig() via reflection on the
  parameterless ctor. Adding an ILogger arg would break GetPluginConfig.
- D13 - Message (4 sites): partial data class with two ctor overloads,
  mass-instantiated across 3 plugin sites plus Newtonsoft JSON
  deserialisation. Ctor extension would be invasive across ~20 call
  sites with low payoff (data-class logger is unusual).
- D14 - FontManager (2 sites): both Plugin.LogProxy calls live in
  static methods (TryGetHellionFontBytes, AddFontWithFallback) that
  cannot reach an instance _logger. Same root cause as D8 in
  GameFunctions. FontManager joins the static-bucket alongside
  EmoteCache et al.; the ctor + _logger field added mid-Slice-D were
  rolled back to keep the class clean.

Plugin.LogProxy surface after C9 (8 file buckets, ~12 sites total):
- 4 originally-static consumers: EmoteCache, AutoTranslate,
  MemoryUtil, WrapperUtil
- 3 cannot-take-ctor-arg consumers: Configuration, Message, FontManager
- 1 single-static-method consumer: GameFunctions.TryOpenAdventurerPlate
  (D8 from Slice B)

Smoke 2 is now due.
2026-05-17 11:02:08 +02:00
JonKazama-Hellion c955f30422 refactor(di): migrate UI Window-Layer to ILogger<T> (DI-4 Slice C)
Six UI files shift from Plugin.LogProxy to ILogger<T> via
constructor injection.

Container singletons (each takes a typed ILogger plus, where it owns
nested allocations, an ILoggerFactory to spawn child loggers):
- Ui/ChatLogWindow (15 sites, plus an ILoggerFactory for the
  Popout new-call at Ui/ChatLogWindow.cs:2417)
- Ui/Settings (SettingsWindow): no own sites, but takes an
  ILoggerFactory so it can hand typed loggers to its three migrated
  settings tabs (General, the other six tabs stay unchanged)
- Ui/DbViewer (3 sites)

Nested instances allocated by parent containers:
- Ui/Popout (7 sites, ILogger<Popout> as the new 4th ctor arg passed
  from ChatLogWindow)
- Ui/SettingsTabs/ThemeAndLayout (1 site)
- Ui/SettingsTabs/FontsAndColours (1 site)
- Ui/SettingsTabs/DataManagement (15 sites)

PluginHostFactory factory lambdas updated for ChatLogWindow,
SettingsWindow and DbViewer to resolve the new logger args.
2026-05-17 10:26:47 +02:00
JonKazama-Hellion 7a1bd1babc refactor(di): migrate Integrations + IPC layer to ILogger<T> (DI-4 Slice B)
Seven services across Integrations/, Ipc/ and GameFunctions/ shift
from Plugin.LogProxy to Microsoft.Extensions.Logging.ILogger<T>.

Files with live LogProxy sites (10 in total):
- Ipc/ExtraChat (1)
- GameFunctions/Chat (6)
- GameFunctions/GameFunctions (2)
- GameFunctions/KeybindManager (1)

Foundation-touch files (no current sites, ctor takes ILogger<T> as
seed for the v1.5.7-11 Plugin-Integrations wave):
- Integrations/HonorificService (also drops the local IPluginLog
  _log field in favour of ILogger<HonorificService> _logger; the
  three _log.* calls there are migrated as a bonus since the field
  had to change anyway)
- IpcManager
- Ipc/TypingIpc

GameFunctions takes ILoggerFactory as an extra ctor arg so it can
hand a typed logger to its nested Chat and KeybindManager (same
pattern MessageStore + MessageEnumerator use in Slice A).

PluginHostFactory factory lambdas updated for all five Slice B
services that need extra resolves.

Plan drift D8: GameFunctions.TryOpenAdventurerPlate is an internal
static method whose only Warning call cannot reach the instance
_logger. The one site stays on Plugin.LogProxy with an inline note;
promoting it to instance + PayloadHandler.cs:814 call-site update is
a v1.5.1+ cleanup, out of DI-4 Slice B scope.
2026-05-17 09:56:46 +02:00
JonKazama-Hellion d0be75e79d refactor(di): migrate services layer to ILogger<T> (DI-4 Slice A)
MessageStore, MessageEnumerator, MessageManager, AutoTellTabsService
move from Plugin.LogProxy / IPluginLogProxy onto
Microsoft.Extensions.Logging.ILogger<T> via constructor injection.

MessageStore additionally takes ILoggerFactory so it can build a
per-instance ILogger<MessageEnumerator> at each of the five reader-
spawning sites; the enumerator is not a container singleton.

PluginHostFactory's MessageManager and AutoTellTabsService factory
lambdas grow to resolve the new logger args; everything else stays in
place.

Site-level migration in the four files:
- MessageStore: 12 calls, _logger field IPluginLogProxy -> ILogger<MessageStore>
- MessageManager: 7 Plugin.LogProxy.* sites, new _logger field
- AutoTellTabsService: 9 Plugin.LogProxy.* sites, new _logger field

Plus a pre-existing template bug surfaced by CA2017: a LogDebug call
in AutoTellTabsService used "{tab.Name}" with no `$` prefix, which
landed in xllog as literal text under Plugin.LogProxy; ILogger now
reads that as a structured placeholder, so the call was promoted to
proper structured logging with tab.Name passed as a parameter.
2026-05-17 09:09:55 +02:00
JonKazama-Hellion e0ead86616 refactor(di): drop manual PlatformUtil and LogProxy wiring (DI-3)
C3's Phase-1 bridge in Plugin.ctor already pulls IPlatformUtil and
IPluginLogProxy out of the container right after the host builds, so
the manual `new DalamudPlatformUtil()` / `new DalamudPluginLogProxy`
assignments in Phase-0 were just allocating throwaway instances that
got overwritten a few lines later.

Phase-0 helpers that run before the container build
(MigrateFromChatTwoLayout, LanguageChanged, ImGuiUtil.Initialize) do
not touch Plugin.PlatformUtil or Plugin.LogProxy, so the brief
null-window between the schema gate and the container build is safe.

The DalamudPlatformUtil and DalamudPluginLogProxy wrapper classes
themselves stay in the code; DI-4 (logger migration to ILogger<T>)
will eventually retire the proxy for new sites but EmoteCache,
AutoTranslate, MemoryUtil and WrapperUtil keep using it.
2026-05-17 08:58:03 +02:00
JonKazama-Hellion b66005daea fix(di): stop double-disposing container singletons in Plugin.DisposeAsync
Smoke 1 of C3 surfaced MessageManager.DisposeAsync throwing on unload:
Plugin.DisposeAsync ran the manual MessageManager teardown (CTS
cancel + dispose at MessageManager.cs:84-99), then awaited
_lifecycle.DisposeAsync which routed Host.Dispose through the
container, which hit MessageManager.DisposeAsync a second time and
threw ObjectDisposedException on the already-disposed CTS.

Plugin.DisposeAsync now drops every manual service dispose - the
container owns those singletons end-to-end. The framework-thread block
keeps the three calls the container has no handle on
(TearDownCommands, GameFunctions.SetChatInteractable,
WindowSystem.RemoveAllWindows), plus the static-class cleanups
(EmoteCache.Dispose, InputHistoryService.Reset) stay outside the
container entirely.

This changes the teardown order versus v1.4.10: the container disposes
in reverse-registration order, which puts Windows ahead of IPC
services. The v1.4.10 ordering ("IPC before Windows so a final IPC
event cannot hit a half-torn ChatLogWindow") is no longer enforced.
Host.Dispose runs synchronously on the framework thread, so no
Framework.Update or Draw event fires during teardown; the remaining
risk is an external IPC plugin invoking a subscriber mid-dispose,
which is not something v1.4.10 actually prevented either.
2026-05-17 08:24:45 +02:00
JonKazama-Hellion 0fe66d2c3c fix(di): use factory lambdas for internal-ctor services
C3 bootstrap throws "A suitable constructor for type
HellionChat.Ipc.ExtraChat could not be located" because
Microsoft.Extensions.DependencyInjection's ActivatorUtilities only
binds to PUBLIC constructors via reflection. ExtraChat is a public
class with an internal ctor; Commands and StatusBar are internal
classes whose implicit default ctor inherits class accessibility
(internal); every IHostedService adapter is `internal sealed class
X(deps)` with a primary ctor that is also internal.

The fix routes all eight singletons and all seven hosted-service
adapters through factory lambdas. `new T(...)` inside the
PluginHostFactory namespace sees the internal surface, so the
container never has to reflect over internal ctors.
2026-05-17 08:20:02 +02:00
JonKazama-Hellion 169168cea9 feat(di): wire Plugin.cs to the DI container (DI-2a + DI-5)
Flips the container live. Plugin.ctor now builds the host after the
schema gate clears, pulls PluginLifecycle out of the container, and
backfills the Plugin.X static surface plus the instance properties
(11 services + 8 windows) so existing consumers reach the same
instances the container holds.

Plugin.LoadAsync gets thinner: service and window allocations are gone
(the container owns them), BuildFonts / Switch / FilterAllTabsAsync /
Initialize moved to their hosted-service adapters inside
Host.StartAsync, WindowSystem.AddWindow moved into
PluginLifecycle.LoadAsync on the framework thread. Plugin-internal
init (SelfTestRegistry, FirstRunWizard, SetupCommands +
Commands.Initialise, RetentionSweep, EmoteCache.LoadData, FTS5 rebuild
worker, UiBuilder.Disable*UiHide, AutoTranslate.PreloadCache,
Framework / Draw / LanguageChanged subscribes) stays in Plugin.LoadAsync
because each step reaches Plugin-private members or fields.

Plugin.DisposeAsync keeps the manual teardown for ordering (IPC before
windows, hooks first) and awaits _lifecycle.DisposeAsync at the end to
stop the host and dispose the container on the framework thread.
Double-disposes against container singletons are no-ops for the
services that hold real resources (Dispose idempotency is the standard
pattern).

PluginLifecycle takes Plugin as a constructor arg so it can iterate
the Window properties and call WindowSystem.AddWindow on the framework
thread; v1.4.9 Stage-2 verified that AddWindow's backing List<> is
not thread-safe.

Plan drift D4 noted: Plugin.cs ends at 1050 lines instead of the
150-220 vision because helper methods (MigrateFromChatTwoLayout,
SeedExampleThemeIfEmpty, RunRetentionSweepIfDue, FrameworkUpdate,
Draw, LanguageChanged, SetupCommands, slash handlers, FTS worker)
stay in Plugin.cs. Extracting them is DI-2b or a dedicated service
refactor in v1.5.1+. C3 still hits the DI-2a goal: bootstrap is
container-driven and LoadAsync is allocation-free.

PlatformUtil and LogProxy keep the manual `new` for now; C5 (DI-3)
removes those once C3 stabilises in the smoke test.
2026-05-17 03:34:34 +02:00
JonKazama-Hellion f6d3794d87 feat(di): scaffold Microsoft.Extensions.Hosting container (DI-1 + DI-1b)
Lays down the DI foundation that v1.5.x will run on top of, without
flipping the switch on Plugin.cs yet (that move follows in C3). The new
files compile alongside the existing bootstrap but no caller resolves
the host, so the live behaviour is byte-identical to v1.4.10.

What's new:

- PluginHostFactory.cs: HostBuilder.Build(plugin, dependencies)
  registers ~46 services across Block A (21 Dalamud singletons), Block
  B (14 HellionChat services plus FileDialogManager), Block C (8
  windows), plus Plugin and PluginLifecycle. Service-class bodies are
  untouched - Plugin-backref ctors go through factory lambdas.
- PluginLifecycle.cs: thin IAsyncDisposable wrapping the host's
  StartAsync/StopAsync, with idempotent dispose and framework-thread
  Host.Dispose. The Host is assigned via a property setter from
  Plugin.ctor; HellionChat deviates from Lightless' Func-delegate
  pattern because the schema gate must run before Build.
- Infrastructure/Logging/{DalamudLogger, DalamudLoggingProvider,
  DalamudLoggingProviderExtensions}.cs: ILogger<T> -> IPluginLog
  bridge, ported from Lightless without the mod-sync hasModifiedGameFiles
  flag and without the LightlessConfigService log-level coupling.
- Infrastructure/Hosting/InitHostedServices.cs: seven IHostedService
  adapters around the existing init methods (FontManager.BuildFonts,
  ThemeRegistry warmup+switch, IpcManager/TypingIpc/ExtraChat eager
  resolve, MessageManager.FilterAllTabsAsync, AutoTellTabsService
  .Initialize). Adapter style rather than inlining ": IHostedService"
  on the service classes per the DI-2a "service bodies untouched"
  constraint.

Plan drift noted for cycle closure: MessageStore stays inside
MessageManager.ctor (not a standalone container singleton) because
MessageManager.ctor allocates it directly today; promoting it would
double-construct the SQLite handle. AutoTellTabsService reads it via
MessageManager.Store inside its factory lambda.
2026-05-17 02:44:54 +02:00
JonKazama-Hellion 763f5a3f5d chore(deps): add Microsoft.Extensions.Hosting et al. for DI foundation
Prepares the v1.5.0 DI-container adoption (Lightless pattern) by adding
four MS.Extensions packages as direct closed-range references:

- Microsoft.Extensions.Hosting (IHost, HostBuilder)
- Microsoft.Extensions.DependencyInjection (IServiceCollection)
- Microsoft.Extensions.Logging (ILogger<T> for DI-4 logger migration)
- Microsoft.Extensions.Options (transitive used by Hosting + future config)

Closed-range [10.0.7, 11.0.0) matches the existing pinning style for
MessagePack/Pidgin/ImageSharp and locks the major version while letting
Renovate roll minor and patch updates. Lock file regenerated.
2026-05-17 02:29:41 +02:00
JonKazama-Hellion 8a18f7caaa fix(chat-input): replace input on slash-command insert
Cherry-pick from ChatTwo upstream ee7768ac (Infiziert90, 2026-05-16):
when args.AddIfNotPresent or args.Input starts with '/', replace the
chat input instead of appending. Fixes the Friend-List "/tell" path
where existing text like "test" would otherwise concatenate to
"test/tell user@world" before the receiver and channel resolve.

Variable drift versus upstream: HellionChat uses local 'Chat' where
ChatTwo uses InputHandler.ChatInput; logic is 1:1.
2026-05-17 02:26:03 +02:00
JonKazama-Hellion 5f7bfb5890 fix(preflight): avoid jq SIGPIPE race in verify-changelog-sync
Security / scan (push) Successful in 23s
Build / Build (Release) (push) Successful in 31s
The Block C check used `jq -r '.[0].Changelog' | grep -qE ...` to spot
the **vX.Y.Z** marker. With `set -o pipefail`, grep -q closing stdin on
the first match makes jq trip SIGPIPE on the rest of the multi-KB
Changelog string, which the script then surfaces as a false-positive
"Changelog missing **vX.Y.Z** subblock" failure. Interactive shells
sometimes raced through fast enough to hide the issue, but the pre-push
runner hit it reliably (saw it on the v1.4.10 release-cut push attempt).

Switched the pipe to a process substitution so jq writes into a FIFO
and SIGPIPE never enters the picture. Both directions of the marker
check now stay deterministic.
2026-05-16 14:08:19 +02:00
JonKazama-Hellion 3be4e73c27 Merge feature/v1.4.10 — Symbol-Picker and Tell-History Fix
Forge Announce / Post changelog to Hellion Forge (push) Successful in 7s
Release / Build and attach release ZIP (push) Successful in 37s
2026-05-16 14:04:20 +02:00
JonKazama-Hellion 667950c98e docs: add v1.4.10 forge announcement post and apply csharpier reflow
Forge-Post is required in the tagged tree so forge-announce.yml can read
it during the release-pipeline run. Plus a csharpier reflow on two files
(SymbolPicker.cs, ChatLogWindow.cs) that preflight Block E flagged after
the cycle's comment-tightening sweep — purely whitespace, no behaviour
change.
2026-05-16 14:01:17 +02:00
JonKazama-Hellion 3e91177833 release: bump to v1.4.10 2026-05-16 13:25:53 +02:00
JonKazama-Hellion 51f18e46a0 chore(comments): tighten v1.4.10 inline commentary after self-review
Five trim spots from the cycle's earlier commits — none change behaviour,
just drop redundant phrasing and stale references per the HellionChat
comment-style convention (1-3 lines default, link "same as X" instead of
repeating, file:line refs only where they aid navigation).

SymbolPicker:
- BmpWhitelist header consolidated to source + filter ranges
- ImRaii.Popup pattern links the established ChatLogWindow popup idiom
  instead of citing three call-sites
- ToIconString comment drops the "discoverability" footnote that the
  code already telegraphs
- Manually-wrapping comment drops the "same modern idiom" tail that
  duplicated the preceding sentence

MessageStore:
- Merge the stale pre-v1.4.10 sqlScanLimit comment with the new
  v1.4.10 commentary; the cap mention now describes the historical
  reason rather than a parameter that no longer exists
2026-05-16 12:49:01 +02:00
JonKazama-Hellion f66316161b fix(autotells): preload tell history fully up to the user-configured limit
PreloadHistory had a hardcoded 500-row SQL scan window that capped the
per-partner history pull regardless of the AutoTellTabsHistoryPreload
setting. For active users with many tell partners, the scan window
filled up with chatter from other partners and pushed less-frequent
partners' history off the back end — pinned tabs reloaded empty even
though the messages were still in the database.

Drops the hardcoded scan cap. The (Receiver, Date) index keeps SQL fast
on the now-unbounded read, and the client-side loop still breaks as
soon as the configured per-tab limit is hit, so decode cost stays
proportional to the depth at which `limit` matches accumulate (typically
shallow even for chatty users).
2026-05-16 12:16:08 +02:00
JonKazama-Hellion 679b8f0f5e feat(settings): toggle for the symbol-picker chat-input button
Adds a Configuration property, defaulted to enabled, and a checkbox in
the Chat settings tab's Behaviour section. Strings live in HellionStrings
so DE/EN stays in sync. Defaults aligned with our 'discoverable by
default, hidden by user choice' convention. Schema stays at v17 — the
new boolean is additive, the default constructor covers existing configs.
2026-05-16 10:05:37 +02:00
JonKazama-Hellion 0e470fcdce feat(ui): SymbolPicker BMP tab and session-only recents
Second tab exposes the server-verified BMP whitelist (round-tripped via
/echo and /say in the v1.4.10 preflight). Recent-used row at the top
floats the user's last sixteen picks across both tabs, move-to-front
on reuse. Recents stay session-only by design — no Configuration touch,
schema unchanged.
2026-05-16 09:27:58 +02:00
JonKazama-Hellion abbbf95002 feat(ui): add SymbolPicker popup with FFXIV icon tab
New popup attached to the chat input lets the user browse and insert
Dalamud SeIconChar glyphs (161 PUA codepoints, server-safe by design).
Search field filters by enum name. Multi-insert keeps the popup open
until the user clicks elsewhere. BMP tab follows in the next commit.
2026-05-16 01:11:12 +02:00
JonKazama-Hellion fbbbeebade refactor(commands): cache slash-command wrappers in private fields
TearDownCommands attached the same instance via re-Register with identical
args, which was functionally a no-op but masked a latent bug if Description
or ShowInHelp ever diverged between Setup and Teardown. Hold the wrapper
instances as nullable fields so Teardown can detach the live registration
directly. Mirrors the cached-wrapper pattern in ChatLogWindow.
2026-05-15 20:18:41 +02:00
45 changed files with 2112 additions and 507 deletions
+36
View File
@@ -0,0 +1,36 @@
---
subtitle: Symbol-Picker und Tell-History Fix
versionsnatur: Feature-Patch + Hotfix
---
- Symbol-Picker im Chat-Eingang: ein kleiner Smile-Button links neben
dem Kanal-Indikator öffnet ein Popup mit zwei Tabs. Der erste listet
alle 161 FFXIV-PUA-Glyphen (Dalamuds SeIconChar); der zweite trägt
97 verifizierte BMP-Symbole (Latin-Marken, Währungen, das ganze
griechische Alphabet, Geometrie, Spielkarten, Noten) — jedes davon
über `/echo` und `/say` in einer vierrundigen Whitelist-Probe
durchgereicht, damit der Channel-Render dem entspricht, was der
Picker anzeigt. Klick fügt das Symbol an der Cursor-Position ein,
Multi-Insert lässt das Popup offen, eine Recent-Used-Leiste zeigt
die letzten sechzehn Picks über beide Tabs. Toggle in Settings →
Chat → Nachrichten-Verhalten, Default an.
- Verlauf in angepinnten Tell-Tabs lädt wieder vollständig: ein
versteckter 500-Zeilen-Scan-Cap in PreloadHistory hat das
User-Setting `AutoTellTabsHistoryPreload` überschrieben, wodurch
weniger-frequente Tell-Partner ihren Backlog verloren haben sobald
die Scan-Schicht mit anderen Chat-Partnern voll lief. Cap ist raus,
der Index auf `(Receiver, Date)` hält die Query schnell.
- Slash-Command-Teardown: /hellion, /hellionView, /hellionDebugger
(und im Debug-Build /hellionSeString) sind als private Felder
gecached. Plugin-Dispose detached die echte Registrierung, statt
mit identischen Args neu zu registrieren — schließt eine latente
Wartungs-Falle aus v1.4.9.
- v1.4.x-Polish-Sweep endet hier. Der ImGuiListClipper-Refactor von
der v1.4.10-Reserve-Liste wurde gecancelt, nachdem der Cross-
Plattform-Smoke gezeigt hat dass das Scroll-Gummi ein Wine/Linux-
Quirk ist — Windows-User haben es nie gesehen. Spike dafür kommt in
einem späteren Patch. Nächster Major-Cycle ist v1.5.0 mit der
DI-Container-Adoption (`Microsoft.Extensions.Hosting` +
`ILogger<T>`) nach dem Lightless-Vorbild.
- Migration v17 unverändert: kein Schema-Bump, kein
Config-Migrations-Aufwand.
+37
View File
@@ -0,0 +1,37 @@
---
subtitle: DI Foundation und Service-Refactor
versionsnatur: Architektur-Cycle
---
- **Architektur-Umbau ohne User-spürbare Verhaltens-Änderung:** der
Plugin-Bootstrap wechselt auf einen Generic-Host DI-Container
(`Microsoft.Extensions.Hosting` + `IServiceCollection`) nach dem
Lightless-Sync-Muster. 18 Service-Klassen wandern von einem
statischen `Plugin.LogProxy`-Locator auf typisierte
`ILogger<T>`-Constructor-Injection. `DalamudLogger` brückt
`Microsoft.Extensions.Logging` über auf Dalamuds `IPluginLog`
im xllog erscheinen jetzt Service-spezifische Spalten wie
`[ MessageManager]` und `[Honori...ervice]`.
- **Plugin.LogProxy bleibt für die acht Buckets erhalten,** die
Constructor-Injection nicht erreicht: Static-Helper (EmoteCache,
AutoTranslate, MemoryUtil, WrapperUtil), Dalamud-Reflektion
(Configuration), Data-Class mit Massen-Instanziierung (Message)
und Instanz-Klassen die nur aus Static-Methods loggen (FontManager,
eine GameFunctions-Stelle).
- **Performance bestätigt durch Cross-Plugin-Baseline:** HellionChat
First-Frame-HITCH 77 ms Median, Chat 2 v1.40.2 74 ms Median — kein
DI-Penalty gegenüber dem Upstream-Fork-Origin. Lightless und
XIVInstantMessenger liegen bei ~7 ms weil sie ihren FontAtlas-Build
deferren; das wird das v1.5.1-Item.
- **User-sichtbarer Bug-Fix nebenbei:** Slash-Command-Einfügen in das
Chat-Eingabefeld (Friend-List "/tell"-Action plus Plugin-Inserts
von Artisan, AllaganTools und ähnlichen) ersetzt jetzt den
vorhandenen Input, statt anzukonkatenieren. Cherry-Pick aus ChatTwo
upstream `ee7768ac` mit Namespace-Anpassung.
- **Foundation für die Plugin-Integrations-Wave:** v1.5.7-11
(Context-Menu, NotificationMaster, Moodles, ExtraChat, XIVIM
Quick-DM) werden ab jetzt strukturell handhabbar — neue Services
sind ein `services.AddSingleton<T>` plus ein paar Factory-Lambda-
Zeilen, kein Plugin.cs-Anflanschen mehr.
- Migration v17 unverändert: kein Schema-Bump, kein
Config-Migrations-Aufwand.
+18 -12
View File
@@ -9,6 +9,7 @@ using HellionChat.Code;
using HellionChat.GameFunctions.Types;
using HellionChat.Resources;
using HellionChat.Util;
using Microsoft.Extensions.Logging;
namespace HellionChat;
@@ -19,6 +20,7 @@ internal sealed class AutoTellTabsService : IDisposable
private readonly Plugin _plugin;
private readonly MessageManager _messageManager;
private readonly MessageStore _store;
private readonly ILogger<AutoTellTabsService> _logger;
private readonly object _tempTabsLock = new();
// Hard cap on pinned TempTabs so the sidebar doesn't inflate over years
@@ -29,11 +31,17 @@ internal sealed class AutoTellTabsService : IDisposable
private bool _initialized;
internal AutoTellTabsService(Plugin plugin, MessageManager messageManager, MessageStore store)
internal AutoTellTabsService(
Plugin plugin,
MessageManager messageManager,
MessageStore store,
ILogger<AutoTellTabsService> logger
)
{
_plugin = plugin;
_messageManager = messageManager;
_store = store;
_logger = logger;
}
// Derived from the tab list on read. Pin/Unpin/Promote/Logout simply
@@ -67,7 +75,7 @@ internal sealed class AutoTellTabsService : IDisposable
private void RehydratePinnedTabs()
{
var pinned = Plugin.Config.Tabs.Count(TabLifecycleHelpers.IsInPinnedPool);
Plugin.LogProxy.Debug($"[Pin] Rehydrate scan: {pinned} pinned tab(s) found");
_logger.LogDebug($"[Pin] Rehydrate scan: {pinned} pinned tab(s) found");
foreach (var tab in Plugin.Config.Tabs)
{
@@ -76,7 +84,7 @@ internal sealed class AutoTellTabsService : IDisposable
if (tab.TellTarget is null || !tab.TellTarget.IsSet())
{
Plugin.LogProxy.Warning(
_logger.LogWarning(
$"[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."
@@ -93,7 +101,7 @@ internal sealed class AutoTellTabsService : IDisposable
// sees the recent conversation, not a blank tab.
PreloadHistory(tab, tab.TellTarget.Name, tab.TellTarget.World, Guid.Empty);
Plugin.LogProxy.Debug(
_logger.LogDebug(
$"[Pin] Rehydrated '{tab.Name}' -> Tell target {tab.TellTarget.Name}@{tab.TellTarget.World}"
);
}
@@ -130,7 +138,7 @@ internal sealed class AutoTellTabsService : IDisposable
if (partner == null)
{
// Diagnostics: helps detect regressions (FFXIV payload changes, new edge cases)
Plugin.LogProxy.Warning(
_logger.LogWarning(
$"[AutoTellTabs] Could not extract tell partner. type={message.Code.Type}, "
+ $"senderChunks={message.Sender.Count}, contentChunks={message.Content.Count}, "
+ $"senderSourcePayloads={message.SenderSource?.Payloads?.Count ?? 0}, "
@@ -361,7 +369,7 @@ internal sealed class AutoTellTabsService : IDisposable
catch (Exception ex)
{
// Non-fatal: tab still spawns with visible error notice instead of silent history loss
Plugin.LogProxy.Error(ex, "[AutoTellTabs] History preload failed");
_logger.LogError(ex, "[AutoTellTabs] History preload failed");
tab.Messages.AddPrune(
MakeSystemMarker(HellionStrings.AutoTellTabs_HistoryLoadError),
MessageManager.MessageDisplayLimit
@@ -456,7 +464,7 @@ internal sealed class AutoTellTabsService : IDisposable
{
if (!tab.IsTempTab || tab.IsPinned)
{
Plugin.LogProxy.Debug(
_logger.LogDebug(
$"[Pin] TryPin skipped: IsTempTab={tab.IsTempTab} IsPinned={tab.IsPinned}"
);
return false;
@@ -472,7 +480,7 @@ internal sealed class AutoTellTabsService : IDisposable
}
tab.IsPinned = true;
Plugin.LogProxy.Debug(
_logger.LogDebug(
$"[Pin] Pinned tab '{tab.Name}' target={tab.TellTarget?.Name}@{tab.TellTarget?.World}"
);
_plugin.SaveConfig();
@@ -495,7 +503,7 @@ internal sealed class AutoTellTabsService : IDisposable
}
tab.IsPinned = false;
Plugin.LogProxy.Debug("[Pin] Unpinned tab '{tab.Name}'");
_logger.LogDebug("[Pin] Unpinned tab '{TabName}'", tab.Name);
_plugin.SaveConfig();
}
@@ -509,9 +517,7 @@ internal sealed class AutoTellTabsService : IDisposable
tab.IsTempTab = false;
tab.IsPinned = false;
tab.TellTarget = TellTarget.Empty();
Plugin.LogProxy.Debug(
$"[Pin] Promoted tab '{tab.Name}' to permanent (tell-binding dropped)"
);
_logger.LogDebug($"[Pin] Promoted tab '{tab.Name}' to permanent (tell-binding dropped)");
_plugin.SaveConfig();
}
}
+9 -2
View File
@@ -1,10 +1,17 @@
using Dalamud.Game.Command;
using Microsoft.Extensions.Logging;
namespace HellionChat;
internal sealed class Commands : IDisposable
{
private readonly Dictionary<string, CommandWrapper> Registered = [];
private readonly ILogger<Commands> _logger;
public Commands(ILogger<Commands> logger)
{
_logger = logger;
}
public void Dispose()
{
@@ -52,7 +59,7 @@ internal sealed class Commands : IDisposable
{
if (!Registered.TryGetValue(command, out var wrapper))
{
Plugin.LogProxy.Warning($"Missing registration for command {command}");
_logger.LogWarning($"Missing registration for command {command}");
return;
}
@@ -62,7 +69,7 @@ internal sealed class Commands : IDisposable
}
catch (Exception ex)
{
Plugin.LogProxy.Error(ex, $"Error while executing command {command}");
_logger.LogError(ex, $"Error while executing command {command}");
}
}
}
+2
View File
@@ -176,6 +176,7 @@ public class Configuration : IPluginConfiguration
public bool SortAutoTranslate;
public bool CollapseDuplicateMessages;
public bool CollapseKeepUniqueLinks;
public bool SymbolPickerEnabled = true;
public bool PlaySounds = true;
public bool KeepInputFocus = true;
public int MaxLinesToRender = 2_500; // 1-10000
@@ -270,6 +271,7 @@ public class Configuration : IPluginConfiguration
SortAutoTranslate = other.SortAutoTranslate;
CollapseDuplicateMessages = other.CollapseDuplicateMessages;
CollapseKeepUniqueLinks = other.CollapseKeepUniqueLinks;
SymbolPickerEnabled = other.SymbolPickerEnabled;
PlaySounds = other.PlaySounds;
KeepInputFocus = other.KeepInputFocus;
MaxLinesToRender = other.MaxLinesToRender;
+6 -3
View File
@@ -8,6 +8,9 @@ using Dalamud.Interface.Utility;
namespace HellionChat;
// Two LogProxy sites live in static methods (TryGetHellionFontBytes,
// AddFontWithFallback); a ctor-injected ILogger would not be reachable
// from those scopes, so the class stays on Plugin.LogProxy.
public class FontManager
{
internal IFontHandle Axis = null!;
@@ -234,9 +237,9 @@ public class FontManager
or ArgumentException
)
{
// 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.
// 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,
$"Configured {slot} font failed to load ({e.GetType().Name}), "
+11 -7
View File
@@ -19,6 +19,7 @@ using HellionChat.Resources;
using HellionChat.Util;
using InteropGenerator.Runtime;
using Lumina.Text.ReadOnly;
using Microsoft.Extensions.Logging;
using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.AtkValueType;
namespace HellionChat.GameFunctions;
@@ -98,9 +99,12 @@ internal sealed unsafe class Chat : IDisposable
private long LastPlayerNameDisplayTypeRefresh;
private PlayerNameDisplayType CurrentPlayerNameDisplayType = PlayerNameDisplayType.FullName;
public Chat(Plugin plugin)
private readonly ILogger<Chat> _logger;
public Chat(Plugin plugin, ILogger<Chat> logger)
{
Plugin = plugin;
_logger = logger;
Plugin.GameInteropProvider.InitializeFromAttributes(this);
ChatLogRefreshHook?.Enable();
@@ -236,7 +240,7 @@ internal sealed unsafe class Chat : IDisposable
}
catch (Exception ex)
{
Plugin.LogProxy.Error(ex, "Error in chat Activated event");
_logger.LogError(ex, "Error in chat Activated event");
}
});
}
@@ -266,7 +270,7 @@ internal sealed unsafe class Chat : IDisposable
}
catch (Exception ex)
{
Plugin.LogProxy.Error(ex, "Error in chat Activated event");
_logger.LogError(ex, "Error in chat Activated event");
}
return 1; // Prevent vanilla chat log from gaining focus
@@ -299,7 +303,7 @@ internal sealed unsafe class Chat : IDisposable
{
playerName = SeString.Parse(agent->TellPlayerName).TextValue;
worldId = agent->TellWorldId;
Plugin.LogProxy.Debug($"Detected tell target '[redacted]'@{worldId}");
_logger.LogDebug($"Detected tell target '[redacted]'@{worldId}");
}
Plugin.CurrentTab.CurrentChannel = new UsedChannel
@@ -358,7 +362,7 @@ internal sealed unsafe class Chat : IDisposable
}
catch (Exception ex)
{
Plugin.LogProxy.Error(ex, "Error in chat Activated event");
_logger.LogError(ex, "Error in chat Activated event");
}
}
@@ -408,7 +412,7 @@ internal sealed unsafe class Chat : IDisposable
}
catch (Exception ex)
{
Plugin.LogProxy.Error(ex, "Error in chat Activated event");
_logger.LogError(ex, "Error in chat Activated event");
}
}
@@ -624,7 +628,7 @@ internal sealed unsafe class Chat : IDisposable
if (contentId == 0)
{
Plugin.ChatGui.PrintError(Language.Chat_SendTell_Error);
Plugin.LogProxy.Warning(
_logger.LogWarning(
"Tried to send a tell with ContentId being 0, sorry this is an internal error."
);
return;
+12 -4
View File
@@ -14,6 +14,7 @@ using FFXIVClientStructs.FFXIV.Client.UI.Info;
using FFXIVClientStructs.FFXIV.Component.GUI;
using Lumina.Excel;
using Lumina.Excel.Sheets;
using Microsoft.Extensions.Logging;
using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.AtkValueType;
namespace HellionChat.GameFunctions;
@@ -37,14 +38,20 @@ internal unsafe class GameFunctions : IDisposable
#endregion
private Plugin Plugin { get; }
private readonly ILogger<GameFunctions> _logger;
internal KeybindManager KeybindManager { get; }
internal Chat Chat { get; }
internal GameFunctions(Plugin plugin)
internal GameFunctions(
Plugin plugin,
ILogger<GameFunctions> logger,
ILoggerFactory loggerFactory
)
{
Plugin = plugin;
KeybindManager = new KeybindManager(plugin);
Chat = new Chat(Plugin);
_logger = logger;
KeybindManager = new KeybindManager(plugin, loggerFactory.CreateLogger<KeybindManager>());
Chat = new Chat(Plugin, loggerFactory.CreateLogger<Chat>());
Plugin.GameInteropProvider.InitializeFromAttributes(this);
ResolveTextCommandPlaceholderHook?.Enable();
@@ -215,6 +222,7 @@ internal unsafe class GameFunctions : IDisposable
}
catch (Exception e)
{
// Static method, no instance _logger reachable here.
Plugin.LogProxy.Warning(e, "Unable to open adventurer plate");
return false;
}
@@ -255,7 +263,7 @@ internal unsafe class GameFunctions : IDisposable
var byteCount = System.Text.Encoding.UTF8.GetByteCount(ReplacementName);
if (byteCount >= PlaceholderBufferSize)
{
Plugin.LogProxy.Warning(
_logger.LogWarning(
$"Replacement name too long for placeholder buffer ({byteCount} bytes >= {PlaceholderBufferSize}); falling back to original."
);
ReplacementName = null;
+6 -2
View File
@@ -8,6 +8,7 @@ using FFXIVClientStructs.FFXIV.Client.UI;
using HellionChat.Code;
using HellionChat.GameFunctions.Types;
using HellionChat.Util;
using Microsoft.Extensions.Logging;
using ModifierFlag = HellionChat.GameFunctions.Types.ModifierFlag;
namespace HellionChat.GameFunctions;
@@ -306,9 +307,12 @@ internal unsafe class KeybindManager : IDisposable
// VirtualKey.OEM_CLEAR,
};
internal KeybindManager(Plugin plugin)
private readonly ILogger<KeybindManager> _logger;
internal KeybindManager(Plugin plugin, ILogger<KeybindManager> logger)
{
Plugin = plugin;
_logger = logger;
Plugin.GameInteropProvider.InitializeFromAttributes(this);
// Handle keybinds from the game on every tick.
@@ -507,7 +511,7 @@ internal unsafe class KeybindManager : IDisposable
}
catch (Exception ex)
{
Plugin.LogProxy.Error(ex, "Error in chat Activated event");
_logger.LogError(ex, "Error in chat Activated event");
}
}
+9 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Dalamud.NET.Sdk/15.0.0">
<PropertyGroup>
<!-- Independent versioning; see yaml changelog for upstream Chat 2 base -->
<Version>1.4.9</Version>
<Version>1.5.0</Version>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<!-- Use lock file to pin exact versions -->
@@ -15,6 +15,14 @@
<!-- Closed ranges prevent surprise major bumps during lock file regeneration -->
<PackageReference Include="MessagePack" Version="[3.1.4, 4.0.0)" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.7" />
<!-- v1.5.0 DI-container foundation; matches Lightless pin (Hosting 10.0.7) -->
<PackageReference
Include="Microsoft.Extensions.DependencyInjection"
Version="[10.0.7, 11.0.0)"
/>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="[10.0.7, 11.0.0)" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="[10.0.7, 11.0.0)" />
<PackageReference Include="Microsoft.Extensions.Options" Version="[10.0.7, 11.0.0)" />
<!-- SQLitePCLRaw override for CVE-2025-6965, CVE-2025-7709 (SQLite >= 3.50.3) -->
<PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" Version="3.50.3" />
<PackageReference Include="morelinq" Version="4.4.0" />
+92 -82
View File
@@ -35,6 +35,98 @@ tags:
- Replacement
- Privacy
changelog: |-
**v1.5.0 — DI Foundation and Service Refactor (2026-05-17)**
Major architecture cycle. The plugin bootstrap moves to a
generic-host DI container (Microsoft.Extensions.Hosting +
IServiceCollection) modelled on Lightless Sync. Service logging
moves from a static Plugin.LogProxy locator to typed
Microsoft.Extensions.Logging.ILogger<T> via constructor injection,
bridged over Dalamud's IPluginLog by a custom DalamudLogger trio.
What changes under the hood:
- 18 instance-class services migrate to ILogger<T> via constructor
injection across four slices: data layer (MessageStore,
MessageManager, AutoTellTabsService), IPC and integrations
(HonorificService, IpcManager, TypingIpc, ExtraChat, the three
GameFunctions classes), UI window layer (ChatLogWindow,
DbViewer, Popout, three settings tabs), and root (Commands,
ThemeRegistry, PayloadHandler).
- Plugin.LogProxy stays in place for the eight buckets ctor
injection cannot reach: static helpers (EmoteCache,
AutoTranslate, MemoryUtil, WrapperUtil), Dalamud-reflected
types (Configuration), the Message data class, and instance
classes that only log from static methods (FontManager, one
GameFunctions site).
- Plugin.cs finishes at 1012 lines — virtually identical to the
pre-cycle 1013. The new Phase-1 host build and Plugin.X bridge
wiring trade out exactly the service and window allocations
that previously lived in LoadAsync.
- Cross-plugin baseline confirms no performance penalty against
Chat 2: HellionChat first-frame HITCH 77 ms median, Chat 2
74 ms median. Lightless and XIVInstantMessenger sit around
7 ms by deferring their font-atlas build past Finished
loading — that pattern is the v1.5.1 follow-up.
User-visible:
- Slash-command insert fix: pasting a slash command into the
chat input (Friend List "/tell" action, plugin-driven inserts
from Artisan, AllaganTools etc.) now replaces the existing
input instead of concatenating. Cherry-picked from ChatTwo
upstream ee7768ac with namespace adaptation.
Migration v17 stays (no schema bump).
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
---
**v1.4.10 — Symbol-Picker and Tell-History Fix (2026-05-16)**
Eleventh and final sub-patch of the v1.4.x polish-sweep series.
Symbol picker for the chat input, a tell-history reload fix for
users with many active partners, and a closing cleanup sweep
before v1.5.0 picks up the DI-container adoption.
- Symbol picker: a small smile-icon button left of the channel
indicator opens a popup with two tabs. The first lists all 161
FFXIV PUA glyphs (Dalamud's SeIconChar enum); the second
carries 97 server-verified BMP symbols (latin marks, currency,
the full Greek alphabet, geometric shapes, suits, notes) —
every one of them round-tripped through /echo and /say in a
four-round probe so the in-channel render matches what the
picker shows. Click drops the glyph at the caret, multi-insert
keeps the popup open, and a recent-used strip floats the last
sixteen picks across both tabs. Toggle in Settings → Chat →
Message behaviour, default on.
- Pinned auto-tell tabs reload their full history again: a
hidden 500-row scan cap in PreloadHistory used to override the
user-configurable AutoTellTabsHistoryPreload setting, so
less-frequent pinned partners (rare /tell sessions in an
otherwise busy week) lost their backlog. The cap is removed;
the (Receiver, Date) index keeps SQL fast, the client-side
loop still respects your setting as the upper bound.
- Slash-command teardown: /hellion, /hellionView,
/hellionDebugger (and #if DEBUG /hellionSeString) wrappers are
now cached as private fields. Plugin teardown detaches the
live registration instead of re-Register'ing with identical
args — closes a latent maintenance hazard from v1.4.9.
- v1.4.x polish-sweep wraps up here. The ImGuiListClipper render
refactor that was on the v1.4.10 reserve list got dropped
after cross-platform smoke showed the scroll rubber-band is a
Wine / Linux render-pipeline quirk, not universal — Windows
users never saw it. It will get its own platform-targeted
spike in a later patch. Next major cycle is v1.5.0 with the
DI-container adoption (Microsoft.Extensions.Hosting +
ILogger<T>) modelled on Lightless.
- Migration v17 stays (no schema bump).
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
---
**v1.4.9 — Plugin-Load Render Polish (2026-05-15)**
Tenth sub-patch of the v1.4.x polish-sweep series. First-frame
@@ -107,86 +199,4 @@ changelog: |-
---
**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).
---
Full history: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases
@@ -0,0 +1,98 @@
using Dalamud.Plugin;
using HellionChat.Ipc;
using HellionChat.Themes;
using Microsoft.Extensions.Hosting;
namespace HellionChat.Infrastructure.Hosting;
// Adapter shells around IHostedService so the host triggers each service's
// existing init method without touching the service class itself. Empty
// adapters still earn their place: registering them forces an eager resolve
// at Build, which runs the service ctor (IPC subscribe etc.) right then
// instead of lazily on first GetRequiredService.
internal sealed class FontManagerInitHostedService(FontManager fontManager) : IHostedService
{
public Task StartAsync(CancellationToken cancellationToken)
{
fontManager.BuildFonts();
return Task.CompletedTask;
}
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
}
internal sealed class ThemeRegistryInitHostedService(ThemeRegistry registry) : IHostedService
{
public Task StartAsync(CancellationToken cancellationToken)
{
// Materialise the lazy AllCustom enumerable so the slug lookup hits a
// warm cache; otherwise the first Switch falls through to the built-in
// default when Config.Theme points at a custom slug.
foreach (var _ in registry.AllCustom()) { }
registry.Switch(Plugin.Config.Theme);
return Task.CompletedTask;
}
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
}
// IPC subscribers do their wiring in the ctor, so StartAsync stays empty —
// the registration alone forces an eager resolve which runs that wiring.
internal sealed class IpcManagerInitHostedService(IpcManager ipc) : IHostedService
{
private readonly IpcManager _ipc = ipc;
public Task StartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
}
internal sealed class TypingIpcInitHostedService(TypingIpc typingIpc) : IHostedService
{
private readonly TypingIpc _typingIpc = typingIpc;
public Task StartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
}
internal sealed class ExtraChatInitHostedService(ExtraChat extraChat) : IHostedService
{
private readonly ExtraChat _extraChat = extraChat;
public Task StartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
}
internal sealed class MessageManagerInitHostedService(
IDalamudPluginInterface pluginInterface,
MessageManager manager
) : IHostedService
{
public Task StartAsync(CancellationToken cancellationToken)
{
// FilterAllTabsAsync rebuilds the per-tab view from the message store;
// on Boot, tabs come up empty and the first chat events fill them, so
// we skip the rebuild to avoid a pointless full-history scan.
if (pluginInterface.Reason is not PluginLoadReason.Boot)
manager.FilterAllTabsAsync();
return Task.CompletedTask;
}
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
}
internal sealed class AutoTellTabsServiceInitHostedService(AutoTellTabsService service)
: IHostedService
{
public Task StartAsync(CancellationToken cancellationToken)
{
service.Initialize();
return Task.CompletedTask;
}
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
}
@@ -0,0 +1,64 @@
using System.Text;
using Dalamud.Plugin.Services;
using Microsoft.Extensions.Logging;
namespace HellionChat.Infrastructure.Logging;
internal sealed class DalamudLogger : ILogger
{
private readonly string _name;
private readonly IPluginLog _pluginLog;
public DalamudLogger(string name, IPluginLog pluginLog)
{
_name = name;
_pluginLog = pluginLog;
}
IDisposable? ILogger.BeginScope<TState>(TState state) => default!;
// Filtering happens in Dalamud's /xllog. Letting every level through keeps
// the HellionChat side stateless; if we ever want a per-plugin floor we add
// a Config.LogLevel and tighten this method.
public bool IsEnabled(LogLevel logLevel) => true;
public void Log<TState>(
LogLevel logLevel,
EventId eventId,
TState state,
Exception? exception,
Func<TState, Exception?, string> formatter
)
{
if (!IsEnabled(logLevel))
return;
// U+200B between the bracket and the level is a quiet provenance
// marker; byte-distinguishable from any 1:1 port of this format.
if ((int)logLevel <= (int)LogLevel.Information)
{
_pluginLog.Information($"[{_name}]{{{(int)logLevel}}} {state}");
return;
}
var sb = new StringBuilder();
sb.Append($"[{_name}]{{{(int)logLevel}}} {state} {exception?.Message}");
if (!string.IsNullOrWhiteSpace(exception?.StackTrace))
sb.AppendLine(exception.StackTrace);
var inner = exception?.InnerException;
while (inner != null)
{
sb.AppendLine($"InnerException {inner}: {inner.Message}");
sb.AppendLine(inner.StackTrace);
inner = inner.InnerException;
}
if (logLevel == LogLevel.Warning)
_pluginLog.Warning(sb.ToString());
else if (logLevel == LogLevel.Error)
_pluginLog.Error(sb.ToString());
else
_pluginLog.Fatal(sb.ToString());
}
}
@@ -0,0 +1,73 @@
using System.Collections.Concurrent;
using System.Reflection;
using System.Security.Cryptography;
using System.Text;
using Dalamud.Plugin.Services;
using Microsoft.Extensions.Logging;
namespace HellionChat.Infrastructure.Logging;
[ProviderAlias("Dalamud")]
public sealed class DalamudLoggingProvider : ILoggerProvider
{
// Hellion Forge Bronze (#C2410C). Mixed into the bootstrap fingerprint.
private const string HellionMarker = "HellionForgeBronzeC2410C";
private readonly ConcurrentDictionary<string, DalamudLogger> _loggers = new(
StringComparer.OrdinalIgnoreCase
);
private readonly IPluginLog _pluginLog;
public DalamudLoggingProvider(IPluginLog pluginLog)
{
_pluginLog = pluginLog;
EmitBootstrapBanner();
}
// One-shot per plugin load. Intentionally visible in xllog so uncredited
// ports of the DalamudLogger trio keep announcing their origin.
private void EmitBootstrapBanner()
{
var version =
typeof(DalamudLoggingProvider).Assembly.GetName().Version?.ToString() ?? "0.0.0";
var fingerprint = ComputeFingerprint(version);
_pluginLog.Information(
$"HellionChat DI-Logger bootstrap v{version} fingerprint={fingerprint}"
);
}
private static string ComputeFingerprint(string version)
{
var seed = Encoding.UTF8.GetBytes($"{HellionMarker}-{version}");
var hash = SHA256.HashData(seed);
var sb = new StringBuilder(8);
for (var i = 0; i < 4; i++)
sb.Append(hash[i].ToString("x2"));
return sb.ToString();
}
public ILogger CreateLogger(string categoryName)
{
// Category-name normalisation mirrors Lightless: take the leaf type
// name, then either ellipsis-trim long ones or left-pad short ones to
// 15 chars so the xllog column stays aligned across services.
var catName = categoryName.Split(".", StringSplitOptions.RemoveEmptyEntries).Last();
if (catName.Length > 15)
catName = string.Concat(
catName.AsSpan(0, 6),
"...",
catName.AsSpan(catName.Length - 6, 6)
);
else
catName = catName.PadLeft(15);
return _loggers.GetOrAdd(catName, name => new DalamudLogger(name, _pluginLog));
}
public void Dispose()
{
_loggers.Clear();
GC.SuppressFinalize(this);
}
}
@@ -0,0 +1,23 @@
using Dalamud.Plugin.Services;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Logging;
namespace HellionChat.Infrastructure.Logging;
public static class DalamudLoggingProviderExtensions
{
public static ILoggingBuilder AddDalamudLogging(
this ILoggingBuilder builder,
IPluginLog pluginLog
)
{
builder.ClearProviders();
builder.Services.TryAddEnumerable(
ServiceDescriptor.Singleton<ILoggerProvider, DalamudLoggingProvider>(
_ => new DalamudLoggingProvider(pluginLog)
)
);
return builder;
}
}
+7 -6
View File
@@ -2,6 +2,7 @@ using System;
using Dalamud.Plugin;
using Dalamud.Plugin.Ipc;
using Dalamud.Plugin.Services;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
namespace HellionChat.Integrations;
@@ -23,7 +24,7 @@ internal sealed class HonorificService : IDisposable
private readonly ICallGateSubscriber<object> _ready;
private readonly ICallGateSubscriber<object> _disposing;
private readonly IPluginLog _log;
private readonly ILogger<HonorificService> _logger;
private readonly IFramework _framework;
private bool _versionWarningLogged;
@@ -34,12 +35,12 @@ internal sealed class HonorificService : IDisposable
public HonorificService(
IDalamudPluginInterface pluginInterface,
IPluginLog log,
ILogger<HonorificService> logger,
IFramework framework
)
{
_framework = framework;
_log = log;
_logger = logger;
// Gate objects are cached per-name by Dalamud and safe to register
// before Honorific loads — they just won't fire until it does.
@@ -84,7 +85,7 @@ internal sealed class HonorificService : IDisposable
{
if (!_versionWarningLogged)
{
_log.Warning(
_logger.LogWarning(
"Honorific API version mismatch — expected major 3, "
+ "found {Major}.{Minor}. Disabling Honorific integration.",
version.Item1,
@@ -104,7 +105,7 @@ internal sealed class HonorificService : IDisposable
catch (Exception ex)
{
// Honorific not installed or not yet initialised — Ready will retry.
_log.Debug(ex, "Honorific not available at HellionChat startup; awaiting Ready.");
_logger.LogDebug(ex, "Honorific not available at HellionChat startup; awaiting Ready.");
IsAvailable = false;
CurrentTitle = null;
}
@@ -149,7 +150,7 @@ internal sealed class HonorificService : IDisposable
{
// Warning not Debug — a silent unsubscribe failure leaks a live
// subscription across plugin reloads.
_log.Warning(
_logger.LogWarning(
ex,
"Honorific unsubscribe failed (likely API break or gate already gone)."
);
+6 -5
View File
@@ -1,9 +1,12 @@
using Dalamud.Plugin.Ipc;
using Microsoft.Extensions.Logging;
namespace HellionChat.Ipc;
public sealed class ExtraChat : IDisposable
{
private readonly ILogger<ExtraChat> _logger;
#pragma warning disable CS0649 // Assigned through IPC
[Serializable]
private struct OverrideInfo
@@ -36,8 +39,9 @@ public sealed class ExtraChat : IDisposable
private volatile Dictionary<Guid, string> ChannelNamesInternal = new();
internal IReadOnlyDictionary<Guid, string> ChannelNames => ChannelNamesInternal;
internal ExtraChat()
internal ExtraChat(ILogger<ExtraChat> logger)
{
_logger = logger;
OverrideChannelGate = Plugin.Interface.GetIpcSubscriber<OverrideInfo, object>(
"ExtraChat.OverrideChannelColour"
);
@@ -62,10 +66,7 @@ public sealed class ExtraChat : IDisposable
catch (Exception ex)
{
// ExtraChat is optional; IPC failure is normal when the plugin isn't loaded.
Plugin.LogProxy.Verbose(
ex,
"ExtraChat IPC initial state query failed (peer not loaded?)"
);
_logger.LogTrace(ex, "ExtraChat IPC initial state query failed (peer not loaded?)");
}
}
+5 -1
View File
@@ -1,5 +1,6 @@
using Dalamud.Plugin.Ipc;
using HellionChat.Code;
using Microsoft.Extensions.Logging;
namespace HellionChat.Ipc;
@@ -33,9 +34,12 @@ internal sealed class TypingIpc : IDisposable
private ChatInputState LastState;
private bool HasState;
internal TypingIpc(Plugin plugin)
private readonly ILogger<TypingIpc> _logger;
internal TypingIpc(Plugin plugin, ILogger<TypingIpc> logger)
{
Plugin = plugin;
_logger = logger;
StateQueryGate = Plugin.Interface.GetIpcProvider<ChatInputState>(
"HellionChat.GetChatInputState"
+5 -1
View File
@@ -1,11 +1,14 @@
using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Plugin.Ipc;
using Microsoft.Extensions.Logging;
namespace HellionChat;
internal sealed class IpcManager : IDisposable
{
private readonly ILogger<IpcManager> _logger;
private ICallGateProvider<string> RegisterGate { get; }
private ICallGateProvider<string, object?> UnregisterGate { get; }
private ICallGateProvider<object?> AvailableGate { get; }
@@ -41,8 +44,9 @@ internal sealed class IpcManager : IDisposable
internal List<string> Registered { get; } = [];
public IpcManager()
public IpcManager(ILogger<IpcManager> logger)
{
_logger = logger;
RegisterGate = Plugin.Interface.GetIpcProvider<string>("HellionChat.Register");
RegisterGate.RegisterFunc(Register);
+21 -9
View File
@@ -14,6 +14,7 @@ using HellionChat.Util;
using Lumina.Text.Expressions;
using Lumina.Text.Payloads;
using Lumina.Text.ReadOnly;
using Microsoft.Extensions.Logging;
namespace HellionChat;
@@ -22,6 +23,7 @@ internal class MessageManager : IAsyncDisposable
internal const int MessageDisplayLimit = 10_000;
private Plugin Plugin { get; }
private readonly ILogger<MessageManager> _logger;
internal MessageStore Store { get; }
private Dictionary<ChatType, NameFormatting> Formats { get; } = [];
@@ -48,11 +50,21 @@ internal class MessageManager : IAsyncDisposable
// AutoTellTabsService to spawn or refresh temp tabs without coupling.
public event Action<Message>? MessageProcessed;
internal unsafe MessageManager(Plugin plugin)
internal unsafe MessageManager(
Plugin plugin,
ILogger<MessageManager> logger,
ILoggerFactory loggerFactory
)
{
Plugin = plugin;
_logger = logger;
Store = new MessageStore(DatabasePath(), Plugin.PlatformUtil, Plugin.LogProxy);
Store = new MessageStore(
DatabasePath(),
Plugin.PlatformUtil,
loggerFactory.CreateLogger<MessageStore>(),
loggerFactory
);
PendingMessageThread = new Thread(() =>
ProcessPendingMessages(PendingThreadCancellationToken.Token)
@@ -91,7 +103,7 @@ internal class MessageManager : IAsyncDisposable
await Task.Delay(100);
if (PendingMessageThread.IsAlive)
Plugin.LogProxy.Warning(
_logger.LogWarning(
"PendingMessageThread did not observe cancellation within 10s. "
+ "Worker remains on background thread; next plugin reload releases it."
);
@@ -137,7 +149,7 @@ internal class MessageManager : IAsyncDisposable
}
catch (Exception ex)
{
Plugin.LogProxy.Error(ex, "Error processing pending message");
_logger.LogError(ex, "Error processing pending message");
}
}
else
@@ -182,12 +194,12 @@ internal class MessageManager : IAsyncDisposable
// Mark failed messages as deleted to prevent retry attempts
var failedIds = messages.FailedMessageIds();
Plugin.LogProxy.Info(
_logger.LogInformation(
$"Marking {failedIds.Count} messages as deleted due to parse failures"
);
foreach (var msgId in messages.FailedMessageIds())
{
Plugin.LogProxy.Debug($"Marking message '{msgId}' as deleted due to parse failure");
_logger.LogDebug($"Marking message '{msgId}' as deleted due to parse failure");
Store.DeleteMessage(msgId);
}
}
@@ -203,13 +215,13 @@ internal class MessageManager : IAsyncDisposable
}
catch (Exception ex)
{
Plugin.LogProxy.Error(ex, "Error in FilterAllTabs");
_logger.LogError(ex, "Error in FilterAllTabs");
}
// v1.4.9 R3 profiling: Information so the xllog tail surfaces this
// without a Debug filter. Belt-and-suspenders for future plugin-load
// regressions; remains in place after Sub-Task 3.4 Befund.
Plugin.LogProxy.Information($"FilterAllTabs took {stopwatch.ElapsedMilliseconds}ms");
_logger.LogInformation($"FilterAllTabs took {stopwatch.ElapsedMilliseconds}ms");
});
}
@@ -264,7 +276,7 @@ internal class MessageManager : IAsyncDisposable
}
catch (Exception ex)
{
Plugin.LogProxy.Error(ex, "Error in ContentIdResolver");
_logger.LogError(ex, "Error in ContentIdResolver");
}
}
+54 -30
View File
@@ -9,6 +9,7 @@ using MessagePack;
using MessagePack.Formatters;
using MessagePack.Resolvers;
using Microsoft.Data.Sqlite;
using Microsoft.Extensions.Logging;
using Encoding = System.Text.Encoding;
namespace HellionChat;
@@ -179,7 +180,8 @@ internal class MessageStore : IDisposable
}
private readonly IPlatformUtil _platformUtil;
private readonly IPluginLogProxy _logger;
private readonly ILogger<MessageStore> _logger;
private readonly ILoggerFactory _loggerFactory;
// Readiness gate for the FTS5 full-text index. Volatile so the DbViewer's
// per-frame IsFtsIndexBuilt read sees the flip the moment the bulk-insert
@@ -197,11 +199,17 @@ internal class MessageStore : IDisposable
// own SqliteConnection via OpenSecondaryConnection.
private readonly object _readLock = new();
internal MessageStore(string dbPath, IPlatformUtil platformUtil, IPluginLogProxy logger)
internal MessageStore(
string dbPath,
IPlatformUtil platformUtil,
ILogger<MessageStore> logger,
ILoggerFactory loggerFactory
)
{
DbPath = dbPath;
_platformUtil = platformUtil;
_logger = logger;
_loggerFactory = loggerFactory;
Connection = Connect();
Migrate();
InitFtsReadyCache();
@@ -246,7 +254,7 @@ internal class MessageStore : IDisposable
conn.Open();
ApplyPragmas(conn);
connectSw.Stop();
_logger.Information($"MessageStore.Connect took {connectSw.ElapsedMilliseconds}ms");
_logger.LogInformation($"MessageStore.Connect took {connectSw.ElapsedMilliseconds}ms");
return conn;
}
@@ -290,12 +298,12 @@ internal class MessageStore : IDisposable
migration();
migrateSw.Stop();
_logger.Information($"MessageStore.Migrate took {migrateSw.ElapsedMilliseconds}ms");
_logger.LogInformation($"MessageStore.Migrate took {migrateSw.ElapsedMilliseconds}ms");
}
private void Migrate0()
{
_logger.Information("Running migration 0: Creating tables");
_logger.LogInformation("Running migration 0: Creating tables");
Connection.Execute(
@"
CREATE TABLE IF NOT EXISTS messages (
@@ -322,7 +330,7 @@ internal class MessageStore : IDisposable
private void Migrate1()
{
_logger.Information("Running migration 1: Adding Deleted column");
_logger.LogInformation("Running migration 1: Adding Deleted column");
Connection.Execute(
@"
ALTER TABLE messages ADD COLUMN Deleted BOOLEAN NOT NULL DEFAULT false;
@@ -334,7 +342,7 @@ internal class MessageStore : IDisposable
private void Migrate2()
{
_logger.Information("Running migration 2: Adding Channel generated column");
_logger.LogInformation("Running migration 2: Adding Channel generated column");
Connection.Execute(
@"
ALTER TABLE messages ADD COLUMN Channel INTEGER GENERATED ALWAYS AS (Code & 0x7f) VIRTUAL;
@@ -362,13 +370,15 @@ internal class MessageStore : IDisposable
private void Migrate3()
{
_logger.Information("Running migration 3: Fix log kinds to fit the new format");
_logger.LogInformation("Running migration 3: Fix log kinds to fit the new format");
// Recovery for partially-applied Migrate3: schema already in target
// shape but user_version was never bumped -- just record and exit.
if (ColumnExists("messages", "ChatType") && !ColumnExists("messages", "Code"))
{
_logger.Information("Migration 3: schema already migrated, only bumping user_version");
_logger.LogInformation(
"Migration 3: schema already migrated, only bumping user_version"
);
SetMigrationVersion(3);
return;
}
@@ -398,7 +408,7 @@ internal class MessageStore : IDisposable
private void Migrate4()
{
_logger.Information("Running migration 4: Add FTS5 virtual table for full-text search");
_logger.LogInformation("Running migration 4: Add FTS5 virtual table for full-text search");
// Standalone FTS5 table (no content='messages' linking, no content_rowid).
// messages.Id is BLOB-PK (Guid), which is incompatible with FTS5's
@@ -422,7 +432,7 @@ internal class MessageStore : IDisposable
private void SetMigrationVersion(int version)
{
_logger.Information($"Setting version {version}");
_logger.LogInformation($"Setting version {version}");
using var cmd = Connection.CreateCommand();
// PRAGMA does not accept SQLite parameter bindings; version is a
// compile-time int from the migration sequence, never user input.
@@ -837,7 +847,7 @@ internal class MessageStore : IDisposable
// Privacy filter -- drop disallowed ChatTypes before they reach storage.
if (!Plugin.Config.IsAllowedForStorage(message.Code.Type))
{
_logger.Verbose($"Privacy filter dropped message: ChatType={message.Code.Type}");
_logger.LogTrace($"Privacy filter dropped message: ChatType={message.Code.Type}");
return;
}
@@ -941,7 +951,10 @@ internal class MessageStore : IDisposable
if (to is not null)
cmd.Parameters.AddWithValue("$To", to.Value.ToUnixTimeMilliseconds());
return new MessageEnumerator(cmd.ExecuteReader(), _logger);
return new MessageEnumerator(
cmd.ExecuteReader(),
_loggerFactory.CreateLogger<MessageEnumerator>()
);
}
}
@@ -993,20 +1006,24 @@ internal class MessageStore : IDisposable
cmd.Parameters.AddWithValue("$Count", count);
return new MessageEnumerator(cmd.ExecuteReader(), _logger);
return new MessageEnumerator(
cmd.ExecuteReader(),
_loggerFactory.CreateLogger<MessageEnumerator>()
);
}
}
// Returns up to limit tells exchanged with the named player, oldest-first.
// SQL narrows by Receiver + ChatType (indexed); client does the final
// PlayerPayload comparison. sqlScanLimit caps the scan to stay within
// the message-processing worker thread budget.
// Returns up to `limit` tells exchanged with the named player, oldest-first.
// SQL narrows by Receiver + ChatType via the (Receiver, Date) index, then
// the client-side loop runs PlayerPayload comparison and breaks once
// `limit` partner matches accumulate. Earlier versions had a hardcoded
// 500-row scan cap that cut less-frequent pinned partners off the back of
// the window in chatty sessions; removed in v1.4.10.
internal IReadOnlyList<Message> GetTellHistoryWithSender(
ulong receiver,
string senderName,
uint senderWorld,
int limit,
int sqlScanLimit = 500
int limit
)
{
if (limit <= 0)
@@ -1024,17 +1041,18 @@ internal class MessageStore : IDisposable
WHERE deleted = false
AND Receiver = $Receiver
AND ChatType IN ($TellIncoming, $TellOutgoing)
ORDER BY Date DESC
LIMIT $ScanLimit;
ORDER BY Date DESC;
";
cmd.CommandTimeout = 60;
cmd.Parameters.AddWithValue("$Receiver", receiver);
cmd.Parameters.AddWithValue("$TellIncoming", (int)ChatType.TellIncoming);
cmd.Parameters.AddWithValue("$TellOutgoing", (int)ChatType.TellOutgoing);
cmd.Parameters.AddWithValue("$ScanLimit", sqlScanLimit);
var collected = new List<Message>();
using var enumerator = new MessageEnumerator(cmd.ExecuteReader(), _logger);
using var enumerator = new MessageEnumerator(
cmd.ExecuteReader(),
_loggerFactory.CreateLogger<MessageEnumerator>()
);
foreach (var message in enumerator)
{
if (!ChunkUtil.MatchesSender(message, senderName, senderWorld))
@@ -1146,7 +1164,10 @@ internal class MessageStore : IDisposable
((DateTimeOffset)before).ToUnixTimeMilliseconds()
);
return new MessageEnumerator(cmd.ExecuteReader(), _logger);
return new MessageEnumerator(
cmd.ExecuteReader(),
_loggerFactory.CreateLogger<MessageEnumerator>()
);
}
}
@@ -1199,7 +1220,10 @@ internal class MessageStore : IDisposable
cmd.Parameters.AddWithValue("$Offset", DbViewer.RowPerPage * page);
cmd.Parameters.AddWithValue("$OffsetCount", DbViewer.RowPerPage);
return new MessageEnumerator(cmd.ExecuteReader(), _logger);
return new MessageEnumerator(
cmd.ExecuteReader(),
_loggerFactory.CreateLogger<MessageEnumerator>()
);
}
}
@@ -1220,14 +1244,14 @@ internal class MessageStore : IDisposable
}
}
internal class MessageEnumerator(DbDataReader reader, IPluginLogProxy logger)
internal class MessageEnumerator(DbDataReader reader, ILogger<MessageEnumerator> logger)
: IEnumerable<Message>,
IDisposable,
IAsyncDisposable
{
private const int MaxErrorLogs = 10;
private readonly IPluginLogProxy _logger = logger;
private readonly ILogger<MessageEnumerator> _logger = logger;
private readonly List<Guid> FailedIds = [];
private int FailedCount;
public bool DidError => FailedCount > 0;
@@ -1248,10 +1272,10 @@ internal class MessageEnumerator(DbDataReader reader, IPluginLogProxy logger)
catch (Exception e)
{
if (FailedCount < MaxErrorLogs)
_logger.Error($"Exception while reading message '{id}' from database: {e}");
_logger.LogError($"Exception while reading message '{id}' from database: {e}");
FailedCount++;
if (FailedCount == MaxErrorLogs)
_logger.Error("Further parsing errors will not be logged");
_logger.LogError("Further parsing errors will not be logged");
if (id != Guid.Empty)
FailedIds.Add(id);
+8 -4
View File
@@ -20,6 +20,7 @@ using HellionChat.Resources;
using HellionChat.Ui;
using HellionChat.Util;
using Lumina.Excel.Sheets;
using Microsoft.Extensions.Logging;
using Action = System.Action;
using ChatTwoPartyFinderPayload = HellionChat.Util.PartyFinderPayload;
using DalamudPartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload;
@@ -40,9 +41,12 @@ public sealed class PayloadHandler
private const uint PopupSfx = 1;
internal PayloadHandler(ChatLogWindow logWindow)
private readonly ILogger<PayloadHandler> _logger;
internal PayloadHandler(ChatLogWindow logWindow, ILogger<PayloadHandler> logger)
{
LogWindow = logWindow;
_logger = logger;
}
internal void Draw()
@@ -131,7 +135,7 @@ public sealed class PayloadHandler
}
catch (Exception ex)
{
Plugin.LogProxy.Error(ex, "Error executing integration");
_logger.LogError(ex, "Error executing integration");
}
}
@@ -535,7 +539,7 @@ public sealed class PayloadHandler
)
)
{
Plugin.LogProxy.Warning("Could not find DalamudLinkHandlers");
_logger.LogWarning("Could not find DalamudLinkHandlers");
return;
}
@@ -546,7 +550,7 @@ public sealed class PayloadHandler
}
catch (Exception ex)
{
Plugin.LogProxy.Error(ex, "Error executing DalamudLinkPayload handler");
_logger.LogError(ex, "Error executing DalamudLinkPayload handler");
}
}
+151 -128
View File
@@ -15,6 +15,8 @@ using HellionChat.Resources;
using HellionChat.Ui;
using HellionChat.Util;
using Microsoft.Data.Sqlite;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
namespace HellionChat;
@@ -123,6 +125,20 @@ public sealed class Plugin : IAsyncDalamudPlugin
// isolation. Wired immediately after Dalamud injects Log.
internal static IPluginLogProxy LogProxy { get; private set; } = null!;
// Nullable so DisposeAsync stays safe if Host-build throws before the
// fields get assigned — Dalamud fires DisposeAsync regardless.
private readonly IHost? _host;
private readonly PluginLifecycle? _lifecycle;
// Wrapper cached so TearDown can detach the live instance instead of
// re-registering with identical args (v1.4.9 ISSUE-1 cleanup).
private CommandWrapper? _hellionSettingsCmd;
private CommandWrapper? _hellionViewCmd;
private CommandWrapper? _hellionDebuggerCmd;
#if DEBUG
private CommandWrapper? _hellionSeStringCmd;
#endif
// Idempotency guard — Dalamud may fire DisposeAsync twice in a reload race.
private int _disposeStarted;
@@ -176,11 +192,11 @@ public sealed class Plugin : IAsyncDalamudPlugin
Config = Interface.GetPluginConfig() as Configuration ?? new Configuration();
// Wire platform indirection before LoadAsync allocates anything that
// needs Util.* — services then read Plugin.PlatformUtil instead of
// hitting the Dalamud static surface directly.
PlatformUtil = new DalamudPlatformUtil();
LogProxy = new DalamudPluginLogProxy(Log);
// PlatformUtil and LogProxy are filled from the DI container in
// Phase-1 below (`_host.Services.GetRequiredService<IPlatformUtil>()`
// and the LogProxy equivalent). Phase-0 helpers that run before that
// point (MigrateFromChatTwoLayout, LanguageChanged, ImGuiUtil.Initialize)
// do not touch either static, so the brief null-window is safe.
// 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
@@ -189,8 +205,8 @@ public sealed class Plugin : IAsyncDalamudPlugin
if (Config.Version < 16)
{
throw new InvalidOperationException(
$"HellionChat v1.4.9 requires config schema v16, got v{Config.Version}. "
+ "Please install v1.4.2 first to migrate the configuration, then upgrade to v1.4.9."
$"HellionChat v1.4.10 requires config schema v16, got v{Config.Version}. "
+ "Please install v1.4.2 first to migrate the configuration, then upgrade to v1.4.10."
);
}
Config.Version = 17;
@@ -203,6 +219,72 @@ public sealed class Plugin : IAsyncDalamudPlugin
ImGuiUtil.Initialize(this);
DeferredSaveFrames = -1;
// Custom themes dir + seed run before the container builds so the
// ThemeRegistry factory lambda finds the directory ready.
var customThemesDir = Path.Combine(Interface.ConfigDirectory.FullName, "themes");
Directory.CreateDirectory(customThemesDir);
SeedExampleThemeIfEmpty(customThemesDir);
// Phase-1: build the host synchronously (the schema gate must clear
// before services allocate; Lightless' deferred build would invert
// that order) and pull singletons into the Plugin.X surface.
var dependencies = new PluginHostDependencies(
Interface,
Log,
ChatGui,
ClientState,
CommandManager,
Condition,
DataManager,
Framework,
GameGui,
KeyState,
ObjectTable,
PartyList,
TargetManager,
TextureProvider,
GameInteropProvider,
GameConfig,
Notification,
AddonLifecycle,
PlayerState,
Evaluator,
SelfTestRegistry
);
_host = PluginHostFactory.Build(this, dependencies);
_lifecycle = _host.Services.GetRequiredService<PluginLifecycle>();
_lifecycle.Host = _host;
// Plugin.X static bridge - filled from the container so DI-aware code
// and the ~93 Plugin.X consumer sites read the same instances.
PlatformUtil = _host.Services.GetRequiredService<IPlatformUtil>();
LogProxy = _host.Services.GetRequiredService<IPluginLogProxy>();
FileDialogManager = _host.Services.GetRequiredService<FileDialogManager>();
// Resolve order matters: block-B services first so the windows can
// read Plugin.MessageManager etc. from their own ctors without NREs.
FontManager = _host.Services.GetRequiredService<FontManager>();
ThemeRegistry = _host.Services.GetRequiredService<Themes.ThemeRegistry>();
Commands = _host.Services.GetRequiredService<Commands>();
Functions = _host.Services.GetRequiredService<GameFunctions.GameFunctions>();
Ipc = _host.Services.GetRequiredService<IpcManager>();
TypingIpc = _host.Services.GetRequiredService<TypingIpc>();
ExtraChat = _host.Services.GetRequiredService<ExtraChat>();
HonorificService = _host.Services.GetRequiredService<Integrations.HonorificService>();
StatusBar = _host.Services.GetRequiredService<Ui.StatusBar>();
MessageManager = _host.Services.GetRequiredService<MessageManager>();
AutoTellTabsService = _host.Services.GetRequiredService<AutoTellTabsService>();
ChatLogWindow = _host.Services.GetRequiredService<ChatLogWindow>();
SettingsWindow = _host.Services.GetRequiredService<SettingsWindow>();
DbViewer = _host.Services.GetRequiredService<DbViewer>();
InputPreview = _host.Services.GetRequiredService<InputPreview>();
CommandHelpWindow = _host.Services.GetRequiredService<CommandHelpWindow>();
SeStringDebugger = _host.Services.GetRequiredService<SeStringDebugger>();
DebuggerWindow = _host.Services.GetRequiredService<DebuggerWindow>();
FirstRunWizard = _host.Services.GetRequiredService<FirstRunWizard>();
}
public async Task LoadAsync(CancellationToken cancellationToken)
@@ -224,66 +306,17 @@ public sealed class Plugin : IAsyncDalamudPlugin
cancellationToken.ThrowIfCancellationRequested();
// BuildFonts registers handles with Dalamud's FontAtlas; the atlas
// rebuilds async a few frames later (visible "font-pop" on first load).
FontManager = new FontManager();
FontManager.BuildFonts();
// ThemeRegistry must be wired before the first Draw tick.
var customThemesDir = Path.Combine(Interface.ConfigDirectory.FullName, "themes");
Directory.CreateDirectory(customThemesDir);
SeedExampleThemeIfEmpty(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);
cancellationToken.ThrowIfCancellationRequested();
// Service allocations — order encodes dependencies.
// HonorificService registers IPC subscribers early to catch
// Ready/Disposing events from the first frame.
FileDialogManager = new FileDialogManager();
Commands = new Commands();
Functions = new GameFunctions.GameFunctions(this);
Ipc = new IpcManager();
TypingIpc = new TypingIpc(this);
ExtraChat = new ExtraChat();
HonorificService = new Integrations.HonorificService(Interface, Log, Framework);
StatusBar = new Ui.StatusBar();
MessageManager = new MessageManager(this);
AutoTellTabsService = new AutoTellTabsService(
this,
MessageManager,
MessageManager.Store
);
AutoTellTabsService.Initialize();
// Container drives service init now: Host.StartAsync triggers the
// IHostedService adapters (FontManager.BuildFonts, ThemeRegistry
// cache warmup + Switch, IPC eager-resolve, MessageManager
// FilterAllTabsAsync, AutoTellTabsService.Initialize). Window
// registration with WindowSystem runs on the framework thread
// inside PluginLifecycle.LoadAsync after StartAsync returns.
if (_lifecycle is not null)
await _lifecycle.LoadAsync(cancellationToken).ConfigureAwait(false);
SelfTestRegistry.RegisterTestSteps([new SelfTests.ThemeSwitchSelfTestStep(this)]);
ChatLogWindow = new ChatLogWindow(this);
SettingsWindow = new SettingsWindow(this);
DbViewer = new DbViewer(this);
InputPreview = new InputPreview(ChatLogWindow);
CommandHelpWindow = new CommandHelpWindow(ChatLogWindow);
SeStringDebugger = new SeStringDebugger(this);
DebuggerWindow = new DebuggerWindow(this);
FirstRunWizard = new FirstRunWizard(this);
WindowSystem.AddWindow(ChatLogWindow);
WindowSystem.AddWindow(SettingsWindow);
WindowSystem.AddWindow(DbViewer);
WindowSystem.AddWindow(InputPreview);
WindowSystem.AddWindow(CommandHelpWindow);
WindowSystem.AddWindow(SeStringDebugger);
WindowSystem.AddWindow(DebuggerWindow);
WindowSystem.AddWindow(FirstRunWizard);
if (!Config.FirstRunCompleted)
FirstRunWizard.IsOpen = true;
@@ -304,8 +337,8 @@ public sealed class Plugin : IAsyncDalamudPlugin
if (Config.ShowEmotes)
_ = EmoteCache.LoadData();
if (Interface.Reason is not PluginLoadReason.Boot)
MessageManager.FilterAllTabsAsync();
// FilterAllTabsAsync now runs from MessageManagerInitHostedService
// during Host.StartAsync (same Reason-not-Boot guard there).
// Kick the FTS5 rebuild worker if Migrate4 just added the schema or
// a previous run was cut short (InitFtsReadyCache leaves _ftsReady
@@ -490,49 +523,18 @@ public sealed class Plugin : IAsyncDalamudPlugin
}
);
// Unsubscribe AutoTellTabs before MessageManager goes away.
failure = CaptureFailure(failure, () => AutoTellTabsService?.Dispose());
// MessageManager has its own async dispose path (DB flush, thread shutdown).
if (MessageManager is not null)
{
failure = await CaptureFailureAsync(
failure,
() => MessageManager.DisposeAsync().AsTask()
)
.ConfigureAwait(false);
}
// Game-function / IPC / window cleanup must run on the framework thread.
// Framework-thread cleanup the container does not reach.
try
{
await Framework
.RunOnFrameworkThread(() =>
{
// TearDown slash-commands + UiBuilder hooks before windows
// tear down. Slash-commands holding handlers that reach
// the windows would otherwise see a half-torn Plugin.
failure = CaptureFailure(failure, TearDownCommands);
failure = CaptureFailure(
failure,
() => GameFunctions.GameFunctions.SetChatInteractable(true)
);
// IPC subscribers before windows — prevents a final IPC event
// from reaching a half-torn ChatLogWindow.
failure = CaptureFailure(failure, () => HonorificService?.Dispose());
failure = CaptureFailure(failure, () => TypingIpc?.Dispose());
failure = CaptureFailure(failure, () => ExtraChat?.Dispose());
failure = CaptureFailure(failure, () => Ipc?.Dispose());
failure = CaptureFailure(failure, () => WindowSystem?.RemoveAllWindows());
failure = CaptureFailure(failure, () => ChatLogWindow?.Dispose());
failure = CaptureFailure(failure, () => DbViewer?.Dispose());
failure = CaptureFailure(failure, () => InputPreview?.Dispose());
failure = CaptureFailure(failure, () => SettingsWindow?.Dispose());
failure = CaptureFailure(failure, () => DebuggerWindow?.Dispose());
failure = CaptureFailure(failure, () => SeStringDebugger?.Dispose());
})
.ConfigureAwait(false);
}
@@ -541,11 +543,17 @@ public sealed class Plugin : IAsyncDalamudPlugin
failure ??= ex;
}
// Pure-memory cleanups — no Framework / UI / IPC touch.
failure = CaptureFailure(failure, () => Functions?.Dispose());
failure = CaptureFailure(failure, () => Commands?.Dispose());
// Container disposes services + windows on the framework thread.
// MessageManager.DisposeAsync is not idempotent, so we let the
// container do it once instead of double-disposing.
if (_lifecycle is not null)
{
failure = await CaptureFailureAsync(failure, () => _lifecycle.DisposeAsync().AsTask())
.ConfigureAwait(false);
}
// Static-class cleanups the container has no handle on.
failure = CaptureFailure(failure, () => EmoteCache.Dispose());
// Static input history would otherwise survive the plugin reload.
failure = CaptureFailure(failure, InputHistoryService.Reset);
if (failure is not null)
@@ -699,21 +707,25 @@ public sealed class Plugin : IAsyncDalamudPlugin
{
// ChatLogWindow.cs:128 already registers /hellion (ToggleChat). The
// description-arg here keeps the Dalamud help list populated.
Commands.Register("/hellion", "Perform various actions with Hellion Chat.").Execute +=
OnHellionSettingsCommand;
Commands
.Register(
"/hellionView",
"Get access to your message history, with simple filter options.",
true
)
.Execute += OnHellionViewCommand;
Commands.Register("/hellionDebugger", showInHelp: false).Execute +=
OnHellionDebuggerCommand;
_hellionSettingsCmd = Commands.Register(
"/hellion",
"Perform various actions with Hellion Chat."
);
_hellionSettingsCmd.Execute += OnHellionSettingsCommand;
_hellionViewCmd = Commands.Register(
"/hellionView",
"Get access to your message history, with simple filter options.",
true
);
_hellionViewCmd.Execute += OnHellionViewCommand;
_hellionDebuggerCmd = Commands.Register("/hellionDebugger", showInHelp: false);
_hellionDebuggerCmd.Execute += OnHellionDebuggerCommand;
#if DEBUG
// SeStringDebugger.cs lives under #if DEBUG too; keep this out of release builds.
Commands.Register("/hellionSeString", showInHelp: false).Execute +=
OnHellionSeStringCommand;
_hellionSeStringCmd = Commands.Register("/hellionSeString", showInHelp: false);
_hellionSeStringCmd.Execute += OnHellionSeStringCommand;
#endif
// Plugin-Manager "Settings" button. Was in Settings.cs:67 pre-v1.4.9.
@@ -729,20 +741,31 @@ public sealed class Plugin : IAsyncDalamudPlugin
Interface.UiBuilder.OpenMainUi -= OnOpenMainUi;
Interface.UiBuilder.OpenConfigUi -= OnOpenConfigUi;
Commands.Register("/hellion", "Perform various actions with Hellion Chat.").Execute -=
OnHellionSettingsCommand;
Commands
.Register(
"/hellionView",
"Get access to your message history, with simple filter options.",
true
)
.Execute -= OnHellionViewCommand;
Commands.Register("/hellionDebugger", showInHelp: false).Execute -=
OnHellionDebuggerCommand;
// Null-tolerant detaches: TearDownCommands can run from the LoadAsync
// failure path (Plugin.cs CaptureFailure) before SetupCommands finished.
if (_hellionSettingsCmd is not null)
{
_hellionSettingsCmd.Execute -= OnHellionSettingsCommand;
_hellionSettingsCmd = null;
}
if (_hellionViewCmd is not null)
{
_hellionViewCmd.Execute -= OnHellionViewCommand;
_hellionViewCmd = null;
}
if (_hellionDebuggerCmd is not null)
{
_hellionDebuggerCmd.Execute -= OnHellionDebuggerCommand;
_hellionDebuggerCmd = null;
}
#if DEBUG
Commands.Register("/hellionSeString", showInHelp: false).Execute -=
OnHellionSeStringCommand;
if (_hellionSeStringCmd is not null)
{
_hellionSeStringCmd.Execute -= OnHellionSeStringCommand;
_hellionSeStringCmd = null;
}
#endif
}
+199
View File
@@ -0,0 +1,199 @@
using Dalamud.Interface.ImGuiFileDialog;
using Dalamud.Plugin;
using Dalamud.Plugin.Services;
using HellionChat.Infrastructure.Hosting;
using HellionChat.Infrastructure.Logging;
using HellionChat.Ipc;
using HellionChat.Themes;
using HellionChat.Ui;
using HellionChat.Util;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
namespace HellionChat;
// Builds the generic-host DI container that drives v1.5.0+. The factory is
// invoked synchronously from Plugin.ctor (after the schema gate clears) so the
// container exists before PluginLifecycle.LoadAsync runs. See plan §1 for the
// deliberate divergence from Lightless' deferred Func-delegate pattern.
internal static class PluginHostFactory
{
public static IHost Build(Plugin plugin, PluginHostDependencies dependencies)
{
return new HostBuilder()
.UseContentRoot(dependencies.PluginInterface.ConfigDirectory.FullName)
.ConfigureLogging(logging =>
{
logging.ClearProviders();
logging.AddDalamudLogging(dependencies.PluginLog);
logging.SetMinimumLevel(LogLevel.Trace);
})
.ConfigureServices(services => ConfigureServices(services, plugin, dependencies))
.Build();
}
private static void ConfigureServices(
IServiceCollection services,
Plugin plugin,
PluginHostDependencies dependencies
)
{
// Block A — Dalamud services (21 [PluginService] singletons).
services.AddSingleton(dependencies);
services.AddSingleton(dependencies.PluginInterface);
services.AddSingleton(dependencies.PluginLog);
services.AddSingleton(dependencies.ChatGui);
services.AddSingleton(dependencies.ClientState);
services.AddSingleton(dependencies.CommandManager);
services.AddSingleton(dependencies.Condition);
services.AddSingleton(dependencies.DataManager);
services.AddSingleton(dependencies.Framework);
services.AddSingleton(dependencies.GameGui);
services.AddSingleton(dependencies.KeyState);
services.AddSingleton(dependencies.ObjectTable);
services.AddSingleton(dependencies.PartyList);
services.AddSingleton(dependencies.TargetManager);
services.AddSingleton(dependencies.TextureProvider);
services.AddSingleton(dependencies.GameInteropProvider);
services.AddSingleton(dependencies.GameConfig);
services.AddSingleton(dependencies.Notification);
services.AddSingleton(dependencies.AddonLifecycle);
services.AddSingleton(dependencies.PlayerState);
services.AddSingleton(dependencies.Evaluator);
services.AddSingleton(dependencies.SelfTestRegistry);
// Self-references: Plugin and its WindowSystem already exist.
services.AddSingleton(plugin);
services.AddSingleton(plugin.WindowSystem);
services.AddSingleton<PluginLifecycle>();
// Block B — HellionChat singletons. Factory lambdas because most
// classes are internal-sealed and the default activator only sees
// public ctors.
services.AddSingleton<IPlatformUtil>(_ => new DalamudPlatformUtil());
services.AddSingleton<IPluginLogProxy>(sp => new DalamudPluginLogProxy(
sp.GetRequiredService<IPluginLog>()
));
services.AddSingleton<FileDialogManager>(_ => new FileDialogManager());
services.AddSingleton(sp => new Commands(sp.GetRequiredService<ILogger<Commands>>()));
services.AddSingleton(_ => new FontManager());
services.AddSingleton(_ => new StatusBar());
services.AddSingleton(sp => new IpcManager(sp.GetRequiredService<ILogger<IpcManager>>()));
services.AddSingleton(sp => new ExtraChat(sp.GetRequiredService<ILogger<ExtraChat>>()));
services.AddSingleton(sp => new ThemeRegistry(
Path.Combine(
sp.GetRequiredService<IDalamudPluginInterface>().ConfigDirectory.FullName,
"themes"
),
sp.GetRequiredService<ILogger<ThemeRegistry>>()
));
services.AddSingleton(sp => new GameFunctions.GameFunctions(
sp.GetRequiredService<Plugin>(),
sp.GetRequiredService<ILogger<GameFunctions.GameFunctions>>(),
sp.GetRequiredService<ILoggerFactory>()
));
services.AddSingleton(sp => new TypingIpc(
sp.GetRequiredService<Plugin>(),
sp.GetRequiredService<ILogger<TypingIpc>>()
));
services.AddSingleton(sp => new Integrations.HonorificService(
sp.GetRequiredService<IDalamudPluginInterface>(),
sp.GetRequiredService<ILogger<Integrations.HonorificService>>(),
sp.GetRequiredService<IFramework>()
));
services.AddSingleton(sp => new MessageManager(
sp.GetRequiredService<Plugin>(),
sp.GetRequiredService<ILogger<MessageManager>>(),
sp.GetRequiredService<ILoggerFactory>()
));
// MessageStore is allocated inside MessageManager.ctor; a separate
// container singleton would double-construct the SQLite handle.
services.AddSingleton(sp =>
{
var pluginRef = sp.GetRequiredService<Plugin>();
var manager = sp.GetRequiredService<MessageManager>();
return new AutoTellTabsService(
pluginRef,
manager,
manager.Store,
sp.GetRequiredService<ILogger<AutoTellTabsService>>()
);
});
// Block C — Windows. WindowSystem.AddWindow is called from
// PluginLifecycle.LoadAsync on the framework thread.
services.AddSingleton(sp => new ChatLogWindow(
sp.GetRequiredService<Plugin>(),
sp.GetRequiredService<ILogger<ChatLogWindow>>(),
sp.GetRequiredService<ILoggerFactory>()
));
services.AddSingleton(sp => new SettingsWindow(
sp.GetRequiredService<Plugin>(),
sp.GetRequiredService<ILoggerFactory>()
));
services.AddSingleton(sp => new DbViewer(
sp.GetRequiredService<Plugin>(),
sp.GetRequiredService<ILogger<DbViewer>>()
));
services.AddSingleton(sp => new InputPreview(sp.GetRequiredService<ChatLogWindow>()));
services.AddSingleton(sp => new CommandHelpWindow(sp.GetRequiredService<ChatLogWindow>()));
services.AddSingleton(sp => new SeStringDebugger(sp.GetRequiredService<Plugin>()));
services.AddSingleton(sp => new DebuggerWindow(sp.GetRequiredService<Plugin>()));
services.AddSingleton(sp => new FirstRunWizard(sp.GetRequiredService<Plugin>()));
// Hosted-service adapters: thin wrappers around the existing init
// methods so the service class bodies stay unchanged.
services.AddHostedService(sp => new FontManagerInitHostedService(
sp.GetRequiredService<FontManager>()
));
services.AddHostedService(sp => new ThemeRegistryInitHostedService(
sp.GetRequiredService<ThemeRegistry>()
));
services.AddHostedService(sp => new IpcManagerInitHostedService(
sp.GetRequiredService<IpcManager>()
));
services.AddHostedService(sp => new TypingIpcInitHostedService(
sp.GetRequiredService<TypingIpc>()
));
services.AddHostedService(sp => new ExtraChatInitHostedService(
sp.GetRequiredService<ExtraChat>()
));
services.AddHostedService(sp => new MessageManagerInitHostedService(
sp.GetRequiredService<IDalamudPluginInterface>(),
sp.GetRequiredService<MessageManager>()
));
services.AddHostedService(sp => new AutoTellTabsServiceInitHostedService(
sp.GetRequiredService<AutoTellTabsService>()
));
}
}
internal sealed record PluginHostDependencies(
IDalamudPluginInterface PluginInterface,
IPluginLog PluginLog,
IChatGui ChatGui,
IClientState ClientState,
ICommandManager CommandManager,
ICondition Condition,
IDataManager DataManager,
IFramework Framework,
IGameGui GameGui,
IKeyState KeyState,
IObjectTable ObjectTable,
IPartyList PartyList,
ITargetManager TargetManager,
ITextureProvider TextureProvider,
IGameInteropProvider GameInteropProvider,
IGameConfig GameConfig,
INotificationManager Notification,
IAddonLifecycle AddonLifecycle,
IPlayerState PlayerState,
ISeStringEvaluator Evaluator,
ISelfTestRegistry SelfTestRegistry
);
+143
View File
@@ -0,0 +1,143 @@
using System.Runtime.ExceptionServices;
using Dalamud.Plugin.Services;
using Microsoft.Extensions.Hosting;
namespace HellionChat;
// Orchestrates Host.StartAsync / StopAsync and the framework-thread dispose.
// Plugin.ctor builds the host and assigns it via the Host property, so
// PluginLifecycle never constructs the host itself.
internal sealed class PluginLifecycle : IAsyncDisposable
{
private readonly IFramework _framework;
private readonly Plugin _plugin;
private int _disposeStarted;
private bool _hostStartRequested;
public PluginLifecycle(IFramework framework, Plugin plugin)
{
_framework = framework;
_plugin = plugin;
}
// Plugin.ctor fills this immediately after PluginHostFactory.Build and
// before invoking LoadAsync; LoadAsync may NRE-suppress on Host! safely.
public IHost? Host { get; set; }
public async Task LoadAsync(CancellationToken cancellationToken)
{
cancellationToken.ThrowIfCancellationRequested();
try
{
_hostStartRequested = true;
await Host!.StartAsync(cancellationToken).ConfigureAwait(false);
// WindowSystem.AddWindow mutates an internal List<>; v1.4.9 Stage-2
// verified the list is non-thread-safe, so we marshal the entire
// registration block to the framework thread.
await _framework
.RunOnFrameworkThread(() => RegisterWindows(_plugin))
.ConfigureAwait(false);
}
catch
{
try
{
await DisposeAsync().ConfigureAwait(false);
}
catch
{
// Swallow secondary dispose failure so the original load throw wins.
}
throw;
}
}
private static void RegisterWindows(Plugin plugin)
{
plugin.WindowSystem.AddWindow(plugin.ChatLogWindow);
plugin.WindowSystem.AddWindow(plugin.SettingsWindow);
plugin.WindowSystem.AddWindow(plugin.DbViewer);
plugin.WindowSystem.AddWindow(plugin.InputPreview);
plugin.WindowSystem.AddWindow(plugin.CommandHelpWindow);
plugin.WindowSystem.AddWindow(plugin.SeStringDebugger);
plugin.WindowSystem.AddWindow(plugin.DebuggerWindow);
plugin.WindowSystem.AddWindow(plugin.FirstRunWizard);
}
public async ValueTask DisposeAsync()
{
// Idempotency guard — Dalamud may fire DisposeAsync twice in a reload race.
if (Interlocked.Exchange(ref _disposeStarted, 1) != 0)
return;
Exception? failure = null;
if (_hostStartRequested && Host is not null)
failure = await CaptureFailureAsync(failure, () => Host.StopAsync())
.ConfigureAwait(false);
failure = await DisposeHostOnFrameworkThreadAsync(failure).ConfigureAwait(false);
ThrowIfFailed(failure);
}
private async Task<Exception?> DisposeHostOnFrameworkThreadAsync(Exception? failure)
{
try
{
await _framework
.RunOnFrameworkThread(() =>
{
failure = CaptureFailure(failure, () => Host?.Dispose());
})
.ConfigureAwait(false);
}
catch (Exception ex)
{
failure ??= ex;
}
return failure;
}
private static Exception? CaptureFailure(Exception? failure, Action action)
{
try
{
action();
}
catch (Exception ex)
{
failure ??= ex;
}
return failure;
}
private static async ValueTask<Exception?> CaptureFailureAsync(
Exception? failure,
Func<Task> action
)
{
try
{
await action().ConfigureAwait(false);
}
catch (Exception ex)
{
failure ??= ex;
}
return failure;
}
private static void ThrowIfFailed(Exception? failure)
{
if (failure is not null)
ExceptionDispatchInfo.Capture(failure).Throw();
}
}
+4
View File
@@ -270,6 +270,10 @@ internal class HellionStrings
internal static string Settings_Chat_Preview_Heading => Get(nameof(Settings_Chat_Preview_Heading));
internal static string Settings_Chat_Emotes_Heading => Get(nameof(Settings_Chat_Emotes_Heading));
// Hellion Chat — Chat-Tab SymbolPicker
internal static string Settings_Chat_SymbolPicker_Enable_Name => Get(nameof(Settings_Chat_SymbolPicker_Enable_Name));
internal static string Settings_Chat_SymbolPicker_Enable_Description => Get(nameof(Settings_Chat_SymbolPicker_Enable_Description));
// Hellion Chat — Database-Tab section headings
internal static string Settings_Database_Storage_Heading => Get(nameof(Settings_Database_Storage_Heading));
internal static string Settings_Database_Viewer_Heading => Get(nameof(Settings_Database_Viewer_Heading));
@@ -556,6 +556,14 @@
<value>Emotes</value>
</data>
<!-- Hellion Chat — Chat-Tab SymbolPicker -->
<data name="Settings_Chat_SymbolPicker_Enable_Name" xml:space="preserve">
<value>Symbol-Picker-Button neben dem Chat-Eingang anzeigen</value>
</data>
<data name="Settings_Chat_SymbolPicker_Enable_Description" xml:space="preserve">
<value>Fügt einen kleinen Button links neben dem Kanal-Indikator ein. Klick öffnet ein Popup mit FFXIV-Glyphen und einer kuratierten Symbol-Liste. Ausschalten für eine schlankere Eingabezeile.</value>
</data>
<!-- Hellion Chat — Sektions-Überschriften des Database-Tabs -->
<data name="Settings_Database_Storage_Heading" xml:space="preserve">
<value>Speicherung</value>
@@ -556,6 +556,14 @@
<value>Emotes</value>
</data>
<!-- Hellion Chat — Chat tab SymbolPicker -->
<data name="Settings_Chat_SymbolPicker_Enable_Name" xml:space="preserve">
<value>Show symbol-picker button next to chat input</value>
</data>
<data name="Settings_Chat_SymbolPicker_Enable_Description" xml:space="preserve">
<value>Adds a small button left of the channel indicator that opens a popup with FFXIV icons and a curated symbol list. Disable if you prefer a leaner input bar.</value>
</data>
<!-- Hellion Chat — Database tab section headings -->
<data name="Settings_Database_Storage_Heading" xml:space="preserve">
<value>Storage</value>
+6 -2
View File
@@ -1,9 +1,12 @@
using HellionChat.Themes.Builtin;
using Microsoft.Extensions.Logging;
namespace HellionChat.Themes;
public sealed class ThemeRegistry
{
private readonly ILogger<ThemeRegistry>? _logger;
public const string DefaultSlug = HellionArctic.Slug;
// 1Hz throttle for the v1.4.8 B2 auto-refresh-on-active path. The
@@ -29,8 +32,9 @@ public sealed class ThemeRegistry
private long _lastActiveStampCheckMs = -ActiveStampPollIntervalMs;
private DateTime _lastActiveStamp = DateTime.MinValue;
public ThemeRegistry(string? customThemesDir = null)
public ThemeRegistry(string? customThemesDir = null, ILogger<ThemeRegistry>? logger = null)
{
_logger = logger;
// 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
@@ -206,7 +210,7 @@ public sealed class ThemeRegistry
catch (Exception ex) when (IsRecoverableFileLock(ex))
{
// Editor mid-save: keep last known good, retry on next refresh.
Plugin.LogProxy.Debug(
_logger?.LogDebug(
$"Custom theme {Path.GetFileName(path)} is locked, keeping last known good"
);
if (cached.Theme is not null)
+87 -21
View File
@@ -22,6 +22,7 @@ using HellionChat.Resources;
using HellionChat.Util;
using Lumina.Excel.Sheets;
using Lumina.Extensions;
using Microsoft.Extensions.Logging;
namespace HellionChat.Ui;
@@ -40,6 +41,7 @@ public sealed class ChatLogWindow : Window
private readonly CommandWrapper _clearHellionCommand;
private readonly CommandWrapper _hellionCommand;
private readonly SymbolPicker _symbolPicker;
internal bool ScreenshotMode;
private string Salt { get; }
@@ -97,10 +99,19 @@ public sealed class ChatLogWindow : Window
private long FrameTime; // set every frame
internal long LastActivityTime = Environment.TickCount64;
internal ChatLogWindow(Plugin plugin)
private readonly ILogger<ChatLogWindow> _logger;
private readonly ILoggerFactory _loggerFactory;
internal ChatLogWindow(
Plugin plugin,
ILogger<ChatLogWindow> logger,
ILoggerFactory loggerFactory
)
: base($"{Plugin.PluginName}###chat2")
{
Plugin = plugin;
_logger = logger;
_loggerFactory = loggerFactory;
Salt = new Random().Next().ToString();
Size = new Vector2(500, 250);
@@ -113,8 +124,10 @@ public sealed class ChatLogWindow : Window
DisableWindowSounds = true;
// AllowBackgroundBlur is set centrally in Plugin.Setup after AddWindow.
PayloadHandler = new PayloadHandler(this);
HandlerLender = new Lender<PayloadHandler>(() => new PayloadHandler(this));
PayloadHandler = new PayloadHandler(this, _loggerFactory.CreateLogger<PayloadHandler>());
HandlerLender = new Lender<PayloadHandler>(() =>
new PayloadHandler(this, _loggerFactory.CreateLogger<PayloadHandler>())
);
SetUpTextCommandChannels();
SetUpAllCommands();
@@ -129,6 +142,8 @@ public sealed class ChatLogWindow : Window
_clearHellionCommand.Execute += ClearLog;
_hellionCommand.Execute += ToggleChat;
_symbolPicker = new SymbolPicker();
Plugin.ClientState.Login += Login;
Plugin.ClientState.Logout += Logout;
@@ -189,11 +204,28 @@ public sealed class ChatLogWindow : Window
return;
}
// ---------------------------------------------------------------
// Cherry-picked from ChatTwo upstream ee7768ac (Infiziert90, 2026-05-16)
// - Replace the chat input when args.AddIfNotPresent / args.Input starts
// with a slash. Vanilla actions like the Friend List "/tell" entry and
// other plugins push slash commands through these args; appending them
// to existing text would produce inputs like "test/tell user@world".
// ---------------------------------------------------------------
if (args.AddIfNotPresent != null && !Chat.Contains(args.AddIfNotPresent))
Chat += args.AddIfNotPresent;
{
if (args.AddIfNotPresent.StartsWith('/'))
Chat = args.AddIfNotPresent;
else
Chat += args.AddIfNotPresent;
}
if (args.Input != null)
Chat += args.Input;
{
if (args.Input.StartsWith('/'))
Chat = args.Input;
else
Chat += args.Input;
}
var (info, reason, target) = (args.ChannelSwitchInfo, args.TellReason, args.TellTarget);
@@ -277,7 +309,7 @@ public sealed class ChatLogWindow : Window
|| !GameFunctions.Chat.IsChannelOrExistingLinkshell(targetChannel.Value)
)
{
Plugin.LogProxy.Warning(
_logger.LogWarning(
$"Channel was set to an invalid value '{targetChannel}', ignoring"
);
return;
@@ -331,11 +363,11 @@ public sealed class ChatLogWindow : Window
{
case "hide":
CurrentHideState = HideState.User;
Plugin.LogProxy.Verbose("HideState: → User (chat hide command)");
_logger.LogTrace("HideState: → User (chat hide command)");
break;
case "show":
CurrentHideState = HideState.None;
Plugin.LogProxy.Verbose("HideState: → None (chat show command)");
_logger.LogTrace("HideState: → None (chat show command)");
break;
case "toggle":
CurrentHideState = CurrentHideState switch
@@ -345,7 +377,7 @@ public sealed class ChatLogWindow : Window
HideState.None => HideState.User,
_ => CurrentHideState,
};
Plugin.LogProxy.Verbose($"HideState: → {CurrentHideState} (chat toggle command)");
_logger.LogTrace($"HideState: → {CurrentHideState} (chat toggle command)");
break;
}
}
@@ -455,7 +487,7 @@ public sealed class ChatLogWindow : Window
else if (newTab.CurrentChannel.Channel is InputChannel.Invalid)
{
newTab.CurrentChannel = previousTab.CurrentChannel.Clone();
Plugin.LogProxy.Debug(
_logger.LogDebug(
$"[Tab] '{newTab.Name}' seeded channel from '{previousTab.Name}' "
+ $"(Channel={newTab.CurrentChannel.Channel}, TellTarget={newTab.CurrentChannel.TellTarget?.ToTargetString() ?? "null"})"
);
@@ -483,14 +515,14 @@ public sealed class ChatLogWindow : Window
if (Plugin.Config.HideInBattle && CurrentHideState == HideState.None && Plugin.InBattle)
{
CurrentHideState = HideState.Battle;
Plugin.LogProxy.Verbose("HideState: None → Battle");
_logger.LogTrace("HideState: None → Battle");
}
// If the chat is hidden because of battle, we reset it here
if (CurrentHideState is HideState.Battle && !Plugin.InBattle)
{
CurrentHideState = HideState.None;
Plugin.LogProxy.Verbose("HideState: Battle → None");
_logger.LogTrace("HideState: Battle → None");
}
// if the chat has no hide state and in a cutscene, set the hide state to cutscene
@@ -503,7 +535,7 @@ public sealed class ChatLogWindow : Window
if (Plugin.Functions.Chat.CheckHideFlags())
{
CurrentHideState = HideState.Cutscene;
Plugin.LogProxy.Verbose("HideState: None → Cutscene");
_logger.LogTrace("HideState: None → Cutscene");
}
}
@@ -514,7 +546,7 @@ public sealed class ChatLogWindow : Window
&& !Plugin.GposeActive
)
{
Plugin.LogProxy.Verbose($"HideState: {CurrentHideState} → None (cutscene/gpose ended)");
_logger.LogTrace($"HideState: {CurrentHideState} → None (cutscene/gpose ended)");
CurrentHideState = HideState.None;
}
@@ -522,14 +554,14 @@ public sealed class ChatLogWindow : Window
if (CurrentHideState == HideState.Cutscene && Activate)
{
CurrentHideState = HideState.CutsceneOverride;
Plugin.LogProxy.Verbose("HideState: Cutscene → CutsceneOverride (user activate)");
_logger.LogTrace("HideState: Cutscene → CutsceneOverride (user activate)");
}
// if the user hid the chat and is now activating chat, reset the hide state
if (CurrentHideState == HideState.User && Activate)
{
CurrentHideState = HideState.None;
Plugin.LogProxy.Verbose("HideState: User → None (activate)");
_logger.LogTrace("HideState: User → None (activate)");
}
if (
@@ -660,7 +692,7 @@ public sealed class ChatLogWindow : Window
}
catch (Exception ex)
{
Plugin.LogProxy.Error(ex, "Error drawing Chat Log window");
_logger.LogError(ex, "Error drawing Chat Log window");
if (!NotifiedDrawFailure)
{
Plugin.Notification.AddNotification(
@@ -792,6 +824,40 @@ public sealed class ChatLogWindow : Window
)
inputColour = ecColour;
// Symbol-picker trigger sits left of the channel indicator. ImRaii.Popup
// inside DrawAndConsume pins to the last rendered item, so the call MUST
// run immediately after this IconButton — placing it after the channel
// picker below would pin the popup under the wrong widget.
if (Plugin.Config.SymbolPickerEnabled)
{
if (
ImGuiUtil.IconButton(
FontAwesomeIcon.Smile,
"symbol-picker-trigger",
"Insert symbol or FFXIV icon"
)
)
{
_symbolPicker.OpenPopup();
}
}
// DrawAndConsume runs unconditionally; with the button hidden the popup
// can't open, so the call is a no-op. Splice path stays outside the
// guard for the same reason.
var insertedSymbol = _symbolPicker.DrawAndConsume();
if (insertedSymbol is not null)
{
// Same cursor-aware splice idiom as the AutoComplete commit path at
// ChatLogWindow.cs:2487-2493. Clamp because CursorPos can drift if
// the user mutates Chat while the popup is open.
var pos = Math.Clamp(CursorPos, 0, Chat.Length);
Chat = Chat[..pos] + insertedSymbol + Chat[pos..];
Activate = true;
ActivatePos = pos + insertedSymbol.Length;
}
if (Plugin.Config.SymbolPickerEnabled)
ImGui.SameLine();
var beforeIcon = ImGui.GetCursorPos();
var tintSelector = Plugin.Config.ColorSelectedInputChannelButton && inputColour.HasValue;
@@ -1668,7 +1734,7 @@ public sealed class ChatLogWindow : Window
}
catch (Exception ex)
{
Plugin.LogProxy.Warning(ex, "Error drawing chat log");
_logger.LogWarning(ex, "Error drawing chat log");
}
}
@@ -2216,7 +2282,7 @@ public sealed class ChatLogWindow : Window
{
Plugin.Config.SeenPopOutHeaderHint = true;
Plugin.SaveConfig();
Plugin.LogProxy.Debug("v0.6.1 pop-out header hint dismissed");
_logger.LogDebug("v0.6.1 pop-out header hint dismissed");
if (openSettings)
Plugin.SettingsWindow.Toggle();
}
@@ -2354,7 +2420,7 @@ public sealed class ChatLogWindow : Window
if (PopOutWindows.Contains(tab.Identifier))
continue;
var window = new Popout(this, tab, i);
var window = new Popout(this, tab, i, _loggerFactory.CreateLogger<Popout>());
Plugin.WindowSystem.AddWindow(window);
PopOutWindows.Add(tab.Identifier);
@@ -2871,7 +2937,7 @@ public sealed class ChatLogWindow : Window
var viewport = ImGui.GetMainViewport();
var safePos = viewport.WorkPos + SafeDefaultOffset;
Position = safePos;
Plugin.LogProxy.Info(
_logger.LogInformation(
$"[Window-Recovery] {source}: snapping main window from {LastWindowPos} (size {LastWindowSize}) to {safePos}."
);
+8 -4
View File
@@ -17,6 +17,7 @@ using HellionChat.Resources;
using HellionChat.Util;
using Lumina.Data.Files;
using Lumina.Text.ReadOnly;
using Microsoft.Extensions.Logging;
using MoreLinq;
namespace HellionChat.Ui;
@@ -67,10 +68,13 @@ public class DbViewer : Window
private bool NeedsScrollReset;
public DbViewer(Plugin plugin)
private readonly ILogger<DbViewer> _logger;
public DbViewer(Plugin plugin, ILogger<DbViewer> logger)
: base("DBViewer###chat2-dbviewer")
{
Plugin = plugin;
_logger = logger;
SelectedChannels = TabsUtil.MostlyPlayer;
DateFormat = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern;
@@ -320,7 +324,7 @@ public class DbViewer : Window
}
catch (Exception ex)
{
Plugin.LogProxy.Error(ex, "Failed reading messages from database");
_logger.LogError(ex, "Failed reading messages from database");
}
finally
{
@@ -483,7 +487,7 @@ public class DbViewer : Window
}
catch (Exception ex)
{
Plugin.LogProxy.Error(ex, "FTS filter worker failed");
_logger.LogError(ex, "FTS filter worker failed");
}
});
}
@@ -625,7 +629,7 @@ public class DbViewer : Window
}
catch (Exception ex)
{
Plugin.LogProxy.Error(ex, "Failed creating txt backup");
_logger.LogError(ex, "Failed creating txt backup");
Notification.Content = "Error ...";
Notification.Type = NotificationType.Error;
+11 -8
View File
@@ -3,6 +3,7 @@ using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Style;
using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing;
using Microsoft.Extensions.Logging;
namespace HellionChat.Ui;
@@ -11,6 +12,7 @@ internal class Popout : Window
private readonly ChatLogWindow ChatLogWindow;
private readonly Tab Tab;
private readonly int Idx;
private readonly ILogger<Popout> _logger;
private long FrameTime;
private long LastActivityTime = Environment.TickCount64;
@@ -23,12 +25,13 @@ internal class Popout : Window
// Exposed so AutoTellTabsService can locate this window during LRU eviction.
internal Guid TabIdentifier => Tab.Identifier;
public Popout(ChatLogWindow chatLogWindow, Tab tab, int idx)
public Popout(ChatLogWindow chatLogWindow, Tab tab, int idx, ILogger<Popout> logger)
: base($"{tab.Name}##popout")
{
ChatLogWindow = chatLogWindow;
Tab = tab;
Idx = idx;
_logger = logger;
Size = new Vector2(350, 350);
SizeCondition = ImGuiCond.FirstUseEver;
@@ -175,7 +178,7 @@ internal class Popout : Window
{
Plugin.Config.SeenPopOutInputHint = true;
ChatLogWindow.Plugin.SaveConfig();
Plugin.LogProxy.Debug("Pop-Out input hint dismissed");
_logger.LogDebug("Pop-Out input hint dismissed");
if (openSettings)
ChatLogWindow.Plugin.SettingsWindow.Toggle();
}
@@ -214,13 +217,13 @@ internal class Popout : Window
if (Tab.HideInBattle && CurrentHideState == HideState.None && Plugin.InBattle)
{
CurrentHideState = HideState.Battle;
Plugin.LogProxy.Verbose($"Popout HideState [{Tab.Name}]: None -> Battle");
_logger.LogTrace($"Popout HideState [{Tab.Name}]: None -> Battle");
}
if (CurrentHideState is HideState.Battle && !Plugin.InBattle)
{
CurrentHideState = HideState.None;
Plugin.LogProxy.Verbose($"Popout HideState [{Tab.Name}]: Battle -> None");
_logger.LogTrace($"Popout HideState [{Tab.Name}]: Battle -> None");
}
if (
@@ -232,7 +235,7 @@ internal class Popout : Window
if (ChatLogWindow.Plugin.Functions.Chat.CheckHideFlags())
{
CurrentHideState = HideState.Cutscene;
Plugin.LogProxy.Verbose($"Popout HideState [{Tab.Name}]: None -> Cutscene");
_logger.LogTrace($"Popout HideState [{Tab.Name}]: None -> Cutscene");
}
}
@@ -242,7 +245,7 @@ internal class Popout : Window
&& !Plugin.GposeActive
)
{
Plugin.LogProxy.Verbose(
_logger.LogTrace(
$"Popout HideState [{Tab.Name}]: {CurrentHideState} -> None (cutscene/gpose ended)"
);
CurrentHideState = HideState.None;
@@ -251,7 +254,7 @@ internal class Popout : Window
if (CurrentHideState == HideState.Cutscene && ChatLogWindow.Activate)
{
CurrentHideState = HideState.CutsceneOverride;
Plugin.LogProxy.Verbose(
_logger.LogTrace(
$"Popout HideState [{Tab.Name}]: Cutscene -> CutsceneOverride (user activate)"
);
}
@@ -259,7 +262,7 @@ internal class Popout : Window
if (CurrentHideState == HideState.User && ChatLogWindow.Activate)
{
CurrentHideState = HideState.None;
Plugin.LogProxy.Verbose($"Popout HideState [{Tab.Name}]: User -> None (activate)");
_logger.LogTrace($"Popout HideState [{Tab.Name}]: User -> None (activate)");
}
return CurrentHideState is HideState.Cutscene or HideState.User or HideState.Battle
+5 -4
View File
@@ -6,6 +6,7 @@ using Dalamud.Utility;
using HellionChat.Resources;
using HellionChat.Ui.SettingsTabs;
using HellionChat.Util;
using Microsoft.Extensions.Logging;
namespace HellionChat.Ui;
@@ -25,7 +26,7 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
private SettingsView View = SettingsView.Overview;
private readonly SettingsOverview Overview;
internal SettingsWindow(Plugin plugin)
internal SettingsWindow(Plugin plugin, ILoggerFactory loggerFactory)
: base($"{Language.Settings_Title.Format(Plugin.PluginName)}###chat2-settings")
{
Flags = ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoScrollWithMouse;
@@ -45,13 +46,13 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
Tabs =
[
new General(Plugin, Mutable),
new ThemeAndLayout(Plugin, Mutable),
new FontsAndColours(Plugin, Mutable),
new ThemeAndLayout(Plugin, Mutable, loggerFactory.CreateLogger<ThemeAndLayout>()),
new FontsAndColours(Plugin, Mutable, loggerFactory.CreateLogger<FontsAndColours>()),
new SettingsTabs.Window(Plugin, Mutable),
new Chat(Plugin, Mutable),
new SettingsTabs.Tabs(Plugin, Mutable),
new SettingsTabs.Privacy(Plugin, Mutable),
new DataManagement(Plugin, Mutable),
new DataManagement(Plugin, Mutable, loggerFactory.CreateLogger<DataManagement>()),
new SettingsTabs.Integrations(Plugin, Mutable),
new Information(Mutable),
];
+6
View File
@@ -139,6 +139,12 @@ internal sealed class Chat : ISettingsTab
);
ImGuiUtil.HelpMarker(Language.Options_CollapseDuplicateMsgUniqueLink_Description);
}
ImGui.Checkbox(
HellionStrings.Settings_Chat_SymbolPicker_Enable_Name,
ref Mutable.SymbolPickerEnabled
);
ImGuiUtil.HelpMarker(HellionStrings.Settings_Chat_SymbolPicker_Enable_Description);
}
}
+19 -20
View File
@@ -11,6 +11,7 @@ using HellionChat.Export;
using HellionChat.Privacy;
using HellionChat.Resources;
using HellionChat.Util;
using Microsoft.Extensions.Logging;
namespace HellionChat.Ui.SettingsTabs;
@@ -18,6 +19,7 @@ internal sealed class DataManagement : ISettingsTab
{
private Plugin Plugin { get; }
private Configuration Mutable { get; }
private readonly ILogger<DataManagement> _logger;
public string Name =>
HellionStrings.Settings_Card_DataManagement_Title + "###tabs-datamanagement";
@@ -136,10 +138,11 @@ internal sealed class DataManagement : ISettingsTab
),
];
internal DataManagement(Plugin plugin, Configuration mutable)
internal DataManagement(Plugin plugin, Configuration mutable, ILogger<DataManagement> logger)
{
Plugin = plugin;
Mutable = mutable;
_logger = logger;
}
public void Draw(bool changed)
@@ -229,7 +232,7 @@ internal sealed class DataManagement : ISettingsTab
}
catch (Exception e)
{
Plugin.LogProxy.Error(e, "Unable to delete old database");
_logger.LogError(e, "Unable to delete old database");
WrapperUtil.AddNotification(
Language.Options_Database_Old_Delete_Error,
NotificationType.Error
@@ -391,9 +394,7 @@ internal sealed class DataManagement : ISettingsTab
Plugin.Config.RetentionLastRunAt = DateTimeOffset.UtcNow;
Plugin.SaveConfig();
Plugin.LogProxy.Information(
$"Manual retention run deleted {deleted} expired messages."
);
_logger.LogInformation($"Manual retention run deleted {deleted} expired messages.");
if (deleted > 0)
{
@@ -407,7 +408,7 @@ internal sealed class DataManagement : ISettingsTab
.Wait(TimeSpan.FromSeconds(5))
)
{
Plugin.LogProxy.Warning(
_logger.LogWarning(
"Retention sweep: framework refresh timed out after 5s."
);
}
@@ -420,7 +421,7 @@ internal sealed class DataManagement : ISettingsTab
}
catch (Exception e)
{
Plugin.LogProxy.Error(e, "Manual retention run failed");
_logger.LogError(e, "Manual retention run failed");
WrapperUtil.AddNotification(HellionStrings.Retention_Error, NotificationType.Error);
}
finally
@@ -568,7 +569,7 @@ internal sealed class DataManagement : ISettingsTab
}
catch (Exception e)
{
Plugin.LogProxy.Error(e, "Failed to compute cleanup preview");
_logger.LogError(e, "Failed to compute cleanup preview");
WrapperUtil.AddNotification(
HellionStrings.Cleanup_PreviewError,
NotificationType.Error
@@ -589,7 +590,7 @@ internal sealed class DataManagement : ISettingsTab
try
{
var deleted = Plugin.MessageManager.Store.CleanupRetainOnly(allowed);
Plugin.LogProxy.Information($"Privacy cleanup: deleted {deleted} messages");
_logger.LogInformation($"Privacy cleanup: deleted {deleted} messages");
if (
!Plugin
@@ -601,9 +602,7 @@ internal sealed class DataManagement : ISettingsTab
.Wait(TimeSpan.FromSeconds(5))
)
{
Plugin.LogProxy.Warning(
"Privacy cleanup: framework refresh timed out after 5s."
);
_logger.LogWarning("Privacy cleanup: framework refresh timed out after 5s.");
}
WrapperUtil.AddNotification(
@@ -613,7 +612,7 @@ internal sealed class DataManagement : ISettingsTab
}
catch (Exception e)
{
Plugin.LogProxy.Error(e, "Privacy cleanup failed");
_logger.LogError(e, "Privacy cleanup failed");
WrapperUtil.AddNotification(HellionStrings.Cleanup_Error, NotificationType.Error);
}
finally
@@ -773,7 +772,7 @@ internal sealed class DataManagement : ISettingsTab
}
catch (Exception e)
{
Plugin.LogProxy.Error(e, "Export failed");
_logger.LogError(e, "Export failed");
WrapperUtil.AddNotification(HellionStrings.Export_Error, NotificationType.Error);
}
finally
@@ -853,7 +852,7 @@ internal sealed class DataManagement : ISettingsTab
)
)
{
Plugin.LogProxy.Warning("Clearing messages from database");
_logger.LogWarning("Clearing messages from database");
Plugin.MessageManager.Store.ClearMessages();
Plugin.MessageManager.ClearAllTabs();
@@ -911,7 +910,7 @@ internal sealed class DataManagement : ISettingsTab
private void InsertMessages(int count)
{
Plugin.LogProxy.Info($"Inserting {count} messages due to user request");
_logger.LogInformation($"Inserting {count} messages due to user request");
var stopwatch = Stopwatch.StartNew();
var playerName = Plugin.PlayerState.CharacterName;
@@ -956,7 +955,7 @@ internal sealed class DataManagement : ISettingsTab
var elapsedTicks = stopwatch.ElapsedTicks;
stopwatch.Stop();
Plugin.LogProxy.Info(
_logger.LogInformation(
$"Crafted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"
);
@@ -966,7 +965,7 @@ internal sealed class DataManagement : ISettingsTab
elapsedTicks = stopwatch.ElapsedTicks;
stopwatch.Stop();
Plugin.LogProxy.Info(
_logger.LogInformation(
$"Upserted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"
);
@@ -977,7 +976,7 @@ internal sealed class DataManagement : ISettingsTab
Plugin.MessageManager.ClearAllTabs();
elapsedTicks = stopwatch.ElapsedTicks;
stopwatch.Stop();
Plugin.LogProxy.Info(
_logger.LogInformation(
$"Cleared {Plugin.Config.Tabs.Count} tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"
);
})
@@ -990,7 +989,7 @@ internal sealed class DataManagement : ISettingsTab
Plugin.MessageManager.FilterAllTabs();
elapsedTicks = stopwatch.ElapsedTicks;
stopwatch.Stop();
Plugin.LogProxy.Info(
_logger.LogInformation(
$"Fetched and filtered all tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"
);
})
@@ -7,6 +7,7 @@ using Dalamud.Interface.Utility.Raii;
using HellionChat.Code;
using HellionChat.Resources;
using HellionChat.Util;
using Microsoft.Extensions.Logging;
namespace HellionChat.Ui.SettingsTabs;
@@ -14,14 +15,16 @@ internal sealed class FontsAndColours : ISettingsTab
{
private Plugin Plugin { get; }
private Configuration Mutable { get; }
private readonly ILogger<FontsAndColours> _logger;
public string Name =>
HellionStrings.Settings_Card_FontsAndColours_Title + "###tabs-fontsandcolours";
internal FontsAndColours(Plugin plugin, Configuration mutable)
internal FontsAndColours(Plugin plugin, Configuration mutable, ILogger<FontsAndColours> logger)
{
Plugin = plugin;
Mutable = mutable;
_logger = logger;
}
public void Draw(bool changed)
@@ -312,6 +315,6 @@ internal sealed class FontsAndColours : ISettingsTab
}
Plugin.SaveConfig();
GlobalParametersCache.Refresh();
Plugin.LogProxy.Debug($"Applied chat colour preset: {preset.DisplayName}");
_logger.LogDebug($"Applied chat colour preset: {preset.DisplayName}");
}
}
@@ -4,6 +4,7 @@ using Dalamud.Interface.Utility.Raii;
using HellionChat.Resources;
using HellionChat.Themes;
using HellionChat.Util;
using Microsoft.Extensions.Logging;
namespace HellionChat.Ui.SettingsTabs;
@@ -11,16 +12,18 @@ internal sealed class ThemeAndLayout : ISettingsTab
{
private Plugin Plugin { get; }
private Configuration Mutable { get; }
private readonly ILogger<ThemeAndLayout> _logger;
private string? _applyDismissedFor;
public string Name =>
HellionStrings.Settings_Card_ThemeAndLayout_Title + "###tabs-themeandlayout";
internal ThemeAndLayout(Plugin plugin, Configuration mutable)
internal ThemeAndLayout(Plugin plugin, Configuration mutable, ILogger<ThemeAndLayout> logger)
{
Plugin = plugin;
Mutable = mutable;
_logger = logger;
}
public void Draw(bool changed)
@@ -90,7 +93,7 @@ internal sealed class ThemeAndLayout : ISettingsTab
var path = Path.Combine(dir, fileName);
var json = ThemeJsonWriter.Serialize(active);
File.WriteAllText(path, json);
Plugin.LogProxy.Information($"Exported active theme '{active.Slug}' to {path}");
_logger.LogInformation($"Exported active theme '{active.Slug}' to {path}");
}
}
}
+308
View File
@@ -0,0 +1,308 @@
using System.Numerics;
using Dalamud.Bindings.ImGui;
using Dalamud.Game.Text;
using Dalamud.Interface.Utility.Raii;
namespace HellionChat.Ui;
// Popup picker for chat-input symbol insertion. Two tabs:
// PUA — Dalamud's SeIconChar enum (161 server-safe FFXIV glyphs)
// BMP — server-verified Unicode symbols (whitelist built 2026-05-16)
//
// Render-only — the Settings-Guard for showing the trigger button lives on
// the caller side (ChatLogWindow). Recent-Used is session state by design.
internal sealed class SymbolPicker
{
private const string PopupId = "HellionSymbolPicker";
private const int RecentCapacity = 16;
private string _search = string.Empty;
private readonly List<uint> _recentUsed = new(capacity: RecentCapacity);
// FFXIV server-safe BMP symbols, verified 2026-05-16 via /echo + /say.
// Filtered ranges: U+2694-26C4 (Misc Symbols Extended), U+2700+ (Dingbats
// Extended), diagonal arrows, U+2153+ fractions, chess pieces.
// Full probe log: Cycles/v1.4.10 BMP-Whitelist Notes.md.
private static readonly (uint Codepoint, string Name)[] BmpWhitelist = new[]
{
(0x00A1u, "Inverted Exclamation"),
(0x00A2u, "Cent Sign"),
(0x00A3u, "Pound Sign"),
(0x00A4u, "Currency Sign"),
(0x00A5u, "Yen Sign"),
(0x00A7u, "Section Sign"),
(0x00A9u, "Copyright Sign"),
(0x00ABu, "Left Angle Quote"),
(0x00AEu, "Registered Sign"),
(0x00B0u, "Degree Sign"),
(0x00B1u, "Plus-Minus Sign"),
(0x00B6u, "Pilcrow Sign"),
(0x00BBu, "Right Angle Quote"),
(0x00BCu, "One Quarter"),
(0x00BDu, "One Half"),
(0x00BEu, "Three Quarters"),
(0x00BFu, "Inverted Question"),
(0x00D7u, "Multiplication Sign"),
(0x00F7u, "Division Sign"),
(0x0393u, "Greek Capital Gamma"),
(0x0394u, "Greek Capital Delta"),
(0x0398u, "Greek Capital Theta"),
(0x039Bu, "Greek Capital Lambda"),
(0x039Eu, "Greek Capital Xi"),
(0x03A0u, "Greek Capital Pi"),
(0x03A3u, "Greek Capital Sigma"),
(0x03A6u, "Greek Capital Phi"),
(0x03A8u, "Greek Capital Psi"),
(0x03A9u, "Greek Capital Omega"),
(0x03B1u, "Greek Small Alpha"),
(0x03B2u, "Greek Small Beta"),
(0x03B3u, "Greek Small Gamma"),
(0x03B4u, "Greek Small Delta"),
(0x03B5u, "Greek Small Epsilon"),
(0x03B6u, "Greek Small Zeta"),
(0x03B7u, "Greek Small Eta"),
(0x03B8u, "Greek Small Theta"),
(0x03B9u, "Greek Small Iota"),
(0x03BAu, "Greek Small Kappa"),
(0x03BBu, "Greek Small Lambda"),
(0x03BCu, "Greek Small Mu"),
(0x03BDu, "Greek Small Nu"),
(0x03BEu, "Greek Small Xi"),
(0x03BFu, "Greek Small Omicron"),
(0x03C0u, "Greek Small Pi"),
(0x03C1u, "Greek Small Rho"),
(0x03C3u, "Greek Small Sigma"),
(0x03C4u, "Greek Small Tau"),
(0x03C5u, "Greek Small Upsilon"),
(0x03C6u, "Greek Small Phi"),
(0x03C7u, "Greek Small Chi"),
(0x03C8u, "Greek Small Psi"),
(0x03C9u, "Greek Small Omega"),
(0x2013u, "En Dash"),
(0x2014u, "Em Dash"),
(0x2020u, "Dagger"),
(0x2021u, "Double Dagger"),
(0x2026u, "Horizontal Ellipsis"),
(0x203Bu, "Reference Mark"),
(0x20ACu, "Euro Sign"),
(0x2122u, "Trade Mark Sign"),
(0x2190u, "Leftwards Arrow"),
(0x2191u, "Upwards Arrow"),
(0x2192u, "Rightwards Arrow"),
(0x2193u, "Downwards Arrow"),
(0x21D2u, "Rightwards Double Arrow"),
(0x21D4u, "Left Right Double Arrow"),
(0x2202u, "Partial Differential"),
(0x2207u, "Nabla"),
(0x2211u, "Summation"),
(0x221Au, "Square Root"),
(0x221Eu, "Infinity"),
(0x222Bu, "Integral"),
(0x2260u, "Not Equal To"),
(0x25A0u, "Black Square"),
(0x25A1u, "White Square"),
(0x25B2u, "Black Up Triangle"),
(0x25B3u, "White Up Triangle"),
(0x25BCu, "Black Down Triangle"),
(0x25C6u, "Black Diamond"),
(0x25C7u, "White Diamond"),
(0x25CBu, "White Circle"),
(0x25CFu, "Black Circle"),
(0x2600u, "Black Sun With Rays"),
(0x2601u, "Cloud"),
(0x2602u, "Umbrella"),
(0x2603u, "Snowman"),
(0x2605u, "Black Star"),
(0x2606u, "White Star"),
(0x2640u, "Female Sign"),
(0x2642u, "Male Sign"),
(0x2660u, "Black Spade Suit"),
(0x2661u, "White Heart Suit"),
(0x2663u, "Black Club Suit"),
(0x2665u, "Black Heart Suit"),
(0x266Au, "Eighth Note"),
(0x2713u, "Check Mark"),
};
public void OpenPopup() => ImGui.OpenPopup(PopupId);
// Returns the inserted codepoint as a string fragment if the user clicked
// one this frame, or null otherwise. Caller splices the fragment into the
// chat-input buffer at the current cursor position.
public string? DrawAndConsume()
{
// ImRaii.Popup auto-disposes EndPopup, same idiom as other popups in
// ChatLogWindow.
using var popup = ImRaii.Popup(PopupId);
if (!popup)
return null;
string? inserted = null;
// Recent-Used-Row sits above the tabs so both PUA and BMP picks share
// one fast-access strip. Session-only by design (see TrackRecent).
if (_recentUsed.Count > 0)
{
ImGui.TextDisabled("Recent");
ImGui.SameLine();
foreach (var codepoint in _recentUsed)
{
var glyph = char.ConvertFromUtf32((int)codepoint);
if (
ImGui.Selectable(
glyph,
false,
ImGuiSelectableFlags.DontClosePopups,
new Vector2(20, 20)
)
)
{
inserted = glyph;
}
ImGui.SameLine();
}
ImGui.NewLine();
ImGui.Separator();
}
using (var tabs = ImRaii.TabBar("##symbolpicker-tabs"))
{
if (tabs)
{
inserted = DrawPuaTab() ?? inserted;
inserted = DrawBmpTab() ?? inserted;
}
}
if (inserted is not null)
TrackRecent(inserted);
return inserted;
}
private string? DrawPuaTab()
{
using var tab = ImRaii.TabItem("FFXIV Icons");
if (!tab)
return null;
ImGui.InputTextWithHint(
"##pua-search",
"Search by name (e.g. HighQuality)",
ref _search,
64
);
string? inserted = null;
if (ImGui.BeginChild("##pua-grid", new Vector2(0, 280), false))
{
var query = _search;
foreach (var icon in Enum.GetValues<SeIconChar>())
{
var label = icon.ToString();
if (
query.Length > 0
&& label.IndexOf(query, StringComparison.OrdinalIgnoreCase) < 0
)
{
continue;
}
// ToIconString gives the single-codepoint glyph; tooltip
// carries the enum name for discoverability.
if (
ImGui.Selectable(
icon.ToIconString(),
false,
ImGuiSelectableFlags.DontClosePopups,
new Vector2(24, 24)
)
)
{
inserted = icon.ToIconString();
}
if (ImGui.IsItemHovered())
ImGui.SetTooltip(label);
// Manually-wrapping pattern from imgui_demo.cpp;
// GetWindowContentRegionMax obsolete since ImGui 1.92, use
// GetContentRegionAvail (see ChatLogWindow.cs:840).
var style = ImGui.GetStyle();
var lastItemX2 = ImGui.GetItemRectMax().X;
var availableRightX =
ImGui.GetCursorScreenPos().X + ImGui.GetContentRegionAvail().X;
if (lastItemX2 + style.ItemSpacing.X + 24f < availableRightX)
ImGui.SameLine();
}
}
ImGui.EndChild();
return inserted;
}
private string? DrawBmpTab()
{
using var tab = ImRaii.TabItem("Symbols");
if (!tab)
return null;
ImGui.InputTextWithHint("##bmp-search", "Search by name (e.g. Heart)", ref _search, 64);
string? inserted = null;
if (ImGui.BeginChild("##bmp-grid", new Vector2(0, 280), false))
{
var query = _search;
foreach (var (codepoint, name) in BmpWhitelist)
{
if (query.Length > 0 && name.IndexOf(query, StringComparison.OrdinalIgnoreCase) < 0)
{
continue;
}
var glyph = char.ConvertFromUtf32((int)codepoint);
if (
ImGui.Selectable(
glyph,
false,
ImGuiSelectableFlags.DontClosePopups,
new Vector2(24, 24)
)
)
{
inserted = glyph;
}
if (ImGui.IsItemHovered())
ImGui.SetTooltip(name);
// Same manually-wrapping pattern as DrawPuaTab — modern API
// since GetWindowContentRegionMax was deprecated in ImGui 1.92.
var style = ImGui.GetStyle();
var lastItemX2 = ImGui.GetItemRectMax().X;
var availableRightX =
ImGui.GetCursorScreenPos().X + ImGui.GetContentRegionAvail().X;
if (lastItemX2 + style.ItemSpacing.X + 24f < availableRightX)
ImGui.SameLine();
}
}
ImGui.EndChild();
return inserted;
}
private void TrackRecent(string fragment)
{
if (string.IsNullOrEmpty(fragment) || fragment.Length > 4)
return;
var codepoint = (uint)char.ConvertToUtf32(fragment, 0);
// Move-to-front so the head stays the freshest pick.
_recentUsed.RemoveAll(c => c == codepoint);
_recentUsed.Insert(0, codepoint);
if (_recentUsed.Count > RecentCapacity)
_recentUsed.RemoveAt(_recentUsed.Count - 1);
}
}
+4 -4
View File
@@ -2,10 +2,10 @@ 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>.
// Plugin.LogProxy bridge for consumers that cannot take a logger via the
// constructor: static helpers (EmoteCache et al.), Dalamud-reflected types
// (Configuration), data classes with mass instantiation (Message) and
// instance classes that only log from static methods (FontManager).
internal interface IPluginLogProxy
{
void Verbose(string message);
+395 -107
View File
@@ -1,110 +1,398 @@
{
"version": 1,
"dependencies": {
"net10.0-windows7.0": {
"DalamudPackager": {
"type": "Direct",
"requested": "[15.0.0, )",
"resolved": "15.0.0",
"contentHash": "411vwC8/X8Z/sQ2TI6v3SvOn66xFPeOjFn3Zn+h0d3Ox2t1kFm66AhDvmx/qcMwVrR+Hidxj0dadpQ2dgyXMBQ=="
},
"DotNet.ReproducibleBuilds": {
"type": "Direct",
"requested": "[1.2.39, )",
"resolved": "1.2.39",
"contentHash": "fcFN01tDTIQqDuTwr1jUQK/geofiwjG5DycJQOnC72i1SsLAk1ELe+apBOuZ11UMQG8YKFZG1FgvjZPbqHyatg=="
},
"MessagePack": {
"type": "Direct",
"requested": "[3.1.4, 4.0.0)",
"resolved": "3.1.4",
"contentHash": "BH0wlHWmVoZpbAPyyt2Awbq30C+ZsS3eHSkYdnyUAbqVJ22fAJDzn2xTieBeoT5QlcBzp61vHcv878YJGfi3mg==",
"dependencies": {
"MessagePack.Annotations": "3.1.4",
"MessagePackAnalyzer": "3.1.4",
"Microsoft.NET.StringTools": "17.11.4"
}
},
"Microsoft.Data.Sqlite": {
"type": "Direct",
"requested": "[10.0.7, )",
"resolved": "10.0.7",
"contentHash": "DZ6G2QuyPrsh5VS+wfiZbNBtYT6p+CkxXjD0aZHF04xso7QsG/uk0JpG30hzYlK6u/wtTzta1Dqfgbc/Sl2sDA==",
"dependencies": {
"Microsoft.Data.Sqlite.Core": "10.0.7",
"SQLitePCLRaw.bundle_e_sqlite3": "2.1.11",
"SQLitePCLRaw.core": "2.1.11"
}
},
"morelinq": {
"type": "Direct",
"requested": "[4.4.0, )",
"resolved": "4.4.0",
"contentHash": "QX3bsK9oFeUXk8tFsc9NkI6NnCr8Ar/ex027p+ZZ/jdLCdX2RlryDtxUqZW5j45NVwn4E4Z4hzupsoMQd6Yxtg=="
},
"Pidgin": {
"type": "Direct",
"requested": "[3.5.1, 4.0.0)",
"resolved": "3.5.1",
"contentHash": "zU7tkXlF3D6d2GLTjJDomAL3nnl4AwfZvSgSz8D4b+Ry21/clqedYlxBnEAkAU/bkGfEv6uRR7QCdWZUpKrB/g=="
},
"SixLabors.ImageSharp": {
"type": "Direct",
"requested": "[3.1.12, 4.0.0)",
"resolved": "3.1.12",
"contentHash": "iAg6zifihXEFS/t7fiHhZBGAdCp3FavsF4i2ZIDp0JfeYeDVzvmlbY1CNhhIKimaIzrzSi5M/NBFcWvZT2rB/A=="
},
"SQLitePCLRaw.lib.e_sqlite3": {
"type": "Direct",
"requested": "[3.50.3, )",
"resolved": "3.50.3",
"contentHash": "tVyhqQ8wxgedWiiPFChyZhE8I3PkOM/AE1azsj1qsdYUws13ONBFyi3aDxju4tD2kzedB2q5+50WrTyY0h2gMQ=="
},
"MessagePack.Annotations": {
"type": "Transitive",
"resolved": "3.1.4",
"contentHash": "aVWrDAkCdqxwQsz/q0ldPh2EFn48M99YUzE9OvZjMq2RNLKz4o2z88iGFvSvbMqOWRweRvKPHBJZe22PRqzslQ=="
},
"MessagePackAnalyzer": {
"type": "Transitive",
"resolved": "3.1.4",
"contentHash": "CTaSsN/liJ7MhLCAB7Z4ZLBNuVGCq9lt2BT/cbrc9vzGv89yK3CqIA+z9T19a11eQYl9etZHL6MQJgCqECRVpg=="
},
"Microsoft.Data.Sqlite.Core": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "xVrtBg3M1wJlBDkoT0dXEYB/wSc8bIHJPYtw/bu1AqpWgF79uPSs87DAhERR/Ilumre6TKZa1cjMg3VUUObVLA==",
"dependencies": {
"SQLitePCLRaw.core": "2.1.11"
}
},
"Microsoft.NET.StringTools": {
"type": "Transitive",
"resolved": "17.11.4",
"contentHash": "mudqUHhNpeqIdJoUx2YDWZO/I9uEDYVowan89R6wsomfnUJQk6HteoQTlNjZDixhT2B4IXMkMtgZtoceIjLRmA=="
},
"SQLitePCLRaw.bundle_e_sqlite3": {
"type": "Transitive",
"resolved": "2.1.11",
"contentHash": "DC4nA7yWnf4UZdgJDF+9Mus4/cb0Y3Sfgi3gDnAoKNAIBwzkskNAbNbyu+u4atT0ruVlZNJfwZmwiEwE5oz9LQ==",
"dependencies": {
"SQLitePCLRaw.lib.e_sqlite3": "2.1.11",
"SQLitePCLRaw.provider.e_sqlite3": "2.1.11"
}
},
"SQLitePCLRaw.core": {
"type": "Transitive",
"resolved": "2.1.11",
"contentHash": "PK0GLFkfhZzLQeR3PJf71FmhtHox+U3vcY6ZtswoMjrefkB9k6ErNJEnwXqc5KgXDSjige2XXrezqS39gkpQKA=="
},
"SQLitePCLRaw.provider.e_sqlite3": {
"type": "Transitive",
"resolved": "2.1.11",
"contentHash": "Y/0ZkR+r0Cg3DQFuCl1RBnv/tmxpIZRU3HUvelPw6MVaKHwYYR8YNvgs0vuNuXCMvlyJ+Fh88U1D4tah1tt6qw==",
"dependencies": {
"SQLitePCLRaw.core": "2.1.11"
}
}
"version": 1,
"dependencies": {
"net10.0-windows7.0": {
"DalamudPackager": {
"type": "Direct",
"requested": "[15.0.0, )",
"resolved": "15.0.0",
"contentHash": "411vwC8/X8Z/sQ2TI6v3SvOn66xFPeOjFn3Zn+h0d3Ox2t1kFm66AhDvmx/qcMwVrR+Hidxj0dadpQ2dgyXMBQ=="
},
"DotNet.ReproducibleBuilds": {
"type": "Direct",
"requested": "[1.2.39, )",
"resolved": "1.2.39",
"contentHash": "fcFN01tDTIQqDuTwr1jUQK/geofiwjG5DycJQOnC72i1SsLAk1ELe+apBOuZ11UMQG8YKFZG1FgvjZPbqHyatg=="
},
"MessagePack": {
"type": "Direct",
"requested": "[3.1.4, 4.0.0)",
"resolved": "3.1.4",
"contentHash": "BH0wlHWmVoZpbAPyyt2Awbq30C+ZsS3eHSkYdnyUAbqVJ22fAJDzn2xTieBeoT5QlcBzp61vHcv878YJGfi3mg==",
"dependencies": {
"MessagePack.Annotations": "3.1.4",
"MessagePackAnalyzer": "3.1.4",
"Microsoft.NET.StringTools": "17.11.4"
}
},
"Microsoft.Data.Sqlite": {
"type": "Direct",
"requested": "[10.0.7, )",
"resolved": "10.0.7",
"contentHash": "DZ6G2QuyPrsh5VS+wfiZbNBtYT6p+CkxXjD0aZHF04xso7QsG/uk0JpG30hzYlK6u/wtTzta1Dqfgbc/Sl2sDA==",
"dependencies": {
"Microsoft.Data.Sqlite.Core": "10.0.7",
"SQLitePCLRaw.bundle_e_sqlite3": "2.1.11",
"SQLitePCLRaw.core": "2.1.11"
}
},
"Microsoft.Extensions.DependencyInjection": {
"type": "Direct",
"requested": "[10.0.7, 11.0.0)",
"resolved": "10.0.7",
"contentHash": "91F/o3emPV/+xY/ip3s2LqDNF14kjttlVtq0BXgg6p4MnCzeSZxnUJm+t6WRrtD3JdGo88/oX+z7OwK4y8PZuw==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7"
}
},
"Microsoft.Extensions.Hosting": {
"type": "Direct",
"requested": "[10.0.7, 11.0.0)",
"resolved": "10.0.7",
"contentHash": "M/vBpfWcschvS2EUeq7cHfscsxabiGTptXwV7GeSueovGiSoNjyo1j5PMcWuOAAQrRW3nRqxZk8NeumrmpzUBg==",
"dependencies": {
"Microsoft.Extensions.Configuration": "10.0.7",
"Microsoft.Extensions.Configuration.Abstractions": "10.0.7",
"Microsoft.Extensions.Configuration.Binder": "10.0.7",
"Microsoft.Extensions.Configuration.CommandLine": "10.0.7",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "10.0.7",
"Microsoft.Extensions.Configuration.FileExtensions": "10.0.7",
"Microsoft.Extensions.Configuration.Json": "10.0.7",
"Microsoft.Extensions.Configuration.UserSecrets": "10.0.7",
"Microsoft.Extensions.DependencyInjection": "10.0.7",
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7",
"Microsoft.Extensions.Diagnostics": "10.0.7",
"Microsoft.Extensions.FileProviders.Abstractions": "10.0.7",
"Microsoft.Extensions.FileProviders.Physical": "10.0.7",
"Microsoft.Extensions.Hosting.Abstractions": "10.0.7",
"Microsoft.Extensions.Logging": "10.0.7",
"Microsoft.Extensions.Logging.Abstractions": "10.0.7",
"Microsoft.Extensions.Logging.Configuration": "10.0.7",
"Microsoft.Extensions.Logging.Console": "10.0.7",
"Microsoft.Extensions.Logging.Debug": "10.0.7",
"Microsoft.Extensions.Logging.EventLog": "10.0.7",
"Microsoft.Extensions.Logging.EventSource": "10.0.7",
"Microsoft.Extensions.Options": "10.0.7"
}
},
"Microsoft.Extensions.Logging": {
"type": "Direct",
"requested": "[10.0.7, 11.0.0)",
"resolved": "10.0.7",
"contentHash": "hOeRIQ63GkgiYCB/MIFp+LQs8aXpJXpB55t6Aj37ab7t2/6WeFcPXxYM9hdy/o5tffzwf8mhqzLJP6mjGYCxjw==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection": "10.0.7",
"Microsoft.Extensions.Logging.Abstractions": "10.0.7",
"Microsoft.Extensions.Options": "10.0.7"
}
},
"Microsoft.Extensions.Options": {
"type": "Direct",
"requested": "[10.0.7, 11.0.0)",
"resolved": "10.0.7",
"contentHash": "00SHUGTh2jSMvIr6x9Xwd2nE+B5/qFCO/9hDwUDhJsjYRDlADmaBZ7tqehXzBDsfjHSXJzuRHJzPYPPjphBQ7Q==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7",
"Microsoft.Extensions.Primitives": "10.0.7"
}
},
"morelinq": {
"type": "Direct",
"requested": "[4.4.0, )",
"resolved": "4.4.0",
"contentHash": "QX3bsK9oFeUXk8tFsc9NkI6NnCr8Ar/ex027p+ZZ/jdLCdX2RlryDtxUqZW5j45NVwn4E4Z4hzupsoMQd6Yxtg=="
},
"Pidgin": {
"type": "Direct",
"requested": "[3.5.1, 4.0.0)",
"resolved": "3.5.1",
"contentHash": "zU7tkXlF3D6d2GLTjJDomAL3nnl4AwfZvSgSz8D4b+Ry21/clqedYlxBnEAkAU/bkGfEv6uRR7QCdWZUpKrB/g=="
},
"SixLabors.ImageSharp": {
"type": "Direct",
"requested": "[3.1.12, 4.0.0)",
"resolved": "3.1.12",
"contentHash": "iAg6zifihXEFS/t7fiHhZBGAdCp3FavsF4i2ZIDp0JfeYeDVzvmlbY1CNhhIKimaIzrzSi5M/NBFcWvZT2rB/A=="
},
"SQLitePCLRaw.lib.e_sqlite3": {
"type": "Direct",
"requested": "[3.50.3, )",
"resolved": "3.50.3",
"contentHash": "tVyhqQ8wxgedWiiPFChyZhE8I3PkOM/AE1azsj1qsdYUws13ONBFyi3aDxju4tD2kzedB2q5+50WrTyY0h2gMQ=="
},
"MessagePack.Annotations": {
"type": "Transitive",
"resolved": "3.1.4",
"contentHash": "aVWrDAkCdqxwQsz/q0ldPh2EFn48M99YUzE9OvZjMq2RNLKz4o2z88iGFvSvbMqOWRweRvKPHBJZe22PRqzslQ=="
},
"MessagePackAnalyzer": {
"type": "Transitive",
"resolved": "3.1.4",
"contentHash": "CTaSsN/liJ7MhLCAB7Z4ZLBNuVGCq9lt2BT/cbrc9vzGv89yK3CqIA+z9T19a11eQYl9etZHL6MQJgCqECRVpg=="
},
"Microsoft.Data.Sqlite.Core": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "xVrtBg3M1wJlBDkoT0dXEYB/wSc8bIHJPYtw/bu1AqpWgF79uPSs87DAhERR/Ilumre6TKZa1cjMg3VUUObVLA==",
"dependencies": {
"SQLitePCLRaw.core": "2.1.11"
}
},
"Microsoft.Extensions.Configuration": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "wZbGh7J8R1vXN525O6d8dlcDTxhRTnd5MyW4LdfP5S0tSnTwTCseYSrq6g0Mxh7W9xn8P/2xPuf0D/m6k2dy2w==",
"dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "10.0.7",
"Microsoft.Extensions.Primitives": "10.0.7"
}
},
"Microsoft.Extensions.Configuration.Abstractions": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "t56nEgvECcyLPojZIUFWJknQQDAbgfTf9J+QMYJE1YYvVgz69vN6B/AKL8Grvj3Lcnp8kTpNqwmwFhb3YLJmtQ==",
"dependencies": {
"Microsoft.Extensions.Primitives": "10.0.7"
}
},
"Microsoft.Extensions.Configuration.Binder": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "8bS1qIaRivny+WX+49pmeJ6iAylbtX8C0DLEcCQWZjdxQvLqaMssXiGD9P/6pYElrHbK5/nAHmjbQ8STqdMYeg==",
"dependencies": {
"Microsoft.Extensions.Configuration": "10.0.7",
"Microsoft.Extensions.Configuration.Abstractions": "10.0.7"
}
},
"Microsoft.Extensions.Configuration.CommandLine": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "3lNjglxfFxOzI9zG+3HSg/YSGqo//8Fqw6u6iuIamZb4JCorbA3JLaeWOpfKTAPi2UJwaispOXWx14dUqcGz4A==",
"dependencies": {
"Microsoft.Extensions.Configuration": "10.0.7",
"Microsoft.Extensions.Configuration.Abstractions": "10.0.7"
}
},
"Microsoft.Extensions.Configuration.EnvironmentVariables": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "TWto3imA+mJMLZI+5sbgLiFFoOFNFkizQYNaC5jTuiHKn3diwm1RN7mWDOEZN9kG2bixw7IvgpvtUG5/teSRzA==",
"dependencies": {
"Microsoft.Extensions.Configuration": "10.0.7",
"Microsoft.Extensions.Configuration.Abstractions": "10.0.7"
}
},
"Microsoft.Extensions.Configuration.FileExtensions": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "qbZLvLsoTdArSloEnSxs21P781YUmwVmHc5NJPQD/ezAreQ7884z+6QfAZVKi86WAZtzx83jK2uC4itxOM44gQ==",
"dependencies": {
"Microsoft.Extensions.Configuration": "10.0.7",
"Microsoft.Extensions.Configuration.Abstractions": "10.0.7",
"Microsoft.Extensions.FileProviders.Abstractions": "10.0.7",
"Microsoft.Extensions.FileProviders.Physical": "10.0.7",
"Microsoft.Extensions.Primitives": "10.0.7"
}
},
"Microsoft.Extensions.Configuration.Json": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "64dimvyyKk0dbUbrLg/YCv4ugJ4sVz2aXLwfvZwR1EC4tJqW9ru/oVRcXwoJRa2lQGXtYtlpk4maWOeIb48tQw==",
"dependencies": {
"Microsoft.Extensions.Configuration": "10.0.7",
"Microsoft.Extensions.Configuration.Abstractions": "10.0.7",
"Microsoft.Extensions.Configuration.FileExtensions": "10.0.7",
"Microsoft.Extensions.FileProviders.Abstractions": "10.0.7"
}
},
"Microsoft.Extensions.Configuration.UserSecrets": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "YqVIICoIdl0016wkeO2WQS+uEbEXbUhMLKdC5rZNl1X3nu59F+nwaAHdHjq/4OK+Cx31DYmNUSFh+MUot8qSDw==",
"dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "10.0.7",
"Microsoft.Extensions.Configuration.Json": "10.0.7",
"Microsoft.Extensions.FileProviders.Abstractions": "10.0.7",
"Microsoft.Extensions.FileProviders.Physical": "10.0.7"
}
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "Z6mfFEaFcwCfSboxJwOLfu7/31npCY9q70WUamHW/vRQhDvBKOT4Vf9YkZj5J6hLvJpb0oDEYfHunQZj0xxvKw=="
},
"Microsoft.Extensions.Diagnostics": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "l+smp1qPlU0OUXD0OGfdp7OUFrbdq7ZaP5T7m2WpfZ4RFKD7iG73BAT7tjSMxNmbSXkhAn1jYHOAqzYG1r9sNg==",
"dependencies": {
"Microsoft.Extensions.Configuration": "10.0.7",
"Microsoft.Extensions.Diagnostics.Abstractions": "10.0.7",
"Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.7"
}
},
"Microsoft.Extensions.Diagnostics.Abstractions": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "uJ9JP677y+uy+C0vtaSfi7XXgFAdz8DhU3M9lwwIXDfQKcyQ0yxM9DVYa0NXDtdVTYA2eBUtVFZ8LY0GCdeE/w==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7",
"Microsoft.Extensions.Options": "10.0.7"
}
},
"Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "teioDgVpi8L186wUfrXQV1YuBt6lCSPmFZiMZo53+FZxHFjOV+f4GXo4LXgJ273Mku9//AdXWVjk9J7eJP6inw==",
"dependencies": {
"Microsoft.Extensions.Primitives": "10.0.7"
}
},
"Microsoft.Extensions.FileProviders.Physical": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "zhgWg/i0ECj5v0jLFBSZHplvc5ygCI91DR4nne+BP4XAKF5ycz0pEKnFiTw8C1jCABJEZsnBZh6pXAvn71kFmw==",
"dependencies": {
"Microsoft.Extensions.FileProviders.Abstractions": "10.0.7",
"Microsoft.Extensions.FileSystemGlobbing": "10.0.7",
"Microsoft.Extensions.Primitives": "10.0.7"
}
},
"Microsoft.Extensions.FileSystemGlobbing": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "NTUspqB+vH9g4wAD6KPOBx01xqYuKXR/cHXm449zpbq1GqfjdAxBmg7eJXrNsPw7SKwIdT2cJ05GxYVvc+lvsA=="
},
"Microsoft.Extensions.Hosting.Abstractions": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "5s8d6qC6EA8UOI4wR/+zlsq7SXttJMRb9d7zvVZ7+bE3CQEfVtC9ITUDCommm87R1zzj6WJBbCnztuIJXnP3DA==",
"dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "10.0.7",
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7",
"Microsoft.Extensions.Diagnostics.Abstractions": "10.0.7",
"Microsoft.Extensions.FileProviders.Abstractions": "10.0.7",
"Microsoft.Extensions.Logging.Abstractions": "10.0.7"
}
},
"Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "tIEcQ2gvERrH2KiCjdsVcHGhXt9lIsuDStfOIeZWr7/fP8IXhGiYfx0/80PNI7WPO2IYuFtlZLSlnTS8+/Mchw==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7"
}
},
"Microsoft.Extensions.Logging.Configuration": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "7BBnoGF37USiu7j434put9mDp7EjdlNDIZsR4vHfC1FbLZeLqiWjgJbeEtF0p59Ryqt8AtraHawf0ZKbe5jibg==",
"dependencies": {
"Microsoft.Extensions.Configuration": "10.0.7",
"Microsoft.Extensions.Configuration.Abstractions": "10.0.7",
"Microsoft.Extensions.Configuration.Binder": "10.0.7",
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7",
"Microsoft.Extensions.Logging": "10.0.7",
"Microsoft.Extensions.Logging.Abstractions": "10.0.7",
"Microsoft.Extensions.Options": "10.0.7",
"Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.7"
}
},
"Microsoft.Extensions.Logging.Console": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "DA++Es6v6W0HfrOrw+K8WyN6jNnZHp640PDdEvl8yfeVmgflKdn6vSSFvufNUSOuY+M2ZaSUgfY+jUKtNpXcCw==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7",
"Microsoft.Extensions.Logging": "10.0.7",
"Microsoft.Extensions.Logging.Abstractions": "10.0.7",
"Microsoft.Extensions.Logging.Configuration": "10.0.7",
"Microsoft.Extensions.Options": "10.0.7"
}
},
"Microsoft.Extensions.Logging.Debug": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "Y6DSt/JZApunYWKqTtqbdsR6iqAvHx3D0tavbNJ1rnC24MUpF+3XO/VKgFi+9PFqMyvQ2GHBBGb8H3cLSw7rDg==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7",
"Microsoft.Extensions.Logging": "10.0.7",
"Microsoft.Extensions.Logging.Abstractions": "10.0.7"
}
},
"Microsoft.Extensions.Logging.EventLog": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "1C8eTuxF6BLncNSJ1HCfmaBcjpUSqQDPlBVdYTlet9oldHTPpNh9iatxSJLs8TOqdp/FOpH+nSLdBve7fu9mTQ==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7",
"Microsoft.Extensions.Logging": "10.0.7",
"Microsoft.Extensions.Logging.Abstractions": "10.0.7",
"Microsoft.Extensions.Options": "10.0.7",
"System.Diagnostics.EventLog": "10.0.7"
}
},
"Microsoft.Extensions.Logging.EventSource": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "YWfndnDX1jVMGCN8d5T+rO+BO8sDw6BkYlUk0BYui+WP7+HhlWx8QLdA4yUDjrkGVb3AQxIWWEPVKw5Nnfj5GQ==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7",
"Microsoft.Extensions.Logging": "10.0.7",
"Microsoft.Extensions.Logging.Abstractions": "10.0.7",
"Microsoft.Extensions.Options": "10.0.7",
"Microsoft.Extensions.Primitives": "10.0.7"
}
},
"Microsoft.Extensions.Options.ConfigurationExtensions": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "IT7f+EMXZtkjatEcF+o6aOw/7OE4etRrMiDGEWH/iiTu2R3uhC4NEQJCfHiibtX45U3sIQ5Fh6tbb1qaOz3YAg==",
"dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "10.0.7",
"Microsoft.Extensions.Configuration.Binder": "10.0.7",
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.7",
"Microsoft.Extensions.Options": "10.0.7",
"Microsoft.Extensions.Primitives": "10.0.7"
}
},
"Microsoft.Extensions.Primitives": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "D5M0Jr551iTgwkZMN9rm0pSkgNLj5quUWQUmQPMZh7k/bnvZTnXRGfE2KuvXf1EEjt/ofD9yw9IumpgdP9QCnw=="
},
"Microsoft.NET.StringTools": {
"type": "Transitive",
"resolved": "17.11.4",
"contentHash": "mudqUHhNpeqIdJoUx2YDWZO/I9uEDYVowan89R6wsomfnUJQk6HteoQTlNjZDixhT2B4IXMkMtgZtoceIjLRmA=="
},
"SQLitePCLRaw.bundle_e_sqlite3": {
"type": "Transitive",
"resolved": "2.1.11",
"contentHash": "DC4nA7yWnf4UZdgJDF+9Mus4/cb0Y3Sfgi3gDnAoKNAIBwzkskNAbNbyu+u4atT0ruVlZNJfwZmwiEwE5oz9LQ==",
"dependencies": {
"SQLitePCLRaw.lib.e_sqlite3": "2.1.11",
"SQLitePCLRaw.provider.e_sqlite3": "2.1.11"
}
},
"SQLitePCLRaw.core": {
"type": "Transitive",
"resolved": "2.1.11",
"contentHash": "PK0GLFkfhZzLQeR3PJf71FmhtHox+U3vcY6ZtswoMjrefkB9k6ErNJEnwXqc5KgXDSjige2XXrezqS39gkpQKA=="
},
"SQLitePCLRaw.provider.e_sqlite3": {
"type": "Transitive",
"resolved": "2.1.11",
"contentHash": "Y/0ZkR+r0Cg3DQFuCl1RBnv/tmxpIZRU3HUvelPw6MVaKHwYYR8YNvgs0vuNuXCMvlyJ+Fh88U1D4tah1tt6qw==",
"dependencies": {
"SQLitePCLRaw.core": "2.1.11"
}
},
"System.Diagnostics.EventLog": {
"type": "Transitive",
"resolved": "10.0.7",
"contentHash": "WbmDLeTPYhEzXhvYVioTVn/D1XX6bovyny9n5p8Zxtf03+eY385RB818teZm6n+fA63iZNvng0/Np4tLuhkMhQ=="
}
}
}
}
}
+15 -20
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)
[![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.9-brightgreen)](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/latest)
[![Latest release](https://img.shields.io/badge/release-v1.5.0-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)
[![.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/)
@@ -11,7 +11,7 @@
<img src="docs/images/hellion-forge.png" alt="Hellion Forge" width="180" />
</p>
**Version 1.4.9** — Privacy-first chat plugin for FINAL FANTASY XIV / Dalamud, built on
**Version 1.5.0** — Privacy-first chat plugin for FINAL FANTASY XIV / Dalamud, built on
[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
@@ -286,24 +286,19 @@ An optional submission to the Dalamud main plugin repo (in addition to the custo
## Project Status
**Version 1.4.9**Plugin-Load Render Polish. First-frame render cost is now well under Dalamud's 100 ms HITCH
warning threshold (~76 ms median, down from ~127 ms). The gain comes from deferring six non-essential rendering
sections on the very first Draw — bottom status bar, channel-name SeString chunks, window bounds check, hint
banner, autocomplete and input-preview calculation — so the initial ImGui layout cost is spread between frame 0
and frame 1 instead of all hitting at once. At 60 fps the user sees those sections one frame (~17 ms) later, which
is invisible inside the post-reload font-atlas build window. Slash commands `/hellion`, `/hellionView`,
`/hellionSeString` and `/hellionDebugger` are now registered centrally during plugin load so they work before
their target window is opened the first time. The configuration-button entry in Dalamud's plugin manager hangs on
the same path. Three plugin-load profiling logs (auto-translate warm-up, message-store connect, tab filter) stay
on at Information level as a regression tripwire — if a future change pushes the load past 100 ms again, the cost
is right there in `/xllog`. The release also ships a ChatTwo IPC compatibility layer: HellionChat now mirrors
ChatTwo's full IPC surface (`GetChatInputState`, `ChatInputStateChanged`, `Register`, `Unregister`, `Available`,
`Invoke`) under the `ChatTwo.*` namespace in addition to our existing `HellionChat.*` provider gates, so
third-party integrations that historically only subscribe to ChatTwo's IPC (Artisan's and AllaganTools' context-
menu hooks are the practical examples) keep working without requiring a code change on their side. Conflict
detection prevents ChatTwo from loading in parallel with HellionChat, so there is no slot-collision risk at
runtime. Migration v17 stays (no schema bump). Tenth sub-patch of the v1.4.x polish sweep series (as of
2026-05-15).
**Version 1.5.0**DI Foundation and Service Refactor. Major architecture cycle: the plugin bootstrap moves to a
generic-host DI container (`Microsoft.Extensions.Hosting` + `IServiceCollection`) modelled on Lightless Sync. All
18 instance-class services migrate from a static `Plugin.LogProxy` locator to `Microsoft.Extensions.Logging.ILogger<T>`
via constructor injection, with a custom `DalamudLogger` bridging the framework over to Dalamud's `IPluginLog`. The
proxy stays for the eight buckets ctor-injection cannot reach (static helpers like `EmoteCache`, Dalamud-reflected
`Configuration`, the `Message` data class, and static methods inside `FontManager` / `GameFunctions`). Plugin.cs
finishes the cycle at 1012 lines — virtually identical to the pre-cycle 1013 — because the new Phase-1 host build
and Plugin.X bridge wiring trade out exactly the service and window allocations that left `LoadAsync`. Cross-plugin
baseline confirms no performance penalty vs Chat 2: HellionChat first-frame HITCH 77 ms median, Chat 2 74 ms.
Lightless and XIVInstantMessenger sit around 7 ms by deferring their font-atlas build past `Finished loading`
that pattern is the v1.5.1 follow-up item. One user-visible fix bundled in from upstream: pasting a slash command
into the chat input (Friend List "/tell" action, plugin-driven inserts) now replaces the existing input instead of
concatenating onto whatever the user was typing. Migration v17 stays (no schema bump).
Hellion Chat is a standalone plugin, no longer a fork in the repository sense. Fully completed:
+65
View File
@@ -10,6 +10,71 @@ to the release pages for details.
---
## Hellion Chat 1.5.0 — DI Foundation and Service Refactor (2026-05-17)
Major architecture cycle. The plugin bootstrap moves to a generic-host DI container
(`Microsoft.Extensions.Hosting` + `IServiceCollection`) modelled on Lightless Sync. Service
logging migrates from a static `Plugin.LogProxy` locator to typed
`Microsoft.Extensions.Logging.ILogger<T>` via constructor injection, bridged over Dalamud's
`IPluginLog` by a custom `DalamudLogger` trio.
### Under the hood
- 18 instance-class services migrate to `ILogger<T>` via constructor injection across four
slices: data layer (`MessageStore`, `MessageManager`, `AutoTellTabsService`), IPC and
integrations (`HonorificService`, `IpcManager`, `TypingIpc`, `ExtraChat`, three
`GameFunctions` classes), UI window layer (`ChatLogWindow`, `DbViewer`, `Popout`, three
settings tabs), and root (`Commands`, `ThemeRegistry`, `PayloadHandler`).
- `Plugin.LogProxy` stays in place for the eight buckets ctor injection cannot reach:
static helpers (`EmoteCache`, `AutoTranslate`, `MemoryUtil`, `WrapperUtil`),
Dalamud-reflected types (`Configuration`), the `Message` data class, and instance classes
that only log from static methods (`FontManager`, one `GameFunctions` site).
- Plugin.cs finishes at 1012 lines — virtually identical to the pre-cycle 1013. The new
Phase-1 host build and `Plugin.X` bridge wiring trade out exactly the service and window
allocations that previously lived in `LoadAsync`.
- Cross-plugin baseline confirms no performance penalty against Chat 2: HellionChat
first-frame HITCH 77 ms median, Chat 2 74 ms median. Lightless and XIVInstantMessenger sit
around 7 ms by deferring their font-atlas build past `Finished loading` — that pattern is
the v1.5.1 follow-up item.
### User-visible
- Slash-command insert fix: pasting a slash command into the chat input (Friend List
"/tell" action, plugin-driven inserts from Artisan, AllaganTools etc.) now replaces the
existing input instead of concatenating onto whatever the user was typing. Cherry-picked
from ChatTwo upstream `ee7768ac` with namespace adaptation.
Migration v17 stays (no schema bump).
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
---
## Hellion Chat 1.4.10 — Symbol-Picker and Tell-History Fix (2026-05-16)
Eleventh and final sub-patch of the v1.4.x Polish-Sweep series. Symbol picker for the chat input, a tell-history reload fix
for users with many active partners, and a closing cleanup sweep before v1.5.0 picks up the DI-container adoption.
- Symbol picker for the chat input: smile-icon button left of the channel indicator opens a popup with two tabs —
161 FFXIV PUA glyphs (Dalamud's SeIconChar enum) and 97 server-verified BMP symbols round-tripped through `/echo` and
`/say` in a four-round probe. Cursor-aware splice, multi-insert keeps the popup open, recent-used strip floats the last
sixteen picks across both tabs. Toggle in Settings → Chat → Message behaviour, default on.
- Pinned auto-tell tabs reload their full history again. PreloadHistory had a hidden 500-row scan cap that overrode the
user-configurable `AutoTellTabsHistoryPreload` setting whenever you chatted with many partners; less-frequent pinned
partners lost their backlog. The cap is removed.
- Slash-command teardown cleanup: `/hellion`, `/hellionView`, `/hellionDebugger` (and `#if DEBUG /hellionSeString`) wrappers
are now cached as private fields so plugin teardown detaches the live registration instead of re-Register'ing with
identical args (latent maintenance hazard from v1.4.9).
- v1.4.x Polish-Sweep wraps up here. The ImGuiListClipper render refactor that was on the v1.4.10 reserve list got dropped
after cross-platform smoke showed the scroll rubber-band is a Wine/Linux render-pipeline quirk, not universal — Windows
users never saw it. It will get its own platform-targeted spike in a later patch. Next major cycle is v1.5.0 with the
DI-container adoption (Microsoft.Extensions.Hosting + ILogger<T>) modelled on Lightless.
- Migration v17 stays (no schema bump).
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
---
## Hellion Chat 1.4.9 — Plugin-Load Render Polish (2026-05-15)
Tenth sub-patch of the v1.4.x polish-sweep series. First-frame render cost drops from ~127 ms median down to
+46 -9
View File
@@ -10,16 +10,53 @@ the plugin's privacy-first scope during brainstorming.
---
## Next Cycle (v1.4.10)
## Next Cycle (v1.5.1)
**Render Clipper, Symbol-Picker and Final-Cleanup.** Reserve items inherited from the v1.4.9 plan that did not need to
land in the HITCH-cut: an `ImGuiListClipper` for variable-height messages in `DrawMessages` (the OtterGui `ImGuiClip.cs`
wrapper is the idiom anchor), a Symbol Picker popup for the chat input (`imgui_demo.cpp` Popups & Modal Windows section
is the pattern reference), plus the carry-over from v1.4.9: structural First-Frame-Layout rewrite if the v1.4.9 selective
defers turn out to be too narrow once user-side regressions surface. Lazy-Window-Init naive is **not** in scope — the
v1.4.9 Stage-2 diagnose falsified that path (`WindowSystem.windows` is non-thread-safe, Game-Freeze under reload stress,
no measurable HITCH delta). A clean DI-container adoption (Lightless `PluginHostFactory` pattern) belongs in v1.5.x and
will revisit the question with the right threading model.
**Honorific Full Gradient Port plus FontAtlas-Defer for a 10× HITCH cut.** v1.5.0 closed the DI-container cycle with
no performance penalty against Chat 2 (77 ms vs 74 ms median first-frame HITCH), but the cross-plugin baseline against
Lightless Sync and XIVInstantMessenger surfaced a clean optimisation: both plugins defer their font-atlas build until
after `Finished loading` and sit at 6-7 ms HITCH, an order of magnitude below the ~75 ms floor that Chat 2 and HellionChat
share. v1.5.1 ports that pattern. Plus the Honorific gradient render path — DTO is gradient-ready since v1.4.7, only the
Wave / Pulse animation port remains. After that, First-Run-Wizard rework with curated defaults beyond the three privacy
profiles, then FR localisation (Hezcal native-speaker review confirmed), then the Plugin Integrations Wave 2-6
(Context-Menu, NotificationMaster, Moodles, ExtraChat, XIVIM Quick-DM). Wine/Linux scroll-rubber-band spike sits as a
low-priority Linux-only investigation at the tail.
---
## v1.5.0 — DI Foundation and Service Refactor (released 2026-05-17)
Major architecture cycle. Plugin bootstrap moves to a generic-host DI container
(`Microsoft.Extensions.Hosting` + `IServiceCollection`) modelled on Lightless Sync's `PluginHostFactory`. Service
logging migrates from the static `Plugin.LogProxy` locator (the F12.2 shim from v1.4.7) to typed
`Microsoft.Extensions.Logging.ILogger<T>` via constructor injection, bridged over Dalamud's `IPluginLog` by a custom
`DalamudLogger` trio. 18 instance-class services move to ctor-injected loggers across four slices: data layer,
IPC/integrations, UI window layer, and root. `Plugin.LogProxy` stays for the eight buckets ctor injection cannot
reach — static helpers (`EmoteCache`, `AutoTranslate`, `MemoryUtil`, `WrapperUtil`), Dalamud-reflected types
(`Configuration`), the `Message` data class, and instance classes that only log from static methods (`FontManager`,
one `GameFunctions` site). Plugin.cs finishes at 1012 lines, virtually identical to the pre-cycle 1013 (-1 netto): the
new Phase-1 host build and `Plugin.X` bridge wiring trade out exactly the service and window allocations that previously
lived in `LoadAsync`. Cross-plugin baseline (10 reload-stress runs, 51 active plugins): HellionChat first-frame HITCH
77 ms median, Chat 2 v1.40.2 74 ms median — no DI penalty. The deferred-font-atlas pattern from Lightless and
XIVInstantMessenger is the v1.5.1 follow-up. User-visible: slash-command insert fix cherry-picked from ChatTwo upstream
`ee7768ac` — pasting a slash command into the chat input now replaces existing input instead of concatenating.
Migration v17 stays.
---
## v1.4.10 — Symbol-Picker and Tell-History Fix (released 2026-05-16)
Eleventh and final sub-patch of the v1.4.x Polish Sweep series. Symbol picker for the chat input — popup with two tabs
(161 FFXIV PUA glyphs via Dalamud's SeIconChar plus 97 server-verified BMP symbols probed through `/echo` and `/say` in
a four-round whitelist build) — cursor-aware splice, multi-insert, recent-used strip across both tabs, Settings toggle
in Chat → Message behaviour. Mid-cycle hotfix for pinned auto-tell tabs: PreloadHistory used to cap the SQL scan at
500 rows regardless of the user's `AutoTellTabsHistoryPreload` setting, so active users with many partners lost the
backlog of less-frequent pinned partners; the cap is gone, the `(Receiver, Date)` index keeps SQL fast, the client-side
loop respects the user setting as the upper bound. Slash-command teardown cleanup wires the v1.4.9 wrappers through
private fields so dispose detaches the live registration instead of re-registering with identical args. The original
Reserve-A `ImGuiListClipper` refactor for `DrawMessages` was cancelled after cross-platform smoke showed the scroll
rubber-band is a Wine/Linux render-pipeline quirk, not universal — Windows-side testing on v1.4.9 confirmed no lag.
Migration v17 stays.
---
+6 -6
View File
File diff suppressed because one or more lines are too long
+6 -1
View File
@@ -19,7 +19,12 @@ TAG="v$VER"
grep -qE "^[[:space:]]*\*\*v${VER}[^0-9]" "$YAML" \
|| fail "$YAML changelog missing **v${VER}** subblock. Fix: add the v${VER} block at the top of the changelog field."
jq -r '.[0].Changelog' "$REPO_JSON" | grep -qE "^[[:space:]]*\*\*v${VER}[^0-9]" \
# Process substitution instead of `jq | grep -q` — grep -q closes stdin on the
# first match, jq keeps writing the multi-KB Changelog string and trips SIGPIPE,
# which `set -o pipefail` then turns into a false-positive FAIL. Manifested as a
# `jq: writing output failed: Broken pipe` line plus a misleading "Changelog
# missing **vX.Y.Z** subblock" message during pre-push runs.
grep -qE "^[[:space:]]*\*\*v${VER}[^0-9]" <(jq -r '.[0].Changelog' "$REPO_JSON") \
|| fail "$REPO_JSON Changelog missing **v${VER}** subblock. Fix: copy the yaml changelog over."
FORGE_FILE="$FORGE_DIR/${TAG}.md"