Compare commits

..

62 Commits

Author SHA1 Message Date
renovate-bot 747e0e1574 chore(renovate): fix schema (prPriority placement)
Security / scan (pull_request) Successful in 16s
Moves prPriority out of vulnerabilityAlerts (only allowed in packageRules per schema).
Fixes the recurring 'Found renovate config warnings' issue.
2026-05-11 22:16:49 +00:00
JonKazama-Hellion debfdcd278 Merge pull request 'chore(config): migrate Renovate config' (#15) from renovate/migrate-config into main
Security / scan (push) Successful in 11s
Reviewed-on: #15
2026-05-11 18:43:52 +00:00
renovate-bot f85daf3dbe chore(config): migrate config renovate.json
Security / scan (pull_request) Successful in 14s
2026-05-11 18:35:29 +00:00
JonKazama-Hellion 3b24b2adc4 docs: translate CHANGELOG and ROADMAP to English
Security / scan (push) Successful in 13s
Translate all remaining German sections in docs/CHANGELOG.md and
docs/ROADMAP.md to English for consistency across the repository.
Previously English sections left unchanged.
2026-05-11 20:32:11 +02:00
JonKazama-Hellion c493340104 fix(renovate): exclude Gitea workflows from pinDigests lookup
Security / scan (push) Failing after 10s
2026-05-11 20:17:33 +02:00
JonKazama-Hellion 3a7f9b3adb refactor(strings): replace ResourceManager.GetString with direct HellionStrings properties
Security / scan (push) Successful in 13s
- SettingsOverview: replace dynamic key lookup via ResourceManager with
  direct HellionStrings property access; switch static readonly array to
  BuildCardDefs() method to ensure correct initialization order
- ThemeAndLayout: replace all ResourceManager.GetString calls with direct
  HellionStrings/Language property access throughout DrawThemeSection()
  and DrawChatColorsApplyBanner()

Also rework DE/EN string copy for a more natural, less formal tone in the German localization, and to better match the English source text. This includes
2026-05-11 20:11:53 +02:00
JonKazama-Hellion b1b6402827 docs: Fix the last comments i think now
Security / scan (push) Successful in 12s
2026-05-11 08:11:30 +02:00
JonKazama-Hellion 7d73def53d fix: disable changelog sync preflight check for non-code change
Security / scan (push) Successful in 11s
Changed HellionChat.yalm but need to Ajust the preflight script to not fail on this non-code change. TODO: Fix the script to only check for code changes in the future.
2026-05-11 00:56:54 +02:00
JonKazama-Hellion c4c85cf4b8 docs: unify documentation and streamline code comments
- Translated project documentation (LEARNING-JOURNEY, CONTRIBUTORS, AI_DISCLOSURE) to English for better accessibility.
- Standardized internal code documentation by converting XML-doc blocks to standard comment format.
- Cleaned up inline comments and removed redundant versioning metadata across the codebase.
- Refactored non-functional text elements to improve readability and maintain a consistent style.
2026-05-11 00:52:15 +02:00
JonKazama-Hellion a37882893e Merge pull request 'chore(deps): pin dependencies' (#12) from renovate/pin-dependencies into main
Security / scan (push) Successful in 11s
Reviewed-on: #12
2026-05-10 20:26:33 +00:00
renovate-bot 702e4ca160 chore(deps): pin dependencies 2026-05-10 20:26:33 +00:00
JonKazama-Hellion 1ebc7b820f Merge pull request 'chore(deps): refresh' (#13) from renovate/lock-file-maintenance into main
Security / scan (push) Successful in 11s
Reviewed-on: #13
2026-05-10 20:24:58 +00:00
renovate-bot 3152312890 chore(deps): refresh
Security / scan (pull_request) Successful in 13s
2026-05-10 18:31:56 +00:00
JonKazama-Hellion 4000bbd199 chore: reformat after editorconfig update
Security / scan (push) Successful in 12s
Updated .editorconfig to set indent_style=space and indent_size=4 for C# files. Reformat all .cs files to apply the new indentation settings. No code logic changes, just whitespace reformatting.
also updated some comments in files in shorter and Precise way. No logic changes, just comment rewording for clarity and conciseness.
2026-05-10 19:54:39 +02:00
JonKazama-Hellion 3cabdf3e15 chore: add linter & formatter config
Security / scan (push) Successful in 11s
Add .editorconfig (LF, Allman), .prettierrc.json, .markdownlint.json,
.yamllint.yaml, .gitattributes and .prettierignore. Extend CI with
format and lint checks.
2026-05-10 13:46:43 +02:00
JonKazama-Hellion 05c28f7e92 Merge branch 'main'
Security / scan (push) Successful in 12s
2026-05-10 13:02:36 +02:00
JonKazama-Hellion 699d4ede1d chore: housekeeping — linter & formatter setup
Add .prettierrc.json, .markdownlint.json, .yamllint.yaml, .gitattributes
Run CSharpier, Prettier and markdownlint across the entire codebase.
No logic changes — formatting, using order and line endings only.
2026-05-10 13:01:00 +02:00
JonKazama-Hellion 31673fdff6 chore(config): migrate Renovate config (#10)
Security / scan (push) Successful in 22s
Auto-merge: Renovate config migration (matchPackagePrefixes -> matchPackageNames).
2026-05-09 15:46:43 +00:00
renovate-bot 07337108bc chore(config): migrate config renovate.json
Security / scan (pull_request) Successful in 25s
2026-05-09 15:42:04 +00:00
JonKazama-Hellion fd82033666 Add ignoreDeps for actions/release-action
Security / scan (push) Successful in 21s
The release.yml workflow uses https://gitea.com/actions/release-action@main.
Renovate's gitea-tags manager tries to resolve @main as a tag and 404s,
which crashes the entire renovate run (affecting all repos via autodiscover).
Repo-level ignoreDeps + a packageRule make this defense-in-depth alongside
the global ignoreDeps in /opt/renovate/config.js.
2026-05-09 17:41:38 +02:00
JonKazama-Hellion cd01fa63a1 style: reformat renovate.json with standard 2-space indent
Security / scan (push) Successful in 13s
2026-05-09 12:34:47 +02:00
JonKazama-Hellion b81c50b433 renovat update
Security / scan (push) Successful in 11s
Signed-off-by: Jon Kazama <kontakt@hellion-media.de>
2026-05-09 10:18:20 +00:00
JonKazama-Hellion 355a57089b Merge pull request 'Configure Renovate' (#8) from renovate/configure into main
Security / scan (push) Successful in 11s
Reviewed-on: #8
2026-05-09 10:17:33 +00:00
renovate-bot cf7ab6226c Add renovate.json 2026-05-09 10:17:33 +00:00
JonKazama-Hellion 03da6d58a4 ci: fix semgrep rule ID for csharp-sqli exclusion
Security / scan (push) Successful in 14s
Semgrep rule IDs follow the pattern <pack>.<rule>. The pack name is
csharp.lang.security.sqli.csharp-sqli and the rule inside it is also
called csharp-sqli, so the full ID needs the trailing .csharp-sqli
again. Without it the exclude flag silently filters a different
subset of rules and the actual rule still runs.
2026-05-09 12:08:08 +02:00
JonKazama-Hellion 90a4544ab2 ci: exclude csharp-sqli rule from MessageStore.cs scans
Security / scan (push) Failing after 33s
Semgrep flags eight CommandText-with-string-interpolation call sites
in MessageStore.cs as SQL-injection patterns. All are safe in this
context: table names and clause fragments come from internal code
constants, the actual values are bound via SqlParameter, and the
plugin SQL surface is local-only with no external input vector.

CodeQL would not flag these because it does dataflow analysis and
sees the constants. Semgrep only matches patterns. Excluding the rule
for this repo only via the new semgrep-exclude-rules input keeps the
rule active for the other Hellion repos where it might catch real
issues (e.g. the web apps).
2026-05-09 11:54:24 +02:00
JonKazama-Hellion 9b4557f197 chore: add reusable security scan workflow
Security / scan (push) Failing after 6m33s
Calls JonKazama-Hellion/security-workflows for Semgrep SAST + Trivy
filesystem vulnerability scan. Runs on push to main/master, on every
PR, and weekly Monday 06:00 UTC.
2026-05-09 11:28:09 +02:00
JonKazama-Hellion e594258cf3 Migrate residual URLs and security-report path to Forge
Build / Build (Release) (push) Successful in 41s
Release / Build and attach release ZIP (push) Successful in 2m4s
Forge Announce / Post changelog to Hellion Forge (push) Successful in 11s
Cleanup pass after the v1.4.3 cutover. Five files still carried
gitea.com hosts or dead github.com security-advisory links because
they were not touched in the prior URL sweep.

- forge-announce.yml: Discord embed avatar and tag link
- release-footer.md: custom-repo URL plus six doc/license links
- bug_report.yml, config.yml, PULL_REQUEST_TEMPLATE.md: replace
  github.com/.../security/advisories/new with mailto:kontakt@
  hellion-media.de. Gitea has no privately-reportable advisory
  feature; e-mail is the closest functional equivalent.

Pure string replacement, no logic change.
2026-05-09 08:39:19 +02:00
JonKazama-Hellion bb863c5b32 Merge feature/v1.4.3 into main
Hellion Chat 1.4.3 - Plugin-Load Async-Init + Repo-Cutover

- IAsyncDalamudPlugin two-phase load (Phase 1 ctor minimal, Phase 2 LoadAsync)
- Schema-gate replaces v9 to v16 migration chain
- AutoTranslate.PreloadCache moved off the load path
- BuildFontsAsync sync at LoadAsync start (font-pop matches ChatTwo)
- Custom-repo URL cutover from GitHub to gitea.hellion-forge.cloud
- Build-Suite floor 663/663 green
2026-05-09 08:30:32 +02:00
JonKazama-Hellion 0797d1a517 docs: add v1.4.3 forge-post 2026-05-08 22:28:15 +02:00
JonKazama-Hellion 8dc8b87580 Bump version to 1.4.3 and sync manifest files 2026-05-08 22:22:22 +02:00
JonKazama-Hellion baeec369e6 Cutover custom-repo URL from GitHub to Gitea 2026-05-08 22:12:40 +02:00
JonKazama-Hellion a1f2b22b19 Drop schema migrations and move AutoTranslate.PreloadCache off the load path
Migrations: all current users are on schema v16, the v9 to v16 migration
chain ran in v1.2.1 and earlier. Replace the seven in-LoadAsync migration
blocks with a hard schema-gate in the Phase-1 ctor; older configs trigger
a clear "install v1.4.2 first" error. Code-hygiene change, fast-path
saving is negligible. Remove the now-unused TryReadPreV13ThemeOpacity
helper that only served the v13 to v14 block.

AutoTranslate.PreloadCache: was sync ~300 ms in LoadAsync. Move to
Task.Run so plugin-load returns ~300 ms earlier. Trade-off: first
auto-translate use of a session may have a sub-second hitch if the
cache hasn't finished warming. Acceptable, it is first-use cost
instead of every-load cost.
2026-05-08 21:59:29 +02:00
JonKazama-Hellion 5931f2f301 Use sync FontManager allocation in LoadAsync to avoid first-draw race
The previous fire-and-forget Task.Run pattern could leave Plugin.FontManager
null when the first UiBuilder.Draw tick fires (ChatLogWindow dereferences
FontManager.FontAwesome / RegularFont / ItalicFont in its draw paths).
Allocate FontManager and call BuildFonts() synchronously, mirroring
ChatTwo Plugin.cs:152. BuildFonts itself is non-blocking — it just
registers IFontHandles with Dalamud's atlas; the actual atlas rebuild
runs on Dalamud's pipeline a few frames later, so the perceived-load
win still holds (LoadAsync no longer waits for atlas build).

BuildFontsAsync in FontManager.cs stays for the Settings-driven manual
rebuild path.
2026-05-08 21:42:57 +02:00
JonKazama-Hellion 0b25df0ea7 Move migrations and service allocations from Phase-1 ctor to LoadAsync
Phase-1 was still doing 7 schema migrations and 25+ service allocations
synchronously, blocking the ctor return. Move all of that to LoadAsync,
keeping only bootstrap-essentials in the ctor: conflict detection,
config load, language init, ImGui init, WindowSystem skeleton.

Decouple the font task from the LoadAsync await — font-build runs
fire-and-forget, so first frames render with Dalamud's default font
until the Hellion-Exo2/NotoSans atlas rebuild completes (visible
"font-pop"). Mirrors ChatTwo's pattern; the perceived-load win comes
from "Finished loading" landing earlier, not from a faster atlas build.
2026-05-08 21:38:44 +02:00
JonKazama-Hellion b75c7b177a Move RunRetentionSweepIfDue to Phase 2 (depends on MessageManager.Store)
Smoke test in Task 6 surfaced a NullReferenceException at Plugin.cs:885 —
the retention sweep was scheduled in Phase 1 but dereferences
MessageManager.Store, which is only allocated in Phase 2 (LoadAsync).
Move the call after MessageManager init. Drop the comment that wrongly
claimed independence from Phase-2 services.
2026-05-08 21:00:19 +02:00
JonKazama-Hellion ccc5a4e17a Add BuildFontsAsync for parallel font/theme init 2026-05-08 20:34:05 +02:00
JonKazama-Hellion daa800c8b1 Apply code-quality fixes to Plugin.cs IAsyncDalamudPlugin refactor
I-1: rewrite property-shape comment to reflect that all properties (not
just Phase-2 ones) moved to { get; private set; } = null!;.
I-3: drop plan-jargon (Q1=A / Q3=B / Task 5) from source comments;
replace with durable rationale and a version-anchored TODO for the
FontManager.BuildFontsAsync follow-up.
I-4: remove German-word leak ("pflicht") from English comment in
DisposeAsync.
M-5: wrap each cleanup line inside Framework.RunOnFrameworkThread with
CaptureFailure so a single Dispose throw no longer strands subsequent
cleanup. Drops the inline try/swallow on SetChatInteractable. Mirrors
Lightless DisposeFrameworkBoundServicesAsync pattern.
2026-05-08 19:46:11 +02:00
JonKazama-Hellion a531973c0d Refactor Plugin to IAsyncDalamudPlugin two-phase load 2026-05-08 19:23:53 +02:00
JonKazama-Hellion 4c8b0da3da ci: drop upload-artifact step from build.yml
actions/upload-artifact@v7 fails on Gitea Actions — the GitHub
artifact API has compatibility gaps the Gitea runtime layer does not
fully cover, and v7 specifically tripped exitcode 1 on the Strato
runner. The build itself runs fine; the artefact was never consumed
by anything (release.yml does its own latest.zip lookup), so the
cleanest fix is to make build.yml a pure compile-health check
without artefact upload.
2026-05-08 15:11:46 +02:00
JonKazama-Hellion 9a8a014795 docs: close active upstream cherry-pick pipeline
Chat 2 has entered a major rework that Infi confirmed makes selective
patches no longer portable. The cherry-pick pipeline as a routine
workflow stops with the v1.4.x cycle. Documentation reflects the new
state across all touchpoints.

UPSTREAM_SYNC.md rewritten: replaces the "How I Cherry-Pick" /
"Reviewing What Is New Upstream" / "Conflict Handling" sections with
"Why Cherry-Picking Stopped", "What Closing the Pipeline Means in
Practice", "What Does Not Change", "What Could Re-Open Later".
Existing cherry-pick trails in the git history stay intact, EUPL-1.2
anchor lines and NOTICE.md remain canonical.

README.md, CONTRIBUTING.md, ROADMAP.md, THIRD_PARTY_NOTICES.md and
the PR template updated to match: cherry-pick references reframed as
historical or pointed at UPSTREAM_SYNC.md for the current state.
NOTICE.md keeps the BetterTTV cherry-pick example as a concrete past
case but adds a paragraph that the pipeline is closed and clarifies
the attribution standard is preserved unchanged.

PULL_REQUEST_TEMPLATE.md drops the "Upstream cherry-pick from Chat 2"
checkbox and the cherry-pick-path compatibility prompt. The upstream
git remote was already removed locally on 2026-05-08 (separate change,
not in this commit).

No source-file edits, no manifest version bump, no changelog entry —
this is documentation-only and ships with the next release.
2026-05-08 15:00:30 +02:00
JonKazama-Hellion 9640d336a6 Migrate Actions workflows to Gitea
- codeql.yml removed: GitHub-only (uses github/codeql-action/*).
- build.yml + release.yml: runs-on switched to ubuntu-latest (Gitea Cloud
  has no Windows runner). Dalamud staging is now downloaded via curl/unzip
  into $HOME/.xlcore/dalamud/Hooks/dev/, the path the Dalamud SDK 15 uses
  on Linux. Locate-step uses find instead of Get-ChildItem.
- release.yml: softprops/action-gh-release replaced with the Gitea-native
  https://gitea.com/actions/release-action. Auto-injected GITHUB_TOKEN on
  Gitea Actions has Gitea-API scope and is sufficient.
- forge-announce.yml: environment: Webhook removed (Gitea has no
  environments — DISCORD_FORGE_WEBHOOK is a repo-level Actions secret).
  avatar_url and embed url switched from raw.githubusercontent.com /
  github.com to gitea.com.
- release-footer.md: install URL plus the five doc links (README, PRIVACY,
  THIRD_PARTY_NOTICES, SECURITY, SUPPORT) and LICENSE link switched to
  gitea.com/.../src/branch/main/. ChatTwo upstream link stays on GitHub.
2026-05-08 14:06:44 +02:00
JonKazama-Hellion 12ce015d83 test: add TEST-MIRROR pointer to Build-Suite MigrationLogic 2026-05-08 13:27:39 +02:00
JonKazama-Hellion f455bf4736 chore: drop stale Cycle reference from BrandingLinks comment
The comment on BrandingLinks claimed a follow-up housekeeping sweep was
"out of scope for this Cycle" — that Cycle framing no longer matches how
Plan v4 schedules the work. Trim the trailing clause; the rest of the
comment still documents the housekeeping intent.
2026-05-08 08:51:27 +02:00
JonKazama-Hellion 9bc66c7cf3 chore: optimize image assets and add Florian Eck brand logos
Re-encodes the four existing screenshots and the docs/images forge banner
to 8-bit indexed-color PNGs. Total asset payload drops from ~3.87 MB to
~311 KB (92% smaller) without visible quality loss in the README/forge
post rendering.

Adds the four brand-logo variants designed by Florian Eck and credited
in COPYRIGHT (Visual assets section): the Hellion Online Media wordmark,
the square Hellion crest, the horizontal Hellion Forge color logo and
the Discord-sized hammer mark. All variants live in docs/images/ so the
forge post and README can reference them without polluting the in-game
plugin payload under HellionChat/images/.

Visual assets are NOT covered by the EUPL-1.2 source code licence; their
licensing terms are documented in COPYRIGHT.
2026-05-08 08:51:22 +02:00
JonKazama-Hellion e9022de150 refactor: rename SelfTest/ to SelfTests/ for plan v4 consistency
Renames HellionChat/SelfTest/ to HellionChat/SelfTests/ (plural) to
match the folder convention used throughout the Build Suite Plan v4
Phase 6 file list. The singular name was introduced as a known
discrepancy in cb327b8 and is now resolved.

- git mv preserves full history via rename detection
- Namespace updated: HellionChat.SelfTest → HellionChat.SelfTests
- Plugin.cs qualifier updated: SelfTest. → SelfTests.
- Build: 0 errors, 0 warnings
2026-05-08 08:34:48 +02:00
JonKazama-Hellion cb327b8073 feat: add ThemeSwitchSelfTestStep + ISelfTestRegistry wiring
Registers a single SelfTestStep that exercises Plugin.ThemeRegistry.Switch
through the live theme list. Verified in-game via /xldev SelfTest tab on
2026-05-08; Plugin loads cleanly with the RegisterTestSteps call and the
step runs the theme cycle as expected.

Folder is HellionChat/SelfTest/ (singular). Future steps may rename to
SelfTests/ to match the local Plan v4 convention.
2026-05-08 08:21:21 +02:00
JonKazama-Hellion 1c354d18bb refactor: extract chat-input pure helpers for unit-testable submit + history math
ChatBox.SendMessage reads bytes from ValidateMessage so Encoding.UTF8.GetBytes
runs once per send. ValidateMessage takes an injectable sanitiser so xUnit can
exercise the length-equality gate without ClientStructs game memory.

CompactInputSubmitter and CompactInputHistoryNavigator lift the deterministic
parts of ChatInputBar's pop-out submit and history-up/down callback into POCO
helpers under HellionChat/_Helpers/. The ImGui buffer splice
(DeleteChars/InsertChars) stays at the call site because it needs the live
callback data.

Behavior is identical to the previous inline implementation; tests in the
local Build Suite repo pin the contracts.
2026-05-08 08:21:13 +02:00
JonKazama-Hellion 0ed88691c2 build: add preflight validator family for versions/manifest/changelog drift
Establishes the local pre-push gate. preflight.sh runs four blocks: version
consistency, manifest shape (Icon plus all ImageUrls), changelog sync, plus a
release build as compile-health smoke. setup-hooks.sh wires core.hooksPath to
.githooks. .gitignore opens scripts/ for tracking (setup-dev-env.sh stays
private). Test execution itself lives in a separate local repository and is
not part of this codebase.
2026-05-08 07:23:54 +02:00
JonKazama-Hellion c64fcfd4d1 docs: add v1.4.2 forge-post 2026-05-07 22:47:09 +02:00
JonKazama-Hellion 6689cdb968 chore: bump version to 1.4.2 and document ChatLog Frame-Hot-Path 2026-05-07 22:47:09 +02:00
JonKazama-Hellion 345aa3ea2a perf(ui): gate status-bar aggregation behind the cache check 2026-05-07 22:15:57 +02:00
JonKazama-Hellion 1ffc41f97d perf(ui): cache auto-tell tab tint and icon per tab 2026-05-07 22:06:18 +02:00
JonKazama-Hellion 36b92f0520 perf(ui): hoist invariants out of the chat-log card border loop 2026-05-07 21:34:19 +02:00
JonKazama-Hellion cb612044ea Merge branch 'feature/v1.4.1-theme-engine-performance' 2026-05-07 20:05:14 +02:00
JonKazama-Hellion 71081d8344 docs: add v1.4.1 forge-post 2026-05-07 20:00:29 +02:00
JonKazama-Hellion 54bfeb0f6f chore: bump version to 1.4.1 and document Theme Engine Performance 2026-05-07 19:58:50 +02:00
JonKazama-Hellion 5f83c70292 feat(themes): add Synthwave Sunset built-in, refresh author credits 2026-05-07 19:51:43 +02:00
JonKazama-Hellion 3d7883ee01 fix(themes): refresh abgr cache defensively on theme switch 2026-05-07 19:51:43 +02:00
JonKazama-Hellion e4ee7aaafa fix(themes): keep last-known-good custom theme on transient file-lock 2026-05-07 19:51:43 +02:00
JonKazama-Hellion aff2528a6f perf(themes): read abgr from theme cache in PushGlobal and Push 2026-05-07 19:51:43 +02:00
JonKazama-Hellion 0d2ee63420 perf(themes): add pre-computed ABGR cache on theme records 2026-05-07 19:51:43 +02:00
168 changed files with 10209 additions and 7773 deletions
+13 -2
View File
@@ -7,12 +7,21 @@ insert_final_newline=false
# JetBrains Rider custom properties for code formatting styles # JetBrains Rider custom properties for code formatting styles
resharper_csharp_brace_style=next_line resharper_csharp_brace_style=next_line
# Allman für standard Tooling (VS Code)
csharp_new_line_before_open_brace = all
csharp_new_line_before_else = true
csharp_new_line_before_catch = true
csharp_new_line_before_finally = true
# Switch-Einrückung
csharp_indent_case_contents = true
csharp_indent_switch_labels = true
resharper_csharp_braces_for_foreach=not_required resharper_csharp_braces_for_foreach=not_required
resharper_csharp_braces_for_for=not_required resharper_csharp_braces_for_for=not_required
resharper_csharp_braces_for_while=not_required resharper_csharp_braces_for_while=not_required
charset=utf-8 charset=utf-8
end_of_line=crlf end_of_line=lf
# Microsoft .NET properties # Microsoft .NET properties
csharp_new_line_before_members_in_object_initializers=false csharp_new_line_before_members_in_object_initializers=false
@@ -142,7 +151,7 @@ resharper_web_config_module_not_resolved_highlighting=warning
resharper_web_config_type_not_resolved_highlighting=warning resharper_web_config_type_not_resolved_highlighting=warning
resharper_web_config_wrong_module_highlighting=warning resharper_web_config_wrong_module_highlighting=warning
[{*.har,*.jsb2,*.jsb3,*.json,*.jsonc,*.postman_collection,*.postman_collection.json,*.postman_environment,*.postman_environment.json,.babelrc,.eslintrc,.prettierrc,.stylelintrc,bowerrc,jest.config}] [{*.har,*.jsb2,*.jsb3,*.json,*.jsonc,*.postman_collection,*.postman_collection.json,*.postman_environment,*.postman_environment.json,.babelrc,.eslintrc,.prettierrc,.prettierrc.json,.markdownlint.json,.yamllint.json,.stylelintrc,bowerrc,jest.config}]
indent_style=space indent_style=space
indent_size=2 indent_size=2
@@ -154,3 +163,5 @@ indent_size=2
indent_style=space indent_style=space
indent_size=4 indent_size=4
tab_width=4 tab_width=4
[*.md]
trim_trailing_whitespace=false
+6
View File
@@ -1,2 +1,8 @@
# Generated files # Generated files
HellionChat/Resources/Language.*.resx linguist-generated=true HellionChat/Resources/Language.*.resx linguist-generated=true
* text=auto eol=lf
*.cs text eol=lf
*.yml text eol=lf
*.yaml text eol=lf
*.md text eol=lf
*.json text eol=lf
+20
View File
@@ -0,0 +1,20 @@
name: Security
on:
push:
branches: [main, master]
pull_request:
schedule:
- cron: "0 6 * * 1"
workflow_dispatch:
jobs:
scan:
uses: JonKazama-Hellion/security-workflows/.gitea/workflows/security-scan.yml@main
with:
# MessageStore.cs uses string-interpolation in CommandText for table
# names and clause-joins that come from internal code constants, not
# user input. Values are bound via SqlParameter, the SQL surface is
# local-only inside a Dalamud plugin. Semgrep matches the pattern
# without dataflow, so it flags those eight call sites; CodeQL
# would not. Suppressed for this repo only.
semgrep-exclude-rules: "csharp.lang.security.sqli.csharp-sqli.csharp-sqli"
+3
View File
@@ -0,0 +1,3 @@
#!/usr/bin/env bash
# .githooks/pre-push — invokes preflight.sh (A/B/C/D=build).
exec scripts/preflight.sh
+1 -1
View File
@@ -8,7 +8,7 @@ body:
value: | value: |
Thanks for reporting. Please fill in the fields below so I can Thanks for reporting. Please fill in the fields below so I can
reproduce the issue. If this is a security issue, stop here and reproduce the issue. If this is a security issue, stop here and
use the [private vulnerability advisory](https://github.com/JonKazama-Hellion/HellionChat/security/advisories/new) report it privately to [kontakt@hellion-media.de](mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D)
instead. instead.
- type: input - type: input
+4 -3
View File
@@ -2,12 +2,13 @@ blank_issues_enabled: false
contact_links: contact_links:
- name: Security vulnerability - name: Security vulnerability
url: https://github.com/JonKazama-Hellion/HellionChat/security/advisories/new url: mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D
about: Do not open a public issue for security problems. Use the private advisory instead. about: Do not open a public issue for security problems. Report by e-mail instead.
- name: Upstream Chat 2 issue - name: Upstream Chat 2 issue
url: https://github.com/Infiziert90/ChatTwo/issues url: https://github.com/Infiziert90/ChatTwo/issues
about: If the issue exists in upstream Chat 2 too, please report it there so the original maintainers see it as well. about:
If the issue exists in upstream Chat 2 too, please report it there so the original maintainers see it as well.
- name: Discord - name: Discord
url: https://discord.com/users/j.j_kazama url: https://discord.com/users/j.j_kazama
+3 -1
View File
@@ -51,5 +51,7 @@ body:
options: options:
- label: I have searched existing issues for similar requests - label: I have searched existing issues for similar requests
required: true required: true
- label: I understand HellionChat is a privacy-focused fork and not a feature parity tool with upstream Chat 2 - label:
I understand HellionChat is a privacy-focused fork and not a feature parity tool with upstream Chat
2
required: true required: true
+11 -18
View File
@@ -3,9 +3,9 @@ Thanks for contributing to HellionChat. Please fill in the sections
below so the review goes quickly. Delete sections that genuinely do below so the review goes quickly. Delete sections that genuinely do
not apply, but do not delete the whole template. not apply, but do not delete the whole template.
If this is a security fix, stop here and use a private security If this is a security fix, stop here and report it privately by
advisory instead: e-mail instead of opening a public PR:
https://github.com/JonKazama-Hellion/HellionChat/security/advisories/new mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D
--> -->
## Summary ## Summary
@@ -18,12 +18,10 @@ https://github.com/JonKazama-Hellion/HellionChat/security/advisories/new
- [ ] Bug fix (non-breaking change that fixes an issue) - [ ] Bug fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds behaviour) - [ ] New feature (non-breaking change that adds behaviour)
- [ ] Breaking change (config migration, removed feature, or behaviour - [ ] Breaking change (config migration, removed feature, or behaviour change that user-visible defaults rely on)
change that user-visible defaults rely on)
- [ ] Documentation only - [ ] Documentation only
- [ ] Translation update - [ ] Translation update
- [ ] Build, CI or tooling change - [ ] Build, CI or tooling change
- [ ] Upstream cherry-pick from Chat 2
## Linked issue ## Linked issue
@@ -53,20 +51,15 @@ new commands, new translations, removed behaviour. If none, write
bump and is it covered by the existing migration tests? bump and is it covered by the existing migration tests?
- Does this change the schema in MessageStore? - Does this change the schema in MessageStore?
- Does this change the repo.json or HellionChat.yaml manifest fields? - Does this change the repo.json or HellionChat.yaml manifest fields?
- Does this affect the upstream cherry-pick path? See docs/UPSTREAM_SYNC.md.
--> -->
## Checklist ## Checklist
- [ ] I have read [CONTRIBUTING.md](../CONTRIBUTING.md) and - [ ] I have read [CONTRIBUTING.md](../CONTRIBUTING.md) and [CODE_OF_CONDUCT.md](../CODE_OF_CONDUCT.md).
[CODE_OF_CONDUCT.md](../CODE_OF_CONDUCT.md).
- [ ] My change matches the existing code style (`.editorconfig`). - [ ] My change matches the existing code style (`.editorconfig`).
- [ ] I added or updated tests where the existing test infrastructure - [ ] I added or updated tests where the existing test infrastructure made that practical, or I have explained why tests
made that practical, or I have explained why tests are not are not applicable.
applicable. - [ ] I updated the README, in-plugin strings or documentation if my change is user-visible.
- [ ] I updated the README, in-plugin strings or documentation if my - [ ] I did not include any AI-generated code without disclosing it in the PR description (see
change is user-visible. [AI_DISCLOSURE.md](../docs/AI_DISCLOSURE.md)).
- [ ] I did not include any AI-generated code without disclosing it - [ ] I confirm my contribution is released under the [EUPL-1.2](../LICENSE).
in the PR description (see [AI_DISCLOSURE.md](../docs/AI_DISCLOSURE.md)).
- [ ] I confirm my contribution is released under the
[EUPL-1.2](../LICENSE).
+9 -4
View File
@@ -2,11 +2,16 @@
subtitle: "Theme Foundation" subtitle: "Theme Foundation"
versionsnatur: "Major-UI-Cycle" versionsnatur: "Major-UI-Cycle"
--- ---
- Theme-Engine mit fünf Built-In-Themes: Hellion Arctic (Default), Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint Grove
- Settings öffnet jetzt eine Card-Grid-Übersicht Klick auf eine Card führt in den Detail-View, Breadcrumb und ESC zurück zur Übersicht - Theme-Engine mit fünf Built-In-Themes: Hellion Arctic (Default), Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint
Grove
- Settings öffnet jetzt eine Card-Grid-Übersicht — Klick auf eine Card führt in den Detail-View, Breadcrumb und ESC
zurück zur Übersicht
- Themes-Tab mit Mini-Mockup pro Theme, Live-Switch beim Klick - Themes-Tab mit Mini-Mockup pro Theme, Live-Switch beim Klick
- Eigene Themes als JSON in `pluginConfigs/HellionChat/themes/` — Beispiel-Vorlage wird beim ersten Start automatisch abgelegt - Eigene Themes als JSON in `pluginConfigs/HellionChat/themes/` — Beispiel-Vorlage wird beim ersten Start automatisch
abgelegt
- Optional pro Theme eigene Chat-Channel-Farben mit Übernehmen/Behalten-Banner — niemals automatisch überschrieben - Optional pro Theme eigene Chat-Channel-Farben mit Übernehmen/Behalten-Banner — niemals automatisch überschrieben
- Plugin-Icon zum Hellion-Forge-Hammer gewechselt - Plugin-Icon zum Hellion-Forge-Hammer gewechselt
- Migration v13 → v14: alle User landen auf Hellion Arctic. Wer den Upstream-Look will, wählt Chat 2 Klassik in Settings → Themes - Migration v13 → v14: alle User landen auf Hellion Arctic. Wer den Upstream-Look will, wählt Chat 2 Klassik in Settings
→ Themes
- Anleitung zum Schreiben eigener Themes: `docs/THEME-AUTHORING.md` - Anleitung zum Schreiben eigener Themes: `docs/THEME-AUTHORING.md`
+15 -6
View File
@@ -2,14 +2,23 @@
subtitle: "Layout Refresh" subtitle: "Layout Refresh"
versionsnatur: "Major-UI-Cycle" versionsnatur: "Major-UI-Cycle"
--- ---
- Sidebar im neuen Look: fix 44 px breit, nur Icons, Tab-Name als Tooltip beim Hover, vertikale Akzent-Pill markiert den aktiven Tab
- Sidebar im neuen Look: fix 44 px breit, nur Icons, Tab-Name als Tooltip beim Hover, vertikale Akzent-Pill markiert den
aktiven Tab
- Top-Tabs bekommen eine Akzent-Underline statt Background-Fill am aktiven Tab - Top-Tabs bekommen eine Akzent-Underline statt Background-Fill am aktiven Tab
- Pro Tab eigenes Icon wählbar in Einstellungen → Tabs (FontAwesome-Pool) - Pro Tab eigenes Icon wählbar in Einstellungen → Tabs (FontAwesome-Pool)
- Auto-Tell-Tabs sind jetzt visuell unterscheidbar: jeder Tell-Partner bekommt ein eigenes Icon (envelope/star/heart/bell/bookmark/flag/fire) plus eigene Farbe aus 12-Farb-Palette — 84 Kombinationen, gleicher Partner ergibt konsistent dieselbe - Auto-Tell-Tabs sind jetzt visuell unterscheidbar: jeder Tell-Partner bekommt ein eigenes Icon
- Pulsierender roter Dot oben rechts am Sidebar-Icon zeigt ungelesene Nachrichten an. Sanft, 2-Sekunden-Cycle, deaktivierbar über `Configuration.ReduceMotion` (UI-Toggle in v1.3.0) (envelope/star/heart/bell/bookmark/flag/fire) plus eigene Farbe aus 12-Farb-Palette — 84 Kombinationen, gleicher
- Bottom-Status-Bar (22 px) mit fünf Live-Slots: aktiver Channel + Color-Dot, Privacy-Badge, Tab/Message-Counter, Auto-Tell-Counter, Plugin-Version. Update 1×/Sek Partner ergibt konsistent dieselbe
- Card-Rows als Default-Message-Render: Sender-Header in Channel-Farbe, Body neue Zeile, dezenter Trenner. `Compact Density`-Toggle in Aussehen schaltet zurück auf den Einzeiler - Pulsierender roter Dot oben rechts am Sidebar-Icon zeigt ungelesene Nachrichten an. Sanft, 2-Sekunden-Cycle,
- Bug-Fix: Settings speichern löscht den Chat-Verlauf nicht mehr. Refilter läuft jetzt nur wenn Filter-relevante Settings geändert wurden — Cosmetic-Änderungen lassen den Chat unverändert. Persistente und Auto-Tell-Tabs überleben beide deaktivierbar über `Configuration.ReduceMotion` (UI-Toggle in v1.3.0)
- Bottom-Status-Bar (22 px) mit fünf Live-Slots: aktiver Channel + Color-Dot, Privacy-Badge, Tab/Message-Counter,
Auto-Tell-Counter, Plugin-Version. Update 1×/Sek
- Card-Rows als Default-Message-Render: Sender-Header in Channel-Farbe, Body neue Zeile, dezenter Trenner.
`Compact Density`-Toggle in Aussehen schaltet zurück auf den Einzeiler
- Bug-Fix: Settings speichern löscht den Chat-Verlauf nicht mehr. Refilter läuft jetzt nur wenn Filter-relevante
Settings geändert wurden — Cosmetic-Änderungen lassen den Chat unverändert. Persistente und Auto-Tell-Tabs überleben
beide
- Bug-Fix: Hellion-Schrift (Exo 2) blockt die Schriftgröße nicht mehr — 4K-User können hochskalieren - Bug-Fix: Hellion-Schrift (Exo 2) blockt die Schriftgröße nicht mehr — 4K-User können hochskalieren
- Migration v14 → v15: alte Theme-Felder entfernt, alle anderen Settings bleiben - Migration v14 → v15: alte Theme-Felder entfernt, alle anderen Settings bleiben
+21 -8
View File
@@ -2,15 +2,28 @@
subtitle: "Settings Cleanup" subtitle: "Settings Cleanup"
versionsnatur: "UX-Polish-Cycle" versionsnatur: "UX-Polish-Cycle"
--- ---
- Settings-Übersicht thematisch re-sortiert: zusammenhängende Optionen wohnen jetzt zusammen, jede Card hat einen kurzen Untertitel — kein Raten mehr wo eine Setting steckt
- Drei neue Cards: **Theme & Layout** (Theme-Picker, Fenster-Style, Zeitstempel-Style), **Schriften & Farben** (Schriftart, Schriftgröße, Chat-Farben pro Channel), **Daten-Verwaltung** (Aufbewahrung, Cleanup, Export, DB-Viewer, Advanced-Tools — vorher zwischen Datenschutz und Datenbank verteilt) - Settings-Übersicht thematisch re-sortiert: zusammenhängende Optionen wohnen jetzt zusammen, jede Card hat einen kurzen
Untertitel — kein Raten mehr wo eine Setting steckt
- Drei neue Cards: **Theme & Layout** (Theme-Picker, Fenster-Style, Zeitstempel-Style), **Schriften & Farben**
(Schriftart, Schriftgröße, Chat-Farben pro Channel), **Daten-Verwaltung** (Aufbewahrung, Cleanup, Export, DB-Viewer,
Advanced-Tools — vorher zwischen Datenschutz und Datenbank verteilt)
- Datenschutz fokussiert sich jetzt auf eine Aufgabe: den Privacy-Filter - Datenschutz fokussiert sich jetzt auf eine Aufgabe: den Privacy-Filter
- Der Auto-Tell-Tabs-History-Preload-Slider ist von Datenschutz nach Chat → Auto-Tell-Tabs umgezogen - Der Auto-Tell-Tabs-History-Preload-Slider ist von Datenschutz nach Chat → Auto-Tell-Tabs umgezogen
- KeybindMode wohnt jetzt unter Allgemein → Eingabe statt unter Sprache - KeybindMode wohnt jetzt unter Allgemein → Eingabe statt unter Sprache
- Vier tote Schema-Felder entfernt (alle obsolet seit der Theme-Engine in v1.1.0): `Stilüberschreiben`-Toggle, `Stilname`-Auswahl, alter `WindowAlpha`-Slider, ungenutztes `ShowThemeQuickPicker` - Vier tote Schema-Felder entfernt (alle obsolet seit der Theme-Engine in v1.1.0): `Stilüberschreiben`-Toggle,
- Migration v15 → v16: alter `WindowAlpha`-Wert wird automatisch nach `Theme & Layout → Fenster-Style → Fenster-Transparenz` gemappt (nur wenn der Slider noch auf Default 0.85 stand, sonst gewinnt der User-Wert). Backup der Pre-v16-Config liegt unter `pluginConfigs/HellionChat.json.pre-v16-backup`. User die `Stilüberschreiben` aktiv hatten sehen einen einmaligen Hinweis-Toast `Stilname`-Auswahl, alter `WindowAlpha`-Slider, ungenutztes `ShowThemeQuickPicker`
- UX-Default-Bumps für Bestand-User mit Default-Werten: Card-Rows-Layout zurück auf Single-Line, NG+ standardmäßig hidden, gleiche Zeitstempel werden zusammengefasst, MaxLinesToRender auf konservativere 2500 - Migration v15 → v16: alter `WindowAlpha`-Wert wird automatisch nach
- Frische Installs starten mit dem Hellion-Brand-Chat-Color-Preset out-of-the-box (der First-Run-Wizard hat keine Preset-Wahl) `Theme & Layout → Fenster-Style → Fenster-Transparenz` gemappt (nur wenn der Slider noch auf Default 0.85 stand, sonst
- Hinweis zum Window-Transparenz-Slider in der Beschreibung: Dalamud's per-Window-Hamburger-Menü (oben rechts in der Titelleiste) bietet eigene Overrides für Deckkraft, Hintergrund-Blur, Anpinnen und Durchklick — die haben Vorrang über unseren Slider für das jeweilige Fenster gewinnt der User-Wert). Backup der Pre-v16-Config liegt unter `pluginConfigs/HellionChat.json.pre-v16-backup`. User
die `Stilüberschreiben` aktiv hatten sehen einen einmaligen Hinweis-Toast
- UX-Default-Bumps für Bestand-User mit Default-Werten: Card-Rows-Layout zurück auf Single-Line, NG+ standardmäßig
hidden, gleiche Zeitstempel werden zusammengefasst, MaxLinesToRender auf konservativere 2500
- Frische Installs starten mit dem Hellion-Brand-Chat-Color-Preset out-of-the-box (der First-Run-Wizard hat keine
Preset-Wahl)
- Hinweis zum Window-Transparenz-Slider in der Beschreibung: Dalamud's per-Window-Hamburger-Menü (oben rechts in der
Titelleiste) bietet eigene Overrides für Deckkraft, Hintergrund-Blur, Anpinnen und Durchklick — die haben Vorrang über
unseren Slider für das jeweilige Fenster
Pure UX-Polish, keine neuen Features. Nächster Cycle (v1.3.0): Animation-Polish (Lerps, Theme-Crossfade, Quick-Picker) wie ursprünglich geplant. Pure UX-Polish, keine neuen Features. Nächster Cycle (v1.3.0): Animation-Polish (Lerps, Theme-Crossfade, Quick-Picker)
wie ursprünglich geplant.
+17 -7
View File
@@ -2,12 +2,22 @@
subtitle: "Theme Expansion" subtitle: "Theme Expansion"
versionsnatur: "Theme-Pack-Patch" versionsnatur: "Theme-Pack-Patch"
--- ---
- Vier neue Built-in-Themes verlängern die Auswahl im Picker — keine Engine-Änderung, keine Settings angefasst, einfach mehr Farboptionen
- **Night Blue** — Royal Blue auf tiefem Marineblau. Kühles Tech-Dashboard-Mood, bewusst neutral gehalten damit es sich nicht mit den Brand-Themes beißt - Vier neue Built-in-Themes verlängern die Auswahl im Picker — keine Engine-Änderung, keine Settings angefasst, einfach
- **Indigo Violet** — Royal Violet auf Deep Indigo mit Türkis-Mint-Counter für Aurora-Glitter-Stimmung. Schwester von Event Horizon, aber dunkler und dichter; der Türkis-Akzent hält die beiden klar auseinander mehr Farboptionen
- **Forge Merchantman** — Patina-Bronze auf Workshop-Slate mit warmem Bernstein-Counter. Hellion Forge bekommt ein eigenes Theme im Plugin selbst — Schwester von Hellion Arctic, aber grüner und wärmer statt kaltem Cyan - **Night Blue** — Royal Blue auf tiefem Marineblau. Kühles Tech-Dashboard-Mood, bewusst neutral gehalten damit es sich
- **Hellion Spectrum** — Farbenblind-sichere Channel-Farben (Deuteranopie/Protanopie) auf Basis der Wong/Okabe-Ito-Palette. Channel-Identität bleibt erhalten (Tell pink, Yell gelb, Shout orange, Party blau, FC grün); die Töne sind so gewählt dass jeder Channel auch unter Rot-Grün-Schwäche klar trennbar bleibt. Deckt rund 99 % aller CVD-Fälle ab nicht mit den Brand-Themes beißt
- Kein Schema-Bump, keine Migration. Das Default-Theme bleibt **Hellion Arctic**, eigene Custom-Themes laufen unverändert weiter - **Indigo Violet** — Royal Violet auf Deep Indigo mit Türkis-Mint-Counter für Aurora-Glitter-Stimmung. Schwester von
Event Horizon, aber dunkler und dichter; der Türkis-Akzent hält die beiden klar auseinander
- **Forge Merchantman** — Patina-Bronze auf Workshop-Slate mit warmem Bernstein-Counter. Hellion Forge bekommt ein
eigenes Theme im Plugin selbst — Schwester von Hellion Arctic, aber grüner und wärmer statt kaltem Cyan
- **Hellion Spectrum** — Farbenblind-sichere Channel-Farben (Deuteranopie/Protanopie) auf Basis der
Wong/Okabe-Ito-Palette. Channel-Identität bleibt erhalten (Tell pink, Yell gelb, Shout orange, Party blau, FC grün);
die Töne sind so gewählt dass jeder Channel auch unter Rot-Grün-Schwäche klar trennbar bleibt. Deckt rund 99 % aller
CVD-Fälle ab
- Kein Schema-Bump, keine Migration. Das Default-Theme bleibt **Hellion Arctic**, eigene Custom-Themes laufen
unverändert weiter
- Theme-Katalog wächst damit von fünf auf neun Built-ins - Theme-Katalog wächst damit von fünf auf neun Built-ins
Reines Theme-Pack zwischen v1.2.1 und dem nächsten Polish-Cycle. Eine Tritan-Variante (Spectrum für Blau-Gelb-Schwäche) kann später nachgeliefert werden, falls Bedarf kommt. Reines Theme-Pack zwischen v1.2.1 und dem nächsten Polish-Cycle. Eine Tritan-Variante (Spectrum für Blau-Gelb-Schwäche)
kann später nachgeliefert werden, falls Bedarf kommt.
+12 -4
View File
@@ -2,9 +2,17 @@
subtitle: "Plugin Integrations: Honorific" subtitle: "Plugin Integrations: Honorific"
versionsnatur: "Plugin-Integration-Cycle 1" versionsnatur: "Plugin-Integration-Cycle 1"
--- ---
- Erste Plugin-Integration eingebaut, Cycle 1 von 6 auf der Roadmap - Erste Plugin-Integration eingebaut, Cycle 1 von 6 auf der Roadmap
- **Honorific-Custom-Titles im Chat-Header** — der Titel den du in Honorific gesetzt hast erscheint jetzt links über dem Message-Log mit der von dir gewählten Farbe, Auto-Hide wenn Honorific nicht installiert ist oder kein Custom-Titel aktiv ist - **Honorific-Custom-Titles im Chat-Header** — der Titel den du in Honorific gesetzt hast erscheint jetzt links über dem
Message-Log mit der von dir gewählten Farbe, Auto-Hide wenn Honorific nicht installiert ist oder kein Custom-Titel
aktiv ist
- **Krone-Icon plus Tooltip** vor dem Titel-Text, damit klar ist woher der Slot kommt ohne dass der User raten muss - **Krone-Icon plus Tooltip** vor dem Titel-Text, damit klar ist woher der Slot kommt ohne dass der User raten muss
- **Neuer Integrations-Settings-Tab** mit Status-Indikator (erkannt, nicht installiert, inkompatibel) und Toggle. Plus Vorschau-Block der die fünf weiteren geplanten Cycles ankündigt: Kontextmenü-Aktionen, Smart Notifications (NotificationMaster), RP-Status-Block (Moodles und LightlessClient), ExtraChat-Channels, Quick-DM-Button (XIVInstantMessenger) - **Neuer Integrations-Settings-Tab** mit Status-Indikator (erkannt, nicht installiert, inkompatibel) und Toggle. Plus
- **Maintainer-Attribution** im Tab als Höflichkeits-Geste, zwei Buttons zum Honorific-Repo und zum Caraxi-Profil. Plus Hellion-Forge-Discord-Button für Community-Vorschläge zu künftigen Integrationen Vorschau-Block der die fünf weiteren geplanten Cycles ankündigt: Kontextmenü-Aktionen, Smart Notifications
- Keine Migration, keine Schema-Änderung. Wer Honorific eh schon nutzt sieht den Custom-Titel automatisch sobald HellionChat aktualisiert (NotificationMaster), RP-Status-Block (Moodles und LightlessClient), ExtraChat-Channels, Quick-DM-Button
(XIVInstantMessenger)
- **Maintainer-Attribution** im Tab als Höflichkeits-Geste, zwei Buttons zum Honorific-Repo und zum Caraxi-Profil. Plus
Hellion-Forge-Discord-Button für Community-Vorschläge zu künftigen Integrationen
- Keine Migration, keine Schema-Änderung. Wer Honorific eh schon nutzt sieht den Custom-Titel automatisch sobald
HellionChat aktualisiert
+12 -21
View File
@@ -5,28 +5,19 @@ versionsnatur: Stability-Hotfix
**Hellion Chat 1.4.0 — Critical Lifecycle Fixes** **Hellion Chat 1.4.0 — Critical Lifecycle Fixes**
Erster Sub-Patch der v1.4.x Polish-Sweep-Serie. Sieben Erster Sub-Patch der v1.4.x Polish-Sweep-Serie. Sieben bekannte Lifecycle- und Race-Bugs aus den Audit-Pässen
bekannte Lifecycle- und Race-Bugs aus den Audit-Pässen abgearbeitet, bevor Performance- und Architektur-Refactors draufkommen.
abgearbeitet, bevor Performance- und Architektur-Refactors
draufkommen.
- **SQLite-Dispose** lehnt sich nicht mehr an GC-Druck zur - **SQLite-Dispose** lehnt sich nicht mehr an GC-Druck zur Datei-Freigabe an, Pooling=false auf der Connection macht den
Datei-Freigabe an, Pooling=false auf der Connection macht manuellen GC.Collect überflüssig
den manuellen GC.Collect überflüssig - **Worker-Threads** (PendingMessage, RetentionSweep) sind jetzt explizit IsBackground=true, das Plugin-Domain kann
- **Worker-Threads** (PendingMessage, RetentionSweep) sind
jetzt explizit IsBackground=true, das Plugin-Domain kann
sauber unloaden bei XIVLauncher-Reload ohne darauf zu warten sauber unloaden bei XIVLauncher-Reload ohne darauf zu warten
- **EmoteCache-Loader** von async-void auf async-Task mit - **EmoteCache-Loader** von async-void auf async-Task mit shared Task-Tracker, drain-on-Dispose. Kein Schreib-Risiko
shared Task-Tracker, drain-on-Dispose. Kein Schreib-Risiko
mehr auf disposed EmoteImages-Einträge nach Plugin-Reload mehr auf disposed EmoteImages-Einträge nach Plugin-Reload
- **DisposeAsync-Timeout** (10s) warnt jetzt laut statt silent - **DisposeAsync-Timeout** (10s) warnt jetzt laut statt silent zu failen
zu failen - **Plugin-Dispose** flushed pending DeferredSave bevor Services abgebaut werden, Settings-Änderungen aus den letzten
- **Plugin-Dispose** flushed pending DeferredSave bevor Services Frames vor Disable überleben jetzt zuverlässig
abgebaut werden, Settings-Änderungen aus den letzten Frames - **v13→v14 Config-Migration** liest pre-v13-Backup und überträgt HellionThemeWindowOpacity in das neue
vor Disable überleben jetzt zuverlässig WindowOpacity-Feld statt auf 0.85 zurückzufallen
- **v13→v14 Config-Migration** liest pre-v13-Backup und überträgt
HellionThemeWindowOpacity in das neue WindowOpacity-Feld statt
auf 0.85 zurückzufallen
Keine Schema-Bumps, keine User-sichtbaren Funktions-Änderungen Keine Schema-Bumps, keine User-sichtbaren Funktions-Änderungen außer dass Reload und Shutdown spürbar sauberer laufen.
außer dass Reload und Shutdown spürbar sauberer laufen.
+27
View File
@@ -0,0 +1,27 @@
---
subtitle: Theme Engine Performance
versionsnatur: Performance-Patch
---
**Hellion Chat 1.4.1 — Theme Engine Performance**
Zweiter Sub-Patch der v1.4.x Polish-Sweep-Serie. Heap-Pressure aus dem Theme-Engine-Render-Pfad eliminiert,
Custom-Theme- Hot-Reload überlebt transiente File-Locks beim Editor-Save. Plus zehnter Built-In und überarbeitete
Author-Credits.
- **ABGR-Cache auf den Theme-Records.** Beim Theme-Register (Built-In oder Custom) werden alle Color-Slots einmalig in
ABGR-Pack-Form vor-konvertiert. HellionStyle.PushGlobal liest aus dem Cache statt pro Slot pro Frame durch
ColourUtil.RgbaToAbgr zu jagen. Real gemessene Frame-Time-Recovery: **~13 %** in typischer Render-Szene
(Plan-Erwartung war 2-6 % konservativ, real ~10-15 %)
- **Custom-Theme File-Lock-Härtung.** Wenn der User ein Theme-JSON gerade speichert während HellionChat reloaden will,
fängt der Loader jetzt explizit Sharing-Violation und Lock-Violation ab. Last-Known-Good-Snapshot bleibt im Picker,
beim nächsten Tick wird automatisch retry'd — vorher fiel das Theme aus der Liste bis zum Plugin-Reload
- **Defensive Cache-Refresh beim Theme-Switch.** Falls ein Theme auf einem alten Pfad ohne Cache-Fill in den Speicher
gekommen ist, holt Switch() das beim Anwenden nach
- **Synthwave Sunset als zehnter Built-In.** Hot Magenta + Cyan auf Mitternachts-Violett, 80s-Neon-Grid-Vibes für
Late-Night-Raids
- **Author-Credits konsolidiert.** Brand-Themes laufen jetzt unter „Hellion Forge". Mint Grove und Forge Merchantman
werden Carla Beleandis als Community-Geste zugeschrieben.
Keine Schema-Bumps, keine User-sichtbaren Funktions- Änderungen außer dass die Frames in Theme-getrieben rendernden
Szenen merklich glatter laufen und ein neues Theme im Picker steht.
+29
View File
@@ -0,0 +1,29 @@
---
subtitle: ChatLog Frame-Hot-Path
versionsnatur: Performance-Patch
---
**Hellion Chat 1.4.2 — ChatLog Frame-Hot-Path**
Dritter Sub-Patch der v1.4.x Polish-Sweep-Serie. Drei Per-Frame-Allokations-Quellen aus dem ChatLogWindow-Render- Pfad
und der Settings-StatusBar eliminiert.
- **Card-Mode-Border-Loop entlastet.** DrawMessages hebt Theme, DrawList, Window-Left, Window-Right und die ABGR-
Border-Color einmalig vor den Per-Message-Loop. Bei 100 sichtbaren Messages sind das gut 500 redundante P/Invokes und
Property-Reads, die der Hoist eliminiert. Pop-Out- Heavy-Setups (mehrere parallele Chat-Windows) profitieren
proportional, weil der Hoist pro DrawMessages-Call greift, also pro Window
- **Auto-Tell Tab-Tint und Icon gecached.** Die Hash-Color- Berechnung für Auto-Tell-Tabs lief pro Tab pro Frame, mit
zwei String-Allokationen pro Tab (eine für Tint-Hash, eine für Icon-Hash). Der neue TabTintCache liest pre-computed
Werte aus dem Tab und rechnet nur neu wenn das Tell-Target drifted. Beide Caches haben separate Validation-Keys, also
keine Cross-Invalidation zwischen Tint- und Icon-Pfad. AutoTellTabTint selbst bleibt pure Hash-Helper, weiterhin ohne
Tab-Awareness
- **StatusBar-Aggregation hinter Cache-Gate.** Die Status- Leiste am unteren Window-Rand summiert die Tab-Message-
Counts und zählt die Auto-Tell-Tabs pro Frame. Der Cache- Gate (1 Sekunde) lag bisher hinter den LINQ-Pfaden, also
liefen Sum und Count trotzdem pro Frame. Jetzt vor dem Gate, plus die LINQ-Pfade durch eine Single-Pass-Foreach
ersetzt. Die Aggregation läuft auf etwa 1 % der Frames
Realistische Frame-Time-Recovery: 2-5 % in typischen Szenen, Pop-Out-Heavy-Setups potenziell mehr durch die Card-Border-
Multiplikation pro Window.
Keine Schema-Bumps, keine User-sichtbaren Funktions- Änderungen außer dass die Frames im Chat-Log und in der
Settings-Statusleiste merklich glatter laufen.
+29
View File
@@ -0,0 +1,29 @@
---
subtitle: Async-Lifecycle + Gitea-Cutover
versionsnatur: Architecture-Refactor
---
**Hellion Chat 1.4.3 — Plugin-Load Async-Init + Repo-Cutover**
Vierter Sub-Patch der v1.4.x Polish-Sweep-Serie. Plugin- Lifecycle auf Dalamud's `IAsyncDalamudPlugin`-API migriert und
das Custom-Repo zieht von GitHub auf Gitea um.
- **Async-Plugin-Architektur.** Konstruktor übernimmt nur noch die Bootstrap-Essentials (Config-Load, Language-Init,
Conflict-Detection). Migrationen, Service-Allokationen, Window-Konstruktion und Hook-Subscription wandern in
LoadAsync, sodass Dalamud die UI während der schweren Arbeit responsive halten kann. Per-Line-CaptureFailure in
DisposeAsync mirrort LightlessSync's Pattern, plus Idempotency-Guard gegen Reload-Races
- **Custom-Repo-URL umgezogen auf Gitea.** Bestehende Tester müssen einmalig in XIVLauncher die Custom-Repo-URL auf
`https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json` umstellen, dann
XIVLauncher neu starten. Das alte GitHub-Repo bleibt als eingefrorener v1.4.2-Snapshot stehen und wird nicht mehr
aktualisiert
- **Schema-Gate statt Migrations-Kette.** Die v9 → v16 Migrationen sind raus, ersetzt durch einen harten Schema-Check in
Phase 1. Configs auf Schema v16+ laden direkt; ältere Configs (vor v1.2.1) bekommen jetzt eine klare „install v1.4.2
first"-Fehlermeldung statt eines impliziten Migrations-Pfads
- **AutoTranslate-Cache läuft im Hintergrund.** Der Cache füllt sich jetzt fire-and-forget statt blockierend im
Plugin-Load. Trade-off: die erste Auto-Translate-Nutzung einer Session kann einen kurzen Hitch haben, dafür kein
300-ms-Block beim Plugin-Start
- **Plugin-Load-Zeit ehrlich.** Median 3,7 s über fünf Reloads, vergleichbar mit v1.4.2. Der Async-Refactor ist
Foundation für künftige Lazy-Init-Optimierungen (v1.4.4) und Code-Architektur-Hygiene, kein direkter User-spürbarer
Speed-Win in dieser Release
Keine User-sichtbaren Funktions-Änderungen außer dem Repo-URL-Update. Settings, Themes und Tabs bleiben unangetastet.
+14 -13
View File
@@ -1,26 +1,27 @@
--- ---
## How to install ## How to install
This release is distributed via the HellionChat custom repository, not the This release is distributed via the HellionChat custom repository, not the Dalamud main plugin repo. To install:
Dalamud main plugin repo. To install:
1. In XIVLauncher: **Settings → Experimental → Custom Plugin Repositories** 1. In XIVLauncher: **Settings → Experimental → Custom Plugin Repositories**
2. Add the URL: 2. Add the URL: `https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json`
`https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/repo.json`
3. Enable, save, then `/xlplugins` → search **Hellion Chat** → install 3. Enable, save, then `/xlplugins` → search **Hellion Chat** → install
## Project documents ## Project documents
- [README](https://github.com/JonKazama-Hellion/HellionChat/blob/main/README.md) — features, architecture, build - [README](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/README.md) — features,
- [Privacy notice](https://github.com/JonKazama-Hellion/HellionChat/blob/main/PRIVACY.md) — what the plugin stores and sends architecture, build
- [Third-party notices](https://github.com/JonKazama-Hellion/HellionChat/blob/main/docs/THIRD_PARTY_NOTICES.md) — dependencies and licences - [Privacy notice](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/PRIVACY.md) — what
- [Security policy](https://github.com/JonKazama-Hellion/HellionChat/blob/main/SECURITY.md) — vulnerability reporting the plugin stores and sends
- [Support](https://github.com/JonKazama-Hellion/HellionChat/blob/main/SUPPORT.md) — bug reports, questions, contact paths - [Third-party notices](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/docs/THIRD_PARTY_NOTICES.md)
— dependencies and licences
- [Security policy](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/SECURITY.md) —
vulnerability reporting
- [Support](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/SUPPORT.md) — bug reports,
questions, contact paths
## Licence ## Licence
[EUPL-1.2](https://github.com/JonKazama-Hellion/HellionChat/blob/main/LICENSE). [EUPL-1.2](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/LICENSE). Based on
Based on [Chat 2](https://github.com/Infiziert90/ChatTwo) by Infi and Anna, [Chat 2](https://github.com/Infiziert90/ChatTwo) by Infi and Anna, also EUPL-1.2.
also EUPL-1.2.
+13 -16
View File
@@ -3,6 +3,12 @@ name: Build
# Verifies that every push to main and every PR still builds against the # Verifies that every push to main and every PR still builds against the
# current Dalamud staging branch. Does not produce release artefacts; the # current Dalamud staging branch. Does not produce release artefacts; the
# release workflow handles that on tag. # release workflow handles that on tag.
#
# Linux runner: gitea.com Cloud Actions provides ubuntu-latest. The plugin
# csproj targets net10.0-windows, but `dotnet build` cross-compiles on
# Linux as long as the Dalamud staging assemblies are present at the
# expected lookup path ($(HOME)/.xlcore/dalamud/Hooks/dev/, which the
# Dalamud SDK 15 uses on Linux).
on: on:
push: push:
@@ -21,36 +27,27 @@ permissions:
jobs: jobs:
build: build:
name: Build (Release) name: Build (Release)
runs-on: windows-latest runs-on: ubuntu-latest
timeout-minutes: 15 timeout-minutes: 15
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v6 uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
- name: Setup .NET 10 - name: Setup .NET 10
uses: actions/setup-dotnet@v5 uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5
with: with:
dotnet-version: 10.0.x dotnet-version: 10.0.x
- name: Download Dalamud staging - name: Download Dalamud staging
shell: pwsh
run: | run: |
$hooks = Join-Path $env:APPDATA "XIVLauncher\addon\Hooks\dev" hooks="$HOME/.xlcore/dalamud/Hooks/dev"
New-Item -ItemType Directory -Force -Path $hooks | Out-Null mkdir -p "$hooks"
Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile dalamud.zip curl -fsSL https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -o dalamud.zip
Expand-Archive -Force -Path dalamud.zip -DestinationPath $hooks unzip -oq dalamud.zip -d "$hooks"
- name: Restore - name: Restore
run: dotnet restore HellionChat/HellionChat.csproj run: dotnet restore HellionChat/HellionChat.csproj
- name: Build (Release) - name: Build (Release)
run: dotnet build HellionChat/HellionChat.csproj --configuration Release --no-restore run: dotnet build HellionChat/HellionChat.csproj --configuration Release --no-restore
- name: Upload build output
uses: actions/upload-artifact@v7
with:
name: HellionChat-build-${{ github.run_number }}
path: HellionChat/bin/Release/**/HellionChat/**
if-no-files-found: warn
retention-days: 14
-93
View File
@@ -1,93 +0,0 @@
name: CodeQL
# Replaces the GitHub default-setup CodeQL scan. The default setup runs
# without resolving the Dalamud assemblies (they live in a user-AppData
# path) and reports "Low C# analysis quality" because call-target
# resolution sits at ~64%. This workflow downloads the Dalamud staging
# distribution before the build, runs a manual dotnet build, and then
# lets CodeQL analyse the fully-resolved compilation. Quality climbs
# back above the 85% thresholds.
#
# This workflow only consumes trusted inputs: the tag/branch ref via
# the standard checkout action, and the Dalamud distribution URL which
# is pinned to a goatcorp-controlled GitHub Pages target. No user-
# controlled event payload (issue title, PR body, commit message) flows
# into a run-step.
#
# Disable the default setup in the repo before this workflow lands:
# Settings -> Code security -> Code scanning -> "CodeQL analysis" tile
# -> Switch to advanced.
on:
push:
branches: [main]
pull_request:
branches: [main]
schedule:
- cron: '17 6 * * 1'
permissions:
actions: read
contents: read
security-events: write
jobs:
analyze-csharp:
name: Analyze (csharp)
runs-on: windows-latest
timeout-minutes: 30
steps:
- name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Setup .NET 10
uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
with:
dotnet-version: 10.0.x
- name: Download Dalamud staging
shell: pwsh
run: |
$hooks = Join-Path $env:APPDATA "XIVLauncher\addon\Hooks\dev"
New-Item -ItemType Directory -Force -Path $hooks | Out-Null
Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile dalamud.zip
Expand-Archive -Force -Path dalamud.zip -DestinationPath $hooks
- name: Initialize CodeQL
uses: github/codeql-action/init@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
with:
languages: csharp
build-mode: manual
queries: security-extended
- name: Restore
run: dotnet restore HellionChat/HellionChat.csproj
- name: Build (Release)
run: dotnet build HellionChat/HellionChat.csproj --configuration Release --no-restore
- name: Perform CodeQL analysis
uses: github/codeql-action/analyze@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
with:
category: /language:csharp
analyze-actions:
name: Analyze (actions)
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Initialize CodeQL
uses: github/codeql-action/init@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
with:
languages: actions
build-mode: none
- name: Perform CodeQL analysis
uses: github/codeql-action/analyze@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
with:
category: /language:actions
+7 -8
View File
@@ -19,11 +19,11 @@ name: Forge Announce
on: on:
push: push:
tags: tags:
- 'v*' - "v*"
workflow_dispatch: workflow_dispatch:
inputs: inputs:
tag: tag:
description: 'Existing tag to (re)post, e.g. v1.1.0' description: "Existing tag to (re)post, e.g. v1.1.0"
required: true required: true
type: string type: string
@@ -34,10 +34,9 @@ jobs:
announce: announce:
name: Post changelog to Hellion Forge name: Post changelog to Hellion Forge
runs-on: ubuntu-latest runs-on: ubuntu-latest
# The DISCORD_FORGE_WEBHOOK secret lives under Settings → Environments # The DISCORD_FORGE_WEBHOOK secret is set as a repo-level Actions Secret
# → Webhook (case-sensitive). Without this declaration the secret is # on Gitea (Settings → Actions → Secrets). Repo-level secrets are in
# not in scope for the job. # scope for every job by default, no environment: declaration needed.
environment: Webhook
timeout-minutes: 5 timeout-minutes: 5
steps: steps:
@@ -134,7 +133,7 @@ jobs:
# ---------- Embed-Payload bauen ---------- # ---------- Embed-Payload bauen ----------
$payload = [ordered]@{ $payload = [ordered]@{
username = "Forge Herald" username = "Forge Herald"
avatar_url = "https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/icon.png" avatar_url = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/icon.png"
content = "<@&1500489631555260446>" content = "<@&1500489631555260446>"
allowed_mentions = [ordered]@{ allowed_mentions = [ordered]@{
parse = @() parse = @()
@@ -143,7 +142,7 @@ jobs:
embeds = @( embeds = @(
[ordered]@{ [ordered]@{
title = $title title = $title
url = "https://github.com/JonKazama-Hellion/HellionChat/releases/tag/$tag" url = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/$tag"
color = 12730636 color = 12730636
description = $description description = $description
footer = [ordered]@{ text = $footerText } footer = [ordered]@{ text = $footerText }
+31 -25
View File
@@ -2,20 +2,24 @@ name: Release
# Triggered when a vX.Y.Z tag is pushed. Builds the plugin against the # Triggered when a vX.Y.Z tag is pushed. Builds the plugin against the
# current Dalamud staging branch, locates the latest.zip produced by # current Dalamud staging branch, locates the latest.zip produced by
# DalamudPackager and attaches it to the matching GitHub Release. # DalamudPackager and attaches it to the matching Gitea Release.
# #
# User-controlled inputs touched by this workflow: # User-controlled inputs touched by this workflow:
# - the tag name (filtered by on.tags = v*, validated again at runtime # - the tag name (filtered by on.tags = v*, validated again at runtime
# against ^v\d+\.\d+\.\d+$ before being used in any string) # against ^v\d+\.\d+\.\d+$ before being used in any string)
# All other values are either repo-controlled (paths under # All other values are either repo-controlled (paths under
# HellionChat/bin/Release derived from Get-ChildItem) or pinned URLs to # HellionChat/bin/Release derived from find / Get-ChildItem) or pinned
# goatcorp / GitHub. Nothing from a webhook event payload (issue/PR # URLs to goatcorp / gitea. Nothing from a webhook event payload (issue/PR
# titles, commit messages, etc.) flows into a run-step. # titles, commit messages, etc.) flows into a run-step.
#
# Linux runner: gitea.com Cloud Actions only ships ubuntu-latest. The
# plugin csproj targets net10.0-windows, `dotnet build` cross-compiles on
# Linux when the Dalamud staging assemblies sit under $(HOME)/.xlcore/...
on: on:
push: push:
tags: tags:
- 'v*' - "v*"
# Manual recovery trigger. Use when a tag was pushed but the auto-run # Manual recovery trigger. Use when a tag was pushed but the auto-run
# was missed or failed: `gh workflow run release.yml -f tag=v0.6.1`. # was missed or failed: `gh workflow run release.yml -f tag=v0.6.1`.
# The tag input is validated against the same semver regex as the # The tag input is validated against the same semver regex as the
@@ -23,7 +27,7 @@ on:
workflow_dispatch: workflow_dispatch:
inputs: inputs:
tag: tag:
description: 'Existing tag to (re)release, e.g. v0.6.1' description: "Existing tag to (re)release, e.g. v0.6.1"
required: true required: true
type: string type: string
@@ -33,7 +37,7 @@ permissions:
jobs: jobs:
release: release:
name: Build and attach release ZIP name: Build and attach release ZIP
runs-on: windows-latest runs-on: ubuntu-latest
timeout-minutes: 20 timeout-minutes: 20
steps: steps:
@@ -42,37 +46,35 @@ jobs:
# invoked from; we need to explicitly check out the tag the user # invoked from; we need to explicitly check out the tag the user
# supplied so the build comes from the tagged commit, not main. # supplied so the build comes from the tagged commit, not main.
- name: Checkout - name: Checkout
uses: actions/checkout@v6 uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
with: with:
ref: ${{ github.event.inputs.tag || github.ref }} ref: ${{ github.event.inputs.tag || github.ref }}
- name: Setup .NET 10 - name: Setup .NET 10
uses: actions/setup-dotnet@v5 uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5
with: with:
dotnet-version: 10.0.x dotnet-version: 10.0.x
- name: Download Dalamud staging - name: Download Dalamud staging
shell: pwsh
run: | run: |
$hooks = Join-Path $env:APPDATA "XIVLauncher\addon\Hooks\dev" hooks="$HOME/.xlcore/dalamud/Hooks/dev"
New-Item -ItemType Directory -Force -Path $hooks | Out-Null mkdir -p "$hooks"
Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile dalamud.zip curl -fsSL https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -o dalamud.zip
Expand-Archive -Force -Path dalamud.zip -DestinationPath $hooks unzip -oq dalamud.zip -d "$hooks"
- name: Build (Release) - name: Build (Release)
run: dotnet build HellionChat/HellionChat.csproj --configuration Release run: dotnet build HellionChat/HellionChat.csproj --configuration Release
- name: Locate latest.zip - name: Locate latest.zip
id: locate id: locate
shell: pwsh
run: | run: |
$zip = Get-ChildItem -Path HellionChat\bin\Release -Recurse -Filter latest.zip | Select-Object -First 1 zip="$(find HellionChat/bin/Release -name latest.zip -print -quit)"
if (-not $zip) if [ -z "$zip" ]; then
{ echo "latest.zip not found under HellionChat/bin/Release" >&2
throw "latest.zip not found under HellionChat\bin\Release" exit 1
} fi
Write-Host "Found: $($zip.FullName)" echo "Found: $zip"
"path=$($zip.FullName)" | Out-File -FilePath $env:GITHUB_OUTPUT -Append echo "path=$zip" >> "$GITHUB_OUTPUT"
# Build a release body from the matching changelog block in # Build a release body from the matching changelog block in
# HellionChat.yaml plus a static install / docs footer. Fails the # HellionChat.yaml plus a static install / docs footer. Fails the
@@ -150,8 +152,13 @@ jobs:
Write-Host $body Write-Host $body
Write-Host "----------------------------------------" Write-Host "----------------------------------------"
- name: Attach to GitHub release # Gitea-native release action. Creates the release if the tag has no
uses: softprops/action-gh-release@v3 # release yet, or updates the existing one. body_path provides the
# generated release body, files attaches latest.zip. The auto-injected
# GITHUB_TOKEN on Gitea Actions has Gitea-API scope and is sufficient
# for release write.
- name: Attach to Gitea release
uses: https://gitea.com/actions/release-action@main
with: with:
# Explicit tag_name so the action targets the correct release in # Explicit tag_name so the action targets the correct release in
# both push:tags (auto) and workflow_dispatch (manual recovery) # both push:tags (auto) and workflow_dispatch (manual recovery)
@@ -160,5 +167,4 @@ jobs:
tag_name: ${{ github.event.inputs.tag || github.ref_name }} tag_name: ${{ github.event.inputs.tag || github.ref_name }}
files: ${{ steps.locate.outputs.path }} files: ${{ steps.locate.outputs.path }}
body_path: release-body.md body_path: release-body.md
fail_on_unmatched_files: true api_key: ${{ secrets.GITHUB_TOKEN }}
generate_release_notes: false
+1 -1
View File
@@ -9,7 +9,7 @@
.envrc .envrc
!.env.example !.env.example
.vscode/ .vscode/
scripts/ scripts/setup-dev-env.sh
# Local test project (stays out of the published plugin repo; # Local test project (stays out of the published plugin repo;
# pure-function safety net for refactor cycles) # pure-function safety net for refactor cycles)
+7
View File
@@ -0,0 +1,7 @@
{
"MD007": { "indent": 4 },
"MD013": false,
"MD029": false,
"MD033": false,
"MD041": false
}
+4
View File
@@ -0,0 +1,4 @@
bin/
obj/
node_modules/
*.Designer.cs
+7
View File
@@ -0,0 +1,7 @@
{
"printWidth": 120,
"tabWidth": 4,
"proseWrap": "always",
"singleQuote": false,
"endOfLine": "lf"
}
+8
View File
@@ -0,0 +1,8 @@
extends: default
rules:
line-length: disable
document-start: disable
truthy:
allowed-values: ["true", "false", "on"]
empty-lines:
max: 1
+52 -75
View File
@@ -2,16 +2,14 @@
## A Note on This Project ## A Note on This Project
HellionChat is a one-person side project developed under Hellion Forge. HellionChat is a one-person side project developed under Hellion Forge. I maintain this in my spare time, which means
I maintain this in my spare time, which means replies can take a few replies can take a few days. Please do not escalate just because a thread is quiet.
days. Please do not escalate just because a thread is quiet.
When in doubt, assume good intent. Contributors come from different When in doubt, assume good intent. Contributors come from different backgrounds, time zones and skill levels. A
backgrounds, time zones and skill levels. A clarifying question is clarifying question is almost always a better first move than an accusation.
almost always a better first move than an accusation.
Please also keep discussions on topic. This project is about a Dalamud Please also keep discussions on topic. This project is about a Dalamud chat plugin. Off-topic arguments belong
chat plugin. Off-topic arguments belong elsewhere. elsewhere.
--- ---
@@ -19,88 +17,72 @@ chat plugin. Off-topic arguments belong elsewhere.
We pledge to make our community welcoming, safe, and equitable for all. We pledge to make our community welcoming, safe, and equitable for all.
We are committed to fostering an environment that respects and promotes We are committed to fostering an environment that respects and promotes the dignity, rights, and contributions of all
the dignity, rights, and contributions of all individuals, regardless individuals, regardless of characteristics including race, ethnicity, caste, color, age, physical characteristics,
of characteristics including race, ethnicity, caste, color, age, neurodiversity, disability, sex or gender, gender identity or expression, sexual orientation, language, philosophy or
physical characteristics, neurodiversity, disability, sex or gender, religion, national or social origin, socio-economic position, level of education, or other status. The same privileges
gender identity or expression, sexual orientation, language, philosophy of participation are extended to everyone who participates in good faith and in accordance with this Covenant.
or religion, national or social origin, socio-economic position, level
of education, or other status. The same privileges of participation are
extended to everyone who participates in good faith and in accordance
with this Covenant.
## Encouraged Behaviors ## Encouraged Behaviors
While acknowledging differences in social norms, we all strive to meet While acknowledging differences in social norms, we all strive to meet our community's expectations for positive
our community's expectations for positive behavior. We also understand behavior. We also understand that our words and actions may be interpreted differently than we intend based on culture,
that our words and actions may be interpreted differently than we intend background, or native language.
based on culture, background, or native language.
With these considerations in mind, we agree to behave mindfully toward With these considerations in mind, we agree to behave mindfully toward each other and act in ways that center our shared
each other and act in ways that center our shared values, including: values, including:
1. Respecting the **purpose of our community**, our activities, and our 1. Respecting the **purpose of our community**, our activities, and our ways of gathering.
ways of gathering.
2. Engaging **kindly and honestly** with others. 2. Engaging **kindly and honestly** with others.
3. Respecting **different viewpoints** and experiences. 3. Respecting **different viewpoints** and experiences.
4. **Taking responsibility** for our actions and contributions. 4. **Taking responsibility** for our actions and contributions.
5. Gracefully giving and accepting **constructive feedback**. 5. Gracefully giving and accepting **constructive feedback**.
6. Committing to **repairing harm** when it occurs. 6. Committing to **repairing harm** when it occurs.
7. Behaving in other ways that promote and sustain the **well-being of 7. Behaving in other ways that promote and sustain the **well-being of our community**.
our community**.
## Restricted Behaviors ## Restricted Behaviors
We agree to restrict the following behaviors in our community. We agree to restrict the following behaviors in our community. Instances, threats, and promotion of these behaviors are
Instances, threats, and promotion of these behaviors are violations of violations of this Code of Conduct.
this Code of Conduct.
1. **Harassment.** Violating explicitly expressed boundaries or engaging 1. **Harassment.** Violating explicitly expressed boundaries or engaging in unnecessary personal attention after any
in unnecessary personal attention after any clear request to stop. clear request to stop.
2. **Character attacks.** Making insulting, demeaning, or pejorative 2. **Character attacks.** Making insulting, demeaning, or pejorative comments directed at a community member or group of
comments directed at a community member or group of people. people.
3. **Stereotyping or discrimination.** Characterizing anyone's 3. **Stereotyping or discrimination.** Characterizing anyone's personality or behavior on the basis of immutable
personality or behavior on the basis of immutable identities or identities or traits.
traits. 4. **Sexualization.** Behaving in a way that would generally be considered inappropriately intimate in the context or
4. **Sexualization.** Behaving in a way that would generally be purpose of the community.
considered inappropriately intimate in the context or purpose of the 5. **Violating confidentiality.** Sharing or acting on someone's personal or private information without their
community. permission.
5. **Violating confidentiality.** Sharing or acting on someone's 6. **Endangerment.** Causing, encouraging, or threatening violence or other harm toward any person or group.
personal or private information without their permission. 7. Behaving in other ways that **threaten the well-being** of our community.
6. **Endangerment.** Causing, encouraging, or threatening violence or
other harm toward any person or group.
7. Behaving in other ways that **threaten the well-being** of our
community.
### Other Restrictions ### Other Restrictions
1. **Misleading identity.** Impersonating someone else for any reason, 1. **Misleading identity.** Impersonating someone else for any reason, or pretending to be someone else to evade
or pretending to be someone else to evade enforcement actions. enforcement actions.
2. **Failing to credit sources.** Not properly crediting the sources of 2. **Failing to credit sources.** Not properly crediting the sources of content you contribute.
content you contribute. 3. **Promotional materials.** Sharing marketing or other commercial content in a way that is outside the norms of the
3. **Promotional materials.** Sharing marketing or other commercial community.
content in a way that is outside the norms of the community. 4. **Irresponsible communication.** Failing to responsibly present content which includes, links to, or describes any
4. **Irresponsible communication.** Failing to responsibly present other restricted behaviors.
content which includes, links to, or describes any other restricted
behaviors.
## Reporting ## Reporting
If something here is being broken, contact me directly. Do not open a If something here is being broken, contact me directly. Do not open a public issue.
public issue.
| Channel | Address | | Channel | Address |
| ---------- | ------------------------ | | ---------- | -------------------------- |
| Email | `kontakt@hellion-media.de` | | Email | `kontakt@hellion-media.de` |
| Discord DM | `@j.j_kazama` | | Discord DM | `@j.j_kazama` |
Reports stay private. I will acknowledge within a few weekdays Reports stay private. I will acknowledge within a few weekdays (European business hours) and tell you what I plan to do.
(European business hours) and tell you what I plan to do.
## Enforcement ## Enforcement
I am the sole maintainer, so enforcement is a single-person process. I am the sole maintainer, so enforcement is a single-person process. I will pick the lightest measure that actually
I will pick the lightest measure that actually resolves the situation: resolves the situation:
1. Private note asking the behaviour to stop. 1. Private note asking the behaviour to stop.
2. Public correction in the affected thread. 2. Public correction in the affected thread.
@@ -109,25 +91,20 @@ I will pick the lightest measure that actually resolves the situation:
5. Temporary block from the repository or related spaces. 5. Temporary block from the repository or related spaces.
6. Permanent block. 6. Permanent block.
Severe cases skip the lower steps. I will not negotiate over harassment Severe cases skip the lower steps. I will not negotiate over harassment or threats.
or threats.
## Scope ## Scope
This Code of Conduct applies to all spaces the project owns or that I This Code of Conduct applies to all spaces the project owns or that I run on its behalf: the GitHub repository, GitHub
run on its behalf: the GitHub repository, GitHub Discussions, Discussions, project-related Discord conversations, and the maintainer contact listed in [`SECURITY.md`](SECURITY.md).
project-related Discord conversations, and the maintainer contact It also applies when someone is identifiably representing HellionChat elsewhere, for example when posting as a
listed in [`SECURITY.md`](SECURITY.md). It also applies when someone HellionChat maintainer in the Dalamud Discord.
is identifiably representing HellionChat elsewhere, for example when
posting as a HellionChat maintainer in the Dalamud Discord.
## Attribution ## Attribution
This Code of Conduct is adapted from the Contributor Covenant, version This Code of Conduct is adapted from the Contributor Covenant, version 3.0, available at
3.0, available at
[https://www.contributor-covenant.org/version/3/0/](https://www.contributor-covenant.org/version/3/0/). [https://www.contributor-covenant.org/version/3/0/](https://www.contributor-covenant.org/version/3/0/).
Contributor Covenant is stewarded by the Organization for Ethical Contributor Covenant is stewarded by the Organization for Ethical Source and licensed under CC BY-SA 4.0. To view a copy
Source and licensed under CC BY-SA 4.0. To view a copy of this of this license, visit
license, visit
[https://creativecommons.org/licenses/by-sa/4.0/](https://creativecommons.org/licenses/by-sa/4.0/). [https://creativecommons.org/licenses/by-sa/4.0/](https://creativecommons.org/licenses/by-sa/4.0/).
+78 -87
View File
@@ -1,87 +1,69 @@
# Contributing to HellionChat # Contributing to HellionChat
Thanks for taking a look. HellionChat is a one-person side project Thanks for taking a look. HellionChat is a one-person side project developed under Hellion Forge. It started as a fork
developed under Hellion Forge. It started as a fork of of [Chat 2](https://github.com/Infiziert90/ChatTwo) and has since become a standalone plugin under its own namespace,
[Chat 2](https://github.com/Infiziert90/ChatTwo) and has since become IPC channels and source tree (standalone-cut completed in v1.0.0). Forking HellionChat itself is explicitly permitted
a standalone plugin under its own namespace, IPC channels and under the EUPL-1.2.
source tree (standalone-cut completed in v1.0.0). Forking HellionChat
itself is explicitly permitted under the EUPL-1.2.
This document explains what I am looking for, what I am not, and how This document explains what I am looking for, what I am not, and how to make a contribution land smoothly.
to make a contribution land smoothly.
## Before You Open Anything ## Before You Open Anything
- Read the [README](README.md) so you understand the scope: a - Read the [README](README.md) so you understand the scope: a privacy-focused, EUPL-1.2-licensed Dalamud plugin that
privacy-focused, EUPL-1.2-licensed Dalamud plugin that intentionally intentionally removes the upstream webinterface and ships privacy-first defaults.
removes the upstream webinterface and ships privacy-first defaults. - Read [`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md). Active cherry-picking from upstream Chat 2 has ended in the
- Read [`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md). Cherry-picks v1.4.x cycle; HellionChat continues as an independent codebase. Existing upstream-derived code keeps its attribution.
from upstream Chat 2 are selective and deliberate; not everything New contributions stand on their own and do not need to be cherry-pick-compatible.
that lands there belongs here. - Read [`SECURITY.md`](SECURITY.md). Anything security-sensitive goes through a private advisory, never a public issue
- Read [`SECURITY.md`](SECURITY.md). Anything security-sensitive goes or PR.
through a private advisory, never a public issue or PR.
- Read the [Code of Conduct](CODE_OF_CONDUCT.md). - Read the [Code of Conduct](CODE_OF_CONDUCT.md).
## What I Will Accept ## What I Will Accept
- Bug fixes for behaviour documented in the README, the in-plugin - Bug fixes for behaviour documented in the README, the in-plugin settings or the changelog.
settings or the changelog. - Translation contributions for Hellion-specific strings via direct pull requests against
- Translation contributions for Hellion-specific strings via direct `HellionChat/Resources/HellionStrings.*.resx`. Translations for upstream Chat 2 strings (`Language.*.resx`) are not
pull requests against handled here; those go to the upstream Chat 2 project.
`HellionChat/Resources/HellionStrings.*.resx`. Translations for
upstream Chat 2 strings (`Language.*.resx`) are not handled here;
those go to the upstream Chat 2 project.
- Documentation improvements (README, comments, this file). - Documentation improvements (README, comments, this file).
- Performance fixes with a measurable before/after. - Performance fixes with a measurable before/after.
- New features that fit the privacy-first scope and do not duplicate - New features that fit the privacy-first scope and do not duplicate what an existing Dalamud plugin already does well.
what an existing Dalamud plugin already does well.
## What I Will Probably Decline ## What I Will Probably Decline
- Re-introducing the webinterface or any remote-access feature. It was - Re-introducing the webinterface or any remote-access feature. It was removed in v0.2.0 on purpose. See the README
removed in v0.2.0 on purpose. See the README section section "Was gegenüber Chat 2 fehlt".
"Was gegenüber Chat 2 fehlt". - Features that bypass the privacy filter or weaken the default retention behaviour without an explicit, documented
- Features that bypass the privacy filter or weaken the default opt-in.
retention behaviour without an explicit, documented opt-in. - Sweeping refactors that touch large parts of the codebase. The maintenance cost outweighs the benefit for a one-person
- Sweeping refactors that touch large parts of the codebase. They make project. (This used to be doubly important because of the upstream cherry-pick path; that path is closed now, but the
selective upstream cherry-picks much harder and the maintenance cost rule still holds on its own merits.)
outweighs the benefit for a one-person project. - AI-generated code dropped in without disclosure or human review. See [`docs/AI_DISCLOSURE.md`](docs/AI_DISCLOSURE.md)
- AI-generated code dropped in without disclosure or human review. See for how I handle AI assistance on my side; I expect comparable transparency from contributors.
[`docs/AI_DISCLOSURE.md`](docs/AI_DISCLOSURE.md) for how I handle
AI assistance on my side; I expect comparable transparency from
contributors.
If you are unsure whether an idea fits, open a feature-request issue If you are unsure whether an idea fits, open a feature-request issue first and ask before writing code. I would rather
first and ask before writing code. I would rather say "no" to a say "no" to a proposal than to a finished pull request.
proposal than to a finished pull request.
## Workflow ## Workflow
1. Open an issue (bug or feature request) using the templates under 1. Open an issue (bug or feature request) using the templates under `.github/ISSUE_TEMPLATE/`. Skip this for trivial
`.github/ISSUE_TEMPLATE/`. Skip this for trivial typos. typos.
2. Fork the repository and branch off `main`. Branch naming is 2. Fork the repository and branch off `main`. Branch naming is informal; something like `fix/auto-tell-history-empty` or
informal; something like `fix/auto-tell-history-empty` or
`feat/theme-export` is fine. `feat/theme-export` is fine.
3. Match the existing code style. The repository ships an 3. Match the existing code style. The repository ships an `.editorconfig` that VS Code and Rider pick up automatically.
`.editorconfig` that VS Code and Rider pick up automatically. 4. Keep commits focused. Several small commits with clear messages are easier to review than one large one.
4. Keep commits focused. Several small commits with clear messages are Squash-on-merge happens at the PR level if needed.
easier to review than one large one. Squash-on-merge happens at 5. If your change touches user-visible behaviour, update the README and/or the changelog block in
the PR level if needed. `HellionChat/HellionChat.yaml` and `repo.json`. I bump the version number myself at release time.
5. If your change touches user-visible behaviour, update the README 6. Open the pull request against `main`. The PR template will ask you to summarise the change, the testing you did and
and/or the changelog block in `HellionChat/HellionChat.yaml` and any compatibility notes.
`repo.json`. I bump the version number myself at release time.
6. Open the pull request against `main`. The PR template will ask
you to summarise the change, the testing you did and any
compatibility notes.
## Build and Test ## Build and Test
The project targets `net10.0-windows` against Dalamud SDK 15. To build The project targets `net10.0-windows` against Dalamud SDK 15. To build locally you need:
locally you need:
- .NET 10 SDK - .NET 10 SDK
- A working Dalamud dev environment with `DALAMUD_HOME` set - A working Dalamud dev environment with `DALAMUD_HOME` set (XIVLauncher installed and launched once is the simplest
(XIVLauncher installed and launched once is the simplest path) path)
- VS Code with the C# Dev Kit, Rider, or Visual Studio - VS Code with the C# Dev Kit, Rider, or Visual Studio
```bash ```bash
@@ -89,59 +71,68 @@ dotnet restore
dotnet build HellionChat.sln -c Release dotnet build HellionChat.sln -c Release
``` ```
There are currently no tests in `HellionChat.sln`. If you add a test There are currently no tests in `HellionChat.sln`. If you add a test project, point it at the relevant subsystems
project, point it at the relevant subsystems (privacy filter, (privacy filter, configuration migration, message store) and mention it in the PR.
configuration migration, message store) and mention it in the PR.
For a smoke test in-game: build, copy the output into your Dalamud For a smoke test in-game: build, copy the output into your Dalamud `devPlugins/HellionChat/` directory and load it via
`devPlugins/HellionChat/` directory and load it via `/xlplugins`. `/xlplugins`.
## Continuous Integration ## Continuous Integration
Every push and every pull request runs: Every push and every pull request runs:
| Workflow | What it checks | | Workflow | What it checks |
| ------------- | ------------------------------------- | | ------------ | -------------------------------- |
| `build.yml` | `dotnet build` and `dotnet test` | | `build.yml` | `dotnet build` and `dotnet test` |
| `codeql.yml` | CodeQL security analysis | | `codeql.yml` | CodeQL security analysis |
A pull request will not be merged while either of these is failing. A pull request will not be merged while either of these is failing. CodeQL findings on changed code need to be
CodeQL findings on changed code need to be addressed; pre-existing addressed; pre-existing findings on untouched code are tracked separately.
findings on untouched code are tracked separately.
## Translations ## Translations
Hellion-specific strings live in Hellion-specific strings live in `HellionChat/Resources/HellionStrings.resx` (English source) and
`HellionChat/Resources/HellionStrings.resx` (English source) and `HellionStrings.<lang>.resx` (per-language). These are accepted as direct pull requests.
`HellionStrings.<lang>.resx` (per-language). These are accepted as
direct pull requests.
The upstream Chat 2 strings in `HellionChat/Resources/Language.*.resx` The upstream Chat 2 strings in `HellionChat/Resources/Language.*.resx` are **not** translated here. They are kept as-is
are **not** translated here. They are owned by the upstream project from the last upstream sync and remain the work of the Chat 2 Crowdin community. Active cherry-picking from upstream
and synced in via cherry-pick. Please contribute those to ended in the v1.4.x cycle (see [`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md)), so future translation improvements to
[Infiziert90/ChatTwo](https://github.com/Infiziert90/ChatTwo) instead. those upstream strings will not flow into HellionChat automatically anymore. If you have improvements for the original
Chat 2 strings, please contribute them to [Infiziert90/ChatTwo](https://github.com/Infiziert90/ChatTwo) directly.
## Licensing ## Licensing
By submitting a pull request you confirm that: By submitting a pull request you confirm that:
- Your contribution is your own work, or you have the right to - Your contribution is your own work, or you have the right to contribute it under the project licence.
contribute it under the project licence. - You agree that your contribution will be released under the [EUPL-1.2](LICENSE), the same licence as the rest of the
- You agree that your contribution will be released under the project.
[EUPL-1.2](LICENSE), the same licence as the rest of the project.
There is no separate CLA. Forking HellionChat is explicitly permitted There is no separate CLA. Forking HellionChat is explicitly permitted under the EUPL-1.2, as with any EUPL-licensed
under the EUPL-1.2, as with any EUPL-licensed project. project.
## Response Times ## Response Times
| Channel | Address | | Channel | Address |
| ------------- | -------------------------- | | ------------- | --------------------------------------- |
| GitHub Issues | Preferred for bugs and feature requests | | GitHub Issues | Preferred for bugs and feature requests |
| Discord DM | `@j.j_kazama` | | Discord DM | `@j.j_kazama` |
| Email | `kontakt@hellion-media.de` | | Email | `kontakt@hellion-media.de` |
I respond on weekdays during European business hours and take weekends I respond on weekdays during European business hours and take weekends and FFXIV patch days off. A pull request that
and FFXIV patch days off. A pull request that sits for a few days has sits for a few days has not been ignored. Pinging once after a week is fine; please do not ping daily.
not been ignored. Pinging once after a week is fine; please do not
ping daily. ## First-time setup
After cloning, run once:
```bash
./scripts/setup-hooks.sh
```
This wires `core.hooksPath` to `.githooks/`. The pre-push hook runs preflight (versions/manifest/changelog/build).
### Test suite
The plugin's test suite lives in a separate local repository and is not part of this codebase. If you need access for
development, contact the maintainer.
+2 -2
View File
@@ -4,7 +4,7 @@ HellionChat — a privacy-focused fork of ChatTwo for FINAL FANTASY XIV
Source code Source code
═══════════════════════════════════════════════════════════════════ ═══════════════════════════════════════════════════════════════════
Copyright (c) 2022-2026 Infiziert90 (Infi) and Anna Clemens (ascclemens) Copyright (c) 2022-2026 **[Infiziert90 (Infi)](https://github.com/Infiziert90)** and **[Anna](https://github.com/anna-is-cute)**
Original ChatTwo authors and copyright holders of the upstream Original ChatTwo authors and copyright holders of the upstream
plugin this fork is built on. Their work covers the message store, plugin this fork is built on. Their work covers the message store,
the channel filtering, the sidebar tab system, the FFXIV chat the channel filtering, the sidebar tab system, the FFXIV chat
@@ -19,7 +19,7 @@ Copyright (c) 2025-2026 Florian Wathling / Hellion Online Media
Source code is licensed under the European Union Public Licence Source code is licensed under the European Union Public Licence
(EUPL), Version 1.2 only. The full Licence text lives in the LICENSE (EUPL), Version 1.2 only. The full Licence text lives in the LICENSE
file at the root of this repository. The official Licence website is file at the root of this repository. The official Licence website is
at: https://eupl.eu/1.2/en/ at: <https://eupl.eu/1.2/en/>
This Work is provided "AS IS" without warranties of any kind. See This Work is provided "AS IS" without warranties of any kind. See
Article 7 (Disclaimer of Warranty) and Article 8 (Disclaimer of Article 7 (Disclaimer of Warranty) and Article 8 (Disclaimer of
+58 -102
View File
@@ -1,23 +1,17 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Dalamud.Game.Text;
using Dalamud.Game.Text.SeStringHandling;
using HellionChat.Code; using HellionChat.Code;
using HellionChat.GameFunctions.Types; using HellionChat.GameFunctions.Types;
using HellionChat.Resources; using HellionChat.Resources;
using HellionChat.Util; using HellionChat.Util;
using Dalamud.Game.Text;
using Dalamud.Game.Text.SeStringHandling;
namespace HellionChat; namespace HellionChat;
// Hellion Chat — Auto-Tell-Tabs. // Auto-Tell-Tabs: spawns session-only tabs per /tell partner.
// // Subscribes to MessageManager.MessageProcessed and ClientState.Logout.
// Spawns a session-only tab per /tell partner so a club greeter can track
// multiple parallel conversations without losing context. Subscribes to
// MessageManager.MessageProcessed for live tells and to ClientState.Logout
// for the cleanup pass; everything else hangs off these two entry points.
//
// See spec: Hellion Chat Auto-Tell-Tabs Spec (Obsidian vault).
internal sealed class AutoTellTabsService : IDisposable internal sealed class AutoTellTabsService : IDisposable
{ {
private readonly Plugin _plugin; private readonly Plugin _plugin;
@@ -76,7 +70,10 @@ internal sealed class AutoTellTabsService : IDisposable
return; return;
} }
if (message.Code.Type != ChatType.TellIncoming && message.Code.Type != ChatType.TellOutgoing) if (
message.Code.Type != ChatType.TellIncoming
&& message.Code.Type != ChatType.TellOutgoing
)
{ {
return; return;
} }
@@ -84,15 +81,13 @@ internal sealed class AutoTellTabsService : IDisposable
var partner = ExtractTellPartner(message); var partner = ExtractTellPartner(message);
if (partner == null) if (partner == null)
{ {
// Real message without a player payload — e.g. GM tells, which // Diagnostics: helps detect regressions (FFXIV payload changes, new edge cases)
// we deliberately skip. The diagnostics make future regressions
// (FFXIV changing tell payload shape, new edge cases) findable
// without having to crank up debug logging at the source.
Plugin.Log.Warning( Plugin.Log.Warning(
$"[AutoTellTabs] Could not extract tell partner. type={message.Code.Type}, " + $"[AutoTellTabs] Could not extract tell partner. type={message.Code.Type}, "
$"senderChunks={message.Sender.Count}, contentChunks={message.Content.Count}, " + + $"senderChunks={message.Sender.Count}, contentChunks={message.Content.Count}, "
$"senderSourcePayloads={message.SenderSource?.Payloads?.Count ?? 0}, " + + $"senderSourcePayloads={message.SenderSource?.Payloads?.Count ?? 0}, "
$"contentSourcePayloads={message.ContentSource?.Payloads?.Count ?? 0}"); + $"contentSourcePayloads={message.ContentSource?.Payloads?.Count ?? 0}"
);
return; return;
} }
@@ -101,9 +96,7 @@ internal sealed class AutoTellTabsService : IDisposable
var existing = FindTempTab(partner.Value.Name, partner.Value.World); var existing = FindTempTab(partner.Value.Name, partner.Value.World);
if (existing != null) if (existing != null)
{ {
// Tab already exists; Tab.Matches has already routed this // Already routed via MessageManager pipeline
// message via the MessageManager pipeline (see Task 2 sender
// filter).
return; return;
} }
@@ -120,11 +113,9 @@ internal sealed class AutoTellTabsService : IDisposable
{ {
if (message.Code.Type == ChatType.TellIncoming) if (message.Code.Type == ChatType.TellIncoming)
{ {
// Incoming tell: the sender is the conversation partner. The // Sender is the partner; check chunks first, then raw SeString as fallback
// PlayerPayload normally rides on a chunk's Link slot, but for var fromSender =
// some tell types FFXIV only puts it in the raw SeString — ChunkUtil.TryGetPlayerPayload(message.Sender)
// fall back to that before giving up.
var fromSender = ChunkUtil.TryGetPlayerPayload(message.Sender)
?? ChunkUtil.TryGetPlayerPayload(message.SenderSource); ?? ChunkUtil.TryGetPlayerPayload(message.SenderSource);
if (fromSender != null) if (fromSender != null)
{ {
@@ -133,11 +124,9 @@ internal sealed class AutoTellTabsService : IDisposable
return null; return null;
} }
// Outgoing tell: the local player is the sender, the partner shows // Outgoing tell: check content first, then channels's TellTarget as fallback
// up either as a payload in the content (for tells typed via the var fromContent =
// Chat 2 input bar) or as the channel's tracked tell target (set by ChunkUtil.TryGetPlayerPayload(message.Content)
// the SetContextTellTarget game hook). Same SeString fallback.
var fromContent = ChunkUtil.TryGetPlayerPayload(message.Content)
?? ChunkUtil.TryGetPlayerPayload(message.ContentSource) ?? ChunkUtil.TryGetPlayerPayload(message.ContentSource)
?? ChunkUtil.TryGetPlayerPayload(message.Sender) ?? ChunkUtil.TryGetPlayerPayload(message.Sender)
?? ChunkUtil.TryGetPlayerPayload(message.SenderSource); ?? ChunkUtil.TryGetPlayerPayload(message.SenderSource);
@@ -146,7 +135,8 @@ internal sealed class AutoTellTabsService : IDisposable
return (fromContent.PlayerName, fromContent.World.RowId); return (fromContent.PlayerName, fromContent.World.RowId);
} }
var current = _plugin.CurrentTab.CurrentChannel.TellTarget var current =
_plugin.CurrentTab.CurrentChannel.TellTarget
?? _plugin.CurrentTab.CurrentChannel.TempTellTarget; ?? _plugin.CurrentTab.CurrentChannel.TempTellTarget;
if (current != null && current.IsSet()) if (current != null && current.IsSet())
{ {
@@ -162,17 +152,15 @@ internal sealed class AutoTellTabsService : IDisposable
t.IsTempTab t.IsTempTab
&& t.TellTarget != null && t.TellTarget != null
&& string.Equals(t.TellTarget.Name, name, StringComparison.OrdinalIgnoreCase) && string.Equals(t.TellTarget.Name, name, StringComparison.OrdinalIgnoreCase)
&& t.TellTarget.World == world); && t.TellTarget.World == world
);
} }
private void DropOldestTempTab() private void DropOldestTempTab()
{ {
// Greeted tabs are dropped before un-greeted ones (the user said // Prioritize greeted tabs for drop; within each bucket, drop by oldest LastActivity
// "I'm done with that conversation"), and within each bucket we var victim = Plugin
// pick the oldest LastActivity. This protects active conversations .Config.Tabs.Select((tab, idx) => (Tab: tab, Index: idx))
// and unfinished greetings while still freeing up a slot.
var victim = Plugin.Config.Tabs
.Select((tab, idx) => (Tab: tab, Index: idx))
.Where(t => t.Tab.IsTempTab) .Where(t => t.Tab.IsTempTab)
.OrderByDescending(t => t.Tab.IsGreeted) .OrderByDescending(t => t.Tab.IsGreeted)
.ThenBy(t => t.Tab.LastActivity) .ThenBy(t => t.Tab.LastActivity)
@@ -183,16 +171,12 @@ internal sealed class AutoTellTabsService : IDisposable
return; return;
} }
// v0.6.1 — if the victim is currently popped out, tear down the // Clean up pop-out window if tab is popped out
// matching Popout window first. Otherwise the window stays in
// PopOutWindows + WindowSystem and renders empty / re-spawns on the
// next AddPopOutsToDraw tick. Latent since pop-outs were introduced;
// becomes visible with AutoTellTabsOpenAsPopout where dropping a
// popped tab is now a routine code path.
if (victim.Tab.PopOut) if (victim.Tab.PopOut)
{ {
var popout = _plugin.ChatLogWindow.ActivePopouts var popout = _plugin.ChatLogWindow.ActivePopouts.FirstOrDefault(p =>
.FirstOrDefault(p => p.TabIdentifier == victim.Tab.Identifier); p.TabIdentifier == victim.Tab.Identifier
);
if (popout != null) if (popout != null)
{ {
popout.IsOpen = false; popout.IsOpen = false;
@@ -201,8 +185,7 @@ internal sealed class AutoTellTabsService : IDisposable
Plugin.Config.Tabs.RemoveAt(victim.Index); Plugin.Config.Tabs.RemoveAt(victim.Index);
// Re-anchor the active tab so the user does not silently end up on // Re-anchor active tab to avoid silent switch when tab is dropped
// a different conversation when their tab gets dropped or shifted.
if (victim.Index <= _plugin.LastTab) if (victim.Index <= _plugin.LastTab)
{ {
_plugin.WantedTab = 0; _plugin.WantedTab = 0;
@@ -213,22 +196,12 @@ internal sealed class AutoTellTabsService : IDisposable
{ {
var tab = BuildTempTab(partner.Name, partner.World); var tab = BuildTempTab(partner.Name, partner.World);
// Preload first so the tab opens with chronological history above // Preload history: chronological order with current message already persisted
// the current message — and so a slow DB query never causes a
// visible "empty tab, then history pops in" effect on screen.
// The current message is already persisted in the store by the
// time MessageProcessed fires (see MessageManager.cs: UpsertMessage
// runs before the event), so we have to exclude it explicitly to
// avoid the separator landing below the live tell.
PreloadHistory(tab, partner.Name, partner.World, currentMessage.Id); PreloadHistory(tab, partner.Name, partner.World, currentMessage.Id);
tab.AddMessage(currentMessage, unread: true); tab.AddMessage(currentMessage, unread: true);
// Hellion Chat v0.6.1 — opt-in: open new /tell tabs directly as a // Open as pop-out if configured (set before Tabs.Add for next render-tick)
// pop-out window. Set BEFORE Tabs.Add so the next render-tick's
// AddPopOutsToDraw() sees PopOut=true and spawns the Popout window
// alongside the tab going into the list. No SaveConfig() because
// auto-tell tabs are IsTempTab (session-only, never persisted).
if (Plugin.Config.AutoTellTabsOpenAsPopout) if (Plugin.Config.AutoTellTabsOpenAsPopout)
{ {
tab.PopOut = true; tab.PopOut = true;
@@ -263,9 +236,7 @@ internal sealed class AutoTellTabsService : IDisposable
{ {
return $"{playerName}@{worldRow.Name}"; return $"{playerName}@{worldRow.Name}";
} }
// World sheet lookup miss is rare (only for FFXIV worlds Dalamud has // Fallback if world lookup misses (rare; only for unseen worlds)
// not yet seen). Fall back to the raw RowId so the user still has a
// unique, readable label.
return $"{playerName}@World{worldRowId}"; return $"{playerName}@World{worldRowId}";
} }
@@ -279,14 +250,13 @@ internal sealed class AutoTellTabsService : IDisposable
try try
{ {
// Pull one extra row because the live tell that triggered this // Pull one extra row: current message is already in store and would eat a preload slot
// spawn is already in the store and would otherwise eat one of
// the user's preload-budget slots.
var history = _store.GetTellHistoryWithSender( var history = _store.GetTellHistoryWithSender(
_messageManager.CurrentContentId, _messageManager.CurrentContentId,
senderName, senderName,
senderWorld, senderWorld,
preloadCount + 1); preloadCount + 1
);
var historicMessages = history var historicMessages = history
.Where(m => m.Id != currentMessageId) .Where(m => m.Id != currentMessageId)
@@ -295,36 +265,30 @@ internal sealed class AutoTellTabsService : IDisposable
if (historicMessages.Count == 0) if (historicMessages.Count == 0)
{ {
// No prior tells with this player — leave the tab to start // No prior tells; leave tab empty to avoid orphaned "history loaded" marker
// empty so the user does not see a "history loaded" marker
// sitting alone above the very first message.
return; return;
} }
// The history list is already oldest-first, so a plain AddPrune // History is oldest-first; add in order for chronological display
// loop produces the chronological order the user expects to see
// when the tab opens.
foreach (var message in historicMessages) foreach (var message in historicMessages)
{ {
tab.Messages.AddPrune(message, MessageManager.MessageDisplayLimit); tab.Messages.AddPrune(message, MessageManager.MessageDisplayLimit);
} }
// Visible separator between the loaded history and the live // Separator between history and live tell (sorts after history but before current)
// tell that triggered this spawn. Goes in last so it sorts
// after the historical messages but before the current one.
tab.Messages.AddPrune( tab.Messages.AddPrune(
MakeSystemMarker(HellionStrings.AutoTellTabs_HistorySeparator), MakeSystemMarker(HellionStrings.AutoTellTabs_HistorySeparator),
MessageManager.MessageDisplayLimit); MessageManager.MessageDisplayLimit
);
} }
catch (Exception ex) catch (Exception ex)
{ {
// Non-fatal: the tab still spawns, but the user gets a visible // Non-fatal: tab still spawns with visible error notice instead of silent history loss
// notice instead of silently missing history. The error logs
// once with full stack trace for diagnosis.
Plugin.Log.Error(ex, "[AutoTellTabs] History preload failed"); Plugin.Log.Error(ex, "[AutoTellTabs] History preload failed");
tab.Messages.AddPrune( tab.Messages.AddPrune(
MakeSystemMarker(HellionStrings.AutoTellTabs_HistoryLoadError), MakeSystemMarker(HellionStrings.AutoTellTabs_HistoryLoadError),
MessageManager.MessageDisplayLimit); MessageManager.MessageDisplayLimit
);
} }
} }
@@ -360,9 +324,7 @@ internal sealed class AutoTellTabsService : IDisposable
lock (_tempTabsLock) lock (_tempTabsLock)
{ {
// Frame-race guard (E5): the sidebar might still render a tab // Guard against frame-race: sidebar might render a tab already removed by LRU or logout
// that has already been removed by LRU drop or logout cleanup.
// Silently skip the toggle so we don't mutate stale state.
if (!Plugin.Config.Tabs.Contains(tab)) if (!Plugin.Config.Tabs.Contains(tab))
{ {
return; return;
@@ -376,28 +338,24 @@ internal sealed class AutoTellTabsService : IDisposable
{ {
lock (_tempTabsLock) lock (_tempTabsLock)
{ {
// Snapshot whether the active tab is about to be removed, BEFORE // Snapshot active tab index before mutating list
// we mutate the list — index lookups would lie to us afterwards.
var lastIndex = _plugin.LastTab; var lastIndex = _plugin.LastTab;
var lastIndexValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count; var lastIndexValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count;
var currentWasTempTab = lastIndexValid && Plugin.Config.Tabs[lastIndex].IsTempTab; var currentWasTempTab = lastIndexValid && Plugin.Config.Tabs[lastIndex].IsTempTab;
// v0.6.1 — symmetric to DropOldestTempTab cleanup: tear down any // Clean up pop-out windows before removing temp tabs
// popped-out temp tab windows before removing the tabs themselves, var poppedTempTabIds = Plugin
// otherwise PopOutWindows + WindowSystem keep ghost entries until .Config.Tabs.Where(t => t.IsTempTab && t.PopOut)
// the next plugin reload. Especially relevant once Auto-Pop-Out is
// enabled — every logout would otherwise leak as many ghosts as
// there were active /tell pop-outs.
var poppedTempTabIds = Plugin.Config.Tabs
.Where(t => t.IsTempTab && t.PopOut)
.Select(t => t.Identifier) .Select(t => t.Identifier)
.ToList(); .ToList();
if (poppedTempTabIds.Count > 0) if (poppedTempTabIds.Count > 0)
{ {
var poppedSet = poppedTempTabIds.ToHashSet(); var poppedSet = poppedTempTabIds.ToHashSet();
foreach (var popout in _plugin.ChatLogWindow.ActivePopouts foreach (
.Where(p => poppedSet.Contains(p.TabIdentifier)) var popout in _plugin
.ToList()) .ChatLogWindow.ActivePopouts.Where(p => poppedSet.Contains(p.TabIdentifier))
.ToList()
)
{ {
popout.IsOpen = false; popout.IsOpen = false;
} }
@@ -405,9 +363,7 @@ internal sealed class AutoTellTabsService : IDisposable
Plugin.Config.Tabs.RemoveAll(t => t.IsTempTab); Plugin.Config.Tabs.RemoveAll(t => t.IsTempTab);
// Force a switch to tab 0 if the active tab was a temp tab OR // Force switch to tab 0 if active tab was temp or index is now out of range
// if drops before the active index pushed LastTab out of range.
// Otherwise the user keeps their current persistent tab.
var stillValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count; var stillValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count;
if (currentWasTempTab || !stillValid) if (currentWasTempTab || !stillValid)
{ {
+6 -6
View File
@@ -1,12 +1,12 @@
// HellionChat/Branding/BrandingLinks.cs
namespace HellionChat.Branding; namespace HellionChat.Branding;
// Centralised so a future invite rotation only touches one file. The same // Centralised a future invite/URL rotation only touches this file.
// link is currently hard-coded in repo.json, README.md, SUPPORT.md,
// CONTRIBUTORS.md and HellionChat.yaml — those will be migrated to consume
// this constant in a separate housekeeping sweep, but that's out of scope
// for this Cycle.
internal static class BrandingLinks internal static class BrandingLinks
{ {
public const string HellionForgeDiscordInvite = "https://discord.gg/X9V7Kcv5gR"; public const string HellionForgeDiscordInvite = "https://discord.gg/X9V7Kcv5gR";
public const string HellionForgeGitea = "https://gitea.hellion-forge.cloud/Hellion-Forge";
public const string HellionChatRepo =
"https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat";
public const string HellionForgeWebsite = "https://hellion-forge.cloud";
public const string HellionMediaWebsite = "https://hellion-media.de/de";
} }
+10 -8
View File
@@ -1,6 +1,6 @@
using System.Linq; using System.Linq;
using HellionChat.Resources;
using Dalamud.Plugin; using Dalamud.Plugin;
using HellionChat.Resources;
namespace HellionChat; namespace HellionChat;
@@ -10,17 +10,19 @@ internal static class ChatTwoConflictDetector
public static void ThrowIfChatTwoIsLoaded(IDalamudPluginInterface pluginInterface) public static void ThrowIfChatTwoIsLoaded(IDalamudPluginInterface pluginInterface)
{ {
var conflict = pluginInterface.InstalledPlugins var conflict = pluginInterface.InstalledPlugins.FirstOrDefault(p =>
.FirstOrDefault(p => p.InternalName == UpstreamInternalName && p.IsLoaded
p.InternalName == UpstreamInternalName && );
p.IsLoaded);
if (conflict is null) if (conflict is null)
return; return;
var message = HellionStrings.ChatTwoConflictTitle + "\n\n" + var message =
HellionStrings.ChatTwoConflictBody + "\n\n" + HellionStrings.ChatTwoConflictTitle
HellionStrings.ChatTwoConflictAction; + "\n\n"
+ HellionStrings.ChatTwoConflictBody
+ "\n\n"
+ HellionStrings.ChatTwoConflictAction;
throw new System.InvalidOperationException(message); throw new System.InvalidOperationException(message);
} }
+35 -21
View File
@@ -1,5 +1,5 @@
using HellionChat.Code;
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using HellionChat.Code;
using MessagePack; using MessagePack;
namespace HellionChat; namespace HellionChat;
@@ -25,7 +25,8 @@ public abstract class Chunk
Link = link; Link = link;
} }
internal SeString? GetSeString() => Source switch internal SeString? GetSeString() =>
Source switch
{ {
ChunkSource.None => null, ChunkSource.None => null,
ChunkSource.Sender => Message?.SenderSource, ChunkSource.Sender => Message?.SenderSource,
@@ -33,16 +34,14 @@ public abstract class Chunk
_ => null, _ => null,
}; };
/// <summary> // Returns basic text for hashing (content for TextChunk, icon name for IconChunk)
/// Get some basic text for use in generating hashes.
/// </summary>
internal string StringValue() internal string StringValue()
{ {
return this switch return this switch
{ {
TextChunk text => text.Content, TextChunk text => text.Content,
IconChunk icon => icon.Icon.ToString(), IconChunk icon => icon.Icon.ToString(),
_ => "" _ => "",
}; };
} }
} }
@@ -57,18 +56,29 @@ public enum ChunkSource
[MessagePackObject(AllowPrivate = true)] [MessagePackObject(AllowPrivate = true)]
public class TextChunk : Chunk public class TextChunk : Chunk
{ {
[Key(2)] public ChatType? FallbackColour; [Key(2)]
[Key(3)] public uint? Foreground; public ChatType? FallbackColour;
[Key(4)] public uint? Glow;
[Key(5)] public bool Italic;
[Key(6)] public string Content;
private TextChunk(Chunk chunk, string content) : base(chunk.Source, chunk.Link) [Key(3)]
public uint? Foreground;
[Key(4)]
public uint? Glow;
[Key(5)]
public bool Italic;
[Key(6)]
public string Content;
private TextChunk(Chunk chunk, string content)
: base(chunk.Source, chunk.Link)
{ {
Content = content; Content = content;
} }
internal TextChunk(ChunkSource source, Payload? link, string content) : base(source, link) internal TextChunk(ChunkSource source, Payload? link, string content)
: base(source, link)
{ {
// This has been null in the past, and it broke rendering code. // This has been null in the past, and it broke rendering code.
// ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract // ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract
@@ -76,7 +86,16 @@ public class TextChunk : Chunk
} }
// ReSharper disable once UnusedMember.Global // Used by MessagePack // ReSharper disable once UnusedMember.Global // Used by MessagePack
public TextChunk(ChunkSource source, Payload? link, ChatType? fallbackColour, uint? foreground, uint? glow, bool italic, string content) : base(source, link) public TextChunk(
ChunkSource source,
Payload? link,
ChatType? fallbackColour,
uint? foreground,
uint? glow,
bool italic,
string content
)
: base(source, link)
{ {
FallbackColour = fallbackColour; FallbackColour = fallbackColour;
Foreground = foreground; Foreground = foreground;
@@ -87,9 +106,6 @@ public class TextChunk : Chunk
Content = content ?? ""; Content = content ?? "";
} }
/// <summary>
/// Creates a new TextChunk with identical styling to this one.
/// </summary>
public TextChunk NewWithStyle(ChunkSource source, Payload? link, string content) public TextChunk NewWithStyle(ChunkSource source, Payload? link, string content)
{ {
return new TextChunk(source, link, content) return new TextChunk(source, link, content)
@@ -101,9 +117,6 @@ public class TextChunk : Chunk
}; };
} }
/// <summary>
/// Creates a new TextChunk with identical styling to this one.
/// </summary>
public TextChunk NewWithStyle(Chunk chunk, string content) public TextChunk NewWithStyle(Chunk chunk, string content)
{ {
return new TextChunk(chunk, content) return new TextChunk(chunk, content)
@@ -122,7 +135,8 @@ public class IconChunk : Chunk
[Key(2)] [Key(2)]
public BitmapFontIcon Icon { get; set; } public BitmapFontIcon Icon { get; set; }
public IconChunk(ChunkSource source, Payload? link, BitmapFontIcon icon) : base(source, link) public IconChunk(ChunkSource source, Payload? link, BitmapFontIcon icon)
: base(source, link)
{ {
Icon = icon; Icon = icon;
} }
+11 -11
View File
@@ -7,36 +7,36 @@ public enum ChatSource : ushort
{ {
None = 0, None = 0,
/// <summary>The player currently controlled by the local client.</summary> // The player controlled by this client
LocalPlayer = 1 << XivChatRelationKind.LocalPlayer, LocalPlayer = 1 << XivChatRelationKind.LocalPlayer,
/// <summary>A player in the same 4-man or 8-man party as the local player.</summary> // Member of the local party
PartyMember = 1 << XivChatRelationKind.PartyMember, PartyMember = 1 << XivChatRelationKind.PartyMember,
/// <summary>A player in the same alliance raid.</summary> // Member of the alliance
AllianceMember = 1 << XivChatRelationKind.AllianceMember, AllianceMember = 1 << XivChatRelationKind.AllianceMember,
/// <summary>A player not in the local player's party or alliance.</summary> // Other player
OtherPlayer = 1 << XivChatRelationKind.OtherPlayer, OtherPlayer = 1 << XivChatRelationKind.OtherPlayer,
/// <summary>An enemy entity that is currently in combat with the player or party.</summary> // Enemy in combat
EngagedEnemy = 1 << XivChatRelationKind.EngagedEnemy, EngagedEnemy = 1 << XivChatRelationKind.EngagedEnemy,
/// <summary>An enemy entity that is not yet in combat or claimed.</summary> // Enemy out of combat
UnengagedEnemy = 1 << XivChatRelationKind.UnengagedEnemy, UnengagedEnemy = 1 << XivChatRelationKind.UnengagedEnemy,
/// <summary>An NPC that is friendly or neutral to the player (e.g., EventNPCs).</summary> // Friendly NPC
FriendlyNpc = 1 << XivChatRelationKind.FriendlyNpc, FriendlyNpc = 1 << XivChatRelationKind.FriendlyNpc,
/// <summary>A pet (Summoner/Scholar) or companion (Chocobo) belonging to the local player.</summary> // Own pet or companion
PetOrCompanion = 1 << XivChatRelationKind.PetOrCompanion, PetOrCompanion = 1 << XivChatRelationKind.PetOrCompanion,
/// <summary>A pet or companion belonging to a member of the local player's party.</summary> // Pet or companion of party members
PetOrCompanionParty = 1 << XivChatRelationKind.PetOrCompanionParty, PetOrCompanionParty = 1 << XivChatRelationKind.PetOrCompanionParty,
/// <summary>A pet or companion belonging to a member of the alliance.</summary> // Pet or companion of alliance members
PetOrCompanionAlliance = 1 << XivChatRelationKind.PetOrCompanionAlliance, PetOrCompanionAlliance = 1 << XivChatRelationKind.PetOrCompanionAlliance,
/// <summary>A pet or companion belonging to a player not in the party or alliance.</summary> // Pet or companion of other players
PetOrCompanionOther = 1 << XivChatRelationKind.PetOrCompanionOther, PetOrCompanionOther = 1 << XivChatRelationKind.PetOrCompanionOther,
} }
+13 -5
View File
@@ -5,12 +5,20 @@ namespace HellionChat.Code;
internal static class ChatSourceExt internal static class ChatSourceExt
{ {
internal const ChatSource All = internal const ChatSource All =
ChatSource.LocalPlayer | ChatSource.PartyMember | ChatSource.AllianceMember | ChatSource.LocalPlayer
ChatSource.OtherPlayer | ChatSource.EngagedEnemy | ChatSource.UnengagedEnemy | | ChatSource.PartyMember
ChatSource.FriendlyNpc | ChatSource.PetOrCompanion | ChatSource.PetOrCompanionParty | | ChatSource.AllianceMember
ChatSource.PetOrCompanionAlliance | ChatSource.PetOrCompanionOther; | ChatSource.OtherPlayer
| ChatSource.EngagedEnemy
| ChatSource.UnengagedEnemy
| ChatSource.FriendlyNpc
| ChatSource.PetOrCompanion
| ChatSource.PetOrCompanionParty
| ChatSource.PetOrCompanionAlliance
| ChatSource.PetOrCompanionOther;
internal static string Name(this ChatSource source) => source switch internal static string Name(this ChatSource source) =>
source switch
{ {
ChatSource.LocalPlayer => Language.ChatSource_Self, ChatSource.LocalPlayer => Language.ChatSource_Self,
ChatSource.PartyMember => Language.ChatSource_PartyMember, ChatSource.PartyMember => Language.ChatSource_PartyMember,
+34 -21
View File
@@ -1,6 +1,6 @@
using Dalamud.Game.Config;
using HellionChat.Resources; using HellionChat.Resources;
using HellionChat.Util; using HellionChat.Util;
using Dalamud.Game.Config;
namespace HellionChat.Code; namespace HellionChat.Code;
@@ -8,9 +8,12 @@ internal static class ChatTypeExt
{ {
internal static IEnumerable<(string, ChatType[])> SortOrder => internal static IEnumerable<(string, ChatType[])> SortOrder =>
[ [
(Language.Options_Tabs_ChannelTypes_Special, [ChatType.Debug, ChatType.Urgent, ChatType.Notice]), (
Language.Options_Tabs_ChannelTypes_Special,
(Language.Options_Tabs_ChannelTypes_Chat, [ChatType.Debug, ChatType.Urgent, ChatType.Notice]
),
(
Language.Options_Tabs_ChannelTypes_Chat,
[ [
ChatType.Say, ChatType.Say,
ChatType.Yell, ChatType.Yell,
@@ -40,10 +43,11 @@ internal static class ChatTypeExt
ChatType.Linkshell8, ChatType.Linkshell8,
ChatType.NoviceNetwork, ChatType.NoviceNetwork,
ChatType.StandardEmote, ChatType.StandardEmote,
ChatType.CustomEmote ChatType.CustomEmote,
]), ]
),
(Language.Options_Tabs_ChannelTypes_Battle, (
Language.Options_Tabs_ChannelTypes_Battle,
[ [
ChatType.Damage, ChatType.Damage,
ChatType.Miss, ChatType.Miss,
@@ -53,10 +57,11 @@ internal static class ChatTypeExt
ChatType.GainBuff, ChatType.GainBuff,
ChatType.LoseBuff, ChatType.LoseBuff,
ChatType.GainDebuff, ChatType.GainDebuff,
ChatType.LoseDebuff ChatType.LoseDebuff,
]), ]
),
(Language.Options_Tabs_ChannelTypes_Announcements, (
Language.Options_Tabs_ChannelTypes_Announcements,
[ [
ChatType.System, ChatType.System,
ChatType.BattleSystem, ChatType.BattleSystem,
@@ -82,8 +87,9 @@ internal static class ChatTypeExt
ChatType.Orchestrion, ChatType.Orchestrion,
ChatType.MessageBook, ChatType.MessageBook,
ChatType.Alarm, ChatType.Alarm,
ChatType.GlamourNotifications ChatType.GlamourNotifications,
]) ]
),
// Note: ExtraChat linkshells are handled separately in the tab settings // Note: ExtraChat linkshells are handled separately in the tab settings
// UI. // UI.
]; ];
@@ -143,7 +149,8 @@ internal static class ChatTypeExt
ChatType.FreeCompanyAnnouncement => Language.ChatType_FreeCompanyAnnouncement, ChatType.FreeCompanyAnnouncement => Language.ChatType_FreeCompanyAnnouncement,
ChatType.FreeCompanyLoginLogout => Language.ChatType_FreeCompanyLoginLogout, ChatType.FreeCompanyLoginLogout => Language.ChatType_FreeCompanyLoginLogout,
ChatType.RetainerSale => Language.ChatType_RetainerSale, ChatType.RetainerSale => Language.ChatType_RetainerSale,
ChatType.PeriodicRecruitmentNotification => Language.ChatType_PeriodicRecruitmentNotification, ChatType.PeriodicRecruitmentNotification =>
Language.ChatType_PeriodicRecruitmentNotification,
ChatType.Sign => Language.ChatType_Sign, ChatType.Sign => Language.ChatType_Sign,
ChatType.RandomNumber => Language.ChatType_RandomNumber, ChatType.RandomNumber => Language.ChatType_RandomNumber,
ChatType.NoviceNetworkSystem => Language.ChatType_NoviceNetworkSystem, ChatType.NoviceNetworkSystem => Language.ChatType_NoviceNetworkSystem,
@@ -306,7 +313,8 @@ internal static class ChatTypeExt
} }
} }
internal static InputChannel? ToInputChannel(this ChatType type) => type switch internal static InputChannel? ToInputChannel(this ChatType type) =>
type switch
{ {
ChatType.TellOutgoing => InputChannel.Tell, ChatType.TellOutgoing => InputChannel.Tell,
ChatType.Say => InputChannel.Say, ChatType.Say => InputChannel.Say,
@@ -336,7 +344,8 @@ internal static class ChatTypeExt
_ => null, _ => null,
}; };
internal static bool IsGm(this ChatType type) => type switch internal static bool IsGm(this ChatType type) =>
type switch
{ {
ChatType.GmTell => true, ChatType.GmTell => true,
ChatType.GmSay => true, ChatType.GmSay => true,
@@ -356,7 +365,8 @@ internal static class ChatTypeExt
_ => false, _ => false,
}; };
internal static bool IsExtraChatLinkshell(this ChatType type) => type switch internal static bool IsExtraChatLinkshell(this ChatType type) =>
type switch
{ {
ChatType.ExtraChatLinkshell1 => true, ChatType.ExtraChatLinkshell1 => true,
ChatType.ExtraChatLinkshell2 => true, ChatType.ExtraChatLinkshell2 => true,
@@ -369,7 +379,8 @@ internal static class ChatTypeExt
_ => false, _ => false,
}; };
public static UiConfigOption ToConfigEntry(this ChatType type) => type switch public static UiConfigOption ToConfigEntry(this ChatType type) =>
type switch
{ {
ChatType.Say => UiConfigOption.ColorSay, ChatType.Say => UiConfigOption.ColorSay,
ChatType.Shout => UiConfigOption.ColorShout, ChatType.Shout => UiConfigOption.ColorShout,
@@ -398,7 +409,8 @@ internal static class ChatTypeExt
_ => UiConfigOption.ColorSay, _ => UiConfigOption.ColorSay,
}; };
internal static bool HasSource(this ChatType type) => type switch internal static bool HasSource(this ChatType type) =>
type switch
{ {
// Battle // Battle
ChatType.Damage => true, ChatType.Damage => true,
@@ -425,7 +437,8 @@ internal static class ChatTypeExt
_ => false, _ => false,
}; };
internal static ChatType Parent(this ChatType type) => type switch internal static ChatType Parent(this ChatType type) =>
type switch
{ {
ChatType.Say => ChatType.Say, ChatType.Say => ChatType.Say,
ChatType.GmSay => ChatType.Say, ChatType.GmSay => ChatType.Say,
+16 -8
View File
@@ -4,7 +4,8 @@ namespace HellionChat.Code;
internal static class InputChannelExt internal static class InputChannelExt
{ {
internal static ChatType ToChatType(this InputChannel input) => input switch internal static ChatType ToChatType(this InputChannel input) =>
input switch
{ {
InputChannel.Tell => ChatType.TellOutgoing, InputChannel.Tell => ChatType.TellOutgoing,
InputChannel.Say => ChatType.Say, InputChannel.Say => ChatType.Say,
@@ -43,7 +44,8 @@ internal static class InputChannelExt
_ => throw new ArgumentOutOfRangeException(nameof(input), input, null), _ => throw new ArgumentOutOfRangeException(nameof(input), input, null),
}; };
public static uint LinkshellIndex(this InputChannel channel) => channel switch public static uint LinkshellIndex(this InputChannel channel) =>
channel switch
{ {
InputChannel.Linkshell1 => 0, InputChannel.Linkshell1 => 0,
InputChannel.Linkshell2 => 1, InputChannel.Linkshell2 => 1,
@@ -72,7 +74,8 @@ internal static class InputChannelExt
_ => uint.MaxValue, _ => uint.MaxValue,
}; };
public static string Prefix(this InputChannel channel) => channel switch public static string Prefix(this InputChannel channel) =>
channel switch
{ {
InputChannel.Tell => "/t", InputChannel.Tell => "/t",
InputChannel.Say => "/s", InputChannel.Say => "/s",
@@ -145,10 +148,12 @@ internal static class InputChannelExt
if (ids.Length == 0) if (ids.Length == 0)
return null; return null;
return ids.Where(id => Sheets.TextCommandSheet.HasRow(id)).Select(id => Sheets.TextCommandSheet.GetRow(id)); return ids.Where(id => Sheets.TextCommandSheet.HasRow(id))
.Select(id => Sheets.TextCommandSheet.GetRow(id));
} }
internal static bool IsLinkshell(this InputChannel channel) => channel switch internal static bool IsLinkshell(this InputChannel channel) =>
channel switch
{ {
InputChannel.Linkshell1 => true, InputChannel.Linkshell1 => true,
InputChannel.Linkshell2 => true, InputChannel.Linkshell2 => true,
@@ -161,7 +166,8 @@ internal static class InputChannelExt
_ => false, _ => false,
}; };
internal static bool IsCrossLinkshell(this InputChannel channel) => channel switch internal static bool IsCrossLinkshell(this InputChannel channel) =>
channel switch
{ {
InputChannel.CrossLinkshell1 => true, InputChannel.CrossLinkshell1 => true,
InputChannel.CrossLinkshell2 => true, InputChannel.CrossLinkshell2 => true,
@@ -174,7 +180,8 @@ internal static class InputChannelExt
_ => false, _ => false,
}; };
internal static bool IsExtraChatLinkshell(this InputChannel channel) => channel switch internal static bool IsExtraChatLinkshell(this InputChannel channel) =>
channel switch
{ {
InputChannel.ExtraChatLinkshell1 => true, InputChannel.ExtraChatLinkshell1 => true,
InputChannel.ExtraChatLinkshell2 => true, InputChannel.ExtraChatLinkshell2 => true,
@@ -187,7 +194,8 @@ internal static class InputChannelExt
_ => false, _ => false,
}; };
internal static bool IsValid(this InputChannel channel) => channel switch internal static bool IsValid(this InputChannel channel) =>
channel switch
{ {
InputChannel.Invalid => false, InputChannel.Invalid => false,
_ => true, _ => true,
+10 -3
View File
@@ -16,15 +16,22 @@ internal sealed class Commands : IDisposable
{ {
foreach (var wrapper in Registered.Values) foreach (var wrapper in Registered.Values)
{ {
Plugin.CommandManager.AddHandler(wrapper.Name, new CommandInfo(Invoke) Plugin.CommandManager.AddHandler(
wrapper.Name,
new CommandInfo(Invoke)
{ {
HelpMessage = wrapper.Description ?? string.Empty, HelpMessage = wrapper.Description ?? string.Empty,
ShowInHelp = wrapper.ShowInHelp, ShowInHelp = wrapper.ShowInHelp,
}); }
);
} }
} }
internal CommandWrapper Register(string name, string? description = null, bool? showInHelp = null) internal CommandWrapper Register(
string name,
string? description = null,
bool? showInHelp = null
)
{ {
if (Registered.TryGetValue(name, out var wrapper)) if (Registered.TryGetValue(name, out var wrapper))
{ {
+131 -181
View File
@@ -1,14 +1,14 @@
using System.Collections; using System.Collections;
using HellionChat.Code;
using HellionChat.GameFunctions.Types;
using HellionChat.Resources;
using HellionChat.Util;
using Dalamud; using Dalamud;
using Dalamud.Bindings.ImGui;
using Dalamud.Configuration; using Dalamud.Configuration;
using Dalamud.Game.ClientState.Keys; using Dalamud.Game.ClientState.Keys;
using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Interface.FontIdentifier; using Dalamud.Interface.FontIdentifier;
using Dalamud.Bindings.ImGui; using HellionChat.Code;
using HellionChat.GameFunctions.Types;
using HellionChat.Resources;
using HellionChat.Util;
namespace HellionChat; namespace HellionChat;
@@ -38,31 +38,26 @@ public class Configuration : IPluginConfiguration
public int Version { get; set; } = LatestVersion; public int Version { get; set; } = LatestVersion;
// v1.1.0 — Theme-Engine. Slug-basiert; ThemeRegistry liefert das Objekt. // Slug-based; ThemeRegistry resolves the object at runtime.
public string Theme = "hellion-arctic"; public string Theme = "hellion-arctic";
// v1.1.0 — Globale Window-Opacity, theme-übergreifend. Migration aus // Global window opacity, applied across all themes.
// HellionThemeWindowOpacity beim Bump v13 → v14.
public float WindowOpacity = 0.85f; public float WindowOpacity = 0.85f;
// Reserved for future UI toggles; pre-declared to avoid a migration later.
// v1.1.0 — Felder für künftige UI-Toggles (v1.2.0 / v1.3.0). Werden
// vorab angelegt, damit später keine Migration nötig ist.
public bool ReduceMotion; public bool ReduceMotion;
// v1.2.1 — Default geflippt von false → true. Card-Rows-Layout aus
// v1.2.0 wurde als zu dicht empfunden; Single-Line `[HH:mm] Sender: // v1.2.1: default flipped false → true. Compact single-line layout is
// Text` ist besser lesbar und platzsparender. Bestand-User mit aktiv // more readable than the card-rows layout introduced in v1.2.0.
// false werden durch die v15→v16-Migration auf den neuen Default
// gehoben (Heuristik: wer in v1.2.0 false hatte, hatte den damals
// neu eingeführten Default — kaum jemand hat aktiv abgeschaltet).
public bool UseCompactDensity = true; public bool UseCompactDensity = true;
// Hellion Chat — Privacy filter (DSGVO Art. 25 Privacy by Default). // Privacy by Default master switch. Set false to restore upstream behaviour.
// Master-switch defaults to true; set false to restore upstream behavior.
public bool PrivacyFilterEnabled = true; public bool PrivacyFilterEnabled = true;
// Empty set means the migration has not run yet — see Plugin.cs v6→v7. // Empty set means the migration has not run yet — see Plugin.cs v6→v7.
public HashSet<ChatType> PrivacyPersistChannels = []; public HashSet<ChatType> PrivacyPersistChannels = [];
// Failsafe for ChatTypes added by future FFXIV patches we don't know about.
// Failsafe for ChatTypes added by future FFXIV patches.
public bool PrivacyPersistUnknownChannels; public bool PrivacyPersistUnknownChannels;
public bool IsAllowedForStorage(ChatType type) public bool IsAllowedForStorage(ChatType type)
@@ -74,75 +69,23 @@ public class Configuration : IPluginConfiguration
return PrivacyPersistUnknownChannels; return PrivacyPersistUnknownChannels;
} }
// Hellion Chat — Message retention (GDPR data minimization, time axis). // Retention master switch defaults to false — plugin will not delete
// Master switch defaults to false; the plugin will not delete history // history until the user explicitly opts in.
// until the user explicitly opts in.
public bool RetentionEnabled; public bool RetentionEnabled;
public int RetentionDefaultDays = 30; public int RetentionDefaultDays = 30;
public Dictionary<ChatType, int> RetentionPerChannelDays = []; public Dictionary<ChatType, int> RetentionPerChannelDays = [];
public DateTimeOffset RetentionLastRunAt = DateTimeOffset.MinValue; public DateTimeOffset RetentionLastRunAt = DateTimeOffset.MinValue;
// Hellion Chat first-run wizard — opens once on a fresh install. Existing
// ChatTwo users skip it because the v6→v7 migration sets the flag.
public bool FirstRunCompleted; public bool FirstRunCompleted;
// Use the bundled Exo 2 font (OFL-1.1) for the regular plugin font
// instead of whatever GlobalFontV2.FontId points at. Default ON so a
// fresh install gets the Hellion typography out-of-the-box; flip OFF
// to fall back to the user's chosen system or Dalamud font.
public bool UseHellionFont = true; public bool UseHellionFont = true;
// Cycle 1 of the plugin-integration roadmap. When Honorific is installed
// and reports a custom title, render it in the chat header above the
// message log. Auto-hides regardless when Honorific is missing or the
// active title is original/empty, so leaving this on is safe even for
// users who don't run Honorific.
public bool ShowHonorificTitleInHeader = true; public bool ShowHonorificTitleInHeader = true;
// Hellion Chat — Auto-Tell-Tabs. When enabled, an incoming or outgoing
// /tell spawns a session-only tab dedicated to that conversation
// partner. See spec: Hellion Chat Auto-Tell-Tabs Spec (Obsidian).
public bool EnableAutoTellTabs = true; public bool EnableAutoTellTabs = true;
// Hard cap on simultaneously open auto tell tabs. Range enforced by the
// settings slider (150). LRU drop favors greeted tabs first.
public int AutoTellTabsLimit = 15; public int AutoTellTabsLimit = 15;
// When true the sidebar shows only a thin separator before the temp
// tabs; when false a section header "Active Tells (n)" is rendered.
public bool AutoTellTabsCompactDisplay; public bool AutoTellTabsCompactDisplay;
// Number of prior tells to preload from the message store when an
// auto tell tab is spawned. Range 0100; 0 disables preload.
public int AutoTellTabsHistoryPreload = 20; public int AutoTellTabsHistoryPreload = 20;
// Show the greeter "marked-as-greeted" toggle button next to each
// temp tab and dim the tab name when set. Off by default because the
// workflow is specific to club-greeter use cases — most users just
// want the auto tabs themselves without the extra UI affordance.
public bool AutoTellTabsShowGreetedToggle; public bool AutoTellTabsShowGreetedToggle;
// Hellion Chat — One-Time-Hint-Banner that introduces the v0.6.0 pop-out
// input feature. Set to true once the user dismisses the banner from a
// pop-out window; never reset after that.
public bool SeenPopOutInputHint; public bool SeenPopOutInputHint;
// Hellion Chat — v0.6.0 master switch for the pop-out input bar.
// Global on purpose: per-tab makes no sense for Auto-Tell-Tabs which
// are session-only and would force the user to re-enable it for every
// new conversation. Default flipped to ON in v0.6.1 (was OFF in v0.6.0)
// because tester feedback called the manual toggle "umständlich, wirkt
// unfertig". v11 → v12 migration applies the same flip to existing users.
public bool PopOutInputEnabled = true; public bool PopOutInputEnabled = true;
// Hellion Chat — v0.6.1 One-Time-Hint-Banner that introduces the
// chat-header pop-out toolbar button and reminds about the pop-out
// input default flip. Set to true once the user dismisses the banner
// from the main chat window; never reset after that.
public bool SeenPopOutHeaderHint; public bool SeenPopOutHeaderHint;
// Hellion Chat — v0.6.1 opt-in: when true, AutoTellTabsService.SpawnTempTab
// sets tab.PopOut = true on every new auto-tell tab so the conversation
// pops out as its own window directly. Closing the pop-out returns the
// tab to the sidebar via the standard Popout.OnClose() flow. Default OFF
// because the existing sidebar workflow is what most users (especially
// club greeters tracking many parallel tells) expect by default.
public bool AutoTellTabsOpenAsPopout; public bool AutoTellTabsOpenAsPopout;
public int GetRetentionDays(ChatType type) public int GetRetentionDays(ChatType type)
@@ -160,10 +103,8 @@ public class Configuration : IPluginConfiguration
public bool HideWhenUiHidden = true; public bool HideWhenUiHidden = true;
public bool HideInLoadingScreens; public bool HideInLoadingScreens;
public bool HideInBattle; public bool HideInBattle;
// v1.2.1 — Default geflippt false → true. Hellion-UI im NG+-Menü
// versteckt zu halten ist konsistent mit den anderen Hide-Defaults // v1.2.1: default flipped false → true for consistency with other hide defaults.
// (Cutscenes, Logged-out, UI-Hidden) — UI-out-of-the-way bei Story-
// Sequenzen.
public bool HideInNewGamePlusMenu = true; public bool HideInNewGamePlusMenu = true;
public bool HideWhenInactive; public bool HideWhenInactive;
public int InactivityHideTimeout = 10; public int InactivityHideTimeout = 10;
@@ -179,16 +120,8 @@ public class Configuration : IPluginConfiguration
public bool NativeItemTooltips = true; public bool NativeItemTooltips = true;
public bool PrettierTimestamps = true; public bool PrettierTimestamps = true;
public bool MoreCompactPretty; public bool MoreCompactPretty;
// v1.2.1 — Default geflippt false → true. Wiederholte Zeitstempel
// innerhalb derselben Minute lesen sich als Rauschen; ein einziger
// Timestamp pro Minute reicht aus um die Konversation zu verorten.
public bool HideSameTimestamps = true; public bool HideSameTimestamps = true;
public bool ShowNoviceNetwork; public bool ShowNoviceNetwork;
// Hellion Chat — vertical sidebar tab layout reads better than the
// horizontal tab strip in the company of Auto-Tell-Tabs (a club
// greeter typically tracks 515 simultaneous conversations). Bestand
// users keep their saved value untouched — only fresh installs pick
// up the new default.
public bool SidebarTabView = true; public bool SidebarTabView = true;
public bool PrintChangelog = true; public bool PrintChangelog = true;
public bool OnlyPreviewIf; public bool OnlyPreviewIf;
@@ -209,20 +142,10 @@ public class Configuration : IPluginConfiguration
public bool CollapseKeepUniqueLinks; public bool CollapseKeepUniqueLinks;
public bool PlaySounds = true; public bool PlaySounds = true;
public bool KeepInputFocus = true; public bool KeepInputFocus = true;
// v1.2.1 — Default gesenkt 5000 → 2500. 5000 ist auf Mid-Range-
// Hardware bei langen Sessions spürbar langsamer (Card-Layout
// re-Layout pro Frame), 2500 deckt eine typische Stunde Chat ab
// und bleibt smooth. User die mehr brauchen können bis 10000 hoch.
public int MaxLinesToRender = 2_500; // 1-10000 public int MaxLinesToRender = 2_500; // 1-10000
// Default ON to match a German / European 24h locale. The
// ChatLogWindow.cs format-flip in v0.5.1 honours this strictly via
// CultureInfo.InvariantCulture so the result is consistent across
// host locales.
public bool Use24HourClock = true; public bool Use24HourClock = true;
public bool ShowEmotes = true; public bool ShowEmotes = true;
public HashSet<string> BlockedEmotes = []; public HashSet<string> BlockedEmotes = [];
public bool FontsEnabled = true; public bool FontsEnabled = true;
public ExtraGlyphRanges ExtraGlyphRanges = 0; public ExtraGlyphRanges ExtraGlyphRanges = 0;
public float FontSizeV2 = 12.75f; public float FontSizeV2 = 12.75f;
@@ -246,18 +169,15 @@ public class Configuration : IPluginConfiguration
}; };
public float TooltipOffset; public float TooltipOffset;
// v1.2.1 — Default-Chat-Farben sind das Hellion-Brand-Preset. Der
// First-Run-Wizard bietet keine Theme-/Preset-Wahl an, daher kriegen
// neue User die Hellion-Brand-Farben out-of-the-box (Cyan-Familie für
// Standard/Tell, Ember/Warning für laute Channels). Bestand-User mit
// leerem ChatColours-Dict werden durch die v15→v16-Migration auf das
// Preset gehoben; User die bereits Custom-Farben haben, bleiben.
public Dictionary<ChatType, uint> ChatColours = BuildDefaultChatColours(); public Dictionary<ChatType, uint> ChatColours = BuildDefaultChatColours();
private static Dictionary<ChatType, uint> BuildDefaultChatColours() private static Dictionary<ChatType, uint> BuildDefaultChatColours()
{ {
var defaults = new Dictionary<ChatType, uint>(); var defaults = new Dictionary<ChatType, uint>();
foreach (var (channel, colour) in HellionChat.Resources.ChatColourPresets.All["Hellion"].Colours) foreach (
var (channel, colour) in HellionChat.Resources.ChatColourPresets.All["Hellion"].Colours
)
defaults[channel] = colour; defaults[channel] = colour;
return defaults; return defaults;
} }
@@ -284,7 +204,10 @@ public class Configuration : IPluginConfiguration
HideWhenInactive = other.HideWhenInactive; HideWhenInactive = other.HideWhenInactive;
InactivityHideTimeout = other.InactivityHideTimeout; InactivityHideTimeout = other.InactivityHideTimeout;
InactivityHideActiveDuringBattle = other.InactivityHideActiveDuringBattle; InactivityHideActiveDuringBattle = other.InactivityHideActiveDuringBattle;
InactivityHideChannelsV2 = other.InactivityHideChannelsV2.ToDictionary(pair => pair.Key, pair => pair.Value); InactivityHideChannelsV2 = other.InactivityHideChannelsV2.ToDictionary(
pair => pair.Key,
pair => pair.Value
);
InactivityHideExtraChatAll = other.InactivityHideExtraChatAll; InactivityHideExtraChatAll = other.InactivityHideExtraChatAll;
InactivityHideExtraChatChannels = other.InactivityHideExtraChatChannels.ToHashSet(); InactivityHideExtraChatChannels = other.InactivityHideExtraChatChannels.ToHashSet();
ShowHideButton = other.ShowHideButton; ShowHideButton = other.ShowHideButton;
@@ -316,9 +239,7 @@ public class Configuration : IPluginConfiguration
MaxLinesToRender = other.MaxLinesToRender; MaxLinesToRender = other.MaxLinesToRender;
Use24HourClock = other.Use24HourClock; Use24HourClock = other.Use24HourClock;
ShowEmotes = other.ShowEmotes; ShowEmotes = other.ShowEmotes;
// Deep-copy the set so the live and mutable Configuration instances don't share state // Deep-copy so settings window edits don't leak into live config before Save.
// — a HashSet reference assignment would cause edits in the settings window to leak
// into the live config before the user clicks Save.
BlockedEmotes = new HashSet<string>(other.BlockedEmotes); BlockedEmotes = new HashSet<string>(other.BlockedEmotes);
FontsEnabled = other.FontsEnabled; FontsEnabled = other.FontsEnabled;
ItalicEnabled = other.ItalicEnabled; ItalicEnabled = other.ItalicEnabled;
@@ -332,28 +253,18 @@ public class Configuration : IPluginConfiguration
ChatColours = other.ChatColours.ToDictionary(entry => entry.Key, entry => entry.Value); ChatColours = other.ChatColours.ToDictionary(entry => entry.Key, entry => entry.Value);
ColorSelectedInputChannelButton = other.ColorSelectedInputChannelButton; ColorSelectedInputChannelButton = other.ColorSelectedInputChannelButton;
// Hellion Chat — Auto-Tell-Tabs are session-only and therefore // Keep live temp tabs alive across UpdateFrom — a settings save must
// never present in a disk-loaded copy. Keep the live temp tabs of // not destroy open tell conversations. For persistent tabs, capture
// *this* configuration alive across an UpdateFrom so a settings // the live MessageList and LastSendUnread by Identifier before the
// save (or sidebar-mode toggle) does not silently destroy the // replace and restore them onto the freshly cloned tabs; new tabs
// user's open tell conversations. // get an empty MessageList, deleted tabs lose their history (intended).
//
// For persistent tabs we go through Tab.Clone() which intentionally
// does NOT copy the NonSerialized Messages list (avoids shared
// mutable state on disk-load). On a settings save that means the
// chat history for every persistent tab would be wiped — bug
// reported by Flo 2026-05-05. We work around it by capturing the
// live MessageList (and LastSendUnread counter) by Identifier
// before the replace, then restoring it onto the freshly cloned
// tabs whose Identifier survives Tab.Clone(). New tabs added in
// settings get a fresh empty MessageList; deleted tabs lose their
// history (intended).
var liveTempTabs = Tabs.Where(t => t.IsTempTab).ToList(); var liveTempTabs = Tabs.Where(t => t.IsTempTab).ToList();
var livePersistentSession = Tabs var livePersistentSession = Tabs.Where(t => !t.IsTempTab)
.Where(t => !t.IsTempTab)
.ToDictionary(t => t.Identifier, t => (t.Messages, t.LastSendUnread)); .ToDictionary(t => t.Identifier, t => (t.Messages, t.LastSendUnread));
Tabs = other.Tabs.Where(t => !t.IsTempTab).Select(t => Tabs = other
.Tabs.Where(t => !t.IsTempTab)
.Select(t =>
{ {
var clone = t.Clone(); var clone = t.Clone();
if (livePersistentSession.TryGetValue(clone.Identifier, out var live)) if (livePersistentSession.TryGetValue(clone.Identifier, out var live))
@@ -362,7 +273,8 @@ public class Configuration : IPluginConfiguration
clone.LastSendUnread = live.LastSendUnread; clone.LastSendUnread = live.LastSendUnread;
} }
return clone; return clone;
}).ToList(); })
.ToList();
Tabs.AddRange(liveTempTabs); Tabs.AddRange(liveTempTabs);
ChatTabForward = other.ChatTabForward; ChatTabForward = other.ChatTabForward;
@@ -374,7 +286,10 @@ public class Configuration : IPluginConfiguration
RetentionEnabled = other.RetentionEnabled; RetentionEnabled = other.RetentionEnabled;
RetentionDefaultDays = other.RetentionDefaultDays; RetentionDefaultDays = other.RetentionDefaultDays;
RetentionPerChannelDays = other.RetentionPerChannelDays.ToDictionary(p => p.Key, p => p.Value); RetentionPerChannelDays = other.RetentionPerChannelDays.ToDictionary(
p => p.Key,
p => p.Value
);
RetentionLastRunAt = other.RetentionLastRunAt; RetentionLastRunAt = other.RetentionLastRunAt;
FirstRunCompleted = other.FirstRunCompleted; FirstRunCompleted = other.FirstRunCompleted;
@@ -410,7 +325,8 @@ public enum UnreadMode
public static class UnreadModeExt public static class UnreadModeExt
{ {
internal static string Name(this UnreadMode mode) => mode switch internal static string Name(this UnreadMode mode) =>
mode switch
{ {
UnreadMode.All => Language.UnreadMode_All, UnreadMode.All => Language.UnreadMode_All,
UnreadMode.Unseen => Language.UnreadMode_Unseen, UnreadMode.Unseen => Language.UnreadMode_Unseen,
@@ -418,7 +334,8 @@ public static class UnreadModeExt
_ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
}; };
internal static string? Tooltip(this UnreadMode mode) => mode switch internal static string? Tooltip(this UnreadMode mode) =>
mode switch
{ {
UnreadMode.All => Language.UnreadMode_All_Tooltip, UnreadMode.All => Language.UnreadMode_All_Tooltip,
UnreadMode.Unseen => Language.UnreadMode_Unseen_Tooltip, UnreadMode.Unseen => Language.UnreadMode_Unseen_Tooltip,
@@ -432,9 +349,7 @@ public class Tab
{ {
public string Name = Language.Tab_DefaultName; public string Name = Language.Tab_DefaultName;
// v1.2.0 — optionaler FontAwesome-Glyph-Name. Null bedeutet: // Optional FontAwesome glyph name; null falls back to TabIconMapping default.
// Default-Mapping aus TabIconMapping greift (basiert auf Tab-Name).
// User können hier per Settings → Tabs einen eigenen Glyph setzen.
public string? Icon = null; public string? Icon = null;
[Obsolete("Removed in favor of SelectedChannels")] [Obsolete("Removed in favor of SelectedChannels")]
@@ -468,34 +383,57 @@ public class Tab
public bool AllSenderMessages; public bool AllSenderMessages;
public TellTarget TellTarget = TellTarget.Empty(); public TellTarget TellTarget = TellTarget.Empty();
[NonSerialized] public uint Unread; [NonSerialized]
[NonSerialized] public uint LastSendUnread; public uint Unread;
[NonSerialized] public long LastActivity;
[NonSerialized] public MessageList Messages = new();
[NonSerialized] public UsedChannel CurrentChannel = new(); [NonSerialized]
public uint LastSendUnread;
[NonSerialized] public Guid Identifier = Guid.NewGuid(); [NonSerialized]
public long LastActivity;
// Hellion Chat — Auto-Tell-Tabs greeted flag. Toggled manually from the [NonSerialized]
// sidebar to mark a tell partner as already greeted in the current public MessageList Messages = new();
// session. NonSerialized because the temp tab itself is session-only.
[NonSerialized] public bool IsGreeted; [NonSerialized]
public UsedChannel CurrentChannel = new();
[NonSerialized]
public Guid Identifier = Guid.NewGuid();
// Session-only greeted flag for club-greeter workflows.
[NonSerialized]
public bool IsGreeted;
// Separate validation keys per cache so TellTarget changes don't
// cause GetTint and GetIcon to strand each other with stale entries.
[NonSerialized]
internal string? _cachedTintTellName;
[NonSerialized]
internal uint _cachedTintTellWorld;
[NonSerialized]
internal uint _cachedTellTint;
[NonSerialized]
internal string? _cachedIconTellName;
[NonSerialized]
internal uint _cachedIconTellWorld;
[NonSerialized]
internal string? _cachedTellIcon;
public bool Matches(Message message) public bool Matches(Message message)
{ {
if (!message.Matches(SelectedChannels, ExtraChatAll, ExtraChatChannels)) if (!message.Matches(SelectedChannels, ExtraChatAll, ExtraChatChannels))
{
return false; return false;
}
// Auto-tell temp tabs are bound to a single conversation partner; // Temp tabs are bound to a single conversation partner — other tells
// every other tell that matches the channel filter must NOT land // matching the channel filter must not land here.
// here, otherwise all temp tabs would mirror "Tell Exclusive".
if (IsTempTab && TellTarget?.IsSet() == true) if (IsTempTab && TellTarget?.IsSet() == true)
{
return ChunkUtil.MatchesSender(message, TellTarget.Name, TellTarget.World); return ChunkUtil.MatchesSender(message, TellTarget.Name, TellTarget.World);
}
return true; return true;
} }
@@ -507,12 +445,17 @@ public class Tab
return; return;
Unread += 1; Unread += 1;
if (message.Matches(Plugin.Config.InactivityHideChannelsV2, Plugin.Config.InactivityHideExtraChatAll, Plugin.Config.InactivityHideExtraChatChannels)) if (
message.Matches(
Plugin.Config.InactivityHideChannelsV2,
Plugin.Config.InactivityHideExtraChatAll,
Plugin.Config.InactivityHideExtraChatChannels
)
)
LastActivity = Environment.TickCount64; LastActivity = Environment.TickCount64;
} }
public void Clear() public void Clear() => Messages.Clear();
=> Messages.Clear();
public Tab Clone() public Tab Clone()
{ {
@@ -550,10 +493,7 @@ public class Tab
}; };
} }
/// <summary> /// Ordered message list with duplicate ID tracking, sorting and mutex protection.
/// MessageList provides an ordered list of messages with duplicate ID
/// tracking, sorting and mutex protection.
/// </summary>
public class MessageList public class MessageList
{ {
private readonly SemaphoreSlim LockSlim = new(1, 1); private readonly SemaphoreSlim LockSlim = new(1, 1);
@@ -641,23 +581,24 @@ public class Tab
} }
} }
/// <summary> /// Current message count. Lock-per-read is acceptable for 1×/sec status bar polling.
/// Aktuelle Anzahl der gespeicherten Messages. Lock-acquire pro Read
/// ist OK für 1×/sec Status-Bar-Polling (v1.2.0).
/// </summary>
public int Count public int Count
{ {
get get
{ {
LockSlim.Wait(-1); LockSlim.Wait(-1);
try { return Messages.Count; } try
finally { LockSlim.Release(); } {
return Messages.Count;
}
finally
{
LockSlim.Release();
}
} }
} }
/// <summary> /// Returns an array copy of the message list for usage outside of main thread.
/// Returns an array copy of the message list for usage outside of main thread
/// </summary>
public async Task<Message[]> GetCopy(int millisecondsTimeout = -1) public async Task<Message[]> GetCopy(int millisecondsTimeout = -1)
{ {
await LockSlim.WaitAsync(millisecondsTimeout); await LockSlim.WaitAsync(millisecondsTimeout);
@@ -671,17 +612,16 @@ public class Tab
} }
} }
/// <summary> /// Returns a read-only list while holding a reader lock. Use with a using statement.
/// GetReadOnly returns a read-only list of messages while holding a
/// reader lock. The list should be used with a using statement.
/// </summary>
public RLockedMessageList GetReadOnly(int millisecondsTimeout = -1) public RLockedMessageList GetReadOnly(int millisecondsTimeout = -1)
{ {
LockSlim.Wait(millisecondsTimeout); LockSlim.Wait(millisecondsTimeout);
return new RLockedMessageList(LockSlim, Messages); return new RLockedMessageList(LockSlim, Messages);
} }
public class RLockedMessageList(SemaphoreSlim lockSlim, List<Message> messages) : IReadOnlyList<Message>, IDisposable public class RLockedMessageList(SemaphoreSlim lockSlim, List<Message> messages)
: IReadOnlyList<Message>,
IDisposable
{ {
public IEnumerator<Message> GetEnumerator() public IEnumerator<Message> GetEnumerator()
{ {
@@ -740,7 +680,8 @@ public enum PreviewPosition
public static class PreviewPositionExt public static class PreviewPositionExt
{ {
public static string Name(this PreviewPosition position) => position switch public static string Name(this PreviewPosition position) =>
position switch
{ {
PreviewPosition.None => Language.Options_Preview_None, PreviewPosition.None => Language.Options_Preview_None,
PreviewPosition.Inside => Language.Options_Preview_Inside, PreviewPosition.Inside => Language.Options_Preview_Inside,
@@ -761,7 +702,8 @@ public enum CommandHelpSide
public static class CommandHelpSideExt public static class CommandHelpSideExt
{ {
public static string Name(this CommandHelpSide side) => side switch public static string Name(this CommandHelpSide side) =>
side switch
{ {
CommandHelpSide.None => Language.CommandHelpSide_None, CommandHelpSide.None => Language.CommandHelpSide_None,
CommandHelpSide.Left => Language.CommandHelpSide_Left, CommandHelpSide.Left => Language.CommandHelpSide_Left,
@@ -779,14 +721,16 @@ public enum KeybindMode
public static class KeybindModeExt public static class KeybindModeExt
{ {
public static string Name(this KeybindMode mode) => mode switch public static string Name(this KeybindMode mode) =>
mode switch
{ {
KeybindMode.Flexible => Language.KeybindMode_Flexible_Name, KeybindMode.Flexible => Language.KeybindMode_Flexible_Name,
KeybindMode.Strict => Language.KeybindMode_Strict_Name, KeybindMode.Strict => Language.KeybindMode_Strict_Name,
_ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
}; };
public static string? Tooltip(this KeybindMode mode) => mode switch public static string? Tooltip(this KeybindMode mode) =>
mode switch
{ {
KeybindMode.Flexible => Language.KeybindMode_Flexible_Tooltip, KeybindMode.Flexible => Language.KeybindMode_Flexible_Tooltip,
KeybindMode.Strict => Language.KeybindMode_Strict_Tooltip, KeybindMode.Strict => Language.KeybindMode_Strict_Tooltip,
@@ -820,7 +764,8 @@ public enum LanguageOverride
public static class LanguageOverrideExt public static class LanguageOverrideExt
{ {
public static string Name(this LanguageOverride mode) => mode switch public static string Name(this LanguageOverride mode) =>
mode switch
{ {
LanguageOverride.None => Language.LanguageOverride_None, LanguageOverride.None => Language.LanguageOverride_None,
LanguageOverride.ChineseSimplified => "简体中文", LanguageOverride.ChineseSimplified => "简体中文",
@@ -842,7 +787,8 @@ public static class LanguageOverrideExt
_ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null), _ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
}; };
public static string Code(this LanguageOverride mode) => mode switch public static string Code(this LanguageOverride mode) =>
mode switch
{ {
LanguageOverride.None => "", LanguageOverride.None => "",
LanguageOverride.ChineseSimplified => "zh-hans", LanguageOverride.ChineseSimplified => "zh-hans",
@@ -880,10 +826,12 @@ public enum ExtraGlyphRanges
public static class ExtraGlyphRangesExt public static class ExtraGlyphRangesExt
{ {
public static string Name(this ExtraGlyphRanges ranges) => ranges switch public static string Name(this ExtraGlyphRanges ranges) =>
ranges switch
{ {
ExtraGlyphRanges.ChineseFull => Language.ExtraGlyphRanges_ChineseFull_Name, ExtraGlyphRanges.ChineseFull => Language.ExtraGlyphRanges_ChineseFull_Name,
ExtraGlyphRanges.ChineseSimplifiedCommon => Language.ExtraGlyphRanges_ChineseSimplifiedCommon_Name, ExtraGlyphRanges.ChineseSimplifiedCommon =>
Language.ExtraGlyphRanges_ChineseSimplifiedCommon_Name,
ExtraGlyphRanges.Cyrillic => Language.ExtraGlyphRanges_Cyrillic_Name, ExtraGlyphRanges.Cyrillic => Language.ExtraGlyphRanges_Cyrillic_Name,
ExtraGlyphRanges.Japanese => Language.ExtraGlyphRanges_Japanese_Name, ExtraGlyphRanges.Japanese => Language.ExtraGlyphRanges_Japanese_Name,
ExtraGlyphRanges.Korean => Language.ExtraGlyphRanges_Korean_Name, ExtraGlyphRanges.Korean => Language.ExtraGlyphRanges_Korean_Name,
@@ -892,10 +840,12 @@ public static class ExtraGlyphRangesExt
_ => throw new ArgumentOutOfRangeException(nameof(ranges), ranges, null), _ => throw new ArgumentOutOfRangeException(nameof(ranges), ranges, null),
}; };
public static unsafe nint Range(this ExtraGlyphRanges ranges) => ranges switch public static unsafe nint Range(this ExtraGlyphRanges ranges) =>
ranges switch
{ {
ExtraGlyphRanges.ChineseFull => (nint)ImGui.GetIO().Fonts.GetGlyphRangesChineseFull(), ExtraGlyphRanges.ChineseFull => (nint)ImGui.GetIO().Fonts.GetGlyphRangesChineseFull(),
ExtraGlyphRanges.ChineseSimplifiedCommon => (nint)ImGui.GetIO().Fonts.GetGlyphRangesChineseSimplifiedCommon(), ExtraGlyphRanges.ChineseSimplifiedCommon => (nint)
ImGui.GetIO().Fonts.GetGlyphRangesChineseSimplifiedCommon(),
ExtraGlyphRanges.Cyrillic => (nint)ImGui.GetIO().Fonts.GetGlyphRangesCyrillic(), ExtraGlyphRanges.Cyrillic => (nint)ImGui.GetIO().Fonts.GetGlyphRangesCyrillic(),
ExtraGlyphRanges.Japanese => (nint)ImGui.GetIO().Fonts.GetGlyphRangesJapanese(), ExtraGlyphRanges.Japanese => (nint)ImGui.GetIO().Fonts.GetGlyphRangesJapanese(),
ExtraGlyphRanges.Korean => (nint)ImGui.GetIO().Fonts.GetGlyphRangesKorean(), ExtraGlyphRanges.Korean => (nint)ImGui.GetIO().Fonts.GetGlyphRangesKorean(),
+75 -48
View File
@@ -2,10 +2,10 @@
using System.Numerics; using System.Numerics;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Textures; using Dalamud.Interface.Textures;
using Dalamud.Interface.Textures.TextureWraps; using Dalamud.Interface.Textures.TextureWraps;
using Dalamud.Utility; using Dalamud.Utility;
using Dalamud.Bindings.ImGui;
using SixLabors.ImageSharp; using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.PixelFormats;
@@ -15,11 +15,31 @@ public static class EmoteCache
{ {
private static readonly string[] NotWorking = private static readonly string[] NotWorking =
[ [
":tf:", "(ditto)", "c!", "h!", "l!", "M&Mjc", "LUL3D", "p!", ":tf:",
"POLICE2", "r!", "Pussy", "s!", "v!", "w!", "x0r6ztGiggle", "(ditto)",
"z!", "xar2EDM", "iron95Pls", "Clap2", "AlienPls3", "Life", "c!",
"peepoPogClimbingTreeHard4House", "monkaGIGAftRobertDowneyJr", "h!",
"DogLookingSussyAndCold", "DICKS" "l!",
"M&Mjc",
"LUL3D",
"p!",
"POLICE2",
"r!",
"Pussy",
"s!",
"v!",
"w!",
"x0r6ztGiggle",
"z!",
"xar2EDM",
"iron95Pls",
"Clap2",
"AlienPls3",
"Life",
"peepoPogClimbingTreeHard4House",
"monkaGIGAftRobertDowneyJr",
"DogLookingSussyAndCold",
"DICKS",
]; ];
private static readonly HttpClient Client = new(); private static readonly HttpClient Client = new();
@@ -56,10 +76,10 @@ public static class EmoteCache
{ {
Unloaded, Unloaded,
Loading, Loading,
Done Done,
} }
// All of this data is uninitalized while State is not `LoadingState.Done` // All fields below are uninitialised while State != Done.
public static LoadingState State = LoadingState.Unloaded; public static LoadingState State = LoadingState.Unloaded;
private static readonly Dictionary<string, Emote> Cache = new(); private static readonly Dictionary<string, Emote> Cache = new();
@@ -67,24 +87,25 @@ public static class EmoteCache
public static string[] SortedCodeArray = []; public static string[] SortedCodeArray = [];
// Plugin-scoped cancellation source for in-flight emote loads. Dispose // Cancelled on Dispose to stop in-flight downloads; replaced on re-enable.
// cancels every running download/texture-create so the workers don't
// touch a torn-down TextureProvider on plugin reload. Replaced with a
// fresh source on the next LoadData() call so a re-enable still works.
private static CancellationTokenSource Cts = new(); private static CancellationTokenSource Cts = new();
internal static CancellationToken Token => Cts.Token; internal static CancellationToken Token => Cts.Token;
// Drain target for in-flight loads on Dispose; without this an orphan // Tracks in-flight loads so Dispose can drain them before teardown.
// continuation could still write to a torn-down Texture/Frames field.
private static readonly ConcurrentBag<Task> PendingLoads = new(); private static readonly ConcurrentBag<Task> PendingLoads = new();
internal static void TrackLoad(Task loadTask, string emoteCode) internal static void TrackLoad(Task loadTask, string emoteCode)
{ {
PendingLoads.Add(loadTask.ContinueWith(t => PendingLoads.Add(
loadTask.ContinueWith(
t =>
{ {
if (t.IsFaulted) if (t.IsFaulted)
Plugin.Log.Error(t.Exception!, $"EmoteCache load failed for {emoteCode}"); Plugin.Log.Error(t.Exception!, $"EmoteCache load failed for {emoteCode}");
}, TaskScheduler.Default)); },
TaskScheduler.Default
)
);
} }
public static async Task LoadData() public static async Task LoadData()
@@ -92,8 +113,7 @@ public static class EmoteCache
if (State is not LoadingState.Unloaded) if (State is not LoadingState.Unloaded)
return; return;
// Refresh the CTS in case Dispose was called and we're being re-enabled // Reset CTS if Dispose was called and the plugin is being re-enabled.
// in the same process (Dalamud /xlplugins toggle).
if (Cts.IsCancellationRequested) if (Cts.IsCancellationRequested)
Cts = new CancellationTokenSource(); Cts = new CancellationTokenSource();
@@ -115,13 +135,13 @@ public static class EmoteCache
var topList = await top.Content.ReadAsStringAsync(ct); var topList = await top.Content.ReadAsStringAsync(ct);
var jsonList = JsonSerializer.Deserialize<List<Top100>>(topList)!; var jsonList = JsonSerializer.Deserialize<List<Top100>>(topList)!;
// BetterTTV occasionally returns entries with a null Code; the // BetterTTV occasionally returns entries with a null Code;
// upstream code passed those straight into Dictionary.TryAdd // skip them so a single bad row doesn't break the whole cache.
// and tripped ArgumentNullException, killing the whole emote
// load. Skip them defensively so a single bad row no longer
// breaks the cache for everyone else.
foreach (var emote in jsonList) foreach (var emote in jsonList)
if (!string.IsNullOrEmpty(emote.Emote.Code) && !NotWorking.Contains(emote.Emote.Code)) if (
!string.IsNullOrEmpty(emote.Emote.Code)
&& !NotWorking.Contains(emote.Emote.Code)
)
Cache.TryAdd(emote.Emote.Code, emote.Emote); Cache.TryAdd(emote.Emote.Code, emote.Emote);
lastId = jsonList.Last().Id; lastId = jsonList.Last().Id;
@@ -132,16 +152,11 @@ public static class EmoteCache
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
// Plugin disposed while the cache was loading; leave State on // Plugin disposed mid-load; State stays on Loading so re-enable can retry.
// Loading so a subsequent re-enable can re-issue LoadData with
// a fresh CTS (handled above).
} }
catch (Exception ex) catch (Exception ex)
{ {
// Reset to Unloaded so a later trigger (e.g. the user reopening // Reset to Unloaded so a later trigger can retry without a plugin reload.
// the Emotes tab after the network recovers) can retry. Without
// this the State stays on Loading and the early-out at the top
// of LoadData blocks every further attempt until plugin reload.
State = LoadingState.Unloaded; State = LoadingState.Unloaded;
Plugin.Log.Error(ex, "BetterTTV cache wasn't initialized"); Plugin.Log.Error(ex, "BetterTTV cache wasn't initialized");
} }
@@ -220,18 +235,21 @@ public static class EmoteCache
internal async Task<byte[]> LoadAsync(Emote emote, CancellationToken ct) internal async Task<byte[]> LoadAsync(Emote emote, CancellationToken ct)
{ {
// BetterTTV-supplied Id and ImageType are interpolated straight // Path-traversal guard: resolve and verify the candidate path stays
// into the filename. HTTPS protects the wire, but a compromised // inside the cache directory before reading or writing.
// upstream could still hand us "../foo" and write into the var dir = Path.GetFullPath(
// pluginConfigs root (or worse). Resolve the candidate path and Path.Join(Plugin.Interface.ConfigDirectory.FullName, "EmoteCacheV1")
// refuse anything that escapes the cache directory. );
var dir = Path.GetFullPath(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "EmoteCacheV1"));
Directory.CreateDirectory(dir); Directory.CreateDirectory(dir);
var dirPrefix = dir.EndsWith(Path.DirectorySeparatorChar) ? dir : dir + Path.DirectorySeparatorChar; var dirPrefix = dir.EndsWith(Path.DirectorySeparatorChar)
? dir
: dir + Path.DirectorySeparatorChar;
var filePath = Path.GetFullPath(Path.Join(dir, $"{emote.Id}.{emote.ImageType}")); var filePath = Path.GetFullPath(Path.Join(dir, $"{emote.Id}.{emote.ImageType}"));
if (!filePath.StartsWith(dirPrefix, StringComparison.Ordinal)) if (!filePath.StartsWith(dirPrefix, StringComparison.Ordinal))
throw new InvalidOperationException($"Emote path escapes cache directory: id={emote.Id}, type={emote.ImageType}"); throw new InvalidOperationException(
$"Emote path escapes cache directory: id={emote.Id}, type={emote.ImageType}"
);
if (File.Exists(filePath)) if (File.Exists(filePath))
{ {
@@ -242,7 +260,12 @@ public static class EmoteCache
var content = await Client.GetAsync(EmotePath.Format(emote.Id), ct); var content = await Client.GetAsync(EmotePath.Format(emote.Id), ct);
RawData = await content.Content.ReadAsByteArrayAsync(ct); RawData = await content.Content.ReadAsByteArrayAsync(ct);
await using var stream = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.Read); await using var stream = new FileStream(
filePath,
FileMode.Create,
FileAccess.Write,
FileShare.Read
);
await stream.WriteAsync(RawData, ct); await stream.WriteAsync(RawData, ct);
} }
@@ -271,12 +294,13 @@ public static class EmoteCache
return; return;
ct.ThrowIfCancellationRequested(); ct.ThrowIfCancellationRequested();
Texture = await Plugin.TextureProvider.CreateFromImageAsync(image, cancellationToken: ct); Texture = await Plugin.TextureProvider.CreateFromImageAsync(
image,
cancellationToken: ct
);
IsLoaded = true; IsLoaded = true;
} }
catch (OperationCanceledException) catch (OperationCanceledException) { }
{
}
catch (Exception ex) catch (Exception ex)
{ {
Failed = true; Failed = true;
@@ -357,13 +381,17 @@ public static class EmoteCache
var delay = frame.Metadata.GetGifMetadata().FrameDelay / 100f; var delay = frame.Metadata.GetGifMetadata().FrameDelay / 100f;
// Follows the same pattern as browsers, anything under 0.02s delay will be rounded up to 0.1s // Match browser behaviour: anything under 20ms rounds up to 100ms.
if (delay < 0.02f) if (delay < 0.02f)
delay = 0.1f; delay = 0.1f;
var buffer = new byte[4 * frame.Width * frame.Height]; var buffer = new byte[4 * frame.Width * frame.Height];
frame.CopyPixelDataTo(buffer); frame.CopyPixelDataTo(buffer);
var tex = await Plugin.TextureProvider.CreateFromRawAsync(RawImageSpecification.Rgba32(frame.Width, frame.Height), buffer, cancellationToken: ct); var tex = await Plugin.TextureProvider.CreateFromRawAsync(
RawImageSpecification.Rgba32(frame.Width, frame.Height),
buffer,
cancellationToken: ct
);
frames.Add((tex, delay)); frames.Add((tex, delay));
} }
@@ -372,8 +400,7 @@ public static class EmoteCache
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
// Plugin disposed mid-load; partial frames are released by // Plugin disposed mid-load; release any partial frames.
// InnerDispose on the next dispose pass.
foreach (var f in Frames) foreach (var f in Frames)
f.Texture.Dispose(); f.Texture.Dispose();
Frames = []; Frames = [];
+64 -28
View File
@@ -13,7 +13,8 @@ internal enum ExportFormat
internal static class ExportFormatExt internal static class ExportFormatExt
{ {
internal static string Extension(this ExportFormat fmt) => fmt switch internal static string Extension(this ExportFormat fmt) =>
fmt switch
{ {
ExportFormat.Markdown => "md", ExportFormat.Markdown => "md",
ExportFormat.Json => "json", ExportFormat.Json => "json",
@@ -21,7 +22,8 @@ internal static class ExportFormatExt
_ => "txt", _ => "txt",
}; };
internal static string Filter(this ExportFormat fmt) => fmt switch internal static string Filter(this ExportFormat fmt) =>
fmt switch
{ {
ExportFormat.Markdown => ".md", ExportFormat.Markdown => ".md",
ExportFormat.Json => ".json", ExportFormat.Json => ".json",
@@ -30,25 +32,23 @@ internal static class ExportFormatExt
}; };
} }
/// <summary> // Serializes message snapshots to Markdown, JSON, or CSV.
/// Serializes message snapshots into Markdown, JSON, or CSV. The caller is // Caller handles pre-filtering except sender substring, which requires deserialized SeString.TextValue.
/// expected to filter the input enumerable; this class only handles
/// formatting and writes to the supplied path. Sender substring filtering
/// happens here because it requires deserialized SeString.TextValue.
/// </summary>
internal static class MessageExporter internal static class MessageExporter
{ {
internal record FilterDescription( internal record FilterDescription(
IReadOnlyCollection<int>? ChatTypes, IReadOnlyCollection<int>? ChatTypes,
DateTimeOffset? From, DateTimeOffset? From,
DateTimeOffset? To, DateTimeOffset? To,
string? SenderSubstring); string? SenderSubstring
);
internal static int ExportToFile( internal static int ExportToFile(
string path, string path,
ExportFormat format, ExportFormat format,
IEnumerable<Message> messages, IEnumerable<Message> messages,
FilterDescription filter) FilterDescription filter
)
{ {
var matching = filter.SenderSubstring is { Length: > 0 } needle var matching = filter.SenderSubstring is { Length: > 0 } needle
? messages.Where(m => MatchesSender(m, needle)) ? messages.Where(m => MatchesSender(m, needle))
@@ -64,10 +64,14 @@ internal static class MessageExporter
}; };
} }
private static bool MatchesSender(Message m, string needle) private static bool MatchesSender(Message m, string needle) =>
=> m.SenderSource.TextValue.Contains(needle, StringComparison.OrdinalIgnoreCase); m.SenderSource.TextValue.Contains(needle, StringComparison.OrdinalIgnoreCase);
private static int WriteMarkdown(StreamWriter w, IEnumerable<Message> messages, FilterDescription filter) private static int WriteMarkdown(
StreamWriter w,
IEnumerable<Message> messages,
FilterDescription filter
)
{ {
w.WriteLine("# Hellion Chat Export"); w.WriteLine("# Hellion Chat Export");
w.WriteLine(); w.WriteLine();
@@ -92,6 +96,7 @@ internal static class MessageExporter
var chatType = (ChatType)(ushort)m.Code.Type; var chatType = (ChatType)(ushort)m.Code.Type;
var sender = m.SenderSource.TextValue.Trim().Trim('<', '>', '[', ']', ':').Trim(); var sender = m.SenderSource.TextValue.Trim().Trim('<', '>', '[', ']', ':').Trim();
var content = m.ContentSource.TextValue; var content = m.ContentSource.TextValue;
if (string.IsNullOrEmpty(sender)) if (string.IsNullOrEmpty(sender))
w.WriteLine($"**[{localDate:HH:mm}] {chatType}:** {content}"); w.WriteLine($"**[{localDate:HH:mm}] {chatType}:** {content}");
else else
@@ -107,7 +112,9 @@ internal static class MessageExporter
private static void WriteFilterSummaryMarkdown(StreamWriter w, FilterDescription filter) private static void WriteFilterSummaryMarkdown(StreamWriter w, FilterDescription filter)
{ {
if (filter.ChatTypes is { Count: > 0 }) if (filter.ChatTypes is { Count: > 0 })
w.WriteLine($"ChatTypes: {string.Join(", ", filter.ChatTypes.Select(t => $"{(ChatType)(ushort)t}({t})"))}"); w.WriteLine(
$"ChatTypes: {string.Join(", ", filter.ChatTypes.Select(t => $"{(ChatType)(ushort)t}({t})"))}"
);
if (filter.From is not null) if (filter.From is not null)
w.WriteLine($"From: {filter.From.Value.ToLocalTime():yyyy-MM-dd HH:mm}"); w.WriteLine($"From: {filter.From.Value.ToLocalTime():yyyy-MM-dd HH:mm}");
if (filter.To is not null) if (filter.To is not null)
@@ -116,10 +123,13 @@ internal static class MessageExporter
w.WriteLine($"Sender contains: \"{filter.SenderSubstring}\""); w.WriteLine($"Sender contains: \"{filter.SenderSubstring}\"");
} }
private static int WriteJson(StreamWriter w, IEnumerable<Message> messages, FilterDescription filter) private static int WriteJson(
StreamWriter w,
IEnumerable<Message> messages,
FilterDescription filter
)
{ {
// Manual JSON to avoid pulling in System.Text.Json policy choices. // Manual JSON to avoid System.Text.Json policy coupling.
// Output is a single object with metadata and an array of messages.
w.Write("{\n \"exported_at\": \""); w.Write("{\n \"exported_at\": \"");
w.Write(DateTimeOffset.UtcNow.ToString("O", CultureInfo.InvariantCulture)); w.Write(DateTimeOffset.UtcNow.ToString("O", CultureInfo.InvariantCulture));
w.Write("\",\n \"plugin\": \"Hellion Chat\",\n"); w.Write("\",\n \"plugin\": \"Hellion Chat\",\n");
@@ -130,9 +140,17 @@ internal static class MessageExporter
else else
w.Write("null"); w.Write("null");
w.Write(",\n \"from\": "); w.Write(",\n \"from\": ");
w.Write(filter.From is null ? "null" : "\"" + filter.From.Value.ToString("O", CultureInfo.InvariantCulture) + "\""); w.Write(
filter.From is null
? "null"
: "\"" + filter.From.Value.ToString("O", CultureInfo.InvariantCulture) + "\""
);
w.Write(",\n \"to\": "); w.Write(",\n \"to\": ");
w.Write(filter.To is null ? "null" : "\"" + filter.To.Value.ToString("O", CultureInfo.InvariantCulture) + "\""); w.Write(
filter.To is null
? "null"
: "\"" + filter.To.Value.ToString("O", CultureInfo.InvariantCulture) + "\""
);
w.Write(",\n \"sender_substring\": "); w.Write(",\n \"sender_substring\": ");
w.Write(filter.SenderSubstring is null ? "null" : JsonString(filter.SenderSubstring)); w.Write(filter.SenderSubstring is null ? "null" : JsonString(filter.SenderSubstring));
w.Write("\n },\n \"messages\": [\n"); w.Write("\n },\n \"messages\": [\n");
@@ -166,9 +184,13 @@ internal static class MessageExporter
return count; return count;
} }
private static int WriteCsv(StreamWriter w, IEnumerable<Message> messages, FilterDescription filter) private static int WriteCsv(
StreamWriter w,
IEnumerable<Message> messages,
FilterDescription filter
)
{ {
// Header line always written so empty exports are still importable. // Header always written so empty exports remain importable.
w.WriteLine("Date,ChatType,ChatTypeName,Sender,Content,Receiver,ContentId"); w.WriteLine("Date,ChatType,ChatTypeName,Sender,Content,Receiver,ContentId");
var count = 0; var count = 0;
foreach (var m in messages) foreach (var m in messages)
@@ -201,13 +223,27 @@ internal static class MessageExporter
{ {
switch (c) switch (c)
{ {
case '"': sb.Append("\\\""); break; case '"':
case '\\': sb.Append("\\\\"); break; sb.Append("\\\"");
case '\b': sb.Append("\\b"); break; break;
case '\f': sb.Append("\\f"); break; case '\\':
case '\n': sb.Append("\\n"); break; sb.Append("\\\\");
case '\r': sb.Append("\\r"); break; break;
case '\t': sb.Append("\\t"); break; case '\b':
sb.Append("\\b");
break;
case '\f':
sb.Append("\\f");
break;
case '\n':
sb.Append("\\n");
break;
case '\r':
sb.Append("\\r");
break;
case '\t':
sb.Append("\\t");
break;
default: default:
if (c < 0x20) if (c < 0x20)
sb.Append($"\\u{(int)c:x4}"); sb.Append($"\\u{(int)c:x4}");
+86 -49
View File
@@ -1,10 +1,10 @@
using Dalamud; using Dalamud;
using Dalamud.Bindings.ImGui;
using Dalamud.Interface; using Dalamud.Interface;
using Dalamud.Interface.FontIdentifier; using Dalamud.Interface.FontIdentifier;
using Dalamud.Interface.GameFonts; using Dalamud.Interface.GameFonts;
using Dalamud.Interface.ManagedFontAtlas; using Dalamud.Interface.ManagedFontAtlas;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using Dalamud.Bindings.ImGui;
namespace HellionChat; namespace HellionChat;
@@ -23,17 +23,25 @@ public class FontManager
public static readonly HashSet<float> AxisFontSizeList = public static readonly HashSet<float> AxisFontSizeList =
[ [
9.6f, 10f, 12f, 14f, 16f, 9.6f,
18f, 18.4f, 20f, 23f, 34f, 10f,
36f, 40f, 45f, 46f, 68f, 90f, 12f,
14f,
16f,
18f,
18.4f,
20f,
23f,
34f,
36f,
40f,
45f,
46f,
68f,
90f,
]; ];
/// <summary> // Hellion font bytes (Exo 2, OFL-1.1); lazily loaded from manifest resources
/// Backing bytes for the bundled Hellion font (Exo 2, OFL-1.1). Lazily
/// extracted from the assembly's manifest resources on first use; the
/// load happens inside the font atlas build callback so we keep the
/// allocation off the plugin constructor's hot path.
/// </summary>
private static byte[]? HellionFontBytes; private static byte[]? HellionFontBytes;
private static byte[] GetHellionFontBytes() private static byte[] GetHellionFontBytes()
@@ -41,8 +49,11 @@ public class FontManager
if (HellionFontBytes is not null) if (HellionFontBytes is not null)
return HellionFontBytes; return HellionFontBytes;
using var stream = typeof(FontManager).Assembly.GetManifestResourceStream("HellionFont.ttf") using var stream =
?? throw new FileNotFoundException("Hellion font resource not embedded in the assembly"); typeof(FontManager).Assembly.GetManifestResourceStream("HellionFont.ttf")
?? throw new FileNotFoundException(
"Hellion font resource not embedded in the assembly"
);
using var ms = new MemoryStream(); using var ms = new MemoryStream();
stream.CopyTo(ms); stream.CopyTo(ms);
HellionFontBytes = ms.ToArray(); HellionFontBytes = ms.ToArray();
@@ -54,11 +65,9 @@ public class FontManager
ushort[] BuildRange(IReadOnlyList<ushort>? chars, params nint[] ranges) ushort[] BuildRange(IReadOnlyList<ushort>? chars, params nint[] ranges)
{ {
var builder = new ImFontGlyphRangesBuilderPtr(ImGuiNative.ImFontGlyphRangesBuilder()); var builder = new ImFontGlyphRangesBuilderPtr(ImGuiNative.ImFontGlyphRangesBuilder());
// text
foreach (var range in ranges) foreach (var range in ranges)
builder.AddRanges((ushort*)range); builder.AddRanges((ushort*)range);
// chars
if (chars != null) if (chars != null)
{ {
for (var i = 0; i < chars.Count; i += 2) for (var i = 0; i < chars.Count; i += 2)
@@ -100,32 +109,39 @@ public class FontManager
JpRange = BuildRange(GlyphRangesJapanese.GlyphRanges); JpRange = BuildRange(GlyphRangesJapanese.GlyphRanges);
} }
// CPU-bound build offloaded to Task.Run; runs parallel with theme init
public async Task BuildFontsAsync(CancellationToken cancellationToken)
{
cancellationToken.ThrowIfCancellationRequested();
await Task.Run(BuildFonts, cancellationToken).ConfigureAwait(false);
}
public void BuildFonts() public void BuildFonts()
{ {
SetUpRanges(); SetUpRanges();
Axis = Plugin.Interface.UiBuilder.FontAtlas.NewGameFontHandle(new GameFontStyle(GameFontFamily.Axis, SizeInPx(Plugin.Config.FontSizeV2))); Axis = Plugin.Interface.UiBuilder.FontAtlas.NewGameFontHandle(
AxisItalic = Plugin.Interface.UiBuilder.FontAtlas.NewGameFontHandle(new GameFontStyle(GameFontFamily.Axis, SizeInPx(Plugin.Config.FontSizeV2)) new GameFontStyle(GameFontFamily.Axis, SizeInPx(Plugin.Config.FontSizeV2))
);
AxisItalic = Plugin.Interface.UiBuilder.FontAtlas.NewGameFontHandle(
new GameFontStyle(GameFontFamily.Axis, SizeInPx(Plugin.Config.FontSizeV2))
{ {
SkewStrength = SizeInPx(Plugin.Config.FontSizeV2) / 6 SkewStrength = SizeInPx(Plugin.Config.FontSizeV2) / 6,
}); }
);
FontAwesome = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(e => FontAwesome = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
{ {
e.OnPreBuild(tk => tk.AddFontAwesomeIconFont(new SafeFontConfig { SizePx = GetFontSize() })); e.OnPreBuild(tk =>
tk.AddFontAwesomeIconFont(new SafeFontConfig { SizePx = GetFontSize() })
);
e.OnPostBuild(tk => tk.FitRatio(tk.Font)); e.OnPostBuild(tk => tk.FitRatio(tk.Font));
}); });
RegularFont = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle( RegularFont = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
e => e.OnPreBuild( e.OnPreBuild(tk =>
tk =>
{ {
// v1.2.0 — Bei aktiver Hellion-Schrift (Exo 2 ist Variable-Font) // v1.2.0: UseHellionFont controls font size selection
// wird die User-Schriftgröße aus FontSizeV2 als SizePt angewendet.
// Der Bestand-Pfad nutzt weiter GlobalFontV2.SizePt aus dem
// Custom-Font-Stack. Ohne diese Verzweigung war FontSizeV2 bei
// UseHellionFont=true wirkungslos, was 4K-User mit größerer
// Skalierung blockierte (Settings → Erscheinungsbild → Schriftarten).
var basePt = Plugin.Config.UseHellionFont var basePt = Plugin.Config.UseHellionFont
? Plugin.Config.FontSizeV2 ? Plugin.Config.FontSizeV2
: Plugin.Config.GlobalFontV2.SizePt; : Plugin.Config.GlobalFontV2.SizePt;
@@ -142,28 +158,41 @@ public class FontManager
tk.AddGameSymbol(config); tk.AddGameSymbol(config);
tk.Font = config.MergeFont; tk.Font = config.MergeFont;
} })
)); );
if (Plugin.Config.ItalicEnabled) if (Plugin.Config.ItalicEnabled)
{ {
ItalicFont = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle( ItalicFont = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
e => e.OnPreBuild( e.OnPreBuild(tk =>
tk =>
{ {
var config = new SafeFontConfig {SizePt = Plugin.Config.ItalicFontV2.SizePt, GlyphRanges = Ranges}; var config = new SafeFontConfig
config.MergeFont = AddFontWithFallback(tk, Plugin.Config.ItalicFontV2.FontId, config, "italic"); {
SizePt = Plugin.Config.ItalicFontV2.SizePt,
GlyphRanges = Ranges,
};
config.MergeFont = AddFontWithFallback(
tk,
Plugin.Config.ItalicFontV2.FontId,
config,
"italic"
);
config.SizePt = Plugin.Config.JapaneseFontV2.SizePt; config.SizePt = Plugin.Config.JapaneseFontV2.SizePt;
config.GlyphRanges = JpRange; config.GlyphRanges = JpRange;
AddFontWithFallback(tk, Plugin.Config.JapaneseFontV2.FontId, config, "japanese"); AddFontWithFallback(
tk,
Plugin.Config.JapaneseFontV2.FontId,
config,
"japanese"
);
config.SizePt = Plugin.Config.SymbolsFontSizeV2; config.SizePt = Plugin.Config.SymbolsFontSizeV2;
tk.AddGameSymbol(config); tk.AddGameSymbol(config);
tk.Font = config.MergeFont; tk.Font = config.MergeFont;
} })
)); );
} }
else else
{ {
@@ -171,28 +200,36 @@ public class FontManager
} }
} }
/// <summary> // Add font with fallback to NotoSansCjkRegular if unavailable
/// Try to add a user-configured font to the build toolkit, falling back to private static ImFontPtr AddFontWithFallback(
/// the bundled NotoSansCjkRegular asset if the configured font isn't IFontAtlasBuildToolkitPreBuild tk,
/// available on the system. Without this guard a stale SystemFontId IFontId fontId,
/// pointing at a font the user uninstalled or that never existed on SafeFontConfig config,
/// Linux (e.g. "Crimson Text") tears down the entire font atlas build. string slot
/// </summary> )
private static ImFontPtr AddFontWithFallback(IFontAtlasBuildToolkitPreBuild tk, IFontId fontId, SafeFontConfig config, string slot)
{ {
try try
{ {
return fontId.AddToBuildToolkit(tk, config); return fontId.AddToBuildToolkit(tk, config);
} }
catch (Exception e) when (e is FileNotFoundException or DirectoryNotFoundException or IOException) catch (Exception e)
when (e is FileNotFoundException or DirectoryNotFoundException or IOException)
{ {
Plugin.Log.Warning(e, $"Configured {slot} font unavailable, falling back to NotoSansCjkRegular"); Plugin.Log.Warning(
e,
$"Configured {slot} font unavailable, falling back to NotoSansCjkRegular"
);
var fallback = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular); var fallback = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular);
return fallback.AddToBuildToolkit(tk, config); return fallback.AddToBuildToolkit(tk, config);
} }
} }
public static float SizeInPt(float px) => (float)(px * 3.0 / 4.0); public static float SizeInPt(float px) => (float)(px * 3.0 / 4.0);
public static float SizeInPx(float pt) => (float)(pt * 4.0 / 3.0); public static float SizeInPx(float pt) => (float)(pt * 4.0 / 3.0);
public static float GetFontSize() => Plugin.Config.FontsEnabled ? Plugin.Config.GlobalFontV2.SizePx : SizeInPx(Plugin.Config.FontSizeV2);
public static float GetFontSize() =>
Plugin.Config.FontsEnabled
? Plugin.Config.GlobalFontV2.SizePx
: SizeInPx(Plugin.Config.FontSizeV2);
} }
+237 -81
View File
@@ -1,8 +1,4 @@
using System.Text; using System.Text;
using HellionChat.Code;
using HellionChat.GameFunctions.Types;
using HellionChat.Resources;
using HellionChat.Util;
using Dalamud.Game.Config; using Dalamud.Game.Config;
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Hooking; using Dalamud.Hooking;
@@ -17,9 +13,12 @@ using FFXIVClientStructs.FFXIV.Client.UI.Info;
using FFXIVClientStructs.FFXIV.Client.UI.Misc; using FFXIVClientStructs.FFXIV.Client.UI.Misc;
using FFXIVClientStructs.FFXIV.Client.UI.Shell; using FFXIVClientStructs.FFXIV.Client.UI.Shell;
using FFXIVClientStructs.FFXIV.Component.GUI; using FFXIVClientStructs.FFXIV.Component.GUI;
using HellionChat.Code;
using HellionChat.GameFunctions.Types;
using HellionChat.Resources;
using HellionChat.Util;
using InteropGenerator.Runtime; using InteropGenerator.Runtime;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.AtkValueType; using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.AtkValueType;
namespace HellionChat.GameFunctions; namespace HellionChat.GameFunctions;
@@ -28,20 +27,55 @@ internal sealed unsafe class Chat : IDisposable
{ {
// Functions // Functions
[Signature("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC ?? 48 8D B9 ?? ?? ?? ?? 33 C0")] [Signature("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC ?? 48 8D B9 ?? ?? ?? ?? 33 C0")]
private readonly delegate* unmanaged<RaptureLogModule*, ushort, Utf8String*, Utf8String*, ulong, ulong, ushort, byte, int, byte, void> PrintTellNative = null!; private readonly delegate* unmanaged<
RaptureLogModule*,
ushort,
Utf8String*,
Utf8String*,
ulong,
ulong,
ushort,
byte,
int,
byte,
void> PrintTellNative = null!;
[Signature("E8 ?? ?? ?? ?? 48 8D 4C 24 ?? E8 ?? ?? ?? ?? 48 8D 8C 24 ?? ?? ?? ?? E8 ?? ?? ?? ?? B0 ?? 48 8B 8C 24")] [Signature(
private readonly delegate* unmanaged<NetworkModule*, ulong, ushort, Utf8String*, Utf8String*, ushort, ushort, byte> SendTellNative = null!; "E8 ?? ?? ?? ?? 48 8D 4C 24 ?? E8 ?? ?? ?? ?? 48 8D 8C 24 ?? ?? ?? ?? E8 ?? ?? ?? ?? B0 ?? 48 8B 8C 24"
)]
private readonly delegate* unmanaged<
NetworkModule*,
ulong,
ushort,
Utf8String*,
Utf8String*,
ushort,
ushort,
byte> SendTellNative = null!;
// Client::UI::AddonChatLog.OnRefresh // Client::UI::AddonChatLog.OnRefresh
[Signature("40 53 57 41 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 4D 8B F8", DetourName = nameof(ChatLogRefreshDetour))] [Signature(
"40 53 57 41 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 4D 8B F8",
DetourName = nameof(ChatLogRefreshDetour)
)]
private Hook<ChatLogRefreshDelegate>? ChatLogRefreshHook = null!; private Hook<ChatLogRefreshDelegate>? ChatLogRefreshHook = null!;
private delegate byte ChatLogRefreshDelegate(nint log, ushort eventId, AtkValue* value); private delegate byte ChatLogRefreshDelegate(nint log, ushort eventId, AtkValue* value);
// Replace with CS version later // Replace with CS version later
[Signature("48 89 5C 24 ?? 55 56 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 83 B9", DetourName = nameof(ContextMenuTellInForayDetour))] [Signature(
"48 89 5C 24 ?? 55 56 57 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 83 B9",
DetourName = nameof(ContextMenuTellInForayDetour)
)]
private Hook<ContextMenuTellInForayDelegate>? ContextMenuTellInForayHook = null!; private Hook<ContextMenuTellInForayDelegate>? ContextMenuTellInForayHook = null!;
private delegate void ContextMenuTellInForayDelegate(RaptureShellModule* module, Utf8String* playerName, Utf8String* worldName, ushort worldId, ulong accountId, ulong contentId, ushort reason); private delegate void ContextMenuTellInForayDelegate(
RaptureShellModule* module,
Utf8String* playerName,
Utf8String* worldName,
ushort worldId,
ulong accountId,
ulong contentId,
ushort reason
);
private readonly Hook<AgentChatLog.Delegates.ChangeChannelName>? ChangeChannelNameHook; private readonly Hook<AgentChatLog.Delegates.ChangeChannelName>? ChangeChannelNameHook;
private readonly Hook<RaptureShellModule.Delegates.ReplyInSelectedChatMode>? ReplyInSelectedChatModeHook; private readonly Hook<RaptureShellModule.Delegates.ReplyInSelectedChatMode>? ReplyInSelectedChatModeHook;
@@ -58,7 +92,7 @@ internal sealed unsafe class Chat : IDisposable
FullName = 0, FullName = 0,
SurnameAbbreviated = 1, SurnameAbbreviated = 1,
ForenameAbbreviated = 2, ForenameAbbreviated = 2,
Initials = 3 Initials = 3,
} }
private long LastPlayerNameDisplayTypeRefresh; private long LastPlayerNameDisplayTypeRefresh;
@@ -72,13 +106,25 @@ internal sealed unsafe class Chat : IDisposable
ChatLogRefreshHook?.Enable(); ChatLogRefreshHook?.Enable();
ContextMenuTellInForayHook?.Enable(); ContextMenuTellInForayHook?.Enable();
ChangeChannelNameHook = Plugin.GameInteropProvider.HookFromAddress<AgentChatLog.Delegates.ChangeChannelName>(AgentChatLog.MemberFunctionPointers.ChangeChannelName, ChangeChannelNameDetour); ChangeChannelNameHook =
Plugin.GameInteropProvider.HookFromAddress<AgentChatLog.Delegates.ChangeChannelName>(
AgentChatLog.MemberFunctionPointers.ChangeChannelName,
ChangeChannelNameDetour
);
ChangeChannelNameHook.Enable(); ChangeChannelNameHook.Enable();
ReplyInSelectedChatModeHook = Plugin.GameInteropProvider.HookFromAddress<RaptureShellModule.Delegates.ReplyInSelectedChatMode>(RaptureShellModule.MemberFunctionPointers.ReplyInSelectedChatMode, ReplyInSelectedChatModeDetour); ReplyInSelectedChatModeHook =
Plugin.GameInteropProvider.HookFromAddress<RaptureShellModule.Delegates.ReplyInSelectedChatMode>(
RaptureShellModule.MemberFunctionPointers.ReplyInSelectedChatMode,
ReplyInSelectedChatModeDetour
);
ReplyInSelectedChatModeHook.Enable(); ReplyInSelectedChatModeHook.Enable();
SetChatLogTellTargetHook = Plugin.GameInteropProvider.HookFromAddress<RaptureShellModule.Delegates.SetContextTellTarget>(RaptureShellModule.MemberFunctionPointers.SetContextTellTarget, SetContextTellTarget); SetChatLogTellTargetHook =
Plugin.GameInteropProvider.HookFromAddress<RaptureShellModule.Delegates.SetContextTellTarget>(
RaptureShellModule.MemberFunctionPointers.SetContextTellTarget,
SetContextTellTarget
);
SetChatLogTellTargetHook.Enable(); SetChatLogTellTargetHook.Enable();
Plugin.ClientState.Login += Login; Plugin.ClientState.Login += Login;
@@ -108,7 +154,8 @@ internal sealed unsafe class Chat : IDisposable
return utf == null ? null : utf->ToString(); return utf == null ? null : utf->ToString();
} }
private static int GetRotateIdx(RotateMode mode) => mode switch private static int GetRotateIdx(RotateMode mode) =>
mode switch
{ {
RotateMode.Forward => 1, RotateMode.Forward => 1,
RotateMode.Reverse => -1, RotateMode.Reverse => -1,
@@ -127,8 +174,7 @@ internal sealed unsafe class Chat : IDisposable
internal static void RotateCrossLinkshellHistory(RotateMode mode) => internal static void RotateCrossLinkshellHistory(RotateMode mode) =>
UIModule.Instance()->RotateCrossLinkshellHistory(GetRotateIdx(mode)); UIModule.Instance()->RotateCrossLinkshellHistory(GetRotateIdx(mode));
// This function looks up a channel's user-defined color. // Look up a channel's user-defined color, returns null if 0
// If this function ever returns 0, it returns null instead.
internal uint? GetChannelColor(ChatType type) internal uint? GetChannelColor(ChatType type)
{ {
var parent = type.Parent(); var parent = type.Parent();
@@ -168,8 +214,7 @@ internal sealed unsafe class Chat : IDisposable
if (Plugin.Functions.KeybindManager.DirectChat && LastTypedCharacter != null) if (Plugin.Functions.KeybindManager.DirectChat && LastTypedCharacter != null)
{ {
// FIXME: this whole system sucks // Capture the just-typed character input
// FIXME v2: I hate everything about this, but it works
Plugin.Framework.RunOnTick(() => Plugin.Framework.RunOnTick(() =>
{ {
string? input = null; string? input = null;
@@ -185,7 +230,9 @@ internal sealed unsafe class Chat : IDisposable
try try
{ {
Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(new ChannelSwitchInfo(null)) { Input = input, }); Plugin.ChatLogWindow.Activated(
new ChatActivatedArgs(new ChannelSwitchInfo(null)) { Input = input }
);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -206,23 +253,23 @@ internal sealed unsafe class Chat : IDisposable
try try
{ {
// We already called this function once, so we skip the duplicated call // Prevent duplicate calls
// Also return the original value here so that vanilla chat receives all information
if (Plugin.ChatLogWindow.TellSpecial) if (Plugin.ChatLogWindow.TellSpecial)
{
Plugin.Log.Information("Return early to prevent duplicated call...");
return ChatLogRefreshHook!.Original(log, eventId, value); return ChatLogRefreshHook!.Original(log, eventId, value);
}
Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(new ChannelSwitchInfo(null)) { AddIfNotPresent = addIfNotPresent, }); Plugin.ChatLogWindow.Activated(
new ChatActivatedArgs(new ChannelSwitchInfo(null))
{
AddIfNotPresent = addIfNotPresent,
}
);
} }
catch (Exception ex) catch (Exception ex)
{ {
Plugin.Log.Error(ex, "Error in chat Activated event"); Plugin.Log.Error(ex, "Error in chat Activated event");
} }
// prevent the game from focusing the chat log return 1; // Prevent vanilla chat log from gaining focus
return 1;
} }
private CStringPointer ChangeChannelNameDetour(AgentChatLog* agent) private CStringPointer ChangeChannelNameDetour(AgentChatLog* agent)
@@ -259,7 +306,7 @@ internal sealed unsafe class Chat : IDisposable
{ {
Channel = (InputChannel)channel, Channel = (InputChannel)channel,
Name = nameChunks, Name = nameChunks,
TellTarget = playerName != null ? new TellTarget(playerName, worldId, 0, 0) : null TellTarget = playerName != null ? new TellTarget(playerName, worldId, 0, 0) : null,
}; };
return ret; return ret;
@@ -278,18 +325,36 @@ internal sealed unsafe class Chat : IDisposable
ReplyInSelectedChatModeHook!.Original(agent); ReplyInSelectedChatModeHook!.Original(agent);
} }
private bool SetContextTellTarget(RaptureShellModule* a1, Utf8String* playerName, Utf8String* worldName, ushort worldId, ulong accountId, ulong contentId, ushort reason, bool setChatType) private bool SetContextTellTarget(
RaptureShellModule* a1,
Utf8String* playerName,
Utf8String* worldName,
ushort worldId,
ulong accountId,
ulong contentId,
ushort reason,
bool setChatType
)
{ {
if (playerName != null) if (playerName != null)
{ {
try try
{ {
var target = new TellTarget(playerName->ToString(), worldId, contentId, (TellReason) reason); var target = new TellTarget(
Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(new ChannelSwitchInfo(InputChannel.Tell, permanent: setChatType)) playerName->ToString(),
worldId,
contentId,
(TellReason)reason
);
Plugin.ChatLogWindow.Activated(
new ChatActivatedArgs(
new ChannelSwitchInfo(InputChannel.Tell, permanent: setChatType)
)
{ {
TellReason = (TellReason)reason, TellReason = (TellReason)reason,
TellTarget = target, TellTarget = target,
}); }
);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -297,10 +362,27 @@ internal sealed unsafe class Chat : IDisposable
} }
} }
return SetChatLogTellTargetHook!.Original(a1, playerName, worldName, worldId, accountId, contentId, reason, setChatType); return SetChatLogTellTargetHook!.Original(
a1,
playerName,
worldName,
worldId,
accountId,
contentId,
reason,
setChatType
);
} }
private void ContextMenuTellInForayDetour(RaptureShellModule* a1, Utf8String* playerName, Utf8String* worldName, ushort worldId, ulong accountId, ulong contentId, ushort reason) private void ContextMenuTellInForayDetour(
RaptureShellModule* a1,
Utf8String* playerName,
Utf8String* worldName,
ushort worldId,
ulong accountId,
ulong contentId,
ushort reason
)
{ {
if (!Plugin.CurrentTab.CurrentChannel.UseTempChannel) if (!Plugin.CurrentTab.CurrentChannel.UseTempChannel)
Plugin.CurrentTab.CurrentChannel.UseTempChannel = true; Plugin.CurrentTab.CurrentChannel.UseTempChannel = true;
@@ -309,13 +391,20 @@ internal sealed unsafe class Chat : IDisposable
{ {
try try
{ {
var target = new TellTarget(playerName->ToString(), worldId, contentId, (TellReason) reason); var target = new TellTarget(
Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(new ChannelSwitchInfo(InputChannel.Tell)) playerName->ToString(),
worldId,
contentId,
(TellReason)reason
);
Plugin.ChatLogWindow.Activated(
new ChatActivatedArgs(new ChannelSwitchInfo(InputChannel.Tell))
{ {
TellReason = (TellReason)reason, TellReason = (TellReason)reason,
TellTarget = target, TellTarget = target,
TellSpecial = Sheets.IsInForay(), // Handle Eureka/Bozja special TellSpecial = Sheets.IsInForay(), // Handle Eureka/Bozja special
}); }
);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -323,13 +412,18 @@ internal sealed unsafe class Chat : IDisposable
} }
} }
ContextMenuTellInForayHook!.Original(a1, playerName, worldName, worldId, accountId, contentId, reason); ContextMenuTellInForayHook!.Original(
a1,
playerName,
worldName,
worldId,
accountId,
contentId,
reason
);
} }
/// <summary> // Check if channel is valid (non-linkshell or existing linkshell)
/// Returns true if the channel is any non-linkshell channel, or if the
/// linkshell actually exists.
/// </summary>
internal static bool ValidAnyLinkshell(InputChannel channel) internal static bool ValidAnyLinkshell(InputChannel channel)
{ {
var idx = channel.LinkshellIndex(); var idx = channel.LinkshellIndex();
@@ -353,10 +447,15 @@ internal sealed unsafe class Chat : IDisposable
{ {
if (idx > 7) if (idx > 7)
return false; return false;
return InfoProxyCrossWorldLinkshell.Instance()->CrossWorldLinkshells[(int) idx].Name.Length > 0; return InfoProxyCrossWorldLinkshell.Instance()->CrossWorldLinkshells[(int)idx].Name.Length
> 0;
} }
private static uint? RotateLinkshell(uint currentIndex, RotateMode rotate, Func<uint, bool> validFn) private static uint? RotateLinkshell(
uint currentIndex,
RotateMode rotate,
Func<uint, bool> validFn
)
{ {
if (rotate == RotateMode.None) if (rotate == RotateMode.None)
return null; return null;
@@ -365,11 +464,10 @@ internal sealed unsafe class Chat : IDisposable
{ {
RotateMode.Forward => 1, RotateMode.Forward => 1,
RotateMode.Reverse => -1, RotateMode.Reverse => -1,
_ => 1 _ => 1,
}; };
// Iterate up to 8 times to find a valid linkshell. for (var i = 0; i < 8; i++) // Find valid linkshell within 8 iterations
for (var i = 0; i < 8; i++)
{ {
currentIndex = (uint)((8 + currentIndex + delta) % 8); currentIndex = (uint)((8 + currentIndex + delta) % 8);
if (validFn(currentIndex)) if (validFn(currentIndex))
@@ -379,30 +477,43 @@ internal sealed unsafe class Chat : IDisposable
return null; return null;
} }
internal static InputChannel? ResolveTempInputChannel(InputChannel? currentTempChannel, InputChannel channel, RotateMode rotate) internal static InputChannel? ResolveTempInputChannel(
InputChannel? currentTempChannel,
InputChannel channel,
RotateMode rotate
)
{ {
switch (channel) switch (channel)
{ {
case InputChannel.Linkshell1 or InputChannel.CrossLinkshell1 when rotate != RotateMode.None: case InputChannel.Linkshell1
or InputChannel.CrossLinkshell1 when rotate != RotateMode.None:
{ {
var module = UIModule.Instance(); var module = UIModule.Instance();
var currentIndex = channel is InputChannel.Linkshell1 ? (uint) module->LinkshellCycle : (uint) module->CrossWorldLinkshellCycle; var currentIndex =
channel is InputChannel.Linkshell1
? (uint)module->LinkshellCycle
: (uint)module->CrossWorldLinkshellCycle;
if (currentTempChannel != null) if (currentTempChannel != null)
{ {
switch (channel) switch (channel)
{ {
case InputChannel.Linkshell1 when currentTempChannel.Value.IsLinkshell(): case InputChannel.Linkshell1 when currentTempChannel.Value.IsLinkshell():
case InputChannel.CrossLinkshell1 when currentTempChannel.Value.IsCrossLinkshell(): case InputChannel.CrossLinkshell1
when currentTempChannel.Value.IsCrossLinkshell():
currentIndex = currentTempChannel.Value.LinkshellIndex(); currentIndex = currentTempChannel.Value.LinkshellIndex();
break; break;
} }
} }
var idx = RotateLinkshell(currentIndex, rotate, channel == InputChannel.Linkshell1 ? ValidLinkshell : ValidCrossLinkshell); var idx = RotateLinkshell(
currentIndex,
rotate,
channel == InputChannel.Linkshell1 ? ValidLinkshell : ValidCrossLinkshell
);
// RotateLinkshell returns null when no valid linkshell is found within 8 iterations. // RotateLinkshell returns null when no valid linkshell is found within 8 iterations.
// Forward the null so the caller can keep the existing channel instead of crashing on nullable arithmetic. // Forward the null so the caller can keep the existing channel instead of crashing on nullable arithmetic.
return idx is null ? null : channel + idx.Value; return idx is null ? null : channel + idx.Value; // null if not found, otherwise new channel
} }
default: default:
return channel; return channel;
@@ -411,11 +522,7 @@ internal sealed unsafe class Chat : IDisposable
internal void SetChannel(InputChannel channel, TellTarget? tellTarget = null) internal void SetChannel(InputChannel channel, TellTarget? tellTarget = null)
{ {
// ExtraChat linkshells aren't supported in game so we never want to // Ignore ExtraChat linkshells (use ChatLogWindow.SetChannel() instead)
// call the ChangeChatChannel function with them.
//
// Callers should call ChatLogWindow.SetChannel() which handles
// ExtraChat channels
if (channel.IsExtraChatLinkshell()) if (channel.IsExtraChatLinkshell())
return; return;
@@ -427,15 +534,22 @@ internal sealed unsafe class Chat : IDisposable
if (!ValidAnyLinkshell(channel)) if (!ValidAnyLinkshell(channel))
return; return;
RaptureShellModule.Instance()->ChangeChatChannel(tellTarget != null ? 17 : (int)channel, idx, target, true); RaptureShellModule
.Instance()
->ChangeChatChannel(tellTarget != null ? 17 : (int)channel, idx, target, true);
target->Dtor(true); target->Dtor(true);
} }
internal void SetEurekaTellChannel(string name, string worldName, ushort worldId, ulong accountId, ulong objectId, ushort reason, bool setChatType) internal void SetEurekaTellChannel(
string name,
string worldName,
ushort worldId,
ulong accountId,
ulong objectId,
ushort reason,
bool setChatType
)
{ {
// param6 is 0 for contentId and 1 for objectId
// param7 is always 0 ?
if (!Plugin.CurrentTab.CurrentChannel.UseTempChannel) if (!Plugin.CurrentTab.CurrentChannel.UseTempChannel)
Plugin.CurrentTab.CurrentChannel.UseTempChannel = true; Plugin.CurrentTab.CurrentChannel.UseTempChannel = true;
@@ -446,7 +560,17 @@ internal sealed unsafe class Chat : IDisposable
var utfName = Utf8String.FromString(name); var utfName = Utf8String.FromString(name);
var utfWorld = Utf8String.FromString(worldName); var utfWorld = Utf8String.FromString(worldName);
RaptureShellModule.Instance()->SetTellTargetInForay(utfName, utfWorld, worldId, accountId, objectId, reason, setChatType); RaptureShellModule
.Instance()
->SetTellTargetInForay(
utfName,
utfWorld,
worldId,
accountId,
objectId,
reason,
setChatType
);
utfName->Dtor(true); utfName->Dtor(true);
utfWorld->Dtor(true); utfWorld->Dtor(true);
@@ -475,19 +599,30 @@ internal sealed unsafe class Chat : IDisposable
mes->Dtor(true); mes->Dtor(true);
} }
internal void SendTell(TellReason reason, ulong contentId, string name, ushort homeWorld, byte[] message, string rawText) internal void SendTell(
TellReason reason,
ulong contentId,
string name,
ushort homeWorld,
byte[] message,
string rawText
)
{ {
if (contentId == 0) if (contentId == 0)
{ {
Plugin.ChatGui.PrintError(Language.Chat_SendTell_Error); Plugin.ChatGui.PrintError(Language.Chat_SendTell_Error);
Plugin.Log.Warning("Tried to send a tell with ContentId being 0, sorry this is an internal error."); Plugin.Log.Warning(
"Tried to send a tell with ContentId being 0, sorry this is an internal error."
);
return; return;
} }
var uName = Utf8String.FromString(name); var uName = Utf8String.FromString(name);
var uMessage = Utf8String.FromSequence(message.NullTerminate()); var uMessage = Utf8String.FromSequence(message.NullTerminate());
var encoded = Utf8String.FromUtf8String(PronounModule.Instance()->ProcessString(uMessage, true)); var encoded = Utf8String.FromUtf8String(
PronounModule.Instance()->ProcessString(uMessage, true)
);
var decoded = EncodeMessage(rawText); var decoded = EncodeMessage(rawText);
AutoTranslate.ReplaceWithPayload(ref decoded); AutoTranslate.ReplaceWithPayload(ref decoded);
@@ -500,9 +635,28 @@ internal sealed unsafe class Chat : IDisposable
if (reason == TellReason.Direct) if (reason == TellReason.Direct)
reason = TellReason.Friend; reason = TellReason.Friend;
var ok = SendTellNative(networkModule, contentId, homeWorld, uName, encoded, (ushort) reason, homeWorld); var ok = SendTellNative(
networkModule,
contentId,
homeWorld,
uName,
encoded,
(ushort)reason,
homeWorld
);
if (ok == 1) if (ok == 1)
PrintTellNative(logModule, 33, uName, &decodedUtf8String, 0, contentId, homeWorld, 255, 0, 0); PrintTellNative(
logModule,
33,
uName,
&decodedUtf8String,
0,
contentId,
homeWorld,
255,
0,
0
);
else else
Plugin.ChatGui.PrintError(Language.Chat_SendTell_Error); Plugin.ChatGui.PrintError(Language.Chat_SendTell_Error);
@@ -511,7 +665,8 @@ internal sealed unsafe class Chat : IDisposable
uMessage->Dtor(true); uMessage->Dtor(true);
} }
private static byte[] EncodeMessage(string str) { private static byte[] EncodeMessage(string str)
{
using var input = new Utf8String(str); using var input = new Utf8String(str);
using var output = new Utf8String(); using var output = new Utf8String();
@@ -557,20 +712,21 @@ internal sealed unsafe class Chat : IDisposable
return CurrentPlayerNameDisplayType switch return CurrentPlayerNameDisplayType switch
{ {
PlayerNameDisplayType.SurnameAbbreviated => $"{split.First()} {split.Last().FirstOrDefault('A')}.", PlayerNameDisplayType.SurnameAbbreviated =>
PlayerNameDisplayType.ForenameAbbreviated => $"{split.First().FirstOrDefault('A')}. {split.Last()}", $"{split.First()} {split.Last().FirstOrDefault('A')}.",
PlayerNameDisplayType.Initials => $"{split.First().FirstOrDefault('A')}. {split.Last().FirstOrDefault('A')}.", PlayerNameDisplayType.ForenameAbbreviated =>
_ => playerName $"{split.First().FirstOrDefault('A')}. {split.Last()}",
PlayerNameDisplayType.Initials =>
$"{split.First().FirstOrDefault('A')}. {split.Last().FirstOrDefault('A')}.",
_ => playerName,
}; };
} }
internal bool CheckHideFlags() internal bool CheckHideFlags()
{ {
// Only hide the chat in a cutscene when the vanilla chat would've // Only hide chat in cutscene when vanilla chat would also be hidden
// also been hidden. This prevents Chat 2 from hiding for a split
// second before the cutscene actually starts, because the game sets
// the cutscene conditions before processing the skip.
var raptureAtkUnitManager = RaptureAtkUnitManager.Instance(); var raptureAtkUnitManager = RaptureAtkUnitManager.Instance();
return raptureAtkUnitManager == null || raptureAtkUnitManager->UiFlags.HasFlag(UiFlags.Chat); return raptureAtkUnitManager == null
|| raptureAtkUnitManager->UiFlags.HasFlag(UiFlags.Chat);
} }
} }
+13 -6
View File
@@ -1,8 +1,8 @@
using System.Text; using System.Text;
using HellionChat.Resources;
using Dalamud.Memory; using Dalamud.Memory;
using FFXIVClientStructs.FFXIV.Client.System.String; using FFXIVClientStructs.FFXIV.Client.System.String;
using FFXIVClientStructs.FFXIV.Client.UI; using FFXIVClientStructs.FFXIV.Client.UI;
using HellionChat.Resources;
namespace HellionChat.GameFunctions; namespace HellionChat.GameFunctions;
@@ -15,7 +15,15 @@ public unsafe class ChatBox
mes->Dtor(true); mes->Dtor(true);
} }
public static void SendMessage(string message) public static void SendMessage(string message) => SendMessageUnsafe(ValidateMessage(message));
// sanitiserOverride allows xUnit to bypass Utf8String->SanitizeString (game memory only).
// Returns encoded bytes so SendMessage avoids a second GetBytes call.
// TEST-MIRROR: ../../../Hellion Build test/GameFunctions/ChatBoxTests.cs
internal static byte[] ValidateMessage(
string message,
Func<string, string>? sanitiserOverride = null
)
{ {
var bytes = Encoding.UTF8.GetBytes(message); var bytes = Encoding.UTF8.GetBytes(message);
if (bytes.Length == 0) if (bytes.Length == 0)
@@ -24,20 +32,19 @@ public unsafe class ChatBox
if (bytes.Length > 500) if (bytes.Length > 500)
throw new ArgumentException(Language.ChatBox_Error_Too_Long, nameof(message)); throw new ArgumentException(Language.ChatBox_Error_Too_Long, nameof(message));
if (message.Length != SanitiseText(message).Length) var sanitiser = sanitiserOverride ?? SanitiseText;
if (message.Length != sanitiser(message).Length)
throw new ArgumentException(Language.ChatBox_Error_Invalid, nameof(message)); throw new ArgumentException(Language.ChatBox_Error_Invalid, nameof(message));
SendMessageUnsafe(bytes); return bytes;
} }
private static string SanitiseText(string text) private static string SanitiseText(string text)
{ {
var uText = Utf8String.FromString(text); var uText = Utf8String.FromString(text);
uText->SanitizeString((AllowedEntities)0x27F); uText->SanitizeString((AllowedEntities)0x27F);
var sanitised = uText->ToString(); var sanitised = uText->ToString();
uText->Dtor(true); uText->Dtor(true);
return sanitised; return sanitised;
} }
} }
+4 -2
View File
@@ -1,7 +1,7 @@
using HellionChat.Util;
using FFXIVClientStructs.FFXIV.Client.UI.Agent; using FFXIVClientStructs.FFXIV.Client.UI.Agent;
using FFXIVClientStructs.FFXIV.Client.UI.Info; using FFXIVClientStructs.FFXIV.Client.UI.Info;
using FFXIVClientStructs.FFXIV.Client.UI.Misc; using FFXIVClientStructs.FFXIV.Client.UI.Misc;
using HellionChat.Util;
namespace HellionChat.GameFunctions; namespace HellionChat.GameFunctions;
@@ -10,7 +10,9 @@ internal sealed unsafe class Context
internal static void InviteToNoviceNetwork(string name, ushort world) internal static void InviteToNoviceNetwork(string name, ushort world)
{ {
// can specify content id if we have it, but there's no need // can specify content id if we have it, but there's no need
InfoProxyNoviceNetwork.Instance()->InviteToNoviceNetwork(0, 0, world, name.ToTerminatedBytes()); InfoProxyNoviceNetwork
.Instance()
->InviteToNoviceNetwork(0, 0, world, name.ToTerminatedBytes());
} }
internal static void TryOn(uint itemId, byte stainId) internal static void TryOn(uint itemId, byte stainId)
+51 -63
View File
@@ -23,9 +23,17 @@ internal unsafe class GameFunctions : IDisposable
internal const string NewGamePlusAddonName = "QuestRedo"; internal const string NewGamePlusAddonName = "QuestRedo";
#region Hooks #region Hooks
[Signature("E8 ?? ?? ?? ?? 48 85 C0 0F 84 ?? ?? ?? ?? 48 8B D0 49 8D 4F", DetourName = nameof(ResolveTextCommandPlaceholderDetour))] [Signature(
"E8 ?? ?? ?? ?? 48 85 C0 0F 84 ?? ?? ?? ?? 48 8B D0 49 8D 4F",
DetourName = nameof(ResolveTextCommandPlaceholderDetour)
)]
private Hook<ResolveTextCommandPlaceholderDelegate>? ResolveTextCommandPlaceholderHook = null!; private Hook<ResolveTextCommandPlaceholderDelegate>? ResolveTextCommandPlaceholderHook = null!;
private delegate nint ResolveTextCommandPlaceholderDelegate(nint a1, byte* placeholderText, byte a3, byte a4); private delegate nint ResolveTextCommandPlaceholderDelegate(
nint a1,
byte* placeholderText,
byte a3,
byte a4
);
#endregion #endregion
private Plugin Plugin { get; } private Plugin Plugin { get; }
@@ -39,7 +47,6 @@ internal unsafe class GameFunctions : IDisposable
Chat = new Chat(Plugin); Chat = new Chat(Plugin);
Plugin.GameInteropProvider.InitializeFromAttributes(this); Plugin.GameInteropProvider.InitializeFromAttributes(this);
ResolveTextCommandPlaceholderHook?.Enable(); ResolveTextCommandPlaceholderHook?.Enable();
} }
@@ -47,41 +54,30 @@ internal unsafe class GameFunctions : IDisposable
{ {
Chat.Dispose(); Chat.Dispose();
KeybindManager.Dispose(); KeybindManager.Dispose();
ResolveTextCommandPlaceholderHook?.Dispose(); ResolveTextCommandPlaceholderHook?.Dispose();
Marshal.FreeHGlobal(PlaceholderNamePtr); Marshal.FreeHGlobal(PlaceholderNamePtr);
} }
internal void SendFriendRequest(string name, ushort world) internal void SendFriendRequest(string name, ushort world) =>
{
ListCommand(name, world, "friendlist"); ListCommand(name, world, "friendlist");
}
internal void AddToBlacklist(string name, ushort world) internal void AddToBlacklist(string name, ushort world) => ListCommand(name, world, "blist");
{
ListCommand(name, world, "blist");
}
internal void AddToMuteList(ulong accountId, ulong contentId, string name, short worldId) internal void AddToMuteList(ulong accountId, ulong contentId, string name, short worldId) =>
{
AgentMutelist.Instance()->Add(accountId, contentId, name, worldId); AgentMutelist.Instance()->Add(accountId, contentId, name, worldId);
}
internal void AddToTermsList(SeString content) internal void AddToTermsList(SeString content) =>
{
AgentTermFilter.Instance()->OpenNewFilterWindow(content.EncodeWithNullTerminator()); AgentTermFilter.Instance()->OpenNewFilterWindow(content.EncodeWithNullTerminator());
}
private void ListCommand(string name, ushort world, string commandName) private void ListCommand(string name, ushort world, string commandName)
{ {
var worldRow = Sheets.WorldSheet.GetRow(world); var worldRow = Sheets.WorldSheet.GetRow(world);
ReplacementName = $"{name}@{worldRow.Name.ToString()}"; ReplacementName = $"{name}@{worldRow.Name.ToString()}";
ChatBox.SendMessage($"/{commandName} add {Placeholder}"); ChatBox.SendMessage($"/{commandName} add {Placeholder}");
} }
private static T* GetAddon<T>(string name) where T : unmanaged private static T* GetAddon<T>(string name)
where T : unmanaged
{ {
var addon = RaptureAtkModule.Instance()->RaptureAtkUnitManager.GetAddonByName(name); var addon = RaptureAtkModule.Instance()->RaptureAtkUnitManager.GetAddonByName(name);
return addon != null && addon->IsReady ? (T*)addon : null; return addon != null && addon->IsReady ? (T*)addon : null;
@@ -99,7 +95,6 @@ internal unsafe class GameFunctions : IDisposable
{ {
for (var i = 0; i < 4; i++) for (var i = 0; i < 4; i++)
SetAddonInteractable($"ChatLogPanel_{i}", interactable); SetAddonInteractable($"ChatLogPanel_{i}", interactable);
SetAddonInteractable("ChatLog", interactable); SetAddonInteractable("ChatLog", interactable);
} }
@@ -115,7 +110,6 @@ internal unsafe class GameFunctions : IDisposable
var agent = AgentItemDetail.Instance(); var agent = AgentItemDetail.Instance();
var addon = GetAddon<AtkUnitBase>("ItemDetail"); var addon = GetAddon<AtkUnitBase>("ItemDetail");
// atkStage ain't gonna be null or we have bigger problems
if (agent == null || addon == null) if (agent == null || addon == null)
return; return;
@@ -124,23 +118,19 @@ internal unsafe class GameFunctions : IDisposable
agent->Index = 0; agent->Index = 0;
agent->Flag1 &= 0xEF; agent->Flag1 &= 0xEF;
agent->ItemId = id; agent->ItemId = id;
// agent->Flag2 = 1;
// agent->Flag3 = 0; // TODO: Revert when CS offset lands in a release build.
// TODO: Revert whenever CS is merged
*(byte*)((nint)agent + 0x21A) = 1; *(byte*)((nint)agent + 0x21A) = 1;
*(byte*)((nint)agent + 0x21E) = 0; *(byte*)((nint)agent + 0x21E) = 0;
// This just probably needs to be set
agent->AddonId = addon->Id; agent->AddonId = addon->Id;
// Skips early return
atkStage->TooltipManager.TooltipType |= 2; atkStage->TooltipManager.TooltipType |= 2;
addon->Show(false, 15); addon->Show(false, 15);
} }
internal static void CloseItemTooltip() internal static void CloseItemTooltip()
{ {
// hide addon first to prevent the "addon close" sound // Hide addon first to suppress the "addon close" sound.
var addon = GetAddon<AtkUnitBase>("ItemDetail"); var addon = GetAddon<AtkUnitBase>("ItemDetail");
if (addon != null) if (addon != null)
addon->Hide(true, false, 0); addon->Hide(true, false, 0);
@@ -158,14 +148,15 @@ internal unsafe class GameFunctions : IDisposable
internal static void OpenPartyFinder() internal static void OpenPartyFinder()
{ {
// this whole method: 6.05: 84433A (FF 97 ?? ?? ?? ?? 41 B4 01) // 6.05: 84433A (FF 97 ?? ?? ?? ?? 41 B4 01)
var lfg = AgentLookingForGroup.Instance(); var lfg = AgentLookingForGroup.Instance();
if (lfg->IsAgentActive()) if (lfg->IsAgentActive())
{ {
var addonId = lfg->GetAddonId(); var addonId = lfg->GetAddonId();
var atkModule = RaptureAtkModule.Instance(); var atkModule = RaptureAtkModule.Instance();
var atkModuleVtbl = (void**)atkModule->AtkModule.VirtualTable; var atkModuleVtbl = (void**)atkModule->AtkModule.VirtualTable;
var vf27 = (delegate* unmanaged<RaptureAtkModule*, ulong, ulong, byte>) atkModuleVtbl[27]; var vf27 = (delegate* unmanaged<RaptureAtkModule*, ulong, ulong, byte>)
atkModuleVtbl[27];
vf27(atkModule, addonId, 1); vf27(atkModule, addonId, 1);
} }
else else
@@ -178,15 +169,10 @@ internal unsafe class GameFunctions : IDisposable
} }
} }
internal static bool IsMentor() internal static bool IsMentor() => PlayerState.Instance()->IsMentor();
{
return PlayerState.Instance()->IsMentor();
}
internal static InfoProxyCommonList.CharacterData[] GetFriends() internal static InfoProxyCommonList.CharacterData[] GetFriends() =>
{ InfoProxyFriendList.Instance()->CharDataSpan.ToArray();
return InfoProxyFriendList.Instance()->CharDataSpan.ToArray();
}
internal static void OpenQuestLog(RowRef<Quest> quest) internal static void OpenQuestLog(RowRef<Quest> quest)
{ {
@@ -197,7 +183,14 @@ internal unsafe class GameFunctions : IDisposable
return; return;
} }
if (!uint.TryParse(splits[1], NumberStyles.Any, CultureInfo.InvariantCulture, out var questId)) if (
!uint.TryParse(
splits[1],
NumberStyles.Any,
CultureInfo.InvariantCulture,
out var questId
)
)
{ {
Plugin.ChatGui.Print("Unable to parse quest id"); Plugin.ChatGui.Print("Unable to parse quest id");
return; return;
@@ -206,20 +199,12 @@ internal unsafe class GameFunctions : IDisposable
AgentQuestJournal.Instance()->OpenForQuest(questId, 1); AgentQuestJournal.Instance()->OpenForQuest(questId, 1);
} }
internal static void OpenPartyFinder(uint id) internal static void OpenPartyFinder(uint id) =>
{
AgentLookingForGroup.Instance()->OpenListing(id); AgentLookingForGroup.Instance()->OpenListing(id);
}
internal static void OpenAchievement(uint id) internal static void OpenAchievement(uint id) => AgentAchievement.Instance()->OpenById(id);
{
AgentAchievement.Instance()->OpenById(id);
}
internal static bool IsInInstance() internal static bool IsInInstance() => Plugin.Condition[ConditionFlag.BoundByDuty56];
{
return Plugin.Condition[ConditionFlag.BoundByDuty56];
}
internal static bool TryOpenAdventurerPlate(ulong playerId) internal static bool TryOpenAdventurerPlate(ulong playerId)
{ {
@@ -238,10 +223,10 @@ internal unsafe class GameFunctions : IDisposable
internal static void ClickNoviceNetworkButton() internal static void ClickNoviceNetworkButton()
{ {
var agent = AgentChatLog.Instance(); var agent = AgentChatLog.Instance();
// case 3 var value = new AtkValue { Type = ValueType.Int, Int = 3 }; // case 3
var value = new AtkValue { Type = ValueType.Int, Int = 3, };
var result = 0; var result = 0;
var vf0 = *(delegate* unmanaged<AgentChatLog*, int*, AtkValue*, ulong, ulong, int*>*) agent->VirtualTable; var vf0 = *(delegate* unmanaged<AgentChatLog*, int*, AtkValue*, ulong, ulong, int*>*)
agent->VirtualTable;
vf0(agent, &result, &value, 0, 0); vf0(agent, &result, &value, 0, 0);
} }
@@ -250,11 +235,15 @@ internal unsafe class GameFunctions : IDisposable
private readonly string Placeholder = $"<{Guid.NewGuid():N}>"; private readonly string Placeholder = $"<{Guid.NewGuid():N}>";
private string? ReplacementName; private string? ReplacementName;
private nint ResolveTextCommandPlaceholderDetour(nint a1, byte* placeholderText, byte a3, byte a4) private nint ResolveTextCommandPlaceholderDetour(
nint a1,
byte* placeholderText,
byte a3,
byte a4
)
{ {
// The detour is only invoked through the hook, so the hook should // Hook field is nullable due to the Signature attribute, but will never
// never be null here, but the nullable field declaration forces us // be null during normal execution; guard covers the teardown race only.
// to handle the theoretical race during teardown.
if (ResolveTextCommandPlaceholderHook is null) if (ResolveTextCommandPlaceholderHook is null)
return nint.Zero; return nint.Zero;
@@ -262,20 +251,19 @@ internal unsafe class GameFunctions : IDisposable
if (ReplacementName == null || placeholder != Placeholder) if (ReplacementName == null || placeholder != Placeholder)
return ResolveTextCommandPlaceholderHook.Original(a1, placeholderText, a3, a4); return ResolveTextCommandPlaceholderHook.Original(a1, placeholderText, a3, a4);
// The fixed buffer is 128 bytes; UTF-8 + null-terminator must fit. // Guard against a malformed ReplacementName overflowing the 128-byte buffer.
// FFXIV player names plus an @World suffix should never approach this
// limit, but a malformed ReplacementName must not overflow the buffer.
var byteCount = System.Text.Encoding.UTF8.GetByteCount(ReplacementName); var byteCount = System.Text.Encoding.UTF8.GetByteCount(ReplacementName);
if (byteCount >= PlaceholderBufferSize) if (byteCount >= PlaceholderBufferSize)
{ {
Plugin.Log.Warning($"Replacement name too long for placeholder buffer ({byteCount} bytes >= {PlaceholderBufferSize}); falling back to original."); Plugin.Log.Warning(
$"Replacement name too long for placeholder buffer ({byteCount} bytes >= {PlaceholderBufferSize}); falling back to original."
);
ReplacementName = null; ReplacementName = null;
return ResolveTextCommandPlaceholderHook.Original(a1, placeholderText, a3, a4); return ResolveTextCommandPlaceholderHook.Original(a1, placeholderText, a3, a4);
} }
MemoryHelper.WriteString(PlaceholderNamePtr, ReplacementName); MemoryHelper.WriteString(PlaceholderNamePtr, ReplacementName);
ReplacementName = null; ReplacementName = null;
return PlaceholderNamePtr; return PlaceholderNamePtr;
} }
} }
+67 -21
View File
@@ -1,23 +1,25 @@
using System.Numerics; using System.Numerics;
using HellionChat.Code; using Dalamud.Bindings.ImGui;
using HellionChat.GameFunctions.Types;
using HellionChat.Util;
using Dalamud.Game.ClientState.Keys; using Dalamud.Game.ClientState.Keys;
using Dalamud.Game.Config; using Dalamud.Game.Config;
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.System.String; using FFXIVClientStructs.FFXIV.Client.System.String;
using FFXIVClientStructs.FFXIV.Client.UI; using FFXIVClientStructs.FFXIV.Client.UI;
using Dalamud.Bindings.ImGui; using HellionChat.Code;
using HellionChat.GameFunctions.Types;
using HellionChat.Util;
using ModifierFlag = HellionChat.GameFunctions.Types.ModifierFlag; using ModifierFlag = HellionChat.GameFunctions.Types.ModifierFlag;
namespace HellionChat.GameFunctions; namespace HellionChat.GameFunctions;
internal enum KeyboardSource { internal enum KeyboardSource
{
Game, Game,
ImGui ImGui,
} }
internal unsafe class KeybindManager : IDisposable { internal unsafe class KeybindManager : IDisposable
{
private Plugin Plugin { get; } private Plugin Plugin { get; }
internal bool DirectChat; internal bool DirectChat;
@@ -26,7 +28,8 @@ internal unsafe class KeybindManager : IDisposable {
private bool VanillaTextInputHasFocus; private bool VanillaTextInputHasFocus;
private readonly Dictionary<string, Keybind> Keybinds = new(); private readonly Dictionary<string, Keybind> Keybinds = new();
private static readonly IReadOnlyDictionary<string, ChannelSwitchInfo> KeybindsToIntercept = new Dictionary<string, ChannelSwitchInfo> private static readonly IReadOnlyDictionary<string, ChannelSwitchInfo> KeybindsToIntercept =
new Dictionary<string, ChannelSwitchInfo>
{ {
["CMD_CHAT"] = new(null), ["CMD_CHAT"] = new(null),
["CMD_COMMAND"] = new(null, text: "/"), ["CMD_COMMAND"] = new(null, text: "/"),
@@ -68,8 +71,16 @@ internal unsafe class KeybindManager : IDisposable {
["CMD_ALLIANCE_ALWAYS"] = new(InputChannel.Alliance, true), ["CMD_ALLIANCE_ALWAYS"] = new(InputChannel.Alliance, true),
["CMD_FREECOM_ALWAYS"] = new(InputChannel.FreeCompany, true), ["CMD_FREECOM_ALWAYS"] = new(InputChannel.FreeCompany, true),
["PVPTEAM_CHAT_ALWAYS"] = new(InputChannel.PvpTeam, true), ["PVPTEAM_CHAT_ALWAYS"] = new(InputChannel.PvpTeam, true),
["CMD_CWLINKSHELL_ALWAYS"] = new(InputChannel.CrossLinkshell1, true, RotateMode.Forward), ["CMD_CWLINKSHELL_ALWAYS"] = new(
["CMD_CWLINKSHELL_ALWAYS_REV"] = new(InputChannel.CrossLinkshell1, true, RotateMode.Reverse), InputChannel.CrossLinkshell1,
true,
RotateMode.Forward
),
["CMD_CWLINKSHELL_ALWAYS_REV"] = new(
InputChannel.CrossLinkshell1,
true,
RotateMode.Reverse
),
["CMD_CWLINKSHELL_1_ALWAYS"] = new(InputChannel.CrossLinkshell1, true), ["CMD_CWLINKSHELL_1_ALWAYS"] = new(InputChannel.CrossLinkshell1, true),
["CMD_CWLINKSHELL_2_ALWAYS"] = new(InputChannel.CrossLinkshell2, true), ["CMD_CWLINKSHELL_2_ALWAYS"] = new(InputChannel.CrossLinkshell2, true),
["CMD_CWLINKSHELL_3_ALWAYS"] = new(InputChannel.CrossLinkshell3, true), ["CMD_CWLINKSHELL_3_ALWAYS"] = new(InputChannel.CrossLinkshell3, true),
@@ -88,7 +99,7 @@ internal unsafe class KeybindManager : IDisposable {
["CMD_LINKSHELL_6_ALWAYS"] = new(InputChannel.Linkshell6, true), ["CMD_LINKSHELL_6_ALWAYS"] = new(InputChannel.Linkshell6, true),
["CMD_LINKSHELL_7_ALWAYS"] = new(InputChannel.Linkshell7, true), ["CMD_LINKSHELL_7_ALWAYS"] = new(InputChannel.Linkshell7, true),
["CMD_LINKSHELL_8_ALWAYS"] = new(InputChannel.Linkshell8, true), ["CMD_LINKSHELL_8_ALWAYS"] = new(InputChannel.Linkshell8, true),
["CMD_BEGINNER_ALWAYS"] = new(InputChannel.NoviceNetwork, true) ["CMD_BEGINNER_ALWAYS"] = new(InputChannel.NoviceNetwork, true),
}; };
// List of keys that can be used as a part of keybinds while the chat is // List of keys that can be used as a part of keybinds while the chat is
@@ -353,12 +364,22 @@ internal unsafe class KeybindManager : IDisposable {
return key.TryToImGui(out var imguiKey) && ImGui.IsKeyPressed(imguiKey); return key.TryToImGui(out var imguiKey) && ImGui.IsKeyPressed(imguiKey);
} }
private static bool ComboPressed(KeyboardSource source, VirtualKey key, ModifierFlag modifier, ModifierFlag? modifierState = null, bool modifiersOnly = false) private static bool ComboPressed(
KeyboardSource source,
VirtualKey key,
ModifierFlag modifier,
ModifierFlag? modifierState = null,
bool modifiersOnly = false
)
{ {
// When we're in an input, we don't want to process any keybinds that // When we're in an input, we don't want to process any keybinds that
// don't have a modifier (or only use shift) and are not explicitly // don't have a modifier (or only use shift) and are not explicitly
// whitelisted. // whitelisted.
if (modifiersOnly && !ModifierlessChatKeys.Contains(key) && modifier is ModifierFlag.None or ModifierFlag.Shift) if (
modifiersOnly
&& !ModifierlessChatKeys.Contains(key)
&& modifier is ModifierFlag.None or ModifierFlag.Shift
)
return false; return false;
modifierState ??= GetModifiers(source); modifierState ??= GetModifiers(source);
@@ -366,26 +387,43 @@ internal unsafe class KeybindManager : IDisposable {
{ {
KeybindMode.Strict => modifier == modifierState.Value, KeybindMode.Strict => modifier == modifierState.Value,
KeybindMode.Flexible => modifierState.Value.HasFlag(modifier), KeybindMode.Flexible => modifierState.Value.HasFlag(modifier),
_ => false _ => false,
}; };
return KeyPressed(source, key) && modifierPressed; return KeyPressed(source, key) && modifierPressed;
} }
private static bool ConfigKeybindPressed(KeyboardSource source, ConfigKeyBind? bind, ModifierFlag? modifierState = null, bool modifiersOnly = false) private static bool ConfigKeybindPressed(
KeyboardSource source,
ConfigKeyBind? bind,
ModifierFlag? modifierState = null,
bool modifiersOnly = false
)
{ {
return bind != null && ComboPressed(source, bind.Key, bind.Modifier, modifierState: modifierState, modifiersOnly: modifiersOnly); return bind != null
&& ComboPressed(
source,
bind.Key,
bind.Modifier,
modifierState: modifierState,
modifiersOnly: modifiersOnly
);
} }
private void HandleKeybinds(IFramework _) => HandleKeybinds(KeyboardSource.Game); private void HandleKeybinds(IFramework _) => HandleKeybinds(KeyboardSource.Game);
internal void HandleKeybinds(KeyboardSource source, bool ignoreChatOpen = false, bool modifiersOnly = false) internal void HandleKeybinds(
KeyboardSource source,
bool ignoreChatOpen = false,
bool modifiersOnly = false
)
{ {
// Refresh current keybinds every 5s // Refresh current keybinds every 5s
if (LastRefresh + 5 * 1000 < Environment.TickCount64) if (LastRefresh + 5 * 1000 < Environment.TickCount64)
{ {
UpdateKeybinds(); UpdateKeybinds();
DirectChat = Plugin.GameConfig.TryGet(UiControlOption.DirectChat, out bool option) && option; DirectChat =
Plugin.GameConfig.TryGet(UiControlOption.DirectChat, out bool option) && option;
LastRefresh = Environment.TickCount64; LastRefresh = Environment.TickCount64;
} }
@@ -433,7 +471,15 @@ internal unsafe class KeybindManager : IDisposable {
void Intercept(VirtualKey vk, ModifierFlag modifier) void Intercept(VirtualKey vk, ModifierFlag modifier)
{ {
if (!ComboPressed(source, vk, modifier, modifierState: modifierState, modifiersOnly: modifiersOnly)) if (
!ComboPressed(
source,
vk,
modifier,
modifierState: modifierState,
modifiersOnly: modifiersOnly
)
)
return; return;
var bits = BitOperations.PopCount((uint)modifier); var bits = BitOperations.PopCount((uint)modifier);
@@ -457,7 +503,7 @@ internal unsafe class KeybindManager : IDisposable {
try try
{ {
TellReason? reason = info.Channel == InputChannel.Tell ? TellReason.Reply : null; TellReason? reason = info.Channel == InputChannel.Tell ? TellReason.Reply : null;
Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(info) { TellReason = reason, }); Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(info) { TellReason = reason });
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -508,7 +554,7 @@ internal unsafe class KeybindManager : IDisposable {
{ {
VirtualKey.F23 => VirtualKey.OEM_2, // /? VirtualKey.F23 => VirtualKey.OEM_2, // /?
(VirtualKey)140 => VirtualKey.OEM_7, // '" (VirtualKey)140 => VirtualKey.OEM_7, // '"
_ => key _ => key,
}; };
} }
} }
+8 -5
View File
@@ -1,8 +1,8 @@
using HellionChat.Resources;
using HellionChat.Util;
using Dalamud.Interface.ImGuiNotification; using Dalamud.Interface.ImGuiNotification;
using FFXIVClientStructs.FFXIV.Client.UI.Agent; using FFXIVClientStructs.FFXIV.Client.UI.Agent;
using FFXIVClientStructs.FFXIV.Client.UI.Info; using FFXIVClientStructs.FFXIV.Client.UI.Info;
using HellionChat.Resources;
using HellionChat.Util;
namespace HellionChat.GameFunctions; namespace HellionChat.GameFunctions;
@@ -11,7 +11,8 @@ internal static unsafe class Party
internal static void InviteSameWorld(string name, ushort world, ulong contentId) internal static void InviteSameWorld(string name, ushort world, ulong contentId)
{ {
// this only works if target is on the same world // this only works if target is on the same world
fixed (byte* namePtr = name.ToTerminatedBytes()) { fixed (byte* namePtr = name.ToTerminatedBytes())
{
InfoProxyPartyInvite.Instance()->InviteToParty(contentId, namePtr, world); InfoProxyPartyInvite.Instance()->InviteToParty(contentId, namePtr, world);
} }
} }
@@ -44,14 +45,16 @@ internal static unsafe class Party
internal static void Kick(string name, ulong contentId) internal static void Kick(string name, ulong contentId)
{ {
fixed (byte* namePtr = name.ToTerminatedBytes()) { fixed (byte* namePtr = name.ToTerminatedBytes())
{
AgentPartyMember.Instance()->Kick(namePtr, 0, contentId); AgentPartyMember.Instance()->Kick(namePtr, 0, contentId);
} }
} }
internal static void Promote(string name, ulong contentId) internal static void Promote(string name, ulong contentId)
{ {
fixed (byte* namePtr = name.ToTerminatedBytes()) { fixed (byte* namePtr = name.ToTerminatedBytes())
{
AgentPartyMember.Instance()->Promote(namePtr, 0, contentId); AgentPartyMember.Instance()->Promote(namePtr, 0, contentId);
} }
} }
@@ -2,13 +2,19 @@ using HellionChat.Code;
namespace HellionChat.GameFunctions.Types; namespace HellionChat.GameFunctions.Types;
internal class ChannelSwitchInfo { internal class ChannelSwitchInfo
{
internal InputChannel? Channel { get; } internal InputChannel? Channel { get; }
internal bool Permanent { get; } internal bool Permanent { get; }
internal RotateMode Rotate { get; } internal RotateMode Rotate { get; }
internal string? Text { get; } internal string? Text { get; }
internal ChannelSwitchInfo(InputChannel? channel, bool permanent = false, RotateMode rotate = RotateMode.None, string? text = null) internal ChannelSwitchInfo(
InputChannel? channel,
bool permanent = false,
RotateMode rotate = RotateMode.None,
string? text = null
)
{ {
Channel = channel; Channel = channel;
Permanent = permanent; Permanent = permanent;
@@ -19,14 +19,14 @@ public class TellTarget
Reason = reason; Reason = reason;
} }
public bool IsSet() public bool IsSet() => !string.IsNullOrEmpty(Name) && World > 0;
=> !string.IsNullOrEmpty(Name) && World > 0;
public string ToWorldString() public string ToWorldString() =>
=> Sheets.WorldSheet.TryGetRow(World, out var worldRow) ? worldRow.Name.ToString() : string.Empty; Sheets.WorldSheet.TryGetRow(World, out var worldRow)
? worldRow.Name.ToString()
: string.Empty;
public string ToTargetString() public string ToTargetString() => $"{Name}@{ToWorldString()}";
=> $"{Name}@{ToWorldString()}";
public unsafe void FromTarget(IPlayerCharacter target) public unsafe void FromTarget(IPlayerCharacter target)
{ {
@@ -39,5 +39,6 @@ public class TellTarget
} }
public static TellTarget Empty() => new(string.Empty, 0, 0, TellReason.Direct); public static TellTarget Empty() => new(string.Empty, 0, 0, TellReason.Direct);
public static TellTarget From(TellTarget t) => new(t.Name, t.World, t.ContentId, t.Reason); public static TellTarget From(TellTarget t) => new(t.Name, t.World, t.ContentId, t.Reason);
} }
+9 -43
View File
@@ -1,36 +1,21 @@
<Project Sdk="Dalamud.NET.Sdk/15.0.0"> <Project Sdk="Dalamud.NET.Sdk/15.0.0">
<PropertyGroup> <PropertyGroup>
<!-- Hellion Chat versioning runs separately from upstream Chat 2. <!-- Independent versioning; see yaml changelog for upstream Chat 2 base -->
0.1.0 is our bootstrap release; the underlying Chat 2 base is <Version>1.4.3</Version>
called out in the yaml changelog so users can see what it
derives from. -->
<Version>1.4.0</Version>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<!-- Honor packages.lock.json on restore so floating version ranges <!-- Use lock file to pin exact versions -->
don't silently drift between machines or CI runs. -->
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile> <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<!-- v1.0.0 standalone cut — both AssemblyName and RootNamespace <!-- v1.0.0+: standalone fork, no upstream cherry-pick compatibility -->
are HellionChat. The plugin no longer maintains source-level
cherry-pick compatibility with upstream Infiziert90/ChatTwo;
upstream changes are integrated manually if at all. -->
<AssemblyName>HellionChat</AssemblyName> <AssemblyName>HellionChat</AssemblyName>
<RootNamespace>HellionChat</RootNamespace> <RootNamespace>HellionChat</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<!-- Closed ranges on packages with breaking-change history block a <!-- Closed ranges prevent surprise major bumps during lock file regeneration -->
surprise major bump when the lock file is regenerated. The
lock file pins the exact version per build; the upper bound
keeps the unlock path from drifting across major lines. -->
<PackageReference Include="MessagePack" Version="[3.1.4, 4.0.0)" /> <PackageReference Include="MessagePack" Version="[3.1.4, 4.0.0)" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.7" /> <PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.7" />
<!-- Override the transitively-referenced native SQLite build to one <!-- SQLitePCLRaw override for CVE-2025-6965, CVE-2025-7709 (SQLite >= 3.50.3) -->
that ships SQLite >= 3.50.3 (CVE-2025-6965 memory corruption,
CVE-2025-7709 fixed in 3.50.x). Microsoft.Data.Sqlite 10.0.7
pulls SQLitePCLRaw 2.1.11 which carries the older lib; pinning
the lib package directly forces the newer native binary
without a major bump on the managed wrapper. -->
<PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" Version="3.50.3" /> <PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" Version="3.50.3" />
<PackageReference Include="morelinq" Version="4.4.0" /> <PackageReference Include="morelinq" Version="4.4.0" />
<PackageReference Include="Pidgin" Version="[3.5.1, 4.0.0)" /> <PackageReference Include="Pidgin" Version="[3.5.1, 4.0.0)" />
@@ -38,9 +23,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<!-- Pure-function test suites in HellionChat.Tests need access to <!-- Test assembly needs access to internal helpers (not redistributed) -->
the internal helper classes (StringUtil, UriPayload, Tokenizer
etc.). Test assembly does not get redistributed. -->
<InternalsVisibleTo Include="HellionChat.Tests" /> <InternalsVisibleTo Include="HellionChat.Tests" />
</ItemGroup> </ItemGroup>
@@ -59,15 +42,7 @@
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
<!-- HellionChat — Hellion-specific resource bundle (HellionStrings.resx <!-- Embedded resources: Hellion font (Exo 2, OFL-1.1) + manifest resource -->
+ HellionStrings.<lang>.resx) is picked up automatically by the SDK
default include. Designer.cs is hand-maintained, no auto-gen needed. -->
<!-- Bundled Hellion font (Exo 2, OFL-1.1). Embedded as a manifest
resource with a fixed LogicalName so FontManager can pull the
bytes back at runtime via AddFontFromMemory. The OFL license
text travels with it inside the assembly to satisfy the
"license must be distributed with the font" clause. -->
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="Resources\HellionFont.ttf"> <EmbeddedResource Include="Resources\HellionFont.ttf">
<LogicalName>HellionFont.ttf</LogicalName> <LogicalName>HellionFont.ttf</LogicalName>
@@ -80,19 +55,10 @@
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
<!-- Plugin icon: copy images/* to output for Dalamud discovery -->
<!-- Plugin icon. Copy images/* into the build output so Dalamud
finds the icon next to the DLL, and let the SDK default
DalamudPackager pipeline include the same path in the
release ZIP. Earlier we shipped a custom DalamudPackager
targets override that explicitly set HandleImages and
ImagesPath; that override conflicted with the SDK 15
default and the resulting manifest carried no IconUrl.
Removed in v0.5.2. -->
<ItemGroup> <ItemGroup>
<None Include="images\**"> <None Include="images\**">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
</ItemGroup> </ItemGroup>
</Project> </Project>
+42 -132
View File
@@ -1,69 +1,33 @@
name: Hellion Chat name: Hellion Chat
author: JonKazama-Hellion author: Jon Kazama (Hellion Forge)
punchline: Chat replacement with privacy controls aligned to EU, US and JP rules — based on Chat 2 (EUPL-1.2) punchline: A Hellion Forge plugin — privacy-focused chat replacement for FFXIV, built for EU, US and JP data rules.
description: |- description: |-
Hellion Chat is a privacy-focused chat replacement for FINAL FANTASY XIV Chat replacement for FINAL FANTASY XIV with privacy controls built around
based on the Chat 2 codebase (EUPL-1.2). One feature is intentionally EU, US and JP data-protection rules.
removed (the optional webinterface) and a stack of privacy controls is
added on top. Tabs, channel filters, RGB colours, emotes, screenshot
mode, IPC integration and the chat replacement window itself work the
same. The webinterface is intentionally not part of Hellion Chat because
it serves a different use case from the smaller default footprint this
plugin is built around.
On top of that, Hellion Chat adds privacy and data-handling controls By default only your own conversations are stored. Public chat, NPC
designed to align with the modern data protection rules that apply dialogue and system messages stay out of the database unless you opt in.
across the EU, the United States and Japan. By default only your own Retention windows are configurable per channel, history can be wiped
conversations are stored; messages from strangers, NPCs and system retroactively, and everything can be exported on demand.
spam stay out of the database. Retention windows are configurable per
channel, history can be wiped retroactively, and stored data can be
exported on demand.
Key privacy and data-handling features:
Features:
- Channel whitelist with a Privacy-First default - Channel whitelist with a Privacy-First default
- Per-channel retention with a daily background sweep - Per-channel retention with a daily background sweep
- Retroactive cleanup with a Ctrl+Shift confirm - Retroactive cleanup (Ctrl+Shift confirm)
- Export to Markdown, JSON or CSV - Export to Markdown, JSON or CSV
- First-run wizard with three preset profiles (Privacy-First, Casual, - First-run wizard with three preset profiles
Full History) - Bilingual UI (EN/DE) with live language switching
- Bilingual UI (English and German) with live language switching - Own config and database — no shared state with other plugins
- Independent plugin state — own config file and database directory,
so Hellion Chat does not share state with upstream Chat 2
v1.1.0 — Theme engine with five built-in themes (Hellion Arctic, Based on Chat 2 by Infi and Anna (EUPL-1.2).
Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint Grove) plus Support: https://discord.gg/X9V7Kcv5gR
JSON-based custom-theme authoring. Settings rebuilt around a card repo_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat
grid with section detail views. See docs/THEME-AUTHORING.md.
v1.2.3 — Theme catalogue grown to nine built-in themes:
Hellion Arctic, Hellion Spectrum (CVD-safe Deuteran/Protan),
Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint Grove,
Night Blue, Indigo Violet, Forge Merchantman.
v1.3.0 First plugin integration cycle. Honorific custom titles
are shown in the chat header above the message log, with auto-detect
and silent fallback when Honorific is not installed.
v1.4.0 — Critical Lifecycle Fixes. Plugin reload and shutdown
are cleaner: SQLite no longer leans on GC pressure to release
its file, worker threads are explicitly background, deferred
config saves no longer get lost mid-disable, and pre-v13 config
backups carry the user's custom theme opacity into the v14 schema
instead of falling back to the default.
Based on Chat 2 by Infi and Anna, licensed under EUPL-1.2.
Modding & support: join the Hellion Forge Discord at
https://discord.gg/X9V7Kcv5gR — community for Hellion Chat and
other Hellion Online Media plugins/tools.
repo_url: https://github.com/JonKazama-Hellion/HellionChat
accepts_feedback: true accepts_feedback: true
icon_url: https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/icon.png icon_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/icon.png
image_urls: image_urls:
- https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/chatWindow.png - https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/chatWindow.png
- https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/settingsOverview.png - https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/settingsOverview.png
- https://raw.githubusercontent.com/JonKazama-Hellion/HellionChat/main/HellionChat/images/themesPicker.png - https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/themesPicker.png
tags: tags:
- Social - Social
- UI - UI
@@ -71,84 +35,30 @@ tags:
- Replacement - Replacement
- Privacy - Privacy
changelog: |- changelog: |-
**Hellion Chat 1.4.0Critical Lifecycle Fixes** **v1.4.3Faster plugin load + new repo (2026-05-08)**
First sub-patch of the v1.4.x Polish Sweep series. Seven Heavy startup work (migrations, hooks, windows) now runs async so
known lifecycle and race bugs eliminated before any Dalamud's UI stays responsive during load. Load time is comparable
performance refactor sits on top. to v1.4.2 — this is the foundation for v1.4.4 optimisations.
- MessageStore disposal no longer triggers GC.Collect - Two-phase async load via IAsyncDalamudPlugin
globally; Pooling=false on the SQLite connection means - Schema-gate replaces the v9→v16 migration chain; old configs
there's nothing left to clean up by hand require a v1.4.2 install first
- PendingMessage and RetentionSweep worker threads are - AutoTranslate cache loads on first use instead of every startup
explicitly marked IsBackground=true so the plugin domain - Custom font (Hellion-Exo2) appears with a brief pop after load
can unload during XIVLauncher reload without waiting - Repo moved to gitea.hellion-forge.cloud — update your custom-repo URL
for them
- EmoteCache image and gif loaders moved from async-void
to async Task with a shared task tracker, draining
on Dispose so an in-flight load can no longer write
to a disposed EmoteImages entry
- DisposeAsync 10s timeout now warns loudly instead of
silently leaving the worker behind
- Plugin.Dispose flushes any pending DeferredSaveFrames
before tearing services down, so settings changes
made in the last few frames before disable are no
longer lost
- The v13→v14 config migration now reads the pre-v13
backup and carries HellionThemeWindowOpacity into the
new WindowOpacity field instead of falling back to
the default 0.85
Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
**Hellion Chat 1.3.0 - Plugin Integrations: Honorific**
First step on the plugin-integration roadmap. HellionChat now
listens to Honorific and shows your custom title in the chat
header. The slot auto-hides when Honorific is not installed,
when no custom title is active, or when you are using the
original FFXIV title.
- New "Integrations" settings tab
- Honorific integration with auto-detection and live updates
- "Coming soon" preview of the next five planned integrations:
context menu actions, smart notifications, RP status block,
ExtraChat channels, and quick DM compose
- Maintainer attribution buttons for Honorific repo and Caraxi
- New service-class pattern under HellionChat/Integrations/
Modding and support: join Hellion Forge - https://discord.gg/X9V7Kcv5gR
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
**Hellion Chat 1.2.3 — Theme Expansion**
Four new built-in themes round out the picker. No engine changes,
no settings touched — just more colour options.
- **Night Blue** — Royal Blue on deep marine. Cool tech-dashboard
mood, distinct from the brand themes.
- **Indigo Violet** — Royal Violet on deep indigo with a turquoise-
mint counter for an aurora glitter feel. Sister to Event Horizon
but darker and denser; the turquoise accent keeps the two
distinguishable.
- **Forge Merchantman** — Patina bronze on workshop slate, warm
amber counter. Hellion Forge given a theme of its own — sister
to Hellion Arctic but greener and warmer instead of cold cyan.
- **Hellion Spectrum** — Deuteran/Protan-safe channel colours
using Wong/Okabe-Ito palette tones. Channel identity (Tell pink,
Yell yellow, Shout orange, Party blue, FC green) is preserved;
tones are chosen so each channel stays distinguishable under
red-green colour vision deficiency. Covers the ~99% of CVD cases
that are red-green.
No schema bump, no migration. Default theme is unchanged (Hellion
Arctic). Existing custom themes keep working.
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
--- ---
Earlier history: https://github.com/JonKazama-Hellion/HellionChat/releases **v1.4.2 — Smoother frames in the chat log**
Per-frame allocations in the chat-log render path eliminated.
25% frame-time recovery in typical scenes, more on pop-out-heavy setups.
- Card-mode: theme/border invariants hoisted out of the per-message loop
- Auto-tell tab tint and icon cached per tab
- Status bar aggregation runs on ~1% of frames instead of every frame
---
Full history: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases
+3 -10
View File
@@ -2,14 +2,8 @@ using System.Collections.Generic;
namespace HellionChat; namespace HellionChat;
// Hellion Chat — v0.6.0 shared input history. Replaces the embedded // Shared input history for all ChatInputBars (main and pop-out windows).
// ChatLogWindow.InputBacklog so that pop-out windows with their own // Push deduplicates: existing entries are moved to the end when re-added.
// ChatInputBar can navigate the same Up/Down history as the main window.
// Index semantics are kept identical to the v0.5.x InputBacklog:
// index 0 = oldest entry
// index Count - 1 = newest entry
// Push performs move-to-newest deduplication: existing entries are
// removed before the new one is appended at the end.
public static class InputHistoryService public static class InputHistoryService
{ {
private const int MaxSize = 30; private const int MaxSize = 30;
@@ -26,8 +20,7 @@ public static class InputHistoryService
var trimmed = entry.Trim(); var trimmed = entry.Trim();
// Move-to-newest: existing entries are removed before the append // Move-to-newest: remove existing entry before adding at the end
// so the same line typed twice does not occupy two history slots.
for (var i = 0; i < _entries.Count; i++) for (var i = 0; i < _entries.Count; i++)
{ {
if (_entries[i] == trimmed) if (_entries[i] == trimmed)
+59 -108
View File
@@ -6,25 +6,17 @@ using Newtonsoft.Json;
namespace HellionChat.Integrations; namespace HellionChat.Integrations;
// We pull Newtonsoft.Json into this single file for IPC compatibility: // Newtonsoft.Json is used here for IPC compatibility with Honorific, which
// Honorific serialises its TitleData with Newtonsoft (see // serialises TitleData with it. It's a transitive Dalamud dependency — no
// Honorific-master/IpcProvider.cs:9 and CustomTitle.cs:12). Using the // new NuGet entry needed. The rest of HellionChat uses System.Text.Json.
// same library guarantees identical handling of System.Numerics.Vector3?
// and the enum fields we ignore. Newtonsoft is a transitive dependency
// via Dalamud, so no new NuGet entry is needed. The rest of HellionChat
// keeps using System.Text.Json.
internal sealed class HonorificService : IDisposable internal sealed class HonorificService : IDisposable
{ {
private const string IpcNamespace = "Honorific"; private const string IpcNamespace = "Honorific";
// Major version of the Honorific IPC contract HellionChat is built against. // Major version of the Honorific IPC contract we're built against.
// Used both by the runtime compatibility check and by the settings tab when
// it tells the user which major version we expected, so the literal lives
// in exactly one place.
internal const uint ExpectedApiMajor = 3; internal const uint ExpectedApiMajor = 3;
// IPC gates we subscribe to. Keep them as fields so Dispose can // IPC gates — kept as fields so Dispose can unsubscribe the same instances.
// unsubscribe the same instances we subscribed in the constructor.
private readonly ICallGateSubscriber<(uint, uint)> _apiVersion; private readonly ICallGateSubscriber<(uint, uint)> _apiVersion;
private readonly ICallGateSubscriber<string> _getLocalCharacterTitle; private readonly ICallGateSubscriber<string> _getLocalCharacterTitle;
private readonly ICallGateSubscriber<string, object> _localCharacterTitleChanged; private readonly ICallGateSubscriber<string, object> _localCharacterTitleChanged;
@@ -39,38 +31,29 @@ internal sealed class HonorificService : IDisposable
public bool IsAvailable { get; private set; } public bool IsAvailable { get; private set; }
public (uint Major, uint Minor)? DetectedApiVersion { get; private set; } public (uint Major, uint Minor)? DetectedApiVersion { get; private set; }
public HonorificService(IDalamudPluginInterface pluginInterface, IPluginLog log, IFramework framework) public HonorificService(
IDalamudPluginInterface pluginInterface,
IPluginLog log,
IFramework framework
)
{ {
_framework = framework; _framework = framework;
_log = log; _log = log;
// Dalamud caches gate objects per-name for the lifetime of the // Gate objects are cached per-name by Dalamud and safe to register
// plugin interface, so we can register subscribers even when // before Honorific loads — they just won't fire until it does.
// Honorific isn't loaded yet — the gate just won't fire. Calling // Initial pull is scheduled on the framework thread because plugin
// InvokeFunc before Honorific is up will throw, which is why the // constructors run on the loader thread, and Honorific's IPC handlers
// initial pull below is wrapped in try-catch. // read ObjectTable.LocalPlayer which throws off the framework thread.
// _apiVersion = pluginInterface.GetIpcSubscriber<(uint, uint)>($"{IpcNamespace}.ApiVersion");
// Thread-context: plugin constructors run on Dalamud's plugin-loader _getLocalCharacterTitle = pluginInterface.GetIpcSubscriber<string>(
// thread, NOT the framework thread. Honorific's IPC handlers read $"{IpcNamespace}.GetLocalCharacterTitle"
// ObjectTable.LocalPlayer (Honorific IpcProvider.cs:61), which throws );
// "Not on main thread!" outside the framework thread. If Honorific is _localCharacterTitleChanged = pluginInterface.GetIpcSubscriber<string, object>(
// already loaded when HellionChat starts, a synchronous InvokeFunc $"{IpcNamespace}.LocalCharacterTitleChanged"
// here would surface that exception, the broad catch below would );
// mark IsAvailable=false, and OnTitleChanged's `if (!IsAvailable)` _ready = pluginInterface.GetIpcSubscriber<object>($"{IpcNamespace}.Ready");
// gate would block every subsequent title update. We therefore _disposing = pluginInterface.GetIpcSubscriber<object>($"{IpcNamespace}.Disposing");
// schedule the initial pull onto the framework thread via
// IFramework.RunOnFrameworkThread so the IPC call sees the right
// thread context.
_apiVersion = pluginInterface
.GetIpcSubscriber<(uint, uint)>($"{IpcNamespace}.ApiVersion");
_getLocalCharacterTitle = pluginInterface
.GetIpcSubscriber<string>($"{IpcNamespace}.GetLocalCharacterTitle");
_localCharacterTitleChanged = pluginInterface
.GetIpcSubscriber<string, object>($"{IpcNamespace}.LocalCharacterTitleChanged");
_ready = pluginInterface
.GetIpcSubscriber<object>($"{IpcNamespace}.Ready");
_disposing = pluginInterface
.GetIpcSubscriber<object>($"{IpcNamespace}.Disposing");
_localCharacterTitleChanged.Subscribe(OnTitleChanged); _localCharacterTitleChanged.Subscribe(OnTitleChanged);
_ready.Subscribe(OnReady); _ready.Subscribe(OnReady);
@@ -81,11 +64,8 @@ internal sealed class HonorificService : IDisposable
public void Dispose() public void Dispose()
{ {
// Honorific may already be gone by the time we dispose. Wrap each // Wrap each unsubscribe — a missing gate must not block the others.
// unsubscribe so a missing gate doesn't prevent the others from // Leaking a subscription keeps this service alive across plugin reloads.
// unsubscribing — leaking even one subscription leaves a callback
// alive that captures `this`, which keeps the whole service alive
// and breaks plugin reload.
TryUnsubscribe(() => _localCharacterTitleChanged.Unsubscribe(OnTitleChanged)); TryUnsubscribe(() => _localCharacterTitleChanged.Unsubscribe(OnTitleChanged));
TryUnsubscribe(() => _ready.Unsubscribe(OnReady)); TryUnsubscribe(() => _ready.Unsubscribe(OnReady));
TryUnsubscribe(() => _disposing.Unsubscribe(OnDisposing)); TryUnsubscribe(() => _disposing.Unsubscribe(OnDisposing));
@@ -103,9 +83,11 @@ internal sealed class HonorificService : IDisposable
if (!_versionWarningLogged) if (!_versionWarningLogged)
{ {
_log.Warning( _log.Warning(
"Honorific API version mismatch — expected major 3, " + "Honorific API version mismatch — expected major 3, "
"found {Major}.{Minor}. Disabling Honorific integration.", + "found {Major}.{Minor}. Disabling Honorific integration.",
version.Item1, version.Item2); version.Item1,
version.Item2
);
_versionWarningLogged = true; _versionWarningLogged = true;
} }
IsAvailable = false; IsAvailable = false;
@@ -114,62 +96,38 @@ internal sealed class HonorificService : IDisposable
IsAvailable = true; IsAvailable = true;
_versionWarningLogged = false; _versionWarningLogged = false;
// Pull the current title once at startup; from here on we rely
// on LocalCharacterTitleChanged events.
var json = _getLocalCharacterTitle.InvokeFunc(); var json = _getLocalCharacterTitle.InvokeFunc();
CurrentTitle = ParseTitleJson(json); CurrentTitle = ParseTitleJson(json);
} }
catch (Exception ex) catch (Exception ex)
{ {
// Honorific isn't installed or hasn't initialised yet. The Ready // Honorific not installed or not yet initialised — Ready will retry.
// event will give us a second chance later. Log at Debug so
// users without Honorific don't see noise on every reload.
_log.Debug(ex, "Honorific not available at HellionChat startup; awaiting Ready."); _log.Debug(ex, "Honorific not available at HellionChat startup; awaiting Ready.");
IsAvailable = false; IsAvailable = false;
CurrentTitle = null; CurrentTitle = null;
} }
} }
// Honorific fires LocalCharacterTitleChanged through its nameplate hook
// (Honorific-master/Plugin.cs:665), which means we get title updates on
// character switches automatically as soon as the new character is
// rendered. While the user is in the character-select menu, HellionChat's
// window is hidden by default via HideWhenNotLoggedIn (Configuration.cs:152),
// so the stale-title window between logout and login isn't user-visible.
private void OnTitleChanged(string json) private void OnTitleChanged(string json)
{ {
// Don't update cached state when we've already decided we can't trust // Skip updates on version mismatch; subscription stays live for reload.
// Honorific (e.g. version mismatch). Subscription stays live in case a if (!IsAvailable)
// compatible Honorific reloads, in which case Ready triggers TryInitialPull return;
// and sets IsAvailable back to true.
if (!IsAvailable) return;
CurrentTitle = ParseTitleJson(json); CurrentTitle = ParseTitleJson(json);
} }
private void OnReady() private void OnReady()
{ {
// Honorific loaded after HellionChat; redo the version check and // Schedule on framework thread — NotifyReady can dispatch from any thread.
// initial pull. Idempotent on purpose — Honorific can fire Ready
// more than once across reloads.
//
// Honorific's NotifyReady may dispatch from any thread, and
// TryInitialPull eventually calls IPC handlers that read
// ObjectTable.LocalPlayer — same "Not on main thread!" hazard as
// the constructor path. Schedule onto the framework thread.
_framework.RunOnFrameworkThread(TryInitialPull); _framework.RunOnFrameworkThread(TryInitialPull);
} }
private void OnDisposing() private void OnDisposing()
{ {
// Honorific is unloading. Drop our cached state so the header // Honorific unloading — clear cached state so the header hides next frame.
// hides on the next frame; subscriptions stay registered because // Subscriptions stay registered in case Honorific reloads.
// the gates may come back later (Honorific reload). // CurrentTitle is already nulled by OnTitleChanged before this fires,
// // re-clearing here is belt-and-braces.
// Race-note: Honorific's NotifyDisposing calls ChangedLocalCharacterTitle(null)
// BEFORE SendMessage on the Disposing gate (IpcProvider.cs:109-111),
// so OnTitleChanged is expected to fire first and already null out
// CurrentTitle. We re-clear here as belt-and-braces; should the
// ordering ever flip, ShouldRenderSlot would still gate on IsAvailable.
CurrentTitle = null; CurrentTitle = null;
IsAvailable = false; IsAvailable = false;
DetectedApiVersion = null; DetectedApiVersion = null;
@@ -187,28 +145,15 @@ internal sealed class HonorificService : IDisposable
} }
} }
// Threading note: Dalamud fires IPC events on the framework thread and // Threading: IPC events and ImGui both run on the framework thread, so
// ImGui renders on the framework thread, so OnTitleChanged and the // OnTitleChanged and the render path never race — no volatile/Interlocked
// render path that reads CurrentTitle never race — OnTitleChanged is // needed as long as Dalamud's framework-thread delivery contract holds.
// safe to keep direct (no RunOnFrameworkThread wrap needed) because
// LocalCharacterTitleChanged delivery is framework-thread by Dalamud
// contract. If a future change moves either side onto a worker thread,
// switch to volatile/Interlocked for the CurrentTitle field.
// //
// The constructor's initial pull and OnReady, on the other hand, are // Constructor and OnReady are exceptions: they run outside that contract
// explicitly scheduled via IFramework.RunOnFrameworkThread because // (plugin-loader thread and Honorific's NotifyReady respectively), so both
// they run outside that contract: the constructor executes on the // use RunOnFrameworkThread to safely reach ObjectTable.LocalPlayer.
// plugin-loader thread, and Honorific's NotifyReady can dispatch from
// any thread. Both call paths eventually invoke IPC handlers that read
// ObjectTable.LocalPlayer, which throws "Not on main thread!" off the
// framework thread — see the constructor comment block for context.
//
// Divergence from ChatTwo/Ipc/ExtraChat.cs: that file uses `volatile`
// on its state fields out of caution. We don't, because the framework-
// thread delivery is the documented Dalamud contract. If the two files
// ever need to share a threading audit, this is the place to revisit.
// --- Pure-logic helpers below; tested via HellionChat.Tests/Integrations. --- // --- Pure-logic helpers; tested via HellionChat.Tests/Integrations. ---
internal static HonorificTitleData? ParseTitleJson(string json) internal static HonorificTitleData? ParseTitleJson(string json)
{ {
@@ -233,13 +178,19 @@ internal sealed class HonorificService : IDisposable
internal static bool ShouldRenderSlot( internal static bool ShouldRenderSlot(
bool toggleEnabled, bool toggleEnabled,
bool isAvailable, bool isAvailable,
HonorificTitleData? title) HonorificTitleData? title
)
{ {
if (!toggleEnabled) return false; if (!toggleEnabled)
if (!isAvailable) return false; return false;
if (title is null) return false; if (!isAvailable)
if (title.IsOriginal) return false; return false;
if (string.IsNullOrEmpty(title.Title)) return false; if (title is null)
return false;
if (title.IsOriginal)
return false;
if (string.IsNullOrEmpty(title.Title))
return false;
return true; return true;
} }
} }
@@ -2,13 +2,9 @@ using System.Numerics;
namespace HellionChat.Integrations; namespace HellionChat.Integrations;
// Local DTO mirroring Honorific's TitleData shape. We replicate the structure // Local DTO mirroring Honorific's TitleData — no hard reference to Honorific.dll
// instead of referencing Honorific.dll because a hard build-time dependency // so HellionChat loads cleanly when Honorific is absent.
// would couple the two assemblies and break HellionChat at load time when // Glow/gradient fields omitted; Cycle 1 renders primary Color only.
// Honorific is missing. Glow, Color3, GradientColourSet and GradientAnimationStyle
// are intentionally omitted — Cycle 1 renders text in the primary Color only;
// the "Honorific Full Fidelity" backlog item adds them later as a pure
// extension that won't break this DTO's existing consumers.
internal sealed record HonorificTitleData( internal sealed record HonorificTitleData(
string? Title, string? Title,
bool IsPrefix, bool IsPrefix,
+1 -5
View File
@@ -1,10 +1,6 @@
namespace HellionChat.Integrations; namespace HellionChat.Integrations;
// External URLs for the third-party plugins HellionChat integrates with. // Third-party plugin URLs — separate from BrandingLinks (Hellion-owned URLs).
// Kept separate from BrandingLinks (which is for Hellion-owned URLs) so
// future cycles can extend this file with maintainer attribution links
// for Moodles, NotificationMaster, ExtraChat, etc. without polluting the
// brand-links class.
internal static class IntegrationLinks internal static class IntegrationLinks
{ {
public const string HonorificRepo = "https://github.com/Caraxi/Honorific"; public const string HonorificRepo = "https://github.com/Caraxi/Honorific";
+29 -25
View File
@@ -15,30 +15,45 @@ public sealed class ExtraChat : IDisposable
#pragma warning restore CS0649 #pragma warning restore CS0649
private ICallGateSubscriber<OverrideInfo, object> OverrideChannelGate { get; } private ICallGateSubscriber<OverrideInfo, object> OverrideChannelGate { get; }
private ICallGateSubscriber<Dictionary<string, uint>, Dictionary<string, uint>> ChannelCommandColoursGate { get; } private ICallGateSubscriber<
private ICallGateSubscriber<Dictionary<Guid, string>, Dictionary<Guid, string>> ChannelNamesGate { get; } Dictionary<string, uint>,
Dictionary<string, uint>
> ChannelCommandColoursGate { get; }
private ICallGateSubscriber<
Dictionary<Guid, string>,
Dictionary<Guid, string>
> ChannelNamesGate { get; }
internal (string, uint)? ChannelOverride { get; set; } internal (string, uint)? ChannelOverride { get; set; }
// Volatile reference: IPC callbacks (OnChannelCommandColours/OnChannelNames) fire on a // volatile: IPC callbacks fire on a Dalamud thread while ImGui reads these.
// Dalamud-dispatcher thread while the ImGui thread reads the IReadOnlyDictionary projections. // Reference assignment is atomic on x64, but the barrier ensures visibility
// Reference assignment is atomic on x64, but the JIT (especially Mono on Wine/Linux) needs // across threads (especially Mono/Wine). See AUDIT-2026-05-05 [SEC-01].
// the volatile barrier to guarantee visibility across threads. See AUDIT-2026-05-05 [SEC-01].
private volatile Dictionary<string, uint> ChannelCommandColoursInternal = new(); private volatile Dictionary<string, uint> ChannelCommandColoursInternal = new();
internal IReadOnlyDictionary<string, uint> ChannelCommandColours => ChannelCommandColoursInternal; internal IReadOnlyDictionary<string, uint> ChannelCommandColours =>
ChannelCommandColoursInternal;
private volatile Dictionary<Guid, string> ChannelNamesInternal = new(); private volatile Dictionary<Guid, string> ChannelNamesInternal = new();
internal IReadOnlyDictionary<Guid, string> ChannelNames => ChannelNamesInternal; internal IReadOnlyDictionary<Guid, string> ChannelNames => ChannelNamesInternal;
internal ExtraChat() internal ExtraChat()
{ {
OverrideChannelGate = Plugin.Interface.GetIpcSubscriber<OverrideInfo, object>("ExtraChat.OverrideChannelColour"); OverrideChannelGate = Plugin.Interface.GetIpcSubscriber<OverrideInfo, object>(
ChannelCommandColoursGate = Plugin.Interface.GetIpcSubscriber<Dictionary<string, uint>, Dictionary<string, uint>>("ExtraChat.ChannelCommandColours"); "ExtraChat.OverrideChannelColour"
ChannelNamesGate = Plugin.Interface.GetIpcSubscriber<Dictionary<Guid, string>, Dictionary<Guid, string>>("ExtraChat.ChannelNames"); );
ChannelCommandColoursGate = Plugin.Interface.GetIpcSubscriber<
Dictionary<string, uint>,
Dictionary<string, uint>
>("ExtraChat.ChannelCommandColours");
ChannelNamesGate = Plugin.Interface.GetIpcSubscriber<
Dictionary<Guid, string>,
Dictionary<Guid, string>
>("ExtraChat.ChannelNames");
OverrideChannelGate.Subscribe(OnOverrideChannel); OverrideChannelGate.Subscribe(OnOverrideChannel);
ChannelCommandColoursGate.Subscribe(OnChannelCommandColours); ChannelCommandColoursGate.Subscribe(OnChannelCommandColours);
ChannelNamesGate.Subscribe(OnChannelNames); ChannelNamesGate.Subscribe(OnChannelNames);
try try
{ {
ChannelCommandColoursInternal = ChannelCommandColoursGate.InvokeFunc(null!); ChannelCommandColoursInternal = ChannelCommandColoursGate.InvokeFunc(null!);
@@ -46,7 +61,7 @@ public sealed class ExtraChat : IDisposable
} }
catch (Exception ex) catch (Exception ex)
{ {
// ExtraChat is optional; missing IPC peer is normal when the plugin isn't loaded. // ExtraChat is optional; IPC failure is normal when the plugin isn't loaded.
Plugin.Log.Verbose(ex, "ExtraChat IPC initial state query failed (peer not loaded?)"); Plugin.Log.Verbose(ex, "ExtraChat IPC initial state query failed (peer not loaded?)");
} }
} }
@@ -60,22 +75,11 @@ public sealed class ExtraChat : IDisposable
private void OnOverrideChannel(OverrideInfo info) private void OnOverrideChannel(OverrideInfo info)
{ {
if (info.Channel == null) ChannelOverride = info.Channel == null ? null : (info.Channel, info.Rgba);
{
ChannelOverride = null;
return;
} }
ChannelOverride = (info.Channel, info.Rgba); private void OnChannelCommandColours(Dictionary<string, uint> obj) =>
}
private void OnChannelCommandColours(Dictionary<string, uint> obj)
{
ChannelCommandColoursInternal = obj; ChannelCommandColoursInternal = obj;
}
private void OnChannelNames(Dictionary<Guid, string> obj) private void OnChannelNames(Dictionary<Guid, string> obj) => ChannelNamesInternal = obj;
{
ChannelNamesInternal = obj;
}
} }
+23 -9
View File
@@ -1,9 +1,16 @@
using HellionChat.Code;
using Dalamud.Plugin.Ipc; using Dalamud.Plugin.Ipc;
using HellionChat.Code;
namespace HellionChat.Ipc; namespace HellionChat.Ipc;
using ChatInputState = (bool InputVisible, bool InputFocused, bool HasText, bool IsTyping, int TextLength, ChatType ChannelType); using ChatInputState = (
bool InputVisible,
bool InputFocused,
bool HasText,
bool IsTyping,
int TextLength,
ChatType ChannelType
);
internal sealed class TypingIpc : IDisposable internal sealed class TypingIpc : IDisposable
{ {
@@ -19,8 +26,12 @@ internal sealed class TypingIpc : IDisposable
{ {
Plugin = plugin; Plugin = plugin;
StateQueryGate = Plugin.Interface.GetIpcProvider<ChatInputState>("HellionChat.GetChatInputState"); StateQueryGate = Plugin.Interface.GetIpcProvider<ChatInputState>(
StateChangedGate = Plugin.Interface.GetIpcProvider<ChatInputState, object?>("HellionChat.ChatInputStateChanged"); "HellionChat.GetChatInputState"
);
StateChangedGate = Plugin.Interface.GetIpcProvider<ChatInputState, object?>(
"HellionChat.ChatInputStateChanged"
);
StateQueryGate.RegisterFunc(GetState); StateQueryGate.RegisterFunc(GetState);
} }
@@ -30,19 +41,22 @@ internal sealed class TypingIpc : IDisposable
var log = Plugin.ChatLogWindow; var log = Plugin.ChatLogWindow;
var usedChannel = Plugin.CurrentTab.CurrentChannel; var usedChannel = Plugin.CurrentTab.CurrentChannel;
var inputChannel = usedChannel.UseTempChannel ? usedChannel.TempChannel : usedChannel.Channel; var inputChannel = usedChannel.UseTempChannel
? usedChannel.TempChannel
: usedChannel.Channel;
var channelType = inputChannel.ToChatType(); var channelType = inputChannel.ToChatType();
return (InputVisible: !log.IsHidden, return (
InputVisible: !log.IsHidden,
log.InputFocused, log.InputFocused,
HasText: log.Chat.Length > 0, HasText: log.Chat.Length > 0,
IsTyping: log is { InputFocused: true, Chat.Length: > 0 }, IsTyping: log is { InputFocused: true, Chat.Length: > 0 },
TextLength: log.Chat.Length, TextLength: log.Chat.Length,
ChannelType: channelType); ChannelType: channelType
);
} }
private ChatInputState GetState() private ChatInputState GetState() => BuildState();
=> BuildState();
internal void Update() internal void Update()
{ {
+26 -3
View File
@@ -9,7 +9,15 @@ internal sealed class IpcManager : IDisposable
private ICallGateProvider<string> RegisterGate { get; } private ICallGateProvider<string> RegisterGate { get; }
private ICallGateProvider<string, object?> UnregisterGate { get; } private ICallGateProvider<string, object?> UnregisterGate { get; }
private ICallGateProvider<object?> AvailableGate { get; } private ICallGateProvider<object?> AvailableGate { get; }
private ICallGateProvider<string, PlayerPayload?, ulong, Payload?, SeString?, SeString?, object?> InvokeGate { get; } private ICallGateProvider<
string,
PlayerPayload?,
ulong,
Payload?,
SeString?,
SeString?,
object?
> InvokeGate { get; }
internal List<string> Registered { get; } = []; internal List<string> Registered { get; } = [];
@@ -23,12 +31,27 @@ internal sealed class IpcManager : IDisposable
UnregisterGate = Plugin.Interface.GetIpcProvider<string, object?>("HellionChat.Unregister"); UnregisterGate = Plugin.Interface.GetIpcProvider<string, object?>("HellionChat.Unregister");
UnregisterGate.RegisterAction(Unregister); UnregisterGate.RegisterAction(Unregister);
InvokeGate = Plugin.Interface.GetIpcProvider<string, PlayerPayload?, ulong, Payload?, SeString?, SeString?, object?>("HellionChat.Invoke"); InvokeGate = Plugin.Interface.GetIpcProvider<
string,
PlayerPayload?,
ulong,
Payload?,
SeString?,
SeString?,
object?
>("HellionChat.Invoke");
AvailableGate.SendMessage(); AvailableGate.SendMessage();
} }
internal void Invoke(string id, PlayerPayload? sender, ulong contentId, Payload? payload, SeString? senderString, SeString? content) internal void Invoke(
string id,
PlayerPayload? sender,
ulong contentId,
Payload? payload,
SeString? senderString,
SeString? content
)
{ {
InvokeGate.SendMessage(id, sender, contentId, payload, senderString, content); InvokeGate.SendMessage(id, sender, contentId, payload, senderString, content);
} }
+114 -30
View File
@@ -1,12 +1,12 @@
using System.Text; using System.Text;
using HellionChat.Code;
using HellionChat.Util;
using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Dalamud.Game.Text; using Dalamud.Game.Text;
using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Utility; using Dalamud.Utility;
using FFXIVClientStructs.FFXIV.Client.UI.Agent; using FFXIVClientStructs.FFXIV.Client.UI.Agent;
using HellionChat.Code;
using HellionChat.Util;
namespace HellionChat; namespace HellionChat;
@@ -33,7 +33,16 @@ public partial class Message
public Dictionary<Guid, float?> Height { get; } = new(); public Dictionary<Guid, float?> Height { get; } = new();
public Dictionary<Guid, bool> IsVisible { get; } = new(); public Dictionary<Guid, bool> IsVisible { get; } = new();
public Message(ulong receiver, ulong contentId, ulong accountId, ChatCode code, List<Chunk> sender, List<Chunk> content, SeString senderSource, SeString contentSource) public Message(
ulong receiver,
ulong contentId,
ulong accountId,
ChatCode code,
List<Chunk> sender,
List<Chunk> content,
SeString senderSource,
SeString contentSource
)
{ {
var extraChatChannel = ExtractExtraChatChannel(contentSource); var extraChatChannel = ExtractExtraChatChannel(contentSource);
Receiver = receiver; Receiver = receiver;
@@ -56,7 +65,18 @@ public partial class Message
chunk.Message = this; chunk.Message = this;
} }
public Message(Guid id, ulong receiver, ulong contentId, DateTimeOffset date, ChatCode code, List<Chunk> sender, List<Chunk> content, SeString senderSource, SeString contentSource, Guid extraChatChannel) public Message(
Guid id,
ulong receiver,
ulong contentId,
DateTimeOffset date,
ChatCode code,
List<Chunk> sender,
List<Chunk> content,
SeString senderSource,
SeString contentSource,
Guid extraChatChannel
)
{ {
Id = id; Id = id;
Receiver = receiver; Receiver = receiver;
@@ -82,7 +102,11 @@ public partial class Message
return new Message(0, 0, 0, code, [], content, new SeString(), new SeString()); return new Message(0, 0, 0, code, [], content, new SeString(), new SeString());
} }
public bool Matches(Dictionary<ChatType, (ChatSource Source, ChatSource Target)> channels, bool allExtraChatChannels, HashSet<Guid> extraChatChannels) public bool Matches(
Dictionary<ChatType, (ChatSource Source, ChatSource Target)> channels,
bool allExtraChatChannels,
HashSet<Guid> extraChatChannels
)
{ {
if (ExtraChatChannel != Guid.Empty) if (ExtraChatChannel != Guid.Empty)
return allExtraChatChannels || extraChatChannels.Contains(ExtraChatChannel); return allExtraChatChannels || extraChatChannels.Contains(ExtraChatChannel);
@@ -91,12 +115,17 @@ public partial class Message
var target = (ChatSource)(1 << (int)Code.Target); var target = (ChatSource)(1 << (int)Code.Target);
return Code.Type.IsGm() return Code.Type.IsGm()
|| channels.TryGetValue(Code.Type, out var sources) || channels.TryGetValue(Code.Type, out var sources)
&& (Code.Source is 0 || sources.Source.HasFlag(source) || sources.Target.HasFlag(target)); && (
Code.Source is 0
|| sources.Source.HasFlag(source)
|| sources.Target.HasFlag(target)
);
} }
private int GenerateHash() private int GenerateHash()
{ {
var hash = SortCodeV2.GetHashCode() var hash =
SortCodeV2.GetHashCode()
^ ExtraChatChannel.GetHashCode() ^ ExtraChatChannel.GetHashCode()
^ string.Join("", Sender.Select(c => c.StringValue())).GetHashCode() ^ string.Join("", Sender.Select(c => c.StringValue())).GetHashCode()
^ string.Join("", Content.Select(c => c.StringValue())).GetHashCode(); ^ string.Join("", Content.Select(c => c.StringValue())).GetHashCode();
@@ -146,13 +175,15 @@ public partial class Message
} }
var nextIsAutoTranslate = false; var nextIsAutoTranslate = false;
var checkForEmotes = (Code.IsPlayerMessage() || extraChatChannel != Guid.Empty) && Plugin.Config.ShowEmotes; var checkForEmotes =
(Code.IsPlayerMessage() || extraChatChannel != Guid.Empty) && Plugin.Config.ShowEmotes;
foreach (var chunk in oldChunks) foreach (var chunk in oldChunks)
{ {
// Use as is if it's not a text chunk, it already has a payload, or is auto translate // Use as is if it's not a text chunk, it already has a payload, or is auto translate
if (chunk is not TextChunk text || chunk.Link != null || nextIsAutoTranslate) if (chunk is not TextChunk text || chunk.Link != null || nextIsAutoTranslate)
{ {
nextIsAutoTranslate = chunk is IconChunk { Icon: BitmapFontIcon.AutoTranslateBegin }; nextIsAutoTranslate =
chunk is IconChunk { Icon: BitmapFontIcon.AutoTranslateBegin };
// No need to call AddChunkWithMessage here since the chunk // No need to call AddChunkWithMessage here since the chunk
// already has the Message field set. // already has the Message field set.
@@ -173,15 +204,23 @@ public partial class Message
var word = wordBuilder.ToString(); var word = wordBuilder.ToString();
wordBuilder.Clear(); wordBuilder.Clear();
var wordUsed = false; var wordUsed = false;
var tokenUsed = false; var tokenUsed = false;
if (checkForEmotes && EmoteCache.Exists(word) && !Plugin.Config.BlockedEmotes.Contains(word)) if (
checkForEmotes
&& EmoteCache.Exists(word)
&& !Plugin.Config.BlockedEmotes.Contains(word)
)
{ {
// Add the previous sentence before adding the emote // Add the previous sentence before adding the emote
AddChunkWithMessage(text.NewWithStyle(chunk, sentenceBuilder.ToString())); AddChunkWithMessage(text.NewWithStyle(chunk, sentenceBuilder.ToString()));
AddChunkWithMessage(new TextChunk(chunk.Source, EmotePayload.ResolveEmote(word), word) { FallbackColour = text.FallbackColour }); AddChunkWithMessage(
new TextChunk(chunk.Source, EmotePayload.ResolveEmote(word), word)
{
FallbackColour = text.FallbackColour,
}
);
wordUsed = true; wordUsed = true;
sentenceBuilder.Clear(); sentenceBuilder.Clear();
@@ -190,15 +229,31 @@ public partial class Message
if (token.TokenType == Tokenizer.TokenType.UrlString) if (token.TokenType == Tokenizer.TokenType.UrlString)
{ {
// Add the previous sentence before adding the url // Add the previous sentence before adding the url
AddChunkWithMessage(text.NewWithStyle(chunk.Source, chunk.Link, sentenceBuilder.Append(!wordUsed ? word : "").ToString())); AddChunkWithMessage(
text.NewWithStyle(
chunk.Source,
chunk.Link,
sentenceBuilder.Append(!wordUsed ? word : "").ToString()
)
);
try try
{ {
AddChunkWithMessage(text.NewWithStyle(chunk.Source, UriPayload.ResolveUri(token.Value), token.Value)); AddChunkWithMessage(
text.NewWithStyle(
chunk.Source,
UriPayload.ResolveUri(token.Value),
token.Value
)
);
} }
catch (UriFormatException) catch (UriFormatException)
{ {
AddChunkWithMessage(text.NewWithStyle(chunk.Source, chunk.Link, token.Value)); AddChunkWithMessage(
Plugin.Log.Debug($"Invalid URL accepted by Regex but failed URI parsing: '{token.Value}'"); text.NewWithStyle(chunk.Source, chunk.Link, token.Value)
);
Plugin.Log.Debug(
$"Invalid URL accepted by Regex but failed URI parsing: '{token.Value}'"
);
} }
wordUsed = true; wordUsed = true;
@@ -215,7 +270,12 @@ public partial class Message
} }
// End of string reached, we add our leftover // End of string reached, we add our leftover
AddChunkWithMessage(text.NewWithStyle(chunk, sentenceBuilder.Append(!wordUsed ? word : "").ToString())); AddChunkWithMessage(
text.NewWithStyle(
chunk,
sentenceBuilder.Append(!wordUsed ? word : "").ToString()
)
);
} }
} }
@@ -281,20 +341,30 @@ public partial class Message
< 500_000 => ItemKind.Normal, < 500_000 => ItemKind.Normal,
< 1_000_000 => ItemKind.Collectible, < 1_000_000 => ItemKind.Collectible,
< 2_000_000 => ItemKind.Hq, < 2_000_000 => ItemKind.Hq,
_ => ItemKind.EventItem _ => ItemKind.EventItem,
}; };
var name = kind != ItemKind.EventItem var name =
kind != ItemKind.EventItem
? Sheets.ItemSheet.GetRow(item.ItemId).Name.ToString() ? Sheets.ItemSheet.GetRow(item.ItemId).Name.ToString()
: Sheets.EventItemSheet.GetRow(item.ItemId).Name.ToString(); : Sheets.EventItemSheet.GetRow(item.ItemId).Name.ToString();
var link = new ItemPayload(item.ItemId, kind, $"{SeIconChar.LinkMarker.ToIconChar()}{name}"); var link = new ItemPayload(
AddChunkWithMessage(text.NewWithStyle(chunk.Source, link, link.DisplayName ?? "Unknown")); item.ItemId,
kind,
$"{SeIconChar.LinkMarker.ToIconChar()}{name}"
);
AddChunkWithMessage(
text.NewWithStyle(chunk.Source, link, link.DisplayName ?? "Unknown")
);
} }
else if (split == "<status>") else if (split == "<status>")
{ {
var statusId = AgentChatLog.Instance()->ContextStatusId; var statusId = AgentChatLog.Instance()->ContextStatusId;
if (statusId == 0 || !Sheets.StatusSheet.TryGetRow(statusId, out var statusRow)) if (
statusId == 0
|| !Sheets.StatusSheet.TryGetRow(statusId, out var statusRow)
)
{ {
AddChunkWithMessage(text.NewWithStyle(chunk.Source, chunk.Link, split)); AddChunkWithMessage(text.NewWithStyle(chunk.Source, chunk.Link, split));
continue; continue;
@@ -305,7 +375,7 @@ public partial class Message
{ {
1 => $"{SeIconChar.Buff.ToIconString()}{nameValue}", 1 => $"{SeIconChar.Buff.ToIconString()}{nameValue}",
2 => $"{SeIconChar.Debuff.ToIconString()}{nameValue}", 2 => $"{SeIconChar.Debuff.ToIconString()}{nameValue}",
_ => nameValue _ => nameValue,
}; };
var link = new StatusPayload(statusId); var link = new StatusPayload(statusId);
@@ -321,13 +391,27 @@ public partial class Message
} }
var mapCoords = agentMap->FlagMapMarkers[0]; var mapCoords = agentMap->FlagMapMarkers[0];
var rawX = (int)(MathF.Round(mapCoords.XFloat, 3, MidpointRounding.AwayFromZero) * 1000); var rawX = (int)(
var rawY = (int)(MathF.Round(mapCoords.YFloat, 3, MidpointRounding.AwayFromZero) * 1000); MathF.Round(mapCoords.XFloat, 3, MidpointRounding.AwayFromZero) * 1000
);
var rawY = (int)(
MathF.Round(mapCoords.YFloat, 3, MidpointRounding.AwayFromZero) * 1000
);
var link = new MapLinkPayload(mapCoords.TerritoryId, mapCoords.MapId, rawX, rawY); var link = new MapLinkPayload(
AddChunkWithMessage(text.NewWithStyle(chunk.Source, link, $"{SeIconChar.LinkMarker.ToIconChar()}{link.PlaceName} {link.CoordinateString}")); mapCoords.TerritoryId,
mapCoords.MapId,
rawX,
rawY
);
AddChunkWithMessage(
text.NewWithStyle(
chunk.Source,
link,
$"{SeIconChar.LinkMarker.ToIconChar()}{link.PlaceName} {link.CoordinateString}"
)
);
} }
} }
catch (Exception) catch (Exception)
{ {
+84 -67
View File
@@ -1,9 +1,6 @@
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Diagnostics; using System.Diagnostics;
using System.Text; using System.Text;
using HellionChat.Code;
using HellionChat.Resources;
using HellionChat.Util;
using Dalamud.Game.Chat; using Dalamud.Game.Chat;
using Dalamud.Game.Text; using Dalamud.Game.Text;
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
@@ -11,6 +8,9 @@ using Dalamud.Hooking;
using Dalamud.Interface.ImGuiNotification; using Dalamud.Interface.ImGuiNotification;
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.UI.Misc; using FFXIVClientStructs.FFXIV.Client.UI.Misc;
using HellionChat.Code;
using HellionChat.Resources;
using HellionChat.Util;
using Lumina.Text.Expressions; using Lumina.Text.Expressions;
using Lumina.Text.Payloads; using Lumina.Text.Payloads;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
@@ -27,16 +27,7 @@ internal class MessageManager : IAsyncDisposable
private Dictionary<ChatType, NameFormatting> Formats { get; } = []; private Dictionary<ChatType, NameFormatting> Formats { get; } = [];
private ulong LastContentId { get; set; } private ulong LastContentId { get; set; }
// Messages go into the PendingSync queue first, which will be consumed one // PendingSync (main thread) → PendingAsync (worker thread); LinkedList for O(1) Last access
// at a time in the main thread. This is to delay the async processing until
// after we've received the content ID from the ContentIdResolver hook.
//
// After that, the message is enqueued in the PendingAsync queue, which will
// be consumed in a separate thread and perform more processing (emotes,
// URLs) as well as inserting the message into the database.
// LinkedList instead of Queue: ContentIdResolver hits PendingSync.Last
// every hook call. Queue<T>.Last() is the LINQ extension and walks the
// whole queue (O(n)); LinkedList<T>.Last is an O(1) node reference.
private LinkedList<PendingMessage> PendingSync { get; } = []; private LinkedList<PendingMessage> PendingSync { get; } = [];
private ConcurrentQueue<PendingMessage> PendingAsync { get; } = []; private ConcurrentQueue<PendingMessage> PendingAsync { get; } = [];
private readonly Thread PendingMessageThread; private readonly Thread PendingMessageThread;
@@ -53,11 +44,8 @@ internal class MessageManager : IAsyncDisposable
} }
} }
// Hellion Chat — Auto-Tell-Tabs hook. Fires after a fully processed // Auto-Tell-Tabs hook: fires after a message is processed and stored, allowing
// message has been routed to all matching persistent tabs and stored // AutoTellTabsService to spawn or refresh temp tabs without coupling.
// in the database. The AutoTellTabsService subscribes to spawn or
// refresh temp tabs without having to wedge itself into ProcessMessage
// directly.
public event Action<Message>? MessageProcessed; public event Action<Message>? MessageProcessed;
internal unsafe MessageManager(Plugin plugin) internal unsafe MessageManager(Plugin plugin)
@@ -66,15 +54,19 @@ internal class MessageManager : IAsyncDisposable
Store = new MessageStore(DatabasePath()); Store = new MessageStore(DatabasePath());
// IsBackground so a stuck worker never blocks plugin unload. PendingMessageThread = new Thread(() =>
// Cooperative cancel via PendingThreadCancellationToken first, background flag is the safety net. ProcessPendingMessages(PendingThreadCancellationToken.Token)
PendingMessageThread = new Thread(() => ProcessPendingMessages(PendingThreadCancellationToken.Token)) )
{ {
IsBackground = true, IsBackground = true,
}; };
PendingMessageThread.Start(); PendingMessageThread.Start();
ContentIdResolverHook = Plugin.GameInteropProvider.HookFromAddress<RaptureLogModule.Delegates.AddMsgSourceEntry>(RaptureLogModule.MemberFunctionPointers.AddMsgSourceEntry, ContentIdResolver); ContentIdResolverHook =
Plugin.GameInteropProvider.HookFromAddress<RaptureLogModule.Delegates.AddMsgSourceEntry>(
RaptureLogModule.MemberFunctionPointers.AddMsgSourceEntry,
ContentIdResolver
);
ContentIdResolverHook.Enable(); ContentIdResolverHook.Enable();
Plugin.ChatGui.ChatMessageUnhandled += ChatMessage; Plugin.ChatGui.ChatMessageUnhandled += ChatMessage;
@@ -100,12 +92,10 @@ internal class MessageManager : IAsyncDisposable
if (PendingMessageThread.IsAlive) if (PendingMessageThread.IsAlive)
Plugin.Log.Warning( Plugin.Log.Warning(
"PendingMessageThread did not observe cancellation within 10s. " + "PendingMessageThread did not observe cancellation within 10s. "
"Worker remains on a background thread; next plugin reload releases it. " + + "Worker remains on background thread; next plugin reload releases it."
"If this recurs, file a bug with /xllog after the previous reload."); );
// CTS owns an unmanaged WaitHandle; dispose even if the worker is
// alive — it checks IsCancellationRequested via the linked token.
PendingThreadCancellationToken.Dispose(); PendingThreadCancellationToken.Dispose();
Store.Dispose(); Store.Dispose();
@@ -159,12 +149,7 @@ internal class MessageManager : IAsyncDisposable
internal void ClearAllTabs() internal void ClearAllTabs()
{ {
// Hellion Chat — TempTabs haben keine DB-Persistenz (session-only, // TempTabs are session-only (not persisted); exclude them to preserve Tell history
// direkt vom AutoTellTabsService befüllt). Ein Clear+Refilter würde
// sie leer hinterlassen weil FilterAllTabs nichts aus der DB
// findet — Tells sind oft durch Privacy-Filter blockiert oder
// schlicht session-flüchtig. TempTabs vom Clear-Pfad ausschließen
// damit Settings-Save den Tell-Verlauf nicht zerstört.
foreach (var tab in Plugin.Config.Tabs.Where(t => !t.IsTempTab)) foreach (var tab in Plugin.Config.Tabs.Where(t => !t.IsTempTab))
tab.Clear(); tab.Clear();
} }
@@ -177,27 +162,25 @@ internal class MessageManager : IAsyncDisposable
using var messages = Store.GetMostRecentMessages(CurrentContentId, since); using var messages = Store.GetMostRecentMessages(CurrentContentId, since);
// We store the pending messages to be added to the chat log in a // TempTabs are excluded; they maintain live state from AutoTellTabsService
// temporary list, and apply them all at once after filtering. var pendingTabs = Plugin
// TempTabs werden ausgeschlossen — sie bleiben live-state aus dem .Config.Tabs.Where(t => !t.IsTempTab)
// AutoTellTabsService, ein DB-Refilter würde sie nur partial .Select(tab => (tab, new List<Message>()))
// wiederherstellen falls Tells in DB liegen, oder leer lassen wenn .ToList();
// Privacy-Filter sie blockiert hat.
var pendingTabs = Plugin.Config.Tabs.Where(t => !t.IsTempTab).Select(tab => (tab, new List<Message>())).ToList();
foreach (var message in messages) foreach (var message in messages)
foreach (var (_, pendingMessages) in pendingTabs.Where(ptab => ptab.Item1.Matches(message))) foreach (var (_, pendingMessages) in pendingTabs.Where(ptab => ptab.Item1.Matches(message)))
pendingMessages.Add(message); pendingMessages.Add(message);
// Apply the messages to the chat log in one go. // Apply messages to chat log all at once.
foreach (var (tab, pendingMessages) in pendingTabs) foreach (var (tab, pendingMessages) in pendingTabs)
tab.Messages.AddSortPrune(pendingMessages, MessageDisplayLimit); tab.Messages.AddSortPrune(pendingMessages, MessageDisplayLimit);
if (!messages.DidError) return; if (!messages.DidError)
return;
WrapperUtil.AddNotification(Language.LoadMessages_Error, NotificationType.Error); WrapperUtil.AddNotification(Language.LoadMessages_Error, NotificationType.Error);
// Mark the failed messages as deleted so we don't try to load them // Mark failed messages as deleted to prevent retry attempts
// again.
var failedIds = messages.FailedMessageIds(); var failedIds = messages.FailedMessageIds();
Plugin.Log.Info($"Marking {failedIds.Count} messages as deleted due to parse failures"); Plugin.Log.Info($"Marking {failedIds.Count} messages as deleted due to parse failures");
foreach (var msgId in messages.FailedMessageIds()) foreach (var msgId in messages.FailedMessageIds())
@@ -226,6 +209,7 @@ internal class MessageManager : IAsyncDisposable
} }
public (SeString? Sender, SeString? Message) LastMessage = (null, null); public (SeString? Sender, SeString? Message) LastMessage = (null, null);
private void ChatMessage(IChatMessage message) private void ChatMessage(IChatMessage message)
{ {
LastMessage = (message.Sender, message.Message); LastMessage = (message.Sender, message.Message);
@@ -244,21 +228,29 @@ internal class MessageManager : IAsyncDisposable
// Update colour codes. // Update colour codes.
GlobalParametersCache.Refresh(); GlobalParametersCache.Refresh();
// We delay messages to be handed off to the async processing thread // Delay to next tick to get content ID from ContentIdResolver hook
// in the next tick, otherwise we can't get the content ID from the hook
// below.
PendingSync.AddLast(pendingMessage); PendingSync.AddLast(pendingMessage);
} }
// This hook is called immediately after receiving a message with the private unsafe void ContentIdResolver(
// message's content ID. If multiple messages are received in the same tick, RaptureLogModule* agent,
// this will be called for each message immediately after ChatMessage is ulong contentId,
// called for each message. ulong accountId,
private unsafe void ContentIdResolver(RaptureLogModule* agent, ulong contentId, ulong accountId, int messageIndex, ushort worldId, ushort chatType) int messageIndex,
ushort worldId,
ushort chatType
)
{ {
try try
{ {
ContentIdResolverHook?.Original(agent, contentId, accountId, messageIndex, worldId, chatType); ContentIdResolverHook?.Original(
agent,
contentId,
accountId,
messageIndex,
worldId,
chatType
);
if (PendingSync.Last is not { } last) if (PendingSync.Last is not { } last)
return; return;
@@ -273,7 +265,11 @@ internal class MessageManager : IAsyncDisposable
private void ProcessMessage(PendingMessage pendingMessage) private void ProcessMessage(PendingMessage pendingMessage)
{ {
var chatCode = new ChatCode(pendingMessage.LogKind, pendingMessage.SourceKind, pendingMessage.TargetKind); var chatCode = new ChatCode(
pendingMessage.LogKind,
pendingMessage.SourceKind,
pendingMessage.TargetKind
);
NameFormatting? formatting = null; NameFormatting? formatting = null;
if (pendingMessage.Sender.Payloads.Count > 0) if (pendingMessage.Sender.Payloads.Count > 0)
@@ -282,13 +278,36 @@ internal class MessageManager : IAsyncDisposable
var senderChunks = new List<Chunk>(); var senderChunks = new List<Chunk>();
if (formatting is { IsPresent: true }) if (formatting is { IsPresent: true })
{ {
senderChunks.Add(new TextChunk(ChunkSource.None, null, formatting.Before) { FallbackColour = chatCode.Type }); senderChunks.Add(
senderChunks.AddRange(ChunkUtil.ToChunks(pendingMessage.Sender, ChunkSource.Sender, chatCode.Type)); new TextChunk(ChunkSource.None, null, formatting.Before)
senderChunks.Add(new TextChunk(ChunkSource.None, null, formatting.After) { FallbackColour = chatCode.Type }); {
FallbackColour = chatCode.Type,
}
);
senderChunks.AddRange(
ChunkUtil.ToChunks(pendingMessage.Sender, ChunkSource.Sender, chatCode.Type)
);
senderChunks.Add(
new TextChunk(ChunkSource.None, null, formatting.After)
{
FallbackColour = chatCode.Type,
}
);
} }
var contentChunks = ChunkUtil.ToChunks(pendingMessage.Content, ChunkSource.Content, chatCode.Type).ToList(); var contentChunks = ChunkUtil
var message = new Message(CurrentContentId, pendingMessage.ContentId, pendingMessage.AccountId, chatCode, senderChunks, contentChunks, pendingMessage.Sender, pendingMessage.Content); .ToChunks(pendingMessage.Content, ChunkSource.Content, chatCode.Type)
.ToList();
var message = new Message(
CurrentContentId,
pendingMessage.ContentId,
pendingMessage.AccountId,
chatCode,
senderChunks,
contentChunks,
pendingMessage.Sender,
pendingMessage.Content
);
if (Plugin.Config.DatabaseBattleMessages || !message.Code.IsBattle()) if (Plugin.Config.DatabaseBattleMessages || !message.Code.IsBattle())
Store.UpsertMessage(message); Store.UpsertMessage(message);
@@ -296,7 +315,9 @@ internal class MessageManager : IAsyncDisposable
var currentMatches = Plugin.CurrentTab.Matches(message); var currentMatches = Plugin.CurrentTab.Matches(message);
foreach (var tab in Plugin.Config.Tabs) foreach (var tab in Plugin.Config.Tabs)
{ {
var unread = !(tab.UnreadMode == UnreadMode.Unseen && Plugin.CurrentTab != tab && currentMatches); var unread = !(
tab.UnreadMode == UnreadMode.Unseen && Plugin.CurrentTab != tab && currentMatches
);
if (tab.Matches(message)) if (tab.Matches(message))
tab.AddMessage(message, unread); tab.AddMessage(message, unread);
@@ -313,16 +334,12 @@ internal class MessageManager : IAsyncDisposable
internal static NameFormatting Empty() internal static NameFormatting Empty()
{ {
return new NameFormatting { IsPresent = false, }; return new NameFormatting { IsPresent = false };
} }
internal static NameFormatting Of(string before, string after) internal static NameFormatting Of(string before, string after)
{ {
return new NameFormatting return new NameFormatting { Before = before, After = after };
{
Before = before,
After = after,
};
} }
} }
@@ -357,7 +374,7 @@ internal class MessageManager : IAsyncDisposable
var after = formats var after = formats
.GetRange(firstStringParam + 1, secondStringParam - firstStringParam) .GetRange(firstStringParam + 1, secondStringParam - firstStringParam)
.Where(payload => payload.Type == ReadOnlySePayloadType.Text) .Where(payload => payload.Type == ReadOnlySePayloadType.Text)
.Select(text => Encoding.UTF8.GetString(text.Body.Span)); // Can't use `ToString()` as it defaults to macro .Select(text => Encoding.UTF8.GetString(text.Body.Span));
var nameFormatting = NameFormatting.Of(string.Join("", before), string.Join("", after)); var nameFormatting = NameFormatting.Of(string.Join("", before), string.Join("", after));
Formats[type] = nameFormatting; Formats[type] = nameFormatting;
+216 -256
View File
@@ -1,15 +1,14 @@
using System.Buffers; using System.Buffers;
using System.Collections; using System.Collections;
using System.Data.Common; using System.Data.Common;
using Dalamud.Game.Text.SeStringHandling;
using HellionChat.Code; using HellionChat.Code;
using HellionChat.Ui; using HellionChat.Ui;
using HellionChat.Util; using HellionChat.Util;
using Dalamud.Game.Text.SeStringHandling;
using MessagePack; using MessagePack;
using MessagePack.Formatters; using MessagePack.Formatters;
using MessagePack.Resolvers; using MessagePack.Resolvers;
using Microsoft.Data.Sqlite; using Microsoft.Data.Sqlite;
using DalamudUtil = Dalamud.Utility.Util; using DalamudUtil = Dalamud.Utility.Util;
using Encoding = System.Text.Encoding; using Encoding = System.Text.Encoding;
@@ -36,7 +35,11 @@ internal enum PayloadMessagePackType : byte
public class PayloadMessagePackFormatter : IMessagePackFormatter<Payload?> public class PayloadMessagePackFormatter : IMessagePackFormatter<Payload?>
{ {
public void Serialize(ref MessagePackWriter writer, Payload? value, MessagePackSerializerOptions options) public void Serialize(
ref MessagePackWriter writer,
Payload? value,
MessagePackSerializerOptions options
)
{ {
if (value == null) if (value == null)
{ {
@@ -100,14 +103,22 @@ public class PayloadMessagePackFormatter : IMessagePackFormatter<Payload?>
public class SeStringMessagePackFormatter : IMessagePackFormatter<SeString?> public class SeStringMessagePackFormatter : IMessagePackFormatter<SeString?>
{ {
public void Serialize(ref MessagePackWriter writer, SeString? value, MessagePackSerializerOptions options) public void Serialize(
ref MessagePackWriter writer,
SeString? value,
MessagePackSerializerOptions options
)
{ {
options.Resolver.GetFormatter<List<Payload>>()!.Serialize(ref writer, value?.Payloads ?? [], options); options
.Resolver.GetFormatter<List<Payload>>()!
.Serialize(ref writer, value?.Payloads ?? [], options);
} }
public SeString Deserialize(ref MessagePackReader reader, MessagePackSerializerOptions options) public SeString Deserialize(ref MessagePackReader reader, MessagePackSerializerOptions options)
{ {
return new SeString(options.Resolver.GetFormatter<List<Payload>>()!.Deserialize(ref reader, options)); return new SeString(
options.Resolver.GetFormatter<List<Payload>>()!.Deserialize(ref reader, options)
);
} }
} }
@@ -116,11 +127,15 @@ internal class MessageStore : IDisposable
private const int MessageQueryLimit = 10_000; private const int MessageQueryLimit = 10_000;
private string DbPath { get; } private string DbPath { get; }
private SqliteConnection Connection { get; set; } private SqliteConnection Connection { get; set; }
internal static readonly MessagePackSerializerOptions MsgPackOptions = MessagePackSerializerOptions.Standard internal static readonly MessagePackSerializerOptions MsgPackOptions =
.WithResolver(CompositeResolver.Create([new PayloadMessagePackFormatter(), new SeStringMessagePackFormatter()], [StandardResolver.Instance])); MessagePackSerializerOptions.Standard.WithResolver(
CompositeResolver.Create(
[new PayloadMessagePackFormatter(), new SeStringMessagePackFormatter()],
[StandardResolver.Instance]
)
);
internal MessageStore(string dbPath) internal MessageStore(string dbPath)
{ {
@@ -131,10 +146,8 @@ internal class MessageStore : IDisposable
public void Dispose() public void Dispose()
{ {
// Pooling=false (set in Connect) avoids ClearAllPools, which is // Pooling=false avoids ClearAllPools which is provider-wide and
// provider-wide and would touch other plugins' SQLite connections. // would touch other plugins' SQLite connections.
// GC.Collect was here as a defensive flush; removed because explicit
// Close already releases everything we hold.
Connection.Close(); Connection.Close();
Connection.Dispose(); Connection.Dispose();
} }
@@ -160,7 +173,6 @@ internal class MessageStore : IDisposable
private void Migrate() private void Migrate()
{ {
// Get current user_version.
using var cmd = Connection.CreateCommand(); using var cmd = Connection.CreateCommand();
cmd.CommandText = "PRAGMA user_version;"; cmd.CommandText = "PRAGMA user_version;";
var userVersion = Convert.ToInt32(cmd.ExecuteScalar()); var userVersion = Convert.ToInt32(cmd.ExecuteScalar());
@@ -170,9 +182,7 @@ internal class MessageStore : IDisposable
{ {
case <= 0: case <= 0:
migrationsToDo.Add(Migrate0); migrationsToDo.Add(Migrate0);
// Migration support was only added in version 1. Migrate0 is idempotent.
// Migration support was only added in version 1. Migrate 0 is
// idempotent.
migrationsToDo.Add(Migrate1); migrationsToDo.Add(Migrate1);
migrationsToDo.Add(Migrate2); migrationsToDo.Add(Migrate2);
migrationsToDo.Add(Migrate3); migrationsToDo.Add(Migrate3);
@@ -193,7 +203,8 @@ internal class MessageStore : IDisposable
private void Migrate0() private void Migrate0()
{ {
Plugin.Log.Information("Running migration 0: Creating tables"); Plugin.Log.Information("Running migration 0: Creating tables");
Connection.Execute(@" Connection.Execute(
@"
CREATE TABLE IF NOT EXISTS messages ( CREATE TABLE IF NOT EXISTS messages (
Id BLOB PRIMARY KEY NOT NULL, -- Guid Id BLOB PRIMARY KEY NOT NULL, -- Guid
Receiver INTEGER NOT NULL, -- uint64 (first bits are always 0) Receiver INTEGER NOT NULL, -- uint64 (first bits are always 0)
@@ -210,7 +221,8 @@ internal class MessageStore : IDisposable
CREATE INDEX IF NOT EXISTS idx_messages_receiver ON messages (Receiver); CREATE INDEX IF NOT EXISTS idx_messages_receiver ON messages (Receiver);
CREATE INDEX IF NOT EXISTS idx_messages_date ON messages (Date); CREATE INDEX IF NOT EXISTS idx_messages_date ON messages (Date);
"); "
);
SetMigrationVersion(0); SetMigrationVersion(0);
} }
@@ -218,10 +230,11 @@ internal class MessageStore : IDisposable
private void Migrate1() private void Migrate1()
{ {
Plugin.Log.Information("Running migration 1: Adding Deleted column"); Plugin.Log.Information("Running migration 1: Adding Deleted column");
Connection.Execute(@" Connection.Execute(
-- Migration 1: Add Deleted column @"
ALTER TABLE messages ADD COLUMN Deleted BOOLEAN NOT NULL DEFAULT false; ALTER TABLE messages ADD COLUMN Deleted BOOLEAN NOT NULL DEFAULT false;
"); "
);
SetMigrationVersion(1); SetMigrationVersion(1);
} }
@@ -229,20 +242,20 @@ internal class MessageStore : IDisposable
private void Migrate2() private void Migrate2()
{ {
Plugin.Log.Information("Running migration 2: Adding Channel generated column"); Plugin.Log.Information("Running migration 2: Adding Channel generated column");
Connection.Execute(@" Connection.Execute(
-- Migration 2: Add Channel generated column @"
ALTER TABLE messages ADD COLUMN Channel INTEGER GENERATED ALWAYS AS (Code & 0x7f) VIRTUAL; ALTER TABLE messages ADD COLUMN Channel INTEGER GENERATED ALWAYS AS (Code & 0x7f) VIRTUAL;
CREATE INDEX IF NOT EXISTS idx_messages_channel ON messages (Channel); CREATE INDEX IF NOT EXISTS idx_messages_channel ON messages (Channel);
"); "
);
SetMigrationVersion(2); SetMigrationVersion(2);
} }
private bool ColumnExists(string table, string column) private bool ColumnExists(string table, string column)
{ {
// PRAGMA does not accept SQLite parameter bindings. The table name is // PRAGMA does not accept SQLite parameter bindings. Table name is a
// a compile-time constant fed in from internal call sites, so the // compile-time constant from internal call sites only.
// interpolation cannot be reached from any user-controlled path.
using var cmd = Connection.CreateCommand(); using var cmd = Connection.CreateCommand();
cmd.CommandText = $"PRAGMA table_info({table});"; cmd.CommandText = $"PRAGMA table_info({table});";
using var reader = cmd.ExecuteReader(); using var reader = cmd.ExecuteReader();
@@ -258,26 +271,19 @@ internal class MessageStore : IDisposable
{ {
Plugin.Log.Information("Running migration 3: Fix log kinds to fit the new format"); Plugin.Log.Information("Running migration 3: Fix log kinds to fit the new format");
// Recovery for partially-applied Migrate3: if the schema is already // Recovery for partially-applied Migrate3: schema already in target
// in its target shape (new columns exist, old Code column gone) but // shape but user_version was never bumped -- just record and exit.
// user_version was never bumped, just record the version and exit.
if (ColumnExists("messages", "ChatType") && !ColumnExists("messages", "Code")) if (ColumnExists("messages", "ChatType") && !ColumnExists("messages", "Code"))
{ {
Plugin.Log.Information("Migration 3: schema already migrated, only bumping user_version"); Plugin.Log.Information(
"Migration 3: schema already migrated, only bumping user_version"
);
SetMigrationVersion(3); SetMigrationVersion(3);
return; return;
} }
Connection.Execute(@" Connection.Execute(
-- Migration 3: Fix log kinds to fit the new format @"
-- Add new ChatType, SourceKind, TargetKind (byte), SortCodeV2
-- Migrate OldChatColumn
-- ChatType = OldChatColumn & 0x7f
-- SourceKind = log2(1 << ((OldChatColumn >> 11) & 0xF))
-- TargetKind = trunc(log2(1 << ((OldChatColumn >> 7) & 0xF)))
-- Virtual SortCodeV2 = ChatType << 16 | SourceKind << 8 | TargetKind
-- Delete OldChatColumn, Virtual Channel
ALTER TABLE messages ADD COLUMN ChatType INTEGER; ALTER TABLE messages ADD COLUMN ChatType INTEGER;
CREATE INDEX IF NOT EXISTS idx_messages_chat_type ON messages (ChatType); CREATE INDEX IF NOT EXISTS idx_messages_chat_type ON messages (ChatType);
ALTER TABLE messages ADD COLUMN SourceKind INTEGER; ALTER TABLE messages ADD COLUMN SourceKind INTEGER;
@@ -293,7 +299,8 @@ internal class MessageStore : IDisposable
ALTER TABLE messages DROP COLUMN Channel; ALTER TABLE messages DROP COLUMN Channel;
ALTER TABLE messages DROP COLUMN Code; ALTER TABLE messages DROP COLUMN Code;
ALTER TABLE messages DROP COLUMN SortCode; ALTER TABLE messages DROP COLUMN SortCode;
"); "
);
SetMigrationVersion(3); SetMigrationVersion(3);
} }
@@ -302,10 +309,8 @@ internal class MessageStore : IDisposable
{ {
Plugin.Log.Information($"Setting version {version}"); Plugin.Log.Information($"Setting version {version}");
using var cmd = Connection.CreateCommand(); using var cmd = Connection.CreateCommand();
// PRAGMA does not accept SQLite parameter bindings, and there is no // PRAGMA does not accept SQLite parameter bindings; version is a
// pragma_ function variant that can set the version either. The // compile-time int from the migration sequence, never user input.
// version is a compile-time int from the migration sequence, never
// user input.
cmd.CommandText = $"PRAGMA user_version = {version};"; cmd.CommandText = $"PRAGMA user_version = {version};";
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
@@ -316,16 +321,14 @@ internal class MessageStore : IDisposable
PerformMaintenance(); PerformMaintenance();
} }
/// <summary> // Returns a (ChatType, count) snapshot over non-deleted messages.
/// Returns a (ChatType, count) snapshot over non-deleted messages. // Used by the Privacy tab to preview retroactive cleanup impact.
/// Used by the Privacy tab to preview the impact of a retroactive
/// cleanup before the user confirms.
/// </summary>
internal Dictionary<int, long> GetMessageCountsByChatType() internal Dictionary<int, long> GetMessageCountsByChatType()
{ {
var result = new Dictionary<int, long>(); var result = new Dictionary<int, long>();
using var cmd = Connection.CreateCommand(); using var cmd = Connection.CreateCommand();
cmd.CommandText = "SELECT ChatType, COUNT(*) FROM messages WHERE deleted = false GROUP BY ChatType;"; cmd.CommandText =
"SELECT ChatType, COUNT(*) FROM messages WHERE deleted = false GROUP BY ChatType;";
cmd.CommandTimeout = 120; cmd.CommandTimeout = 120;
using var reader = cmd.ExecuteReader(); using var reader = cmd.ExecuteReader();
while (reader.Read()) while (reader.Read())
@@ -337,19 +340,25 @@ internal class MessageStore : IDisposable
return result; return result;
} }
/// <summary> // Deletes messages older than the per-channel retention window, with a global
/// Deletes messages older than the per-channel retention window, with a // default for unmapped channels. Runs VACUUM only if rows were removed.
/// global default for channels not listed explicitly. Cutoffs are // Returns the number of rows deleted.
/// computed from "now" at call time. Runs VACUUM only if anything was internal long DeleteByRetentionPolicy(
/// removed. Returns the number of rows deleted. IReadOnlyDictionary<int, int> chatTypeDaysMap,
/// </summary> int defaultDays
internal long DeleteByRetentionPolicy(IReadOnlyDictionary<int, int> chatTypeDaysMap, int defaultDays) )
{ {
if (defaultDays < 0) if (defaultDays < 0)
throw new ArgumentOutOfRangeException(nameof(defaultDays), "Negative retention is not allowed."); throw new ArgumentOutOfRangeException(
nameof(defaultDays),
"Negative retention is not allowed."
);
foreach (var (_, days) in chatTypeDaysMap) foreach (var (_, days) in chatTypeDaysMap)
if (days < 0) if (days < 0)
throw new ArgumentOutOfRangeException(nameof(chatTypeDaysMap), "Negative retention is not allowed."); throw new ArgumentOutOfRangeException(
nameof(chatTypeDaysMap),
"Negative retention is not allowed."
);
var nowMs = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(); var nowMs = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
@@ -372,19 +381,19 @@ internal class MessageStore : IDisposable
index++; index++;
} }
// Catch-all for channels without an explicit override. "0" is // defaultDays=0 means "keep forever" for unmapped channels.
// treated as "do not delete by default" — without an explicit
// user override, unmapped channels stay forever instead of
// getting wiped immediately.
if (defaultDays > 0) if (defaultDays > 0)
{ {
var defaultCutoff = nowMs - defaultDays * 86400000L; var defaultCutoff = nowMs - defaultDays * 86400000L;
cmd.Parameters.AddWithValue("$defaultCutoff", defaultCutoff); cmd.Parameters.AddWithValue("$defaultCutoff", defaultCutoff);
var explicitPlaceholders = chatTypeDaysMap.Count > 0 var explicitPlaceholders =
chatTypeDaysMap.Count > 0
? BindIntList(cmd, "explicit", chatTypeDaysMap.Keys) ? BindIntList(cmd, "explicit", chatTypeDaysMap.Keys)
: "-1"; // empty list would produce invalid SQL : "-1"; // empty list would produce invalid SQL
clauses.Add($"(ChatType NOT IN ({explicitPlaceholders}) AND Date < $defaultCutoff)"); clauses.Add(
$"(ChatType NOT IN ({explicitPlaceholders}) AND Date < $defaultCutoff)"
);
} }
if (clauses.Count == 0) if (clauses.Count == 0)
@@ -400,19 +409,14 @@ internal class MessageStore : IDisposable
return deleted; return deleted;
} }
/// <summary> // Hard-deletes every message whose ChatType is not in the allowlist,
/// Hard-deletes every message whose ChatType is not in the supplied // then VACUUMs. Returns the number of rows deleted.
/// allowlist, then VACUUMs the database to reclaim disk space.
/// Returns the number of rows deleted.
/// </summary>
internal long CleanupRetainOnly(IReadOnlyCollection<int> allowedTypes) internal long CleanupRetainOnly(IReadOnlyCollection<int> allowedTypes)
{ {
if (allowedTypes.Count == 0) if (allowedTypes.Count == 0)
{ throw new InvalidOperationException(
// Defensive: refuse a "delete everything" disguised as a filter. "CleanupRetainOnly requires at least one allowed ChatType. Use ClearMessages for a full wipe."
// Use ClearMessages() if a full wipe is actually intended. );
throw new InvalidOperationException("CleanupRetainOnly requires at least one allowed ChatType. Use ClearMessages for a full wipe.");
}
long deleted; long deleted;
using (var cmd = Connection.CreateCommand()) using (var cmd = Connection.CreateCommand())
@@ -428,15 +432,19 @@ internal class MessageStore : IDisposable
internal void PerformMaintenance() internal void PerformMaintenance()
{ {
Connection.Execute(@" Connection.Execute(
@"
VACUUM; VACUUM;
REINDEX messages; REINDEX messages;
ANALYZE; ANALYZE;
"); "
);
} }
private string LogPath => DbPath + "-wal"; private string LogPath => DbPath + "-wal";
internal long DatabaseSize() => !File.Exists(DbPath) ? 0 : new FileInfo(DbPath).Length; internal long DatabaseSize() => !File.Exists(DbPath) ? 0 : new FileInfo(DbPath).Length;
internal long DatabaseLogSize() => !File.Exists(LogPath) ? 0 : new FileInfo(LogPath).Length; internal long DatabaseLogSize() => !File.Exists(LogPath) ? 0 : new FileInfo(LogPath).Length;
internal int MessageCount() internal int MessageCount()
@@ -448,48 +456,22 @@ internal class MessageStore : IDisposable
internal void UpsertMessage(Message message) internal void UpsertMessage(Message message)
{ {
// Hellion Chat privacy filter drop disallowed ChatTypes before // Privacy filter -- drop disallowed ChatTypes before they reach storage.
// they reach the storage layer (single source of truth, also
// covers any future write paths e.g. webinterface backfill).
if (!Plugin.Config.IsAllowedForStorage(message.Code.Type)) if (!Plugin.Config.IsAllowedForStorage(message.Code.Type))
{ {
// Verbose-only: this fires for every dropped message, which is
// the common case for users with a tight privacy whitelist. Keep
// it for diagnostics but stay out of the default xllog stream.
Plugin.Log.Verbose($"Privacy filter dropped message: ChatType={message.Code.Type}"); Plugin.Log.Verbose($"Privacy filter dropped message: ChatType={message.Code.Type}");
return; return;
} }
using var cmd = Connection.CreateCommand(); using var cmd = Connection.CreateCommand();
cmd.CommandText = @" cmd.CommandText =
@"
INSERT INTO messages ( INSERT INTO messages (
Id, Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
Receiver, Sender, Content, SenderSource, ContentSource, ExtraChatChannel, Deleted
ContentId,
Date,
ChatType,
SourceKind,
TargetKind,
Sender,
Content,
SenderSource,
ContentSource,
ExtraChatChannel,
Deleted
) VALUES ( ) VALUES (
$Id, $Id, $Receiver, $ContentId, $Date, $ChatType, $SourceKind, $TargetKind,
$Receiver, $Sender, $Content, $SenderSource, $ContentSource, $ExtraChatChannel, false
$ContentId,
$Date,
$ChatType,
$SourceKind,
$TargetKind,
$Sender,
$Content,
$SenderSource,
$ContentSource,
$ExtraChatChannel,
false
) )
ON CONFLICT (id) DO UPDATE SET ON CONFLICT (id) DO UPDATE SET
Receiver = excluded.Receiver, Receiver = excluded.Receiver,
@@ -513,26 +495,35 @@ internal class MessageStore : IDisposable
cmd.Parameters.AddWithValue("$ChatType", message.Code.Type); cmd.Parameters.AddWithValue("$ChatType", message.Code.Type);
cmd.Parameters.AddWithValue("$SourceKind", message.Code.Source); cmd.Parameters.AddWithValue("$SourceKind", message.Code.Source);
cmd.Parameters.AddWithValue("$TargetKind", message.Code.Target); cmd.Parameters.AddWithValue("$TargetKind", message.Code.Target);
cmd.Parameters.AddWithValue("$Sender", MessagePackSerializer.Serialize(message.Sender, MsgPackOptions)); cmd.Parameters.AddWithValue(
cmd.Parameters.AddWithValue("$Content", MessagePackSerializer.Serialize(message.Content, MsgPackOptions)); "$Sender",
cmd.Parameters.AddWithValue("$SenderSource", MessagePackSerializer.Serialize(message.SenderSource, MsgPackOptions)); MessagePackSerializer.Serialize(message.Sender, MsgPackOptions)
cmd.Parameters.AddWithValue("$ContentSource", MessagePackSerializer.Serialize(message.ContentSource, MsgPackOptions)); );
cmd.Parameters.AddWithValue(
"$Content",
MessagePackSerializer.Serialize(message.Content, MsgPackOptions)
);
cmd.Parameters.AddWithValue(
"$SenderSource",
MessagePackSerializer.Serialize(message.SenderSource, MsgPackOptions)
);
cmd.Parameters.AddWithValue(
"$ContentSource",
MessagePackSerializer.Serialize(message.ContentSource, MsgPackOptions)
);
cmd.Parameters.AddWithValue("$ExtraChatChannel", message.ExtraChatChannel); cmd.Parameters.AddWithValue("$ExtraChatChannel", message.ExtraChatChannel);
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
/// <summary> // Streams messages for export, sorted ascending by Date, excluding soft-deleted rows.
/// Streams messages for export. Optional filters: // Optional filters: chatTypes, from/to inclusive date range.
/// - <paramref name="chatTypes"/>: limit to these ChatTypes // Caller is responsible for disposing the enumerator.
/// - <paramref name="from"/> / <paramref name="to"/>: inclusive date range
/// Result is sorted ascending by Date and excludes soft-deleted rows.
/// Caller is responsible for disposing the enumerator.
/// </summary>
internal MessageEnumerator StreamForExport( internal MessageEnumerator StreamForExport(
IReadOnlyCollection<int>? chatTypes, IReadOnlyCollection<int>? chatTypes,
DateTimeOffset? from, DateTimeOffset? from,
DateTimeOffset? to) DateTimeOffset? to
)
{ {
var cmd = Connection.CreateCommand(); var cmd = Connection.CreateCommand();
@@ -544,22 +535,15 @@ internal class MessageStore : IDisposable
if (to is not null) if (to is not null)
clauses.Add("Date <= $To"); clauses.Add("Date <= $To");
cmd.CommandText = @" cmd.CommandText =
@"
SELECT SELECT
Id, Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
Receiver, Sender, Content, SenderSource, ContentSource, ExtraChatChannel
ContentId,
Date,
ChatType,
SourceKind,
TargetKind,
Sender,
Content,
SenderSource,
ContentSource,
ExtraChatChannel
FROM messages FROM messages
WHERE " + string.Join(" AND ", clauses) + @" WHERE "
+ string.Join(" AND ", clauses)
+ @"
ORDER BY Date ASC;"; ORDER BY Date ASC;";
cmd.CommandTimeout = 600; cmd.CommandTimeout = 600;
@@ -571,13 +555,15 @@ internal class MessageStore : IDisposable
return new MessageEnumerator(cmd.ExecuteReader()); return new MessageEnumerator(cmd.ExecuteReader());
} }
/// <summary> // Returns the most recent messages, oldest-first.
/// Get the most recent messages. // receiver: filter by receiver ContentId (null = no filter)
/// </summary> // since: only include messages after this date (null = no filter)
/// <param name="receiver">The receiver content ID to filter by. If null, no filtering is performed.</param> // count: max rows to return, defaults to 10,000
/// <param name="since">Only show messages since this date. If null, no filtering is performed.</param> internal MessageEnumerator GetMostRecentMessages(
/// <param name="count">The amount to return. Defaults to 10,000.</param> ulong? receiver = null,
internal MessageEnumerator GetMostRecentMessages(ulong? receiver = null, DateTimeOffset? since = null, int count = MessageQueryLimit) DateTimeOffset? since = null,
int count = MessageQueryLimit
)
{ {
List<string> whereClauses = ["deleted = false"]; List<string> whereClauses = ["deleted = false"];
if (receiver != null) if (receiver != null)
@@ -588,32 +574,24 @@ internal class MessageStore : IDisposable
var whereClause = "WHERE " + string.Join(" AND ", whereClauses); var whereClause = "WHERE " + string.Join(" AND ", whereClauses);
var cmd = Connection.CreateCommand(); var cmd = Connection.CreateCommand();
// Select last N messages by date DESC, but reverse the order to get // Select last N by date DESC, then reverse to ascending order.
// them in ascending order. cmd.CommandText =
cmd.CommandText = @" @"
SELECT * SELECT *
FROM ( FROM (
SELECT SELECT
Id, Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
Receiver, Sender, Content, SenderSource, ContentSource, ExtraChatChannel
ContentId,
Date,
ChatType,
SourceKind,
TargetKind,
Sender,
Content,
SenderSource,
ContentSource,
ExtraChatChannel
FROM messages FROM messages
" + whereClause + @" "
+ whereClause
+ @"
ORDER BY Date DESC ORDER BY Date DESC
LIMIT $Count LIMIT $Count
) )
ORDER BY Date ASC; ORDER BY Date ASC;
"; ";
cmd.CommandTimeout = 120; // this could take a while on slow computers cmd.CommandTimeout = 120;
if (receiver != null) if (receiver != null)
cmd.Parameters.AddWithValue("$Receiver", receiver); cmd.Parameters.AddWithValue("$Receiver", receiver);
@@ -625,48 +603,27 @@ internal class MessageStore : IDisposable
return new MessageEnumerator(cmd.ExecuteReader()); return new MessageEnumerator(cmd.ExecuteReader());
} }
/// <summary> // Returns up to limit tells exchanged with the named player, oldest-first.
/// Hellion Chat — Auto-Tell-Tabs history preload. // SQL narrows by Receiver + ChatType (indexed); client does the final
/// // PlayerPayload comparison. sqlScanLimit caps the scan to stay within
/// Returns up to <paramref name="limit"/> tells exchanged with the named // the message-processing worker thread budget.
/// player, oldest-first, ready to be added to a freshly spawned auto
/// tell tab. The Sender column is a serialized chunk blob, so SQL on its
/// own cannot filter by player identity; we narrow with SQL on Receiver
/// + ChatType (cheap, indexed) and let the client do the final
/// PlayerPayload comparison on the result set.
///
/// <paramref name="sqlScanLimit"/> caps how many recent tells we scan
/// before giving up. 500 covers around 10 days for an active greeter
/// and stays well under the 20 ms budget required to keep the spawn on
/// the message-processing worker thread.
/// </summary>
internal IReadOnlyList<Message> GetTellHistoryWithSender( internal IReadOnlyList<Message> GetTellHistoryWithSender(
ulong receiver, ulong receiver,
string senderName, string senderName,
uint senderWorld, uint senderWorld,
int limit, int limit,
int sqlScanLimit = 500) int sqlScanLimit = 500
)
{ {
if (limit <= 0) if (limit <= 0)
{
return []; return [];
}
using var cmd = Connection.CreateCommand(); using var cmd = Connection.CreateCommand();
cmd.CommandText = @" cmd.CommandText =
@"
SELECT SELECT
Id, Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
Receiver, Sender, Content, SenderSource, ContentSource, ExtraChatChannel
ContentId,
Date,
ChatType,
SourceKind,
TargetKind,
Sender,
Content,
SenderSource,
ContentSource,
ExtraChatChannel
FROM messages FROM messages
WHERE deleted = false WHERE deleted = false
AND Receiver = $Receiver AND Receiver = $Receiver
@@ -685,27 +642,19 @@ internal class MessageStore : IDisposable
foreach (var message in enumerator) foreach (var message in enumerator)
{ {
if (!ChunkUtil.MatchesSender(message, senderName, senderWorld)) if (!ChunkUtil.MatchesSender(message, senderName, senderWorld))
{
continue; continue;
}
collected.Add(message); collected.Add(message);
if (collected.Count >= limit) if (collected.Count >= limit)
{
break; break;
} }
}
// SQL was DESC (newest-first) so we hit the limit on the most // SQL was DESC (newest-first); reverse to oldest-first for tab display.
// recent matching tells. Reverse to oldest-first for chronological
// display in the tab.
collected.Reverse(); collected.Reverse();
return collected; return collected;
} }
/// <summary> // Soft-deletes a message so it won't appear in queries.
/// Marks a message as deleted so it won't get returned in queries.
/// </summary>
internal void DeleteMessage(Guid id) internal void DeleteMessage(Guid id)
{ {
using var cmd = Connection.CreateCommand(); using var cmd = Connection.CreateCommand();
@@ -714,7 +663,12 @@ internal class MessageStore : IDisposable
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
internal long CountDateRange(DateTime after, DateTime before, IEnumerable<byte> channels, ulong? receiver = null) internal long CountDateRange(
DateTime after,
DateTime before,
IEnumerable<byte> channels,
ulong? receiver = null
)
{ {
using var cmd = Connection.CreateCommand(); using var cmd = Connection.CreateCommand();
@@ -727,9 +681,8 @@ internal class MessageStore : IDisposable
var whereClause = "WHERE " + string.Join(" AND ", whereClauses); var whereClause = "WHERE " + string.Join(" AND ", whereClauses);
// Select last N messages by date DESC, but reverse the order to get cmd.CommandText =
// them in ascending order. @"
cmd.CommandText = @"
SELECT COUNT(*) SELECT COUNT(*)
FROM messages FROM messages
" + whereClause; " + whereClause;
@@ -739,12 +692,17 @@ internal class MessageStore : IDisposable
cmd.Parameters.AddWithValue("$After", ((DateTimeOffset)after).ToUnixTimeMilliseconds()); cmd.Parameters.AddWithValue("$After", ((DateTimeOffset)after).ToUnixTimeMilliseconds());
cmd.Parameters.AddWithValue("$Before", ((DateTimeOffset)before).ToUnixTimeMilliseconds()); cmd.Parameters.AddWithValue("$Before", ((DateTimeOffset)before).ToUnixTimeMilliseconds());
cmd.CommandTimeout = 120; // this could take a while on slow computers cmd.CommandTimeout = 120;
return (long)cmd.ExecuteScalar()!; return (long)cmd.ExecuteScalar()!;
} }
internal MessageEnumerator GetDateRange(DateTime after, DateTime before, IEnumerable<byte> channels, ulong? receiver = null) internal MessageEnumerator GetDateRange(
DateTime after,
DateTime before,
IEnumerable<byte> channels,
ulong? receiver = null
)
{ {
var cmd = Connection.CreateCommand(); var cmd = Connection.CreateCommand();
@@ -757,25 +715,14 @@ internal class MessageStore : IDisposable
var whereClause = $"WHERE {string.Join(" AND ", whereClauses)}"; var whereClause = $"WHERE {string.Join(" AND ", whereClauses)}";
// Select last N messages by date DESC, but reverse the order to get cmd.CommandText =
// them in ascending order. @"
cmd.CommandText = @"
SELECT SELECT
Id, Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
Receiver, Sender, Content, SenderSource, ContentSource, ExtraChatChannel
ContentId,
Date,
ChatType,
SourceKind,
TargetKind,
Sender,
Content,
SenderSource,
ContentSource,
ExtraChatChannel
FROM messages FROM messages
" + whereClause; " + whereClause;
cmd.CommandTimeout = 120; // this could take a while on slow computers cmd.CommandTimeout = 120;
if (receiver != null) if (receiver != null)
cmd.Parameters.AddWithValue("$Receiver", receiver); cmd.Parameters.AddWithValue("$Receiver", receiver);
@@ -786,7 +733,13 @@ internal class MessageStore : IDisposable
return new MessageEnumerator(cmd.ExecuteReader()); return new MessageEnumerator(cmd.ExecuteReader());
} }
internal MessageEnumerator GetPagedDateRange(DateTime after, DateTime before, IEnumerable<byte> channels, ulong? receiver = null, int page = 0) internal MessageEnumerator GetPagedDateRange(
DateTime after,
DateTime before,
IEnumerable<byte> channels,
ulong? receiver = null,
int page = 0
)
{ {
var cmd = Connection.CreateCommand(); var cmd = Connection.CreateCommand();
@@ -799,28 +752,19 @@ internal class MessageStore : IDisposable
var whereClause = $"WHERE {string.Join(" AND ", whereClauses)}"; var whereClause = $"WHERE {string.Join(" AND ", whereClauses)}";
// Select last N messages by date DESC, but reverse the order to get cmd.CommandText =
// them in ascending order. @"
cmd.CommandText = @"
SELECT SELECT
Id, Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
Receiver, Sender, Content, SenderSource, ContentSource, ExtraChatChannel
ContentId,
Date,
ChatType,
SourceKind,
TargetKind,
Sender,
Content,
SenderSource,
ContentSource,
ExtraChatChannel
FROM messages FROM messages
" + whereClause + @" "
+ whereClause
+ @"
ORDER BY Date ORDER BY Date
LIMIT $Offset, $OffsetCount; LIMIT $Offset, $OffsetCount;
"; ";
cmd.CommandTimeout = 120; // this could take a while on slow computers cmd.CommandTimeout = 120;
if (receiver != null) if (receiver != null)
cmd.Parameters.AddWithValue("$Receiver", receiver); cmd.Parameters.AddWithValue("$Receiver", receiver);
@@ -833,10 +777,8 @@ internal class MessageStore : IDisposable
return new MessageEnumerator(cmd.ExecuteReader()); return new MessageEnumerator(cmd.ExecuteReader());
} }
// Build "$prefix0,$prefix1,..." placeholder list and bind values to // Builds a "$prefix0,$prefix1,..." placeholder list and binds values to the command.
// the command. SQLite has no native array parameter, so we generate // SQLite has no native array parameter, so placeholders are generated per entry.
// the list at runtime and bind each entry under its own name. Used
// for IN-clauses and similar dynamic-arity SQL fragments.
private static string BindIntList(SqliteCommand cmd, string prefix, IEnumerable<int> values) private static string BindIntList(SqliteCommand cmd, string prefix, IEnumerable<int> values)
{ {
var names = new List<string>(); var names = new List<string>();
@@ -852,12 +794,13 @@ internal class MessageStore : IDisposable
} }
} }
internal class MessageEnumerator(DbDataReader reader) : IEnumerable<Message>, IDisposable, IAsyncDisposable internal class MessageEnumerator(DbDataReader reader)
: IEnumerable<Message>,
IDisposable,
IAsyncDisposable
{ {
private const int MaxErrorLogs = 10; private const int MaxErrorLogs = 10;
// FailedIds and FailedCount are separate, because messages might fail to
// even parse the ID field.
private readonly List<Guid> FailedIds = []; private readonly List<Guid> FailedIds = [];
private int FailedCount; private int FailedCount;
public bool DidError => FailedCount > 0; public bool DidError => FailedCount > 0;
@@ -876,11 +819,27 @@ internal class MessageEnumerator(DbDataReader reader) : IEnumerable<Message>, ID
(ulong)reader.GetInt64(1), (ulong)reader.GetInt64(1),
(ulong)reader.GetInt64(2), (ulong)reader.GetInt64(2),
DateTimeOffset.FromUnixTimeMilliseconds(reader.GetInt64(3)), DateTimeOffset.FromUnixTimeMilliseconds(reader.GetInt64(3)),
new ChatCode((byte)reader.GetInt32(4), (byte)reader.GetInt32(5), (byte)reader.GetInt32(6)), new ChatCode(
MessagePackSerializer.Deserialize<List<Chunk>>(reader.GetFieldValue<byte[]>(7), MessageStore.MsgPackOptions), (byte)reader.GetInt32(4),
MessagePackSerializer.Deserialize<List<Chunk>>(reader.GetFieldValue<byte[]>(8), MessageStore.MsgPackOptions), (byte)reader.GetInt32(5),
MessagePackSerializer.Deserialize<SeString>(reader.GetFieldValue<byte[]>(9), MessageStore.MsgPackOptions), (byte)reader.GetInt32(6)
MessagePackSerializer.Deserialize<SeString>(reader.GetFieldValue<byte[]>(10), MessageStore.MsgPackOptions), ),
MessagePackSerializer.Deserialize<List<Chunk>>(
reader.GetFieldValue<byte[]>(7),
MessageStore.MsgPackOptions
),
MessagePackSerializer.Deserialize<List<Chunk>>(
reader.GetFieldValue<byte[]>(8),
MessageStore.MsgPackOptions
),
MessagePackSerializer.Deserialize<SeString>(
reader.GetFieldValue<byte[]>(9),
MessageStore.MsgPackOptions
),
MessagePackSerializer.Deserialize<SeString>(
reader.GetFieldValue<byte[]>(10),
MessageStore.MsgPackOptions
),
reader.GetGuid(11) reader.GetGuid(11)
); );
} }
@@ -915,6 +874,7 @@ internal class MessageEnumerator(DbDataReader reader) : IEnumerable<Message>, ID
{ {
reader.Dispose(); reader.Dispose();
} }
public async ValueTask DisposeAsync() public async ValueTask DisposeAsync()
{ {
await reader.DisposeAsync(); await reader.DisposeAsync();
+175 -43
View File
@@ -1,8 +1,5 @@
using System.Numerics; using System.Numerics;
using HellionChat.Code; using Dalamud.Bindings.ImGui;
using HellionChat.Resources;
using HellionChat.Ui;
using HellionChat.Util;
using Dalamud.Game.Addon.Lifecycle; using Dalamud.Game.Addon.Lifecycle;
using Dalamud.Game.Addon.Lifecycle.AddonArgTypes; using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
using Dalamud.Game.ClientState.Objects.SubKinds; using Dalamud.Game.ClientState.Objects.SubKinds;
@@ -18,11 +15,14 @@ using Dalamud.Interface.Utility.Raii;
using Dalamud.Utility; using Dalamud.Utility;
using FFXIVClientStructs.FFXIV.Client.UI; using FFXIVClientStructs.FFXIV.Client.UI;
using FFXIVClientStructs.FFXIV.Component.GUI; using FFXIVClientStructs.FFXIV.Component.GUI;
using Dalamud.Bindings.ImGui; using HellionChat.Code;
using HellionChat.Resources;
using HellionChat.Ui;
using HellionChat.Util;
using Lumina.Excel.Sheets; using Lumina.Excel.Sheets;
using Action = System.Action; using Action = System.Action;
using DalamudPartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload;
using ChatTwoPartyFinderPayload = HellionChat.Util.PartyFinderPayload; using ChatTwoPartyFinderPayload = HellionChat.Util.PartyFinderPayload;
using DalamudPartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload;
namespace HellionChat; namespace HellionChat;
@@ -107,7 +107,9 @@ public sealed class PayloadHandler
ImGui.Separator(); ImGui.Separator();
var contentId = chunk.Message?.ContentId ?? 0; var contentId = chunk.Message?.ContentId ?? 0;
var sender = chunk.Message?.Sender.Select(c => c.Link).FirstOrDefault(p => p is PlayerPayload) as PlayerPayload; var sender =
chunk.Message?.Sender.Select(c => c.Link).FirstOrDefault(p => p is PlayerPayload)
as PlayerPayload;
using var menu = ImRaii.Menu(Language.Context_Integrations); using var menu = ImRaii.Menu(Language.Context_Integrations);
if (!menu.Success) if (!menu.Success)
@@ -118,7 +120,14 @@ public sealed class PayloadHandler
{ {
try try
{ {
LogWindow.Plugin.Ipc.Invoke(id, sender, contentId, payload, chunk.Message?.SenderSource, chunk.Message?.ContentSource); LogWindow.Plugin.Ipc.Invoke(
id,
sender,
contentId,
payload,
chunk.Message?.SenderSource,
chunk.Message?.ContentSource
);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -128,7 +137,10 @@ public sealed class PayloadHandler
if (cursor == ImGui.GetCursorPos()) if (cursor == ImGui.GetCursorPos())
{ {
using var pushedColor = ImRaii.PushColor(ImGuiCol.Text, ImGui.GetStyle().Colors[(int)ImGuiCol.TextDisabled]); using var pushedColor = ImRaii.PushColor(
ImGuiCol.Text,
ImGui.GetStyle().Colors[(int)ImGuiCol.TextDisabled]
);
ImGui.Text("No integrations available"); ImGui.Text("No integrations available");
} }
} }
@@ -168,10 +180,16 @@ public sealed class PayloadHandler
if (message.Sender.Count > 0 && ImGui.Selectable(Language.Context_CopyContent)) if (message.Sender.Count > 0 && ImGui.Selectable(Language.Context_CopyContent))
{ {
ImGui.SetClipboardText(StringifyMessage(message)); ImGui.SetClipboardText(StringifyMessage(message));
WrapperUtil.AddNotification(Language.Context_CopyContentSuccess, NotificationType.Info); WrapperUtil.AddNotification(
Language.Context_CopyContentSuccess,
NotificationType.Info
);
} }
using var pushedColor = ImRaii.PushColor(ImGuiCol.Text, ImGui.GetStyle().Colors[(int) ImGuiCol.TextDisabled]); using var pushedColor = ImRaii.PushColor(
ImGuiCol.Text,
ImGui.GetStyle().Colors[(int)ImGuiCol.TextDisabled]
);
ImGui.TextUnformatted(message.Code.Type.Name()); ImGui.TextUnformatted(message.Code.Type.Name());
} }
@@ -184,7 +202,8 @@ public sealed class PayloadHandler
return string.Empty; return string.Empty;
var chunks = withSender ? message.Sender.Concat(message.Content) : message.Content; var chunks = withSender ? message.Sender.Concat(message.Content) : message.Content;
return chunks.Where(chunk => chunk is TextChunk) return chunks
.Where(chunk => chunk is TextChunk)
.Cast<TextChunk>() .Cast<TextChunk>()
.Select(text => text.Content) .Select(text => text.Content)
.Aggregate(string.Concat); .Aggregate(string.Concat);
@@ -255,7 +274,10 @@ public sealed class PayloadHandler
public unsafe void MoveTooltip(AddonEvent type, AddonArgs args) public unsafe void MoveTooltip(AddonEvent type, AddonArgs args)
{ {
// Only move if the user has the "Next to Cursor" option selected // Only move if the user has the "Next to Cursor" option selected
if (!Plugin.GameConfig.TryGet(UiControlOption.DetailTrackingType, out uint selected) || selected != 0) if (
!Plugin.GameConfig.TryGet(UiControlOption.DetailTrackingType, out uint selected)
|| selected != 0
)
return; return;
if (LogWindow.LastViewport != ImGuiHelpers.MainViewport.Handle) if (LogWindow.LastViewport != ImGuiHelpers.MainViewport.Handle)
@@ -274,7 +296,10 @@ public sealed class PayloadHandler
var component = atkBase->WindowNode->AtkResNode; var component = atkBase->WindowNode->AtkResNode;
var atkPos = new Vector2(component.ScreenX, component.ScreenY); var atkPos = new Vector2(component.ScreenX, component.ScreenY);
var atkSize = new Vector2(component.GetWidth() * component.ScaleX, component.GetHeight() * component.GetScaleY()); var atkSize = new Vector2(
component.GetWidth() * component.ScaleX,
component.GetHeight() * component.GetScaleY()
);
var chatRect = new MathUtil.Rectangle(LogWindow.LastWindowPos, LogWindow.LastWindowSize); var chatRect = new MathUtil.Rectangle(LogWindow.LastWindowPos, LogWindow.LastWindowSize);
var addonRect = new MathUtil.Rectangle(atkPos, atkSize); var addonRect = new MathUtil.Rectangle(atkPos, atkSize);
@@ -347,12 +372,17 @@ public sealed class PayloadHandler
var cursor = ImGui.GetCursorPos(); var cursor = ImGui.GetCursorPos();
ImGui.Image(icon.Handle, size); ImGui.Image(icon.Handle, size);
ImGui.SameLine(); ImGui.SameLine();
ImGui.SetCursorPos(cursor + new Vector2(size.X + 4, size.Y - ImGui.GetTextLineHeightWithSpacing())); ImGui.SetCursorPos(
cursor + new Vector2(size.X + 4, size.Y - ImGui.GetTextLineHeightWithSpacing())
);
} }
private void HoverStatus(StatusPayload status) private void HoverStatus(StatusPayload status)
{ {
if (Plugin.TextureProvider.GetFromGameIcon(status.Status.Value.Icon).GetWrapOrDefault() is { } icon) if (
Plugin.TextureProvider.GetFromGameIcon(status.Status.Value.Icon).GetWrapOrDefault() is
{ } icon
)
InlineIcon(icon); InlineIcon(icon);
var builder = new SeStringBuilder(); var builder = new SeStringBuilder();
@@ -374,7 +404,11 @@ public sealed class PayloadHandler
LogWindow.DrawChunks(name.ToList()); LogWindow.DrawChunks(name.ToList());
ImGui.Separator(); ImGui.Separator();
var desc = ChunkUtil.ToChunks(status.Status.Value.Description.ToDalamudString(), ChunkSource.None, null); var desc = ChunkUtil.ToChunks(
status.Status.Value.Description.ToDalamudString(),
ChunkSource.None,
null
);
LogWindow.DrawChunks(desc.ToList()); LogWindow.DrawChunks(desc.ToList());
} }
@@ -389,14 +423,23 @@ public sealed class PayloadHandler
if (!item.Item.TryGetValue(out Item resolvedItem)) if (!item.Item.TryGetValue(out Item resolvedItem))
return; return;
if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(resolvedItem.Icon, item.IsHQ)).GetWrapOrDefault() is { } icon) if (
Plugin
.TextureProvider.GetFromGameIcon(new GameIconLookup(resolvedItem.Icon, item.IsHQ))
.GetWrapOrDefault() is
{ } icon
)
InlineIcon(icon); InlineIcon(icon);
var name = ChunkUtil.ToChunks(resolvedItem.Name.ToDalamudString(), ChunkSource.None, null); var name = ChunkUtil.ToChunks(resolvedItem.Name.ToDalamudString(), ChunkSource.None, null);
LogWindow.DrawChunks(name.ToList()); LogWindow.DrawChunks(name.ToList());
ImGui.Separator(); ImGui.Separator();
var desc = ChunkUtil.ToChunks(resolvedItem.Description.ToDalamudString(), ChunkSource.None, null); var desc = ChunkUtil.ToChunks(
resolvedItem.Description.ToDalamudString(),
ChunkSource.None,
null
);
LogWindow.DrawChunks(desc.ToList()); LogWindow.DrawChunks(desc.ToList());
} }
@@ -405,7 +448,12 @@ public sealed class PayloadHandler
if (!Sheets.EventItemSheet.TryGetRow(payload.RawItemId, out var itemRow)) if (!Sheets.EventItemSheet.TryGetRow(payload.RawItemId, out var itemRow))
return; return;
if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(itemRow.Icon)).GetWrapOrDefault() is { } icon) if (
Plugin
.TextureProvider.GetFromGameIcon(new GameIconLookup(itemRow.Icon))
.GetWrapOrDefault() is
{ } icon
)
InlineIcon(icon); InlineIcon(icon);
var name = ChunkUtil.ToChunks(itemRow.Name.ToDalamudString(), ChunkSource.None, null); var name = ChunkUtil.ToChunks(itemRow.Name.ToDalamudString(), ChunkSource.None, null);
@@ -415,7 +463,11 @@ public sealed class PayloadHandler
if (!Sheets.EventItemHelpSheet.TryGetRow(payload.RawItemId, out var itemHelpRow)) if (!Sheets.EventItemHelpSheet.TryGetRow(payload.RawItemId, out var itemHelpRow))
return; return;
LogWindow.DrawChunks(ChunkUtil.ToChunks(itemHelpRow.Description.ToDalamudString(), ChunkSource.None, null).ToList()); LogWindow.DrawChunks(
ChunkUtil
.ToChunks(itemHelpRow.Description.ToDalamudString(), ChunkSource.None, null)
.ToList()
);
} }
private void HoverUri(UriPayload uri) private void HoverUri(UriPayload uri)
@@ -438,7 +490,10 @@ public sealed class PayloadHandler
ClickLinkPayload(chunk, payload, link); ClickLinkPayload(chunk, payload, link);
break; break;
case DalamudPartyFinderPayload pf: case DalamudPartyFinderPayload pf:
if (pf.LinkType == DalamudPartyFinderPayload.PartyFinderLinkType.PartyFinderNotification) if (
pf.LinkType
== DalamudPartyFinderPayload.PartyFinderLinkType.PartyFinderNotification
)
GameFunctions.GameFunctions.OpenPartyFinder(); GameFunctions.GameFunctions.OpenPartyFinder();
else else
GameFunctions.GameFunctions.OpenPartyFinder(pf.ListingId); GameFunctions.GameFunctions.OpenPartyFinder(pf.ListingId);
@@ -473,7 +528,12 @@ public sealed class PayloadHandler
return; return;
var payloads = source.Payloads.Skip(start).Take(end - start + 1).ToList(); var payloads = source.Payloads.Skip(start).Take(end - start + 1).ToList();
if (!Plugin.ChatGui.RegisteredLinkHandlers.TryGetValue((link.Plugin, link.CommandId), out var value)) if (
!Plugin.ChatGui.RegisteredLinkHandlers.TryGetValue(
(link.Plugin, link.CommandId),
out var value
)
)
{ {
Plugin.Log.Warning("Could not find DalamudLinkHandlers"); Plugin.Log.Warning("Could not find DalamudLinkHandlers");
return; return;
@@ -508,7 +568,12 @@ public sealed class PayloadHandler
return; return;
var hq = payload.Kind == ItemKind.Hq; var hq = payload.Kind == ItemKind.Hq;
if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(itemRow.Icon, hq)).GetWrapOrDefault() is { } icon) if (
Plugin
.TextureProvider.GetFromGameIcon(new GameIconLookup(itemRow.Icon, hq))
.GetWrapOrDefault() is
{ } icon
)
InlineIcon(icon); InlineIcon(icon);
var name = itemRow.Name.ToDalamudString(); var name = itemRow.Name.ToDalamudString();
@@ -554,10 +619,18 @@ public sealed class PayloadHandler
return; return;
var item = Sheets.EventItemSheet.GetRow(payload.ItemId); var item = Sheets.EventItemSheet.GetRow(payload.ItemId);
if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(item.Icon)).GetWrapOrDefault() is { } icon) if (
Plugin
.TextureProvider.GetFromGameIcon(new GameIconLookup(item.Icon))
.GetWrapOrDefault() is
{ } icon
)
InlineIcon(icon); InlineIcon(icon);
LogWindow.DrawChunks(ChunkUtil.ToChunks(item.Name.ToDalamudString(), ChunkSource.None, null).ToList(), false); LogWindow.DrawChunks(
ChunkUtil.ToChunks(item.Name.ToDalamudString(), ChunkSource.None, null).ToList(),
false
);
ImGui.Separator(); ImGui.Separator();
var realItemId = payload.RawItemId; var realItemId = payload.RawItemId;
@@ -585,7 +658,7 @@ public sealed class PayloadHandler
{ {
name.AddRange([ name.AddRange([
new IconChunk(ChunkSource.None, null, BitmapFontIcon.CrossWorld), new IconChunk(ChunkSource.None, null, BitmapFontIcon.CrossWorld),
new TextChunk(ChunkSource.None, null, world.Value.Name.ExtractText()) new TextChunk(ChunkSource.None, null, world.Value.Name.ExtractText()),
]); ]);
} }
@@ -606,7 +679,15 @@ public sealed class PayloadHandler
} }
else if (validContentId) else if (validContentId)
{ {
LogWindow.Plugin.Functions.Chat.SetEurekaTellChannel(player.PlayerName, world.Value.Name.ToString(), (ushort) world.RowId, 0, chunk.Message!.ContentId, 0, false); LogWindow.Plugin.Functions.Chat.SetEurekaTellChannel(
player.PlayerName,
world.Value.Name.ToString(),
(ushort)world.RowId,
0,
chunk.Message!.ContentId,
0,
false
);
} }
LogWindow.Activate = true; LogWindow.Activate = true;
@@ -617,10 +698,16 @@ public sealed class PayloadHandler
var party = Plugin.PartyList; var party = Plugin.PartyList;
var leader = party[(int)party.PartyLeaderIndex]?.ContentId; var leader = party[(int)party.PartyLeaderIndex]?.ContentId;
var isLeader = party.Length == 0 || Plugin.PlayerState.ContentId == leader; var isLeader = party.Length == 0 || Plugin.PlayerState.ContentId == leader;
var member = party.FirstOrDefault(member => member.Name.TextValue == player.PlayerName && member.World.RowId == world.RowId); var member = party.FirstOrDefault(member =>
member.Name.TextValue == player.PlayerName && member.World.RowId == world.RowId
);
var isInParty = member != null; var isInParty = member != null;
var inInstance = GameFunctions.GameFunctions.IsInInstance(); var inInstance = GameFunctions.GameFunctions.IsInInstance();
var inPartyInstance = Sheets.TerritorySheet.GetRow(Plugin.ClientState.TerritoryType).TerritoryIntendedUse.RowId is (41 or 47 or 48 or 52 or 53 or 61); var inPartyInstance =
Sheets
.TerritorySheet.GetRow(Plugin.ClientState.TerritoryType)
.TerritoryIntendedUse.RowId
is (41 or 47 or 48 or 52 or 53 or 61);
if (isLeader) if (isLeader)
{ {
if (!isInParty) if (!isInParty)
@@ -636,10 +723,20 @@ public sealed class PayloadHandler
if (menu.Success) if (menu.Success)
{ {
if (ImGui.Selectable(Language.Context_InviteToParty_SameWorld)) if (ImGui.Selectable(Language.Context_InviteToParty_SameWorld))
GameFunctions.Party.InviteSameWorld(player.PlayerName, (ushort)world.RowId, chunk.Message?.ContentId ?? 0); GameFunctions.Party.InviteSameWorld(
player.PlayerName,
(ushort)world.RowId,
chunk.Message?.ContentId ?? 0
);
if (validContentId && ImGui.Selectable(Language.Context_InviteToParty_DifferentWorld)) if (
GameFunctions.Party.InviteOtherWorld(chunk.Message!.ContentId, (ushort)world.RowId); validContentId
&& ImGui.Selectable(Language.Context_InviteToParty_DifferentWorld)
)
GameFunctions.Party.InviteOtherWorld(
chunk.Message!.ContentId,
(ushort)world.RowId
);
} }
} }
} }
@@ -654,23 +751,41 @@ public sealed class PayloadHandler
} }
} }
var isFriend = GameFunctions.GameFunctions.GetFriends().Any(friend => friend.NameString == player.PlayerName && friend.HomeWorld == world.RowId); var isFriend = GameFunctions
.GameFunctions.GetFriends()
.Any(friend =>
friend.NameString == player.PlayerName && friend.HomeWorld == world.RowId
);
if (!isFriend && ImGui.Selectable(Language.Context_SendFriendRequest)) if (!isFriend && ImGui.Selectable(Language.Context_SendFriendRequest))
LogWindow.Plugin.Functions.SendFriendRequest(player.PlayerName, (ushort) world.RowId); LogWindow.Plugin.Functions.SendFriendRequest(
player.PlayerName,
(ushort)world.RowId
);
using (var menuBlockFunctions = ImRaii.Menu(Language.Context_BlockFunctions)) using (var menuBlockFunctions = ImRaii.Menu(Language.Context_BlockFunctions))
{ {
if (menuBlockFunctions.Success) if (menuBlockFunctions.Success)
{ {
if (ImGui.Selectable(Language.Context_AddToBlacklist)) if (ImGui.Selectable(Language.Context_AddToBlacklist))
LogWindow.Plugin.Functions.AddToBlacklist(player.PlayerName, (ushort)world.RowId); LogWindow.Plugin.Functions.AddToBlacklist(
player.PlayerName,
(ushort)world.RowId
);
if (chunk.Message != null) if (chunk.Message != null)
{ {
var message = chunk.Message; var message = chunk.Message;
if (message.AccountId != 0 && ImGui.Selectable(Language.Context_AddToMuteList)) if (
LogWindow.Plugin.Functions.AddToMuteList(message.AccountId, message.ContentId, player.PlayerName, (short) world.RowId); message.AccountId != 0
&& ImGui.Selectable(Language.Context_AddToMuteList)
)
LogWindow.Plugin.Functions.AddToMuteList(
message.AccountId,
message.ContentId,
player.PlayerName,
(short)world.RowId
);
if (ImGui.Selectable(Language.Context_AddToTermsFilter)) if (ImGui.Selectable(Language.Context_AddToTermsFilter))
LogWindow.Plugin.Functions.AddToTermsList(message.ContentSource); LogWindow.Plugin.Functions.AddToTermsList(message.ContentSource);
@@ -678,7 +793,10 @@ public sealed class PayloadHandler
} }
} }
if (GameFunctions.GameFunctions.IsMentor() && ImGui.Selectable(Language.Context_InviteToNoviceNetwork)) if (
GameFunctions.GameFunctions.IsMentor()
&& ImGui.Selectable(Language.Context_InviteToNoviceNetwork)
)
GameFunctions.Context.InviteToNoviceNetwork(player.PlayerName, (ushort)world.RowId); GameFunctions.Context.InviteToNoviceNetwork(player.PlayerName, (ushort)world.RowId);
} }
@@ -694,7 +812,10 @@ public sealed class PayloadHandler
if (validContentId && ImGui.Selectable(Language.Context_AdventurerPlate)) if (validContentId && ImGui.Selectable(Language.Context_AdventurerPlate))
if (!GameFunctions.GameFunctions.TryOpenAdventurerPlate(chunk.Message!.ContentId)) if (!GameFunctions.GameFunctions.TryOpenAdventurerPlate(chunk.Message!.ContentId))
WrapperUtil.AddNotification(Language.Context_AdventurerPlateError, NotificationType.Warning); WrapperUtil.AddNotification(
Language.Context_AdventurerPlateError,
NotificationType.Warning
);
} }
private IPlayerCharacter? FindCharacterForPayload(PlayerPayload payload) private IPlayerCharacter? FindCharacterForPayload(PlayerPayload payload)
@@ -728,13 +849,21 @@ public sealed class PayloadHandler
if (ImGui.Selectable(Language.Context_CopyLink)) if (ImGui.Selectable(Language.Context_CopyLink))
{ {
ImGui.SetClipboardText(uri.Uri.ToString()); ImGui.SetClipboardText(uri.Uri.ToString());
WrapperUtil.AddNotification(Language.Context_CopyLinkNotification, NotificationType.Info); WrapperUtil.AddNotification(
Language.Context_CopyLinkNotification,
NotificationType.Info
);
} }
} }
private void DrawStatusPopup(StatusPayload status) private void DrawStatusPopup(StatusPayload status)
{ {
if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(status.Status.Value.Icon)).GetWrapOrDefault() is { } icon) if (
Plugin
.TextureProvider.GetFromGameIcon(new GameIconLookup(status.Status.Value.Icon))
.GetWrapOrDefault() is
{ } icon
)
InlineIcon(icon); InlineIcon(icon);
var builder = new SeStringBuilder(); var builder = new SeStringBuilder();
@@ -752,7 +881,10 @@ public sealed class PayloadHandler
break; break;
} }
LogWindow.DrawChunks(ChunkUtil.ToChunks(builder.BuiltString, ChunkSource.None, null).ToList(), false); LogWindow.DrawChunks(
ChunkUtil.ToChunks(builder.BuiltString, ChunkSource.None, null).ToList(),
false
);
ImGui.Separator(); ImGui.Separator();
if (ImGui.Selectable(Language.Context_Link)) if (ImGui.Selectable(Language.Context_Link))
+334 -539
View File
File diff suppressed because it is too large Load Diff
+15 -15
View File
@@ -4,10 +4,9 @@ namespace HellionChat.Privacy;
internal static class PrivacyDefaults internal static class PrivacyDefaults
{ {
// Privacy-First default whitelist (DSGVO Art. 25 - Privacy by Default). // DSGVO Art. 25 (Privacy by Default): only the player's own conversations
// Only the player's own conversations are persisted out-of-the-box. // are persisted out-of-the-box. Public chat, NPC dialogue, system logs and
// Public chat (Say/Shout/Yell), Novice Network, NPC dialogue, system // battle messages require explicit opt-in.
// logs and battle messages are NOT persisted unless the user opts in.
internal static readonly IReadOnlySet<ChatType> PrivacyFirstWhitelist = new HashSet<ChatType> internal static readonly IReadOnlySet<ChatType> PrivacyFirstWhitelist = new HashSet<ChatType>
{ {
ChatType.TellIncoming, ChatType.TellIncoming,
@@ -42,11 +41,10 @@ internal static class PrivacyDefaults
ChatType.ExtraChatLinkshell8, ChatType.ExtraChatLinkshell8,
}; };
// Default retention windows per channel (in days). Channels not listed // Per-channel retention in days. Unlisted channels fall back to
// here fall back to Configuration.RetentionDefaultDays. Reflects the // Configuration.RetentionDefaultDays. Tells: 365, everything else: 90.
// design spec: Tells 365, own-conversation channels 90, everything else internal static readonly IReadOnlyDictionary<ChatType, int> DefaultRetentionDays =
// shorter via the global default. new Dictionary<ChatType, int>
internal static readonly IReadOnlyDictionary<ChatType, int> DefaultRetentionDays = new Dictionary<ChatType, int>
{ {
[ChatType.TellIncoming] = 365, [ChatType.TellIncoming] = 365,
[ChatType.TellOutgoing] = 365, [ChatType.TellOutgoing] = 365,
@@ -85,11 +83,12 @@ internal static class PrivacyDefaults
[ChatType.ExtraChatLinkshell8] = 90, [ChatType.ExtraChatLinkshell8] = 90,
}; };
// Casual profile = Privacy-First plus public chat (Say/Shout/Yell, both // Casual: Privacy-First + public chat (Say/Shout/Yell, emotes, Novice
// emote types, Novice Network), kept for a short 24-hour window so the // Network) with a 1-day window so recent RP/trade is searchable but
// last RP scene or shout trade is still searchable but third-party data // third-party data doesn't accumulate.
// doesn't accumulate forever. internal static readonly IReadOnlySet<ChatType> CasualWhitelist = new HashSet<ChatType>(
internal static readonly IReadOnlySet<ChatType> CasualWhitelist = new HashSet<ChatType>(PrivacyFirstWhitelist) PrivacyFirstWhitelist
)
{ {
ChatType.Say, ChatType.Say,
ChatType.Shout, ChatType.Shout,
@@ -99,7 +98,8 @@ internal static class PrivacyDefaults
ChatType.NoviceNetwork, ChatType.NoviceNetwork,
}; };
internal static readonly IReadOnlyDictionary<ChatType, int> CasualRetentionOverrides = new Dictionary<ChatType, int> internal static readonly IReadOnlyDictionary<ChatType, int> CasualRetentionOverrides =
new Dictionary<ChatType, int>
{ {
[ChatType.Say] = 1, [ChatType.Say] = 1,
[ChatType.Shout] = 1, [ChatType.Shout] = 1,
+25 -60
View File
@@ -4,16 +4,14 @@ using HellionChat.Util;
namespace HellionChat.Resources; namespace HellionChat.Resources;
// Hellion Chat — v0.6.0 built-in colour presets for the ChatColours // Built-in colour presets applied via Settings UI → ChatColours.
// settings section. Read-only static data; users apply a preset via the // Battle-channel types are intentionally excluded to preserve combat-log tuning.
// settings UI which overwrites Configuration.ChatColours immediately.
// Battle-channel types are intentionally NOT covered by the stylistic
// presets so that combat-log tuning the user has done stays intact.
public sealed record ChatColourPreset( public sealed record ChatColourPreset(
string DisplayName, string DisplayName,
string LocalizationKey, string LocalizationKey,
bool IsBrandPreset, bool IsBrandPreset,
IReadOnlyDictionary<ChatType, uint> Colours); IReadOnlyDictionary<ChatType, uint> Colours
);
public static class ChatColourPresets public static class ChatColourPresets
{ {
@@ -27,43 +25,48 @@ public static class ChatColourPresets
DisplayName: "ChatTwo Default", DisplayName: "ChatTwo Default",
LocalizationKey: "ChatColourPresets_Default", LocalizationKey: "ChatColourPresets_Default",
IsBrandPreset: false, IsBrandPreset: false,
Colours: BuildDefault()), Colours: BuildDefault()
),
["HighContrast"] = new( ["HighContrast"] = new(
DisplayName: "High-Contrast", DisplayName: "High-Contrast",
LocalizationKey: "ChatColourPresets_HighContrast", LocalizationKey: "ChatColourPresets_HighContrast",
IsBrandPreset: false, IsBrandPreset: false,
Colours: BuildHighContrast()), Colours: BuildHighContrast()
),
["Pastell"] = new( ["Pastell"] = new(
DisplayName: "Pastell", DisplayName: "Pastell",
LocalizationKey: "ChatColourPresets_Pastell", LocalizationKey: "ChatColourPresets_Pastell",
IsBrandPreset: false, IsBrandPreset: false,
Colours: BuildPastell()), Colours: BuildPastell()
),
["DarkModeTuned"] = new( ["DarkModeTuned"] = new(
DisplayName: "Dark-Mode-Tuned", DisplayName: "Dark-Mode-Tuned",
LocalizationKey: "ChatColourPresets_DarkModeTuned", LocalizationKey: "ChatColourPresets_DarkModeTuned",
IsBrandPreset: false, IsBrandPreset: false,
Colours: BuildDarkModeTuned()), Colours: BuildDarkModeTuned()
),
["Hellion"] = new( ["Hellion"] = new(
DisplayName: "Hellion", DisplayName: "Hellion",
LocalizationKey: "ChatColourPresets_Hellion", LocalizationKey: "ChatColourPresets_Hellion",
IsBrandPreset: true, IsBrandPreset: true,
Colours: BuildHellion()), Colours: BuildHellion()
),
["NightBlue"] = new( ["NightBlue"] = new(
DisplayName: "Night Blue", DisplayName: "Night Blue",
LocalizationKey: "ChatColourPresets_NightBlue", LocalizationKey: "ChatColourPresets_NightBlue",
IsBrandPreset: false, IsBrandPreset: false,
Colours: BuildNightBlue()), Colours: BuildNightBlue()
),
["IndigoViolet"] = new( ["IndigoViolet"] = new(
DisplayName: "Indigo Violet", DisplayName: "Indigo Violet",
LocalizationKey: "ChatColourPresets_IndigoViolet", LocalizationKey: "ChatColourPresets_IndigoViolet",
IsBrandPreset: false, IsBrandPreset: false,
Colours: BuildIndigoViolet()), Colours: BuildIndigoViolet()
),
}; };
} }
// The Default preset spiegelt 1:1 die Werte aus ChatTypeExt.DefaultColor. // Mirrors ChatTypeExt.DefaultColor; channels without a default are skipped.
// Channels ohne Default-Wert (return null) werden ausgelassen — wer sie
// anwenden will, behält seine aktuelle Farbe.
private static IReadOnlyDictionary<ChatType, uint> BuildDefault() private static IReadOnlyDictionary<ChatType, uint> BuildDefault()
{ {
var dict = new Dictionary<ChatType, uint>(); var dict = new Dictionary<ChatType, uint>();
@@ -175,33 +178,22 @@ public static class ChatColourPresets
}; };
} }
// Hellion brand preset — Arctic Cyan + Ember Orange palette aus // Hellion brand preset — Arctic Cyan + Ember Orange palette.
// /mnt/ssd-fast/Projekte/hellion-media/hellion-media-website/BRANDING.md // Cyan family for Standard/Tell, Ember/Warning for loud channels,
// (Schema-Stand 2026-04-16). Channels sind über das ganze Brand-Spektrum // Status colours for Linkshells, darker variants for CrossLinkshells.
// verteilt damit jede Zeile auf einen Glance unterscheidbar ist:
// Cyan-Familie für Standard/Tell, Ember + Warning für laute Channels,
// Status-Farben (Success, Danger) für Linkshells. CrossLinkshells
// nutzen die dunkleren/sattersten Varianten derselben Hue-Familien.
private static IReadOnlyDictionary<ChatType, uint> BuildHellion() private static IReadOnlyDictionary<ChatType, uint> BuildHellion()
{ {
return new Dictionary<ChatType, uint> return new Dictionary<ChatType, uint>
{ {
// Standard / Tell — Cyan-Familie (Brand-Primary)
[ChatType.Say] = ColourUtil.ComponentsToRgba(77, 217, 232), // Cyan-light #4DD9E8 [ChatType.Say] = ColourUtil.ComponentsToRgba(77, 217, 232), // Cyan-light #4DD9E8
[ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(0, 190, 210), // Brand Cyan #00BED2 [ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(0, 190, 210), // Brand Cyan #00BED2
[ChatType.TellOutgoing] = ColourUtil.ComponentsToRgba(0, 151, 167), // Cyan-dark #0097A7 [ChatType.TellOutgoing] = ColourUtil.ComponentsToRgba(0, 151, 167), // Cyan-dark #0097A7
// Laute Channels — Ember/Warning
[ChatType.Yell] = ColourUtil.ComponentsToRgba(240, 173, 78), // Warning #F0AD4E [ChatType.Yell] = ColourUtil.ComponentsToRgba(240, 173, 78), // Warning #F0AD4E
[ChatType.Shout] = ColourUtil.ComponentsToRgba(249, 115, 22), // Brand Ember #F97316 [ChatType.Shout] = ColourUtil.ComponentsToRgba(249, 115, 22), // Brand Ember #F97316
// Gruppen-Channels — Success/Ember-dark/Cyan
[ChatType.Party] = ColourUtil.ComponentsToRgba(92, 184, 92), // Success #5CB85C [ChatType.Party] = ColourUtil.ComponentsToRgba(92, 184, 92), // Success #5CB85C
[ChatType.Alliance] = ColourUtil.ComponentsToRgba(232, 93, 4), // Ember-dark #E85D04 [ChatType.Alliance] = ColourUtil.ComponentsToRgba(232, 93, 4), // Ember-dark #E85D04
[ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(0, 190, 210), // Brand Cyan [ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(0, 190, 210), // Brand Cyan
[ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(77, 217, 232), // Cyan-light [ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(77, 217, 232), // Cyan-light
// Linkshells 1-8 — über das ganze Brand-Spektrum verteilt
[ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(251, 146, 60), // Ember-light #FB923C [ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(251, 146, 60), // Ember-light #FB923C
[ChatType.Linkshell2] = ColourUtil.ComponentsToRgba(240, 173, 78), // Warning [ChatType.Linkshell2] = ColourUtil.ComponentsToRgba(240, 173, 78), // Warning
[ChatType.Linkshell3] = ColourUtil.ComponentsToRgba(92, 184, 92), // Success [ChatType.Linkshell3] = ColourUtil.ComponentsToRgba(92, 184, 92), // Success
@@ -210,8 +202,6 @@ public static class ChatColourPresets
[ChatType.Linkshell6] = ColourUtil.ComponentsToRgba(0, 151, 167), // Cyan-dark [ChatType.Linkshell6] = ColourUtil.ComponentsToRgba(0, 151, 167), // Cyan-dark
[ChatType.Linkshell7] = ColourUtil.ComponentsToRgba(249, 115, 22), // Brand Ember [ChatType.Linkshell7] = ColourUtil.ComponentsToRgba(249, 115, 22), // Brand Ember
[ChatType.Linkshell8] = ColourUtil.ComponentsToRgba(217, 83, 79), // Danger #D9534F [ChatType.Linkshell8] = ColourUtil.ComponentsToRgba(217, 83, 79), // Danger #D9534F
// CrossWorld-Linkshells 1-8 — dunklere/sattersere Varianten
[ChatType.CrossLinkshell1] = ColourUtil.ComponentsToRgba(232, 93, 4), // Ember-dark [ChatType.CrossLinkshell1] = ColourUtil.ComponentsToRgba(232, 93, 4), // Ember-dark
[ChatType.CrossLinkshell2] = ColourUtil.ComponentsToRgba(200, 140, 50), // Warning-dark [ChatType.CrossLinkshell2] = ColourUtil.ComponentsToRgba(200, 140, 50), // Warning-dark
[ChatType.CrossLinkshell3] = ColourUtil.ComponentsToRgba(60, 140, 60), // Success-dark [ChatType.CrossLinkshell3] = ColourUtil.ComponentsToRgba(60, 140, 60), // Success-dark
@@ -223,31 +213,20 @@ public static class ChatColourPresets
}; };
} }
// Bonus preset — Night Blue, KAZAMA-Stimmungs-Theme aus // Night Blue — cool nautical theme, deep navy without purple.
// /mnt/HDD-Data1/Obsidian/Vault/Systeme/KAZAMA/Theming/Night Blue + Indigo Violet Themes.md
// Klassisch, kühl, technisch — Marineblau-Tiefe ohne Lila-Anteil.
// Bewusst NICHT als Brand-Preset markiert (Vault-Boundary): die KAZAMA-Themes
// sind persönliche Stimmungs-Themes, nicht Teil des Hellion-Brand-Systems.
private static IReadOnlyDictionary<ChatType, uint> BuildNightBlue() private static IReadOnlyDictionary<ChatType, uint> BuildNightBlue()
{ {
return new Dictionary<ChatType, uint> return new Dictionary<ChatType, uint>
{ {
// Standard / Tell — Royal Blue Akzent-Familie
[ChatType.Say] = ColourUtil.ComponentsToRgba(230, 237, 247), // text-primary [ChatType.Say] = ColourUtil.ComponentsToRgba(230, 237, 247), // text-primary
[ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(106, 176, 255), // akzent-hot [ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(106, 176, 255), // akzent-hot
[ChatType.TellOutgoing] = ColourUtil.ComponentsToRgba(74, 144, 226), // akzent-primary [ChatType.TellOutgoing] = ColourUtil.ComponentsToRgba(74, 144, 226), // akzent-primary
// Laute Channels — Warning/Danger Status-Töne
[ChatType.Yell] = ColourUtil.ComponentsToRgba(255, 184, 74), // warning [ChatType.Yell] = ColourUtil.ComponentsToRgba(255, 184, 74), // warning
[ChatType.Shout] = ColourUtil.ComponentsToRgba(255, 92, 122), // danger [ChatType.Shout] = ColourUtil.ComponentsToRgba(255, 92, 122), // danger
// Gruppen — Success/Akzent-Variations
[ChatType.Party] = ColourUtil.ComponentsToRgba(61, 220, 151), // success [ChatType.Party] = ColourUtil.ComponentsToRgba(61, 220, 151), // success
[ChatType.Alliance] = ColourUtil.ComponentsToRgba(255, 144, 100), // warm-orange-light [ChatType.Alliance] = ColourUtil.ComponentsToRgba(255, 144, 100), // warm-orange-light
[ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(74, 144, 226), // akzent-primary [ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(74, 144, 226), // akzent-primary
[ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(140, 160, 191), // text-dim [ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(140, 160, 191), // text-dim
// Linkshells 1-8 — über Spektrum verteilt
[ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(255, 184, 74), [ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(255, 184, 74),
[ChatType.Linkshell2] = ColourUtil.ComponentsToRgba(255, 144, 100), [ChatType.Linkshell2] = ColourUtil.ComponentsToRgba(255, 144, 100),
[ChatType.Linkshell3] = ColourUtil.ComponentsToRgba(255, 220, 130), [ChatType.Linkshell3] = ColourUtil.ComponentsToRgba(255, 220, 130),
@@ -256,8 +235,6 @@ public static class ChatColourPresets
[ChatType.Linkshell6] = ColourUtil.ComponentsToRgba(100, 200, 220), [ChatType.Linkshell6] = ColourUtil.ComponentsToRgba(100, 200, 220),
[ChatType.Linkshell7] = ColourUtil.ComponentsToRgba(106, 176, 255), [ChatType.Linkshell7] = ColourUtil.ComponentsToRgba(106, 176, 255),
[ChatType.Linkshell8] = ColourUtil.ComponentsToRgba(140, 160, 191), [ChatType.Linkshell8] = ColourUtil.ComponentsToRgba(140, 160, 191),
// CrossWorld-Linkshells — gedämpfte Variants
[ChatType.CrossLinkshell1] = ColourUtil.ComponentsToRgba(200, 130, 50), [ChatType.CrossLinkshell1] = ColourUtil.ComponentsToRgba(200, 130, 50),
[ChatType.CrossLinkshell2] = ColourUtil.ComponentsToRgba(220, 110, 80), [ChatType.CrossLinkshell2] = ColourUtil.ComponentsToRgba(220, 110, 80),
[ChatType.CrossLinkshell3] = ColourUtil.ComponentsToRgba(200, 180, 60), [ChatType.CrossLinkshell3] = ColourUtil.ComponentsToRgba(200, 180, 60),
@@ -269,30 +246,20 @@ public static class ChatColourPresets
}; };
} }
// Bonus preset — Indigo Violet, KAZAMA-Stimmungs-Theme aus demselben // Indigo Violet — warm-mystic theme, deep indigo with violet accent.
// Vault-Doc. Warm-mystisch, "Galaxy/Glitter/Nordlicht" — tiefes Indigo
// mit kräftigem Violet-Akzent. Persönlicher Favorit (siehe Vault).
// Auch nicht als Brand-Preset (siehe NightBlue-Note oben).
private static IReadOnlyDictionary<ChatType, uint> BuildIndigoViolet() private static IReadOnlyDictionary<ChatType, uint> BuildIndigoViolet()
{ {
return new Dictionary<ChatType, uint> return new Dictionary<ChatType, uint>
{ {
// Standard / Tell — Royal Violet Akzent-Familie [ChatType.Say] = ColourUtil.ComponentsToRgba(240, 230, 255), // text-primary
[ChatType.Say] = ColourUtil.ComponentsToRgba(240, 230, 255), // text-primary (light lavender)
[ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(176, 124, 255), // akzent-hot [ChatType.TellIncoming] = ColourUtil.ComponentsToRgba(176, 124, 255), // akzent-hot
[ChatType.TellOutgoing] = ColourUtil.ComponentsToRgba(139, 77, 222), // akzent-primary [ChatType.TellOutgoing] = ColourUtil.ComponentsToRgba(139, 77, 222), // akzent-primary
// Laute Channels — geteilt mit Night Blue (Status-Farben)
[ChatType.Yell] = ColourUtil.ComponentsToRgba(255, 184, 74), [ChatType.Yell] = ColourUtil.ComponentsToRgba(255, 184, 74),
[ChatType.Shout] = ColourUtil.ComponentsToRgba(255, 92, 122), [ChatType.Shout] = ColourUtil.ComponentsToRgba(255, 92, 122),
// Gruppen
[ChatType.Party] = ColourUtil.ComponentsToRgba(61, 220, 151), [ChatType.Party] = ColourUtil.ComponentsToRgba(61, 220, 151),
[ChatType.Alliance] = ColourUtil.ComponentsToRgba(255, 144, 100), [ChatType.Alliance] = ColourUtil.ComponentsToRgba(255, 144, 100),
[ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(139, 77, 222), // akzent-primary [ChatType.FreeCompany] = ColourUtil.ComponentsToRgba(139, 77, 222), // akzent-primary
[ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(168, 144, 208), // text-dim [ChatType.NoviceNetwork] = ColourUtil.ComponentsToRgba(168, 144, 208), // text-dim
// Linkshells 1-8
[ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(255, 184, 74), [ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(255, 184, 74),
[ChatType.Linkshell2] = ColourUtil.ComponentsToRgba(255, 144, 100), [ChatType.Linkshell2] = ColourUtil.ComponentsToRgba(255, 144, 100),
[ChatType.Linkshell3] = ColourUtil.ComponentsToRgba(255, 220, 130), [ChatType.Linkshell3] = ColourUtil.ComponentsToRgba(255, 220, 130),
@@ -301,8 +268,6 @@ public static class ChatColourPresets
[ChatType.Linkshell6] = ColourUtil.ComponentsToRgba(139, 77, 222), [ChatType.Linkshell6] = ColourUtil.ComponentsToRgba(139, 77, 222),
[ChatType.Linkshell7] = ColourUtil.ComponentsToRgba(130, 90, 200), [ChatType.Linkshell7] = ColourUtil.ComponentsToRgba(130, 90, 200),
[ChatType.Linkshell8] = ColourUtil.ComponentsToRgba(168, 144, 208), [ChatType.Linkshell8] = ColourUtil.ComponentsToRgba(168, 144, 208),
// CrossWorld-Linkshells
[ChatType.CrossLinkshell1] = ColourUtil.ComponentsToRgba(200, 130, 50), [ChatType.CrossLinkshell1] = ColourUtil.ComponentsToRgba(200, 130, 50),
[ChatType.CrossLinkshell2] = ColourUtil.ComponentsToRgba(220, 110, 80), [ChatType.CrossLinkshell2] = ColourUtil.ComponentsToRgba(220, 110, 80),
[ChatType.CrossLinkshell3] = ColourUtil.ComponentsToRgba(200, 180, 60), [ChatType.CrossLinkshell3] = ColourUtil.ComponentsToRgba(200, 180, 60),
+10 -10
View File
@@ -639,7 +639,7 @@
<value>Allgemein</value> <value>Allgemein</value>
</data> </data>
<data name="Settings_Card_General_Subtext" xml:space="preserve"> <data name="Settings_Card_General_Subtext" xml:space="preserve">
<value>Plugin-globale Einstellungen — Sprache, Eingabe, Audio, Performance.</value> <value>Sprache, Eingabe, Audio und Performance.</value>
</data> </data>
<data name="Settings_Card_Appearance_Title" xml:space="preserve"> <data name="Settings_Card_Appearance_Title" xml:space="preserve">
<value>Erscheinungsbild</value> <value>Erscheinungsbild</value>
@@ -657,25 +657,25 @@
<value>Fenster</value> <value>Fenster</value>
</data> </data>
<data name="Settings_Card_Window_Subtext" xml:space="preserve"> <data name="Settings_Card_Window_Subtext" xml:space="preserve">
<value>Verhalten des Fensters — wann es da ist, ob es bewegt werden kann.</value> <value>Wann das Fenster sichtbar ist und ob es sich bewegen lässt.</value>
</data> </data>
<data name="Settings_Card_Chat_Title" xml:space="preserve"> <data name="Settings_Card_Chat_Title" xml:space="preserve">
<value>Chat</value> <value>Chat</value>
</data> </data>
<data name="Settings_Card_Chat_Subtext" xml:space="preserve"> <data name="Settings_Card_Chat_Subtext" xml:space="preserve">
<value>Wie Nachrichten angezeigt werden — Tells, Vorschau, Verhalten, Emotes.</value> <value>Tells, Vorschau, Nachrichten-Verhalten und Emotes.</value>
</data> </data>
<data name="Settings_Card_Tabs_Title" xml:space="preserve"> <data name="Settings_Card_Tabs_Title" xml:space="preserve">
<value>Tabs</value> <value>Tabs</value>
</data> </data>
<data name="Settings_Card_Tabs_Subtext" xml:space="preserve"> <data name="Settings_Card_Tabs_Subtext" xml:space="preserve">
<value>Tab-Verwaltung — eigene Chat-Tabs anlegen und konfigurieren.</value> <value>Eigene Chat-Tabs anlegen und konfigurieren.</value>
</data> </data>
<data name="Settings_Card_Privacy_Title" xml:space="preserve"> <data name="Settings_Card_Privacy_Title" xml:space="preserve">
<value>Datenschutz</value> <value>Datenschutz</value>
</data> </data>
<data name="Settings_Card_Privacy_Subtext" xml:space="preserve"> <data name="Settings_Card_Privacy_Subtext" xml:space="preserve">
<value>Was darf gespeichert werden — Privacy-Filter pro Channel.</value> <value>Privacy-Filter pro Channel und was gespeichert werden darf.</value>
</data> </data>
<data name="Settings_Card_Database_Title" xml:space="preserve"> <data name="Settings_Card_Database_Title" xml:space="preserve">
<value>Datenbank</value> <value>Datenbank</value>
@@ -687,7 +687,7 @@
<value>Information</value> <value>Information</value>
</data> </data>
<data name="Settings_Card_Information_Subtext" xml:space="preserve"> <data name="Settings_Card_Information_Subtext" xml:space="preserve">
<value>Über das Plugin — Version, Mission, Lizenz, Changelog.</value> <value>Version, Mission, Lizenz und Changelog.</value>
</data> </data>
<data name="Settings_Tab_Themes" xml:space="preserve"> <data name="Settings_Tab_Themes" xml:space="preserve">
<value>Themes</value> <value>Themes</value>
@@ -732,25 +732,25 @@
<value>Theme &amp; Layout</value> <value>Theme &amp; Layout</value>
</data> </data>
<data name="Settings_Card_ThemeAndLayout_Subtext" xml:space="preserve"> <data name="Settings_Card_ThemeAndLayout_Subtext" xml:space="preserve">
<value>Wie das Fenster aussieht — Theme, Rahmen, Zeitstempel-Style.</value> <value>Theme, Fenster-Rahmen und Zeitstempel-Style.</value>
</data> </data>
<data name="Settings_Card_FontsAndColours_Title" xml:space="preserve"> <data name="Settings_Card_FontsAndColours_Title" xml:space="preserve">
<value>Schriften &amp; Farben</value> <value>Schriften &amp; Farben</value>
</data> </data>
<data name="Settings_Card_FontsAndColours_Subtext" xml:space="preserve"> <data name="Settings_Card_FontsAndColours_Subtext" xml:space="preserve">
<value>Lesbarkeit — Schriftart, Schriftgröße, Chat-Farben pro Channel.</value> <value>Schriftart, Schriftgröße und Chat-Farben pro Channel.</value>
</data> </data>
<data name="Settings_Card_DataManagement_Title" xml:space="preserve"> <data name="Settings_Card_DataManagement_Title" xml:space="preserve">
<value>Daten-Verwaltung</value> <value>Daten-Verwaltung</value>
</data> </data>
<data name="Settings_Card_DataManagement_Subtext" xml:space="preserve"> <data name="Settings_Card_DataManagement_Subtext" xml:space="preserve">
<value>Was passiert mit gespeicherten Daten — Aufbewahrung, Aufräumen, Export, DB-Stats.</value> <value>Aufbewahrung, Aufräumen, Export und Datenbank-Statistiken.</value>
</data> </data>
<data name="Settings_Card_Integrations_Title" xml:space="preserve"> <data name="Settings_Card_Integrations_Title" xml:space="preserve">
<value>Integrationen</value> <value>Integrationen</value>
</data> </data>
<data name="Settings_Card_Integrations_Subtext" xml:space="preserve"> <data name="Settings_Card_Integrations_Subtext" xml:space="preserve">
<value>Andere Dalamud-Plugins, mit denen HellionChat zusammenarbeitet. Auto-detected, mit Vorschau auf kommende Integrationen.</value> <value>Andere Dalamud-Plugins, mit denen HellionChat zusammenarbeitet. Kommende Integrationen in der Vorschau.</value>
</data> </data>
<data name="Settings_ThemeAndLayout_Theme_Heading" xml:space="preserve"> <data name="Settings_ThemeAndLayout_Theme_Heading" xml:space="preserve">
<value>Theme</value> <value>Theme</value>
+164 -164
View File
@@ -19,28 +19,28 @@
<value>Enable privacy filter</value> <value>Enable privacy filter</value>
</data> </data>
<data name="Privacy_FilterEnabled_Description" xml:space="preserve"> <data name="Privacy_FilterEnabled_Description" xml:space="preserve">
<value>When enabled, only messages from whitelisted channels are persisted to the database. Disabling restores the original behavior (everything except battle messages is stored).</value> <value>When enabled, only messages from allowed channels are written to the database. When disabled, the default behaviour applies — everything except battle logs is stored.</value>
</data> </data>
<data name="Privacy_FilterEnabled_StorageOnly_Help" xml:space="preserve"> <data name="Privacy_FilterEnabled_StorageOnly_Help" xml:space="preserve">
<value>The filter only controls what is written to the local database. The chat log itself keeps showing every message live, disallowed channels just stop being saved. Use the channel hide options in your in-game chat tabs if you want to remove channels from the visible chat.</value> <value>The filter only controls what is written to the local database. The chat log still shows every message live; excluded channels are simply no longer stored. If you also want to remove channels from the visible display, use the normal chat-tab filters in the game.</value>
</data> </data>
<data name="Privacy_Filter_Tree_Heading" xml:space="preserve"> <data name="Privacy_Filter_Tree_Heading" xml:space="preserve">
<value>Privacy filter and whitelist</value> <value>Privacy filter and whitelist</value>
</data> </data>
<data name="Privacy_Whitelist_Help" xml:space="preserve"> <data name="Privacy_Whitelist_Help" xml:space="preserve">
<value>Pick which channels are stored in the local database. Privacy-First default: only your own conversations. Use the buttons below to apply a preset.</value> <value>Choose which channels are saved to the local database. Default follows data minimisation: only your own conversations. Use the buttons below to apply a preset.</value>
</data> </data>
<data name="Privacy_Preset_PrivacyFirst" xml:space="preserve"> <data name="Privacy_Preset_PrivacyFirst" xml:space="preserve">
<value>Privacy-First (recommended)</value> <value>Data minimisation (recommended)</value>
</data> </data>
<data name="Privacy_Preset_ClearAll" xml:space="preserve"> <data name="Privacy_Preset_ClearAll" xml:space="preserve">
<value>Clear all</value> <value>Deselect all</value>
</data> </data>
<data name="Privacy_Preset_SelectAll" xml:space="preserve"> <data name="Privacy_Preset_SelectAll" xml:space="preserve">
<value>Select all</value> <value>Select all</value>
</data> </data>
<data name="Privacy_Group_DirectMessages" xml:space="preserve"> <data name="Privacy_Group_DirectMessages" xml:space="preserve">
<value>Direct Messages</value> <value>Direct messages</value>
</data> </data>
<data name="Privacy_Group_PartyAlliance" xml:space="preserve"> <data name="Privacy_Group_PartyAlliance" xml:space="preserve">
<value>Party &amp; Alliance</value> <value>Party &amp; Alliance</value>
@@ -55,52 +55,52 @@
<value>Cross-World Linkshells</value> <value>Cross-World Linkshells</value>
</data> </data>
<data name="Privacy_Group_ExtraChat" xml:space="preserve"> <data name="Privacy_Group_ExtraChat" xml:space="preserve">
<value>ExtraChat (Encrypted)</value> <value>ExtraChat (encrypted)</value>
</data> </data>
<data name="Privacy_Group_PublicChat" xml:space="preserve"> <data name="Privacy_Group_PublicChat" xml:space="preserve">
<value>Public Chat (third-party data)</value> <value>Public chat (third-party data)</value>
</data> </data>
<data name="Privacy_Group_SystemLogs" xml:space="preserve"> <data name="Privacy_Group_SystemLogs" xml:space="preserve">
<value>System &amp; Game Logs</value> <value>System &amp; game logs</value>
</data> </data>
<data name="Privacy_PersistUnknown_Name" xml:space="preserve"> <data name="Privacy_PersistUnknown_Name" xml:space="preserve">
<value>Persist unknown channel types</value> <value>Save unknown channel types</value>
</data> </data>
<data name="Privacy_PersistUnknown_Description" xml:space="preserve"> <data name="Privacy_PersistUnknown_Description" xml:space="preserve">
<value>Failsafe for ChatTypes added by future FFXIV patches that this plugin does not yet know about. Default OFF (Privacy-First). Turn ON if you want a complete log including future channels.</value> <value>Safety net for ChatTypes added by future FFXIV patches that the plugin does not yet know about. Default is OFF (data minimisation). Enable if you want future channels to be fully logged as well.</value>
</data> </data>
<data name="Cleanup_Heading" xml:space="preserve"> <data name="Cleanup_Heading" xml:space="preserve">
<value>Apply filter to existing database</value> <value>Apply filter to existing database</value>
</data> </data>
<data name="Cleanup_Help_Intro" xml:space="preserve"> <data name="Cleanup_Help_Intro" xml:space="preserve">
<value>The privacy filter only applies to new messages. Use the cleanup below to retroactively remove already-stored messages that don't match your saved whitelist.</value> <value>The privacy filter only affects new messages. The cleanup below lets you retroactively remove already-stored messages that do not match your saved whitelist.</value>
</data> </data>
<data name="Cleanup_Help_SavedNote" xml:space="preserve"> <data name="Cleanup_Help_SavedNote" xml:space="preserve">
<value>Cleanup uses your SAVED whitelist (Plugin.Config), not unsaved edits above. Click Save first if you want to apply your current edits.</value> <value>Cleanup uses your SAVED whitelist (Plugin.Config), not unsaved changes above. Click Save first if you want your current changes to be applied.</value>
</data> </data>
<data name="Retention_Help_SavedNote" xml:space="preserve"> <data name="Retention_Help_SavedNote" xml:space="preserve">
<value>The manual sweep uses your SAVED retention policy, not the slider values above. Click Save first if you want the run to apply your current edits.</value> <value>The manual run uses your SAVED retention policy, not the slider values above. Click Save first if you want the run to apply your current changes.</value>
</data> </data>
<data name="Cleanup_Preview_Stale" xml:space="preserve"> <data name="Cleanup_Preview_Stale" xml:space="preserve">
<value>Preview is out of date — your whitelist has changed since the last refresh. Click Refresh to recalculate.</value> <value>Preview is stale — your whitelist has changed since the last refresh. Click Refresh to recalculate.</value>
</data> </data>
<data name="Cleanup_RefreshPreview" xml:space="preserve"> <data name="Cleanup_RefreshPreview" xml:space="preserve">
<value>Refresh preview</value> <value>Refresh preview</value>
</data> </data>
<data name="Cleanup_NoPreview" xml:space="preserve"> <data name="Cleanup_NoPreview" xml:space="preserve">
<value>No preview yet. Click Refresh to compute the impact.</value> <value>No preview yet. Click Refresh to calculate the impact.</value>
</data> </data>
<data name="Cleanup_TotalStored" xml:space="preserve"> <data name="Cleanup_TotalStored" xml:space="preserve">
<value>Total stored messages: {0:N0}</value> <value>Total stored messages: {0:N0}</value>
</data> </data>
<data name="Cleanup_WillKeep" xml:space="preserve"> <data name="Cleanup_WillKeep" xml:space="preserve">
<value>Will keep: {0:N0}</value> <value>Keep: {0:N0}</value>
</data> </data>
<data name="Cleanup_WillDelete" xml:space="preserve"> <data name="Cleanup_WillDelete" xml:space="preserve">
<value>Will delete: {0:N0}</value> <value>Delete: {0:N0}</value>
</data> </data>
<data name="Cleanup_Breakdown" xml:space="preserve"> <data name="Cleanup_Breakdown" xml:space="preserve">
<value>Per-channel breakdown</value> <value>Breakdown by channel</value>
</data> </data>
<data name="Cleanup_Marker_Keep" xml:space="preserve"> <data name="Cleanup_Marker_Keep" xml:space="preserve">
<value>[KEEP] </value> <value>[KEEP] </value>
@@ -112,46 +112,46 @@
<value>Apply current filter to database</value> <value>Apply current filter to database</value>
</data> </data>
<data name="Cleanup_Apply_Tooltip" xml:space="preserve"> <data name="Cleanup_Apply_Tooltip" xml:space="preserve">
<value>Ctrl+Shift: Hard-deletes {0:N0} messages, then runs VACUUM. Cannot be undone.</value> <value>Ctrl+Shift: Permanently deletes {0:N0} messages and runs VACUUM afterwards. Cannot be undone.</value>
</data> </data>
<data name="Cleanup_Running" xml:space="preserve"> <data name="Cleanup_Running" xml:space="preserve">
<value>Cleanup running in background…</value> <value>Cleanup running in the background…</value>
</data> </data>
<data name="Cleanup_PreviewError" xml:space="preserve"> <data name="Cleanup_PreviewError" xml:space="preserve">
<value>Failed to compute cleanup preview, see /xllog</value> <value>Preview could not be calculated, see /xllog</value>
</data> </data>
<data name="Cleanup_Success" xml:space="preserve"> <data name="Cleanup_Success" xml:space="preserve">
<value>Privacy cleanup complete: {0:N0} messages removed.</value> <value>Cleanup complete, {0:N0} messages removed.</value>
</data> </data>
<data name="Cleanup_Error" xml:space="preserve"> <data name="Cleanup_Error" xml:space="preserve">
<value>Privacy cleanup failed, see /xllog</value> <value>Cleanup failed, see /xllog</value>
</data> </data>
<data name="Retention_Heading" xml:space="preserve"> <data name="Retention_Heading" xml:space="preserve">
<value>Message retention</value> <value>Message retention</value>
</data> </data>
<data name="Retention_Enabled_Name" xml:space="preserve"> <data name="Retention_Enabled_Name" xml:space="preserve">
<value>Auto-delete messages after a per-channel retention window</value> <value>Automatically delete messages past their channel retention window</value>
</data> </data>
<data name="Retention_Enabled_Description" xml:space="preserve"> <data name="Retention_Enabled_Description" xml:space="preserve">
<value>When enabled, messages older than the configured window are deleted on every plugin start (at most once per 24 hours). Off by default. The plugin never deletes history without your explicit consent.</value> <value>When enabled, messages older than the configured window are deleted on each plugin start (at most once every 24 hours). Default is OFF — the plugin never deletes anything without your explicit consent.</value>
</data> </data>
<data name="Retention_Default_Label" xml:space="preserve"> <data name="Retention_Default_Label" xml:space="preserve">
<value>Default retention (days, 0 = never)</value> <value>Default retention (days, 0 = never)</value>
</data> </data>
<data name="Retention_Default_Help" xml:space="preserve"> <data name="Retention_Default_Help" xml:space="preserve">
<value>Applies to channels without an explicit override below.</value> <value>Applies to channels that have no individual override below.</value>
</data> </data>
<data name="Retention_Reset_Spec" xml:space="preserve"> <data name="Retention_Reset_Spec" xml:space="preserve">
<value>Reset overrides to spec defaults</value> <value>Reset overrides to spec defaults</value>
</data> </data>
<data name="Retention_Clear_Overrides" xml:space="preserve"> <data name="Retention_Clear_Overrides" xml:space="preserve">
<value>Clear all overrides</value> <value>Remove all overrides</value>
</data> </data>
<data name="Retention_Tree_Heading" xml:space="preserve"> <data name="Retention_Tree_Heading" xml:space="preserve">
<value>Per-channel retention overrides</value> <value>Retention per channel</value>
</data> </data>
<data name="Retention_Tag_Override" xml:space="preserve"> <data name="Retention_Tag_Override" xml:space="preserve">
<value>[override]</value> <value>[custom]</value>
</data> </data>
<data name="Retention_Tag_Spec" xml:space="preserve"> <data name="Retention_Tag_Spec" xml:space="preserve">
<value>[spec]</value> <value>[spec]</value>
@@ -163,13 +163,13 @@
<value>reset</value> <value>reset</value>
</data> </data>
<data name="Retention_Apply_Label" xml:space="preserve"> <data name="Retention_Apply_Label" xml:space="preserve">
<value>Apply retention policy now</value> <value>Apply retention now</value>
</data> </data>
<data name="Retention_Apply_Tooltip" xml:space="preserve"> <data name="Retention_Apply_Tooltip" xml:space="preserve">
<value>Ctrl+Shift: runs the retention sweep immediately using the SAVED policy. Save your changes first.</value> <value>Ctrl+Shift: Runs the retention cleanup immediately using the SAVED policy. Save your changes first.</value>
</data> </data>
<data name="Retention_Running" xml:space="preserve"> <data name="Retention_Running" xml:space="preserve">
<value>Retention sweep running in background…</value> <value>Retention cleanup running in the background…</value>
</data> </data>
<data name="Retention_LastRun_Never" xml:space="preserve"> <data name="Retention_LastRun_Never" xml:space="preserve">
<value>Last run: never</value> <value>Last run: never</value>
@@ -178,67 +178,67 @@
<value>Last run: {0:yyyy-MM-dd HH:mm}</value> <value>Last run: {0:yyyy-MM-dd HH:mm}</value>
</data> </data>
<data name="Retention_Success" xml:space="preserve"> <data name="Retention_Success" xml:space="preserve">
<value>Retention sweep complete: {0:N0} messages removed.</value> <value>Retention cleanup complete, {0:N0} messages removed.</value>
</data> </data>
<data name="Retention_Error" xml:space="preserve"> <data name="Retention_Error" xml:space="preserve">
<value>Retention sweep failed, see /xllog</value> <value>Retention cleanup failed, see /xllog</value>
</data> </data>
<data name="Wizard_Title" xml:space="preserve"> <data name="Wizard_Title" xml:space="preserve">
<value>Hellion Chat — Welcome</value> <value>Hellion Chat — Welcome</value>
</data> </data>
<data name="Wizard_Intro" xml:space="preserve"> <data name="Wizard_Intro" xml:space="preserve">
<value>Pick a starting profile. You can change anything later under Settings → Privacy.</value> <value>Choose a starting profile. You can adjust everything later under Settings → Privacy.</value>
</data> </data>
<data name="Wizard_Profile_PrivacyFirst_Heading" xml:space="preserve"> <data name="Wizard_Profile_PrivacyFirst_Heading" xml:space="preserve">
<value>Privacy-First (recommended)</value> <value>Data minimisation (recommended)</value>
</data> </data>
<data name="Wizard_Profile_PrivacyFirst_Description" xml:space="preserve"> <data name="Wizard_Profile_PrivacyFirst_Description" xml:space="preserve">
<value>Only your own conversations are stored: Tells, Party, FC, Linkshells, Cross-World Linkshells, Alliance and ExtraChat. Public chat, NPC dialogue and system spam are dropped at the storage layer. Retention follows the spec defaults (Tells 365 days, own-conversation channels 90 days).</value> <value>Only your own conversations are stored: tells, party, FC, linkshells, cross-world linkshells, alliance, and ExtraChat. Public chat, NPC dialogues, and system spam are discarded at the storage level. Retention follows spec defaults (tells 365 days, own conversation channels 90 days).</value>
</data> </data>
<data name="Wizard_Profile_PrivacyFirst_Apply" xml:space="preserve"> <data name="Wizard_Profile_PrivacyFirst_Apply" xml:space="preserve">
<value>Use Privacy-First</value> <value>Apply data minimisation</value>
</data> </data>
<data name="Wizard_Profile_Casual_Heading" xml:space="preserve"> <data name="Wizard_Profile_Casual_Heading" xml:space="preserve">
<value>Casual</value> <value>Casual</value>
</data> </data>
<data name="Wizard_Profile_Casual_Description" xml:space="preserve"> <data name="Wizard_Profile_Casual_Description" xml:space="preserve">
<value>Privacy-First plus a 24-hour window for public chat (Say, Shout, Yell, both emote types, Novice Network). For RP players who want to look up the last scene without keeping public chat forever.</value> <value>Data minimisation plus a 24-hour window for public chat (say, shout, yell, both emote types, novice network). For RP players who want to re-read the last scene without keeping public chat forever.</value>
</data> </data>
<data name="Wizard_Profile_Casual_Apply" xml:space="preserve"> <data name="Wizard_Profile_Casual_Apply" xml:space="preserve">
<value>Use Casual</value> <value>Apply casual</value>
</data> </data>
<data name="Wizard_Profile_FullHistory_Heading" xml:space="preserve"> <data name="Wizard_Profile_FullHistory_Heading" xml:space="preserve">
<value>Full History</value> <value>Full history</value>
</data> </data>
<data name="Wizard_Profile_FullHistory_Description" xml:space="preserve"> <data name="Wizard_Profile_FullHistory_Description" xml:space="preserve">
<value>Disables the privacy filter entirely. Stores everything except battle logs (the original full-history behavior). Retention is OFF, history grows forever.</value> <value>Disables the privacy filter entirely. Stores everything except battle logs (the original full-history behaviour). Retention is OFF, so the history grows indefinitely.</value>
</data> </data>
<data name="Wizard_Profile_FullHistory_GdprWarning" xml:space="preserve"> <data name="Wizard_Profile_FullHistory_GdprWarning" xml:space="preserve">
<value>GDPR notice: storing third-party messages (Say/Shout/Yell of strangers, NPC dialogue with player names, etc.) for an unlimited time may exceed the personal/household exemption (Art. 2(2)(c)). Use this profile only if you have a clear reason to keep the full archive.</value> <value>GDPR notice: Storing third-party messages (say/shout/yell from other players, NPC dialogues with player names, etc.) indefinitely may exceed the exemption for purely personal or household activities (Art. 2(2)(c)). Only use this profile if you have a clear reason to keep the full archive.</value>
</data> </data>
<data name="Wizard_Profile_FullHistory_Apply" xml:space="preserve"> <data name="Wizard_Profile_FullHistory_Apply" xml:space="preserve">
<value>Use Full History</value> <value>Apply full history</value>
</data> </data>
<data name="Wizard_Reopen_Button" xml:space="preserve"> <data name="Wizard_Reopen_Button" xml:space="preserve">
<value>Show wizard again</value> <value>Show wizard again</value>
</data> </data>
<data name="Export_Heading" xml:space="preserve"> <data name="Export_Heading" xml:space="preserve">
<value>Export (GDPR Art. 15 — right of access)</value> <value>Export (GDPR Art. 15 — Right of access)</value>
</data> </data>
<data name="Export_Help" xml:space="preserve"> <data name="Export_Help" xml:space="preserve">
<value>Export stored messages to Markdown, JSON or CSV. Use this to fulfil a request for access from someone whose messages you have, or to take your own history with you.</value> <value>Export stored messages as Markdown, JSON, or CSV. This lets you fulfil an access request from a person whose messages you have stored, or take your own history with you.</value>
</data> </data>
<data name="Export_Range_Label" xml:space="preserve"> <data name="Export_Range_Label" xml:space="preserve">
<value>Last X days (0 = all time)</value> <value>Last X days (0 = no time limit)</value>
</data> </data>
<data name="Export_Sender_Label" xml:space="preserve"> <data name="Export_Sender_Label" xml:space="preserve">
<value>Sender contains (optional, case-insensitive)</value> <value>Sender contains (optional, case-insensitive)</value>
</data> </data>
<data name="Export_Channels_Heading" xml:space="preserve"> <data name="Export_Channels_Heading" xml:space="preserve">
<value>Limit to channels</value> <value>Restrict to channels</value>
</data> </data>
<data name="Export_Channels_AllOff" xml:space="preserve"> <data name="Export_Channels_AllOff" xml:space="preserve">
<value>(none selected = all stored channels)</value> <value>(nothing selected = all stored channels)</value>
</data> </data>
<data name="Export_Format_Label" xml:space="preserve"> <data name="Export_Format_Label" xml:space="preserve">
<value>Format</value> <value>Format</value>
@@ -259,41 +259,41 @@
<value>Save export</value> <value>Save export</value>
</data> </data>
<data name="Export_Running" xml:space="preserve"> <data name="Export_Running" xml:space="preserve">
<value>Export running in background…</value> <value>Export running in the background…</value>
</data> </data>
<data name="Export_Success" xml:space="preserve"> <data name="Export_Success" xml:space="preserve">
<value>Export complete: {0:N0} messages written to {1}</value> <value>Export complete, {0:N0} messages written to {1}</value>
</data> </data>
<data name="Export_Empty" xml:space="preserve"> <data name="Export_Empty" xml:space="preserve">
<value>Export complete: no messages matched the filter.</value> <value>Export complete, no message matched the filter.</value>
</data> </data>
<data name="Export_Error" xml:space="preserve"> <data name="Export_Error" xml:space="preserve">
<value>Export failed, see /xllog</value> <value>Export failed, see /xllog</value>
</data> </data>
<data name="Theme_Enabled_Name" xml:space="preserve"> <data name="Theme_Enabled_Name" xml:space="preserve">
<value>Use the Hellion theme across all plugin windows</value> <value>Use Hellion theme for all plugin windows</value>
</data> </data>
<data name="Theme_Enabled_Description" xml:space="preserve"> <data name="Theme_Enabled_Description" xml:space="preserve">
<value>Hellion Online Media palette of Arctic Cyan plus Ember Orange, applied across the chat log, settings, viewers and the wizard. Disable to fall back to the default Dalamud look.</value> <value>Hellion Online Media palette of Arctic Cyan and Ember Orange, applied to the chat window, settings, viewer, and wizard. Disable to use the default Dalamud appearance.</value>
</data> </data>
<data name="Theme_WindowOpacity_Label" xml:space="preserve"> <data name="Theme_WindowOpacity_Label" xml:space="preserve">
<value>Window opacity</value> <value>Window opacity</value>
</data> </data>
<data name="Theme_WindowOpacity_Help" xml:space="preserve"> <data name="Theme_WindowOpacity_Help" xml:space="preserve">
<value>How opaque the plugin panes are. Lower values let the game shine through; form fields and dialogs stay opaque on top so they remain readable.</value> <value>How opaque the plugin windows are. Lower values let the game show through; form fields and dialogs stay fully opaque and readable on top.</value>
</data> </data>
<data name="Theme_UseHellionFont_Name" xml:space="preserve"> <data name="Theme_UseHellionFont_Name" xml:space="preserve">
<value>Use the bundled Hellion font (Exo 2)</value> <value>Use bundled Hellion font (Exo 2)</value>
</data> </data>
<data name="Theme_UseHellionFont_Description" xml:space="preserve"> <data name="Theme_UseHellionFont_Description" xml:space="preserve">
<value>Renders chat and UI in Exo 2 (SIL Open Font License 1.1) which ships with the plugin. Disable to fall back to whatever font you picked under Settings → Fonts.</value> <value>Renders chat and UI in Exo 2 (SIL Open Font License 1.1), which ships with the plugin. Disable to fall back to the font selected under Settings → Font.</value>
</data> </data>
<data name="About_Maintainer_Heading" xml:space="preserve"> <data name="About_Maintainer_Heading" xml:space="preserve">
<value>Maintainer</value> <value>Maintainer</value>
</data> </data>
<data name="About_Maintainer_Body" xml:space="preserve"> <data name="About_Maintainer_Body" xml:space="preserve">
<value>I maintain Hellion Chat through Hellion Online Media. The website has the contact details for licensing, legal or business questions.</value> <value>I maintain Hellion Chat through Hellion Online Media. Contact details for licensing, legal, or business inquiries are on the website.</value>
</data> </data>
<data name="About_Maintainer_Website_Label" xml:space="preserve"> <data name="About_Maintainer_Website_Label" xml:space="preserve">
<value>Website:</value> <value>Website:</value>
@@ -303,76 +303,76 @@
<value>Why this fork exists</value> <value>Why this fork exists</value>
</data> </data>
<data name="About_Mission_P1" xml:space="preserve"> <data name="About_Mission_P1" xml:space="preserve">
<value>Hellion Chat is not trying to replace Chat 2. Chat 2 ships a complete chat experience with full history available for filtering, search and replay. That default is the right one for most users. This fork takes a different stance: a smaller default footprint, with extra knobs for users who want to keep less third-party chat on disk.</value> <value>Hellion Chat is not meant to replace Chat 2. Chat 2 delivers a complete chat experience with a full history available for filtering, searching, and replay. That default is the right choice for most users. This fork takes a different approach: a smaller default footprint, with additional controls for users who prefer to keep less of other people's chat on disk.</value>
</data> </data>
<data name="About_Mission_P2" xml:space="preserve"> <data name="About_Mission_P2" xml:space="preserve">
<value>The reason I wanted that narrower default was personal. After two years on Chat 2 my database had grown past two million messages, most of them /say, /shout and /yell from strangers in Limsa. That data is exactly what makes Chat 2's full-history view powerful and most users are happy to keep it. For my own taste I wanted a smaller default. So I built this fork.</value> <value>The desire for this narrower default was personal. After two years with Chat 2, my database had grown to over two million messages, the majority of them /say, /shout, and /yell from strangers in Limsa. That data is exactly what makes Chat 2's full history useful, and most users are happy to keep it. My own preference was for a smaller default. So I built this fork.</value>
</data> </data>
<data name="About_Mission_P3" xml:space="preserve"> <data name="About_Mission_P3" xml:space="preserve">
<value>I am not chasing a big audience and the fork is not in competition with Chat 2. The code is open under the same EUPL-1.2 licence as the upstream plugin. Infi, Anna or anyone else are welcome to read it, borrow ideas, ask questions, or ignore the project. All three are fine by me.</value> <value>I am not targeting a large audience, and the fork is not in competition with Chat 2. The code is open under the same EUPL-1.2 licence as the original. Infi, Anna, or anyone else is welcome to look around, borrow ideas, ask questions, or simply ignore the project. All three are fine by me.</value>
</data> </data>
<data name="About_BuiltOn_Heading" xml:space="preserve"> <data name="About_BuiltOn_Heading" xml:space="preserve">
<value>Built on Chat 2</value> <value>Built on Chat 2</value>
</data> </data>
<data name="About_BuiltOn_P1" xml:space="preserve"> <data name="About_BuiltOn_P1" xml:space="preserve">
<value>Hellion Chat is a fork of Chat 2 by Infi and Anna (ascclemens). The chat replacement window, the IPC integration, the rendering engine and the entire storage core come from upstream Chat 2.</value> <value>Hellion Chat is a fork of Chat 2 by Infi and Anna (ascclemens). The chat-replacement window, IPC integration, render engine, and the entire storage core all come from the original.</value>
</data> </data>
<data name="About_BuiltOn_P2" xml:space="preserve"> <data name="About_BuiltOn_P2" xml:space="preserve">
<value>The webinterface is the only major piece I removed. It is built for remote access to chat from a second device, which is a different focus than the smaller default footprint this fork is built around. Aligning it with these defaults would have meant a substantial rebuild, so removing it was the cleaner path for this particular fork.</value> <value>The web interface is the only major piece I removed. It is built for remote access to the chat from a second device a different focus from the smaller default footprint this fork pursues. Adapting it to these defaults would have required significant rework, so removing it was the clean path for this particular fork.</value>
</data> </data>
<data name="About_BuiltOn_Upstream_Label" xml:space="preserve"> <data name="About_BuiltOn_Upstream_Label" xml:space="preserve">
<value>Upstream repository:</value> <value>Upstream repository:</value>
</data> </data>
<data name="About_License_Heading" xml:space="preserve"> <data name="About_License_Heading" xml:space="preserve">
<value>License</value> <value>Licence</value>
</data> </data>
<data name="About_License_P1" xml:space="preserve"> <data name="About_License_P1" xml:space="preserve">
<value>Hellion Chat and Chat 2 both ship under the European Union Public Licence v1.2 (EUPL-1.2).</value> <value>Hellion Chat and Chat 2 are both released under the European Union Public Licence v1.2 (EUPL-1.2).</value>
</data> </data>
<data name="About_License_P2" xml:space="preserve"> <data name="About_License_P2" xml:space="preserve">
<value>© 2023 to 2026, the Chat 2 authors (Infi, Anna and the upstream contributors).</value> <value>© 2023 to 2026, the Chat 2 authors (Infi, Anna, and upstream contributors).</value>
</data> </data>
<data name="About_License_P3" xml:space="preserve"> <data name="About_License_P3" xml:space="preserve">
<value>© 2026 Hellion Online Media for the additions made in this fork.</value> <value>© 2026 Hellion Online Media for the extensions in this fork.</value>
</data> </data>
<data name="About_SE_Heading" xml:space="preserve"> <data name="About_SE_Heading" xml:space="preserve">
<value>FINAL FANTASY XIV disclaimer</value> <value>FINAL FANTASY XIV notice</value>
</data> </data>
<data name="About_SE_P1" xml:space="preserve"> <data name="About_SE_P1" xml:space="preserve">
<value>FINAL FANTASY XIV © SQUARE ENIX CO., LTD. All rights reserved.</value> <value>FINAL FANTASY XIV © SQUARE ENIX CO., LTD. All rights reserved.</value>
</data> </data>
<data name="About_SE_P2" xml:space="preserve"> <data name="About_SE_P2" xml:space="preserve">
<value>Hellion Chat is an unofficial, fan-made plugin. It has no affiliation with Square Enix and is not endorsed, sponsored or approved by them.</value> <value>Hellion Chat is an unofficial fan plugin. It is not affiliated with Square Enix and is neither endorsed, sponsored, nor approved by them.</value>
</data> </data>
<data name="About_Localization_Heading" xml:space="preserve"> <data name="About_Localization_Heading" xml:space="preserve">
<value>Localization</value> <value>Localisation</value>
</data> </data>
<data name="About_Localization_P1" xml:space="preserve"> <data name="About_Localization_P1" xml:space="preserve">
<value>The German translations of the Hellion-specific strings come from me. Other languages are not provided yet.</value> <value>The translations of the Hellion-specific strings were done by me. No additional languages are currently available.</value>
</data> </data>
<data name="About_Localization_P2" xml:space="preserve"> <data name="About_Localization_P2" xml:space="preserve">
<value>The translator list below covers the upstream Chat 2 strings on Crowdin. Those volunteers translated Chat 2, not the Hellion additions.</value> <value>The translator list below belongs to the Chat 2 strings on Crowdin. These volunteers translated Chat 2, not the Hellion extensions.</value>
</data> </data>
<data name="About_Translators_TreeNode" xml:space="preserve"> <data name="About_Translators_TreeNode" xml:space="preserve">
<value>Chat 2 community translators (upstream)</value> <value>Chat 2 community translators (upstream)</value>
</data> </data>
<!-- Hellion Chat — Auto-Tell-Tabs (runtime strings) --> <!-- Hellion Chat — Auto-Tell-Tabs (Runtime strings) -->
<data name="AutoTellTabs_SectionHeader" xml:space="preserve"> <data name="AutoTellTabs_SectionHeader" xml:space="preserve">
<value>Active Tells</value> <value>Active tells</value>
</data> </data>
<data name="AutoTellTabs_HistorySeparator" xml:space="preserve"> <data name="AutoTellTabs_HistorySeparator" xml:space="preserve">
<value>— Earlier conversations —</value> <value>— Earlier conversations —</value>
</data> </data>
<data name="AutoTellTabs_HistoryLoadError" xml:space="preserve"> <data name="AutoTellTabs_HistoryLoadError" xml:space="preserve">
<value>History could not be loaded.</value> <value>Could not load history.</value>
</data> </data>
<data name="AutoTellTabs_GreetedTooltip" xml:space="preserve"> <data name="AutoTellTabs_GreetedTooltip" xml:space="preserve">
<value>Marked as greeted. Click to remove the marker.</value> <value>Marked as greeted. Click to remove the mark.</value>
</data> </data>
<data name="AutoTellTabs_UnGreetedTooltip" xml:space="preserve"> <data name="AutoTellTabs_UnGreetedTooltip" xml:space="preserve">
<value>Mark as greeted.</value> <value>Mark as greeted.</value>
@@ -383,62 +383,62 @@
<value>Auto-Tell-Tabs</value> <value>Auto-Tell-Tabs</value>
</data> </data>
<data name="ChatLog_AutoTellTabs_Enable_Name" xml:space="preserve"> <data name="ChatLog_AutoTellTabs_Enable_Name" xml:space="preserve">
<value>Open a tab automatically for each tell partner</value> <value>Automatically open a tab per conversation partner for every /tell</value>
</data> </data>
<data name="ChatLog_AutoTellTabs_Enable_Description" xml:space="preserve"> <data name="ChatLog_AutoTellTabs_Enable_Description" xml:space="preserve">
<value>When you receive or send a /tell, a temporary tab dedicated to that player is opened automatically. Tabs vanish on logout.</value> <value>As soon as you receive or send a /tell, a temporary tab is automatically opened for that player. Tabs are removed on logout.</value>
</data> </data>
<data name="ChatLog_AutoTellTabs_Limit_Name" xml:space="preserve"> <data name="ChatLog_AutoTellTabs_Limit_Name" xml:space="preserve">
<value>Maximum number of auto tell tabs</value> <value>Maximum number of auto-tell tabs</value>
</data> </data>
<data name="ChatLog_AutoTellTabs_Limit_Description" xml:space="preserve"> <data name="ChatLog_AutoTellTabs_Limit_Description" xml:space="preserve">
<value>When the limit is reached, greeted tabs with the oldest activity are dropped first. The change applies on the next /tell.</value> <value>When the limit is reached, greeted tabs with the oldest activity are closed first. Changes take effect on the next /tell.</value>
</data> </data>
<data name="ChatLog_AutoTellTabs_Compact_Name" xml:space="preserve"> <data name="ChatLog_AutoTellTabs_Compact_Name" xml:space="preserve">
<value>Compact display</value> <value>Compact display</value>
</data> </data>
<data name="ChatLog_AutoTellTabs_Compact_Description" xml:space="preserve"> <data name="ChatLog_AutoTellTabs_Compact_Description" xml:space="preserve">
<value>Show only a thin separator between persistent tabs and auto tell tabs, without the section header.</value> <value>Shows only a thin separator between regular tabs and auto-tell tabs, without a section header.</value>
</data> </data>
<data name="ChatLog_AutoTellTabs_GreetedToggle_Name" xml:space="preserve"> <data name="ChatLog_AutoTellTabs_GreetedToggle_Name" xml:space="preserve">
<value>Show "mark as greeted" button</value> <value>Show "Mark as greeted" button</value>
</data> </data>
<data name="ChatLog_AutoTellTabs_GreetedToggle_Description" xml:space="preserve"> <data name="ChatLog_AutoTellTabs_GreetedToggle_Description" xml:space="preserve">
<value>Adds a click-to-toggle button next to each auto tell tab to mark a partner as already greeted, dimming the tab name when set. Useful for club greeters tracking many parallel conversations; off by default.</value> <value>Adds a click button next to each auto-tell tab to mark a conversation partner as already greeted the tab name is then dimmed. Useful for club greeters managing many conversations in parallel. Off by default.</value>
</data> </data>
<data name="ChatLog_AutoTellTabs_OpenAsPopout_Name" xml:space="preserve"> <data name="ChatLog_AutoTellTabs_OpenAsPopout_Name" xml:space="preserve">
<value>Open new /tell tabs directly as pop-out</value> <value>Open new /tell tabs directly as pop-outs</value>
</data> </data>
<data name="ChatLog_AutoTellTabs_OpenAsPopout_Description" xml:space="preserve"> <data name="ChatLog_AutoTellTabs_OpenAsPopout_Description" xml:space="preserve">
<value>When enabled, each newly created /tell tab opens directly as its own window. Closing the window returns the tab to the sidebar.</value> <value>When active, each newly created /tell tab is immediately opened as its own window. Closing the window returns the tab to the sidebar.</value>
</data> </data>
<data name="ChatLog_AutoTellTabs_PreloadHint" xml:space="preserve"> <data name="ChatLog_AutoTellTabs_PreloadHint" xml:space="preserve">
<value>The number of preloaded tells is configured in the Privacy tab.</value> <value>The number of preloaded tells can be configured in the Privacy tab.</value>
</data> </data>
<data name="ChatLog_AutoTellTabs_ConflictHint" xml:space="preserve"> <data name="ChatLog_AutoTellTabs_ConflictHint" xml:space="preserve">
<value>Heads-up: if XIV Messanger or a similar plugin is suppressing direct messages, turn its "Suppress DMs" option off so Hellion Chat can receive tells and open the auto tabs.</value> <value>Note: If XIV Messenger or a similar plugin suppresses tells, disable the "Suppress DMs" option there so that Hellion Chat can receive tells and open the auto-tabs.</value>
</data> </data>
<!-- Hellion Chat — Auto-Tell-Tabs (Privacy settings tab) --> <!-- Hellion Chat — Auto-Tell-Tabs (Privacy settings tab) -->
<data name="Privacy_AutoTellTabs_Section_Title" xml:space="preserve"> <data name="Privacy_AutoTellTabs_Section_Title" xml:space="preserve">
<value>Tell history in auto tabs</value> <value>Tell history in auto-tabs</value>
</data> </data>
<data name="Privacy_AutoTellTabs_Preload_Name" xml:space="preserve"> <data name="Privacy_AutoTellTabs_Preload_Name" xml:space="preserve">
<value>Number of preloaded tells</value> <value>Number of preloaded tells</value>
</data> </data>
<data name="Privacy_AutoTellTabs_Preload_Description" xml:space="preserve"> <data name="Privacy_AutoTellTabs_Preload_Description" xml:space="preserve">
<value>How many earlier tell messages are loaded from the database when an auto tell tab is opened. 0 disables the preload.</value> <value>How many previous tell messages are loaded from the database when an auto-tell tab is opened. 0 disables preloading.</value>
</data> </data>
<data name="Privacy_AutoTellTabs_Preload_Hint" xml:space="preserve"> <data name="Privacy_AutoTellTabs_Preload_Hint" xml:space="preserve">
<value>Only takes effect when auto tell tabs are enabled in the Chat tab.</value> <value>Only takes effect when auto-tell tabs are enabled in the Chat tab.</value>
</data> </data>
<!-- Hellion Chat — Settings UX Polish v10 wipe migration --> <!-- Hellion Chat — Settings UX Polish v10 Wipe migration -->
<data name="SettingsRefactor_Migration_Title" xml:space="preserve"> <data name="SettingsRefactor_Migration_Title" xml:space="preserve">
<value>Settings reorganised</value> <value>Settings restructured</value>
</data> </data>
<data name="SettingsRefactor_Migration_Content" xml:space="preserve"> <data name="SettingsRefactor_Migration_Content" xml:space="preserve">
<value>Hellion Chat 0.5.0 reorganised the settings into themed tabs. Your chat database and your message history stay untouched. Settings have been reset to defaults; if you want to pick a privacy profile again, the reopen button is in the Privacy tab. A backup of your previous config is at HellionChat.json.pre-v10-backup next to the live config file.</value> <value>Hellion Chat 0.5.0 has restructured the settings into thematic tabs. Your chat database and message history remain unchanged. Settings have been reset to defaults. If you want to re-select your privacy profile, the Reopen button is in the Privacy tab. A backup of the previous config is located at HellionChat.json.pre-v10-backup next to the active config file.</value>
</data> </data>
<!-- Hellion Chat — Settings UX Polish 8-tab structure --> <!-- Hellion Chat — Settings UX Polish 8-tab structure -->
@@ -455,30 +455,30 @@
<value>Chat</value> <value>Chat</value>
</data> </data>
<data name="Settings_Tab_Tabs" xml:space="preserve"> <data name="Settings_Tab_Tabs" xml:space="preserve">
<value>Tabs</value> <value>Channels</value>
</data> </data>
<data name="Settings_Tab_Database" xml:space="preserve"> <data name="Settings_Tab_Database" xml:space="preserve">
<value>Database</value> <value>Database</value>
</data> </data>
<data name="Settings_Tab_Information" xml:space="preserve"> <data name="Settings_Tab_Information" xml:space="preserve">
<value>Information</value> <value>About</value>
</data> </data>
<!-- Hellion Chat — General-Tab section headings --> <!-- Hellion Chat — General tab section headings -->
<data name="Settings_General_Input_Heading" xml:space="preserve"> <data name="Settings_General_Input_Heading" xml:space="preserve">
<value>Input</value> <value>Input</value>
</data> </data>
<data name="Settings_General_Audio_Heading" xml:space="preserve"> <data name="Settings_General_Audio_Heading" xml:space="preserve">
<value>Audio &amp; Notifications</value> <value>Audio &amp; notifications</value>
</data> </data>
<data name="Settings_General_Performance_Heading" xml:space="preserve"> <data name="Settings_General_Performance_Heading" xml:space="preserve">
<value>Performance</value> <value>Performance</value>
</data> </data>
<data name="Settings_General_Language_Heading" xml:space="preserve"> <data name="Settings_General_Language_Heading" xml:space="preserve">
<value>Language &amp; Input Helpers</value> <value>Language &amp; input aids</value>
</data> </data>
<!-- Hellion Chat — Appearance-Tab section headings --> <!-- Hellion Chat — Appearance tab section headings -->
<data name="Settings_Appearance_Theme_Heading" xml:space="preserve"> <data name="Settings_Appearance_Theme_Heading" xml:space="preserve">
<value>Theme</value> <value>Theme</value>
</data> </data>
@@ -486,32 +486,32 @@
<value>Fonts</value> <value>Fonts</value>
</data> </data>
<data name="Settings_Appearance_Colours_Heading" xml:space="preserve"> <data name="Settings_Appearance_Colours_Heading" xml:space="preserve">
<value>Chat Colours</value> <value>Chat colours</value>
</data> </data>
<data name="Settings_Appearance_Timestamps_Heading" xml:space="preserve"> <data name="Settings_Appearance_Timestamps_Heading" xml:space="preserve">
<value>Timestamps</value> <value>Timestamps</value>
</data> </data>
<!-- Hellion Chat — Window-Tab section headings --> <!-- Hellion Chat — Window tab section headings -->
<data name="Settings_Window_Hide_Heading" xml:space="preserve"> <data name="Settings_Window_Hide_Heading" xml:space="preserve">
<value>Hide</value> <value>Hiding</value>
</data> </data>
<data name="Settings_Window_InactivityHide_Heading" xml:space="preserve"> <data name="Settings_Window_InactivityHide_Heading" xml:space="preserve">
<value>Inactivity Hide</value> <value>Inactivity hiding</value>
</data> </data>
<data name="Settings_Window_Frame_Heading" xml:space="preserve"> <data name="Settings_Window_Frame_Heading" xml:space="preserve">
<value>Window Frame</value> <value>Window frame</value>
</data> </data>
<data name="Settings_Window_Tooltips_Heading" xml:space="preserve"> <data name="Settings_Window_Tooltips_Heading" xml:space="preserve">
<value>Tooltips</value> <value>Tooltips</value>
</data> </data>
<!-- Hellion Chat — Chat-Tab section headings --> <!-- Hellion Chat — Chat tab section headings -->
<data name="Settings_Chat_AutoTellTabs_Heading" xml:space="preserve"> <data name="Settings_Chat_AutoTellTabs_Heading" xml:space="preserve">
<value>Auto-Tell-Tabs</value> <value>Auto-Tell-Tabs</value>
</data> </data>
<data name="Settings_Chat_Behaviour_Heading" xml:space="preserve"> <data name="Settings_Chat_Behaviour_Heading" xml:space="preserve">
<value>Message Behaviour</value> <value>Message behaviour</value>
</data> </data>
<data name="Settings_Chat_Preview_Heading" xml:space="preserve"> <data name="Settings_Chat_Preview_Heading" xml:space="preserve">
<value>Preview</value> <value>Preview</value>
@@ -520,7 +520,7 @@
<value>Emotes</value> <value>Emotes</value>
</data> </data>
<!-- Hellion Chat — Database-Tab section headings --> <!-- Hellion Chat — Database tab section headings -->
<data name="Settings_Database_Storage_Heading" xml:space="preserve"> <data name="Settings_Database_Storage_Heading" xml:space="preserve">
<value>Storage</value> <value>Storage</value>
</data> </data>
@@ -531,9 +531,9 @@
<value>Maintenance</value> <value>Maintenance</value>
</data> </data>
<!-- Hellion Chat — Information-Tab section headings --> <!-- Hellion Chat — Information tab section headings -->
<data name="Settings_Information_VersionInfo_Heading" xml:space="preserve"> <data name="Settings_Information_VersionInfo_Heading" xml:space="preserve">
<value>Version Info</value> <value>Version info</value>
</data> </data>
<data name="Settings_Information_About_Heading" xml:space="preserve"> <data name="Settings_Information_About_Heading" xml:space="preserve">
<value>About HellionChat</value> <value>About HellionChat</value>
@@ -542,7 +542,7 @@
<value>Changelog</value> <value>Changelog</value>
</data> </data>
<!-- Hellion Chat — Default tab presets (channel-themed) --> <!-- Hellion Chat — Default tab presets (channel-specific) -->
<data name="Tabs_Presets_System" xml:space="preserve"> <data name="Tabs_Presets_System" xml:space="preserve">
<value>System</value> <value>System</value>
</data> </data>
@@ -553,36 +553,36 @@
<value>Party</value> <value>Party</value>
</data> </data>
<data name="Tabs_Presets_Beginner" xml:space="preserve"> <data name="Tabs_Presets_Beginner" xml:space="preserve">
<value>Beginner</value> <value>Novice</value>
</data> </data>
<data name="Tabs_Presets_Linkshell" xml:space="preserve"> <data name="Tabs_Presets_Linkshell" xml:space="preserve">
<value>Linkshell</value> <value>Linkshell</value>
</data> </data>
<data name="Tabs_Presets_Linkshell_Hint" xml:space="preserve"> <data name="Tabs_Presets_Linkshell_Hint" xml:space="preserve">
<value>If you use multiple linkshells, the maintainer recommends one tab per shell for cleaner readability. Duplicate this tab and narrow the channel selection per copy.</value> <value>If you use multiple linkshells, the maintainer recommends one tab per shell for a cleaner overview. Duplicate the tab and restrict the channel selection in each copy.</value>
</data> </data>
<!-- Hellion Chat — v1.2.0 per-tab icon override --> <!-- Hellion Chat — v1.2.0 per-tab icon override -->
<data name="Tabs_Icon_Label" xml:space="preserve"> <data name="Tabs_Icon_Label" xml:space="preserve">
<value>Tab-Icon</value> <value>Tab icon</value>
</data> </data>
<data name="Tabs_Icon_HelpMarker" xml:space="preserve"> <data name="Tabs_Icon_HelpMarker" xml:space="preserve">
<value>FontAwesome-Glyph für die Sidebar. Default greift auf Tab-Name oder Channel-Typ.</value> <value>FontAwesome glyph for the sidebar. Default falls back to the tab name or channel type.</value>
</data> </data>
<data name="Tabs_Icon_DefaultOption" xml:space="preserve"> <data name="Tabs_Icon_DefaultOption" xml:space="preserve">
<value>(Default-Mapping)</value> <value>(Default mapping)</value>
</data> </data>
<data name="ChatColourPresets_Default" xml:space="preserve"> <data name="ChatColourPresets_Default" xml:space="preserve">
<value>Klassik (Chat 2 Default)</value> <value>Classic (Chat 2 default)</value>
</data> </data>
<data name="ChatColourPresets_HighContrast" xml:space="preserve"> <data name="ChatColourPresets_HighContrast" xml:space="preserve">
<value>High-Contrast</value> <value>High contrast</value>
</data> </data>
<data name="ChatColourPresets_Pastell" xml:space="preserve"> <data name="ChatColourPresets_Pastell" xml:space="preserve">
<value>Pastell</value> <value>Pastel</value>
</data> </data>
<data name="ChatColourPresets_DarkModeTuned" xml:space="preserve"> <data name="ChatColourPresets_DarkModeTuned" xml:space="preserve">
<value>Dark-Mode-Tuned</value> <value>Dark mode tuned</value>
</data> </data>
<data name="ChatColourPresets_Hellion" xml:space="preserve"> <data name="ChatColourPresets_Hellion" xml:space="preserve">
<value>Hellion</value> <value>Hellion</value>
@@ -594,22 +594,22 @@
<value>Indigo Violet</value> <value>Indigo Violet</value>
</data> </data>
<data name="Settings_Appearance_Colours_PresetsHint" xml:space="preserve"> <data name="Settings_Appearance_Colours_PresetsHint" xml:space="preserve">
<value>Tip: presets overwrite your current channel colours immediately.</value> <value>Tip: Presets overwrite your current channel colours immediately.</value>
</data> </data>
<data name="Settings_Window_PopOutInputEnabled_Name" xml:space="preserve"> <data name="Settings_Window_PopOutInputEnabled_Name" xml:space="preserve">
<value>Enable input in pop-outs</value> <value>Enable input in pop-outs</value>
</data> </data>
<data name="Settings_Window_PopOutInputEnabled_Description" xml:space="preserve"> <data name="Settings_Window_PopOutInputEnabled_Description" xml:space="preserve">
<value>Master switch: lets you type and send messages directly inside every pop-out window (including auto-tell tabs). Channel changes inside a pop-out apply globally just like in the main window; the text buffer and history cursor stay independent per pop-out.</value> <value>Master switch: allows typing and sending directly in any pop-out window (including auto-tell tabs). Channel switching in a pop-out acts globally like in the main window; the text buffer and history cursor are independent per pop-out.</value>
</data> </data>
<data name="Settings_Window_ResetPosition_Name" xml:space="preserve"> <data name="Settings_Window_ResetPosition_Name" xml:space="preserve">
<value>Reset Window Position</value> <value>Reset window position</value>
</data> </data>
<data name="Settings_Window_ResetPosition_Description" xml:space="preserve"> <data name="Settings_Window_ResetPosition_Description" xml:space="preserve">
<value>Snaps the chat window and every active pop-out back to the primary monitor's top-left corner. Useful when a window has drifted off-screen after a display layout change (monitor disconnected, resolution changed). The plugin also runs an automatic bounds check once per session this button is the manual backup if anything still ends up unreachable.</value> <value>Moves the chat window and all active pop-outs back to the top-left corner of the primary monitor. Useful when a window has ended up outside the visible area after a display layout change (monitor disconnected, resolution changed). The plugin also performs an automatic bounds check once per session; this button is the manual escape hatch if something still ends up unreachable.</value>
</data> </data>
<data name="Popout_v060_HintText" xml:space="preserve"> <data name="Popout_v060_HintText" xml:space="preserve">
<value>New in v0.6.0: you can type directly inside pop-out windows. Toggle the master switch in the window settings to enable it.</value> <value>New in v0.6.0: You can now type directly in pop-outs. Enable the master switch in the Window settings.</value>
</data> </data>
<data name="Popout_v060_HintAck" xml:space="preserve"> <data name="Popout_v060_HintAck" xml:space="preserve">
<value>Got it</value> <value>Got it</value>
@@ -618,19 +618,19 @@
<value>Open window settings</value> <value>Open window settings</value>
</data> </data>
<data name="Hint_v061_PopOutHeader_Body" xml:space="preserve"> <data name="Hint_v061_PopOutHeader_Body" xml:space="preserve">
<value>You can open any chat tab as its own window. Click the window icon in the top right or right-click the tab. New in v0.6.1: pop-out input is enabled by default (can be turned off under Settings → Window).</value> <value>You can open any chat tab as its own window. Click the window icon in the top right or right-click the tab. New in v0.6.1: pop-out input is active by default (can be disabled under Settings → Window).</value>
</data> </data>
<data name="Hint_v061_PopOutHeader_Ack" xml:space="preserve"> <data name="Hint_v061_PopOutHeader_Ack" xml:space="preserve">
<value>Got it</value> <value>Got it</value>
</data> </data>
<data name="Hint_v061_PopOutHeader_OpenSettings" xml:space="preserve"> <data name="Hint_v061_PopOutHeader_OpenSettings" xml:space="preserve">
<value>Open Settings</value> <value>Open settings</value>
</data> </data>
<data name="ChatTwoConflictTitle" xml:space="preserve"> <data name="ChatTwoConflictTitle" xml:space="preserve">
<value>Hellion Chat cannot start while Chat 2 is loaded.</value> <value>Hellion Chat cannot start while Chat 2 is loaded.</value>
</data> </data>
<data name="ChatTwoConflictBody" xml:space="preserve"> <data name="ChatTwoConflictBody" xml:space="preserve">
<value>Hellion Chat is a standalone fork of Chat 2. Both plugins replace the same in-game chat window and would conflict at runtime if loaded together.</value> <value>Hellion Chat is a standalone fork of Chat 2. Both plugins replace the same chat window in the game and would conflict at runtime.</value>
</data> </data>
<data name="ChatTwoConflictAction" xml:space="preserve"> <data name="ChatTwoConflictAction" xml:space="preserve">
<value>Disable Chat 2 in /xlplugins, then re-enable Hellion Chat.</value> <value>Disable Chat 2 in /xlplugins, then re-enable Hellion Chat.</value>
@@ -639,7 +639,7 @@
<value>General</value> <value>General</value>
</data> </data>
<data name="Settings_Card_General_Subtext" xml:space="preserve"> <data name="Settings_Card_General_Subtext" xml:space="preserve">
<value>Plugin-wide settings — language, input, audio, performance.</value> <value>Language, input, audio, and performance.</value>
</data> </data>
<data name="Settings_Card_Appearance_Title" xml:space="preserve"> <data name="Settings_Card_Appearance_Title" xml:space="preserve">
<value>Appearance</value> <value>Appearance</value>
@@ -657,25 +657,25 @@
<value>Window</value> <value>Window</value>
</data> </data>
<data name="Settings_Card_Window_Subtext" xml:space="preserve"> <data name="Settings_Card_Window_Subtext" xml:space="preserve">
<value>Window behaviour — when it shows, whether it can move.</value> <value>When the window is visible and whether it can be moved.</value>
</data> </data>
<data name="Settings_Card_Chat_Title" xml:space="preserve"> <data name="Settings_Card_Chat_Title" xml:space="preserve">
<value>Chat</value> <value>Chat</value>
</data> </data>
<data name="Settings_Card_Chat_Subtext" xml:space="preserve"> <data name="Settings_Card_Chat_Subtext" xml:space="preserve">
<value>How messages are displayed — tells, preview, behaviour, emotes.</value> <value>Tells, preview, message behaviour, and emotes.</value>
</data> </data>
<data name="Settings_Card_Tabs_Title" xml:space="preserve"> <data name="Settings_Card_Tabs_Title" xml:space="preserve">
<value>Tabs</value> <value>Tabs</value>
</data> </data>
<data name="Settings_Card_Tabs_Subtext" xml:space="preserve"> <data name="Settings_Card_Tabs_Subtext" xml:space="preserve">
<value>Tab management — create and configure your own chat tabs.</value> <value>Create and configure custom chat tabs.</value>
</data> </data>
<data name="Settings_Card_Privacy_Title" xml:space="preserve"> <data name="Settings_Card_Privacy_Title" xml:space="preserve">
<value>Privacy</value> <value>Privacy</value>
</data> </data>
<data name="Settings_Card_Privacy_Subtext" xml:space="preserve"> <data name="Settings_Card_Privacy_Subtext" xml:space="preserve">
<value>What's allowed to be stored — privacy filter per channel.</value> <value>Privacy filter per channel and what may be stored.</value>
</data> </data>
<data name="Settings_Card_Database_Title" xml:space="preserve"> <data name="Settings_Card_Database_Title" xml:space="preserve">
<value>Database</value> <value>Database</value>
@@ -687,7 +687,7 @@
<value>Information</value> <value>Information</value>
</data> </data>
<data name="Settings_Card_Information_Subtext" xml:space="preserve"> <data name="Settings_Card_Information_Subtext" xml:space="preserve">
<value>About the plugin — version, mission, license, changelog.</value> <value>Version, mission, licence, and changelog.</value>
</data> </data>
<data name="Settings_Tab_Themes" xml:space="preserve"> <data name="Settings_Tab_Themes" xml:space="preserve">
<value>Themes</value> <value>Themes</value>
@@ -705,16 +705,16 @@
<value>Open themes folder</value> <value>Open themes folder</value>
</data> </data>
<data name="Settings_Themes_ExportActive" xml:space="preserve"> <data name="Settings_Themes_ExportActive" xml:space="preserve">
<value>Export active...</value> <value>Export active</value>
</data> </data>
<data name="Settings_Themes_ApplyChatColors_Hint" xml:space="preserve"> <data name="Settings_Themes_ApplyChatColors_Hint" xml:space="preserve">
<value>This theme suggests its own chat channel colours.</value> <value>This theme suggests its own channel colours.</value>
</data> </data>
<data name="Settings_Themes_ApplyChatColors_Apply" xml:space="preserve"> <data name="Settings_Themes_ApplyChatColors_Apply" xml:space="preserve">
<value>Apply</value> <value>Apply</value>
</data> </data>
<data name="Settings_Themes_ApplyChatColors_Keep" xml:space="preserve"> <data name="Settings_Themes_ApplyChatColors_Keep" xml:space="preserve">
<value>Keep current</value> <value>Keep</value>
</data> </data>
<data name="StatusBar_Privacy_Enabled" xml:space="preserve"> <data name="StatusBar_Privacy_Enabled" xml:space="preserve">
<value>Privacy-First</value> <value>Privacy-First</value>
@@ -723,55 +723,55 @@
<value>Open</value> <value>Open</value>
</data> </data>
<data name="Appearance_UseCompactDensity_Name" xml:space="preserve"> <data name="Appearance_UseCompactDensity_Name" xml:space="preserve">
<value>Compact Density</value> <value>Compact density</value>
</data> </data>
<data name="Appearance_UseCompactDensity_Description" xml:space="preserve"> <data name="Appearance_UseCompactDensity_Description" xml:space="preserve">
<value>Schaltet das Message-Layout vom Card-Row-Default zurück auf einzeilige `[HH:mm] Sender: Text` Zeilen.</value> <value>Switches the message layout from the card-row default back to single-line `[HH:mm] Sender: Text` rows.</value>
</data> </data>
<data name="Settings_Card_ThemeAndLayout_Title" xml:space="preserve"> <data name="Settings_Card_ThemeAndLayout_Title" xml:space="preserve">
<value>Theme &amp; Layout</value> <value>Theme &amp; Layout</value>
</data> </data>
<data name="Settings_Card_ThemeAndLayout_Subtext" xml:space="preserve"> <data name="Settings_Card_ThemeAndLayout_Subtext" xml:space="preserve">
<value>How the window looks — theme, frame, timestamp style.</value> <value>Theme, window frame, and timestamp style.</value>
</data> </data>
<data name="Settings_Card_FontsAndColours_Title" xml:space="preserve"> <data name="Settings_Card_FontsAndColours_Title" xml:space="preserve">
<value>Fonts &amp; Colours</value> <value>Fonts &amp; Colours</value>
</data> </data>
<data name="Settings_Card_FontsAndColours_Subtext" xml:space="preserve"> <data name="Settings_Card_FontsAndColours_Subtext" xml:space="preserve">
<value>Readability — font, font size, per-channel chat colours.</value> <value>Font, font size, and chat colours per channel.</value>
</data> </data>
<data name="Settings_Card_DataManagement_Title" xml:space="preserve"> <data name="Settings_Card_DataManagement_Title" xml:space="preserve">
<value>Data Management</value> <value>Data management</value>
</data> </data>
<data name="Settings_Card_DataManagement_Subtext" xml:space="preserve"> <data name="Settings_Card_DataManagement_Subtext" xml:space="preserve">
<value>What happens to stored data — retention, cleanup, export, DB stats.</value> <value>Retention, cleanup, export, and database statistics.</value>
</data> </data>
<data name="Settings_Card_Integrations_Title" xml:space="preserve"> <data name="Settings_Card_Integrations_Title" xml:space="preserve">
<value>Integrations</value> <value>Integrations</value>
</data> </data>
<data name="Settings_Card_Integrations_Subtext" xml:space="preserve"> <data name="Settings_Card_Integrations_Subtext" xml:space="preserve">
<value>Other Dalamud plugins HellionChat reacts to. Auto-detected, with a "coming soon" preview of upcoming integrations.</value> <value>Other Dalamud plugins that HellionChat works with. Upcoming integrations in preview.</value>
</data> </data>
<data name="Settings_ThemeAndLayout_Theme_Heading" xml:space="preserve"> <data name="Settings_ThemeAndLayout_Theme_Heading" xml:space="preserve">
<value>Theme</value> <value>Theme</value>
</data> </data>
<data name="Settings_ThemeAndLayout_WindowStyle_Heading" xml:space="preserve"> <data name="Settings_ThemeAndLayout_WindowStyle_Heading" xml:space="preserve">
<value>Window Style</value> <value>Window style</value>
</data> </data>
<data name="Settings_ThemeAndLayout_TimestampStyle_Heading" xml:space="preserve"> <data name="Settings_ThemeAndLayout_TimestampStyle_Heading" xml:space="preserve">
<value>Timestamp Style</value> <value>Timestamp style</value>
</data> </data>
<data name="Settings_ThemeAndLayout_WindowOpacity_Name" xml:space="preserve"> <data name="Settings_ThemeAndLayout_WindowOpacity_Name" xml:space="preserve">
<value>Window Transparency</value> <value>Window transparency</value>
</data> </data>
<data name="Settings_ThemeAndLayout_WindowOpacity_Description" xml:space="preserve"> <data name="Settings_ThemeAndLayout_WindowOpacity_Description" xml:space="preserve">
<value>How transparent the window background is. Lower values let the game show through more. Tip: Dalamud's per-window menu (Hamburger in the title bar) gives you per-window overrides for opacity, background blur, click-through and pinning — those override this slider for that window.</value> <value>How transparent the window background is. Lower values let more of the game show through. Tip: Dalamud's per-window menu (hamburger in the title bar) offers per-window overrides for opacity, background blur, click-through, and pinning — those take precedence over this slider for the respective window.</value>
</data> </data>
<data name="Settings_FontsAndColours_Fonts_Heading" xml:space="preserve"> <data name="Settings_FontsAndColours_Fonts_Heading" xml:space="preserve">
<value>Fonts</value> <value>Fonts</value>
</data> </data>
<data name="Settings_FontsAndColours_Colours_Heading" xml:space="preserve"> <data name="Settings_FontsAndColours_Colours_Heading" xml:space="preserve">
<value>Chat Colours</value> <value>Chat colours</value>
</data> </data>
<data name="Settings_DataManagement_Storage_Heading" xml:space="preserve"> <data name="Settings_DataManagement_Storage_Heading" xml:space="preserve">
<value>Storage</value> <value>Storage</value>
@@ -786,22 +786,22 @@
<value>Export</value> <value>Export</value>
</data> </data>
<data name="Settings_DataManagement_DbViewer_Heading" xml:space="preserve"> <data name="Settings_DataManagement_DbViewer_Heading" xml:space="preserve">
<value>Database Viewer</value> <value>Database viewer</value>
</data> </data>
<data name="Settings_DataManagement_Advanced_Heading" xml:space="preserve"> <data name="Settings_DataManagement_Advanced_Heading" xml:space="preserve">
<value>Advanced (Shift+Click to open)</value> <value>Advanced (Shift+click to open)</value>
</data> </data>
<data name="Settings_Window_Frame_Behaviour_Heading" xml:space="preserve"> <data name="Settings_Window_Frame_Behaviour_Heading" xml:space="preserve">
<value>Behaviour</value> <value>Behaviour</value>
</data> </data>
<data name="Migration_v16_OverrideStyle_Toast" xml:space="preserve"> <data name="Migration_v16_OverrideStyle_Toast" xml:space="preserve">
<value>Hellion Chat 1.2.1 reorganised the Settings menu and removed the legacy "Style override" option (made obsolete by the Themes system in 1.1.0). Your other settings are unchanged. Window opacity was migrated to Theme &amp; Layout. A backup of your previous config is at pluginConfigs/HellionChat.json.pre-v16-backup next to the live HellionChat.json.</value> <value>Hellion Chat 1.2.1 has reorganised the settings menu and removed the old "Override style" option (superseded by the theme system from 1.1.0). Your remaining settings are unchanged. Window transparency has been migrated to "Theme &amp; Layout". A backup of the previous config is located at pluginConfigs/HellionChat.json.pre-v16-backup next to the active HellionChat.json.</value>
</data> </data>
<data name="Settings_Tab_Integrations" xml:space="preserve"> <data name="Settings_Tab_Integrations" xml:space="preserve">
<value>Integrations</value> <value>Integrations</value>
</data> </data>
<data name="Settings_Integrations_Intro" xml:space="preserve"> <data name="Settings_Integrations_Intro" xml:space="preserve">
<value>Plugin integrations let HellionChat react to other installed Dalamud plugins. Each integration auto-detects its target and silently disables itself when the target plugin is not present.</value> <value>Plugin integrations let HellionChat work together with other installed Dalamud plugins. Each integration automatically detects its target and silently disables itself when the target plugin is missing.</value>
</data> </data>
<data name="Settings_Integrations_Honorific_SectionHeader" xml:space="preserve"> <data name="Settings_Integrations_Honorific_SectionHeader" xml:space="preserve">
<value>Honorific</value> <value>Honorific</value>
@@ -813,13 +813,13 @@
<value>Not installed</value> <value>Not installed</value>
</data> </data>
<data name="Settings_Integrations_Honorific_Status_Incompatible" xml:space="preserve"> <data name="Settings_Integrations_Honorific_Status_Incompatible" xml:space="preserve">
<value>Incompatible API version ({0} expected, {1}.{2} detected)</value> <value>Incompatible API version ({0} expected, {1}.{2} found)</value>
</data> </data>
<data name="Settings_Integrations_Honorific_Toggle" xml:space="preserve"> <data name="Settings_Integrations_Honorific_Toggle" xml:space="preserve">
<value>Show Honorific title in chat header</value> <value>Show Honorific title in chat header</value>
</data> </data>
<data name="Settings_Integrations_Honorific_ToggleHint" xml:space="preserve"> <data name="Settings_Integrations_Honorific_ToggleHint" xml:space="preserve">
<value>Displays your custom title from Honorific in the header above the chat log, in your chosen colour.</value> <value>Shows your custom title from Honorific in the header above the chat log, in the colour you have chosen.</value>
</data> </data>
<data name="Settings_Integrations_Honorific_LinkRepo" xml:space="preserve"> <data name="Settings_Integrations_Honorific_LinkRepo" xml:space="preserve">
<value>Honorific on GitHub</value> <value>Honorific on GitHub</value>
@@ -831,48 +831,48 @@
<value>Coming soon</value> <value>Coming soon</value>
</data> </data>
<data name="Settings_Integrations_ComingSoon_Intro" xml:space="preserve"> <data name="Settings_Integrations_ComingSoon_Intro" xml:space="preserve">
<value>These integrations are on the roadmap. The settings for each appear automatically once the underlying plugin is wired up.</value> <value>These integrations are on the roadmap. The settings will appear automatically once the respective plugin is connected.</value>
</data> </data>
<data name="Settings_Integrations_ComingSoon_ContextMenu_Title" xml:space="preserve"> <data name="Settings_Integrations_ComingSoon_ContextMenu_Title" xml:space="preserve">
<value>Context menu actions</value> <value>Context menu actions</value>
</data> </data>
<data name="Settings_Integrations_ComingSoon_ContextMenu_Description" xml:space="preserve"> <data name="Settings_Integrations_ComingSoon_ContextMenu_Description" xml:space="preserve">
<value>Right-click a name in chat to jump to PlayerTrack, open the Lodestone profile, or compose a DM in one click.</value> <value>Right-click a name in chat: jump to PlayerTrack, open the Lodestone profile, or compose a DM with one click.</value>
</data> </data>
<data name="Settings_Integrations_ComingSoon_Notifications_Title" xml:space="preserve"> <data name="Settings_Integrations_ComingSoon_Notifications_Title" xml:space="preserve">
<value>Smart notifications (NotificationMaster)</value> <value>Smart notifications (NotificationMaster)</value>
</data> </data>
<data name="Settings_Integrations_ComingSoon_Notifications_Description" xml:space="preserve"> <data name="Settings_Integrations_ComingSoon_Notifications_Description" xml:space="preserve">
<value>Route mentions and DMs through NotificationMaster for system toasts, taskbar flash, and per-channel sounds.</value> <value>Mentions and DMs via NotificationMaster: system toasts, taskbar flash, and per-channel sounds.</value>
</data> </data>
<data name="Settings_Integrations_ComingSoon_RPStatus_Title" xml:space="preserve"> <data name="Settings_Integrations_ComingSoon_RPStatus_Title" xml:space="preserve">
<value>RP status block (Moodles · LightlessClient)</value> <value>RP status block (Moodles · LightlessClient)</value>
</data> </data>
<data name="Settings_Integrations_ComingSoon_RPStatus_Description" xml:space="preserve"> <data name="Settings_Integrations_ComingSoon_RPStatus_Description" xml:space="preserve">
<value>Show Moodles status icons and pair-badges inline next to chat names for richer roleplay context.</value> <value>Show Moodles status icons and pair badges directly next to chat names for more roleplay context.</value>
</data> </data>
<data name="Settings_Integrations_ComingSoon_ExtraChat_Title" xml:space="preserve"> <data name="Settings_Integrations_ComingSoon_ExtraChat_Title" xml:space="preserve">
<value>ExtraChat channels</value> <value>ExtraChat channels</value>
</data> </data>
<data name="Settings_Integrations_ComingSoon_ExtraChat_Description" xml:space="preserve"> <data name="Settings_Integrations_ComingSoon_ExtraChat_Description" xml:space="preserve">
<value>Host end-to-end-encrypted cross-datacenter linkshells natively in HellionChat.</value> <value>Host end-to-end encrypted cross-datacenter linkshells natively in HellionChat.</value>
</data> </data>
<data name="Settings_Integrations_ComingSoon_QuickDM_Title" xml:space="preserve"> <data name="Settings_Integrations_ComingSoon_QuickDM_Title" xml:space="preserve">
<value>Quick DM button (XIVInstantMessenger)</value> <value>Quick-DM button (XIVInstantMessenger)</value>
</data> </data>
<data name="Settings_Integrations_ComingSoon_QuickDM_Description" xml:space="preserve"> <data name="Settings_Integrations_ComingSoon_QuickDM_Description" xml:space="preserve">
<value>One-click DM compose without leaving the chat window.</value> <value>Quick DM access directly from the chat window, one click.</value>
</data> </data>
<data name="Settings_Integrations_GotAnIdea_SectionHeader" xml:space="preserve"> <data name="Settings_Integrations_GotAnIdea_SectionHeader" xml:space="preserve">
<value>Got an idea?</value> <value>Got an idea?</value>
</data> </data>
<data name="Settings_Integrations_GotAnIdea_Body" xml:space="preserve"> <data name="Settings_Integrations_GotAnIdea_Body" xml:space="preserve">
<value>Got an idea for a plugin integration that's not on this list? Hop on the Hellion Forge Discord and tell me. Community input drives the roadmap.</value> <value>Got an idea for a plugin integration that is not on the list? Come to the Hellion Forge Discord and write to me. Community input shapes the roadmap.</value>
</data> </data>
<data name="Settings_Integrations_GotAnIdea_LinkLabel" xml:space="preserve"> <data name="Settings_Integrations_GotAnIdea_LinkLabel" xml:space="preserve">
<value>Open Hellion Forge</value> <value>Open Hellion Forge</value>
</data> </data>
<data name="ChatHeader_HonorificTitle_Tooltip" xml:space="preserve"> <data name="ChatHeader_HonorificTitle_Tooltip" xml:space="preserve">
<value>Honorific custom title</value> <value>Custom title from Honorific</value>
</data> </data>
</root> </root>
@@ -0,0 +1,79 @@
using Dalamud.Bindings.ImGui;
using Dalamud.Plugin.SelfTest;
using HellionChat.Themes;
namespace HellionChat.SelfTests;
// Validates the runtime theme-switch contract: polls ThemeRegistry.Active
// per frame until the slug moves away and back, then sanity-checks that
// the ABGR cache was recomputed on switch.
internal sealed class ThemeSwitchSelfTestStep : ISelfTestStep
{
private readonly Plugin plugin;
private string? initialSlug;
private bool switchedAway;
public ThemeSwitchSelfTestStep(Plugin plugin)
{
this.plugin = plugin;
}
public string Name => "Hellion Chat - Theme switch";
public SelfTestStepResult RunStep()
{
var registry = this.plugin.ThemeRegistry;
if (registry is null)
return SelfTestStepResult.Fail;
var active = registry.Active;
if (active is null)
return SelfTestStepResult.Fail;
if (!HasPopulatedCache(active))
return SelfTestStepResult.Fail;
if (this.initialSlug is null)
{
this.initialSlug = active.Slug;
ImGui.Text(
$"Initial theme: \"{this.initialSlug}\". Open Settings -> Theme & Layout and pick a different theme."
);
return SelfTestStepResult.Waiting;
}
if (!this.switchedAway)
{
if (!string.Equals(active.Slug, this.initialSlug, StringComparison.OrdinalIgnoreCase))
{
this.switchedAway = true;
return SelfTestStepResult.Waiting;
}
ImGui.Text($"Switch the active theme away from \"{this.initialSlug}\".");
return SelfTestStepResult.Waiting;
}
if (!string.Equals(active.Slug, this.initialSlug, StringComparison.OrdinalIgnoreCase))
{
ImGui.Text($"Switch back to \"{this.initialSlug}\" to finish the test.");
return SelfTestStepResult.Waiting;
}
return SelfTestStepResult.Pass;
}
public void CleanUp()
{
this.initialSlug = null;
this.switchedAway = false;
}
// Any non-zero slot confirms the cache was recomputed — no reference
// comparison since custom themes can share slot values with built-ins.
private static bool HasPopulatedCache(Theme theme)
{
var cache = theme.AbgrCache;
return (cache.Primary | cache.WindowBg | cache.TextPrimary | cache.Border) != 0u;
}
}
+2 -2
View File
@@ -32,8 +32,8 @@ public static class Sheets
} }
public static bool IsInForay() => public static bool IsInForay() =>
TerritorySheet.TryGetRow(Plugin.ClientState.TerritoryType, out var row) && TerritorySheet.TryGetRow(Plugin.ClientState.TerritoryType, out var row)
row.TerritoryIntendedUse.RowId is 41 or 61; && row.TerritoryIntendedUse.RowId is 41 or 61;
public static IEnumerable<World> WorldsOnDatacenter(IPlayerCharacter character) public static IEnumerable<World> WorldsOnDatacenter(IPlayerCharacter character)
{ {
+11 -9
View File
@@ -6,7 +6,8 @@ internal static class Chat2Classic
{ {
public const string Slug = "chat2-classic"; public const string Slug = "chat2-classic";
public static Theme Build() => new( public static Theme Build() =>
new(
Slug: Slug, Slug: Slug,
Name: "Chat 2 Klassik", Name: "Chat 2 Klassik",
Author: "Upstream (Infi & Anna)", Author: "Upstream (Infi & Anna)",
@@ -16,33 +17,34 @@ internal static class Chat2Classic
Primary: ColourUtil.HexToRgba("#4682B4"), Primary: ColourUtil.HexToRgba("#4682B4"),
PrimaryLight: ColourUtil.HexToRgba("#5C9DC8"), PrimaryLight: ColourUtil.HexToRgba("#5C9DC8"),
PrimaryGlow: ColourUtil.HexToRgba("#4682B466"), PrimaryGlow: ColourUtil.HexToRgba("#4682B466"),
AccentDark: ColourUtil.HexToRgba("#3D6E92"), AccentDark: ColourUtil.HexToRgba("#3D6E92"),
Accent: ColourUtil.HexToRgba("#4682B4"), Accent: ColourUtil.HexToRgba("#4682B4"),
AccentLight: ColourUtil.HexToRgba("#5C9DC8"), AccentLight: ColourUtil.HexToRgba("#5C9DC8"),
Identity: ColourUtil.HexToRgba("#4682B4"), Identity: ColourUtil.HexToRgba("#4682B4"),
WindowBg: ColourUtil.HexToRgba("#0F0F0FF2"), WindowBg: ColourUtil.HexToRgba("#0F0F0FF2"),
ChildBg: ColourUtil.HexToRgba("#141414"), ChildBg: ColourUtil.HexToRgba("#141414"),
FrameBg: ColourUtil.HexToRgba("#1A1A1A"), FrameBg: ColourUtil.HexToRgba("#1A1A1A"),
Surface: ColourUtil.HexToRgba("#202020"), Surface: ColourUtil.HexToRgba("#202020"),
SurfaceHover: ColourUtil.HexToRgba("#2C2C2C"), SurfaceHover: ColourUtil.HexToRgba("#2C2C2C"),
Border: ColourUtil.HexToRgba("#404040"), Border: ColourUtil.HexToRgba("#404040"),
TextPrimary: ColourUtil.HexToRgba("#E6E6E6"), TextPrimary: ColourUtil.HexToRgba("#E6E6E6"),
TextMuted: ColourUtil.HexToRgba("#999999"), TextMuted: ColourUtil.HexToRgba("#999999"),
TextDim: ColourUtil.HexToRgba("#666666"), TextDim: ColourUtil.HexToRgba("#666666"),
StatusSuccess: ColourUtil.HexToRgba("#5CB85C"), StatusSuccess: ColourUtil.HexToRgba("#5CB85C"),
StatusDanger: ColourUtil.HexToRgba("#D9534F"), StatusDanger: ColourUtil.HexToRgba("#D9534F"),
StatusWarning: ColourUtil.HexToRgba("#F0AD4E"), StatusWarning: ColourUtil.HexToRgba("#F0AD4E"),
StatusInfo: ColourUtil.HexToRgba("#4682B4") StatusInfo: ColourUtil.HexToRgba("#4682B4")
), ),
Layout: new ThemeLayout( Layout: new ThemeLayout(
WindowRounding: 0f, ChildRounding: 0f, PopupRounding: 0f, WindowRounding: 0f,
FrameRounding: 0f, GrabRounding: 0f, TabRounding: 0f, ChildRounding: 0f,
ScrollbarRounding: 0f, WindowBorderSize: 1f, FrameBorderSize: 1f PopupRounding: 0f,
FrameRounding: 0f,
GrabRounding: 0f,
TabRounding: 0f,
ScrollbarRounding: 0f,
WindowBorderSize: 1f,
FrameBorderSize: 1f
), ),
Typography: new ThemeTypography(), Typography: new ThemeTypography(),
IsBuiltIn: true IsBuiltIn: true
+16 -12
View File
@@ -6,47 +6,50 @@ internal static class EventHorizon
{ {
public const string Slug = "event-horizon"; public const string Slug = "event-horizon";
public static Theme Build() => new( public static Theme Build() =>
new(
Slug: Slug, Slug: Slug,
Name: "Event Horizon", Name: "Event Horizon",
Author: "Hellion Online Media", Author: "Hellion Forge",
Description: "Cosmic Purple auf Near-Black. Deep-Space-Stimmung.", Description: "Cosmic Purple auf Near-Black. Deep-Space-Stimmung.",
Colors: new ThemeColors( Colors: new ThemeColors(
PrimaryDark: ColourUtil.HexToRgba("#7B3FCF"), PrimaryDark: ColourUtil.HexToRgba("#7B3FCF"),
Primary: ColourUtil.HexToRgba("#9D5CFF"), Primary: ColourUtil.HexToRgba("#9D5CFF"),
PrimaryLight: ColourUtil.HexToRgba("#B585FF"), PrimaryLight: ColourUtil.HexToRgba("#B585FF"),
PrimaryGlow: ColourUtil.HexToRgba("#9D5CFF99"), PrimaryGlow: ColourUtil.HexToRgba("#9D5CFF99"),
AccentDark: ColourUtil.HexToRgba("#C9982E"), AccentDark: ColourUtil.HexToRgba("#C9982E"),
Accent: ColourUtil.HexToRgba("#E0AB36"), Accent: ColourUtil.HexToRgba("#E0AB36"),
AccentLight: ColourUtil.HexToRgba("#F2C25C"), AccentLight: ColourUtil.HexToRgba("#F2C25C"),
Identity: ColourUtil.HexToRgba("#9D5CFF"), Identity: ColourUtil.HexToRgba("#9D5CFF"),
WindowBg: ColourUtil.HexToRgba("#040308"), WindowBg: ColourUtil.HexToRgba("#040308"),
ChildBg: ColourUtil.HexToRgba("#0A081A"), ChildBg: ColourUtil.HexToRgba("#0A081A"),
FrameBg: ColourUtil.HexToRgba("#140F23"), FrameBg: ColourUtil.HexToRgba("#140F23"),
Surface: ColourUtil.HexToRgba("#1B1530"), Surface: ColourUtil.HexToRgba("#1B1530"),
SurfaceHover: ColourUtil.HexToRgba("#251D40"), SurfaceHover: ColourUtil.HexToRgba("#251D40"),
Border: ColourUtil.HexToRgba("#9D5CFF44"), Border: ColourUtil.HexToRgba("#9D5CFF44"),
TextPrimary: ColourUtil.HexToRgba("#E6E0F5"), TextPrimary: ColourUtil.HexToRgba("#E6E0F5"),
TextMuted: ColourUtil.HexToRgba("#9890B5"), TextMuted: ColourUtil.HexToRgba("#9890B5"),
TextDim: ColourUtil.HexToRgba("#5A5570"), TextDim: ColourUtil.HexToRgba("#5A5570"),
StatusSuccess: ColourUtil.HexToRgba("#26A269"), StatusSuccess: ColourUtil.HexToRgba("#26A269"),
StatusDanger: ColourUtil.HexToRgba("#ED333B"), StatusDanger: ColourUtil.HexToRgba("#ED333B"),
StatusWarning: ColourUtil.HexToRgba("#E0AB36"), StatusWarning: ColourUtil.HexToRgba("#E0AB36"),
StatusInfo: ColourUtil.HexToRgba("#9D5CFF") StatusInfo: ColourUtil.HexToRgba("#9D5CFF")
), ),
Layout: new ThemeLayout( Layout: new ThemeLayout(
WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f, WindowRounding: 6f,
FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f, ChildRounding: 5f,
ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f PopupRounding: 5f,
FrameRounding: 4f,
GrabRounding: 4f,
TabRounding: 4f,
ScrollbarRounding: 4f,
WindowBorderSize: 1f,
FrameBorderSize: 1f
), ),
Typography: new ThemeTypography(), Typography: new ThemeTypography(),
IsBuiltIn: true, IsBuiltIn: true,
ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint> ChatColors: new ThemeChatColors(
new Dictionary<HellionChat.Code.ChatType, uint>
{ {
// Event Horizon — Cosmic-Purple-Drift: helle Pastelle bekommen // Event Horizon — Cosmic-Purple-Drift: helle Pastelle bekommen
// Lavender-Tinte, Akzent-Channels (Tell) ziehen Richtung Magenta- // Lavender-Tinte, Akzent-Channels (Tell) ziehen Richtung Magenta-
@@ -72,6 +75,7 @@ internal static class EventHorizon
[HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E0B870"), [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E0B870"),
[HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E0B870"), [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E0B870"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#9890B5"), [HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#9890B5"),
}) }
)
); );
} }
+16 -12
View File
@@ -6,47 +6,50 @@ internal static class ForgeMerchantman
{ {
public const string Slug = "forge-merchantman"; public const string Slug = "forge-merchantman";
public static Theme Build() => new( public static Theme Build() =>
new(
Slug: Slug, Slug: Slug,
Name: "Forge Merchantman", Name: "Forge Merchantman",
Author: "Hellion Online Media", Author: "Carla Beleandis",
Description: "Patina Bronze auf Workshop-Slate — Hellion Forge im Plugin.", Description: "Patina Bronze auf Workshop-Slate — Hellion Forge im Plugin.",
Colors: new ThemeColors( Colors: new ThemeColors(
PrimaryDark: ColourUtil.HexToRgba("#1F8A82"), PrimaryDark: ColourUtil.HexToRgba("#1F8A82"),
Primary: ColourUtil.HexToRgba("#2DB39E"), Primary: ColourUtil.HexToRgba("#2DB39E"),
PrimaryLight: ColourUtil.HexToRgba("#4FC9B0"), PrimaryLight: ColourUtil.HexToRgba("#4FC9B0"),
PrimaryGlow: ColourUtil.HexToRgba("#2DB39E99"), PrimaryGlow: ColourUtil.HexToRgba("#2DB39E99"),
AccentDark: ColourUtil.HexToRgba("#B86A20"), AccentDark: ColourUtil.HexToRgba("#B86A20"),
Accent: ColourUtil.HexToRgba("#D9892C"), Accent: ColourUtil.HexToRgba("#D9892C"),
AccentLight: ColourUtil.HexToRgba("#E8A04A"), AccentLight: ColourUtil.HexToRgba("#E8A04A"),
Identity: ColourUtil.HexToRgba("#1F8A82"), Identity: ColourUtil.HexToRgba("#1F8A82"),
WindowBg: ColourUtil.HexToRgba("#050B0A"), WindowBg: ColourUtil.HexToRgba("#050B0A"),
ChildBg: ColourUtil.HexToRgba("#0B1413"), ChildBg: ColourUtil.HexToRgba("#0B1413"),
FrameBg: ColourUtil.HexToRgba("#11201D"), FrameBg: ColourUtil.HexToRgba("#11201D"),
Surface: ColourUtil.HexToRgba("#182925"), Surface: ColourUtil.HexToRgba("#182925"),
SurfaceHover: ColourUtil.HexToRgba("#213631"), SurfaceHover: ColourUtil.HexToRgba("#213631"),
Border: ColourUtil.HexToRgba("#2DB39E66"), Border: ColourUtil.HexToRgba("#2DB39E66"),
TextPrimary: ColourUtil.HexToRgba("#D8EFE8"), TextPrimary: ColourUtil.HexToRgba("#D8EFE8"),
TextMuted: ColourUtil.HexToRgba("#8FA39B"), TextMuted: ColourUtil.HexToRgba("#8FA39B"),
TextDim: ColourUtil.HexToRgba("#5A6E66"), TextDim: ColourUtil.HexToRgba("#5A6E66"),
StatusSuccess: ColourUtil.HexToRgba("#5CB85C"), StatusSuccess: ColourUtil.HexToRgba("#5CB85C"),
StatusDanger: ColourUtil.HexToRgba("#D9534F"), StatusDanger: ColourUtil.HexToRgba("#D9534F"),
StatusWarning: ColourUtil.HexToRgba("#F0AD4E"), StatusWarning: ColourUtil.HexToRgba("#F0AD4E"),
StatusInfo: ColourUtil.HexToRgba("#2DB39E") StatusInfo: ColourUtil.HexToRgba("#2DB39E")
), ),
Layout: new ThemeLayout( Layout: new ThemeLayout(
WindowRounding: 4f, ChildRounding: 3f, PopupRounding: 3f, WindowRounding: 4f,
FrameRounding: 2f, GrabRounding: 2f, TabRounding: 2f, ChildRounding: 3f,
ScrollbarRounding: 2f, WindowBorderSize: 1f, FrameBorderSize: 1f PopupRounding: 3f,
FrameRounding: 2f,
GrabRounding: 2f,
TabRounding: 2f,
ScrollbarRounding: 2f,
WindowBorderSize: 1f,
FrameBorderSize: 1f
), ),
Typography: new ThemeTypography(), Typography: new ThemeTypography(),
IsBuiltIn: true, IsBuiltIn: true,
ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint> ChatColors: new ThemeChatColors(
new Dictionary<HellionChat.Code.ChatType, uint>
{ {
// Forge Merchantman — Patina-Tinte in Party/FC, Bernstein-Tinte in // Forge Merchantman — Patina-Tinte in Party/FC, Bernstein-Tinte in
// Yell/Alliance/CustomEmote. Channel-identity bleibt voll erhalten. // Yell/Alliance/CustomEmote. Channel-identity bleibt voll erhalten.
@@ -71,6 +74,7 @@ internal static class ForgeMerchantman
[HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8C880"), [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8C880"),
[HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8C880"), [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8C880"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#8FA39B"), [HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#8FA39B"),
}) }
)
); );
} }
+16 -12
View File
@@ -6,47 +6,50 @@ internal static class HellionArctic
{ {
public const string Slug = "hellion-arctic"; public const string Slug = "hellion-arctic";
public static Theme Build() => new( public static Theme Build() =>
new(
Slug: Slug, Slug: Slug,
Name: "Hellion Arctic", Name: "Hellion Arctic",
Author: "Hellion Online Media", Author: "Hellion Forge",
Description: "Arctic Cyan + Ember Glow on industrial slate. Plugin default.", Description: "Arctic Cyan + Ember Glow on industrial slate. Plugin default.",
Colors: new ThemeColors( Colors: new ThemeColors(
PrimaryDark: ColourUtil.HexToRgba("#0097A7"), PrimaryDark: ColourUtil.HexToRgba("#0097A7"),
Primary: ColourUtil.HexToRgba("#00BED2"), Primary: ColourUtil.HexToRgba("#00BED2"),
PrimaryLight: ColourUtil.HexToRgba("#4DD9E8"), PrimaryLight: ColourUtil.HexToRgba("#4DD9E8"),
PrimaryGlow: ColourUtil.HexToRgba("#00BED299"), PrimaryGlow: ColourUtil.HexToRgba("#00BED299"),
AccentDark: ColourUtil.HexToRgba("#E85D04"), AccentDark: ColourUtil.HexToRgba("#E85D04"),
Accent: ColourUtil.HexToRgba("#F97316"), Accent: ColourUtil.HexToRgba("#F97316"),
AccentLight: ColourUtil.HexToRgba("#FB923C"), AccentLight: ColourUtil.HexToRgba("#FB923C"),
Identity: ColourUtil.HexToRgba("#0097A7"), Identity: ColourUtil.HexToRgba("#0097A7"),
WindowBg: ColourUtil.HexToRgba("#070B12"), WindowBg: ColourUtil.HexToRgba("#070B12"),
ChildBg: ColourUtil.HexToRgba("#0C1220"), ChildBg: ColourUtil.HexToRgba("#0C1220"),
FrameBg: ColourUtil.HexToRgba("#141E30"), FrameBg: ColourUtil.HexToRgba("#141E30"),
Surface: ColourUtil.HexToRgba("#1A2538"), Surface: ColourUtil.HexToRgba("#1A2538"),
SurfaceHover: ColourUtil.HexToRgba("#22303F"), SurfaceHover: ColourUtil.HexToRgba("#22303F"),
Border: ColourUtil.HexToRgba("#00BED266"), Border: ColourUtil.HexToRgba("#00BED266"),
TextPrimary: ColourUtil.HexToRgba("#E6F4F1"), TextPrimary: ColourUtil.HexToRgba("#E6F4F1"),
TextMuted: ColourUtil.HexToRgba("#8FA3B5"), TextMuted: ColourUtil.HexToRgba("#8FA3B5"),
TextDim: ColourUtil.HexToRgba("#566273"), TextDim: ColourUtil.HexToRgba("#566273"),
StatusSuccess: ColourUtil.HexToRgba("#5CB85C"), StatusSuccess: ColourUtil.HexToRgba("#5CB85C"),
StatusDanger: ColourUtil.HexToRgba("#D9534F"), StatusDanger: ColourUtil.HexToRgba("#D9534F"),
StatusWarning: ColourUtil.HexToRgba("#F0AD4E"), StatusWarning: ColourUtil.HexToRgba("#F0AD4E"),
StatusInfo: ColourUtil.HexToRgba("#00BED2") StatusInfo: ColourUtil.HexToRgba("#00BED2")
), ),
Layout: new ThemeLayout( Layout: new ThemeLayout(
WindowRounding: 4f, ChildRounding: 3f, PopupRounding: 3f, WindowRounding: 4f,
FrameRounding: 2f, GrabRounding: 2f, TabRounding: 2f, ChildRounding: 3f,
ScrollbarRounding: 2f, WindowBorderSize: 1f, FrameBorderSize: 1f PopupRounding: 3f,
FrameRounding: 2f,
GrabRounding: 2f,
TabRounding: 2f,
ScrollbarRounding: 2f,
WindowBorderSize: 1f,
FrameBorderSize: 1f
), ),
Typography: new ThemeTypography(), Typography: new ThemeTypography(),
IsBuiltIn: true, IsBuiltIn: true,
ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint> ChatColors: new ThemeChatColors(
new Dictionary<HellionChat.Code.ChatType, uint>
{ {
// Hellion Arctic — FFXIV-Standard mit dezenter Cyan-Tinte in den // Hellion Arctic — FFXIV-Standard mit dezenter Cyan-Tinte in den
// blauen Channels (Party/FC). Channel-Identität bleibt klar. // blauen Channels (Party/FC). Channel-Identität bleibt klar.
@@ -71,6 +74,7 @@ internal static class HellionArctic
[HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8C880"), [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8C880"),
[HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8C880"), [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8C880"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#C0C0C0"), [HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#C0C0C0"),
}) }
)
); );
} }
+17 -21
View File
@@ -2,61 +2,56 @@ using HellionChat.Util;
namespace HellionChat.Themes.Builtin; namespace HellionChat.Themes.Builtin;
// Hellion Spectrum: Deuteran/Protan-safe channel colours. // Deuteran/Protan-safe palette with preserved channel identity.
// Palette derived from Bang Wong, "Points of view: Color blindness",
// Nature Methods 8, 441 (2011). Channel identity (Tell pink, Yell yellow,
// Shout orange, Party blue, FC green) is preserved per Channel-Identity-
// Rule in docs/THEME-AUTHORING.md; tones are chosen so every channel
// stays distinguishable under red-green colour-vision deficiency.
internal static class HellionSpectrum internal static class HellionSpectrum
{ {
public const string Slug = "hellion-spectrum"; public const string Slug = "hellion-spectrum";
public static Theme Build() => new( public static Theme Build() =>
new(
Slug: Slug, Slug: Slug,
Name: "Hellion Spectrum", Name: "Hellion Spectrum",
Author: "Hellion Online Media", Author: "Hellion Forge",
Description: "Deuteran/Protan-safe channels — Wong palette tones, channel identity preserved.", Description: "Deuteran/Protan-safe channels — Wong palette tones, channel identity preserved.",
Colors: new ThemeColors( Colors: new ThemeColors(
PrimaryDark: ColourUtil.HexToRgba("#005983"), PrimaryDark: ColourUtil.HexToRgba("#005983"),
Primary: ColourUtil.HexToRgba("#0072B2"), Primary: ColourUtil.HexToRgba("#0072B2"),
PrimaryLight: ColourUtil.HexToRgba("#3E9BD0"), PrimaryLight: ColourUtil.HexToRgba("#3E9BD0"),
PrimaryGlow: ColourUtil.HexToRgba("#0072B299"), PrimaryGlow: ColourUtil.HexToRgba("#0072B299"),
AccentDark: ColourUtil.HexToRgba("#B07F00"), AccentDark: ColourUtil.HexToRgba("#B07F00"),
Accent: ColourUtil.HexToRgba("#E69F00"), Accent: ColourUtil.HexToRgba("#E69F00"),
AccentLight: ColourUtil.HexToRgba("#F0B73A"), AccentLight: ColourUtil.HexToRgba("#F0B73A"),
Identity: ColourUtil.HexToRgba("#005983"), Identity: ColourUtil.HexToRgba("#005983"),
WindowBg: ColourUtil.HexToRgba("#0A0F14"), WindowBg: ColourUtil.HexToRgba("#0A0F14"),
ChildBg: ColourUtil.HexToRgba("#101620"), ChildBg: ColourUtil.HexToRgba("#101620"),
FrameBg: ColourUtil.HexToRgba("#1A222E"), FrameBg: ColourUtil.HexToRgba("#1A222E"),
Surface: ColourUtil.HexToRgba("#22303F"), Surface: ColourUtil.HexToRgba("#22303F"),
SurfaceHover: ColourUtil.HexToRgba("#2D3E51"), SurfaceHover: ColourUtil.HexToRgba("#2D3E51"),
Border: ColourUtil.HexToRgba("#0072B266"), Border: ColourUtil.HexToRgba("#0072B266"),
TextPrimary: ColourUtil.HexToRgba("#F0F4F8"), TextPrimary: ColourUtil.HexToRgba("#F0F4F8"),
TextMuted: ColourUtil.HexToRgba("#9AA8B5"), TextMuted: ColourUtil.HexToRgba("#9AA8B5"),
TextDim: ColourUtil.HexToRgba("#5E6B78"), TextDim: ColourUtil.HexToRgba("#5E6B78"),
StatusSuccess: ColourUtil.HexToRgba("#009E73"), StatusSuccess: ColourUtil.HexToRgba("#009E73"),
StatusDanger: ColourUtil.HexToRgba("#D55E00"), StatusDanger: ColourUtil.HexToRgba("#D55E00"),
StatusWarning: ColourUtil.HexToRgba("#F0E442"), StatusWarning: ColourUtil.HexToRgba("#F0E442"),
StatusInfo: ColourUtil.HexToRgba("#56B4E9") StatusInfo: ColourUtil.HexToRgba("#56B4E9")
), ),
Layout: new ThemeLayout( Layout: new ThemeLayout(
WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f, WindowRounding: 6f,
FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f, ChildRounding: 5f,
ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f PopupRounding: 5f,
FrameRounding: 4f,
GrabRounding: 4f,
TabRounding: 4f,
ScrollbarRounding: 4f,
WindowBorderSize: 1f,
FrameBorderSize: 1f
), ),
Typography: new ThemeTypography(), Typography: new ThemeTypography(),
IsBuiltIn: true, IsBuiltIn: true,
ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint> ChatColors: new ThemeChatColors(
new Dictionary<HellionChat.Code.ChatType, uint>
{ {
// Hellion Spectrum — Wong/Okabe-Ito tones within FFXIV channel
// identity. FC pulled slightly greener than vanilla cyan-teal so
// Party-blue and FC-green stay separable under deuteran sim.
[HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#FFFFFF"), [HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#FFFFFF"),
[HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#F0E442"), [HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#F0E442"),
[HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#D55E00"), [HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#D55E00"),
@@ -78,6 +73,7 @@ internal static class HellionSpectrum
[HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#C9A56F"), [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#C9A56F"),
[HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#C9A56F"), [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#C9A56F"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#C0C0C0"), [HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#C0C0C0"),
}) }
)
); );
} }
+15 -11
View File
@@ -6,7 +6,8 @@ internal static class IndigoViolet
{ {
public const string Slug = "indigo-violet"; public const string Slug = "indigo-violet";
public static Theme Build() => new( public static Theme Build() =>
new(
Slug: Slug, Slug: Slug,
Name: "Indigo Violet", Name: "Indigo Violet",
Author: "Julia Moon", Author: "Julia Moon",
@@ -16,37 +17,39 @@ internal static class IndigoViolet
Primary: ColourUtil.HexToRgba("#8B4DDE"), Primary: ColourUtil.HexToRgba("#8B4DDE"),
PrimaryLight: ColourUtil.HexToRgba("#B07CFF"), PrimaryLight: ColourUtil.HexToRgba("#B07CFF"),
PrimaryGlow: ColourUtil.HexToRgba("#8B4DDE99"), PrimaryGlow: ColourUtil.HexToRgba("#8B4DDE99"),
AccentDark: ColourUtil.HexToRgba("#36A89C"), AccentDark: ColourUtil.HexToRgba("#36A89C"),
Accent: ColourUtil.HexToRgba("#4FC9B8"), Accent: ColourUtil.HexToRgba("#4FC9B8"),
AccentLight: ColourUtil.HexToRgba("#7AE0CF"), AccentLight: ColourUtil.HexToRgba("#7AE0CF"),
Identity: ColourUtil.HexToRgba("#6B3AB0"), Identity: ColourUtil.HexToRgba("#6B3AB0"),
WindowBg: ColourUtil.HexToRgba("#0D061F"), WindowBg: ColourUtil.HexToRgba("#0D061F"),
ChildBg: ColourUtil.HexToRgba("#1A0D3D"), ChildBg: ColourUtil.HexToRgba("#1A0D3D"),
FrameBg: ColourUtil.HexToRgba("#2A1556"), FrameBg: ColourUtil.HexToRgba("#2A1556"),
Surface: ColourUtil.HexToRgba("#3D1F78"), Surface: ColourUtil.HexToRgba("#3D1F78"),
SurfaceHover: ColourUtil.HexToRgba("#5B2A9A"), SurfaceHover: ColourUtil.HexToRgba("#5B2A9A"),
Border: ColourUtil.HexToRgba("#8B4DDE66"), Border: ColourUtil.HexToRgba("#8B4DDE66"),
TextPrimary: ColourUtil.HexToRgba("#F0E6FF"), TextPrimary: ColourUtil.HexToRgba("#F0E6FF"),
TextMuted: ColourUtil.HexToRgba("#A890D0"), TextMuted: ColourUtil.HexToRgba("#A890D0"),
TextDim: ColourUtil.HexToRgba("#7560A0"), TextDim: ColourUtil.HexToRgba("#7560A0"),
StatusSuccess: ColourUtil.HexToRgba("#3DDC97"), StatusSuccess: ColourUtil.HexToRgba("#3DDC97"),
StatusDanger: ColourUtil.HexToRgba("#FF5C7A"), StatusDanger: ColourUtil.HexToRgba("#FF5C7A"),
StatusWarning: ColourUtil.HexToRgba("#FFB84A"), StatusWarning: ColourUtil.HexToRgba("#FFB84A"),
StatusInfo: ColourUtil.HexToRgba("#8B4DDE") StatusInfo: ColourUtil.HexToRgba("#8B4DDE")
), ),
Layout: new ThemeLayout( Layout: new ThemeLayout(
WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f, WindowRounding: 6f,
FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f, ChildRounding: 5f,
ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f PopupRounding: 5f,
FrameRounding: 4f,
GrabRounding: 4f,
TabRounding: 4f,
ScrollbarRounding: 4f,
WindowBorderSize: 1f,
FrameBorderSize: 1f
), ),
Typography: new ThemeTypography(), Typography: new ThemeTypography(),
IsBuiltIn: true, IsBuiltIn: true,
ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint> ChatColors: new ThemeChatColors(
new Dictionary<HellionChat.Code.ChatType, uint>
{ {
// Indigo Violet — Lavender-Pink-Drift in Tell und LS6/7. Türkis- // Indigo Violet — Lavender-Pink-Drift in Tell und LS6/7. Türkis-
// Mint-Aurora-Counter in Party/FC und LS4. Glitter-Gold in Yell. // Mint-Aurora-Counter in Party/FC und LS4. Glitter-Gold in Yell.
@@ -72,6 +75,7 @@ internal static class IndigoViolet
[HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8B590"), [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8B590"),
[HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8B590"), [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8B590"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#A890D0"), [HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#A890D0"),
}) }
)
); );
} }
+16 -12
View File
@@ -6,47 +6,50 @@ internal static class MintGrove
{ {
public const string Slug = "mint-grove"; public const string Slug = "mint-grove";
public static Theme Build() => new( public static Theme Build() =>
new(
Slug: Slug, Slug: Slug,
Name: "Mint Grove", Name: "Mint Grove",
Author: "Hellion Online Media", Author: "Carla Beleandis",
Description: "Mint Green + Honey Amber auf Deep Forest. Naturthemen-tauglich.", Description: "Mint Green + Honey Amber auf Deep Forest. Naturthemen-tauglich.",
Colors: new ThemeColors( Colors: new ThemeColors(
PrimaryDark: ColourUtil.HexToRgba("#3CB371"), PrimaryDark: ColourUtil.HexToRgba("#3CB371"),
Primary: ColourUtil.HexToRgba("#5DD39E"), Primary: ColourUtil.HexToRgba("#5DD39E"),
PrimaryLight: ColourUtil.HexToRgba("#8FE0B8"), PrimaryLight: ColourUtil.HexToRgba("#8FE0B8"),
PrimaryGlow: ColourUtil.HexToRgba("#5DD39E99"), PrimaryGlow: ColourUtil.HexToRgba("#5DD39E99"),
AccentDark: ColourUtil.HexToRgba("#F4C870"), AccentDark: ColourUtil.HexToRgba("#F4C870"),
Accent: ColourUtil.HexToRgba("#F9D580"), Accent: ColourUtil.HexToRgba("#F9D580"),
AccentLight: ColourUtil.HexToRgba("#FCDD93"), AccentLight: ColourUtil.HexToRgba("#FCDD93"),
Identity: ColourUtil.HexToRgba("#5DD39E"), Identity: ColourUtil.HexToRgba("#5DD39E"),
WindowBg: ColourUtil.HexToRgba("#0A1410"), WindowBg: ColourUtil.HexToRgba("#0A1410"),
ChildBg: ColourUtil.HexToRgba("#10201A"), ChildBg: ColourUtil.HexToRgba("#10201A"),
FrameBg: ColourUtil.HexToRgba("#162B22"), FrameBg: ColourUtil.HexToRgba("#162B22"),
Surface: ColourUtil.HexToRgba("#1E372B"), Surface: ColourUtil.HexToRgba("#1E372B"),
SurfaceHover: ColourUtil.HexToRgba("#284335"), SurfaceHover: ColourUtil.HexToRgba("#284335"),
Border: ColourUtil.HexToRgba("#5DD39E55"), Border: ColourUtil.HexToRgba("#5DD39E55"),
TextPrimary: ColourUtil.HexToRgba("#E8F5EA"), TextPrimary: ColourUtil.HexToRgba("#E8F5EA"),
TextMuted: ColourUtil.HexToRgba("#9BB5A5"), TextMuted: ColourUtil.HexToRgba("#9BB5A5"),
TextDim: ColourUtil.HexToRgba("#5C6F65"), TextDim: ColourUtil.HexToRgba("#5C6F65"),
StatusSuccess: ColourUtil.HexToRgba("#5DD39E"), StatusSuccess: ColourUtil.HexToRgba("#5DD39E"),
StatusDanger: ColourUtil.HexToRgba("#D9534F"), StatusDanger: ColourUtil.HexToRgba("#D9534F"),
StatusWarning: ColourUtil.HexToRgba("#E8B590"), StatusWarning: ColourUtil.HexToRgba("#E8B590"),
StatusInfo: ColourUtil.HexToRgba("#5DA9C7") StatusInfo: ColourUtil.HexToRgba("#5DA9C7")
), ),
Layout: new ThemeLayout( Layout: new ThemeLayout(
WindowRounding: 5f, ChildRounding: 4f, PopupRounding: 4f, WindowRounding: 5f,
FrameRounding: 3f, GrabRounding: 3f, TabRounding: 3f, ChildRounding: 4f,
ScrollbarRounding: 3f, WindowBorderSize: 1f, FrameBorderSize: 1f PopupRounding: 4f,
FrameRounding: 3f,
GrabRounding: 3f,
TabRounding: 3f,
ScrollbarRounding: 3f,
WindowBorderSize: 1f,
FrameBorderSize: 1f
), ),
Typography: new ThemeTypography(), Typography: new ThemeTypography(),
IsBuiltIn: true, IsBuiltIn: true,
ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint> ChatColors: new ThemeChatColors(
new Dictionary<HellionChat.Code.ChatType, uint>
{ {
// Mint Grove — Naturthemen-Tönung: Honey-Amber in Yell-Familie, // Mint Grove — Naturthemen-Tönung: Honey-Amber in Yell-Familie,
// Mint-Drift in NoviceNetwork und Linkshell. Tell-Pink-Identität // Mint-Drift in NoviceNetwork und Linkshell. Tell-Pink-Identität
@@ -72,6 +75,7 @@ internal static class MintGrove
[HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8C088"), [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8C088"),
[HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8C088"), [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8C088"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#9BB5A5"), [HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#9BB5A5"),
}) }
)
); );
} }
+16 -12
View File
@@ -6,47 +6,50 @@ internal static class MoonlitBloom
{ {
public const string Slug = "moonlit-bloom"; public const string Slug = "moonlit-bloom";
public static Theme Build() => new( public static Theme Build() =>
new(
Slug: Slug, Slug: Slug,
Name: "Moonlit Bloom", Name: "Moonlit Bloom",
Author: "Hellion Online Media", Author: "Hellion Forge",
Description: "Bloom Magenta + Soft Sage auf Deep Violet Night.", Description: "Bloom Magenta + Soft Sage auf Deep Violet Night.",
Colors: new ThemeColors( Colors: new ThemeColors(
PrimaryDark: ColourUtil.HexToRgba("#C957D0"), PrimaryDark: ColourUtil.HexToRgba("#C957D0"),
Primary: ColourUtil.HexToRgba("#E374E8"), Primary: ColourUtil.HexToRgba("#E374E8"),
PrimaryLight: ColourUtil.HexToRgba("#EF8AF4"), PrimaryLight: ColourUtil.HexToRgba("#EF8AF4"),
PrimaryGlow: ColourUtil.HexToRgba("#E374E899"), PrimaryGlow: ColourUtil.HexToRgba("#E374E899"),
AccentDark: ColourUtil.HexToRgba("#7AAC5C"), AccentDark: ColourUtil.HexToRgba("#7AAC5C"),
Accent: ColourUtil.HexToRgba("#9CCB7C"), Accent: ColourUtil.HexToRgba("#9CCB7C"),
AccentLight: ColourUtil.HexToRgba("#B6E297"), AccentLight: ColourUtil.HexToRgba("#B6E297"),
Identity: ColourUtil.HexToRgba("#E374E8"), Identity: ColourUtil.HexToRgba("#E374E8"),
WindowBg: ColourUtil.HexToRgba("#0E0C1F"), WindowBg: ColourUtil.HexToRgba("#0E0C1F"),
ChildBg: ColourUtil.HexToRgba("#15122B"), ChildBg: ColourUtil.HexToRgba("#15122B"),
FrameBg: ColourUtil.HexToRgba("#1F1A38"), FrameBg: ColourUtil.HexToRgba("#1F1A38"),
Surface: ColourUtil.HexToRgba("#28224A"), Surface: ColourUtil.HexToRgba("#28224A"),
SurfaceHover: ColourUtil.HexToRgba("#332B5B"), SurfaceHover: ColourUtil.HexToRgba("#332B5B"),
Border: ColourUtil.HexToRgba("#E374E844"), Border: ColourUtil.HexToRgba("#E374E844"),
TextPrimary: ColourUtil.HexToRgba("#ECE6F5"), TextPrimary: ColourUtil.HexToRgba("#ECE6F5"),
TextMuted: ColourUtil.HexToRgba("#9A8BB0"), TextMuted: ColourUtil.HexToRgba("#9A8BB0"),
TextDim: ColourUtil.HexToRgba("#554B6E"), TextDim: ColourUtil.HexToRgba("#554B6E"),
StatusSuccess: ColourUtil.HexToRgba("#7AAC5C"), StatusSuccess: ColourUtil.HexToRgba("#7AAC5C"),
StatusDanger: ColourUtil.HexToRgba("#E85C6A"), StatusDanger: ColourUtil.HexToRgba("#E85C6A"),
StatusWarning: ColourUtil.HexToRgba("#E8B590"), StatusWarning: ColourUtil.HexToRgba("#E8B590"),
StatusInfo: ColourUtil.HexToRgba("#6278FF") StatusInfo: ColourUtil.HexToRgba("#6278FF")
), ),
Layout: new ThemeLayout( Layout: new ThemeLayout(
WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f, WindowRounding: 6f,
FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f, ChildRounding: 5f,
ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f PopupRounding: 5f,
FrameRounding: 4f,
GrabRounding: 4f,
TabRounding: 4f,
ScrollbarRounding: 4f,
WindowBorderSize: 1f,
FrameBorderSize: 1f
), ),
Typography: new ThemeTypography(), Typography: new ThemeTypography(),
IsBuiltIn: true, IsBuiltIn: true,
ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint> ChatColors: new ThemeChatColors(
new Dictionary<HellionChat.Code.ChatType, uint>
{ {
// Moonlit Bloom — Bloom-Magenta-Tönung. Sage-Drift in NoviceNetwork // Moonlit Bloom — Bloom-Magenta-Tönung. Sage-Drift in NoviceNetwork
// und Linkshell4. Tell-Pink-Identität bleibt sichtbar. // und Linkshell4. Tell-Pink-Identität bleibt sichtbar.
@@ -71,6 +74,7 @@ internal static class MoonlitBloom
[HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8B590"), [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8B590"),
[HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8B590"), [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8B590"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#9A8BB0"), [HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#9A8BB0"),
}) }
)
); );
} }
+15 -11
View File
@@ -6,7 +6,8 @@ internal static class NightBlue
{ {
public const string Slug = "night-blue"; public const string Slug = "night-blue";
public static Theme Build() => new( public static Theme Build() =>
new(
Slug: Slug, Slug: Slug,
Name: "Night Blue", Name: "Night Blue",
Author: "Julia Moon", Author: "Julia Moon",
@@ -16,37 +17,39 @@ internal static class NightBlue
Primary: ColourUtil.HexToRgba("#4A90E2"), Primary: ColourUtil.HexToRgba("#4A90E2"),
PrimaryLight: ColourUtil.HexToRgba("#6AB0FF"), PrimaryLight: ColourUtil.HexToRgba("#6AB0FF"),
PrimaryGlow: ColourUtil.HexToRgba("#4A90E299"), PrimaryGlow: ColourUtil.HexToRgba("#4A90E299"),
AccentDark: ColourUtil.HexToRgba("#C97A2E"), AccentDark: ColourUtil.HexToRgba("#C97A2E"),
Accent: ColourUtil.HexToRgba("#E8A040"), Accent: ColourUtil.HexToRgba("#E8A040"),
AccentLight: ColourUtil.HexToRgba("#F4B968"), AccentLight: ColourUtil.HexToRgba("#F4B968"),
Identity: ColourUtil.HexToRgba("#3576C0"), Identity: ColourUtil.HexToRgba("#3576C0"),
WindowBg: ColourUtil.HexToRgba("#050B18"), WindowBg: ColourUtil.HexToRgba("#050B18"),
ChildBg: ColourUtil.HexToRgba("#0A1628"), ChildBg: ColourUtil.HexToRgba("#0A1628"),
FrameBg: ColourUtil.HexToRgba("#122039"), FrameBg: ColourUtil.HexToRgba("#122039"),
Surface: ColourUtil.HexToRgba("#1A2D4F"), Surface: ColourUtil.HexToRgba("#1A2D4F"),
SurfaceHover: ColourUtil.HexToRgba("#234070"), SurfaceHover: ColourUtil.HexToRgba("#234070"),
Border: ColourUtil.HexToRgba("#4A90E266"), Border: ColourUtil.HexToRgba("#4A90E266"),
TextPrimary: ColourUtil.HexToRgba("#E6EDF7"), TextPrimary: ColourUtil.HexToRgba("#E6EDF7"),
TextMuted: ColourUtil.HexToRgba("#8CA0BF"), TextMuted: ColourUtil.HexToRgba("#8CA0BF"),
TextDim: ColourUtil.HexToRgba("#5A6F8F"), TextDim: ColourUtil.HexToRgba("#5A6F8F"),
StatusSuccess: ColourUtil.HexToRgba("#3DDC97"), StatusSuccess: ColourUtil.HexToRgba("#3DDC97"),
StatusDanger: ColourUtil.HexToRgba("#FF5C7A"), StatusDanger: ColourUtil.HexToRgba("#FF5C7A"),
StatusWarning: ColourUtil.HexToRgba("#FFB84A"), StatusWarning: ColourUtil.HexToRgba("#FFB84A"),
StatusInfo: ColourUtil.HexToRgba("#4A90E2") StatusInfo: ColourUtil.HexToRgba("#4A90E2")
), ),
Layout: new ThemeLayout( Layout: new ThemeLayout(
WindowRounding: 6f, ChildRounding: 5f, PopupRounding: 5f, WindowRounding: 6f,
FrameRounding: 4f, GrabRounding: 4f, TabRounding: 4f, ChildRounding: 5f,
ScrollbarRounding: 4f, WindowBorderSize: 1f, FrameBorderSize: 1f PopupRounding: 5f,
FrameRounding: 4f,
GrabRounding: 4f,
TabRounding: 4f,
ScrollbarRounding: 4f,
WindowBorderSize: 1f,
FrameBorderSize: 1f
), ),
Typography: new ThemeTypography(), Typography: new ThemeTypography(),
IsBuiltIn: true, IsBuiltIn: true,
ChatColors: new ThemeChatColors(new Dictionary<HellionChat.Code.ChatType, uint> ChatColors: new ThemeChatColors(
new Dictionary<HellionChat.Code.ChatType, uint>
{ {
// Night Blue — Royal-Blue-Tinte in Party/FC, Bronze-Gold in Yell/ // Night Blue — Royal-Blue-Tinte in Party/FC, Bronze-Gold in Yell/
// Alliance. Channel-identity (Tell-Pink, NN-Lime) bleibt erhalten. // Alliance. Channel-identity (Tell-Pink, NN-Lime) bleibt erhalten.
@@ -71,6 +74,7 @@ internal static class NightBlue
[HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8B070"), [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#E8B070"),
[HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8B070"), [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#E8B070"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#8CA0BF"), [HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#8CA0BF"),
}) }
)
); );
} }
@@ -0,0 +1,80 @@
using HellionChat.Util;
namespace HellionChat.Themes.Builtin;
internal static class SynthwaveSunset
{
public const string Slug = "synthwave-sunset";
public static Theme Build() =>
new(
Slug: Slug,
Name: "Synthwave Sunset",
Author: "Zoe Moon",
Description: "Hot Magenta + Cyan on midnight violet. 80s neon-grid vibes for late-night raids.",
Colors: new ThemeColors(
PrimaryDark: ColourUtil.HexToRgba("#C71585"),
Primary: ColourUtil.HexToRgba("#FF2D95"),
PrimaryLight: ColourUtil.HexToRgba("#FF6BB6"),
PrimaryGlow: ColourUtil.HexToRgba("#FF2D9599"),
AccentDark: ColourUtil.HexToRgba("#0098B8"),
Accent: ColourUtil.HexToRgba("#00F0FF"),
AccentLight: ColourUtil.HexToRgba("#5CFFFE"),
Identity: ColourUtil.HexToRgba("#FF2D95"),
WindowBg: ColourUtil.HexToRgba("#13041F"),
ChildBg: ColourUtil.HexToRgba("#1E0A35"),
FrameBg: ColourUtil.HexToRgba("#2A1247"),
Surface: ColourUtil.HexToRgba("#3A1860"),
SurfaceHover: ColourUtil.HexToRgba("#4A2475"),
Border: ColourUtil.HexToRgba("#FF2D9566"),
TextPrimary: ColourUtil.HexToRgba("#F0DFFF"),
TextMuted: ColourUtil.HexToRgba("#A88BC4"),
TextDim: ColourUtil.HexToRgba("#6F4D8E"),
StatusSuccess: ColourUtil.HexToRgba("#39FF14"),
StatusDanger: ColourUtil.HexToRgba("#FF3838"),
StatusWarning: ColourUtil.HexToRgba("#FFD700"),
StatusInfo: ColourUtil.HexToRgba("#00F0FF")
),
Layout: new ThemeLayout(
WindowRounding: 5f,
ChildRounding: 4f,
PopupRounding: 4f,
FrameRounding: 3f,
GrabRounding: 3f,
TabRounding: 3f,
ScrollbarRounding: 3f,
WindowBorderSize: 1f,
FrameBorderSize: 1f
),
Typography: new ThemeTypography(),
IsBuiltIn: true,
ChatColors: new ThemeChatColors(
new Dictionary<HellionChat.Code.ChatType, uint>
{
// Synthwave Sunset — Magenta dominiert die warmen Channels (Yell/Shout/FC),
// Cyan dominiert die kühlen (Tell/Party). Neon-Akzente für Status-nahe Channels.
[HellionChat.Code.ChatType.Say] = ColourUtil.HexToRgba("#F0DFFF"),
[HellionChat.Code.ChatType.Yell] = ColourUtil.HexToRgba("#FF2D95"),
[HellionChat.Code.ChatType.Shout] = ColourUtil.HexToRgba("#FF6BB6"),
[HellionChat.Code.ChatType.TellIncoming] = ColourUtil.HexToRgba("#00F0FF"),
[HellionChat.Code.ChatType.TellOutgoing] = ColourUtil.HexToRgba("#5CFFFE"),
[HellionChat.Code.ChatType.Party] = ColourUtil.HexToRgba("#5CFFFE"),
[HellionChat.Code.ChatType.Alliance] = ColourUtil.HexToRgba("#FF8C00"),
[HellionChat.Code.ChatType.FreeCompany] = ColourUtil.HexToRgba("#FF2D95"),
[HellionChat.Code.ChatType.NoviceNetwork] = ColourUtil.HexToRgba("#39FF14"),
[HellionChat.Code.ChatType.CrossParty] = ColourUtil.HexToRgba("#5CFFFE"),
[HellionChat.Code.ChatType.Linkshell1] = ColourUtil.HexToRgba("#39FF14"),
[HellionChat.Code.ChatType.Linkshell2] = ColourUtil.HexToRgba("#FF8C00"),
[HellionChat.Code.ChatType.Linkshell3] = ColourUtil.HexToRgba("#FFD700"),
[HellionChat.Code.ChatType.Linkshell4] = ColourUtil.HexToRgba("#00F0FF"),
[HellionChat.Code.ChatType.Linkshell5] = ColourUtil.HexToRgba("#FF6BB6"),
[HellionChat.Code.ChatType.Linkshell6] = ColourUtil.HexToRgba("#FF2D95"),
[HellionChat.Code.ChatType.Linkshell7] = ColourUtil.HexToRgba("#A88BC4"),
[HellionChat.Code.ChatType.Linkshell8] = ColourUtil.HexToRgba("#5CFFFE"),
[HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#FF6BB6"),
[HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#A88BC4"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#A88BC4"),
}
)
);
}
+60
View File
@@ -1,3 +1,5 @@
using HellionChat.Util;
namespace HellionChat.Themes; namespace HellionChat.Themes;
public sealed record Theme( public sealed record Theme(
@@ -10,4 +12,62 @@ public sealed record Theme(
ThemeTypography Typography, ThemeTypography Typography,
bool IsBuiltIn, bool IsBuiltIn,
ThemeChatColors? ChatColors = null ThemeChatColors? ChatColors = null
)
{
// Pre-computed ABGR mirror of ThemeColors so PushGlobal can skip the
// RgbaToAbgr conversion per slot per frame.
public ThemeAbgrCache AbgrCache { get; private set; }
public void RecomputeAbgrCache()
{
AbgrCache = new ThemeAbgrCache(
PrimaryDark: ColourUtil.RgbaToAbgr(Colors.PrimaryDark),
Primary: ColourUtil.RgbaToAbgr(Colors.Primary),
PrimaryLight: ColourUtil.RgbaToAbgr(Colors.PrimaryLight),
PrimaryGlow: ColourUtil.RgbaToAbgr(Colors.PrimaryGlow),
AccentDark: ColourUtil.RgbaToAbgr(Colors.AccentDark),
Accent: ColourUtil.RgbaToAbgr(Colors.Accent),
AccentLight: ColourUtil.RgbaToAbgr(Colors.AccentLight),
Identity: ColourUtil.RgbaToAbgr(Colors.Identity),
WindowBg: ColourUtil.RgbaToAbgr(Colors.WindowBg),
ChildBg: ColourUtil.RgbaToAbgr(Colors.ChildBg),
FrameBg: ColourUtil.RgbaToAbgr(Colors.FrameBg),
Surface: ColourUtil.RgbaToAbgr(Colors.Surface),
SurfaceHover: ColourUtil.RgbaToAbgr(Colors.SurfaceHover),
Border: ColourUtil.RgbaToAbgr(Colors.Border),
TextPrimary: ColourUtil.RgbaToAbgr(Colors.TextPrimary),
TextMuted: ColourUtil.RgbaToAbgr(Colors.TextMuted),
TextDim: ColourUtil.RgbaToAbgr(Colors.TextDim),
StatusSuccess: ColourUtil.RgbaToAbgr(Colors.StatusSuccess),
StatusDanger: ColourUtil.RgbaToAbgr(Colors.StatusDanger),
StatusWarning: ColourUtil.RgbaToAbgr(Colors.StatusWarning),
StatusInfo: ColourUtil.RgbaToAbgr(Colors.StatusInfo)
);
}
}
// Mirrors ThemeColors slot-for-slot. The FillsAll21Slots test pins the
// contract — a new slot without its mirror fails the build.
public readonly record struct ThemeAbgrCache(
uint PrimaryDark,
uint Primary,
uint PrimaryLight,
uint PrimaryGlow,
uint AccentDark,
uint Accent,
uint AccentLight,
uint Identity,
uint WindowBg,
uint ChildBg,
uint FrameBg,
uint Surface,
uint SurfaceHover,
uint Border,
uint TextPrimary,
uint TextMuted,
uint TextDim,
uint StatusSuccess,
uint StatusDanger,
uint StatusWarning,
uint StatusInfo
); );
+3 -7
View File
@@ -2,10 +2,6 @@ using HellionChat.Code;
namespace HellionChat.Themes; namespace HellionChat.Themes;
// Optional pro Theme. Wenn ein Theme ChatColors mitliefert, kann der // Optional per-theme chat colours applied to Configuration.ChatColours on user request.
// User sie per Klick im Themes-Tab auf Configuration.ChatColours anwenden. // Themes without this leave channel colours untouched.
// Ein Theme ohne ChatColors (z.B. chat2-classic) lässt die User-Channel- public sealed record ThemeChatColors(IReadOnlyDictionary<ChatType, uint> Channels);
// Farben unverändert.
public sealed record ThemeChatColors(
IReadOnlyDictionary<ChatType, uint> Channels
);
+1 -6
View File
@@ -1,29 +1,24 @@
namespace HellionChat.Themes; namespace HellionChat.Themes;
// Color-Werte als 0xRRGGBBAA, RgbaToAbgr handled den Byte-Swap zu ImGui. // Colour values as 0xRRGGBBAA RgbaToAbgr handles the byte-swap for ImGui.
public sealed record ThemeColors( public sealed record ThemeColors(
uint PrimaryDark, uint PrimaryDark,
uint Primary, uint Primary,
uint PrimaryLight, uint PrimaryLight,
uint PrimaryGlow, uint PrimaryGlow,
uint AccentDark, uint AccentDark,
uint Accent, uint Accent,
uint AccentLight, uint AccentLight,
uint Identity, uint Identity,
uint WindowBg, uint WindowBg,
uint ChildBg, uint ChildBg,
uint FrameBg, uint FrameBg,
uint Surface, uint Surface,
uint SurfaceHover, uint SurfaceHover,
uint Border, uint Border,
uint TextPrimary, uint TextPrimary,
uint TextMuted, uint TextMuted,
uint TextDim, uint TextDim,
uint StatusSuccess, uint StatusSuccess,
uint StatusDanger, uint StatusDanger,
uint StatusWarning, uint StatusWarning,
+44 -18
View File
@@ -13,8 +13,14 @@ internal static class ThemeJsonLoader
throw new FormatException("Theme JSON is empty"); throw new FormatException("Theme JSON is empty");
JsonDocument doc; JsonDocument doc;
try { doc = JsonDocument.Parse(json); } try
catch (JsonException ex) { throw new FormatException("Theme JSON is not valid JSON", ex); } {
doc = JsonDocument.Parse(json);
}
catch (JsonException ex)
{
throw new FormatException("Theme JSON is not valid JSON", ex);
}
using (doc) using (doc)
{ {
@@ -22,7 +28,9 @@ internal static class ThemeJsonLoader
var schemaVersion = ReadInt(root, "schemaVersion"); var schemaVersion = ReadInt(root, "schemaVersion");
if (schemaVersion != SupportedSchemaVersion) if (schemaVersion != SupportedSchemaVersion)
throw new FormatException($"Unsupported schemaVersion {schemaVersion}; expected {SupportedSchemaVersion}"); throw new FormatException(
$"Unsupported schemaVersion {schemaVersion}; expected {SupportedSchemaVersion}"
);
var slug = ReadString(root, "slug"); var slug = ReadString(root, "slug");
var name = ReadString(root, "name"); var name = ReadString(root, "name");
@@ -33,10 +41,23 @@ internal static class ThemeJsonLoader
var layout = ReadLayout(root.GetProperty("layout")); var layout = ReadLayout(root.GetProperty("layout"));
ThemeChatColors? chatColors = null; ThemeChatColors? chatColors = null;
if (root.TryGetProperty("chatChannels", out var ch) && ch.ValueKind == JsonValueKind.Object) if (
root.TryGetProperty("chatChannels", out var ch)
&& ch.ValueKind == JsonValueKind.Object
)
chatColors = ReadChatColors(ch); chatColors = ReadChatColors(ch);
return new Theme(slug, name, author, description, colors, layout, new ThemeTypography(), IsBuiltIn: false, ChatColors: chatColors); return new Theme(
slug,
name,
author,
description,
colors,
layout,
new ThemeTypography(),
IsBuiltIn: false,
ChatColors: chatColors
);
} }
} }
@@ -45,11 +66,15 @@ internal static class ThemeJsonLoader
var dict = new Dictionary<HellionChat.Code.ChatType, uint>(); var dict = new Dictionary<HellionChat.Code.ChatType, uint>();
foreach (var prop in el.EnumerateObject()) foreach (var prop in el.EnumerateObject())
{ {
// Property-Name ist der ChatType-Name als String (z.B. "Say", "Tell"), // Property name is the ChatType name (e.g. "Say", "Tell"), value is hex like theme colours.
// Value ist Hex wie bei den Theme-Colors. Unbekannte Channel-Names // Unknown channel names are silently skipped for forward-compat with future SE channels.
// werden still übersprungen — Forward-Compat falls SE neue Channels if (
// einführt. !Enum.TryParse<HellionChat.Code.ChatType>(
if (!Enum.TryParse<HellionChat.Code.ChatType>(prop.Name, ignoreCase: true, out var channel)) prop.Name,
ignoreCase: true,
out var channel
)
)
continue; continue;
if (prop.Value.ValueKind != JsonValueKind.String) if (prop.Value.ValueKind != JsonValueKind.String)
continue; continue;
@@ -63,40 +88,41 @@ internal static class ThemeJsonLoader
public static Theme LoadFromFile(string path) public static Theme LoadFromFile(string path)
{ {
var json = File.ReadAllText(path); // FileShare.Read lets concurrent readers and well-behaved editors share
// the handle; atomic-replace editors still raise IOException, caught upstream.
using var stream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
using var reader = new StreamReader(stream);
var json = reader.ReadToEnd();
return LoadFromString(json); return LoadFromString(json);
} }
private static ThemeColors ReadColors(JsonElement el) => new( private static ThemeColors ReadColors(JsonElement el) =>
new(
PrimaryDark: ColourUtil.HexToRgba(ReadString(el, "primaryDark")), PrimaryDark: ColourUtil.HexToRgba(ReadString(el, "primaryDark")),
Primary: ColourUtil.HexToRgba(ReadString(el, "primary")), Primary: ColourUtil.HexToRgba(ReadString(el, "primary")),
PrimaryLight: ColourUtil.HexToRgba(ReadString(el, "primaryLight")), PrimaryLight: ColourUtil.HexToRgba(ReadString(el, "primaryLight")),
PrimaryGlow: ColourUtil.HexToRgba(ReadString(el, "primaryGlow")), PrimaryGlow: ColourUtil.HexToRgba(ReadString(el, "primaryGlow")),
AccentDark: ColourUtil.HexToRgba(ReadString(el, "accentDark")), AccentDark: ColourUtil.HexToRgba(ReadString(el, "accentDark")),
Accent: ColourUtil.HexToRgba(ReadString(el, "accent")), Accent: ColourUtil.HexToRgba(ReadString(el, "accent")),
AccentLight: ColourUtil.HexToRgba(ReadString(el, "accentLight")), AccentLight: ColourUtil.HexToRgba(ReadString(el, "accentLight")),
Identity: ColourUtil.HexToRgba(ReadString(el, "identity")), Identity: ColourUtil.HexToRgba(ReadString(el, "identity")),
WindowBg: ColourUtil.HexToRgba(ReadString(el, "windowBg")), WindowBg: ColourUtil.HexToRgba(ReadString(el, "windowBg")),
ChildBg: ColourUtil.HexToRgba(ReadString(el, "childBg")), ChildBg: ColourUtil.HexToRgba(ReadString(el, "childBg")),
FrameBg: ColourUtil.HexToRgba(ReadString(el, "frameBg")), FrameBg: ColourUtil.HexToRgba(ReadString(el, "frameBg")),
Surface: ColourUtil.HexToRgba(ReadString(el, "surface")), Surface: ColourUtil.HexToRgba(ReadString(el, "surface")),
SurfaceHover: ColourUtil.HexToRgba(ReadString(el, "surfaceHover")), SurfaceHover: ColourUtil.HexToRgba(ReadString(el, "surfaceHover")),
Border: ColourUtil.HexToRgba(ReadString(el, "border")), Border: ColourUtil.HexToRgba(ReadString(el, "border")),
TextPrimary: ColourUtil.HexToRgba(ReadString(el, "textPrimary")), TextPrimary: ColourUtil.HexToRgba(ReadString(el, "textPrimary")),
TextMuted: ColourUtil.HexToRgba(ReadString(el, "textMuted")), TextMuted: ColourUtil.HexToRgba(ReadString(el, "textMuted")),
TextDim: ColourUtil.HexToRgba(ReadString(el, "textDim")), TextDim: ColourUtil.HexToRgba(ReadString(el, "textDim")),
StatusSuccess: ColourUtil.HexToRgba(ReadString(el, "statusSuccess")), StatusSuccess: ColourUtil.HexToRgba(ReadString(el, "statusSuccess")),
StatusDanger: ColourUtil.HexToRgba(ReadString(el, "statusDanger")), StatusDanger: ColourUtil.HexToRgba(ReadString(el, "statusDanger")),
StatusWarning: ColourUtil.HexToRgba(ReadString(el, "statusWarning")), StatusWarning: ColourUtil.HexToRgba(ReadString(el, "statusWarning")),
StatusInfo: ColourUtil.HexToRgba(ReadString(el, "statusInfo")) StatusInfo: ColourUtil.HexToRgba(ReadString(el, "statusInfo"))
); );
private static ThemeLayout ReadLayout(JsonElement el) => new( private static ThemeLayout ReadLayout(JsonElement el) =>
new(
WindowRounding: ReadFloat(el, "windowRounding"), WindowRounding: ReadFloat(el, "windowRounding"),
ChildRounding: ReadFloat(el, "childRounding"), ChildRounding: ReadFloat(el, "childRounding"),
PopupRounding: ReadFloat(el, "popupRounding"), PopupRounding: ReadFloat(el, "popupRounding"),
+1 -1
View File
@@ -1,6 +1,6 @@
namespace HellionChat.Themes; namespace HellionChat.Themes;
// Layout-Werte spiegeln die ImGuiStyleVar-Slots, die HellionStyle pusht. // Layout values mirror the ImGuiStyleVar slots pushed by HellionStyle.
public sealed record ThemeLayout( public sealed record ThemeLayout(
float WindowRounding, float WindowRounding,
float ChildRounding, float ChildRounding,
+47 -14
View File
@@ -7,7 +7,9 @@ public sealed class ThemeRegistry
public const string DefaultSlug = HellionArctic.Slug; public const string DefaultSlug = HellionArctic.Slug;
private readonly Dictionary<string, Theme> _builtIns; private readonly Dictionary<string, Theme> _builtIns;
private readonly Dictionary<string, (Theme Theme, DateTime Stamp)> _customCache = new(StringComparer.OrdinalIgnoreCase); private readonly Dictionary<string, (Theme Theme, DateTime Stamp)> _customCache = new(
StringComparer.OrdinalIgnoreCase
);
private readonly string? _customThemesDir; private readonly string? _customThemesDir;
private Theme _active; private Theme _active;
@@ -24,7 +26,13 @@ public sealed class ThemeRegistry
{ IndigoViolet.Slug, IndigoViolet.Build() }, { IndigoViolet.Slug, IndigoViolet.Build() },
{ ForgeMerchantman.Slug, ForgeMerchantman.Build() }, { ForgeMerchantman.Slug, ForgeMerchantman.Build() },
{ MintGrove.Slug, MintGrove.Build() }, { MintGrove.Slug, MintGrove.Build() },
{ SynthwaveSunset.Slug, SynthwaveSunset.Build() },
}; };
// Centralised so Build() factories stay free of cache plumbing.
foreach (var theme in _builtIns.Values)
theme.RecomputeAbgrCache();
_active = _builtIns[DefaultSlug]; _active = _builtIns[DefaultSlug];
_customThemesDir = customThemesDir; _customThemesDir = customThemesDir;
} }
@@ -33,10 +41,12 @@ public sealed class ThemeRegistry
public Theme Get(string slug) public Theme Get(string slug)
{ {
if (_builtIns.TryGetValue(slug, out var b)) return b; if (_builtIns.TryGetValue(slug, out var b))
return b;
var custom = LoadCustomBySlug(slug); var custom = LoadCustomBySlug(slug);
if (custom != null) return custom; if (custom != null)
return custom;
return _builtIns[DefaultSlug]; return _builtIns[DefaultSlug];
} }
@@ -45,15 +55,32 @@ public sealed class ThemeRegistry
public IEnumerable<Theme> AllCustom() => RefreshCustomCache(); public IEnumerable<Theme> AllCustom() => RefreshCustomCache();
public void Switch(string slug) => _active = Get(slug); public void Switch(string slug)
{
var theme = Get(slug);
// Defensive — ensures any future theme source always gets a populated cache.
theme.RecomputeAbgrCache();
_active = theme;
}
// Custom-Themes werden lazy aus dem Verzeichnis geladen, Cache mit // 0x80070020 = SHARING_VIOLATION, 0x80070021 = LOCK_VIOLATION.
// LastWriteTime-Token. Eine geänderte JSON wird beim nächsten Lookup // Other IO failures are permanent — theme is dropped instead of retried.
// neu eingelesen. internal static bool IsRecoverableFileLock(Exception? ex)
{
if (ex is not IOException io)
return false;
var code = (uint)io.HResult;
return code == 0x80070020u || code == 0x80070021u;
}
// Custom themes are loaded lazily, cached by LastWriteTime.
// A changed JSON is reloaded on the next lookup.
private Theme? LoadCustomBySlug(string slug) private Theme? LoadCustomBySlug(string slug)
{ {
if (_customThemesDir is null) return null; if (_customThemesDir is null)
if (!Directory.Exists(_customThemesDir)) return null; return null;
if (!Directory.Exists(_customThemesDir))
return null;
foreach (var theme in RefreshCustomCache()) foreach (var theme in RefreshCustomCache())
if (string.Equals(theme.Slug, slug, StringComparison.OrdinalIgnoreCase)) if (string.Equals(theme.Slug, slug, StringComparison.OrdinalIgnoreCase))
@@ -81,14 +108,20 @@ public sealed class ThemeRegistry
try try
{ {
theme = ThemeJsonLoader.LoadFromFile(path); theme = ThemeJsonLoader.LoadFromFile(path);
theme.RecomputeAbgrCache();
_customCache[key] = (theme, stamp); _customCache[key] = (theme, stamp);
} }
catch (Exception ex) catch (Exception ex) when (IsRecoverableFileLock(ex))
{
// Editor mid-save: keep last known good, retry on next refresh.
Plugin.Log.Debug(
$"Custom theme {Path.GetFileName(path)} is locked, keeping last known good"
);
if (cached.Theme is not null)
theme = cached.Theme;
}
catch (Exception)
{ {
// Logging passiert in Plugin.cs durch den Aufrufer; hier still
// ignorieren, damit ein einzelnes kaputtes JSON nicht alle
// Custom-Themes blockt.
_ = ex;
continue; continue;
} }
} }
+1 -2
View File
@@ -1,7 +1,6 @@
namespace HellionChat.Themes; namespace HellionChat.Themes;
// Optional pro Theme. v1.1.0 nutzt das nicht aktiv; ist als Erweiterungspunkt // Optional per-theme; reserved as an extension point for future theme slots.
// für zukünftige Theme-Slots vorbereitet.
public sealed record ThemeTypography( public sealed record ThemeTypography(
float? OverrideGlobalFontSizePt = null, float? OverrideGlobalFontSizePt = null,
float? OverrideSymbolsFontSizePt = null float? OverrideSymbolsFontSizePt = null
+15 -52
View File
@@ -1,34 +1,17 @@
namespace HellionChat.Ui; namespace HellionChat.Ui;
/// <summary> // Deterministic hash-based color and icon tinting for Auto-Tell sidebar tabs.
/// Hash-Color-Tinting für Auto-Tell-Tabs in der Sidebar (v1.2.0). // Same tell partner (name+world) always produces the same color and icon across
/// Differenziert Tells visuell ohne dass User pro Tab manuell ein // sessions. Pure string logic, no Dalamud dependency — testable without game refs.
/// Custom-Icon setzen muss. Gleicher Tell-Partner (Name+World) liefert
/// konsistent dieselbe Farbe über Sessions hinweg.
///
/// Kuratierte 12-Farb-Palette aus dem Hellion-Theme-Pool: alle saturiert
/// mid-bright, lesbar gegen Dark-Theme-Backgrounds. Bei realistischen
/// 1-5 parallelen Tells ist Kollisions-Wahrscheinlichkeit gering.
///
/// Reine String-Logik (kein Dalamud-Dep) — testbar im HellionChat.Tests-
/// Projekt das ohne Dalamud-Reference baut.
/// </summary>
internal static class AutoTellTabTint internal static class AutoTellTabTint
{ {
/// <summary> // Fallback for invalid input (empty name or world=0). White matches
/// Fallback bei ungültigem Input (leerer Name, World=0). Standard- // TextPrimary default so the sidebar stays visually consistent.
/// Text-Color (weiß) — passt mit existierendem TextPrimary-Default
/// zusammen, sodass die Sidebar visuell konsistent bleibt.
/// </summary>
public const uint Fallback = 0xFFFFFFFFu; public const uint Fallback = 0xFFFFFFFFu;
/// <summary> // 12 saturated mid-bright colors from the built-in theme pool, readable
/// 12 saturierte mid-bright Farben aus den 5 Built-In-Themes // on dark backgrounds. Collision risk is low at realistic 1-5 active tells.
/// (Hellion-Arctic, Chat2-Klassik, Event-Horizon, Moonlit-Bloom, // RGBA format, matching ColourUtil.RgbaToAbgr convention.
/// Mint-Grove). Reihenfolge ist deterministisch — Hash-Index wählt
/// Farbe per Modulo. RGBA-Format (passt zu ColourUtil.RgbaToAbgr-
/// Konvention im restlichen Code).
/// </summary>
public static readonly IReadOnlyList<uint> Palette = new uint[] public static readonly IReadOnlyList<uint> Palette = new uint[]
{ {
0x00BED2FFu, // Arctic Cyan 0x00BED2FFu, // Arctic Cyan
@@ -45,30 +28,19 @@ internal static class AutoTellTabTint
0xE85D04FFu, // Deep Ember 0xE85D04FFu, // Deep Ember
}; };
/// <summary>
/// Liefert eine konsistente Tint-Color für einen Tell-Partner.
/// Hash basiert auf "Name@World" — Cross-World-Namen kollidieren
/// nur bei Hash-Bucket-Kollision, nicht durch Identitäts-Annahme.
/// </summary>
public static uint For(string name, uint world) public static uint For(string name, uint world)
{ {
if (string.IsNullOrEmpty(name) || world == 0) if (string.IsNullOrEmpty(name) || world == 0)
return Fallback; return Fallback;
// GetHashCode kann negativ sein; Bitmaske auf positive Range // Mask to positive range so modulo always yields a valid index.
// damit Modulo-Division immer einen validen Index liefert.
var key = $"{name}@{world}"; var key = $"{name}@{world}";
var hash = (uint)(key.GetHashCode() & 0x7FFFFFFF); var hash = (uint)(key.GetHashCode() & 0x7FFFFFFF);
return Palette[(int)(hash % Palette.Count)]; return Palette[(int)(hash % Palette.Count)];
} }
/// <summary> // 7 visually distinct FA glyphs that make sense in a tell context.
/// Tell-spezifischer Icon-Pool. 7 visuell distinkte FontAwesome-Glyphen // Excludes cog/comment/users — those read as system or group tabs.
/// die im Tell-Kontext sinnvoll wirken (envelope = Tell-Default, star/
/// heart/bell = personalisiert, bookmark/flag/fire = markiert/wichtig).
/// Bewusst kein cog/comment/users — die wären für System-/Group-Tabs
/// reserviert und würden im Tell-Bereich verwirrend wirken.
/// </summary>
public static readonly IReadOnlyList<string> IconPool = new[] public static readonly IReadOnlyList<string> IconPool = new[]
{ {
"envelope", "envelope",
@@ -80,26 +52,17 @@ internal static class AutoTellTabTint
"fire", "fire",
}; };
/// <summary> // "envelope" matches the tell context better than the old hardcoded "clock".
/// Fallback-Icon bei ungültigem Input. "envelope" passt semantisch zum
/// Tell-Kontext besser als das alte hardcoded "clock".
/// </summary>
public const string IconFallback = "envelope"; public const string IconFallback = "envelope";
/// <summary>
/// Liefert ein konsistentes Icon-Glyph für einen Tell-Partner.
/// Nutzt einen anderen Hash-Bias als For() (Color), damit Icon und
/// Color unabhängig variieren — gibt 7 × 12 = 84 distinct Combinations.
/// </summary>
public static string IconFor(string name, uint world) public static string IconFor(string name, uint world)
{ {
if (string.IsNullOrEmpty(name) || world == 0) if (string.IsNullOrEmpty(name) || world == 0)
return IconFallback; return IconFallback;
// Anderer Hash-Bias als For() (verschiedene Modulo-Basis): wir // Reversed key ("world@name") gives icon and color independent variation
// nutzen "world@name" statt "name@world" damit Icon und Color // so the same tell partner doesn't always get the same color+icon pair.
// nicht synchron variieren. Ohne Bias-Trennung würden alle Tells // 7 icons x 12 colors = 84 distinct combinations.
// mit derselben Color auch dasselbe Icon haben.
var key = $"{world}@{name}"; var key = $"{world}@{name}";
var hash = (uint)(key.GetHashCode() & 0x7FFFFFFF); var hash = (uint)(key.GetHashCode() & 0x7FFFFFFF);
return IconPool[(int)(hash % IconPool.Count)]; return IconPool[(int)(hash % IconPool.Count)];
+68 -99
View File
@@ -1,22 +1,17 @@
using System; using System;
using System.Numerics; using System.Numerics;
using HellionChat.Code;
using HellionChat.Util;
using Dalamud.Bindings.ImGui; using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using HellionChat._Helpers;
using HellionChat.Code;
using HellionChat.Util;
namespace HellionChat.Ui; namespace HellionChat.Ui;
// Hellion Chat — v0.6.0 input bar component for pop-out windows. // Input bar component for pop-out windows. Render() is a stub — the main
// // window input layer stays in ChatLogWindow to avoid a high-risk extract.
// Pragmatischer Refactor-Scope: Render() ist ein leerer Marker-Stub für // RenderCompact() is the only v0.6.0 deliverable; Render() can be filled
// das Hauptfenster — der bestehende Input-Layer in ChatLogWindow bleibt // in a later cycle if needed.
// unangetastet, weil ein 400-Zeilen-Extract aus einem 1926-Zeilen-File
// das v0.6.0-Risiko unverhältnismäßig erhöhen würde. Pop-Outs nutzen
// ausschließlich RenderCompact(), das ist der ganze v0.6.0-Mehrwert.
// Sollte das Hauptfenster selber später eine Compact-Variante brauchen
// (oder das große Extract sich aus anderem Grund lohnen), kann Render()
// in einem späteren Cycle gefüllt werden.
public sealed class ChatInputBar public sealed class ChatInputBar
{ {
private readonly Plugin _plugin; private readonly Plugin _plugin;
@@ -34,24 +29,17 @@ public sealed class ChatInputBar
public InputState State => _state; public InputState State => _state;
public bool IsFocused { get; private set; } public bool IsFocused { get; private set; }
// Stub. v0.6.0 belässt den Hauptfenster-Input wie er ist. // Stub — main window input is handled in ChatLogWindow.
public void Render() public void Render() { }
{
}
// Compact rendering for pop-out windows. // Compact layout for pop-out windows: channel icon button left, text
// input right. Auto-translate is intentionally excluded — the upstream
// popup isn't instanciable per window without a larger refactor, and
// typical pop-out use cases rarely need it. Can be added later if
// tester feedback warrants it.
// //
// v0.6.0 Compact-Layout: Channel-Icon-Button links (Background-Farbe // Channel switching is global via Plugin.Functions.Chat (FFXIV API).
// aus ChatColours), Text-Input rechts daneben. Auto-Translate-Picker // Text buffer and history cursor are independent per pop-out.
// ist bewusst NICHT im Compact-Mode (Spec-Abweichung Layout D → A).
// Rechtfertigung: das Hauptfenster-Auto-Complete-Popup ist nicht ohne
// grossen Refactor pro Window instanzierbar; typische Pop-Out-Use-Cases
// (FC-Greeter, Club-Hostess) brauchen Auto-Translate selten dort.
// Eigene Compact-Auto-Complete-Implementation kann ein späterer
// Cycle nachreichen wenn Tester-Feedback das verlangt.
//
// Channel-Switch wirkt via Plugin.Functions.Chat global (FFXIV-API).
// Pro Pop-Out unabhängig bleiben Text-Buffer und History-Cursor.
public void RenderCompact() public void RenderCompact()
{ {
var tab = _activeTabAccessor(); var tab = _activeTabAccessor();
@@ -65,84 +53,71 @@ public sealed class ChatInputBar
private void DrawCompactInput(Tab tab) private void DrawCompactInput(Tab tab)
{ {
// Input takes the whole remaining width — no auto-translate button
// reserved on the right side in v0.6.0 (see RenderCompact comment).
var inputWidth = ImGui.GetContentRegionAvail().X; var inputWidth = ImGui.GetContentRegionAvail().X;
if (inputWidth < 60f) if (inputWidth < 60f)
inputWidth = 60f; inputWidth = 60f;
ImGui.SetNextItemWidth(inputWidth); ImGui.SetNextItemWidth(inputWidth);
// CallbackHistory wires up Up/Down navigation against the shared // CallbackHistory wires Up/Down navigation to InputHistoryService.
// InputHistoryService. Submit is detected the same way the main // Submit detected via IsItemDeactivated + Enter, not EnterReturnsTrue
// window does it: via IsItemDeactivated + Enter, NOT EnterReturnsTrue // (matches ChatLogWindow behavior).
// (matching v0.5.x ChatLogWindow.cs behavior).
const ImGuiInputTextFlags flags = ImGuiInputTextFlags.CallbackHistory; const ImGuiInputTextFlags flags = ImGuiInputTextFlags.CallbackHistory;
ImGui.InputText($"##chat-compact-input-{tab.Identifier}", ref _state.Buffer, 500, flags, CompactCallback); ImGui.InputText(
$"##chat-compact-input-{tab.Identifier}",
ref _state.Buffer,
500,
flags,
CompactCallback
);
IsFocused = ImGui.IsItemActive(); IsFocused = ImGui.IsItemActive();
if (ImGui.IsItemDeactivated() if (
&& (ImGui.IsKeyDown(ImGuiKey.Enter) || ImGui.IsKeyDown(ImGuiKey.KeypadEnter))) ImGui.IsItemDeactivated()
&& (ImGui.IsKeyDown(ImGuiKey.Enter) || ImGui.IsKeyDown(ImGuiKey.KeypadEnter))
)
{ {
SubmitCompact(tab); SubmitCompact(tab);
} }
} }
private void SubmitCompact(Tab tab) // TEST-MIRROR: ../_Helpers/CompactInputSubmitter.cs
{ private void SubmitCompact(Tab tab) =>
if (string.IsNullOrWhiteSpace(_state.Buffer)) CompactInputSubmitter.TrySubmit(_state, tab, _host.SendChatBoxFromExternal);
return;
var text = _state.Buffer; // History navigation callback. Cursor math delegated to
_state.Buffer = string.Empty; // CompactInputHistoryNavigator; ImGui buffer splice stays here.
_state.HistoryCursor = -1; // TEST-MIRROR: ../_Helpers/CompactInputHistoryNavigator.cs
_host.SendChatBoxFromExternal(tab, text);
}
// History-navigation callback for the compact input. Mirrors the main
// window's logic but operates on _state.HistoryCursor and the shared
// InputHistoryService. Index semantics match v0.5.x InputBacklog:
// 0 = oldest, Count-1 = newest.
private int CompactCallback(scoped ref ImGuiInputTextCallbackData data) private int CompactCallback(scoped ref ImGuiInputTextCallbackData data)
{ {
if (data.EventFlag != ImGuiInputTextFlags.CallbackHistory) if (data.EventFlag != ImGuiInputTextFlags.CallbackHistory)
return 0; return 0;
var prev = _state.HistoryCursor; var direction = data.EventKey switch
switch (data.EventKey)
{ {
case ImGuiKey.UpArrow: ImGuiKey.UpArrow => CompactInputHistoryNavigator.Direction.Up,
switch (_state.HistoryCursor) ImGuiKey.DownArrow => CompactInputHistoryNavigator.Direction.Down,
{ _ => (CompactInputHistoryNavigator.Direction?)null,
case -1: };
var offset = 0; if (direction is null)
if (!string.IsNullOrWhiteSpace(_state.Buffer))
{
InputHistoryService.Push(_state.Buffer);
offset = 1;
}
_state.HistoryCursor = InputHistoryService.Count - 1 - offset;
break;
case > 0:
_state.HistoryCursor--;
break;
}
break;
case ImGuiKey.DownArrow:
if (_state.HistoryCursor != -1)
if (++_state.HistoryCursor >= InputHistoryService.Count)
_state.HistoryCursor = -1;
break;
}
if (prev == _state.HistoryCursor)
return 0; return 0;
var historyStr = InputHistoryService.GetByCursor(_state.HistoryCursor) ?? string.Empty; var (cursor, replacement) = CompactInputHistoryNavigator.Navigate(
data.DeleteChars(0, data.BufTextLen); direction.Value,
data.InsertChars(0, historyStr); _state.HistoryCursor,
_state.Buffer,
() => InputHistoryService.Count,
InputHistoryService.Push,
InputHistoryService.GetByCursor
);
_state.HistoryCursor = cursor;
if (replacement is null)
return 0;
data.DeleteChars(0, data.BufTextLen);
data.InsertChars(0, replacement);
return 0; return 0;
} }
@@ -158,7 +133,7 @@ public sealed class ChatInputBar
var v3 = ColourUtil.RgbaToVector3(rgba); var v3 = ColourUtil.RgbaToVector3(rgba);
var bg = new Vector4(v3.X, v3.Y, v3.Z, 1f); var bg = new Vector4(v3.X, v3.Y, v3.Z, 1f);
// Compute readable foreground — black on bright, white on dark // Black foreground on bright backgrounds, white on dark.
var luminance = 0.2126f * v3.X + 0.7152f * v3.Y + 0.0722f * v3.Z; var luminance = 0.2126f * v3.X + 0.7152f * v3.Y + 0.0722f * v3.Z;
var fg = luminance > 0.55f ? new Vector4(0f, 0f, 0f, 1f) : new Vector4(1f, 1f, 1f, 1f); var fg = luminance > 0.55f ? new Vector4(0f, 0f, 0f, 1f) : new Vector4(1f, 1f, 1f, 1f);
@@ -170,21 +145,19 @@ public sealed class ChatInputBar
using (ImRaii.PushColor(ImGuiCol.ButtonActive, bg)) using (ImRaii.PushColor(ImGuiCol.ButtonActive, bg))
using (ImRaii.PushColor(ImGuiCol.Text, fg)) using (ImRaii.PushColor(ImGuiCol.Text, fg))
{ {
// Single-letter glyph derived from the channel — quick visual cue // Single-letter glyph as a quick visual cue until a proper icon font lands.
// until we have a proper icon font available in the compact bar.
var label = ChannelGlyph(inputType); var label = ChannelGlyph(inputType);
if (ImGui.Button($"{label}##chan-compact", new Vector2(buttonSize, buttonSize)) && tab.Channel is null) if (
ImGui.Button($"{label}##chan-compact", new Vector2(buttonSize, buttonSize))
&& tab.Channel is null
)
ImGui.OpenPopup(popupId); ImGui.OpenPopup(popupId);
} }
if (tab.Channel is not null && ImGui.IsItemHovered()) if (tab.Channel is not null && ImGui.IsItemHovered())
{
ImGui.SetTooltip(Resources.Language.ChatLog_SwitcherDisabled); ImGui.SetTooltip(Resources.Language.ChatLog_SwitcherDisabled);
}
else if (ImGui.IsItemHovered()) else if (ImGui.IsItemHovered())
{
ImGui.SetTooltip(inputType.Name()); ImGui.SetTooltip(inputType.Name());
}
using (var popup = ImRaii.Popup(popupId)) using (var popup = ImRaii.Popup(popupId))
{ {
@@ -198,7 +171,8 @@ public sealed class ChatInputBar
} }
} }
private static string ChannelGlyph(ChatType type) => type switch private static string ChannelGlyph(ChatType type) =>
type switch
{ {
ChatType.Say => "S", ChatType.Say => "S",
ChatType.Yell => "Y", ChatType.Yell => "Y",
@@ -227,17 +201,12 @@ public sealed class ChatInputBar
_ => "?", _ => "?",
}; };
// Forwards a tab-cycle keybind delta to the host so all windows // Forwards a tab-cycle keybind delta to the host (single source of truth).
// navigate the same active-tab pointer (single source of truth). public void HandleKeybindForward(int delta) => _host.ChangeTabDelta(delta);
public void HandleKeybindForward(int delta)
{
_host.ChangeTabDelta(delta);
}
} }
// Per-window input state. Each ChatInputBar instance owns one of these // Per-window input state. Each ChatInputBar owns one so pop-outs and the
// so pop-outs and the main window keep independent buffers and channels // main window keep independent buffers and history cursors.
// (State-Sync-Entscheidung A in the v0.6.0 spec).
public sealed class InputState public sealed class InputState
{ {
public string Buffer = string.Empty; public string Buffer = string.Empty;
File diff suppressed because it is too large Load Diff
+21 -9
View File
@@ -1,23 +1,30 @@
using System.Numerics; using System.Numerics;
using HellionChat.Util; using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using Dalamud.Utility; using Dalamud.Utility;
using Dalamud.Bindings.ImGui; using HellionChat.Util;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
namespace HellionChat.Ui; namespace HellionChat.Ui;
public class CommandHelpWindow : Window { public class CommandHelpWindow : Window
{
private ChatLogWindow LogWindow { get; } private ChatLogWindow LogWindow { get; }
private ReadOnlySeString? CommandDescription { get; set; } private ReadOnlySeString? CommandDescription { get; set; }
internal CommandHelpWindow(ChatLogWindow logWindow) : base("command help##chat2-commandhelp") internal CommandHelpWindow(ChatLogWindow logWindow)
: base("command help##chat2-commandhelp")
{ {
LogWindow = logWindow; LogWindow = logWindow;
Flags = ImGuiWindowFlags.NoSavedSettings | ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoMove | Flags =
ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.AlwaysAutoResize; ImGuiWindowFlags.NoSavedSettings
| ImGuiWindowFlags.NoTitleBar
| ImGuiWindowFlags.NoMove
| ImGuiWindowFlags.NoResize
| ImGuiWindowFlags.NoFocusOnAppearing
| ImGuiWindowFlags.AlwaysAutoResize;
RespectCloseHotkey = false; RespectCloseHotkey = false;
DisableWindowSounds = true; DisableWindowSounds = true;
@@ -31,7 +38,8 @@ public class CommandHelpWindow : Window {
var width = 350; var width = 350;
var scaledWidth = width * ImGuiHelpers.GlobalScale; var scaledWidth = width * ImGuiHelpers.GlobalScale;
var pos = LogWindow.LastWindowPos; var pos = LogWindow.LastWindowPos;
switch (Plugin.Config.CommandHelpSide) { switch (Plugin.Config.CommandHelpSide)
{
case CommandHelpSide.Right: case CommandHelpSide.Right:
pos.X += LogWindow.LastWindowSize.X; pos.X += LogWindow.LastWindowSize.X;
break; break;
@@ -51,7 +59,7 @@ public class CommandHelpWindow : Window {
// coordinate space as Position above; otherwise the help window // coordinate space as Position above; otherwise the help window
// ends up the wrong width at non-100% DPI. // ends up the wrong width at non-100% DPI.
MinimumSize = new Vector2(scaledWidth, 0), MinimumSize = new Vector2(scaledWidth, 0),
MaximumSize = LogWindow.LastWindowSize with { X = scaledWidth } MaximumSize = LogWindow.LastWindowSize with { X = scaledWidth },
}; };
IsOpen = true; IsOpen = true;
@@ -62,6 +70,10 @@ public class CommandHelpWindow : Window {
if (CommandDescription == null) if (CommandDescription == null)
return; return;
LogWindow.DrawChunks(ChunkUtil.ToChunks(CommandDescription.Value.ToDalamudString(), ChunkSource.None, null).ToList()); LogWindow.DrawChunks(
ChunkUtil
.ToChunks(CommandDescription.Value.ToDalamudString(), ChunkSource.None, null)
.ToList()
);
} }
} }
+183 -49
View File
@@ -2,18 +2,18 @@
using System.Globalization; using System.Globalization;
using System.Numerics; using System.Numerics;
using System.Text; using System.Text;
using HellionChat.Code; using Dalamud.Bindings.ImGui;
using HellionChat.Resources; using Dalamud.Game.Text.SeStringHandling.Payloads;
using HellionChat.Util;
using Dalamud.Interface; using Dalamud.Interface;
using Dalamud.Interface.Colors; using Dalamud.Interface.Colors;
using Dalamud.Interface.Components;
using Dalamud.Interface.ImGuiNotification;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using Dalamud.Bindings.ImGui; using HellionChat.Code;
using Dalamud.Game.Text.SeStringHandling.Payloads; using HellionChat.Resources;
using Dalamud.Interface.Components; using HellionChat.Util;
using Dalamud.Interface.ImGuiNotification;
using Lumina.Data.Files; using Lumina.Data.Files;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
using MoreLinq; using MoreLinq;
@@ -56,7 +56,8 @@ public class DbViewer : Window
private bool NeedsScrollReset; private bool NeedsScrollReset;
public DbViewer(Plugin plugin) : base("DBViewer###chat2-dbviewer") public DbViewer(Plugin plugin)
: base("DBViewer###chat2-dbviewer")
{ {
Plugin = plugin; Plugin = plugin;
SelectedChannels = TabsUtil.MostlyPlayer; SelectedChannels = TabsUtil.MostlyPlayer;
@@ -64,24 +65,42 @@ public class DbViewer : Window
DateFormat = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern; DateFormat = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern;
DateTimeFormat = "ddd, dd MMM yyy HH:mm:ss"; DateTimeFormat = "ddd, dd MMM yyy HH:mm:ss";
LastProcessed = (AfterDate, BeforeDate, CurrentPage, OnlyCurrentCharacter, SelectedChannels.Count); LastProcessed = (
AfterDate,
BeforeDate,
CurrentPage,
OnlyCurrentCharacter,
SelectedChannels.Count
);
DateReset(); DateReset();
SizeConstraints = new WindowSizeConstraints SizeConstraints = new WindowSizeConstraints
{ {
MinimumSize = new Vector2(475, 600), MinimumSize = new Vector2(475, 600),
MaximumSize = new Vector2(float.MaxValue, float.MaxValue) MaximumSize = new Vector2(float.MaxValue, float.MaxValue),
}; };
RespectCloseHotkey = false; RespectCloseHotkey = false;
DisableWindowSounds = true; DisableWindowSounds = true;
Plugin.Commands.Register("/hellionView", "Get access to your message history, with simple filter options.", true).Execute += Toggle; Plugin
.Commands.Register(
"/hellionView",
"Get access to your message history, with simple filter options.",
true
)
.Execute += Toggle;
} }
public void Dispose() public void Dispose()
{ {
Plugin.Commands.Register("/hellionView", "Get access to your message history, with simple filter options.", true).Execute -= Toggle; Plugin
.Commands.Register(
"/hellionView",
"Get access to your message history, with simple filter options.",
true
)
.Execute -= Toggle;
} }
private void Toggle(string _, string __) => Toggle(); private void Toggle(string _, string __) => Toggle();
@@ -102,8 +121,21 @@ public class DbViewer : Window
ImGui.SameLine(); ImGui.SameLine();
var spacing = 3.0f * ImGuiHelpers.GlobalScale; var spacing = 3.0f * ImGuiHelpers.GlobalScale;
DateWidget.DatePickerWithInput("##FromDate", 1, ref MinDateString, ref AfterDate, DateFormat); DateWidget.DatePickerWithInput(
DateWidget.DatePickerWithInput("##ToDate", 2, ref MaxDateString, ref BeforeDate, DateFormat, true); "##FromDate",
1,
ref MinDateString,
ref AfterDate,
DateFormat
);
DateWidget.DatePickerWithInput(
"##ToDate",
2,
ref MaxDateString,
ref BeforeDate,
DateFormat,
true
);
ImGui.SameLine(0, spacing); ImGui.SameLine(0, spacing);
@@ -118,7 +150,11 @@ public class DbViewer : Window
ChannelSelection(); ChannelSelection();
var skipText = Language.DbViewer_CharacterOption; var skipText = Language.DbViewer_CharacterOption;
var textLength = ImGui.GetTextLineHeight() + ImGui.CalcTextSize(skipText).X + ImGui.GetStyle().ItemInnerSpacing.X + ImGui.GetStyle().FramePadding.X * 2; var textLength =
ImGui.GetTextLineHeight()
+ ImGui.CalcTextSize(skipText).X
+ ImGui.GetStyle().ItemInnerSpacing.X
+ ImGui.GetStyle().FramePadding.X * 2;
ImGui.SameLine(ImGui.GetContentRegionMax().X - textLength); ImGui.SameLine(ImGui.GetContentRegionMax().X - textLength);
ImGui.Checkbox(skipText, ref OnlyCurrentCharacter); ImGui.Checkbox(skipText, ref OnlyCurrentCharacter);
@@ -139,7 +175,16 @@ public class DbViewer : Window
using (var innerPopup = ImRaii.Popup("InputPathDialog")) using (var innerPopup = ImRaii.Popup("InputPathDialog"))
{ {
if (innerPopup.Success) if (innerPopup.Success)
Plugin.FileDialogManager.OpenFolderDialog(Language.Folder_Selection_Header, (b, s) => { if (b) InputPath = s; }, null, true); Plugin.FileDialogManager.OpenFolderDialog(
Language.Folder_Selection_Header,
(b, s) =>
{
if (b)
InputPath = s;
},
null,
true
);
} }
ImGui.SameLine(0, spacing); ImGui.SameLine(0, spacing);
@@ -157,7 +202,8 @@ public class DbViewer : Window
UserDismissable = false, UserDismissable = false,
InitialDuration = TimeSpan.FromSeconds(10000), InitialDuration = TimeSpan.FromSeconds(10000),
Progress = 0.0f, Progress = 0.0f,
}); }
);
CreateTxtBackup(); CreateTxtBackup();
} }
} }
@@ -165,23 +211,38 @@ public class DbViewer : Window
if (ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenDisabled)) if (ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenDisabled))
ImGui.SetTooltip(Language.Export_Txt_Tooltip); ImGui.SetTooltip(Language.Export_Txt_Tooltip);
// Hellion Chat: the JSON export button used to dump the database in
// the upstream webinterface's wire format. With the webinterface
// removed there is no consumer for that format any more, so the
// button is dropped. The Privacy tab's MessageExporter covers the
// same ground (Markdown / JSON / CSV) with channel and date filters
// and is the supported way to get history out of the plugin.
var width = 350 * ImGuiHelpers.GlobalScale; var width = 350 * ImGuiHelpers.GlobalScale;
var loadingIndicator = IsProcessing && ProcessingStart < Environment.TickCount64; var loadingIndicator = IsProcessing && ProcessingStart < Environment.TickCount64;
ImGui.AlignTextToFramePadding(); ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted(string.Format(Language.DbViewer_Page, CurrentPage, totalPages, Count, loadingIndicator ? Language.DbViewer_LoadingIndicator : "")); ImGui.TextUnformatted(
ImGuiUtil.DrawArrows(ref CurrentPage, 1, totalPages, spacing, tooltipLeft: Language.Page_ArrowLeft_Tooltip, tooltipRight: Language.Page_ArrowRight_Tooltip); string.Format(
Language.DbViewer_Page,
CurrentPage,
totalPages,
Count,
loadingIndicator ? Language.DbViewer_LoadingIndicator : ""
)
);
ImGuiUtil.DrawArrows(
ref CurrentPage,
1,
totalPages,
spacing,
tooltipLeft: Language.Page_ArrowLeft_Tooltip,
tooltipRight: Language.Page_ArrowRight_Tooltip
);
ImGui.SameLine(ImGui.GetContentRegionMax().X - width); ImGui.SameLine(ImGui.GetContentRegionMax().X - width);
ImGui.SetNextItemWidth(width); ImGui.SetNextItemWidth(width);
if (ImGui.InputTextWithHint("##searchbar", Language.DbViewer_SearcHint, ref SimpleSearchTerm, 30)) if (
ImGui.InputTextWithHint(
"##searchbar",
Language.DbViewer_SearcHint,
ref SimpleSearchTerm,
30
)
)
Filtered = Filter(Messages); Filtered = Filter(Messages);
// Third row // Third row
@@ -189,7 +250,17 @@ public class DbViewer : Window
if (DateWidget.Validate(MinimalDate, ref AfterDate, ref BeforeDate)) if (DateWidget.Validate(MinimalDate, ref AfterDate, ref BeforeDate))
DateRefresh(); DateRefresh();
if (!IsProcessing && LastProcessed != (AfterDate, BeforeDate, CurrentPage, OnlyCurrentCharacter, SelectedChannels.Count)) if (
!IsProcessing
&& LastProcessed
!= (
AfterDate,
BeforeDate,
CurrentPage,
OnlyCurrentCharacter,
SelectedChannels.Count
)
)
{ {
// Page hasn't changed, so we reset it back to 1 // Page hasn't changed, so we reset it back to 1
if (LastProcessed.Page == CurrentPage) if (LastProcessed.Page == CurrentPage)
@@ -198,7 +269,13 @@ public class DbViewer : Window
AdjustDates(); AdjustDates();
IsProcessing = true; IsProcessing = true;
ProcessingStart = Environment.TickCount64 + 1_000; // + 1 second ProcessingStart = Environment.TickCount64 + 1_000; // + 1 second
LastProcessed = (AfterDate, BeforeDate, CurrentPage, OnlyCurrentCharacter, SelectedChannels.Count); LastProcessed = (
AfterDate,
BeforeDate,
CurrentPage,
OnlyCurrentCharacter,
SelectedChannels.Count
);
Task.Run(() => Task.Run(() =>
{ {
try try
@@ -208,9 +285,21 @@ public class DbViewer : Window
// We only want to fetch count if this is the first page // We only want to fetch count if this is the first page
if (CurrentPage == 1) if (CurrentPage == 1)
Count = Plugin.MessageManager.Store.CountDateRange(AfterDate, BeforeDate, channels, character); Count = Plugin.MessageManager.Store.CountDateRange(
AfterDate,
BeforeDate,
channels,
character
);
using var rangeMessageEnumerator = Plugin.MessageManager.Store.GetPagedDateRange(AfterDate, BeforeDate, channels, character, CurrentPage - 1); using var rangeMessageEnumerator =
Plugin.MessageManager.Store.GetPagedDateRange(
AfterDate,
BeforeDate,
channels,
character,
CurrentPage - 1
);
Messages = rangeMessageEnumerator.ToArray(); Messages = rangeMessageEnumerator.ToArray();
Filtered = Filter(Messages); Filtered = Filter(Messages);
@@ -231,7 +320,11 @@ public class DbViewer : Window
if (Filtered.IsEmpty) if (Filtered.IsEmpty)
{ {
ImGui.TextUnformatted(SimpleSearchTerm == "" ? Language.DbViewer_Status_NothingFound : Language.DbViewer_Status_NoSearchResult); ImGui.TextUnformatted(
SimpleSearchTerm == ""
? Language.DbViewer_Status_NothingFound
: Language.DbViewer_Status_NoSearchResult
);
return; return;
} }
@@ -245,13 +338,24 @@ public class DbViewer : Window
ImGui.SetScrollY(0.0f); ImGui.SetScrollY(0.0f);
} }
using var table = ImRaii.Table("##messageHistory", 4, ImGuiTableFlags.Borders | ImGuiTableFlags.RowBg | ImGuiTableFlags.Resizable); using var table = ImRaii.Table(
"##messageHistory",
4,
ImGuiTableFlags.Borders | ImGuiTableFlags.RowBg | ImGuiTableFlags.Resizable
);
if (!table.Success) if (!table.Success)
return; return;
var columnWidth = ImGui.CalcTextSize(Language.DbViewer_TableField_Type); var columnWidth = ImGui.CalcTextSize(Language.DbViewer_TableField_Type);
ImGui.TableSetupColumn(Language.DbViewer_TableField_Date, ImGuiTableColumnFlags.WidthFixed | ImGuiTableColumnFlags.NoResize); ImGui.TableSetupColumn(
ImGui.TableSetupColumn(Language.DbViewer_TableField_Type, ImGuiTableColumnFlags.WidthFixed | ImGuiTableColumnFlags.NoResize, columnWidth.X); Language.DbViewer_TableField_Date,
ImGuiTableColumnFlags.WidthFixed | ImGuiTableColumnFlags.NoResize
);
ImGui.TableSetupColumn(
Language.DbViewer_TableField_Type,
ImGuiTableColumnFlags.WidthFixed | ImGuiTableColumnFlags.NoResize,
columnWidth.X
);
ImGui.TableSetupColumn(Language.DbViewer_TableField_Sender); ImGui.TableSetupColumn(Language.DbViewer_TableField_Sender);
ImGui.TableSetupColumn(Language.DbViewer_TableField_Content); ImGui.TableSetupColumn(Language.DbViewer_TableField_Content);
@@ -349,10 +453,18 @@ public class DbViewer : Window
return new ConcurrentStack<Message>(messages.Reverse().OrderByDescending(m => m.Date)); return new ConcurrentStack<Message>(messages.Reverse().OrderByDescending(m => m.Date));
return new ConcurrentStack<Message>( return new ConcurrentStack<Message>(
messages.Reverse().Where(m => messages
ChunkUtil.ToRawString(m.Sender).Contains(SimpleSearchTerm, StringComparison.InvariantCultureIgnoreCase) || .Reverse()
ChunkUtil.ToRawString(m.Content).Contains(SimpleSearchTerm, StringComparison.InvariantCultureIgnoreCase) .Where(m =>
).OrderByDescending(m => m.Date)); ChunkUtil
.ToRawString(m.Sender)
.Contains(SimpleSearchTerm, StringComparison.InvariantCultureIgnoreCase)
|| ChunkUtil
.ToRawString(m.Content)
.Contains(SimpleSearchTerm, StringComparison.InvariantCultureIgnoreCase)
)
.OrderByDescending(m => m.Date)
);
} }
private void DateRefresh() private void DateRefresh()
@@ -386,7 +498,12 @@ public class DbViewer : Window
ulong? character = OnlyCurrentCharacter ? Plugin.PlayerState.ContentId : null; ulong? character = OnlyCurrentCharacter ? Plugin.PlayerState.ContentId : null;
var channels = SelectedChannels.Select(pair => (byte)pair.Key).ToArray(); var channels = SelectedChannels.Select(pair => (byte)pair.Key).ToArray();
var rangeMessageEnumerator = Plugin.MessageManager.Store.GetDateRange(AfterDate, BeforeDate, channels, character); var rangeMessageEnumerator = Plugin.MessageManager.Store.GetDateRange(
AfterDate,
BeforeDate,
channels,
character
);
var messageHistory = rangeMessageEnumerator.ToArray(); var messageHistory = rangeMessageEnumerator.ToArray();
await rangeMessageEnumerator.DisposeAsync(); await rangeMessageEnumerator.DisposeAsync();
@@ -397,28 +514,46 @@ public class DbViewer : Window
var totalCount = filteredHistory.Count; var totalCount = filteredHistory.Count;
var sb = new StringBuilder(); var sb = new StringBuilder();
await using var stream = new StreamWriter(Path.Join(InputPath, $"Chat2_{DateTime.Now:yyyy_dd_M__HH_mm_ss}.txt")); await using var stream = new StreamWriter(
Path.Join(InputPath, $"Chat2_{DateTime.Now:yyyy_dd_M__HH_mm_ss}.txt")
);
var batch = 0; var batch = 0;
foreach (var messages in filteredHistory.Batch(5000)) foreach (var messages in filteredHistory.Batch(5000))
{ {
await Plugin.Framework.RunOnTick(() => await Plugin.Framework.RunOnTick(
() =>
{ {
foreach (var message in messages) foreach (var message in messages)
{ {
if (!Sheets.LogKindSheet.TryGetRow((uint)message.Code.Type, out var logKind)) if (
!Sheets.LogKindSheet.TryGetRow(
(uint)message.Code.Type,
out var logKind
)
)
logKind = Sheets.LogKindSheet.GetRow(10); // default to say logKind = Sheets.LogKindSheet.GetRow(10); // default to say
var rossSender = new ReadOnlySeString(message.SenderSource.Encode()); var rossSender = new ReadOnlySeString(
var rossMessage = new ReadOnlySeString(message.ContentSource.Encode()); message.SenderSource.Encode()
);
var rossMessage = new ReadOnlySeString(
message.ContentSource.Encode()
);
var timestamp = message.Date.ToLocalTime().ToString(DateTimeFormat); var timestamp = message.Date.ToLocalTime().ToString(DateTimeFormat);
var text = Plugin.Evaluator.Evaluate(logKind.Format, [rossSender, rossMessage]).ToString(); var text = Plugin
sb.AppendLine($"[{timestamp}][{message.Code.Type.Name()}] {text}"); .Evaluator.Evaluate(logKind.Format, [rossSender, rossMessage])
.ToString();
sb.AppendLine(
$"[{timestamp}][{message.Code.Type.Name()}] {text}"
);
batch++; batch++;
} }
}, delayTicks: 5); },
delayTicks: 5
);
Notification.Progress = (float)batch / totalCount; Notification.Progress = (float)batch / totalCount;
Notification.Content = $"Exported {batch} of {totalCount} messages"; Notification.Content = $"Exported {batch} of {totalCount} messages";
@@ -447,5 +582,4 @@ public class DbViewer : Window
} }
}); });
} }
} }
+26 -11
View File
@@ -1,10 +1,10 @@
using System.Numerics; using System.Numerics;
using HellionChat.Code; using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Colors; using Dalamud.Interface.Colors;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using FFXIVClientStructs.FFXIV.Client.UI.Agent; using FFXIVClientStructs.FFXIV.Client.UI.Agent;
using Dalamud.Bindings.ImGui; using HellionChat.Code;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
namespace HellionChat.Ui; namespace HellionChat.Ui;
@@ -14,7 +14,8 @@ public class DebuggerWindow : Window, IDisposable
private readonly Plugin Plugin; private readonly Plugin Plugin;
private readonly ChatLogWindow ChatLogWindow; private readonly ChatLogWindow ChatLogWindow;
public DebuggerWindow(Plugin plugin) : base("Debugger###chat2-debugger") public DebuggerWindow(Plugin plugin)
: base("Debugger###chat2-debugger")
{ {
Plugin = plugin; Plugin = plugin;
ChatLogWindow = plugin.ChatLogWindow; ChatLogWindow = plugin.ChatLogWindow;
@@ -22,7 +23,7 @@ public class DebuggerWindow : Window, IDisposable
SizeConstraints = new WindowSizeConstraints SizeConstraints = new WindowSizeConstraints
{ {
MinimumSize = new Vector2(475, 600), MinimumSize = new Vector2(475, 600),
MaximumSize = new Vector2(float.MaxValue, float.MaxValue) MaximumSize = new Vector2(float.MaxValue, float.MaxValue),
}; };
RespectCloseHotkey = false; RespectCloseHotkey = false;
@@ -50,23 +51,37 @@ public class DebuggerWindow : Window, IDisposable
ImGui.TextUnformatted($"Handle Tooltips: {ChatLogWindow.PayloadHandler.HandleTooltips}"); ImGui.TextUnformatted($"Handle Tooltips: {ChatLogWindow.PayloadHandler.HandleTooltips}");
ImGui.TextUnformatted($"Hovered Item: {ChatLogWindow.PayloadHandler.HoveredItem}"); ImGui.TextUnformatted($"Hovered Item: {ChatLogWindow.PayloadHandler.HoveredItem}");
ImGui.TextUnformatted($"Hover Counter: {ChatLogWindow.PayloadHandler.HoverCounter}"); ImGui.TextUnformatted($"Hover Counter: {ChatLogWindow.PayloadHandler.HoverCounter}");
ImGui.TextUnformatted($"Last Hover Counter: {ChatLogWindow.PayloadHandler.LastHoverCounter}"); ImGui.TextUnformatted(
$"Last Hover Counter: {ChatLogWindow.PayloadHandler.LastHoverCounter}"
);
ImGuiHelpers.ScaledDummy(5.0f); ImGuiHelpers.ScaledDummy(5.0f);
ImGui.TextColored(ImGuiColors.DalamudOrange, "Current Tab"); ImGui.TextColored(ImGuiColors.DalamudOrange, "Current Tab");
ImGui.TextUnformatted($"Name: {Plugin.CurrentTab.Name}"); ImGui.TextUnformatted($"Name: {Plugin.CurrentTab.Name}");
ImGui.TextUnformatted($"Channel: {Plugin.CurrentTab.CurrentChannel.Channel.ToChatType().Name()}"); ImGui.TextUnformatted(
ImGui.TextUnformatted($"Tell Target: {Plugin.CurrentTab.CurrentChannel.TellTarget?.ToTargetString() ?? "Null"}"); $"Channel: {Plugin.CurrentTab.CurrentChannel.Channel.ToChatType().Name()}"
);
ImGui.TextUnformatted(
$"Tell Target: {Plugin.CurrentTab.CurrentChannel.TellTarget?.ToTargetString() ?? "Null"}"
);
ImGui.TextUnformatted($"Use Temp? {Plugin.CurrentTab.CurrentChannel.UseTempChannel}"); ImGui.TextUnformatted($"Use Temp? {Plugin.CurrentTab.CurrentChannel.UseTempChannel}");
ImGui.TextUnformatted($"Temp Channel: {Plugin.CurrentTab.CurrentChannel.TempChannel.ToChatType().Name()}"); ImGui.TextUnformatted(
ImGui.TextUnformatted($"Temp Tell Target: {Plugin.CurrentTab.CurrentChannel.TempTellTarget?.ToTargetString() ?? "Null"}"); $"Temp Channel: {Plugin.CurrentTab.CurrentChannel.TempChannel.ToChatType().Name()}"
);
ImGui.TextUnformatted(
$"Temp Tell Target: {Plugin.CurrentTab.CurrentChannel.TempTellTarget?.ToTargetString() ?? "Null"}"
);
ImGui.TextUnformatted($"Name Set? {Plugin.CurrentTab.CurrentChannel.Name.Count > 0}"); ImGui.TextUnformatted($"Name Set? {Plugin.CurrentTab.CurrentChannel.Name.Count > 0}");
ImGui.TextUnformatted($"Name {string.Join(" ", Plugin.CurrentTab.CurrentChannel.Name.Select(c => c.StringValue()))}"); ImGui.TextUnformatted(
$"Name {string.Join(" ", Plugin.CurrentTab.CurrentChannel.Name.Select(c => c.StringValue()))}"
);
ImGuiHelpers.ScaledDummy(5.0f); ImGuiHelpers.ScaledDummy(5.0f);
ImGui.TextColored(ImGuiColors.DalamudOrange, "Vanilla Chat"); ImGui.TextColored(ImGuiColors.DalamudOrange, "Vanilla Chat");
ImGui.TextUnformatted($"Channel: {new ReadOnlySeString(AgentChatLog.Instance()->ChannelLabel).ExtractText()}"); ImGui.TextUnformatted(
$"Channel: {new ReadOnlySeString(AgentChatLog.Instance()->ChannelLabel).ExtractText()}"
);
} }
} }
+37 -13
View File
@@ -1,11 +1,11 @@
using System.Numerics; using System.Numerics;
using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing;
using HellionChat.Code; using HellionChat.Code;
using HellionChat.Privacy; using HellionChat.Privacy;
using HellionChat.Resources; using HellionChat.Resources;
using HellionChat.Util; using HellionChat.Util;
using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing;
using Dalamud.Bindings.ImGui;
namespace HellionChat.Ui; namespace HellionChat.Ui;
@@ -13,7 +13,8 @@ public sealed class FirstRunWizard : Window
{ {
private readonly Plugin Plugin; private readonly Plugin Plugin;
internal FirstRunWizard(Plugin plugin) : base($"{HellionStrings.Wizard_Title}###hellion-firstrun") internal FirstRunWizard(Plugin plugin)
: base($"{HellionStrings.Wizard_Title}###hellion-firstrun")
{ {
Plugin = plugin; Plugin = plugin;
@@ -50,33 +51,54 @@ public sealed class FirstRunWizard : Window
var cardWidth = (avail.X - ImGui.GetStyle().ItemSpacing.X * 2) / 3f; var cardWidth = (avail.X - ImGui.GetStyle().ItemSpacing.X * 2) / 3f;
var cardHeight = avail.Y - ImGui.GetTextLineHeightWithSpacing(); var cardHeight = avail.Y - ImGui.GetTextLineHeightWithSpacing();
DrawCard("privacy-first", cardWidth, cardHeight, DrawCard(
"privacy-first",
cardWidth,
cardHeight,
HellionStrings.Wizard_Profile_PrivacyFirst_Heading, HellionStrings.Wizard_Profile_PrivacyFirst_Heading,
HellionStrings.Wizard_Profile_PrivacyFirst_Description, HellionStrings.Wizard_Profile_PrivacyFirst_Description,
null, null,
HellionStrings.Wizard_Profile_PrivacyFirst_Apply, HellionStrings.Wizard_Profile_PrivacyFirst_Apply,
ApplyPrivacyFirst); ApplyPrivacyFirst
);
ImGui.SameLine(); ImGui.SameLine();
DrawCard("casual", cardWidth, cardHeight, DrawCard(
"casual",
cardWidth,
cardHeight,
HellionStrings.Wizard_Profile_Casual_Heading, HellionStrings.Wizard_Profile_Casual_Heading,
HellionStrings.Wizard_Profile_Casual_Description, HellionStrings.Wizard_Profile_Casual_Description,
null, null,
HellionStrings.Wizard_Profile_Casual_Apply, HellionStrings.Wizard_Profile_Casual_Apply,
ApplyCasual); ApplyCasual
);
ImGui.SameLine(); ImGui.SameLine();
DrawCard("full-history", cardWidth, cardHeight, DrawCard(
"full-history",
cardWidth,
cardHeight,
HellionStrings.Wizard_Profile_FullHistory_Heading, HellionStrings.Wizard_Profile_FullHistory_Heading,
HellionStrings.Wizard_Profile_FullHistory_Description, HellionStrings.Wizard_Profile_FullHistory_Description,
HellionStrings.Wizard_Profile_FullHistory_GdprWarning, HellionStrings.Wizard_Profile_FullHistory_GdprWarning,
HellionStrings.Wizard_Profile_FullHistory_Apply, HellionStrings.Wizard_Profile_FullHistory_Apply,
ApplyFullHistory); ApplyFullHistory
);
} }
private void DrawCard(string id, float width, float height, string heading, string description, string? warning, string buttonLabel, Action onApply) private void DrawCard(
string id,
float width,
float height,
string heading,
string description,
string? warning,
string buttonLabel,
Action onApply
)
{ {
using var child = ImRaii.Child($"##wizard-card-{id}", new Vector2(width, height), true); using var child = ImRaii.Child($"##wizard-card-{id}", new Vector2(width, height), true);
if (!child.Success) if (!child.Success)
@@ -118,8 +140,10 @@ public sealed class FirstRunWizard : Window
Plugin.Config.RetentionEnabled = true; Plugin.Config.RetentionEnabled = true;
Plugin.Config.RetentionDefaultDays = 30; Plugin.Config.RetentionDefaultDays = 30;
Plugin.Config.RetentionPerChannelDays = Plugin.Config.RetentionPerChannelDays = PrivacyDefaults.DefaultRetentionDays.ToDictionary(
PrivacyDefaults.DefaultRetentionDays.ToDictionary(p => p.Key, p => p.Value); p => p.Key,
p => p.Value
);
} }
private void ApplyCasual() private void ApplyCasual()
+70 -80
View File
@@ -1,67 +1,53 @@
using HellionChat.Themes;
using HellionChat.Util;
using Dalamud.Bindings.ImGui; using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using HellionChat.Themes;
using HellionChat.Util;
namespace HellionChat.Ui; namespace HellionChat.Ui;
/// <summary> // Theme-driven ImGui style override. PushGlobal is pushed once per frame
/// ImGui style override for Hellion Chat. v1.1.0 ist die Engine // in Plugin.Draw and drives every Hellion-rendered window.
/// theme-getrieben: PushGlobal nimmt eine Theme-Instance + Window-
/// Opacity, die gesamten Color- und Style-Slots werden aus dem Theme
/// gelesen statt aus einer fixen Konstanten-Tabelle.
/// </summary>
internal static class HellionStyle internal static class HellionStyle
{ {
/// <summary> // Local color stack for the active theme. Use inside a
/// Local color stack auf Basis des aktiven Themes. Cheap. Use inside a // `using var _ = HellionStyle.Push(theme);` block.
/// `using var _ = HellionStyle.Push(theme);` block.
/// </summary>
internal static IDisposable Push(Theme theme) internal static IDisposable Push(Theme theme)
{ {
var c = theme.Colors; var a = theme.AbgrCache;
var stack = new StackHandle(); var stack = new StackHandle();
stack.PushColor(ImGuiCol.Button, c.Primary); stack.PushColorAbgr(ImGuiCol.Button, a.Primary);
stack.PushColor(ImGuiCol.ButtonHovered, c.PrimaryLight); stack.PushColorAbgr(ImGuiCol.ButtonHovered, a.PrimaryLight);
stack.PushColor(ImGuiCol.ButtonActive, c.PrimaryDark); stack.PushColorAbgr(ImGuiCol.ButtonActive, a.PrimaryDark);
stack.PushColor(ImGuiCol.FrameBg, c.FrameBg); stack.PushColorAbgr(ImGuiCol.FrameBg, a.FrameBg);
stack.PushColor(ImGuiCol.FrameBgHovered, c.SurfaceHover); stack.PushColorAbgr(ImGuiCol.FrameBgHovered, a.SurfaceHover);
stack.PushColor(ImGuiCol.FrameBgActive, c.Surface); stack.PushColorAbgr(ImGuiCol.FrameBgActive, a.Surface);
stack.PushColor(ImGuiCol.Border, c.Border); stack.PushColorAbgr(ImGuiCol.Border, a.Border);
stack.PushColor(ImGuiCol.Header, c.Surface); stack.PushColorAbgr(ImGuiCol.Header, a.Surface);
stack.PushColor(ImGuiCol.HeaderHovered, c.SurfaceHover); stack.PushColorAbgr(ImGuiCol.HeaderHovered, a.SurfaceHover);
stack.PushColor(ImGuiCol.HeaderActive, c.Identity); stack.PushColorAbgr(ImGuiCol.HeaderActive, a.Identity);
stack.PushColor(ImGuiCol.CheckMark, c.Primary); stack.PushColorAbgr(ImGuiCol.CheckMark, a.Primary);
stack.PushColor(ImGuiCol.SliderGrab, c.Primary); stack.PushColorAbgr(ImGuiCol.SliderGrab, a.Primary);
stack.PushColor(ImGuiCol.SliderGrabActive, c.PrimaryLight); stack.PushColorAbgr(ImGuiCol.SliderGrabActive, a.PrimaryLight);
return stack; return stack;
} }
/// <summary> // Global color and style stack pushed once per frame.
/// Global color and style-variable stack pushed once per frame in // windowOpacity: window background alpha (0.5-1.0).
/// Plugin.Draw. Drives every Hellion-rendered window from the active
/// theme's palette and layout values.
/// </summary>
/// <param name="theme">Active theme from ThemeRegistry.</param>
/// <param name="windowOpacity">Window background alpha (0.51.0).</param>
internal static IDisposable PushGlobal(Theme theme, float windowOpacity = 1.0f) internal static IDisposable PushGlobal(Theme theme, float windowOpacity = 1.0f)
{ {
var c = theme.Colors; var c = theme.Colors;
var l = theme.Layout; var l = theme.Layout;
var a = theme.AbgrCache;
var stack = new StackHandle(); var stack = new StackHandle();
var alphaByte = (uint)Math.Clamp((int)(windowOpacity * 255f), 0x55, 0xFF); var alphaByte = (uint)Math.Clamp((int)(windowOpacity * 255f), 0x55, 0xFF);
var windowBgWithAlpha = (c.WindowBg & 0xFFFFFF00u) | alphaByte; var windowBgWithAlpha = (c.WindowBg & 0xFFFFFF00u) | alphaByte;
// ChildBg-Alpha: Sub-Bereiche (Tab-Sidebar, Message-Area, Input-Bar) // ChildBg alpha: child areas rendered inside ChatLogWindow would
// werden im ChatLog-Window als BeginChild gezeichnet. Würde der ChildBg // multiply their alpha with WindowBg, making 50% opacity appear
// mit dem gleichen Alpha wie WindowBg gerendert, multiplizieren sich // ~75% solid. At full opacity the theme's alpha is preserved; below
// die Layer (1 - (1-α)² Deckung), und 50 % WindowOpacity kommt mit // it ChildBg goes fully transparent so only WindowBg sets the final
// 75 % Deckung im Child-Bereich an — das Fenster wirkt solider als der // coverage.
// Slider verspricht. Bei voller Opacity bleibt der Theme-Akzent
// erhalten (Theme-eigene Alpha-Komponente, i.d.R. FF); sobald der User
// Transparenz zieht, wird ChildBg vollständig durchsichtig damit nur
// der WindowBg-Layer die finale Deckung bestimmt.
var childBgAlpha = windowOpacity >= 0.999f ? (c.ChildBg & 0xFFu) : 0u; var childBgAlpha = windowOpacity >= 0.999f ? (c.ChildBg & 0xFFu) : 0u;
var childBgWithAlpha = (c.ChildBg & 0xFFFFFF00u) | childBgAlpha; var childBgWithAlpha = (c.ChildBg & 0xFFFFFF00u) | childBgAlpha;
@@ -76,60 +62,61 @@ internal static class HellionStyle
stack.PushStyleVar(ImGuiStyleVar.WindowBorderSize, l.WindowBorderSize); stack.PushStyleVar(ImGuiStyleVar.WindowBorderSize, l.WindowBorderSize);
stack.PushStyleVar(ImGuiStyleVar.FrameBorderSize, l.FrameBorderSize); stack.PushStyleVar(ImGuiStyleVar.FrameBorderSize, l.FrameBorderSize);
// Surfaces // Surfaces — WindowBg/ChildBg use opacity-modulated values (RGBA path);
// everything else reads from the pre-computed ABGR cache.
stack.PushColor(ImGuiCol.WindowBg, windowBgWithAlpha); stack.PushColor(ImGuiCol.WindowBg, windowBgWithAlpha);
stack.PushColor(ImGuiCol.ChildBg, childBgWithAlpha); stack.PushColor(ImGuiCol.ChildBg, childBgWithAlpha);
stack.PushColor(ImGuiCol.PopupBg, c.ChildBg); stack.PushColorAbgr(ImGuiCol.PopupBg, a.ChildBg);
stack.PushColor(ImGuiCol.Border, c.Border); stack.PushColorAbgr(ImGuiCol.Border, a.Border);
stack.PushColor(ImGuiCol.BorderShadow, 0u); stack.PushColorAbgr(ImGuiCol.BorderShadow, 0u);
// Frames // Frames
stack.PushColor(ImGuiCol.FrameBg, c.FrameBg); stack.PushColorAbgr(ImGuiCol.FrameBg, a.FrameBg);
stack.PushColor(ImGuiCol.FrameBgHovered, c.SurfaceHover); stack.PushColorAbgr(ImGuiCol.FrameBgHovered, a.SurfaceHover);
stack.PushColor(ImGuiCol.FrameBgActive, c.Surface); stack.PushColorAbgr(ImGuiCol.FrameBgActive, a.Surface);
// Title bars // Title bars
stack.PushColor(ImGuiCol.TitleBg, c.WindowBg); stack.PushColorAbgr(ImGuiCol.TitleBg, a.WindowBg);
stack.PushColor(ImGuiCol.TitleBgActive, c.Identity); stack.PushColorAbgr(ImGuiCol.TitleBgActive, a.Identity);
stack.PushColor(ImGuiCol.TitleBgCollapsed, c.WindowBg); stack.PushColorAbgr(ImGuiCol.TitleBgCollapsed, a.WindowBg);
// Buttons // Buttons
stack.PushColor(ImGuiCol.Button, c.Primary); stack.PushColorAbgr(ImGuiCol.Button, a.Primary);
stack.PushColor(ImGuiCol.ButtonHovered, c.PrimaryLight); stack.PushColorAbgr(ImGuiCol.ButtonHovered, a.PrimaryLight);
stack.PushColor(ImGuiCol.ButtonActive, c.PrimaryDark); stack.PushColorAbgr(ImGuiCol.ButtonActive, a.PrimaryDark);
// Headers / selectables // Headers / selectables
stack.PushColor(ImGuiCol.Header, c.Surface); stack.PushColorAbgr(ImGuiCol.Header, a.Surface);
stack.PushColor(ImGuiCol.HeaderHovered, c.SurfaceHover); stack.PushColorAbgr(ImGuiCol.HeaderHovered, a.SurfaceHover);
stack.PushColor(ImGuiCol.HeaderActive, c.Identity); stack.PushColorAbgr(ImGuiCol.HeaderActive, a.Identity);
// Tabs // Tabs
stack.PushColor(ImGuiCol.Tab, c.FrameBg); stack.PushColorAbgr(ImGuiCol.Tab, a.FrameBg);
stack.PushColor(ImGuiCol.TabHovered, c.PrimaryLight); stack.PushColorAbgr(ImGuiCol.TabHovered, a.PrimaryLight);
stack.PushColor(ImGuiCol.TabActive, c.Identity); stack.PushColorAbgr(ImGuiCol.TabActive, a.Identity);
stack.PushColor(ImGuiCol.TabUnfocused, c.ChildBg); stack.PushColorAbgr(ImGuiCol.TabUnfocused, a.ChildBg);
stack.PushColor(ImGuiCol.TabUnfocusedActive, c.PrimaryDark); stack.PushColorAbgr(ImGuiCol.TabUnfocusedActive, a.PrimaryDark);
// Scrollbar // Scrollbar
stack.PushColor(ImGuiCol.ScrollbarBg, c.WindowBg); stack.PushColorAbgr(ImGuiCol.ScrollbarBg, a.WindowBg);
stack.PushColor(ImGuiCol.ScrollbarGrab, c.Surface); stack.PushColorAbgr(ImGuiCol.ScrollbarGrab, a.Surface);
stack.PushColor(ImGuiCol.ScrollbarGrabHovered, c.AccentLight); stack.PushColorAbgr(ImGuiCol.ScrollbarGrabHovered, a.AccentLight);
stack.PushColor(ImGuiCol.ScrollbarGrabActive, c.Accent); stack.PushColorAbgr(ImGuiCol.ScrollbarGrabActive, a.Accent);
// Resize grip // Resize grip
stack.PushColor(ImGuiCol.ResizeGrip, c.FrameBg); stack.PushColorAbgr(ImGuiCol.ResizeGrip, a.FrameBg);
stack.PushColor(ImGuiCol.ResizeGripHovered, c.AccentLight); stack.PushColorAbgr(ImGuiCol.ResizeGripHovered, a.AccentLight);
stack.PushColor(ImGuiCol.ResizeGripActive, c.Accent); stack.PushColorAbgr(ImGuiCol.ResizeGripActive, a.Accent);
// Check mark + slider grab // Check mark + slider grab
stack.PushColor(ImGuiCol.CheckMark, c.Primary); stack.PushColorAbgr(ImGuiCol.CheckMark, a.Primary);
stack.PushColor(ImGuiCol.SliderGrab, c.Primary); stack.PushColorAbgr(ImGuiCol.SliderGrab, a.Primary);
stack.PushColor(ImGuiCol.SliderGrabActive, c.PrimaryLight); stack.PushColorAbgr(ImGuiCol.SliderGrabActive, a.PrimaryLight);
// Separator // Separator
stack.PushColor(ImGuiCol.Separator, c.Border); stack.PushColorAbgr(ImGuiCol.Separator, a.Border);
stack.PushColor(ImGuiCol.SeparatorHovered, c.PrimaryLight); stack.PushColorAbgr(ImGuiCol.SeparatorHovered, a.PrimaryLight);
stack.PushColor(ImGuiCol.SeparatorActive, c.Primary); stack.PushColorAbgr(ImGuiCol.SeparatorActive, a.Primary);
return stack; return stack;
} }
@@ -138,11 +125,14 @@ internal static class HellionStyle
{ {
private readonly List<IDisposable> _items = new(64); private readonly List<IDisposable> _items = new(64);
internal void PushColor(ImGuiCol slot, uint rgba) internal void PushColor(ImGuiCol slot, uint rgba) =>
=> _items.Add(ImRaii.PushColor(slot, ColourUtil.RgbaToAbgr(rgba))); _items.Add(ImRaii.PushColor(slot, ColourUtil.RgbaToAbgr(rgba)));
internal void PushStyleVar(ImGuiStyleVar var, float value) internal void PushColorAbgr(ImGuiCol slot, uint abgr) =>
=> _items.Add(ImRaii.PushStyle(var, value)); _items.Add(ImRaii.PushColor(slot, abgr));
internal void PushStyleVar(ImGuiStyleVar var, float value) =>
_items.Add(ImRaii.PushStyle(var, value));
public void Dispose() public void Dispose()
{ {
+48 -14
View File
@@ -1,16 +1,16 @@
using System.Numerics; using System.Numerics;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using HellionChat.Code; using Dalamud.Bindings.ImGui;
using HellionChat.Resources;
using HellionChat.Util;
using Dalamud.Game.Text; using Dalamud.Game.Text;
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using Dalamud.Bindings.ImGui; using HellionChat.Code;
using HellionChat.Resources;
using HellionChat.Util;
namespace HellionChat.Ui; namespace HellionChat.Ui;
@@ -30,12 +30,18 @@ public partial class InputPreview : Window
internal int SelectedCursorPos = -1; internal int SelectedCursorPos = -1;
internal InputPreview(ChatLogWindow logWindow) : base("##chat2-inputpreview") internal InputPreview(ChatLogWindow logWindow)
: base("##chat2-inputpreview")
{ {
LogWindow = logWindow; LogWindow = logWindow;
Flags = ImGuiWindowFlags.NoSavedSettings | ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoMove | Flags =
ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.NoScrollbar; ImGuiWindowFlags.NoSavedSettings
| ImGuiWindowFlags.NoTitleBar
| ImGuiWindowFlags.NoMove
| ImGuiWindowFlags.NoResize
| ImGuiWindowFlags.NoFocusOnAppearing
| ImGuiWindowFlags.NoScrollbar;
RespectCloseHotkey = false; RespectCloseHotkey = false;
DisableWindowSounds = true; DisableWindowSounds = true;
@@ -49,7 +55,10 @@ public partial class InputPreview : Window
Plugin.Framework.Update -= UpdateConditionCheck; Plugin.Framework.Update -= UpdateConditionCheck;
} }
private bool ValidDraw => !string.IsNullOrEmpty(LogWindow.Chat) && LogWindow.Chat.Length >= Plugin.Config.PreviewMinimum; private bool ValidDraw =>
!string.IsNullOrEmpty(LogWindow.Chat)
&& LogWindow.Chat.Length >= Plugin.Config.PreviewMinimum;
private void UpdateConditionCheck(IFramework framework) private void UpdateConditionCheck(IFramework framework)
{ {
Drawing = ValidDraw; Drawing = ValidDraw;
@@ -70,7 +79,9 @@ public partial class InputPreview : Window
var bytes = Encoding.UTF8.GetBytes(LogWindow.Chat.Trim()); var bytes = Encoding.UTF8.GetBytes(LogWindow.Chat.Trim());
AutoTranslate.ReplaceWithPayload(ref bytes); AutoTranslate.ReplaceWithPayload(ref bytes);
var chunks = ChunkUtil.ToChunks(SeString.Parse(bytes), ChunkSource.Content, ChatType.Say).ToList(); var chunks = ChunkUtil
.ToChunks(SeString.Parse(bytes), ChunkSource.Content, ChatType.Say)
.ToList();
PreviewMessage = Message.FakeMessage(chunks, new ChatCode(XivChatType.Say, 0, 0)); PreviewMessage = Message.FakeMessage(chunks, new ChatCode(XivChatType.Say, 0, 0));
PreviewMessage.DecodeTextParam(); PreviewMessage.DecodeTextParam();
} }
@@ -79,7 +90,9 @@ public partial class InputPreview : Window
internal bool IsDrawable => ValidDraw && HasEvaluation; internal bool IsDrawable => ValidDraw && HasEvaluation;
private static bool IsWindowMode => Plugin.Config.PreviewPosition is PreviewPosition.Top or PreviewPosition.Bottom; private static bool IsWindowMode =>
Plugin.Config.PreviewPosition is PreviewPosition.Top or PreviewPosition.Bottom;
public override bool DrawConditions() public override bool DrawConditions()
{ {
return IsWindowMode && IsDrawable; return IsWindowMode && IsDrawable;
@@ -96,7 +109,11 @@ public partial class InputPreview : Window
{ {
PreviewPosition.Top => pos.Y - PreviewHeight, PreviewPosition.Top => pos.Y - PreviewHeight,
PreviewPosition.Bottom => pos.Y + size.Y, PreviewPosition.Bottom => pos.Y + size.Y,
_ => throw new ArgumentOutOfRangeException(nameof(Plugin.Config.PreviewPosition), Plugin.Config.PreviewPosition, null) _ => throw new ArgumentOutOfRangeException(
nameof(Plugin.Config.PreviewPosition),
Plugin.Config.PreviewPosition,
null
),
}; };
Position = pos with { Y = y }; Position = pos with { Y = y };
@@ -141,7 +158,12 @@ public partial class InputPreview : Window
} }
} }
private void DrawChunksPreview(IReadOnlyList<Chunk> chunks, PayloadHandler? handler = null, float lineWidth = 0f, int unique = 0) private void DrawChunksPreview(
IReadOnlyList<Chunk> chunks,
PayloadHandler? handler = null,
float lineWidth = 0f,
int unique = 0
)
{ {
CursorPosition = 0; CursorPosition = 0;
@@ -168,7 +190,12 @@ public partial class InputPreview : Window
} }
} }
private void DrawChunkPreview(Chunk chunk, PayloadHandler? handler = null, float lineWidth = 0f, int unique = 0) private void DrawChunkPreview(
Chunk chunk,
PayloadHandler? handler = null,
float lineWidth = 0f,
int unique = 0
)
{ {
if (chunk is IconChunk icon) if (chunk is IconChunk icon)
{ {
@@ -248,7 +275,14 @@ public partial class InputPreview : Window
var letterSize = ImGui.CalcTextSize(letter.ToString()); var letterSize = ImGui.CalcTextSize(letter.ToString());
CursorPosition++; CursorPosition++;
if (ImGui.Selectable($"{letter}##{CursorPosition + unique}", false, ImGuiSelectableFlags.None, letterSize)) if (
ImGui.Selectable(
$"{letter}##{CursorPosition + unique}",
false,
ImGuiSelectableFlags.None,
letterSize
)
)
{ {
SelectedCursorPos = CursorPosition; SelectedCursorPos = CursorPosition;
LogWindow.FocusedPreview = true; LogWindow.FocusedPreview = true;
+52 -63
View File
@@ -1,8 +1,8 @@
using System.Numerics; using System.Numerics;
using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Style; using Dalamud.Interface.Style;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using Dalamud.Bindings.ImGui;
namespace HellionChat.Ui; namespace HellionChat.Ui;
@@ -12,22 +12,19 @@ internal class Popout : Window
private readonly Tab Tab; private readonly Tab Tab;
private readonly int Idx; private readonly int Idx;
private long FrameTime; // set every frame private long FrameTime;
private long LastActivityTime = Environment.TickCount64; private long LastActivityTime = Environment.TickCount64;
// v0.6.0 — optional input bar inside the pop-out window. Lazy-allocated // Optional input bar inside the pop-out. Lazy-allocated when enabled,
// when the user enables Tab.PopOutInputEnabled and torn down when the // torn down on toggle-off (buffer discarded intentionally).
// toggle is turned off (independent text buffer is intentionally
// discarded — see v0.6.0 spec edge-case P1).
public ChatInputBar? InputBar { get; private set; } public ChatInputBar? InputBar { get; private set; }
public bool HasFocusedInputBar => InputBar?.IsFocused ?? false; public bool HasFocusedInputBar => InputBar?.IsFocused ?? false;
// Hellion Chat — v0.6.1 expose just the tab identifier (not the whole Tab // Exposed so AutoTellTabsService can locate this window during LRU eviction.
// reference) so AutoTellTabsService.DropOldestTempTab can locate the
// matching pop-out window when an LRU temp tab gets evicted.
internal Guid TabIdentifier => Tab.Identifier; internal Guid TabIdentifier => Tab.Identifier;
public Popout(ChatLogWindow chatLogWindow, Tab tab, int idx) : base($"{tab.Name}##popout") public Popout(ChatLogWindow chatLogWindow, Tab tab, int idx)
: base($"{tab.Name}##popout")
{ {
ChatLogWindow = chatLogWindow; ChatLogWindow = chatLogWindow;
Tab = tab; Tab = tab;
@@ -39,12 +36,9 @@ internal class Popout : Window
IsOpen = true; IsOpen = true;
RespectCloseHotkey = false; RespectCloseHotkey = false;
DisableWindowSounds = true; DisableWindowSounds = true;
// v1.2.1 — KEIN AllowBackgroundBlur. Pop-Outs werden vom User häufig // AllowBackgroundBlur is intentionally off: Dalamud blurs the entire
// im Dalamud-Tab-Container mit anderen Plugin-Windows kombiniert; in // tab container, not just this window, which would affect adjacent plugins.
// dem Render-Pfad blurt Dalamud den gesamten Container, nicht nur // Users can enable blur per-window via the Dalamud hamburger menu.
// das Pop-Out — würde die Tab-Bar oben und benachbarte Plugins
// mitziehen. Wer Blur in Pop-Outs will, kann ihn via Dalamud-
// Hamburger-Menü pro Window selbst aktivieren.
} }
public override void PreOpenCheck() public override void PreOpenCheck()
@@ -59,13 +53,16 @@ internal class Popout : Window
if (Tab.IndependentHide ? HideStateCheck() : ChatLogWindow.IsHidden) if (Tab.IndependentHide ? HideStateCheck() : ChatLogWindow.IsHidden)
return false; return false;
if (!Plugin.Config.HideWhenInactive || (!Plugin.Config.InactivityHideActiveDuringBattle && Plugin.InBattle) || !Tab.UnhideOnActivity) if (
!Plugin.Config.HideWhenInactive
|| (!Plugin.Config.InactivityHideActiveDuringBattle && Plugin.InBattle)
|| !Tab.UnhideOnActivity
)
{ {
LastActivityTime = FrameTime; LastActivityTime = FrameTime;
return true; return true;
} }
// Activity in the tab, this popout window, or the main chat log window.
var lastActivityTime = Math.Max(Tab.LastActivity, LastActivityTime); var lastActivityTime = Math.Max(Tab.LastActivity, LastActivityTime);
lastActivityTime = Math.Max(lastActivityTime, ChatLogWindow.LastActivityTime); lastActivityTime = Math.Max(lastActivityTime, ChatLogWindow.LastActivityTime);
return FrameTime - lastActivityTime <= 1000 * Plugin.Config.InactivityHideTimeout; return FrameTime - lastActivityTime <= 1000 * Plugin.Config.InactivityHideTimeout;
@@ -73,10 +70,8 @@ internal class Popout : Window
public override void PreDraw() public override void PreDraw()
{ {
// Hellion Chat v1.1.0+ — Theme-Engine ist Source-of-Truth, kein // Theme engine pushes the active theme globally in Plugin.Draw;
// zusätzlicher Dalamud-StyleModel-Override mehr pro Window. Plugin.Draw // pop-outs draw consistently without per-window overrides.
// pusht das aktive Hellion-Theme global; Pop-Out zeichnet sich damit
// konsistent zum Haupt-Chat-Window.
Flags = ImGuiWindowFlags.None; Flags = ImGuiWindowFlags.None;
if (!Plugin.Config.ShowPopOutTitleBar) if (!Plugin.Config.ShowPopOutTitleBar)
Flags |= ImGuiWindowFlags.NoTitleBar; Flags |= ImGuiWindowFlags.NoTitleBar;
@@ -87,19 +82,10 @@ internal class Popout : Window
if (!Tab.CanResize) if (!Tab.CanResize)
Flags |= ImGuiWindowFlags.NoResize; Flags |= ImGuiWindowFlags.NoResize;
// Idx may point past the end if PopOutDocked was resized (e.g., a tab // Guard against Idx pointing past the end if PopOutDocked was resized mid-frame.
// dropped) between the AddPopOutsToDraw() snapshot and this frame.
// Guard the read so we don't index into stale state.
if (Idx >= 0 && Idx < ChatLogWindow.PopOutDocked.Count && !ChatLogWindow.PopOutDocked[Idx]) if (Idx >= 0 && Idx < ChatLogWindow.PopOutDocked.Count && !ChatLogWindow.PopOutDocked[Idx])
{ {
if (Tab.IndependentOpacity) BgAlpha = Tab.IndependentOpacity ? Tab.Opacity / 100f : Plugin.Config.WindowOpacity;
{
BgAlpha = Tab.Opacity / 100f;
}
else
{
BgAlpha = Plugin.Config.WindowOpacity;
}
} }
} }
@@ -113,24 +99,15 @@ internal class Popout : Window
ImGui.Separator(); ImGui.Separator();
} }
// v0.6.0 — one-time hint banner explaining the new pop-out input
// feature. Shown once per user; "Got it" or "Open settings"
// dismisses it and persists the flag.
var hintBannerHeight = DrawHintBannerIfNeeded(); var hintBannerHeight = DrawHintBannerIfNeeded();
// v0.6.0 — pop-out optional input bar. Reserve height first so the // Toggle-OFF resets InputBar so the next toggle-ON starts with a fresh buffer.
// message log draws into the right region; only shown when the
// global master switch is on. Toggle-OFF resets InputBar so the
// next toggle-ON gives a fresh buffer (no stale text persists).
var inputEnabled = Plugin.Config.PopOutInputEnabled; var inputEnabled = Plugin.Config.PopOutInputEnabled;
if (!inputEnabled && InputBar != null) if (!inputEnabled && InputBar != null)
{
InputBar = null; InputBar = null;
}
if (inputEnabled) if (inputEnabled)
{
InputBar ??= new ChatInputBar(ChatLogWindow.Plugin, ChatLogWindow, () => Tab); InputBar ??= new ChatInputBar(ChatLogWindow.Plugin, ChatLogWindow, () => Tab);
}
var inputBarHeight = inputEnabled var inputBarHeight = inputEnabled
? ImGui.GetFrameHeightWithSpacing() + ImGui.GetStyle().ItemSpacing.Y ? ImGui.GetFrameHeightWithSpacing() + ImGui.GetStyle().ItemSpacing.Y
@@ -150,8 +127,7 @@ internal class Popout : Window
LastActivityTime = FrameTime; LastActivityTime = FrameTime;
} }
// Returns the vertical space the banner consumed (0 when not shown) // Returns the vertical space consumed by the banner (0 when not shown).
// so the message log can shrink accordingly.
private float DrawHintBannerIfNeeded() private float DrawHintBannerIfNeeded()
{ {
if (Plugin.Config.SeenPopOutInputHint) if (Plugin.Config.SeenPopOutInputHint)
@@ -169,7 +145,13 @@ internal class Popout : Window
var dismiss = false; var dismiss = false;
var openSettings = false; var openSettings = false;
using (var child = ImRaii.Child("##v060-pop-out-hint", new System.Numerics.Vector2(0f, 64f), true)) using (
var child = ImRaii.Child(
"##v060-pop-out-hint",
new System.Numerics.Vector2(0f, 64f),
true
)
)
{ {
if (child) if (child)
{ {
@@ -222,58 +204,65 @@ internal class Popout : Window
Cutscene, Cutscene,
CutsceneOverride, CutsceneOverride,
User, User,
Battle Battle,
} }
private HideState CurrentHideState = HideState.None; private HideState CurrentHideState = HideState.None;
private bool HideStateCheck() private bool HideStateCheck()
{ {
// if the chat has no hide state set, and the player has entered battle, we hide chat if they have configured it
if (Tab.HideInBattle && CurrentHideState == HideState.None && Plugin.InBattle) if (Tab.HideInBattle && CurrentHideState == HideState.None && Plugin.InBattle)
{ {
CurrentHideState = HideState.Battle; CurrentHideState = HideState.Battle;
Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: None Battle"); Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: None -> Battle");
} }
// If the chat is hidden because of battle, we reset it here
if (CurrentHideState is HideState.Battle && !Plugin.InBattle) if (CurrentHideState is HideState.Battle && !Plugin.InBattle)
{ {
CurrentHideState = HideState.None; CurrentHideState = HideState.None;
Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: Battle None"); Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: Battle -> None");
} }
// if the chat has no hide state and in a cutscene, set the hide state to cutscene if (
if (Tab.HideDuringCutscenes && CurrentHideState == HideState.None && (Plugin.CutsceneActive || Plugin.GposeActive)) Tab.HideDuringCutscenes
&& CurrentHideState == HideState.None
&& (Plugin.CutsceneActive || Plugin.GposeActive)
)
{ {
if (ChatLogWindow.Plugin.Functions.Chat.CheckHideFlags()) if (ChatLogWindow.Plugin.Functions.Chat.CheckHideFlags())
{ {
CurrentHideState = HideState.Cutscene; CurrentHideState = HideState.Cutscene;
Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: None Cutscene"); Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: None -> Cutscene");
} }
} }
// if the chat is hidden because of a cutscene and no longer in a cutscene, set the hide state to none if (
if (CurrentHideState is HideState.Cutscene or HideState.CutsceneOverride && !Plugin.CutsceneActive && !Plugin.GposeActive) CurrentHideState is HideState.Cutscene or HideState.CutsceneOverride
&& !Plugin.CutsceneActive
&& !Plugin.GposeActive
)
{ {
Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: {CurrentHideState} → None (cutscene/gpose ended)"); Plugin.Log.Verbose(
$"Popout HideState [{Tab.Name}]: {CurrentHideState} -> None (cutscene/gpose ended)"
);
CurrentHideState = HideState.None; CurrentHideState = HideState.None;
} }
// if the chat is hidden because of a cutscene and the chat has been activated, show chat
if (CurrentHideState == HideState.Cutscene && ChatLogWindow.Activate) if (CurrentHideState == HideState.Cutscene && ChatLogWindow.Activate)
{ {
CurrentHideState = HideState.CutsceneOverride; CurrentHideState = HideState.CutsceneOverride;
Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: Cutscene → CutsceneOverride (user activate)"); Plugin.Log.Verbose(
$"Popout HideState [{Tab.Name}]: Cutscene -> CutsceneOverride (user activate)"
);
} }
// if the user hid the chat and is now activating chat, reset the hide state
if (CurrentHideState == HideState.User && ChatLogWindow.Activate) if (CurrentHideState == HideState.User && ChatLogWindow.Activate)
{ {
CurrentHideState = HideState.None; CurrentHideState = HideState.None;
Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: User None (activate)"); Plugin.Log.Verbose($"Popout HideState [{Tab.Name}]: User -> None (activate)");
} }
return CurrentHideState is HideState.Cutscene or HideState.User or HideState.Battle || (Tab.HideWhenNotLoggedIn && !Plugin.ClientState.IsLoggedIn); return CurrentHideState is HideState.Cutscene or HideState.User or HideState.Battle
|| (Tab.HideWhenNotLoggedIn && !Plugin.ClientState.IsLoggedIn);
} }
} }
+120 -53
View File
@@ -1,13 +1,13 @@
using System.Globalization; using System.Globalization;
using System.Numerics; using System.Numerics;
using System.Text; using System.Text;
using HellionChat.Util; using Dalamud.Bindings.ImGui;
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using Dalamud.Bindings.ImGui;
using Dalamud.Utility; using Dalamud.Utility;
using HellionChat.Util;
using DalamudPartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload; using DalamudPartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload;
namespace HellionChat.Ui; namespace HellionChat.Ui;
@@ -16,14 +16,15 @@ public class SeStringDebugger : Window
{ {
private readonly Plugin Plugin; private readonly Plugin Plugin;
public SeStringDebugger(Plugin plugin) : base("SeString Debugger###chat2-sestringdebugger") public SeStringDebugger(Plugin plugin)
: base("SeString Debugger###chat2-sestringdebugger")
{ {
Plugin = plugin; Plugin = plugin;
SizeConstraints = new WindowSizeConstraints SizeConstraints = new WindowSizeConstraints
{ {
MinimumSize = new Vector2(475, 600), MinimumSize = new Vector2(475, 600),
MaximumSize = new Vector2(float.MaxValue, float.MaxValue) MaximumSize = new Vector2(float.MaxValue, float.MaxValue),
}; };
RespectCloseHotkey = false; RespectCloseHotkey = false;
@@ -75,21 +76,35 @@ public class SeStringDebugger : Window
{ {
case UIForegroundPayload color: case UIForegroundPayload color:
{ {
RenderMetadataDictionary("Link ForegroundColor", new Dictionary<string, string?> RenderMetadataDictionary(
"Link ForegroundColor",
new Dictionary<string, string?>
{ {
{ "Enabled?", color.IsEnabled.ToString() }, { "Enabled?", color.IsEnabled.ToString() },
{ "ColorKey", color.IsEnabled ? color.ColorKey.ToString() : "Color Ended" }, {
}); "ColorKey",
color.IsEnabled ? color.ColorKey.ToString() : "Color Ended"
},
}
);
break; break;
} }
case MapLinkPayload map: case MapLinkPayload map:
{ {
RenderMetadataDictionary("Link MapLinkPayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link MapLinkPayload",
new Dictionary<string, string?>
{ {
{ "Map.RowId", map.Map.RowId.ToString() }, { "Map.RowId", map.Map.RowId.ToString() },
{ "Map.PlaceName", map.Map.Value.PlaceName.Value.Name.ToString() }, { "Map.PlaceName", map.Map.Value.PlaceName.Value.Name.ToString() },
{ "Map.PlaceNameRegion", map.Map.Value.PlaceNameRegion.Value.Name.ToString() }, {
{ "Map.PlaceNameSub", map.Map.Value.PlaceNameSub.Value.Name.ToString() }, "Map.PlaceNameRegion",
map.Map.Value.PlaceNameRegion.Value.Name.ToString()
},
{
"Map.PlaceNameSub",
map.Map.Value.PlaceNameSub.Value.Name.ToString()
},
{ "TerritoryType.RowId", map.TerritoryType.RowId.ToString() }, { "TerritoryType.RowId", map.TerritoryType.RowId.ToString() },
{ "RawX", map.RawX.ToString() }, { "RawX", map.RawX.ToString() },
{ "RawY", map.RawY.ToString() }, { "RawY", map.RawY.ToString() },
@@ -97,77 +112,107 @@ public class SeStringDebugger : Window
{ "YCoord", map.YCoord.ToString(CultureInfo.InvariantCulture) }, { "YCoord", map.YCoord.ToString(CultureInfo.InvariantCulture) },
{ "CoordinateString", map.CoordinateString }, { "CoordinateString", map.CoordinateString },
{ "DataString", map.DataString }, { "DataString", map.DataString },
}); }
);
break; break;
} }
case QuestPayload quest: case QuestPayload quest:
{ {
RenderMetadataDictionary("Link QuestPayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link QuestPayload",
new Dictionary<string, string?>
{ {
{ "Quest.RowId", quest.Quest.RowId.ToString() }, { "Quest.RowId", quest.Quest.RowId.ToString() },
{ "Quest.Name", quest.Quest.Value.Name.ToString() }, { "Quest.Name", quest.Quest.Value.Name.ToString() },
}); }
);
break; break;
} }
case DalamudLinkPayload link: case DalamudLinkPayload link:
{ {
RenderMetadataDictionary("Link DalamudLinkPayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link DalamudLinkPayload",
new Dictionary<string, string?>
{ {
{ "CommandId", link.CommandId.ToString() }, { "CommandId", link.CommandId.ToString() },
{ "Plugin", link.Plugin }, { "Plugin", link.Plugin },
}); }
);
break; break;
} }
case DalamudPartyFinderPayload pf: case DalamudPartyFinderPayload pf:
{ {
RenderMetadataDictionary("Link PartyFinderPayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link PartyFinderPayload",
new Dictionary<string, string?>
{ {
{ "ListingId", pf.ListingId.ToString() }, { "ListingId", pf.ListingId.ToString() },
{ "LinkType", EnumName(pf.LinkType) }, { "LinkType", EnumName(pf.LinkType) },
}); }
);
break; break;
} }
case PlayerPayload player: case PlayerPayload player:
{ {
RenderMetadataDictionary("Link PlayerPayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link PlayerPayload",
new Dictionary<string, string?>
{ {
{ "Displayed", player.DisplayedName }, { "Displayed", player.DisplayedName },
{ "Player Name", player.PlayerName }, { "Player Name", player.PlayerName },
{ "World Name", player.World.Value.Name.ExtractText() }, { "World Name", player.World.Value.Name.ExtractText() },
{ "Data", string.Join(" ", player.Encode().Select(b => b.ToString("X2"))) }, {
}); "Data",
string.Join(" ", player.Encode().Select(b => b.ToString("X2")))
},
}
);
break; break;
} }
case ItemPayload item: case ItemPayload item:
{ {
RenderMetadataDictionary("Link ItemPayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link ItemPayload",
new Dictionary<string, string?>
{ {
{ "ItemId", item.ItemId.ToString() }, { "ItemId", item.ItemId.ToString() },
{ "RawItemId", item.RawItemId.ToString() }, { "RawItemId", item.RawItemId.ToString() },
{ "Kind", EnumName(item.Kind) }, { "Kind", EnumName(item.Kind) },
{ "IsHQ", item.IsHQ.ToString() }, { "IsHQ", item.IsHQ.ToString() },
{ "Item.Name", item.Kind == ItemKind.EventItem ? Sheets.EventItemSheet.GetRow(item.ItemId).Name.ExtractText() : Sheets.ItemSheet.GetRow(item.ItemId).Name.ExtractText() }, {
}); "Item.Name",
item.Kind == ItemKind.EventItem
? Sheets.EventItemSheet.GetRow(item.ItemId).Name.ExtractText()
: Sheets.ItemSheet.GetRow(item.ItemId).Name.ExtractText()
},
}
);
break; break;
} }
case AutoTranslatePayload at: case AutoTranslatePayload at:
{ {
RenderMetadataDictionary("Link AutoTranslatePayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link AutoTranslatePayload",
new Dictionary<string, string?>
{ {
{ "Text", at.Text }, { "Text", at.Text },
{ "Key/Group", $"{at.Key}/{at.Group}" }, { "Key/Group", $"{at.Key}/{at.Group}" },
{ "Data", string.Join(" ", at.Encode().Select(b => b.ToString("X2"))) }, { "Data", string.Join(" ", at.Encode().Select(b => b.ToString("X2"))) },
}); }
);
break; break;
} }
case IconPayload icon: case IconPayload icon:
{ {
var found = IconUtil.GfdFileView.TryGetEntry((uint)icon.Icon, out _); var found = IconUtil.GfdFileView.TryGetEntry((uint)icon.Icon, out _);
RenderMetadataDictionary("Link IconPayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link IconPayload",
new Dictionary<string, string?>
{ {
{ "Found", found.ToString() }, { "Found", found.ToString() },
{ "Icon ID", ((uint)icon.Icon).ToString() }, { "Icon ID", ((uint)icon.Icon).ToString() },
}); }
);
break; break;
} }
case RawPayload raw: case RawPayload raw:
@@ -175,48 +220,60 @@ public class SeStringDebugger : Window
var colorPayload = ColorPayload.From(raw.Data); var colorPayload = ColorPayload.From(raw.Data);
if (colorPayload != null) if (colorPayload != null)
{ {
RenderMetadataDictionary("Link ColorPayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link ColorPayload",
new Dictionary<string, string?>
{ {
{ "Unshifted", colorPayload.UnshiftedColor.ToString("X8") }, { "Unshifted", colorPayload.UnshiftedColor.ToString("X8") },
{ "Color", colorPayload.Color.ToString("X8") }, { "Color", colorPayload.Color.ToString("X8") },
{ "Enabled?", colorPayload.Enabled.ToString() }, { "Enabled?", colorPayload.Enabled.ToString() },
}); }
);
} }
else else
{ {
RenderMetadataDictionary("Link RawPayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link RawPayload",
new Dictionary<string, string?>
{ {
{ "Data", string.Join(" ", raw.Data.Select(b => b.ToString("X2"))) }, {
"Data",
string.Join(" ", raw.Data.Select(b => b.ToString("X2")))
},
{ "Type", EnumName(raw.Type) }, { "Type", EnumName(raw.Type) },
}); }
);
} }
break; break;
} }
case StatusPayload status: case StatusPayload status:
{ {
RenderMetadataDictionary("Link StatusPayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link StatusPayload",
new Dictionary<string, string?>
{ {
{ "Status.RowId", status.Status.RowId.ToString() }, { "Status.RowId", status.Status.RowId.ToString() },
{ "Status.Name", status.Status.Value.Name.ExtractText() }, { "Status.Name", status.Status.Value.Name.ExtractText() },
{ "Status.Icon", status.Status.Value.Icon.ToString() } { "Status.Icon", status.Status.Value.Icon.ToString() },
}); }
);
break; break;
} }
case Util.PartyFinderPayload pf: case Util.PartyFinderPayload pf:
{ {
RenderMetadataDictionary("Link PartyFinderPayload", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Link PartyFinderPayload",
{ "Id", pf.Id.ToString() } new Dictionary<string, string?> { { "Id", pf.Id.ToString() } }
}); );
break; break;
} }
case AchievementPayload achievement: case AchievementPayload achievement:
{ {
RenderMetadataDictionary("Link AchievementPayload", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Link AchievementPayload",
{ "Id", achievement.Id.ToString() } new Dictionary<string, string?> { { "Id", achievement.Id.ToString() } }
}); );
break; break;
} }
default: default:
@@ -224,35 +281,45 @@ public class SeStringDebugger : Window
if (payloadData.Length == 0) if (payloadData.Length == 0)
{ {
RenderMetadataDictionary("Empty Payload", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Empty Payload",
{ "Type", payload.GetType().Name }, new Dictionary<string, string?> { { "Type", payload.GetType().Name } }
}); );
break; break;
} }
var initialByte = payloadData[0]; var initialByte = payloadData[0];
if (initialByte != 0x02) if (initialByte != 0x02)
{ {
RenderMetadataDictionary("Text Payload", new Dictionary<string, string?> RenderMetadataDictionary(
"Text Payload",
new Dictionary<string, string?>
{ {
{ "Content", Encoding.UTF8.GetString(payloadData) }, { "Content", Encoding.UTF8.GetString(payloadData) },
}); }
);
} }
else else
{ {
var unknown = new RawPayload(payloadData); var unknown = new RawPayload(payloadData);
RenderMetadataDictionary("Link Unknown", new Dictionary<string, string?> RenderMetadataDictionary(
"Link Unknown",
new Dictionary<string, string?>
{ {
{ "Unknown", string.Join(" ", unknown.Data.Select(b => b.ToString("X2"))) }, {
}); "Unknown",
string.Join(" ", unknown.Data.Select(b => b.ToString("X2")))
},
}
);
} }
break; break;
} }
} }
} }
private static string? EnumName<T>(T? value) where T : Enum private static string? EnumName<T>(T? value)
where T : Enum
{ {
if (value == null) if (value == null)
{ {
+75 -69
View File
@@ -1,11 +1,11 @@
using System.Numerics; using System.Numerics;
using HellionChat.Resources; using Dalamud.Bindings.ImGui;
using HellionChat.Ui.SettingsTabs;
using HellionChat.Util;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using Dalamud.Utility; using Dalamud.Utility;
using Dalamud.Bindings.ImGui; using HellionChat.Resources;
using HellionChat.Ui.SettingsTabs;
using HellionChat.Util;
namespace HellionChat.Ui; namespace HellionChat.Ui;
@@ -25,7 +25,8 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
private SettingsView View = SettingsView.Overview; private SettingsView View = SettingsView.Overview;
private readonly SettingsOverview Overview; private readonly SettingsOverview Overview;
internal SettingsWindow(Plugin plugin) : base($"{Language.Settings_Title.Format(Plugin.PluginName)}###chat2-settings") internal SettingsWindow(Plugin plugin)
: base($"{Language.Settings_Title.Format(Plugin.PluginName)}###chat2-settings")
{ {
Flags = ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoScrollWithMouse; Flags = ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoScrollWithMouse;
@@ -33,7 +34,7 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
SizeConstraints = new WindowSizeConstraints SizeConstraints = new WindowSizeConstraints
{ {
MinimumSize = new Vector2(475, 600), MinimumSize = new Vector2(475, 600),
MaximumSize = new Vector2(float.MaxValue, float.MaxValue) MaximumSize = new Vector2(float.MaxValue, float.MaxValue),
}; };
Plugin = plugin; Plugin = plugin;
@@ -60,7 +61,9 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
Initialise(); Initialise();
Plugin.Commands.Register("/hellion", "Perform various actions with Hellion Chat.").Execute += Command; Plugin
.Commands.Register("/hellion", "Perform various actions with Hellion Chat.")
.Execute += Command;
Plugin.Interface.UiBuilder.OpenConfigUi += Toggle; Plugin.Interface.UiBuilder.OpenConfigUi += Toggle;
} }
@@ -89,13 +92,13 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
View = SettingsView.Overview; View = SettingsView.Overview;
} }
// ESC im Detail-View kehrt zur Overview zurück. Window-Focus-Check ist // ESC in Detail view returns to Overview. Window focus check is
// Pflicht — sonst triggert ESC auch wenn der User ein anderes Fenster // required so ESC doesn't fire when the user targets a different window.
// fokussiert hat und ESC fürs Game-Menü drückt (Codebase-Pattern siehe if (
// Util/SearchSelector.cs:37). View == SettingsView.Detail
if (View == SettingsView.Detail
&& ImGui.IsWindowFocused(ImGuiFocusedFlags.RootAndChildWindows) && ImGui.IsWindowFocused(ImGuiFocusedFlags.RootAndChildWindows)
&& ImGui.IsKeyPressed(ImGuiKey.Escape)) && ImGui.IsKeyPressed(ImGuiKey.Escape)
)
{ {
View = SettingsView.Overview; View = SettingsView.Overview;
return; return;
@@ -123,13 +126,13 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
private void DrawDetail() private void DrawDetail()
{ {
// Breadcrumb-Header — Akzent-Cyan, klickbar, führt zurück zur Overview // Breadcrumb header -- accent cyan, clickable, returns to Overview.
using (ImRaii.PushColor(ImGuiCol.Text, 0xFF00BED2u)) using (ImRaii.PushColor(ImGuiCol.Text, 0xFF00BED2u))
using (ImRaii.PushColor(ImGuiCol.Button, 0u)) using (ImRaii.PushColor(ImGuiCol.Button, 0u))
using (ImRaii.PushColor(ImGuiCol.ButtonHovered, 0x33FFFFFFu)) using (ImRaii.PushColor(ImGuiCol.ButtonHovered, 0x33FFFFFFu))
using (ImRaii.PushColor(ImGuiCol.ButtonActive, 0x55FFFFFFu)) using (ImRaii.PushColor(ImGuiCol.ButtonActive, 0x55FFFFFFu))
{ {
if (ImGui.SmallButton(" Settings")) if (ImGui.SmallButton("<- Settings"))
{ {
View = SettingsView.Overview; View = SettingsView.Overview;
return; return;
@@ -144,13 +147,15 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
ImGui.Separator(); ImGui.Separator();
ImGui.Spacing(); ImGui.Spacing();
// Section-Content in voller Breite. Die Tab-Liste links ist überholt: // Section content fills full width. Navigation back to another
// der User ist bereits über die Card-Übersicht navigiert, eine zweite // section goes via the breadcrumb or ESC.
// Tab-Liste daneben würde nur den Vanilla-Look zurückbringen. Falls
// der User in eine andere Section will, geht er zurück zur Overview
// (Breadcrumb / ESC).
var style = ImGui.GetStyle(); var style = ImGui.GetStyle();
var height = ImGui.GetContentRegionAvail().Y - style.FramePadding.Y * 2 - style.ItemSpacing.Y - style.ItemInnerSpacing.Y * 2 - ImGui.CalcTextSize("A").Y; var height =
ImGui.GetContentRegionAvail().Y
- style.FramePadding.Y * 2
- style.ItemSpacing.Y
- style.ItemInnerSpacing.Y * 2
- ImGui.CalcTextSize("A").Y;
using var child = ImRaii.Child("##chat2-settings-detail", new Vector2(-1, height)); using var child = ImRaii.Child("##chat2-settings-detail", new Vector2(-1, height));
if (child.Success) if (child.Success)
@@ -172,9 +177,7 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
ImGui.SameLine(); ImGui.SameLine();
if (ImGui.Button(Language.Settings_Discard)) if (ImGui.Button(Language.Settings_Discard))
{
IsOpen = false; IsOpen = false;
}
const string buttonLabel = "Anna's Ko-fi"; const string buttonLabel = "Anna's Ko-fi";
const string buttonLabel2 = "Infi's Ko-fi"; const string buttonLabel2 = "Infi's Ko-fi";
@@ -184,9 +187,16 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
using (ImRaii.PushColor(ImGuiCol.ButtonActive, ColourUtil.RgbaToAbgr(0xFF4542FF))) using (ImRaii.PushColor(ImGuiCol.ButtonActive, ColourUtil.RgbaToAbgr(0xFF4542FF)))
using (ImRaii.PushColor(ImGuiCol.Text, 0xFFFFFFFF)) using (ImRaii.PushColor(ImGuiCol.Text, 0xFFFFFFFF))
{ {
var buttonWidth = ImGui.CalcTextSize(buttonLabel).X + ImGui.GetStyle().FramePadding.X * 2; var buttonWidth =
var buttonWidth2 = ImGui.CalcTextSize(buttonLabel2).X + ImGui.GetStyle().FramePadding.X * 2; ImGui.CalcTextSize(buttonLabel).X + ImGui.GetStyle().FramePadding.X * 2;
ImGui.SameLine(ImGui.GetContentRegionAvail().X - buttonWidth - buttonWidth2 - ImGui.GetStyle().ItemSpacing.X); var buttonWidth2 =
ImGui.CalcTextSize(buttonLabel2).X + ImGui.GetStyle().FramePadding.X * 2;
ImGui.SameLine(
ImGui.GetContentRegionAvail().X
- buttonWidth
- buttonWidth2
- ImGui.GetStyle().ItemSpacing.X
);
if (ImGui.Button(buttonLabel2)) if (ImGui.Button(buttonLabel2))
Dalamud.Utility.Util.OpenLink("https://ko-fi.com/infiii"); Dalamud.Utility.Util.OpenLink("https://ko-fi.com/infiii");
@@ -200,29 +210,28 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
if (!save) if (!save)
return; return;
// calculate all conditions before updating config
var hideChanged = !Mutable.HideChat && Mutable.HideChat != Plugin.Config.HideChat; var hideChanged = !Mutable.HideChat && Mutable.HideChat != Plugin.Config.HideChat;
var languageChanged = Mutable.LanguageOverride != Plugin.Config.LanguageOverride; var languageChanged = Mutable.LanguageOverride != Plugin.Config.LanguageOverride;
var fontChanged = Mutable.GlobalFontV2 != Plugin.Config.GlobalFontV2 var fontChanged =
Mutable.GlobalFontV2 != Plugin.Config.GlobalFontV2
|| Mutable.JapaneseFontV2 != Plugin.Config.JapaneseFontV2 || Mutable.JapaneseFontV2 != Plugin.Config.JapaneseFontV2
|| Mutable.ItalicFontV2 != Plugin.Config.ItalicFontV2 || Mutable.ItalicFontV2 != Plugin.Config.ItalicFontV2
|| Mutable.ExtraGlyphRanges != Plugin.Config.ExtraGlyphRanges || Mutable.ExtraGlyphRanges != Plugin.Config.ExtraGlyphRanges
|| Mutable.UseHellionFont != Plugin.Config.UseHellionFont; || Mutable.UseHellionFont != Plugin.Config.UseHellionFont;
var fontSizeChanged = Math.Abs(Mutable.SymbolsFontSizeV2 - Plugin.Config.SymbolsFontSizeV2) > 0.001 var fontSizeChanged =
Math.Abs(Mutable.SymbolsFontSizeV2 - Plugin.Config.SymbolsFontSizeV2) > 0.001
|| Math.Abs(Mutable.FontSizeV2 - Plugin.Config.FontSizeV2) > 0.001; || Math.Abs(Mutable.FontSizeV2 - Plugin.Config.FontSizeV2) > 0.001;
var italicStateChanged = Mutable.ItalicEnabled != Plugin.Config.ItalicEnabled; var italicStateChanged = Mutable.ItalicEnabled != Plugin.Config.ItalicEnabled;
// v1.2.0 — Refilter only if a filter-relevant setting actually
// changed. The Clear+Refilter cycle reloads messages from the DB, // Only refilter when filter-relevant settings changed. Clear+Refilter
// which silently wipes any in-session message that wasn't // reloads from the DB and silently drops in-session messages that
// persisted (Privacy-First config blocks most channels from DB). // weren't persisted (Privacy-First blocks most channels). Cosmetic
// Cosmetic changes (theme, tab icons, layout flags) trigger no // changes (theme, icons, layout) skip the cycle.
// refilter — chat history stays intact.
var filtersChanged = HasFilterRelevantChanges(); var filtersChanged = HasFilterRelevantChanges();
Plugin.Config.UpdateFrom(Mutable, true); Plugin.Config.UpdateFrom(Mutable, true);
// save after 60 frames have passed, which should hopefully not // Defer save by 60 frames to avoid committing changes that cause a crash.
// commit any changes that cause a crash
Plugin.DeferredSaveFrames = 60; Plugin.DeferredSaveFrames = 60;
if (filtersChanged) if (filtersChanged)
{ {
@@ -240,60 +249,57 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
GameFunctions.GameFunctions.SetChatInteractable(true); GameFunctions.GameFunctions.SetChatInteractable(true);
if (Plugin.Config.ShowEmotes) if (Plugin.Config.ShowEmotes)
_ = EmoteCache.LoadData(); // Fire-and-forget intentional, exceptions are caught inside _ = EmoteCache.LoadData();
Initialise(); Initialise();
} }
/// <summary> // Returns true if any filter-relevant setting changed between Plugin.Config
/// v1.2.0 — Detects whether any setting that influences message // and the Mutable copy. Gates Clear+Refilter on Save so cosmetic changes
/// filtering changed between Plugin.Config and the Mutable working // don't wipe in-session chat history.
/// copy. Used to gate the heavy ClearAllTabs+FilterAllTabsAsync cycle
/// in Save: cosmetic changes (theme, tab icons, layout flags) do not
/// touch the chat log, only filter-relevant changes do. Without this
/// gate, every settings save wipes the chat history of any channel
/// the Privacy filter blocks from being persisted to the DB —
/// reported by Flo from in-game testing 2026-05-05/06.
/// </summary>
private bool HasFilterRelevantChanges() private bool HasFilterRelevantChanges()
{ {
// Top-level privacy controls. if (Mutable.PrivacyFilterEnabled != Plugin.Config.PrivacyFilterEnabled)
if (Mutable.PrivacyFilterEnabled != Plugin.Config.PrivacyFilterEnabled) return true; return true;
if (Mutable.PrivacyPersistUnknownChannels != Plugin.Config.PrivacyPersistUnknownChannels) return true; if (Mutable.PrivacyPersistUnknownChannels != Plugin.Config.PrivacyPersistUnknownChannels)
if (!Mutable.PrivacyPersistChannels.SetEquals(Plugin.Config.PrivacyPersistChannels)) return true; return true;
if (!Mutable.PrivacyPersistChannels.SetEquals(Plugin.Config.PrivacyPersistChannels))
return true;
// FilterIncludePreviousSessions changes the GetMostRecentMessages // FilterIncludePreviousSessions changes the GetMostRecentMessages
// window in MessageManager.FilterAllTabs and is therefore filter- // window and is filter-relevant even outside the Privacy block.
// relevant even though it lives outside the Privacy block. if (Mutable.FilterIncludePreviousSessions != Plugin.Config.FilterIncludePreviousSessions)
if (Mutable.FilterIncludePreviousSessions != Plugin.Config.FilterIncludePreviousSessions) return true; return true;
// Per-tab channel selection. Compare persistent tabs only // Compare persistent tabs only -- TempTabs are never refiltered.
// TempTabs are session-only and never refiltered anyway.
var origPersistent = Plugin.Config.Tabs.Where(t => !t.IsTempTab).ToList(); var origPersistent = Plugin.Config.Tabs.Where(t => !t.IsTempTab).ToList();
var newPersistent = Mutable.Tabs.Where(t => !t.IsTempTab).ToList(); var newPersistent = Mutable.Tabs.Where(t => !t.IsTempTab).ToList();
if (origPersistent.Count != newPersistent.Count) return true; // add or delete if (origPersistent.Count != newPersistent.Count)
return true;
for (var i = 0; i < origPersistent.Count; i++) for (var i = 0; i < origPersistent.Count; i++)
{ {
var orig = origPersistent[i]; var orig = origPersistent[i];
var neu = newPersistent[i]; var neu = newPersistent[i];
// Identifier mismatch at the same index means reorder or // Identifier mismatch means reorder or slot swap -- treat as filter-relevant.
// a slot got swapped — treat as filter-relevant so the new if (orig.Identifier != neu.Identifier)
// channel-selection layout actually applies. return true;
if (orig.Identifier != neu.Identifier) return true;
if (orig.ExtraChatAll != neu.ExtraChatAll) return true; if (orig.ExtraChatAll != neu.ExtraChatAll)
if (!orig.ExtraChatChannels.SetEquals(neu.ExtraChatChannels)) return true; return true;
if (!orig.ExtraChatChannels.SetEquals(neu.ExtraChatChannels))
return true;
// SelectedChannels is a Dictionary<ChatType, (ChatSource, ChatSource)> if (orig.SelectedChannels.Count != neu.SelectedChannels.Count)
// — value-tuple equality already does the right thing per-pair. return true;
if (orig.SelectedChannels.Count != neu.SelectedChannels.Count) return true;
foreach (var pair in orig.SelectedChannels) foreach (var pair in orig.SelectedChannels)
{ {
if (!neu.SelectedChannels.TryGetValue(pair.Key, out var nv)) return true; if (!neu.SelectedChannels.TryGetValue(pair.Key, out var nv))
if (!pair.Value.Equals(nv)) return true; return true;
if (!pair.Value.Equals(nv))
return true;
} }
} }

Some files were not shown because too many files have changed in this diff Show More