Compare commits

...

60 Commits

Author SHA1 Message Date
renovate-bot b6bd0b459a chore(deps): refresh
Security / scan (pull_request) Successful in 21s
2026-05-10 12:34:14 +00: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
JonKazama-Hellion de9d1ac60b Merge branch 'feature/v1.4.0-critical-lifecycle-fixes'
Hellion Chat 1.4.0 — Critical Lifecycle Fixes

Seven P0 lifecycle and race bugs eliminated before any performance refactor.
Plus version bump, manifest sync, changelog, forge-post.
2026-05-07 19:06:56 +02:00
JonKazama-Hellion 19f7099af0 docs: add v1.4.0 forge-post 2026-05-07 19:04:24 +02:00
JonKazama-Hellion f8a734d93f chore: bump version to 1.4.0 and document Critical Lifecycle Fixes 2026-05-07 19:04:20 +02:00
JonKazama-Hellion 3f7e86b32e fix(migration): pull HellionThemeWindowOpacity from pre-v13 backup in v13->v14 2026-05-07 08:03:57 +02:00
JonKazama-Hellion e5bf375b42 fix(plugin): flush DeferredSaveFrames in Dispose before service teardown 2026-05-07 07:53:52 +02:00
JonKazama-Hellion 93329087a9 fix(messagemanager): warn loudly when DisposeAsync 10s timeout hits 2026-05-07 07:52:14 +02:00
JonKazama-Hellion 72d568e5b3 fix(emotecache): replace async void Load with async Task tracker 2026-05-07 07:41:50 +02:00
JonKazama-Hellion c9dfd024b2 docs(comments): trim verbose dispose and thread rationale
Match the new HellionChat comment-length convention: 1-3 lines for
standard pitfall notes, 5+ only for non-trivial workarounds. The
previous Dispose comment was 14 lines of textbook prose, which veered
into AI-slop territory and would rot on the next refactor.
2026-05-07 01:10:50 +02:00
JonKazama-Hellion 8c624a0032 fix(threads): mark PendingMessage thread as background, document RetentionSweep rationale 2026-05-07 00:54:43 +02:00
JonKazama-Hellion 079e280226 fix(messagestore): drop GC.Collect from Dispose, rely on Pooling=false 2026-05-07 00:42:26 +02:00
JonKazama-Hellion 3bdf45c29c Datein in falschen ordner verschoben xD 2026-05-06 22:32:01 +02:00
161 changed files with 9704 additions and 5690 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
+23
View File
@@ -0,0 +1,23 @@
---
subtitle: Critical Lifecycle Fixes
versionsnatur: Stability-Hotfix
---
**Hellion Chat 1.4.0 — Critical Lifecycle Fixes**
Erster Sub-Patch der v1.4.x Polish-Sweep-Serie. Sieben bekannte Lifecycle- und Race-Bugs aus den Audit-Pässen
abgearbeitet, bevor Performance- und Architektur-Refactors draufkommen.
- **SQLite-Dispose** lehnt sich nicht mehr an GC-Druck zur Datei-Freigabe an, Pooling=false auf der Connection macht den
manuellen GC.Collect überflüssig
- **Worker-Threads** (PendingMessage, RetentionSweep) sind jetzt explizit IsBackground=true, das Plugin-Domain kann
sauber unloaden bei XIVLauncher-Reload ohne darauf zu warten
- **EmoteCache-Loader** von async-void auf async-Task mit shared Task-Tracker, drain-on-Dispose. Kein Schreib-Risiko
mehr auf disposed EmoteImages-Einträge nach Plugin-Reload
- **DisposeAsync-Timeout** (10s) warnt jetzt laut statt silent zu failen
- **Plugin-Dispose** flushed pending DeferredSave bevor Services abgebaut werden, Settings-Änderungen aus den letzten
Frames vor Disable überleben jetzt zuverlässig
- **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 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.
+11 -14
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,7 +27,7 @@ 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:
@@ -34,23 +40,14 @@ jobs:
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 }
+29 -23
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:
@@ -52,27 +56,25 @@ jobs:
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.
+12 -12
View File
@@ -4,22 +4,22 @@ 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
hooks, the localisation infrastructure and most of the hooks, the localisation infrastructure and most of the
architecture HellionChat still relies on. architecture HellionChat still relies on.
Copyright (c) 2025-2026 Florian Wathling / Hellion Online Media Copyright (c) 2025-2026 Florian Wathling / Hellion Online Media
HellionChat-specific modifications, including the privacy filter, HellionChat-specific modifications, including the privacy filter,
per-channel retention sweep, export pipeline, Auto-Tell-Tabs, per-channel retention sweep, export pipeline, Auto-Tell-Tabs,
German localisation and the EUPL-1.2 fork maintenance. German localisation and the EUPL-1.2 fork maintenance.
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
@@ -42,8 +42,8 @@ Bundled assets
═══════════════════════════════════════════════════════════════════ ═══════════════════════════════════════════════════════════════════
Exo 2 font (HellionChat/Resources/HellionFont.ttf) Exo 2 font (HellionChat/Resources/HellionFont.ttf)
SIL Open Font License 1.1, full text in HellionFont-OFL.txt. SIL Open Font License 1.1, full text in HellionFont-OFL.txt.
Bundled with permission per the OFL terms. Bundled with permission per the OFL terms.
═══════════════════════════════════════════════════════════════════ ═══════════════════════════════════════════════════════════════════
+37 -23
View File
@@ -1,12 +1,12 @@
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;
@@ -76,7 +76,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;
} }
@@ -89,10 +92,11 @@ internal sealed class AutoTellTabsService : IDisposable
// (FFXIV changing tell payload shape, new edge cases) findable // (FFXIV changing tell payload shape, new edge cases) findable
// without having to crank up debug logging at the source. // 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;
} }
@@ -124,7 +128,8 @@ internal sealed class AutoTellTabsService : IDisposable
// PlayerPayload normally rides on a chunk's Link slot, but for // PlayerPayload normally rides on a chunk's Link slot, but for
// some tell types FFXIV only puts it in the raw SeString — // some tell types FFXIV only puts it in the raw SeString —
// fall back to that before giving up. // fall back to that before giving up.
var fromSender = ChunkUtil.TryGetPlayerPayload(message.Sender) var fromSender =
ChunkUtil.TryGetPlayerPayload(message.Sender)
?? ChunkUtil.TryGetPlayerPayload(message.SenderSource); ?? ChunkUtil.TryGetPlayerPayload(message.SenderSource);
if (fromSender != null) if (fromSender != null)
{ {
@@ -137,7 +142,8 @@ internal sealed class AutoTellTabsService : IDisposable
// up either as a payload in the content (for tells typed via the // up either as a payload in the content (for tells typed via the
// Chat 2 input bar) or as the channel's tracked tell target (set by // Chat 2 input bar) or as the channel's tracked tell target (set by
// the SetContextTellTarget game hook). Same SeString fallback. // the SetContextTellTarget game hook). Same SeString fallback.
var fromContent = ChunkUtil.TryGetPlayerPayload(message.Content) 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 +152,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,7 +169,8 @@ 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()
@@ -171,8 +179,8 @@ internal sealed class AutoTellTabsService : IDisposable
// "I'm done with that conversation"), and within each bucket we // "I'm done with that conversation"), and within each bucket we
// pick the oldest LastActivity. This protects active conversations // pick the oldest LastActivity. This protects active conversations
// and unfinished greetings while still freeing up a slot. // and unfinished greetings while still freeing up a slot.
var victim = Plugin.Config.Tabs var victim = Plugin
.Select((tab, idx) => (Tab: tab, Index: idx)) .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)
@@ -191,8 +199,9 @@ internal sealed class AutoTellTabsService : IDisposable
// popped tab is now a routine code path. // 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;
@@ -286,7 +295,8 @@ internal sealed class AutoTellTabsService : IDisposable
_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)
@@ -314,7 +324,8 @@ internal sealed class AutoTellTabsService : IDisposable
// after the historical messages but before the current one. // 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)
{ {
@@ -324,7 +335,8 @@ internal sealed class AutoTellTabsService : IDisposable
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
);
} }
} }
@@ -388,16 +400,18 @@ internal sealed class AutoTellTabsService : IDisposable
// the next plugin reload. Especially relevant once Auto-Pop-Out is // the next plugin reload. Especially relevant once Auto-Pop-Out is
// enabled — every logout would otherwise leak as many ghosts as // enabled — every logout would otherwise leak as many ghosts as
// there were active /tell pop-outs. // there were active /tell pop-outs.
var poppedTempTabIds = Plugin.Config.Tabs var poppedTempTabIds = Plugin
.Where(t => t.IsTempTab && t.PopOut) .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;
} }
+1 -2
View File
@@ -4,8 +4,7 @@ namespace HellionChat.Branding;
// Centralised so a future invite rotation only touches one file. The same // Centralised so a future invite rotation only touches one file. The same
// link is currently hard-coded in repo.json, README.md, SUPPORT.md, // link is currently hard-coded in repo.json, README.md, SUPPORT.md,
// CONTRIBUTORS.md and HellionChat.yaml — those will be migrated to consume // CONTRIBUTORS.md and HellionChat.yaml — those will be migrated to consume
// this constant in a separate housekeeping sweep, but that's out of scope // this constant in a separate housekeeping sweep
// 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";
+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);
} }
+34 -12
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,
@@ -42,7 +43,7 @@ public abstract class Chunk
{ {
TextChunk text => text.Content, TextChunk text => text.Content,
IconChunk icon => icon.Icon.ToString(), IconChunk icon => icon.Icon.ToString(),
_ => "" _ => "",
}; };
} }
} }
@@ -57,18 +58,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 +88,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;
@@ -122,7 +143,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;
} }
+1 -1
View File
@@ -16,7 +16,7 @@ public class ChatCode
} }
public ChatCode(byte type, byte source, byte target) public ChatCode(byte type, byte source, byte target)
: this((XivChatType)type, (XivChatRelationKind)source, (XivChatRelationKind)target) {} : this((XivChatType)type, (XivChatRelationKind)source, (XivChatRelationKind)target) { }
public bool IsBattle() public bool IsBattle()
{ {
+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))
{ {
+118 -40
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;
@@ -27,7 +27,7 @@ public class ConfigKeyBind
modString += Language.Keybind_Modifier_Shift + " + "; modString += Language.Keybind_Modifier_Shift + " + ";
if (Modifier.HasFlag(ModifierFlag.Alt)) if (Modifier.HasFlag(ModifierFlag.Alt))
modString += Language.Keybind_Modifier_Alt + " + "; modString += Language.Keybind_Modifier_Alt + " + ";
return modString+Key.GetFancyName(); return modString + Key.GetFancyName();
} }
} }
@@ -45,10 +45,10 @@ public class Configuration : IPluginConfiguration
// HellionThemeWindowOpacity beim Bump v13 → v14. // HellionThemeWindowOpacity beim Bump v13 → v14.
public float WindowOpacity = 0.85f; public float WindowOpacity = 0.85f;
// v1.1.0 — Felder für künftige UI-Toggles (v1.2.0 / v1.3.0). Werden // 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. // 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.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.0 wurde als zu dicht empfunden; Single-Line `[HH:mm] Sender:
// Text` ist besser lesbar und platzsparender. Bestand-User mit aktiv // Text` ist besser lesbar und platzsparender. Bestand-User mit aktiv
@@ -60,8 +60,10 @@ public class Configuration : IPluginConfiguration
// Hellion Chat — Privacy filter (DSGVO Art. 25 Privacy by Default). // Hellion Chat — Privacy filter (DSGVO Art. 25 Privacy by Default).
// Master-switch defaults to true; set false to restore upstream behavior. // 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 we don't know about.
public bool PrivacyPersistUnknownChannels; public bool PrivacyPersistUnknownChannels;
@@ -103,15 +105,19 @@ public class Configuration : IPluginConfiguration
// /tell spawns a session-only tab dedicated to that conversation // /tell spawns a session-only tab dedicated to that conversation
// partner. See spec: Hellion Chat Auto-Tell-Tabs Spec (Obsidian). // 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 // Hard cap on simultaneously open auto tell tabs. Range enforced by the
// settings slider (150). LRU drop favors greeted tabs first. // 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 // When true the sidebar shows only a thin separator before the temp
// tabs; when false a section header "Active Tells (n)" is rendered. // 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 // Number of prior tells to preload from the message store when an
// auto tell tab is spawned. Range 0100; 0 disables preload. // 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 // 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 // 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 // workflow is specific to club-greeter use cases — most users just
@@ -160,6 +166,7 @@ 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ü // v1.2.1 — Default geflippt false → true. Hellion-UI im NG+-Menü
// versteckt zu halten ist konsistent mit den anderen Hide-Defaults // versteckt zu halten ist konsistent mit den anderen Hide-Defaults
// (Cutscenes, Logged-out, UI-Hidden) — UI-out-of-the-way bei Story- // (Cutscenes, Logged-out, UI-Hidden) — UI-out-of-the-way bei Story-
@@ -179,11 +186,13 @@ 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 // v1.2.1 — Default geflippt false → true. Wiederholte Zeitstempel
// innerhalb derselben Minute lesen sich als Rauschen; ein einziger // innerhalb derselben Minute lesen sich als Rauschen; ein einziger
// Timestamp pro Minute reicht aus um die Konversation zu verorten. // 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 // Hellion Chat — vertical sidebar tab layout reads better than the
// horizontal tab strip in the company of Auto-Tell-Tabs (a club // horizontal tab strip in the company of Auto-Tell-Tabs (a club
// greeter typically tracks 515 simultaneous conversations). Bestand // greeter typically tracks 515 simultaneous conversations). Bestand
@@ -209,11 +218,13 @@ 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- // v1.2.1 — Default gesenkt 5000 → 2500. 5000 ist auf Mid-Range-
// Hardware bei langen Sessions spürbar langsamer (Card-Layout // Hardware bei langen Sessions spürbar langsamer (Card-Layout
// re-Layout pro Frame), 2500 deckt eine typische Stunde Chat ab // re-Layout pro Frame), 2500 deckt eine typische Stunde Chat ab
// und bleibt smooth. User die mehr brauchen können bis 10000 hoch. // 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 // Default ON to match a German / European 24h locale. The
// ChatLogWindow.cs format-flip in v0.5.1 honours this strictly via // ChatLogWindow.cs format-flip in v0.5.1 honours this strictly via
// CultureInfo.InvariantCulture so the result is consistent across // CultureInfo.InvariantCulture so the result is consistent across
@@ -246,6 +257,7 @@ public class Configuration : IPluginConfiguration
}; };
public float TooltipOffset; public float TooltipOffset;
// v1.2.1 — Default-Chat-Farben sind das Hellion-Brand-Preset. Der // v1.2.1 — Default-Chat-Farben sind das Hellion-Brand-Preset. Der
// First-Run-Wizard bietet keine Theme-/Preset-Wahl an, daher kriegen // 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 // neue User die Hellion-Brand-Farben out-of-the-box (Cyan-Familie für
@@ -257,7 +269,9 @@ public class Configuration : IPluginConfiguration
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 +298,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;
@@ -349,11 +366,12 @@ public class Configuration : IPluginConfiguration
// settings get a fresh empty MessageList; deleted tabs lose their // settings get a fresh empty MessageList; deleted tabs lose their
// history (intended). // 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,19 +380,23 @@ 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;
ChatTabBackward = other.ChatTabBackward; ChatTabBackward = other.ChatTabBackward;
PrivacyFilterEnabled = other.PrivacyFilterEnabled; PrivacyFilterEnabled = other.PrivacyFilterEnabled;
PrivacyPersistChannels = [..other.PrivacyPersistChannels]; PrivacyPersistChannels = [.. other.PrivacyPersistChannels];
PrivacyPersistUnknownChannels = other.PrivacyPersistUnknownChannels; PrivacyPersistUnknownChannels = other.PrivacyPersistUnknownChannels;
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 +432,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 +441,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,
@@ -468,19 +492,50 @@ 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;
[NonSerialized]
public MessageList Messages = new();
[NonSerialized]
public UsedChannel CurrentChannel = new();
[NonSerialized]
public Guid Identifier = Guid.NewGuid();
// Hellion Chat — Auto-Tell-Tabs greeted flag. Toggled manually from the // Hellion Chat — Auto-Tell-Tabs greeted flag. Toggled manually from the
// sidebar to mark a tell partner as already greeted in the current // sidebar to mark a tell partner as already greeted in the current
// session. NonSerialized because the temp tab itself is session-only. // session. NonSerialized because the temp tab itself is session-only.
[NonSerialized] public bool IsGreeted; [NonSerialized]
public bool IsGreeted;
// v1.4.2 — TabTintCache uses separate validation keys per cache so a
// TellTarget change picked up by GetTint can't strand GetIcon (or vice
// versa) with a stale entry that looks fresh on the shared key.
[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)
{ {
@@ -507,12 +562,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()
{ {
@@ -650,8 +710,14 @@ public class Tab
get get
{ {
LockSlim.Wait(-1); LockSlim.Wait(-1);
try { return Messages.Count; } try
finally { LockSlim.Release(); } {
return Messages.Count;
}
finally
{
LockSlim.Release();
}
} }
} }
@@ -681,7 +747,9 @@ public class Tab
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 +808,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 +830,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 +849,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 +892,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 +915,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 +954,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 +968,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(),
+93 -26
View File
@@ -1,10 +1,11 @@
using System.Numerics; using System.Collections.Concurrent;
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;
@@ -14,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();
@@ -55,7 +76,7 @@ public static class EmoteCache
{ {
Unloaded, Unloaded,
Loading, Loading,
Done Done,
} }
// All of this data is uninitalized while State is not `LoadingState.Done` // All of this data is uninitalized while State is not `LoadingState.Done`
@@ -73,6 +94,24 @@ public static class EmoteCache
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
// continuation could still write to a torn-down Texture/Frames field.
private static readonly ConcurrentBag<Task> PendingLoads = new();
internal static void TrackLoad(Task loadTask, string emoteCode)
{
PendingLoads.Add(
loadTask.ContinueWith(
t =>
{
if (t.IsFaulted)
Plugin.Log.Error(t.Exception!, $"EmoteCache load failed for {emoteCode}");
},
TaskScheduler.Default
)
);
}
public static async Task LoadData() public static async Task LoadData()
{ {
if (State is not LoadingState.Unloaded) if (State is not LoadingState.Unloaded)
@@ -107,7 +146,10 @@ public static class EmoteCache
// load. Skip them defensively so a single bad row no longer // load. Skip them defensively so a single bad row no longer
// breaks the cache for everyone else. // 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;
@@ -135,10 +177,20 @@ public static class EmoteCache
public static void Dispose() public static void Dispose()
{ {
// Cancel in-flight downloads / texture creates so the async-void
// Load methods bail out before they touch a disposed TextureProvider.
Cts.Cancel(); Cts.Cancel();
// 5s upper bound; anything still running gets abandoned.
try
{
Task.WaitAll(PendingLoads.ToArray(), TimeSpan.FromSeconds(5));
}
catch (AggregateException)
{
// Faults already logged in TrackLoad.
}
while (PendingLoads.TryTake(out _)) { }
foreach (var emote in EmoteImages.Values) foreach (var emote in EmoteImages.Values)
emote.InnerDispose(); emote.InnerDispose();
} }
@@ -201,13 +253,19 @@ public static class EmoteCache
// upstream could still hand us "../foo" and write into the // upstream could still hand us "../foo" and write into the
// pluginConfigs root (or worse). Resolve the candidate path and // pluginConfigs root (or worse). Resolve the candidate path and
// refuse anything that escapes the cache directory. // refuse anything that escapes the cache directory.
var dir = Path.GetFullPath(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "EmoteCacheV1")); 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))
{ {
@@ -218,7 +276,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);
} }
@@ -233,11 +296,12 @@ public static class EmoteCache
public ImGuiEmote Prepare(Emote emote) public ImGuiEmote Prepare(Emote emote)
{ {
var ct = EmoteCache.Token; var ct = EmoteCache.Token;
Task.Run(() => Load(emote, ct), ct); // Task.Run keeps the sync prefix off the ImGui render thread.
EmoteCache.TrackLoad(Task.Run(() => LoadAsyncTracked(emote, ct), ct), emote.Code);
return this; return this;
} }
private async void Load(Emote emote, CancellationToken ct) private async Task LoadAsyncTracked(Emote emote, CancellationToken ct)
{ {
try try
{ {
@@ -246,14 +310,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) { }
{
// Plugin disposed mid-load; the EmoteImages entry is also
// being torn down, no extra cleanup needed.
}
catch (Exception ex) catch (Exception ex)
{ {
Failed = true; Failed = true;
@@ -310,11 +373,11 @@ public static class EmoteCache
public ImGuiGif Prepare(Emote emote) public ImGuiGif Prepare(Emote emote)
{ {
var ct = EmoteCache.Token; var ct = EmoteCache.Token;
Task.Run(() => Load(emote, ct), ct); EmoteCache.TrackLoad(Task.Run(() => LoadAsyncTracked(emote, ct), ct), emote.Code);
return this; return this;
} }
private async void Load(Emote emote, CancellationToken ct) private async Task LoadAsyncTracked(Emote emote, CancellationToken ct)
{ {
try try
{ {
@@ -340,7 +403,11 @@ public static class EmoteCache
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));
} }
+59 -19
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",
@@ -42,13 +44,15 @@ internal static class MessageExporter
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 +68,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();
@@ -107,7 +115,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,7 +126,11 @@ 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 pulling in System.Text.Json policy choices.
// Output is a single object with metadata and an array of messages. // Output is a single object with metadata and an array of messages.
@@ -130,9 +144,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,7 +188,11 @@ 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 line always written so empty exports are still importable.
w.WriteLine("Date,ChatType,ChatTypeName,Sender,Content,Receiver,ContentId"); w.WriteLine("Date,ChatType,ChatTypeName,Sender,Content,Receiver,ContentId");
@@ -201,13 +227,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}");
+95 -34
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,9 +23,22 @@ 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> /// <summary>
@@ -41,8 +54,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();
@@ -66,8 +82,8 @@ public class FontManager
if (chars[i] == 0) if (chars[i] == 0)
break; break;
for (var j = (uint) chars[i]; j <= chars[i + 1]; j++) for (var j = (uint)chars[i]; j <= chars[i + 1]; j++)
builder.AddChar((ushort) j); builder.AddChar((ushort)j);
} }
} }
@@ -85,7 +101,7 @@ public class FontManager
// "Enclosed Alphanumerics" (partial) https://www.compart.com/en/unicode/block/U+2460 // "Enclosed Alphanumerics" (partial) https://www.compart.com/en/unicode/block/U+2460
for (var i = 0x2460; i <= 0x24B5; i++) for (var i = 0x2460; i <= 0x24B5; i++)
builder.AddChar((char) i); builder.AddChar((char)i);
builder.AddChar('⓪'); builder.AddChar('⓪');
return builder.BuildRangesToArray(); return builder.BuildRangesToArray();
@@ -100,25 +116,43 @@ public class FontManager
JpRange = BuildRange(GlyphRangesJapanese.GlyphRanges); JpRange = BuildRange(GlyphRangesJapanese.GlyphRanges);
} }
/// <summary>
/// Async wrapper around <see cref="BuildFonts"/> for the Phase-1 LoadAsync
/// path. The font-atlas build is CPU-bound, so we offload via Task.Run and
/// honour the cancellation token at the scheduling boundary; this lets the
/// font build run in parallel with the theme init without blocking the
/// loader. Settings-driven manual rebuilds keep using the sync entry point.
/// </summary>
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 — Bei aktiver Hellion-Schrift (Exo 2 ist Variable-Font)
// wird die User-Schriftgröße aus FontSizeV2 als SizePt angewendet. // wird die User-Schriftgröße aus FontSizeV2 als SizePt angewendet.
@@ -129,7 +163,7 @@ public class FontManager
var basePt = Plugin.Config.UseHellionFont var basePt = Plugin.Config.UseHellionFont
? Plugin.Config.FontSizeV2 ? Plugin.Config.FontSizeV2
: Plugin.Config.GlobalFontV2.SizePt; : Plugin.Config.GlobalFontV2.SizePt;
var config = new SafeFontConfig {SizePt = basePt, GlyphRanges = Ranges}; var config = new SafeFontConfig { SizePt = basePt, GlyphRanges = Ranges };
config.MergeFont = Plugin.Config.UseHellionFont config.MergeFont = Plugin.Config.UseHellionFont
? tk.AddFontFromMemory(GetHellionFontBytes(), config, "Hellion-Exo2") ? tk.AddFontFromMemory(GetHellionFontBytes(), config, "Hellion-Exo2")
: AddFontWithFallback(tk, Plugin.Config.GlobalFontV2.FontId, config, "global"); : AddFontWithFallback(tk, Plugin.Config.GlobalFontV2.FontId, config, "global");
@@ -142,28 +176,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
{ {
@@ -178,21 +225,35 @@ public class FontManager
/// pointing at a font the user uninstalled or that never existed on /// pointing at a font the user uninstalled or that never existed on
/// Linux (e.g. "Crimson Text") tears down the entire font atlas build. /// Linux (e.g. "Crimson Text") tears down the entire font atlas build.
/// </summary> /// </summary>
private static ImFontPtr AddFontWithFallback(IFontAtlasBuildToolkitPreBuild tk, IFontId fontId, SafeFontConfig config, string slot) 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 GetFontSize() => Plugin.Config.FontsEnabled ? Plugin.Config.GlobalFontV2.SizePx : SizeInPx(Plugin.Config.FontSizeV2); 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);
} }
+241 -64
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,
@@ -174,7 +221,7 @@ internal sealed unsafe class Chat : IDisposable
{ {
string? input = null; string? input = null;
var utf8Bytes = MemoryHelper.ReadRaw((nint)LastTypedCharacter+0x4, 2); var utf8Bytes = MemoryHelper.ReadRaw((nint)LastTypedCharacter + 0x4, 2);
var chars = Encoding.UTF8.GetString(utf8Bytes).ToCharArray(); var chars = Encoding.UTF8.GetString(utf8Bytes).ToCharArray();
if (chars.Length == 0) if (chars.Length == 0)
return; return;
@@ -185,7 +232,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)
{ {
@@ -197,7 +246,7 @@ internal sealed unsafe class Chat : IDisposable
string? addIfNotPresent = null; string? addIfNotPresent = null;
var str = value + 2; var str = value + 2;
if (str != null && ((int) str->Type & 0xF) == (int) ValueType.String && str->String.HasValue) if (str != null && ((int)str->Type & 0xF) == (int)ValueType.String && str->String.HasValue)
{ {
var add = str->String.ToString(); var add = str->String.ToString();
if (add.Length > 0) if (add.Length > 0)
@@ -214,7 +263,12 @@ internal sealed unsafe class Chat : IDisposable
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)
{ {
@@ -231,9 +285,9 @@ internal sealed unsafe class Chat : IDisposable
if (agent == null) if (agent == null)
return ret; return ret;
var channel = (uint) RaptureShellModule.Instance()->ChatType; var channel = (uint)RaptureShellModule.Instance()->ChatType;
if (channel is 17 or 18) if (channel is 17 or 18)
channel = (uint) InputChannel.Tell; channel = (uint)InputChannel.Tell;
var name = SeString.Parse(agent->ChannelLabel); var name = SeString.Parse(agent->ChannelLabel);
if (name.Payloads.Count == 0) if (name.Payloads.Count == 0)
@@ -248,7 +302,7 @@ internal sealed unsafe class Chat : IDisposable
string? playerName = null; string? playerName = null;
ushort worldId = 0; ushort worldId = 0;
if (channel == (uint) InputChannel.Tell) if (channel == (uint)InputChannel.Tell)
{ {
playerName = SeString.Parse(agent->TellPlayerName).TextValue; playerName = SeString.Parse(agent->TellPlayerName).TextValue;
worldId = agent->TellWorldId; worldId = agent->TellWorldId;
@@ -257,9 +311,9 @@ internal sealed unsafe class Chat : IDisposable
Plugin.CurrentTab.CurrentChannel = new UsedChannel Plugin.CurrentTab.CurrentChannel = new UsedChannel
{ {
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;
@@ -274,22 +328,40 @@ internal sealed unsafe class Chat : IDisposable
return; return;
} }
SetChannel((InputChannel) replyMode); SetChannel((InputChannel)replyMode);
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 +369,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 +398,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,7 +419,15 @@ 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> /// <summary>
@@ -346,17 +450,22 @@ internal sealed unsafe class Chat : IDisposable
{ {
if (idx > 7) if (idx > 7)
return false; return false;
return InfoProxyLinkshell.Instance()->LinkShells[(int) idx].Id != 0; return InfoProxyLinkshell.Instance()->LinkShells[(int)idx].Id != 0;
} }
internal static bool ValidCrossLinkshell(uint idx) internal static bool ValidCrossLinkshell(uint idx)
{ {
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,13 +474,13 @@ 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. // Iterate up to 8 times to find a valid linkshell.
for (var i = 0; i < 8; i++) 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))
return currentIndex; return currentIndex;
} }
@@ -379,27 +488,40 @@ 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;
@@ -427,11 +549,21 @@ 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 // param6 is 0 for contentId and 1 for objectId
// param7 is always 0 ? // param7 is always 0 ?
@@ -446,7 +578,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 +617,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 +653,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 +683,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();
@@ -524,7 +697,7 @@ internal sealed unsafe class Chat : IDisposable
{ {
var uC = Utf8String.FromString(c.ToString()); var uC = Utf8String.FromString(c.ToString());
uC->SanitizeString((AllowedEntities) 0x27F); uC->SanitizeString((AllowedEntities)0x27F);
var wasValid = uC->ToString().Length > 0; var wasValid = uC->ToString().Length > 0;
uC->Dtor(true); uC->Dtor(true);
@@ -537,7 +710,7 @@ internal sealed unsafe class Chat : IDisposable
var ok = Plugin.GameConfig.TryGet(UiConfigOption.LogNameType, out uint type); var ok = Plugin.GameConfig.TryGet(UiConfigOption.LogNameType, out uint type);
if (!ok || !Enum.IsDefined(typeof(PlayerNameDisplayType), type)) if (!ok || !Enum.IsDefined(typeof(PlayerNameDisplayType), type))
return PlayerNameDisplayType.FullName; return PlayerNameDisplayType.FullName;
return (PlayerNameDisplayType) type; return (PlayerNameDisplayType)type;
} }
internal string AbbreviatePlayerName(string playerName) internal string AbbreviatePlayerName(string playerName)
@@ -557,10 +730,13 @@ 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,
}; };
} }
@@ -571,6 +747,7 @@ internal sealed unsafe class Chat : IDisposable
// second before the cutscene actually starts, because the game sets // second before the cutscene actually starts, because the game sets
// the cutscene conditions before processing the skip. // 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);
} }
} }
+20 -4
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;
@@ -16,6 +16,21 @@ public unsafe class ChatBox
} }
public static void SendMessage(string message) public static void SendMessage(string message)
{
var bytes = ValidateMessage(message);
SendMessageUnsafe(bytes);
}
// Validation split out so the deterministic checks (UTF-8 length, sanitise
// round-trip) can run in xUnit without ClientStructs game memory. The
// sanitiser is injectable so tests can pin throw behaviour without invoking
// Utf8String->SanitizeString, which only resolves in-process. Returns the
// already-encoded bytes so SendMessage doesn't pay GetBytes twice.
// 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,17 +39,18 @@ 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);
+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)
+37 -12
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; }
@@ -81,7 +89,8 @@ internal unsafe class GameFunctions : IDisposable
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;
@@ -164,14 +173,15 @@ internal unsafe class GameFunctions : IDisposable
{ {
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
{ {
// 6.05: 8443DD // 6.05: 8443DD
if (*(uint*) ((nint) lfg + 0x2C20) > 0) if (*(uint*)((nint)lfg + 0x2C20) > 0)
lfg->Hide(); lfg->Hide();
else else
lfg->Show(); lfg->Show();
@@ -197,7 +207,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;
@@ -239,9 +256,10 @@ internal unsafe class GameFunctions : IDisposable
{ {
var agent = AgentChatLog.Instance(); var agent = AgentChatLog.Instance();
// case 3 // case 3
var value = new AtkValue { Type = ValueType.Int, Int = 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,7 +268,12 @@ 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 // The detour is only invoked through the hook, so the hook should
// never be null here, but the nullable field declaration forces us // never be null here, but the nullable field declaration forces us
@@ -258,7 +281,7 @@ internal unsafe class GameFunctions : IDisposable
if (ResolveTextCommandPlaceholderHook is null) if (ResolveTextCommandPlaceholderHook is null)
return nint.Zero; return nint.Zero;
var placeholder = MemoryHelper.ReadStringNullTerminated((nint) placeholderText); var placeholder = MemoryHelper.ReadStringNullTerminated((nint)placeholderText);
if (ReplacementName == null || placeholder != Placeholder) if (ReplacementName == null || placeholder != Placeholder)
return ResolveTextCommandPlaceholderHook.Original(a1, placeholderText, a3, a4); return ResolveTextCommandPlaceholderHook.Original(a1, placeholderText, a3, a4);
@@ -268,7 +291,9 @@ internal unsafe class GameFunctions : IDisposable
var byteCount = System.Text.Encoding.UTF8.GetByteCount(ReplacementName); var byteCount = System.Text.Encoding.UTF8.GetByteCount(ReplacementName);
if (byteCount >= PlaceholderBufferSize) if (byteCount >= PlaceholderBufferSize)
{ {
Plugin.Log.Warning($"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);
} }
+74 -28
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,10 +471,18 @@ 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);
if (bits < currentBest.Item3) if (bits < currentBest.Item3)
return; return;
@@ -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)
{ {
@@ -494,11 +540,11 @@ internal unsafe class KeybindManager : IDisposable {
var key2 = outData.KeySettings[1]; var key2 = outData.KeySettings[1];
return new Keybind return new Keybind
{ {
Key1 = RemapInvalidVirtualKey((VirtualKey) key1.Key), Key1 = RemapInvalidVirtualKey((VirtualKey)key1.Key),
Modifier1 = (ModifierFlag) key1.KeyModifier, Modifier1 = (ModifierFlag)key1.KeyModifier,
Key2 = RemapInvalidVirtualKey((VirtualKey) key2.Key), Key2 = RemapInvalidVirtualKey((VirtualKey)key2.Key),
Modifier2 = (ModifierFlag) key2.KeyModifier, Modifier2 = (ModifierFlag)key2.KeyModifier,
}; };
} }
@@ -507,8 +553,8 @@ internal unsafe class KeybindManager : IDisposable {
return key switch return key switch
{ {
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);
} }
+1 -3
View File
@@ -4,7 +4,7 @@
0.1.0 is our bootstrap release; the underlying Chat 2 base is 0.1.0 is our bootstrap release; the underlying Chat 2 base is
called out in the yaml changelog so users can see what it called out in the yaml changelog so users can see what it
derives from. --> derives from. -->
<Version>1.3.0</Version> <Version>1.4.3</Version>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<!-- Honor packages.lock.json on restore so floating version ranges <!-- Honor packages.lock.json on restore so floating version ranges
@@ -80,7 +80,6 @@
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
<!-- Plugin icon. Copy images/* into the build output so Dalamud <!-- Plugin icon. Copy images/* into the build output so Dalamud
finds the icon next to the DLL, and let the SDK default finds the icon next to the DLL, and let the SDK default
DalamudPackager pipeline include the same path in the DalamudPackager pipeline include the same path in the
@@ -94,5 +93,4 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
</ItemGroup> </ItemGroup>
</Project> </Project>
+156 -50
View File
@@ -31,32 +31,54 @@ description: |-
- Independent plugin state — own config file and database directory, - Independent plugin state — own config file and database directory,
so Hellion Chat does not share state with upstream Chat 2 so Hellion Chat does not share state with upstream Chat 2
v1.1.0 — Theme engine with five built-in themes (Hellion Arctic,
Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint Grove) plus
JSON-based custom-theme authoring. Settings rebuilt around a card
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 v1.3.0 First plugin integration cycle. Honorific custom titles
are shown in the chat header above the message log, with auto-detect are shown in the chat header above the message log, with auto-detect
and silent fallback when Honorific is not installed. 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.
v1.4.1 — Theme Engine Performance plus a tenth built-in.
HellionStyle.PushGlobal reads pre-computed ABGR values from a
per-theme cache instead of converting RGBA per slot per frame
(~13 % render-time recovery in typical scenes). Custom-theme
hot-reload survives transient file locks (editor mid-save
keeps the last-known-good snapshot). Synthwave Sunset joins
as the tenth built-in theme — Hot Magenta + Cyan on midnight
violet, 80s neon-grid vibes.
v1.4.2 — ChatLog Frame-Hot-Path. Three per-frame allocation
patterns gone from the chat-log render path: card-mode borders
hoist invariants out of the per-message loop, auto-tell tab
tint and icon get a per-tab cache, and the status bar gates
its tab aggregation behind the same one-second cache it uses
for the format strings.
v1.4.3 — Plugin-Load Async-Init plus Repo-Cutover. Plugin
migrated to Dalamud's IAsyncDalamudPlugin so the heavy work
(migrations, service allocations, window construction, hook
subscription) runs in LoadAsync without blocking Dalamud's
UI. Schema-gate replaces the v9 → v16 migration chain;
configs on schema v16+ load directly. Custom-repo URL moves
to gitea.hellion-forge.cloud, the GitHub repo stays as a
frozen v1.4.2 snapshot.
Based on Chat 2 by Infi and Anna, licensed under EUPL-1.2. Based on Chat 2 by Infi and Anna, licensed under EUPL-1.2.
Modding & support: join the Hellion Forge Discord at Modding & support: join the Hellion Forge Discord at
https://discord.gg/X9V7Kcv5gR — community for Hellion Chat and https://discord.gg/X9V7Kcv5gR — community for Hellion Chat and
other Hellion Online Media plugins/tools. other Hellion Online Media plugins/tools.
repo_url: https://github.com/JonKazama-Hellion/HellionChat repo_url: https://gitea.hellion-forge.cloud/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
@@ -64,52 +86,136 @@ tags:
- Replacement - Replacement
- Privacy - Privacy
changelog: |- changelog: |-
**Hellion Chat 1.3.0 - Plugin Integrations: Honorific** **Hellion Chat 1.4.3 — Plugin-Load Async-Init + Repo-Cutover (2026-05-08)**
First step on the plugin-integration roadmap. HellionChat now Plugin lifecycle migrated to Dalamud's `IAsyncDalamudPlugin`
listens to Honorific and shows your custom title in the chat API. The constructor now does only the bootstrap-essentials
header. The slot auto-hides when Honorific is not installed, (config load, language init, conflict detection); migrations,
when no custom title is active, or when you are using the service allocations, window construction and hook subscription
original FFXIV title. move to LoadAsync. Dalamud can keep its UI responsive while the
heavy work runs.
- New "Integrations" settings tab - IAsyncDalamudPlugin two-phase load with per-line CaptureFailure
- Honorific integration with auto-detection and live updates in DisposeAsync (mirrors LightlessSync's pattern); idempotency
- "Coming soon" preview of the next five planned integrations: guard protects against reload races
context menu actions, smart notifications, RP status block, - Schema-gate replaces the v9 → v16 migration chain. Configs
ExtraChat channels, and quick DM compose on schema v16+ load directly; older configs trigger an
- Maintainer attribution buttons for Honorific repo and Caraxi "install v1.4.2 first" error so the historic migration
- New service-class pattern under HellionChat/Integrations/ path stays intact
- AutoTranslate.PreloadCache moved off the load path. First
use may have a sub-second hitch instead of every-load; the
upstream chose differently, we accept first-use latency
- FontManager.BuildFonts is called sync at the start of
LoadAsync; Dalamud rebuilds the font atlas on its own
pipeline so the custom Hellion-Exo2 font appears with a
brief font-pop after load (matches ChatTwo's behaviour)
- Custom-repo URL moved to gitea.hellion-forge.cloud/
JonKazama-Hellion/HellionChat. GitHub repo stays as a
frozen v1.4.2 snapshot; new releases ship from Gitea.
Existing testers need to update the custom-repo URL once
- Plugin-load time in this release sits at ~3.7 s median
(5 reloads), comparable to v1.4.2. Async migration is
foundational for v1.4.4 Lazy-Init optimisations rather
than an immediate user-perceived win
Modding and support: join Hellion Forge - https://discord.gg/X9V7Kcv5gR Modding & support: join Hellion Forge https://discord.gg/X9V7Kcv5gR
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2). Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
**Hellion Chat 1.2.3 — Theme Expansion** **Hellion Chat 1.4.2 — ChatLog Frame-Hot-Path**
Four new built-in themes round out the picker. No engine changes, Third sub-patch of the v1.4.x Polish Sweep series. Per-frame
no settings touched — just more colour options. allocations from the chat-log render path eliminated.
- **Night Blue** — Royal Blue on deep marine. Cool tech-dashboard - DrawMessages card-mode hoists theme/drawList/winLeft/winRight/
mood, distinct from the brand themes. borderColorAbgr out of the per-message loop. About 500
- **Indigo Violet** — Royal Violet on deep indigo with a turquoise- redundant calls per frame at 100 visible messages, multiplied
mint counter for an aurora glitter feel. Sister to Event Horizon by every pop-out window
but darker and denser; the turquoise accent keeps the two - Auto-tell tab tint and icon use a per-tab cache. Hash
distinguishable. computation and string allocation only happen when the tell
- **Forge Merchantman** — Patina bronze on workshop slate, warm target name or world drifts. AutoTellTabTint stays a pure
amber counter. Hellion Forge given a theme of its own — sister hash helper; cache lives in a thin TabTintCache wrapper
to Hellion Arctic but greener and warmer instead of cold cyan. - Status bar gates its tab aggregation behind the same
- **Hellion Spectrum** — Deuteran/Protan-safe channel colours one-second cache it already used for the format strings.
using Wong/Okabe-Ito palette tones. Channel identity (Tell pink, LINQ Sum and Count replaced with a single foreach pass
Yell yellow, Shout orange, Party blue, FC green) is preserved; that runs on roughly 1% of frames
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 Realistic frame-time recovery: 2-5% in typical scenes, more
Arctic). Existing custom themes keep working. on pop-out-heavy setups because the card-border hoist scales
per window.
Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
**Hellion Chat 1.4.1 — Theme Engine Performance**
Second sub-patch of the v1.4.x Polish Sweep series. Heap
pressure from the theme engine's per-frame render path
removed, plus a tenth built-in theme and hardening for
the custom-theme hot-reload.
- Theme records carry a pre-computed ABGR-packed cache
for every color slot; cache is filled when the theme
is registered and refreshed defensively on every
Switch()
- HellionStyle.PushGlobal reads ABGR values from the
cache instead of calling ColourUtil.RgbaToAbgr per
slot per frame; ~13 % render-time recovery measured
in typical scenes (plan estimate was 26 %, real
~1015 %)
- ThemeRegistry custom-theme reload distinguishes a
recoverable file lock (editor mid-save) from a
permanent IO failure; locked themes keep their
last-known-good snapshot and retry on the next
lookup instead of dropping out of the picker
- New built-in: Synthwave Sunset — Hot Magenta + Cyan
on midnight violet, 80s neon-grid vibes; tenth theme
in the picker
- Author credits refreshed: brand themes are credited
as "Hellion Forge"; Mint Grove and Forge Merchantman
now credited to Carla Beleandis as a community thanks
No schema bump, no user-visible behaviour change other
than smoother frames on GC-sensitive setups and one
additional colour option.
Modding & support: join Hellion Forge — https://discord.gg/X9V7Kcv5gR
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
**Hellion Chat 1.4.0 — Critical Lifecycle Fixes**
First sub-patch of the v1.4.x Polish Sweep series. Seven
known lifecycle and race bugs eliminated before any
performance refactor sits on top.
- MessageStore disposal no longer triggers GC.Collect
globally; Pooling=false on the SQLite connection means
there's nothing left to clean up by hand
- PendingMessage and RetentionSweep worker threads are
explicitly marked IsBackground=true so the plugin domain
can unload during XIVLauncher reload without waiting
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). Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
--- ---
Earlier history: https://github.com/JonKazama-Hellion/HellionChat/releases Earlier history: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases
+33 -21
View File
@@ -39,7 +39,11 @@ 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;
@@ -61,16 +65,15 @@ internal sealed class HonorificService : IDisposable
// schedule the initial pull onto the framework thread via // schedule the initial pull onto the framework thread via
// IFramework.RunOnFrameworkThread so the IPC call sees the right // IFramework.RunOnFrameworkThread so the IPC call sees the right
// thread context. // thread context.
_apiVersion = pluginInterface _apiVersion = pluginInterface.GetIpcSubscriber<(uint, uint)>($"{IpcNamespace}.ApiVersion");
.GetIpcSubscriber<(uint, uint)>($"{IpcNamespace}.ApiVersion"); _getLocalCharacterTitle = pluginInterface.GetIpcSubscriber<string>(
_getLocalCharacterTitle = pluginInterface $"{IpcNamespace}.GetLocalCharacterTitle"
.GetIpcSubscriber<string>($"{IpcNamespace}.GetLocalCharacterTitle"); );
_localCharacterTitleChanged = pluginInterface _localCharacterTitleChanged = pluginInterface.GetIpcSubscriber<string, object>(
.GetIpcSubscriber<string, object>($"{IpcNamespace}.LocalCharacterTitleChanged"); $"{IpcNamespace}.LocalCharacterTitleChanged"
_ready = pluginInterface );
.GetIpcSubscriber<object>($"{IpcNamespace}.Ready"); _ready = pluginInterface.GetIpcSubscriber<object>($"{IpcNamespace}.Ready");
_disposing = pluginInterface _disposing = pluginInterface.GetIpcSubscriber<object>($"{IpcNamespace}.Disposing");
.GetIpcSubscriber<object>($"{IpcNamespace}.Disposing");
_localCharacterTitleChanged.Subscribe(OnTitleChanged); _localCharacterTitleChanged.Subscribe(OnTitleChanged);
_ready.Subscribe(OnReady); _ready.Subscribe(OnReady);
@@ -103,9 +106,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;
@@ -142,7 +147,8 @@ internal sealed class HonorificService : IDisposable
// Honorific (e.g. version mismatch). Subscription stays live in case a // Honorific (e.g. version mismatch). Subscription stays live in case a
// compatible Honorific reloads, in which case Ready triggers TryInitialPull // compatible Honorific reloads, in which case Ready triggers TryInitialPull
// and sets IsAvailable back to true. // and sets IsAvailable back to true.
if (!IsAvailable) return; if (!IsAvailable)
return;
CurrentTitle = ParseTitleJson(json); CurrentTitle = ParseTitleJson(json);
} }
@@ -233,13 +239,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;
} }
} }
+21 -6
View File
@@ -15,8 +15,14 @@ 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; }
@@ -25,16 +31,25 @@ public sealed class ExtraChat : IDisposable
// Reference assignment is atomic on x64, but the JIT (especially Mono on Wine/Linux) needs // Reference assignment is atomic on x64, but the JIT (especially Mono on Wine/Linux) needs
// the volatile barrier to guarantee visibility across threads. 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);
+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)
{ {
+91 -32
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;
@@ -66,10 +66,21 @@ internal class MessageManager : IAsyncDisposable
Store = new MessageStore(DatabasePath()); Store = new MessageStore(DatabasePath());
PendingMessageThread = new Thread(() => ProcessPendingMessages(PendingThreadCancellationToken.Token)); // IsBackground so a stuck worker never blocks plugin unload.
// Cooperative cancel via PendingThreadCancellationToken first, background flag is the safety net.
PendingMessageThread = new Thread(() =>
ProcessPendingMessages(PendingThreadCancellationToken.Token)
)
{
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;
@@ -85,19 +96,23 @@ internal class MessageManager : IAsyncDisposable
Plugin.ChatGui.ChatMessageUnhandled -= ChatMessage; Plugin.ChatGui.ChatMessageUnhandled -= ChatMessage;
await PendingThreadCancellationToken.CancelAsync(); await PendingThreadCancellationToken.CancelAsync();
var timeout = 10_000; // 10s
while (timeout > 0)
{
if (!PendingMessageThread.IsAlive)
break;
timeout -= 100; // 10s cooperative window; Thread.Abort is gone since .NET 5, so a
// stuck worker has to ride out the next AppDomain unload.
var deadline = TimeSpan.FromSeconds(10);
var stopwatch = Stopwatch.StartNew();
while (stopwatch.Elapsed < deadline && PendingMessageThread.IsAlive)
await Task.Delay(100); await Task.Delay(100);
Plugin.Log.Debug("Sleeping because PendingMessageThread thread still alive");
}
// CancellationTokenSource owns an unmanaged WaitHandle; dispose after the if (PendingMessageThread.IsAlive)
// worker thread has drained, otherwise it leaks across plugin reloads. Plugin.Log.Warning(
"PendingMessageThread did not observe cancellation within 10s. "
+ "Worker remains on a 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();
@@ -175,7 +190,10 @@ internal class MessageManager : IAsyncDisposable
// AutoTellTabsService, ein DB-Refilter würde sie nur partial // AutoTellTabsService, ein DB-Refilter würde sie nur partial
// wiederherstellen falls Tells in DB liegen, oder leer lassen wenn // wiederherstellen falls Tells in DB liegen, oder leer lassen wenn
// Privacy-Filter sie blockiert hat. // Privacy-Filter sie blockiert hat.
var pendingTabs = Plugin.Config.Tabs.Where(t => !t.IsTempTab).Select(tab => (tab, new List<Message>())).ToList(); 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);
@@ -184,7 +202,8 @@ internal class MessageManager : IAsyncDisposable
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);
@@ -218,6 +237,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);
@@ -246,11 +266,25 @@ internal class MessageManager : IAsyncDisposable
// message's content ID. If multiple messages are received in the same tick, // message's content ID. If multiple messages are received in the same tick,
// this will be called for each message immediately after ChatMessage is // this will be called for each message immediately after ChatMessage is
// called for each message. // called for each message.
private unsafe void ContentIdResolver(RaptureLogModule* agent, ulong contentId, ulong accountId, int messageIndex, ushort worldId, ushort chatType) private unsafe void ContentIdResolver(
RaptureLogModule* agent,
ulong contentId,
ulong accountId,
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;
@@ -265,7 +299,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)
@@ -274,13 +312,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);
@@ -288,7 +349,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);
@@ -305,16 +368,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,
};
} }
} }
+175 -62
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)
);
} }
} }
@@ -119,8 +130,13 @@ internal class MessageStore : IDisposable
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,11 +147,12 @@ internal class MessageStore : IDisposable
public void Dispose() public void Dispose()
{ {
// Pooling=false (set in Connect) avoids ClearAllPools, which is
// provider-wide and 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();
// Closing the connection doesn't immediately release the file.
GC.Collect();
GC.WaitForPendingFinalizers();
} }
private SqliteConnection Connect() private SqliteConnection Connect()
@@ -192,7 +209,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)
@@ -209,7 +227,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);
} }
@@ -217,10 +236,12 @@ 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 -- 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);
} }
@@ -228,11 +249,13 @@ 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 -- 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);
} }
@@ -262,12 +285,15 @@ internal class MessageStore : IDisposable
// user_version was never bumped, just record the version 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 -- Migration 3: Fix log kinds to fit the new format
-- Add new ChatType, SourceKind, TargetKind (byte), SortCodeV2 -- Add new ChatType, SourceKind, TargetKind (byte), SortCodeV2
-- Migrate OldChatColumn -- Migrate OldChatColumn
@@ -292,7 +318,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);
} }
@@ -324,7 +351,8 @@ internal class MessageStore : IDisposable
{ {
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())
@@ -342,13 +370,22 @@ internal class MessageStore : IDisposable
/// computed from "now" at call time. Runs VACUUM only if anything was /// computed from "now" at call time. Runs VACUUM only if anything was
/// removed. Returns the number of rows deleted. /// removed. Returns the number of rows deleted.
/// </summary> /// </summary>
internal long DeleteByRetentionPolicy(IReadOnlyDictionary<int, int> chatTypeDaysMap, 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();
@@ -380,10 +417,13 @@ internal class MessageStore : IDisposable
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)
@@ -410,7 +450,9 @@ internal class MessageStore : IDisposable
{ {
// Defensive: refuse a "delete everything" disguised as a filter. // Defensive: refuse a "delete everything" disguised as a filter.
// Use ClearMessages() if a full wipe is actually intended. // 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."); throw new InvalidOperationException(
"CleanupRetainOnly requires at least one allowed ChatType. Use ClearMessages for a full wipe."
);
} }
long deleted; long deleted;
@@ -427,15 +469,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()
@@ -460,7 +506,8 @@ internal class MessageStore : IDisposable
} }
using var cmd = Connection.CreateCommand(); using var cmd = Connection.CreateCommand();
cmd.CommandText = @" cmd.CommandText =
@"
INSERT INTO messages ( INSERT INTO messages (
Id, Id,
Receiver, Receiver,
@@ -512,10 +559,22 @@ 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();
@@ -531,7 +590,8 @@ internal class MessageStore : IDisposable
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();
@@ -543,7 +603,8 @@ 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, Receiver,
@@ -558,7 +619,9 @@ internal class MessageStore : IDisposable
ContentSource, ContentSource,
ExtraChatChannel 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;
@@ -576,7 +639,11 @@ internal class MessageStore : IDisposable
/// <param name="receiver">The receiver content ID to filter by. If null, no filtering is performed.</param> /// <param name="receiver">The receiver content ID to filter by. If null, no filtering is performed.</param>
/// <param name="since">Only show messages since this date. If null, no filtering is performed.</param> /// <param name="since">Only show messages since this date. If null, no filtering is performed.</param>
/// <param name="count">The amount to return. Defaults to 10,000.</param> /// <param name="count">The amount to return. Defaults to 10,000.</param>
internal MessageEnumerator GetMostRecentMessages(ulong? receiver = null, DateTimeOffset? since = null, int count = MessageQueryLimit) internal MessageEnumerator GetMostRecentMessages(
ulong? receiver = null,
DateTimeOffset? since = null,
int count = MessageQueryLimit
)
{ {
List<string> whereClauses = ["deleted = false"]; List<string> whereClauses = ["deleted = false"];
if (receiver != null) if (receiver != null)
@@ -589,7 +656,8 @@ internal class MessageStore : IDisposable
var cmd = Connection.CreateCommand(); var cmd = Connection.CreateCommand();
// Select last N messages by date DESC, but reverse the order to get // Select last N messages by date DESC, but reverse the order to get
// them in ascending order. // them in ascending order.
cmd.CommandText = @" cmd.CommandText =
@"
SELECT * SELECT *
FROM ( FROM (
SELECT SELECT
@@ -606,7 +674,9 @@ internal class MessageStore : IDisposable
ContentSource, ContentSource,
ExtraChatChannel ExtraChatChannel
FROM messages FROM messages
" + whereClause + @" "
+ whereClause
+ @"
ORDER BY Date DESC ORDER BY Date DESC
LIMIT $Count LIMIT $Count
) )
@@ -644,7 +714,8 @@ internal class MessageStore : IDisposable
string senderName, string senderName,
uint senderWorld, uint senderWorld,
int limit, int limit,
int sqlScanLimit = 500) int sqlScanLimit = 500
)
{ {
if (limit <= 0) if (limit <= 0)
{ {
@@ -652,7 +723,8 @@ internal class MessageStore : IDisposable
} }
using var cmd = Connection.CreateCommand(); using var cmd = Connection.CreateCommand();
cmd.CommandText = @" cmd.CommandText =
@"
SELECT SELECT
Id, Id,
Receiver, Receiver,
@@ -713,7 +785,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();
@@ -728,7 +805,8 @@ internal class MessageStore : IDisposable
// Select last N messages by date DESC, but reverse the order to get // Select last N messages by date DESC, but reverse the order to get
// them in ascending order. // them in ascending order.
cmd.CommandText = @" cmd.CommandText =
@"
SELECT COUNT(*) SELECT COUNT(*)
FROM messages FROM messages
" + whereClause; " + whereClause;
@@ -736,14 +814,19 @@ internal class MessageStore : IDisposable
if (receiver != null) if (receiver != null)
cmd.Parameters.AddWithValue("$Receiver", receiver); cmd.Parameters.AddWithValue("$Receiver", receiver);
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; // this could take a while on slow computers
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();
@@ -758,7 +841,8 @@ internal class MessageStore : IDisposable
// Select last N messages by date DESC, but reverse the order to get // Select last N messages by date DESC, but reverse the order to get
// them in ascending order. // them in ascending order.
cmd.CommandText = @" cmd.CommandText =
@"
SELECT SELECT
Id, Id,
Receiver, Receiver,
@@ -779,13 +863,19 @@ internal class MessageStore : IDisposable
if (receiver != null) if (receiver != null)
cmd.Parameters.AddWithValue("$Receiver", receiver); cmd.Parameters.AddWithValue("$Receiver", receiver);
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());
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();
@@ -800,7 +890,8 @@ internal class MessageStore : IDisposable
// Select last N messages by date DESC, but reverse the order to get // Select last N messages by date DESC, but reverse the order to get
// them in ascending order. // them in ascending order.
cmd.CommandText = @" cmd.CommandText =
@"
SELECT SELECT
Id, Id,
Receiver, Receiver,
@@ -815,7 +906,9 @@ internal class MessageStore : IDisposable
ContentSource, ContentSource,
ExtraChatChannel ExtraChatChannel
FROM messages FROM messages
" + whereClause + @" "
+ whereClause
+ @"
ORDER BY Date ORDER BY Date
LIMIT $Offset, $OffsetCount; LIMIT $Offset, $OffsetCount;
"; ";
@@ -824,8 +917,8 @@ internal class MessageStore : IDisposable
if (receiver != null) if (receiver != null)
cmd.Parameters.AddWithValue("$Receiver", receiver); cmd.Parameters.AddWithValue("$Receiver", receiver);
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.Parameters.AddWithValue("$Offset", DbViewer.RowPerPage * page); cmd.Parameters.AddWithValue("$Offset", DbViewer.RowPerPage * page);
cmd.Parameters.AddWithValue("$OffsetCount", DbViewer.RowPerPage); cmd.Parameters.AddWithValue("$OffsetCount", DbViewer.RowPerPage);
@@ -851,7 +944,10 @@ 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;
@@ -875,11 +971,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)
); );
} }
@@ -914,6 +1026,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();
+182 -50
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);
@@ -302,7 +327,7 @@ public sealed class PayloadHandler
if (!chatRect.HasOverlap(addonRect)) if (!chatRect.HasOverlap(addonRect))
{ {
atkBase->SetPosition((short) addonRect.X, (short) addonRect.Y); atkBase->SetPosition((short)addonRect.X, (short)addonRect.Y);
return; return;
} }
@@ -320,7 +345,7 @@ public sealed class PayloadHandler
if (!chatRect.HasOverlap(addonRect)) if (!chatRect.HasOverlap(addonRect))
{ {
atkBase->SetPosition((short) addonRect.X, (short) addonRect.Y); atkBase->SetPosition((short)addonRect.X, (short)addonRect.Y);
return; return;
} }
@@ -329,7 +354,7 @@ public sealed class PayloadHandler
var y = Math.Clamp(chatRect.SizeY - atkSize.Y, 0, float.MaxValue); var y = Math.Clamp(chatRect.SizeY - atkSize.Y, 0, float.MaxValue);
y -= isTop ? 0 : Plugin.Config.TooltipOffset; // offset to prevent cut-off on the bottom y -= isTop ? 0 : Plugin.Config.TooltipOffset; // offset to prevent cut-off on the bottom
atkBase->SetPosition((short) x, (short) y); atkBase->SetPosition((short)x, (short)y);
} }
private const float MaxInlineIconSize = 32f; private const float MaxInlineIconSize = 32f;
@@ -339,20 +364,25 @@ public sealed class PayloadHandler
if (icon.Size.X <= 0 || icon.Size.Y <= 0) if (icon.Size.X <= 0 || icon.Size.Y <= 0)
return; return;
var width = (float) icon.Size.X; var width = (float)icon.Size.X;
var height = (float) icon.Size.Y; var height = (float)icon.Size.Y;
var scale = Math.Min(1f, Math.Min(MaxInlineIconSize / width, MaxInlineIconSize / height)); var scale = Math.Min(1f, Math.Min(MaxInlineIconSize / width, MaxInlineIconSize / height));
var size = ImGuiHelpers.ScaledVector2(width * scale, height * scale); var size = ImGuiHelpers.ScaledVector2(width * scale, height * scale);
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;
@@ -615,12 +696,18 @@ public sealed class PayloadHandler
if (world.Value.IsPublic) if (world.Value.IsPublic)
{ {
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,8 +793,11 @@ public sealed class PayloadHandler
} }
} }
if (GameFunctions.GameFunctions.IsMentor() && ImGui.Selectable(Language.Context_InviteToNoviceNetwork)) if (
GameFunctions.Context.InviteToNoviceNetwork(player.PlayerName, (ushort) world.RowId); GameFunctions.GameFunctions.IsMentor()
&& ImGui.Selectable(Language.Context_InviteToNoviceNetwork)
)
GameFunctions.Context.InviteToNoviceNetwork(player.PlayerName, (ushort)world.RowId);
} }
var inputChannel = chunk.Message?.Code.Type.ToInputChannel(); var inputChannel = chunk.Message?.Code.Type.ToInputChannel();
@@ -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))
+385 -417
View File
File diff suppressed because it is too large Load Diff
+7 -3
View File
@@ -46,7 +46,8 @@ internal static class PrivacyDefaults
// here fall back to Configuration.RetentionDefaultDays. Reflects the // here fall back to Configuration.RetentionDefaultDays. Reflects the
// design spec: Tells 365, own-conversation channels 90, everything else // design spec: Tells 365, own-conversation channels 90, everything else
// shorter via the global default. // shorter via the global default.
internal static readonly IReadOnlyDictionary<ChatType, int> DefaultRetentionDays = 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,
@@ -89,7 +90,9 @@ internal static class PrivacyDefaults
// emote types, Novice Network), kept for a short 24-hour window so the // emote types, Novice Network), kept for a short 24-hour window so the
// last RP scene or shout trade is still searchable but third-party data // last RP scene or shout trade is still searchable but third-party data
// doesn't accumulate forever. // doesn't accumulate forever.
internal static readonly IReadOnlySet<ChatType> CasualWhitelist = new HashSet<ChatType>(PrivacyFirstWhitelist) internal static readonly IReadOnlySet<ChatType> CasualWhitelist = new HashSet<ChatType>(
PrivacyFirstWhitelist
)
{ {
ChatType.Say, ChatType.Say,
ChatType.Shout, ChatType.Shout,
@@ -99,7 +102,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,
+21 -13
View File
@@ -13,7 +13,8 @@ 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,37 +28,44 @@ 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()
),
}; };
} }
@@ -199,7 +207,7 @@ public static class ChatColourPresets
[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 // 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
@@ -234,7 +242,7 @@ public static class ChatColourPresets
{ {
// Standard / Tell — Royal Blue Akzent-Familie // 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 // Laute Channels — Warning/Danger Status-Töne
@@ -245,7 +253,7 @@ public static class ChatColourPresets
[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 // Linkshells 1-8 — über Spektrum verteilt
[ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(255, 184, 74), [ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(255, 184, 74),
@@ -279,7 +287,7 @@ public static class ChatColourPresets
{ {
// Standard / Tell — Royal Violet Akzent-Familie // Standard / Tell — Royal Violet Akzent-Familie
[ChatType.Say] = ColourUtil.ComponentsToRgba(240, 230, 255), // text-primary (light lavender) [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) // Laute Channels — geteilt mit Night Blue (Status-Farben)
@@ -290,7 +298,7 @@ public static class ChatColourPresets
[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 // Linkshells 1-8
[ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(255, 184, 74), [ChatType.Linkshell1] = ColourUtil.ComponentsToRgba(255, 184, 74),
@@ -0,0 +1,84 @@
using Dalamud.Bindings.ImGui;
using Dalamud.Plugin.SelfTest;
using HellionChat.Themes;
namespace HellionChat.SelfTests;
// Validates the runtime theme-switch contract from the user side. The
// caller toggles the active theme via Settings -> Theme & Layout, the
// step polls ThemeRegistry.Active per frame and only passes once the
// slug has moved away from the initial value and back. The ABGR cache
// is sanity-checked on every frame: a freshly switched theme must carry
// a populated cache, otherwise Switch() forgot the recompute and the UI
// would still draw, just with all-transparent slots.
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 proves the cache was actually recomputed for the
// current theme. We don't compare against a reference, because custom
// themes can legitimately share slot values with a built-in.
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"),
}) }
)
); );
} }
+16 -12
View File
@@ -12,47 +12,50 @@ 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 // Hellion Spectrum — Wong/Okabe-Ito tones within FFXIV channel
// identity. FC pulled slightly greener than vanilla cyan-teal so // identity. FC pulled slightly greener than vanilla cyan-teal so
@@ -78,6 +81,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: "Hellion Forge",
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
); );
+1 -3
View File
@@ -6,6 +6,4 @@ namespace HellionChat.Themes;
// User sie per Klick im Themes-Tab auf Configuration.ChatColours anwenden. // User sie per Klick im Themes-Tab auf Configuration.ChatColours anwenden.
// Ein Theme ohne ChatColors (z.B. chat2-classic) lässt die User-Channel- // Ein Theme ohne ChatColors (z.B. chat2-classic) lässt die User-Channel-
// Farben unverändert. // Farben unverändert.
public sealed record ThemeChatColors( public sealed record ThemeChatColors(IReadOnlyDictionary<ChatType, uint> Channels);
IReadOnlyDictionary<ChatType, uint> Channels
);
-5
View File
@@ -6,24 +6,19 @@ public sealed record ThemeColors(
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,
+42 -14
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
);
} }
} }
@@ -49,7 +70,13 @@ internal static class ThemeJsonLoader
// Value ist Hex wie bei den Theme-Colors. Unbekannte Channel-Names // Value ist Hex wie bei den Theme-Colors. Unbekannte Channel-Names
// werden still übersprungen — Forward-Compat falls SE neue Channels // werden still übersprungen — Forward-Compat falls SE neue Channels
// einführt. // einführt.
if (!Enum.TryParse<HellionChat.Code.ChatType>(prop.Name, ignoreCase: true, out var channel)) if (
!Enum.TryParse<HellionChat.Code.ChatType>(
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 +90,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"),
+47 -11
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 the ten .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,34 @@ 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 — idempotent and cheap, so any future theme source
// that forgets the cache fill still ends up with a populated one.
theme.RecomputeAbgrCache();
_active = theme;
}
// 0x80070020 = SHARING_VIOLATION, 0x80070021 = LOCK_VIOLATION. Other
// IO failures are permanent and get the theme dropped instead of retried.
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 werden lazy aus dem Verzeichnis geladen, Cache mit // Custom-Themes werden lazy aus dem Verzeichnis geladen, Cache mit
// LastWriteTime-Token. Eine geänderte JSON wird beim nächsten Lookup // LastWriteTime-Token. Eine geänderte JSON wird beim nächsten Lookup
// neu eingelesen. // neu eingelesen.
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 +110,21 @@ 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 the cached snapshot, leave the stamp
// alone so the next refresh retries automatically.
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;
} }
} }
+48 -54
View File
@@ -1,9 +1,10 @@
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;
@@ -35,9 +36,7 @@ public sealed class ChatInputBar
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. v0.6.0 belässt den Hauptfenster-Input wie er ist.
public void Render() public void Render() { }
{
}
// Compact rendering for pop-out windows. // Compact rendering for pop-out windows.
// //
@@ -78,71 +77,62 @@ public sealed class ChatInputBar
// window does it: via IsItemDeactivated + Enter, NOT EnterReturnsTrue // window does it: via IsItemDeactivated + Enter, NOT EnterReturnsTrue
// (matching v0.5.x ChatLogWindow.cs 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 for the compact input. Cursor math is
_state.Buffer = string.Empty; // delegated to CompactInputHistoryNavigator; only the ImGui buffer
_state.HistoryCursor = -1; // splice stays here because it needs the live callback data.
_host.SendChatBoxFromExternal(tab, text); // TEST-MIRROR: ../_Helpers/CompactInputHistoryNavigator.cs
}
// 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;
} }
@@ -173,7 +163,10 @@ public sealed class ChatInputBar
// Single-letter glyph derived from the channel — quick visual cue // Single-letter glyph derived from the channel — quick visual cue
// until we have a proper icon font available in the compact bar. // 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);
} }
@@ -198,7 +191,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",
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()
);
} }
} }
+184 -43
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();
} }
} }
@@ -176,12 +222,34 @@ public class DbViewer : Window
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 +257,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,19 +276,37 @@ 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
{ {
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();
// 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 +327,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 +345,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 +460,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 +505,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 +521,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 +589,4 @@ public class DbViewer : Window
} }
}); });
} }
} }
+27 -12
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;
@@ -40,7 +41,7 @@ public class DebuggerWindow : Window, IDisposable
public override unsafe void Draw() public override unsafe void Draw()
{ {
var agent = (nint) AgentItemDetail.Instance(); var agent = (nint)AgentItemDetail.Instance();
ImGui.TextUnformatted($"Current Cursor Pos: {ChatLogWindow.CursorPos}"); ImGui.TextUnformatted($"Current Cursor Pos: {ChatLogWindow.CursorPos}");
if (ImGui.Selectable($"Agent Address: {agent:X}")) if (ImGui.Selectable($"Agent Address: {agent:X}"))
ImGui.SetClipboardText(agent.ToString("X")); ImGui.SetClipboardText(agent.ToString("X"));
@@ -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()}"
);
} }
} }
+39 -15
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)
@@ -113,19 +135,21 @@ public sealed class FirstRunWizard : Window
private void ApplyPrivacyFirst() private void ApplyPrivacyFirst()
{ {
Plugin.Config.PrivacyFilterEnabled = true; Plugin.Config.PrivacyFilterEnabled = true;
Plugin.Config.PrivacyPersistChannels = [..PrivacyDefaults.PrivacyFirstWhitelist]; Plugin.Config.PrivacyPersistChannels = [.. PrivacyDefaults.PrivacyFirstWhitelist];
Plugin.Config.PrivacyPersistUnknownChannels = false; Plugin.Config.PrivacyPersistUnknownChannels = false;
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()
{ {
Plugin.Config.PrivacyFilterEnabled = true; Plugin.Config.PrivacyFilterEnabled = true;
Plugin.Config.PrivacyPersistChannels = [..PrivacyDefaults.CasualWhitelist]; Plugin.Config.PrivacyPersistChannels = [.. PrivacyDefaults.CasualWhitelist];
Plugin.Config.PrivacyPersistUnknownChannels = false; Plugin.Config.PrivacyPersistUnknownChannels = false;
Plugin.Config.RetentionEnabled = true; Plugin.Config.RetentionEnabled = true;
+59 -54
View File
@@ -1,7 +1,7 @@
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;
@@ -19,21 +19,21 @@ internal static class HellionStyle
/// </summary> /// </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;
} }
@@ -48,6 +48,7 @@ internal static class HellionStyle
{ {
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);
@@ -76,60 +77,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 the per-push opacity-modulated value,
// so they go through the RGBA path; everything else reads from 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 +140,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;
+34 -10
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;
@@ -27,7 +27,8 @@ internal class Popout : Window
// matching pop-out window when an LRU temp tab gets evicted. // 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;
@@ -59,7 +60,11 @@ 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;
@@ -169,7 +174,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,7 +233,7 @@ internal class Popout : Window
Cutscene, Cutscene,
CutsceneOverride, CutsceneOverride,
User, User,
Battle Battle,
} }
private HideState CurrentHideState = HideState.None; private HideState CurrentHideState = HideState.None;
@@ -244,7 +255,11 @@ internal class Popout : Window
} }
// if the chat has no hide state and in a cutscene, set the hide state to cutscene // if the chat has no hide state and in a cutscene, set the hide state to cutscene
if (Tab.HideDuringCutscenes && CurrentHideState == HideState.None && (Plugin.CutsceneActive || Plugin.GposeActive)) if (
Tab.HideDuringCutscenes
&& CurrentHideState == HideState.None
&& (Plugin.CutsceneActive || Plugin.GposeActive)
)
{ {
if (ChatLogWindow.Plugin.Functions.Chat.CheckHideFlags()) if (ChatLogWindow.Plugin.Functions.Chat.CheckHideFlags())
{ {
@@ -254,9 +269,15 @@ internal class Popout : Window
} }
// if the chat is hidden because of a cutscene and no longer in a cutscene, set the hide state to none // if the chat is hidden because of a cutscene and no longer in a cutscene, set the hide state to none
if (CurrentHideState is HideState.Cutscene or HideState.CutsceneOverride && !Plugin.CutsceneActive && !Plugin.GposeActive) if (
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;
} }
@@ -264,7 +285,9 @@ internal class Popout : Window
if (CurrentHideState == HideState.Cutscene && ChatLogWindow.Activate) if (CurrentHideState == HideState.Cutscene && ChatLogWindow.Activate)
{ {
CurrentHideState = HideState.CutsceneOverride; CurrentHideState = HideState.CutsceneOverride;
Plugin.Log.Verbose($"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 the user hid the chat and is now activating chat, reset the hide state
@@ -274,6 +297,7 @@ internal class Popout : Window
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);
} }
} }
+126 -59
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,29 +16,30 @@ 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;
DisableWindowSounds = true; DisableWindowSounds = true;
#if DEBUG #if DEBUG
Plugin.Commands.Register("/hellionSeString", showInHelp: false).Execute += Toggle; Plugin.Commands.Register("/hellionSeString", showInHelp: false).Execute += Toggle;
#endif #endif
} }
public void Dispose() public void Dispose()
{ {
#if DEBUG #if DEBUG
Plugin.Commands.Register("/hellionSeString", showInHelp: false).Execute -= Toggle; Plugin.Commands.Register("/hellionSeString", showInHelp: false).Execute -= Toggle;
#endif #endif
} }
private void Toggle(string _, string __) => Toggle(); private void Toggle(string _, string __) => Toggle();
@@ -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)
{ {
+56 -26
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;
} }
@@ -93,9 +96,11 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
// Pflicht — sonst triggert ESC auch wenn der User ein anderes Fenster // Pflicht — sonst triggert ESC auch wenn der User ein anderes Fenster
// fokussiert hat und ESC fürs Game-Menü drückt (Codebase-Pattern siehe // fokussiert hat und ESC fürs Game-Menü drückt (Codebase-Pattern siehe
// Util/SearchSelector.cs:37). // Util/SearchSelector.cs:37).
if (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;
@@ -150,7 +155,12 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
// der User in eine andere Section will, geht er zurück zur Overview // der User in eine andere Section will, geht er zurück zur Overview
// (Breadcrumb / ESC). // (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)
@@ -184,9 +194,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");
@@ -203,12 +220,14 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
// calculate all conditions before updating config // 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 // v1.2.0 — Refilter only if a filter-relevant setting actually
@@ -258,21 +277,26 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
private bool HasFilterRelevantChanges() private bool HasFilterRelevantChanges()
{ {
// Top-level privacy controls. // Top-level privacy controls.
if (Mutable.PrivacyFilterEnabled != Plugin.Config.PrivacyFilterEnabled) return true; if (Mutable.PrivacyFilterEnabled != Plugin.Config.PrivacyFilterEnabled)
if (Mutable.PrivacyPersistUnknownChannels != Plugin.Config.PrivacyPersistUnknownChannels) return true; return true;
if (!Mutable.PrivacyPersistChannels.SetEquals(Plugin.Config.PrivacyPersistChannels)) return true; if (Mutable.PrivacyPersistUnknownChannels != Plugin.Config.PrivacyPersistUnknownChannels)
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 in MessageManager.FilterAllTabs and is therefore filter-
// relevant even though it lives outside the Privacy block. // relevant even though it lives outside the Privacy block.
if (Mutable.FilterIncludePreviousSessions != Plugin.Config.FilterIncludePreviousSessions) return true; if (Mutable.FilterIncludePreviousSessions != Plugin.Config.FilterIncludePreviousSessions)
return true;
// Per-tab channel selection. Compare persistent tabs only — // Per-tab channel selection. Compare persistent tabs only —
// TempTabs are session-only and never refiltered anyway. // 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; // add or delete
for (var i = 0; i < origPersistent.Count; i++) for (var i = 0; i < origPersistent.Count; i++)
{ {
@@ -282,18 +306,24 @@ public sealed class SettingsWindow : Dalamud.Interface.Windowing.Window
// Identifier mismatch at the same index means reorder or // Identifier mismatch at the same index means reorder or
// a slot got swapped — treat as filter-relevant so the new // a slot got swapped — treat as filter-relevant so the new
// channel-selection layout actually applies. // channel-selection layout actually applies.
if (orig.Identifier != neu.Identifier) 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)> // SelectedChannels is a Dictionary<ChatType, (ChatSource, ChatSource)>
// — value-tuple equality already does the right thing per-pair. // — value-tuple equality already does the right thing per-pair.
if (orig.SelectedChannels.Count != neu.SelectedChannels.Count) 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;
} }
} }
+46 -8
View File
@@ -19,15 +19,39 @@ internal sealed class SettingsOverview
private static readonly (FontAwesomeIcon Icon, string TitleKey, string SubtextKey)[] CardDefs = private static readonly (FontAwesomeIcon Icon, string TitleKey, string SubtextKey)[] CardDefs =
[ [
(FontAwesomeIcon.SlidersH, "Settings_Card_General_Title", "Settings_Card_General_Subtext"), (FontAwesomeIcon.SlidersH, "Settings_Card_General_Title", "Settings_Card_General_Subtext"),
(FontAwesomeIcon.Palette, "Settings_Card_ThemeAndLayout_Title", "Settings_Card_ThemeAndLayout_Subtext"), (
(FontAwesomeIcon.Font, "Settings_Card_FontsAndColours_Title", "Settings_Card_FontsAndColours_Subtext"), FontAwesomeIcon.Palette,
(FontAwesomeIcon.WindowMaximize, "Settings_Card_Window_Title", "Settings_Card_Window_Subtext"), "Settings_Card_ThemeAndLayout_Title",
"Settings_Card_ThemeAndLayout_Subtext"
),
(
FontAwesomeIcon.Font,
"Settings_Card_FontsAndColours_Title",
"Settings_Card_FontsAndColours_Subtext"
),
(
FontAwesomeIcon.WindowMaximize,
"Settings_Card_Window_Title",
"Settings_Card_Window_Subtext"
),
(FontAwesomeIcon.Comments, "Settings_Card_Chat_Title", "Settings_Card_Chat_Subtext"), (FontAwesomeIcon.Comments, "Settings_Card_Chat_Title", "Settings_Card_Chat_Subtext"),
(FontAwesomeIcon.FolderTree, "Settings_Card_Tabs_Title", "Settings_Card_Tabs_Subtext"), (FontAwesomeIcon.FolderTree, "Settings_Card_Tabs_Title", "Settings_Card_Tabs_Subtext"),
(FontAwesomeIcon.ShieldAlt, "Settings_Card_Privacy_Title", "Settings_Card_Privacy_Subtext"), (FontAwesomeIcon.ShieldAlt, "Settings_Card_Privacy_Title", "Settings_Card_Privacy_Subtext"),
(FontAwesomeIcon.Database, "Settings_Card_DataManagement_Title", "Settings_Card_DataManagement_Subtext"), (
(FontAwesomeIcon.Plug, "Settings_Card_Integrations_Title", "Settings_Card_Integrations_Subtext"), FontAwesomeIcon.Database,
(FontAwesomeIcon.InfoCircle, "Settings_Card_Information_Title", "Settings_Card_Information_Subtext"), "Settings_Card_DataManagement_Title",
"Settings_Card_DataManagement_Subtext"
),
(
FontAwesomeIcon.Plug,
"Settings_Card_Integrations_Title",
"Settings_Card_Integrations_Subtext"
),
(
FontAwesomeIcon.InfoCircle,
"Settings_Card_Information_Title",
"Settings_Card_Information_Subtext"
),
]; ];
public SettingsOverview(SettingsWindow window) public SettingsOverview(SettingsWindow window)
@@ -57,7 +81,14 @@ internal sealed class SettingsOverview
} }
} }
private void DrawCard(int index, FontAwesomeIcon icon, string title, string subtext, float w, float h) private void DrawCard(
int index,
FontAwesomeIcon icon,
string title,
string subtext,
float w,
float h
)
{ {
// BeginGroup macht den Card-Bereich zu einem einzelnen ImGui-Layout-Item. // BeginGroup macht den Card-Bereich zu einem einzelnen ImGui-Layout-Item.
// Damit funktioniert SameLine() im Caller-Loop — sonst tracked ImGui die // Damit funktioniert SameLine() im Caller-Loop — sonst tracked ImGui die
@@ -94,7 +125,14 @@ internal sealed class SettingsOverview
// erweitern und das SameLine-Wrapping in der Card-Reihe brechen, daher // erweitern und das SameLine-Wrapping in der Card-Reihe brechen, daher
// bleibt der Subtext bewusst beim DrawList-Overlay-Pattern. // bleibt der Subtext bewusst beim DrawList-Overlay-Pattern.
var subtextWrapWidth = w - 32f; var subtextWrapWidth = w - 32f;
draw.AddText(ImGui.GetFont(), ImGui.GetFontSize(), subtextPos, subtextColor, subtext, subtextWrapWidth); draw.AddText(
ImGui.GetFont(),
ImGui.GetFontSize(),
subtextPos,
subtextColor,
subtext,
subtextWrapWidth
);
ImGui.EndGroup(); ImGui.EndGroup();
+80 -19
View File
@@ -1,11 +1,11 @@
using System.Numerics; using System.Numerics;
using HellionChat.Resources; using Dalamud.Bindings.ImGui;
using HellionChat.Util;
using Dalamud.Interface; using Dalamud.Interface;
using Dalamud.Interface.Colors; using Dalamud.Interface.Colors;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Bindings.ImGui; using HellionChat.Resources;
using HellionChat.Util;
namespace HellionChat.Ui.SettingsTabs; namespace HellionChat.Ui.SettingsTabs;
@@ -21,6 +21,7 @@ internal sealed class Chat : ISettingsTab
public string Name => HellionStrings.Settings_Tab_Chat + "###tabs-chat"; public string Name => HellionStrings.Settings_Tab_Chat + "###tabs-chat";
private SearchSelector.SelectorPopupOptions WordPopupOptions; private SearchSelector.SelectorPopupOptions WordPopupOptions;
// Snapshot of EmoteCache.State for which we last built WordPopupOptions. // Snapshot of EmoteCache.State for which we last built WordPopupOptions.
// Without this, an empty FilteredSheet (e.g., the user blocked every emote) // Without this, an empty FilteredSheet (e.g., the user blocked every emote)
// would trigger a refill every frame the settings tab is open. // would trigger a refill every frame the settings tab is open.
@@ -39,7 +40,9 @@ internal sealed class Chat : ISettingsTab
{ {
return new SearchSelector.SelectorPopupOptions return new SearchSelector.SelectorPopupOptions
{ {
FilteredSheet = EmoteCache.SortedCodeArray.Where(w => !Mutable.BlockedEmotes.Contains(w)).ToArray() FilteredSheet = EmoteCache
.SortedCodeArray.Where(w => !Mutable.BlockedEmotes.Contains(w))
.ToArray(),
}; };
} }
@@ -64,7 +67,10 @@ internal sealed class Chat : ISettingsTab
using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false)) using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
{ {
ImGui.Checkbox(HellionStrings.ChatLog_AutoTellTabs_Enable_Name, ref Mutable.EnableAutoTellTabs); ImGui.Checkbox(
HellionStrings.ChatLog_AutoTellTabs_Enable_Name,
ref Mutable.EnableAutoTellTabs
);
ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_Enable_Description); ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_Enable_Description);
ImGui.SetNextItemWidth(200f * ImGuiHelpers.GlobalScale); ImGui.SetNextItemWidth(200f * ImGuiHelpers.GlobalScale);
@@ -75,13 +81,22 @@ internal sealed class Chat : ISettingsTab
} }
ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_Limit_Description); ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_Limit_Description);
ImGui.Checkbox(HellionStrings.ChatLog_AutoTellTabs_Compact_Name, ref Mutable.AutoTellTabsCompactDisplay); ImGui.Checkbox(
HellionStrings.ChatLog_AutoTellTabs_Compact_Name,
ref Mutable.AutoTellTabsCompactDisplay
);
ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_Compact_Description); ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_Compact_Description);
ImGui.Checkbox(HellionStrings.ChatLog_AutoTellTabs_OpenAsPopout_Name, ref Mutable.AutoTellTabsOpenAsPopout); ImGui.Checkbox(
HellionStrings.ChatLog_AutoTellTabs_OpenAsPopout_Name,
ref Mutable.AutoTellTabsOpenAsPopout
);
ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_OpenAsPopout_Description); ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_OpenAsPopout_Description);
ImGui.Checkbox(HellionStrings.ChatLog_AutoTellTabs_GreetedToggle_Name, ref Mutable.AutoTellTabsShowGreetedToggle); ImGui.Checkbox(
HellionStrings.ChatLog_AutoTellTabs_GreetedToggle_Name,
ref Mutable.AutoTellTabsShowGreetedToggle
);
ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_GreetedToggle_Description); ImGuiUtil.HelpMarker(HellionStrings.ChatLog_AutoTellTabs_GreetedToggle_Description);
ImGui.Spacing(); ImGui.Spacing();
@@ -96,7 +111,14 @@ internal sealed class Chat : ISettingsTab
var preload = Mutable.AutoTellTabsHistoryPreload; var preload = Mutable.AutoTellTabsHistoryPreload;
ImGui.SetNextItemWidth(200f * ImGuiHelpers.GlobalScale); ImGui.SetNextItemWidth(200f * ImGuiHelpers.GlobalScale);
if (ImGui.SliderInt(HellionStrings.Privacy_AutoTellTabs_Preload_Name, ref preload, 0, 100)) if (
ImGui.SliderInt(
HellionStrings.Privacy_AutoTellTabs_Preload_Name,
ref preload,
0,
100
)
)
{ {
Mutable.AutoTellTabsHistoryPreload = preload; Mutable.AutoTellTabsHistoryPreload = preload;
} }
@@ -117,12 +139,18 @@ internal sealed class Chat : ISettingsTab
using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false)) using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
{ {
ImGui.Checkbox(Language.Options_CollapseDuplicateMessages_Name, ref Mutable.CollapseDuplicateMessages); ImGui.Checkbox(
Language.Options_CollapseDuplicateMessages_Name,
ref Mutable.CollapseDuplicateMessages
);
ImGuiUtil.HelpMarker(Language.Options_CollapseDuplicateMessages_Description); ImGuiUtil.HelpMarker(Language.Options_CollapseDuplicateMessages_Description);
if (Mutable.CollapseDuplicateMessages) if (Mutable.CollapseDuplicateMessages)
{ {
ImGui.Checkbox(Language.Options_CollapseDuplicateMsgUniqueLink_Name, ref Mutable.CollapseKeepUniqueLinks); ImGui.Checkbox(
Language.Options_CollapseDuplicateMsgUniqueLink_Name,
ref Mutable.CollapseKeepUniqueLinks
);
ImGuiUtil.HelpMarker(Language.Options_CollapseDuplicateMsgUniqueLink_Description); ImGuiUtil.HelpMarker(Language.Options_CollapseDuplicateMsgUniqueLink_Description);
} }
} }
@@ -138,7 +166,12 @@ internal sealed class Chat : ISettingsTab
using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false)) using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
{ {
using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_Preview_Name, Mutable.PreviewPosition.Name())) using (
var combo = ImGuiUtil.BeginComboVertical(
Language.Options_Preview_Name,
Mutable.PreviewPosition.Name()
)
)
{ {
if (combo) if (combo)
{ {
@@ -153,7 +186,13 @@ internal sealed class Chat : ISettingsTab
} }
ImGuiUtil.HelpMarker(Language.Options_Preview_Description); ImGuiUtil.HelpMarker(Language.Options_Preview_Description);
if (ImGuiUtil.InputIntVertical(Language.Options_PreviewMinimum_Name, Language.Options_PreviewMinimum_Description, ref Mutable.PreviewMinimum)) if (
ImGuiUtil.InputIntVertical(
Language.Options_PreviewMinimum_Name,
Language.Options_PreviewMinimum_Description,
ref Mutable.PreviewMinimum
)
)
{ {
Mutable.PreviewMinimum = Math.Clamp(Mutable.PreviewMinimum, 1, 250); Mutable.PreviewMinimum = Math.Clamp(Mutable.PreviewMinimum, 1, 250);
} }
@@ -180,9 +219,11 @@ internal sealed class Chat : ISettingsTab
ImGui.TextUnformatted(Language.Options_Emote_BlockedEmotes); ImGui.TextUnformatted(Language.Options_Emote_BlockedEmotes);
ImGui.Spacing(); ImGui.Spacing();
if (EmoteCache.State is EmoteCache.LoadingState.Done if (
EmoteCache.State is EmoteCache.LoadingState.Done
&& WordPopupOptions.FilteredSheet.Length == 0 && WordPopupOptions.FilteredSheet.Length == 0
&& WordPopupOptionsBuiltFor != EmoteCache.LoadingState.Done) && WordPopupOptionsBuiltFor != EmoteCache.LoadingState.Done
)
{ {
WordPopupOptions = RefillSheet(); WordPopupOptions = RefillSheet();
WordPopupOptionsBuiltFor = EmoteCache.LoadingState.Done; WordPopupOptionsBuiltFor = EmoteCache.LoadingState.Done;
@@ -204,7 +245,13 @@ internal sealed class Chat : ISettingsTab
Mutable.BlockedEmotes.Add(newWord); Mutable.BlockedEmotes.Add(newWord);
} }
using (var table = ImRaii.Table("##BlockedWords", 2, ImGuiTableFlags.RowBg | ImGuiTableFlags.BordersInner)) using (
var table = ImRaii.Table(
"##BlockedWords",
2,
ImGuiTableFlags.RowBg | ImGuiTableFlags.BordersInner
)
)
{ {
if (table) if (table)
{ {
@@ -220,7 +267,13 @@ internal sealed class Chat : ISettingsTab
ImGui.TextUnformatted(word); ImGui.TextUnformatted(word);
ImGui.TableNextColumn(); ImGui.TableNextColumn();
if (ImGuiUtil.Button($"##{word}Del", FontAwesomeIcon.Trash, !ImGui.GetIO().KeyCtrl)) if (
ImGuiUtil.Button(
$"##{word}Del",
FontAwesomeIcon.Trash,
!ImGui.GetIO().KeyCtrl
)
)
{ {
Mutable.BlockedEmotes.Remove(word); Mutable.BlockedEmotes.Remove(word);
} }
@@ -244,8 +297,16 @@ internal sealed class Chat : ISettingsTab
ImGui.TextColored(ImGuiColors.DPSRed, Language.Options_Emote_NotReady); ImGui.TextColored(ImGuiColors.DPSRed, Language.Options_Emote_NotReady);
} }
ImGui.TextUnformatted($"{Language.Options_Emote_Loaded} {EmoteCache.SortedCodeArray.Length}"); ImGui.TextUnformatted(
using (var emoteTable = ImRaii.Table("##LoadedEmotes", 5, ImGuiTableFlags.RowBg | ImGuiTableFlags.BordersInner)) $"{Language.Options_Emote_Loaded} {EmoteCache.SortedCodeArray.Length}"
);
using (
var emoteTable = ImRaii.Table(
"##LoadedEmotes",
5,
ImGuiTableFlags.RowBg | ImGuiTableFlags.BordersInner
)
)
{ {
if (emoteTable) if (emoteTable)
{ {
+361 -107
View File
@@ -1,16 +1,16 @@
using System.Diagnostics; using System.Diagnostics;
using HellionChat.Code; using Dalamud.Bindings.ImGui;
using HellionChat.Export;
using HellionChat.Privacy;
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.Colors; using Dalamud.Interface.Colors;
using Dalamud.Interface.ImGuiNotification; using Dalamud.Interface.ImGuiNotification;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Bindings.ImGui; using HellionChat.Code;
using HellionChat.Export;
using HellionChat.Privacy;
using HellionChat.Resources;
using HellionChat.Util;
namespace HellionChat.Ui.SettingsTabs; namespace HellionChat.Ui.SettingsTabs;
@@ -19,7 +19,8 @@ internal sealed class DataManagement : ISettingsTab
private Plugin Plugin { get; } private Plugin Plugin { get; }
private Configuration Mutable { get; } private Configuration Mutable { get; }
public string Name => HellionStrings.Settings_Card_DataManagement_Title + "###tabs-datamanagement"; public string Name =>
HellionStrings.Settings_Card_DataManagement_Title + "###tabs-datamanagement";
// Cleanup state (was in Privacy.cs) // Cleanup state (was in Privacy.cs)
private Dictionary<int, long>? CleanupCounts; private Dictionary<int, long>? CleanupCounts;
@@ -49,28 +50,90 @@ internal sealed class DataManagement : ISettingsTab
// call updates the labels immediately. 1:1 from Privacy.cs Groups. // call updates the labels immediately. 1:1 from Privacy.cs Groups.
private static readonly (Func<string> Heading, ChatType[] Types)[] Groups = private static readonly (Func<string> Heading, ChatType[] Types)[] Groups =
[ [
(() => HellionStrings.Privacy_Group_DirectMessages, [ChatType.TellIncoming, ChatType.TellOutgoing]), (
(() => HellionStrings.Privacy_Group_PartyAlliance, [ChatType.Party, ChatType.CrossParty, ChatType.Alliance, ChatType.PvpTeam]), () => HellionStrings.Privacy_Group_DirectMessages,
(() => HellionStrings.Privacy_Group_FreeCompany, [ChatType.FreeCompany, ChatType.FreeCompanyAnnouncement, ChatType.FreeCompanyLoginLogout]), [ChatType.TellIncoming, ChatType.TellOutgoing]
(() => HellionStrings.Privacy_Group_Linkshells, [ ),
ChatType.Linkshell1, ChatType.Linkshell2, ChatType.Linkshell3, ChatType.Linkshell4, (
ChatType.Linkshell5, ChatType.Linkshell6, ChatType.Linkshell7, ChatType.Linkshell8, () => HellionStrings.Privacy_Group_PartyAlliance,
]), [ChatType.Party, ChatType.CrossParty, ChatType.Alliance, ChatType.PvpTeam]
(() => HellionStrings.Privacy_Group_CrossLinkshells, [ ),
ChatType.CrossLinkshell1, ChatType.CrossLinkshell2, ChatType.CrossLinkshell3, ChatType.CrossLinkshell4, (
ChatType.CrossLinkshell5, ChatType.CrossLinkshell6, ChatType.CrossLinkshell7, ChatType.CrossLinkshell8, () => HellionStrings.Privacy_Group_FreeCompany,
]), [
(() => HellionStrings.Privacy_Group_ExtraChat, [ ChatType.FreeCompany,
ChatType.ExtraChatLinkshell1, ChatType.ExtraChatLinkshell2, ChatType.ExtraChatLinkshell3, ChatType.ExtraChatLinkshell4, ChatType.FreeCompanyAnnouncement,
ChatType.ExtraChatLinkshell5, ChatType.ExtraChatLinkshell6, ChatType.ExtraChatLinkshell7, ChatType.ExtraChatLinkshell8, ChatType.FreeCompanyLoginLogout,
]), ]
(() => HellionStrings.Privacy_Group_PublicChat, [ChatType.Say, ChatType.Shout, ChatType.Yell, ChatType.NoviceNetwork, ChatType.CustomEmote, ChatType.StandardEmote]), ),
(() => HellionStrings.Privacy_Group_SystemLogs, [ (
ChatType.System, ChatType.Notice, ChatType.Urgent, ChatType.Echo, () => HellionStrings.Privacy_Group_Linkshells,
ChatType.NpcDialogue, ChatType.NpcAnnouncement, [
ChatType.LootNotice, ChatType.LootRoll, ChatType.RetainerSale, ChatType.Linkshell1,
ChatType.Crafting, ChatType.Gathering, ChatType.Sign, ChatType.RandomNumber, ChatType.Linkshell2,
]), ChatType.Linkshell3,
ChatType.Linkshell4,
ChatType.Linkshell5,
ChatType.Linkshell6,
ChatType.Linkshell7,
ChatType.Linkshell8,
]
),
(
() => HellionStrings.Privacy_Group_CrossLinkshells,
[
ChatType.CrossLinkshell1,
ChatType.CrossLinkshell2,
ChatType.CrossLinkshell3,
ChatType.CrossLinkshell4,
ChatType.CrossLinkshell5,
ChatType.CrossLinkshell6,
ChatType.CrossLinkshell7,
ChatType.CrossLinkshell8,
]
),
(
() => HellionStrings.Privacy_Group_ExtraChat,
[
ChatType.ExtraChatLinkshell1,
ChatType.ExtraChatLinkshell2,
ChatType.ExtraChatLinkshell3,
ChatType.ExtraChatLinkshell4,
ChatType.ExtraChatLinkshell5,
ChatType.ExtraChatLinkshell6,
ChatType.ExtraChatLinkshell7,
ChatType.ExtraChatLinkshell8,
]
),
(
() => HellionStrings.Privacy_Group_PublicChat,
[
ChatType.Say,
ChatType.Shout,
ChatType.Yell,
ChatType.NoviceNetwork,
ChatType.CustomEmote,
ChatType.StandardEmote,
]
),
(
() => HellionStrings.Privacy_Group_SystemLogs,
[
ChatType.System,
ChatType.Notice,
ChatType.Urgent,
ChatType.Echo,
ChatType.NpcDialogue,
ChatType.NpcAnnouncement,
ChatType.LootNotice,
ChatType.LootRoll,
ChatType.RetainerSale,
ChatType.Crafting,
ChatType.Gathering,
ChatType.Sign,
ChatType.RandomNumber,
]
),
]; ];
internal DataManagement(Plugin plugin, Configuration mutable) internal DataManagement(Plugin plugin, Configuration mutable)
@@ -107,21 +170,36 @@ internal sealed class DataManagement : ISettingsTab
using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false)) using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
{ {
ImGui.Checkbox(Language.Options_DatabaseBattleMessages_Name, ref Mutable.DatabaseBattleMessages); ImGui.Checkbox(
Language.Options_DatabaseBattleMessages_Name,
ref Mutable.DatabaseBattleMessages
);
ImGuiUtil.HelpMarker(Language.Options_DatabaseBattleMessages_Description); ImGuiUtil.HelpMarker(Language.Options_DatabaseBattleMessages_Description);
if (ImGui.Checkbox(Language.Options_LoadPreviousSession_Name, ref Mutable.LoadPreviousSession)) if (
ImGui.Checkbox(
Language.Options_LoadPreviousSession_Name,
ref Mutable.LoadPreviousSession
)
)
if (Mutable.LoadPreviousSession) if (Mutable.LoadPreviousSession)
Mutable.FilterIncludePreviousSessions = true; Mutable.FilterIncludePreviousSessions = true;
ImGuiUtil.HelpMarker(Language.Options_LoadPreviousSession_Description); ImGuiUtil.HelpMarker(Language.Options_LoadPreviousSession_Description);
if (ImGui.Checkbox(Language.Options_FilterIncludePreviousSessions_Name, ref Mutable.FilterIncludePreviousSessions)) if (
ImGui.Checkbox(
Language.Options_FilterIncludePreviousSessions_Name,
ref Mutable.FilterIncludePreviousSessions
)
)
if (!Mutable.FilterIncludePreviousSessions) if (!Mutable.FilterIncludePreviousSessions)
Mutable.LoadPreviousSession = false; Mutable.LoadPreviousSession = false;
ImGuiUtil.HelpMarker(Language.Options_FilterIncludePreviousSessions_Description); ImGuiUtil.HelpMarker(Language.Options_FilterIncludePreviousSessions_Description);
var old = new FileInfo(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "chat.db")); var old = new FileInfo(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "chat.db"));
var migratedOld = new FileInfo(Path.Join(Plugin.Interface.ConfigDirectory.FullName, "chat-litedb.db")); var migratedOld = new FileInfo(
Path.Join(Plugin.Interface.ConfigDirectory.FullName, "chat-litedb.db")
);
if (old.Exists || migratedOld.Exists) if (old.Exists || migratedOld.Exists)
{ {
ImGui.Spacing(); ImGui.Spacing();
@@ -131,7 +209,12 @@ internal sealed class DataManagement : ISettingsTab
ImGui.TextUnformatted(Language.Options_Database_Old_Heading); ImGui.TextUnformatted(Language.Options_Database_Old_Heading);
ImGui.Spacing(); ImGui.Spacing();
if (ImGuiUtil.CtrlShiftButton(Language.Options_Database_Old_Delete, Language.Options_Database_Old_Delete_Tooltip)) if (
ImGuiUtil.CtrlShiftButton(
Language.Options_Database_Old_Delete,
Language.Options_Database_Old_Delete_Tooltip
)
)
{ {
try try
{ {
@@ -139,12 +222,18 @@ internal sealed class DataManagement : ISettingsTab
old.Delete(); old.Delete();
if (migratedOld.Exists) if (migratedOld.Exists)
migratedOld.Delete(); migratedOld.Delete();
WrapperUtil.AddNotification(Language.Options_Database_Old_Delete_Success, NotificationType.Success); WrapperUtil.AddNotification(
Language.Options_Database_Old_Delete_Success,
NotificationType.Success
);
} }
catch (Exception e) catch (Exception e)
{ {
Plugin.Log.Error(e, "Unable to delete old database"); Plugin.Log.Error(e, "Unable to delete old database");
WrapperUtil.AddNotification(Language.Options_Database_Old_Delete_Error, NotificationType.Error); WrapperUtil.AddNotification(
Language.Options_Database_Old_Delete_Error,
NotificationType.Error
);
} }
} }
} }
@@ -162,7 +251,8 @@ internal sealed class DataManagement : ISettingsTab
ImGuiUtil.OptionCheckbox( ImGuiUtil.OptionCheckbox(
ref Mutable.RetentionEnabled, ref Mutable.RetentionEnabled,
HellionStrings.Retention_Enabled_Name, HellionStrings.Retention_Enabled_Name,
HellionStrings.Retention_Enabled_Description); HellionStrings.Retention_Enabled_Description
);
using (ImRaii.Disabled(!Mutable.RetentionEnabled)) using (ImRaii.Disabled(!Mutable.RetentionEnabled))
{ {
@@ -200,17 +290,31 @@ internal sealed class DataManagement : ISettingsTab
using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false)) using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
foreach (var type in types) foreach (var type in types)
{ {
var hasOverride = Mutable.RetentionPerChannelDays.TryGetValue(type, out var days); var hasOverride =
var hasSpecDefault = PrivacyDefaults.DefaultRetentionDays.TryGetValue(type, out var specDays); Mutable.RetentionPerChannelDays.TryGetValue(
type,
out var days
);
var hasSpecDefault =
PrivacyDefaults.DefaultRetentionDays.TryGetValue(
type,
out var specDays
);
if (!hasOverride) if (!hasOverride)
days = hasSpecDefault ? specDays : Mutable.RetentionDefaultDays; days = hasSpecDefault
? specDays
: Mutable.RetentionDefaultDays;
var tag = hasOverride var tag =
? HellionStrings.Retention_Tag_Override hasOverride ? HellionStrings.Retention_Tag_Override
: hasSpecDefault : hasSpecDefault ? HellionStrings.Retention_Tag_Spec
? HellionStrings.Retention_Tag_Spec
: HellionStrings.Retention_Tag_Global; : HellionStrings.Retention_Tag_Global;
if (ImGui.InputInt($"{type} {tag}##retention-{(int)type}", ref days)) if (
ImGui.InputInt(
$"{type} {tag}##retention-{(int)type}",
ref days
)
)
{ {
days = Math.Max(0, days); days = Math.Max(0, days);
Mutable.RetentionPerChannelDays[type] = days; Mutable.RetentionPerChannelDays[type] = days;
@@ -219,7 +323,11 @@ internal sealed class DataManagement : ISettingsTab
if (hasOverride) if (hasOverride)
{ {
ImGui.SameLine(); ImGui.SameLine();
if (ImGui.Button($"{HellionStrings.Retention_Reset_Button}##retention-reset-{(int)type}")) if (
ImGui.Button(
$"{HellionStrings.Retention_Reset_Button}##retention-reset-{(int)type}"
)
)
Mutable.RetentionPerChannelDays.Remove(type); Mutable.RetentionPerChannelDays.Remove(type);
} }
} }
@@ -234,7 +342,12 @@ internal sealed class DataManagement : ISettingsTab
using (ImRaii.Disabled(RetentionRunning)) using (ImRaii.Disabled(RetentionRunning))
{ {
if (ImGuiUtil.CtrlShiftButton(HellionStrings.Retention_Apply_Label, HellionStrings.Retention_Apply_Tooltip)) if (
ImGuiUtil.CtrlShiftButton(
HellionStrings.Retention_Apply_Label,
HellionStrings.Retention_Apply_Tooltip
)
)
StartRetentionRun(); StartRetentionRun();
} }
@@ -243,9 +356,11 @@ internal sealed class DataManagement : ISettingsTab
ImGui.Spacing(); ImGui.Spacing();
var lastRun = Plugin.Config.RetentionLastRunAt; var lastRun = Plugin.Config.RetentionLastRunAt;
ImGuiUtil.HelpText(lastRun == DateTimeOffset.MinValue ImGuiUtil.HelpText(
lastRun == DateTimeOffset.MinValue
? HellionStrings.Retention_LastRun_Never ? HellionStrings.Retention_LastRun_Never
: string.Format(HellionStrings.Retention_LastRun_At, lastRun.ToLocalTime())); : string.Format(HellionStrings.Retention_LastRun_At, lastRun.ToLocalTime())
);
} }
} }
} }
@@ -259,14 +374,20 @@ internal sealed class DataManagement : ISettingsTab
Plugin.RetentionSweepRunning = true; Plugin.RetentionSweepRunning = true;
} }
var policy = Plugin.Config.RetentionPerChannelDays.ToDictionary(p => (int)(ushort)p.Key, p => p.Value); var policy = Plugin.Config.RetentionPerChannelDays.ToDictionary(
p => (int)(ushort)p.Key,
p => p.Value
);
var defaultDays = Plugin.Config.RetentionDefaultDays; var defaultDays = Plugin.Config.RetentionDefaultDays;
new Thread(() => new Thread(() =>
{ {
try try
{ {
var deleted = Plugin.MessageManager.Store.DeleteByRetentionPolicy(policy, defaultDays); var deleted = Plugin.MessageManager.Store.DeleteByRetentionPolicy(
policy,
defaultDays
);
Plugin.Config.RetentionLastRunAt = DateTimeOffset.UtcNow; Plugin.Config.RetentionLastRunAt = DateTimeOffset.UtcNow;
Plugin.SaveConfig(); Plugin.SaveConfig();
@@ -274,17 +395,26 @@ internal sealed class DataManagement : ISettingsTab
if (deleted > 0) if (deleted > 0)
{ {
if (!Plugin.Framework.Run(() => if (
!Plugin
.Framework.Run(() =>
{ {
Plugin.MessageManager.ClearAllTabs(); Plugin.MessageManager.ClearAllTabs();
Plugin.MessageManager.FilterAllTabsAsync(); Plugin.MessageManager.FilterAllTabsAsync();
}).Wait(TimeSpan.FromSeconds(5))) })
.Wait(TimeSpan.FromSeconds(5))
)
{ {
Plugin.Log.Warning("Retention sweep: framework refresh timed out after 5s."); Plugin.Log.Warning(
"Retention sweep: framework refresh timed out after 5s."
);
} }
} }
WrapperUtil.AddNotification(string.Format(HellionStrings.Retention_Success, deleted), NotificationType.Success); WrapperUtil.AddNotification(
string.Format(HellionStrings.Retention_Success, deleted),
NotificationType.Success
);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -296,7 +426,10 @@ internal sealed class DataManagement : ISettingsTab
lock (Plugin.RetentionSweepLock) lock (Plugin.RetentionSweepLock)
Plugin.RetentionSweepRunning = false; Plugin.RetentionSweepRunning = false;
} }
}) { IsBackground = true }.Start(); })
{
IsBackground = true,
}.Start();
} }
private void DrawCleanupSection() private void DrawCleanupSection()
@@ -312,15 +445,19 @@ internal sealed class DataManagement : ISettingsTab
ImGui.Spacing(); ImGui.Spacing();
if (CleanupPreviewSnapshot is not null if (
&& !CleanupPreviewSnapshot.SetEquals(Mutable.PrivacyPersistChannels)) CleanupPreviewSnapshot is not null
&& !CleanupPreviewSnapshot.SetEquals(Mutable.PrivacyPersistChannels)
)
{ {
CleanupPreviewStale = true; CleanupPreviewStale = true;
} }
using (var emphasis = CleanupPreviewStale using (
var emphasis = CleanupPreviewStale
? ImRaii.PushColor(ImGuiCol.Button, ImGuiColors.HealerGreen with { W = 0.6f }) ? ImRaii.PushColor(ImGuiCol.Button, ImGuiColors.HealerGreen with { W = 0.6f })
: null) : null
)
using (ImRaii.Disabled(CleanupRunning)) using (ImRaii.Disabled(CleanupRunning))
{ {
if (ImGui.Button(HellionStrings.Cleanup_RefreshPreview)) if (ImGui.Button(HellionStrings.Cleanup_RefreshPreview))
@@ -341,13 +478,24 @@ internal sealed class DataManagement : ISettingsTab
ImGui.Spacing(); ImGui.Spacing();
using (var staleColor = CleanupPreviewStale using (
var staleColor = CleanupPreviewStale
? ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudGrey) ? ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudGrey)
: null) : null
)
{ {
ImGuiUtil.HelpText(string.Format(HellionStrings.Cleanup_TotalStored, CleanupKeepCount + CleanupDeleteCount)); ImGuiUtil.HelpText(
ImGuiUtil.HelpText(string.Format(HellionStrings.Cleanup_WillKeep, CleanupKeepCount)); string.Format(
ImGuiUtil.HelpText(string.Format(HellionStrings.Cleanup_WillDelete, CleanupDeleteCount)); HellionStrings.Cleanup_TotalStored,
CleanupKeepCount + CleanupDeleteCount
)
);
ImGuiUtil.HelpText(
string.Format(HellionStrings.Cleanup_WillKeep, CleanupKeepCount)
);
ImGuiUtil.HelpText(
string.Format(HellionStrings.Cleanup_WillDelete, CleanupDeleteCount)
);
} }
using (var breakdownTree = ImRaii.TreeNode(HellionStrings.Cleanup_Breakdown)) using (var breakdownTree = ImRaii.TreeNode(HellionStrings.Cleanup_Breakdown))
@@ -355,13 +503,17 @@ internal sealed class DataManagement : ISettingsTab
if (breakdownTree.Success) if (breakdownTree.Success)
{ {
using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false)) using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
foreach (var (chatType, count) in CleanupCounts.OrderByDescending(p => p.Value)) foreach (
var (chatType, count) in CleanupCounts.OrderByDescending(p => p.Value)
)
{ {
var name = Enum.IsDefined(typeof(ChatType), (ushort)chatType) var name = Enum.IsDefined(typeof(ChatType), (ushort)chatType)
? ((ChatType)(ushort)chatType).ToString() ? ((ChatType)(ushort)chatType).ToString()
: $"Unknown({chatType})"; : $"Unknown({chatType})";
var keeps = WouldBeKept(chatType); var keeps = WouldBeKept(chatType);
var marker = keeps ? HellionStrings.Cleanup_Marker_Keep : HellionStrings.Cleanup_Marker_Delete; var marker = keeps
? HellionStrings.Cleanup_Marker_Keep
: HellionStrings.Cleanup_Marker_Delete;
ImGuiUtil.HelpText($"{marker} {name} — {count:N0}"); ImGuiUtil.HelpText($"{marker} {name} — {count:N0}");
} }
} }
@@ -371,8 +523,12 @@ internal sealed class DataManagement : ISettingsTab
using (ImRaii.Disabled(CleanupRunning || CleanupDeleteCount == 0)) using (ImRaii.Disabled(CleanupRunning || CleanupDeleteCount == 0))
{ {
if (ImGuiUtil.CtrlShiftButton(HellionStrings.Cleanup_Apply_Label, if (
string.Format(HellionStrings.Cleanup_Apply_Tooltip, CleanupDeleteCount))) ImGuiUtil.CtrlShiftButton(
HellionStrings.Cleanup_Apply_Label,
string.Format(HellionStrings.Cleanup_Apply_Tooltip, CleanupDeleteCount)
)
)
StartCleanup(); StartCleanup();
} }
@@ -411,7 +567,10 @@ internal sealed class DataManagement : ISettingsTab
catch (Exception e) catch (Exception e)
{ {
Plugin.Log.Error(e, "Failed to compute cleanup preview"); Plugin.Log.Error(e, "Failed to compute cleanup preview");
WrapperUtil.AddNotification(HellionStrings.Cleanup_PreviewError, NotificationType.Error); WrapperUtil.AddNotification(
HellionStrings.Cleanup_PreviewError,
NotificationType.Error
);
} }
} }
@@ -430,16 +589,23 @@ internal sealed class DataManagement : ISettingsTab
var deleted = Plugin.MessageManager.Store.CleanupRetainOnly(allowed); var deleted = Plugin.MessageManager.Store.CleanupRetainOnly(allowed);
Plugin.Log.Information($"Privacy cleanup: deleted {deleted} messages"); Plugin.Log.Information($"Privacy cleanup: deleted {deleted} messages");
if (!Plugin.Framework.Run(() => if (
!Plugin
.Framework.Run(() =>
{ {
Plugin.MessageManager.ClearAllTabs(); Plugin.MessageManager.ClearAllTabs();
Plugin.MessageManager.FilterAllTabs(); Plugin.MessageManager.FilterAllTabs();
}).Wait(TimeSpan.FromSeconds(5))) })
.Wait(TimeSpan.FromSeconds(5))
)
{ {
Plugin.Log.Warning("Privacy cleanup: framework refresh timed out after 5s."); Plugin.Log.Warning("Privacy cleanup: framework refresh timed out after 5s.");
} }
WrapperUtil.AddNotification(string.Format(HellionStrings.Cleanup_Success, deleted), NotificationType.Success); WrapperUtil.AddNotification(
string.Format(HellionStrings.Cleanup_Success, deleted),
NotificationType.Success
);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -482,7 +648,9 @@ internal sealed class DataManagement : ISettingsTab
ImGuiUtil.HelpText(HellionStrings.Export_Channels_AllOff); ImGuiUtil.HelpText(HellionStrings.Export_Channels_AllOff);
foreach (var (heading, types) in Groups) foreach (var (heading, types) in Groups)
{ {
using var subTree = ImRaii.TreeNode($"{heading()}##export-group-{heading()}"); using var subTree = ImRaii.TreeNode(
$"{heading()}##export-group-{heading()}"
);
if (!subTree.Success) if (!subTree.Success)
continue; continue;
@@ -507,10 +675,22 @@ internal sealed class DataManagement : ISettingsTab
ImGui.TextUnformatted(HellionStrings.Export_Format_Label); ImGui.TextUnformatted(HellionStrings.Export_Format_Label);
ImGui.SameLine(); ImGui.SameLine();
var fmt = (int)ExportFormat; var fmt = (int)ExportFormat;
if (ImGui.RadioButton(HellionStrings.Export_Format_Markdown, ref fmt, (int)ExportFormat.Markdown)) if (
ImGui.RadioButton(
HellionStrings.Export_Format_Markdown,
ref fmt,
(int)ExportFormat.Markdown
)
)
ExportFormat = ExportFormat.Markdown; ExportFormat = ExportFormat.Markdown;
ImGui.SameLine(); ImGui.SameLine();
if (ImGui.RadioButton(HellionStrings.Export_Format_Json, ref fmt, (int)ExportFormat.Json)) if (
ImGui.RadioButton(
HellionStrings.Export_Format_Json,
ref fmt,
(int)ExportFormat.Json
)
)
ExportFormat = ExportFormat.Json; ExportFormat = ExportFormat.Json;
ImGui.SameLine(); ImGui.SameLine();
if (ImGui.RadioButton(HellionStrings.Export_Format_Csv, ref fmt, (int)ExportFormat.Csv)) if (ImGui.RadioButton(HellionStrings.Export_Format_Csv, ref fmt, (int)ExportFormat.Csv))
@@ -544,7 +724,8 @@ internal sealed class DataManagement : ISettingsTab
if (!success || string.IsNullOrWhiteSpace(path)) if (!success || string.IsNullOrWhiteSpace(path))
return; return;
StartExport(path); StartExport(path);
}); }
);
} }
private void StartExport(string path) private void StartExport(string path)
@@ -553,15 +734,17 @@ internal sealed class DataManagement : ISettingsTab
return; return;
ExportRunning = true; ExportRunning = true;
var types = ExportSelectedChannels.Count > 0 var types =
ExportSelectedChannels.Count > 0
? ExportSelectedChannels.Select(t => (int)(ushort)t).ToList() ? ExportSelectedChannels.Select(t => (int)(ushort)t).ToList()
: null; : null;
DateTimeOffset? from = ExportRangeDays > 0 DateTimeOffset? from =
? DateTimeOffset.UtcNow.AddDays(-ExportRangeDays) ExportRangeDays > 0 ? DateTimeOffset.UtcNow.AddDays(-ExportRangeDays) : null;
: null;
var senderSubstring = string.IsNullOrWhiteSpace(ExportSenderSubstring) ? null : ExportSenderSubstring.Trim(); var senderSubstring = string.IsNullOrWhiteSpace(ExportSenderSubstring)
? null
: ExportSenderSubstring.Trim();
var format = ExportFormat; var format = ExportFormat;
var filterDesc = new MessageExporter.FilterDescription(types, from, null, senderSubstring); var filterDesc = new MessageExporter.FilterDescription(types, from, null, senderSubstring);
@@ -569,11 +752,18 @@ internal sealed class DataManagement : ISettingsTab
{ {
try try
{ {
using var enumerator = Plugin.MessageManager.Store.StreamForExport(types, from, null); using var enumerator = Plugin.MessageManager.Store.StreamForExport(
types,
from,
null
);
var written = MessageExporter.ExportToFile(path, format, enumerator, filterDesc); var written = MessageExporter.ExportToFile(path, format, enumerator, filterDesc);
if (written > 0) if (written > 0)
WrapperUtil.AddNotification(string.Format(HellionStrings.Export_Success, written, path), NotificationType.Success); WrapperUtil.AddNotification(
string.Format(HellionStrings.Export_Success, written, path),
NotificationType.Success
);
else else
WrapperUtil.AddNotification(HellionStrings.Export_Empty, NotificationType.Info); WrapperUtil.AddNotification(HellionStrings.Export_Empty, NotificationType.Info);
} }
@@ -586,7 +776,10 @@ internal sealed class DataManagement : ISettingsTab
{ {
ExportRunning = false; ExportRunning = false;
} }
}) { IsBackground = true }.Start(); })
{
IsBackground = true,
}.Start();
} }
private void DrawDatabaseViewerSection() private void DrawDatabaseViewerSection()
@@ -605,12 +798,20 @@ internal sealed class DataManagement : ISettingsTab
DatabaseLastRefreshTicks = Environment.TickCount64; DatabaseLastRefreshTicks = Environment.TickCount64;
} }
ImGuiUtil.HelpText(string.Format(Language.Options_Database_Metadata_Path, MessageManager.DatabasePath())); ImGuiUtil.HelpText(
string.Format(
Language.Options_Database_Metadata_Path,
MessageManager.DatabasePath()
)
);
if (ImGui.IsItemClicked(ImGuiMouseButton.Left)) if (ImGui.IsItemClicked(ImGuiMouseButton.Left))
{ {
var path = Path.GetDirectoryName(MessageManager.DatabasePath()); var path = Path.GetDirectoryName(MessageManager.DatabasePath());
ImGui.SetClipboardText(path); ImGui.SetClipboardText(path);
WrapperUtil.AddNotification(Language.Options_Database_Metadata_CopyConfigPathNotification, NotificationType.Info); WrapperUtil.AddNotification(
Language.Options_Database_Metadata_CopyConfigPathNotification,
NotificationType.Info
);
} }
if (ImGui.IsItemHovered()) if (ImGui.IsItemHovered())
@@ -619,24 +820,44 @@ internal sealed class DataManagement : ISettingsTab
ImGuiUtil.Tooltip(Language.Options_Database_Metadata_CopyConfigPath); ImGuiUtil.Tooltip(Language.Options_Database_Metadata_CopyConfigPath);
} }
ImGuiUtil.HelpText(string.Format(Language.Options_Database_Metadata_Size, StringUtil.BytesToString(DatabaseSize))); ImGuiUtil.HelpText(
string.Format(
Language.Options_Database_Metadata_Size,
StringUtil.BytesToString(DatabaseSize)
)
);
if (ImGui.IsItemHovered()) if (ImGui.IsItemHovered())
ImGuiUtil.Tooltip(StringUtil.BytesToString(DatabaseSize)); ImGuiUtil.Tooltip(StringUtil.BytesToString(DatabaseSize));
ImGuiUtil.HelpText(string.Format(Language.Options_Database_Metadata_LogSize, StringUtil.BytesToString(DatabaseLogSize))); ImGuiUtil.HelpText(
string.Format(
Language.Options_Database_Metadata_LogSize,
StringUtil.BytesToString(DatabaseLogSize)
)
);
if (ImGui.IsItemHovered()) if (ImGui.IsItemHovered())
ImGuiUtil.Tooltip(StringUtil.BytesToString(DatabaseLogSize)); ImGuiUtil.Tooltip(StringUtil.BytesToString(DatabaseLogSize));
ImGuiUtil.HelpText(string.Format(Language.Options_Database_Metadata_MessageCount, DatabaseMessageCount)); ImGuiUtil.HelpText(
string.Format(Language.Options_Database_Metadata_MessageCount, DatabaseMessageCount)
);
if (ImGuiUtil.CtrlShiftButton(Language.Options_ClearDatabase_Button, Language.Options_ClearDatabase_Tooltip)) if (
ImGuiUtil.CtrlShiftButton(
Language.Options_ClearDatabase_Button,
Language.Options_ClearDatabase_Tooltip
)
)
{ {
Plugin.Log.Warning("Clearing messages from database"); Plugin.Log.Warning("Clearing messages from database");
Plugin.MessageManager.Store.ClearMessages(); Plugin.MessageManager.Store.ClearMessages();
Plugin.MessageManager.ClearAllTabs(); Plugin.MessageManager.ClearAllTabs();
DatabaseLastRefreshTicks = 0; DatabaseLastRefreshTicks = 0;
WrapperUtil.AddNotification(Language.Options_ClearDatabase_Success, NotificationType.Info); WrapperUtil.AddNotification(
Language.Options_ClearDatabase_Success,
NotificationType.Info
);
} }
} }
} }
@@ -655,16 +876,31 @@ internal sealed class DataManagement : ISettingsTab
using var wrap = ImRaii.TextWrapPos(0.0f); using var wrap = ImRaii.TextWrapPos(0.0f);
ImGuiUtil.WarningText(Language.Options_Database_Advanced_Warning); ImGuiUtil.WarningText(Language.Options_Database_Advanced_Warning);
if (ImGuiUtil.CtrlShiftButton("Perform maintenance", "Ctrl+Shift: MessageManager.Store.PerformMaintenance()")) if (
ImGuiUtil.CtrlShiftButton(
"Perform maintenance",
"Ctrl+Shift: MessageManager.Store.PerformMaintenance()"
)
)
Plugin.MessageManager.Store.PerformMaintenance(); Plugin.MessageManager.Store.PerformMaintenance();
if (ImGuiUtil.CtrlShiftButton("Reload messages from database", "Ctrl+Shift: MessageManager.FilterAllTabs()")) if (
ImGuiUtil.CtrlShiftButton(
"Reload messages from database",
"Ctrl+Shift: MessageManager.FilterAllTabs()"
)
)
{ {
Plugin.MessageManager.ClearAllTabs(); Plugin.MessageManager.ClearAllTabs();
Plugin.MessageManager.FilterAllTabsAsync(); Plugin.MessageManager.FilterAllTabsAsync();
} }
if (ImGuiUtil.CtrlShiftButton("Inject 10,000 messages", "Ctrl+Shift: creates 10,000 unique messages (async)")) if (
ImGuiUtil.CtrlShiftButton(
"Inject 10,000 messages",
"Ctrl+Shift: creates 10,000 unique messages (async)"
)
)
new Thread(() => InsertMessages(10_000)).Start(); new Thread(() => InsertMessages(10_000)).Start();
} }
} }
@@ -683,7 +919,9 @@ internal sealed class DataManagement : ISettingsTab
.Add(RawPayload.LinkTerminator) .Add(RawPayload.LinkTerminator)
.AddText(">: ") .AddText(">: ")
.Build(); .Build();
var senderChunks = ChunkUtil.ToChunks(senderSource, ChunkSource.Sender, ChatType.Debug).ToList(); var senderChunks = ChunkUtil
.ToChunks(senderSource, ChunkSource.Sender, ChatType.Debug)
.ToList();
var messages = new List<Message>(count); var messages = new List<Message>(count);
for (var i = 0; i < count; i++) for (var i = 0; i < count; i++)
{ {
@@ -691,10 +929,13 @@ internal sealed class DataManagement : ISettingsTab
.AddText("Random message payload - ") .AddText("Random message payload - ")
.AddItalics(Guid.NewGuid().ToString()) .AddItalics(Guid.NewGuid().ToString())
.Build(); .Build();
var contentChunks = ChunkUtil.ToChunks(contentSource, ChunkSource.Content, ChatType.Debug).ToList(); var contentChunks = ChunkUtil
.ToChunks(contentSource, ChunkSource.Content, ChatType.Debug)
.ToList();
var chatCode = new ChatCode(XivChatType.Say, 0, 0); var chatCode = new ChatCode(XivChatType.Say, 0, 0);
messages.Add(new Message( messages.Add(
new Message(
Guid.NewGuid(), Guid.NewGuid(),
Plugin.MessageManager.CurrentContentId, Plugin.MessageManager.CurrentContentId,
Plugin.MessageManager.CurrentContentId, Plugin.MessageManager.CurrentContentId,
@@ -705,12 +946,15 @@ internal sealed class DataManagement : ISettingsTab
senderSource, senderSource,
contentSource, contentSource,
Guid.Empty Guid.Empty
)); )
);
} }
var elapsedTicks = stopwatch.ElapsedTicks; var elapsedTicks = stopwatch.ElapsedTicks;
stopwatch.Stop(); stopwatch.Stop();
Plugin.Log.Info($"Crafted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"); Plugin.Log.Info(
$"Crafted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"
);
stopwatch = Stopwatch.StartNew(); stopwatch = Stopwatch.StartNew();
foreach (var message in messages) foreach (var message in messages)
@@ -718,24 +962,34 @@ internal sealed class DataManagement : ISettingsTab
elapsedTicks = stopwatch.ElapsedTicks; elapsedTicks = stopwatch.ElapsedTicks;
stopwatch.Stop(); stopwatch.Stop();
Plugin.Log.Info($"Upserted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"); Plugin.Log.Info(
$"Upserted {count} messages in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"
);
Plugin.Framework.Run(() => Plugin
.Framework.Run(() =>
{ {
stopwatch = Stopwatch.StartNew(); stopwatch = Stopwatch.StartNew();
Plugin.MessageManager.ClearAllTabs(); Plugin.MessageManager.ClearAllTabs();
elapsedTicks = stopwatch.ElapsedTicks; elapsedTicks = stopwatch.ElapsedTicks;
stopwatch.Stop(); stopwatch.Stop();
Plugin.Log.Info($"Cleared {Plugin.Config.Tabs.Count} tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"); Plugin.Log.Info(
}).Wait(); $"Cleared {Plugin.Config.Tabs.Count} tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"
);
})
.Wait();
Plugin.Framework.Run(() => Plugin
.Framework.Run(() =>
{ {
stopwatch = Stopwatch.StartNew(); stopwatch = Stopwatch.StartNew();
Plugin.MessageManager.FilterAllTabs(); Plugin.MessageManager.FilterAllTabs();
elapsedTicks = stopwatch.ElapsedTicks; elapsedTicks = stopwatch.ElapsedTicks;
stopwatch.Stop(); stopwatch.Stop();
Plugin.Log.Info($"Fetched and filtered all tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"); Plugin.Log.Info(
}).Wait(); $"Fetched and filtered all tabs in {elapsedTicks} ticks ({elapsedTicks / TimeSpan.TicksPerMillisecond}ms)"
);
})
.Wait();
} }
} }
+94 -24
View File
@@ -1,12 +1,12 @@
using HellionChat.Code;
using HellionChat.Resources;
using HellionChat.Util;
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.Utility; using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Bindings.ImGui; using HellionChat.Code;
using HellionChat.Resources;
using HellionChat.Util;
namespace HellionChat.Ui.SettingsTabs; namespace HellionChat.Ui.SettingsTabs;
@@ -15,7 +15,8 @@ internal sealed class FontsAndColours : ISettingsTab
private Plugin Plugin { get; } private Plugin Plugin { get; }
private Configuration Mutable { get; } private Configuration Mutable { get; }
public string Name => HellionStrings.Settings_Card_FontsAndColours_Title + "###tabs-fontsandcolours"; public string Name =>
HellionStrings.Settings_Card_FontsAndColours_Title + "###tabs-fontsandcolours";
internal FontsAndColours(Plugin plugin, Configuration mutable) internal FontsAndColours(Plugin plugin, Configuration mutable)
{ {
@@ -38,7 +39,9 @@ internal sealed class FontsAndColours : ISettingsTab
using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false)) using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
{ {
if (ImGui.Checkbox(HellionStrings.Theme_UseHellionFont_Name, ref Mutable.UseHellionFont)) if (
ImGui.Checkbox(HellionStrings.Theme_UseHellionFont_Name, ref Mutable.UseHellionFont)
)
{ {
if (Mutable.UseHellionFont) if (Mutable.UseHellionFont)
Mutable.FontsEnabled = false; Mutable.FontsEnabled = false;
@@ -51,7 +54,10 @@ internal sealed class FontsAndColours : ISettingsTab
ImGuiUtil.FontSizeCombo(Language.Options_FontSize_Name, ref Mutable.FontSizeV2); ImGuiUtil.FontSizeCombo(Language.Options_FontSize_Name, ref Mutable.FontSizeV2);
ImGui.Spacing(); ImGui.Spacing();
ImGuiUtil.FontSizeCombo(Language.Options_SymbolsFontSize_Name, ref Mutable.SymbolsFontSizeV2); ImGuiUtil.FontSizeCombo(
Language.Options_SymbolsFontSize_Name,
ref Mutable.SymbolsFontSizeV2
);
ImGuiUtil.HelpMarker(Language.Options_SymbolsFontSize_Description); ImGuiUtil.HelpMarker(Language.Options_SymbolsFontSize_Description);
ImGui.Spacing(); ImGui.Spacing();
@@ -68,7 +74,12 @@ internal sealed class FontsAndColours : ISettingsTab
} }
else else
{ {
var globalChooser = ImGuiUtil.FontChooser(Language.Options_Font_Name, Mutable.GlobalFontV2, false, ref unused); var globalChooser = ImGuiUtil.FontChooser(
Language.Options_Font_Name,
Mutable.GlobalFontV2,
false,
ref unused
);
globalChooser?.ResultTask.ContinueWith(r => globalChooser?.ResultTask.ContinueWith(r =>
{ {
if (r.IsCompletedSuccessfully) if (r.IsCompletedSuccessfully)
@@ -79,14 +90,27 @@ internal sealed class FontsAndColours : ISettingsTab
ImGui.SameLine(); ImGui.SameLine();
if (ImGui.Button("Reset##global")) if (ImGui.Button("Reset##global"))
{ {
Mutable.GlobalFontV2 = new SingleFontSpec { FontId = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular), SizePt = 12.75f }; Mutable.GlobalFontV2 = new SingleFontSpec
{
FontId = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular),
SizePt = 12.75f,
};
} }
ImGuiUtil.HelpMarker(string.Format(Language.Options_Font_Description, Plugin.PluginName)); ImGuiUtil.HelpMarker(
string.Format(Language.Options_Font_Description, Plugin.PluginName)
);
ImGuiUtil.WarningText(Language.Options_Font_Warning); ImGuiUtil.WarningText(Language.Options_Font_Warning);
ImGui.Spacing(); ImGui.Spacing();
var japaneseChooser = ImGuiUtil.FontChooser(Language.Options_JapaneseFont_Name, Mutable.JapaneseFontV2, false, ref unused, id => !id.LocaleNames?.ContainsKey("ja-jp") ?? false, "いろはにほへと ちりぬるを"); var japaneseChooser = ImGuiUtil.FontChooser(
Language.Options_JapaneseFont_Name,
Mutable.JapaneseFontV2,
false,
ref unused,
id => !id.LocaleNames?.ContainsKey("ja-jp") ?? false,
"いろはにほへと ちりぬるを"
);
japaneseChooser?.ResultTask.ContinueWith(r => japaneseChooser?.ResultTask.ContinueWith(r =>
{ {
if (r.IsCompletedSuccessfully) if (r.IsCompletedSuccessfully)
@@ -97,13 +121,24 @@ internal sealed class FontsAndColours : ISettingsTab
ImGui.SameLine(); ImGui.SameLine();
if (ImGui.Button("Reset##japanese")) if (ImGui.Button("Reset##japanese"))
{ {
Mutable.JapaneseFontV2 = new SingleFontSpec { FontId = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkMedium), SizePt = 12.75f }; Mutable.JapaneseFontV2 = new SingleFontSpec
{
FontId = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkMedium),
SizePt = 12.75f,
};
} }
ImGuiUtil.HelpMarker(string.Format(Language.Options_JapaneseFont_Description, Plugin.PluginName)); ImGuiUtil.HelpMarker(
string.Format(Language.Options_JapaneseFont_Description, Plugin.PluginName)
);
ImGui.Spacing(); ImGui.Spacing();
var italicChooser = ImGuiUtil.FontChooser(Language.Options_ItalicFont_Name, Mutable.ItalicFontV2, true, ref Mutable.ItalicEnabled); var italicChooser = ImGuiUtil.FontChooser(
Language.Options_ItalicFont_Name,
Mutable.ItalicFontV2,
true,
ref Mutable.ItalicEnabled
);
italicChooser?.ResultTask.ContinueWith(r => italicChooser?.ResultTask.ContinueWith(r =>
{ {
if (r.IsCompletedSuccessfully) if (r.IsCompletedSuccessfully)
@@ -115,15 +150,23 @@ internal sealed class FontsAndColours : ISettingsTab
if (ImGui.Button("Reset##italic")) if (ImGui.Button("Reset##italic"))
{ {
Mutable.ItalicEnabled = false; Mutable.ItalicEnabled = false;
Mutable.ItalicFontV2 = new SingleFontSpec { FontId = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular), SizePt = 12.75f }; Mutable.ItalicFontV2 = new SingleFontSpec
{
FontId = new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular),
SizePt = 12.75f,
};
} }
ImGuiUtil.HelpMarker(string.Format(Language.Options_Italic_Description, Plugin.PluginName)); ImGuiUtil.HelpMarker(
string.Format(Language.Options_Italic_Description, Plugin.PluginName)
);
ImGui.Spacing(); ImGui.Spacing();
if (ImGui.CollapsingHeader(Language.Options_ExtraGlyphs_Name)) if (ImGui.CollapsingHeader(Language.Options_ExtraGlyphs_Name))
{ {
ImGuiUtil.HelpMarker(string.Format(Language.Options_ExtraGlyphs_Description, Plugin.PluginName)); ImGuiUtil.HelpMarker(
string.Format(Language.Options_ExtraGlyphs_Description, Plugin.PluginName)
);
var range = (int)Mutable.ExtraGlyphRanges; var range = (int)Mutable.ExtraGlyphRanges;
foreach (var extra in Enum.GetValues<ExtraGlyphRanges>()) foreach (var extra in Enum.GetValues<ExtraGlyphRanges>())
@@ -137,7 +180,10 @@ internal sealed class FontsAndColours : ISettingsTab
ImGui.Spacing(); ImGui.Spacing();
} }
ImGuiUtil.FontSizeCombo(Language.Options_SymbolsFontSize_Name, ref Mutable.SymbolsFontSizeV2); ImGuiUtil.FontSizeCombo(
Language.Options_SymbolsFontSize_Name,
ref Mutable.SymbolsFontSizeV2
);
ImGuiUtil.HelpMarker(Language.Options_SymbolsFontSize_Description); ImGuiUtil.HelpMarker(Language.Options_SymbolsFontSize_Description);
ImGui.Spacing(); ImGui.Spacing();
@@ -158,7 +204,10 @@ internal sealed class FontsAndColours : ISettingsTab
ImGui.Separator(); ImGui.Separator();
ImGui.Spacing(); ImGui.Spacing();
ImGui.Checkbox(Language.Options_ColorSelectedInputChannelButton_Name, ref Mutable.ColorSelectedInputChannelButton); ImGui.Checkbox(
Language.Options_ColorSelectedInputChannelButton_Name,
ref Mutable.ColorSelectedInputChannelButton
);
ImGuiUtil.HelpMarker(Language.Options_ColorSelectedInputChannelButton_Description); ImGuiUtil.HelpMarker(Language.Options_ColorSelectedInputChannelButton_Description);
ImGui.Spacing(); ImGui.Spacing();
@@ -166,14 +215,26 @@ internal sealed class FontsAndColours : ISettingsTab
{ {
foreach (var type in types) foreach (var type in types)
{ {
if (ImGuiUtil.IconButton(FontAwesomeIcon.UndoAlt, $"{type}", Language.Options_ChatColours_Reset)) if (
ImGuiUtil.IconButton(
FontAwesomeIcon.UndoAlt,
$"{type}",
Language.Options_ChatColours_Reset
)
)
{ {
Mutable.ChatColours.Remove(type); Mutable.ChatColours.Remove(type);
} }
ImGui.SameLine(); ImGui.SameLine();
if (ImGuiUtil.IconButton(FontAwesomeIcon.LongArrowAltDown, $"{type}", Language.Options_ChatColours_Import)) if (
ImGuiUtil.IconButton(
FontAwesomeIcon.LongArrowAltDown,
$"{type}",
Language.Options_ChatColours_Import
)
)
{ {
var gameColour = Plugin.Functions.Chat.GetChannelColor(type); var gameColour = Plugin.Functions.Chat.GetChannelColor(type);
Mutable.ChatColours[type] = gameColour ?? type.DefaultColor() ?? 0; Mutable.ChatColours[type] = gameColour ?? type.DefaultColor() ?? 0;
@@ -210,8 +271,14 @@ internal sealed class FontsAndColours : ISettingsTab
{ {
var border = ColourUtil.RgbaToVector3(ColourUtil.ComponentsToRgba(255, 128, 200)); var border = ColourUtil.RgbaToVector3(ColourUtil.ComponentsToRgba(255, 128, 200));
var btn = ColourUtil.RgbaToVector3(ColourUtil.ComponentsToRgba(74, 42, 106)); var btn = ColourUtil.RgbaToVector3(ColourUtil.ComponentsToRgba(74, 42, 106));
ImGui.PushStyleColor(ImGuiCol.Border, new System.Numerics.Vector4(border.X, border.Y, border.Z, 1f)); ImGui.PushStyleColor(
ImGui.PushStyleColor(ImGuiCol.Button, new System.Numerics.Vector4(btn.X, btn.Y, btn.Z, 1f)); ImGuiCol.Border,
new System.Numerics.Vector4(border.X, border.Y, border.Z, 1f)
);
ImGui.PushStyleColor(
ImGuiCol.Button,
new System.Numerics.Vector4(btn.X, btn.Y, btn.Z, 1f)
);
ImGui.PushStyleVar(ImGuiStyleVar.FrameBorderSize, 1.5f); ImGui.PushStyleVar(ImGuiStyleVar.FrameBorderSize, 1.5f);
} }
@@ -230,7 +297,10 @@ internal sealed class FontsAndColours : ISettingsTab
private static string GetPresetLabel(ChatColourPreset preset) private static string GetPresetLabel(ChatColourPreset preset)
{ {
var localized = HellionStrings.ResourceManager.GetString(preset.LocalizationKey, HellionStrings.Culture); var localized = HellionStrings.ResourceManager.GetString(
preset.LocalizationKey,
HellionStrings.Culture
);
return string.IsNullOrEmpty(localized) ? preset.DisplayName : localized; return string.IsNullOrEmpty(localized) ? preset.DisplayName : localized;
} }
+30 -9
View File
@@ -1,8 +1,8 @@
using HellionChat.Resources; using Dalamud.Bindings.ImGui;
using HellionChat.Util;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Bindings.ImGui; using HellionChat.Resources;
using HellionChat.Util;
namespace HellionChat.Ui.SettingsTabs; namespace HellionChat.Ui.SettingsTabs;
@@ -54,7 +54,12 @@ internal sealed class General : ISettingsTab
ImGui.Spacing(); ImGui.Spacing();
using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_KeybindMode_Name, Mutable.KeybindMode.Name())) using (
var combo = ImGuiUtil.BeginComboVertical(
Language.Options_KeybindMode_Name,
Mutable.KeybindMode.Name()
)
)
{ {
if (combo.Success) if (combo.Success)
{ {
@@ -72,7 +77,9 @@ internal sealed class General : ISettingsTab
} }
} }
} }
ImGuiUtil.HelpMarker(string.Format(Language.Options_KeybindMode_Description, Plugin.PluginName)); ImGuiUtil.HelpMarker(
string.Format(Language.Options_KeybindMode_Description, Plugin.PluginName)
);
} }
} }
@@ -123,7 +130,12 @@ internal sealed class General : ISettingsTab
using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false)) using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
{ {
using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_Language_Name, Mutable.LanguageOverride.Name())) using (
var combo = ImGuiUtil.BeginComboVertical(
Language.Options_Language_Name,
Mutable.LanguageOverride.Name()
)
)
{ {
if (combo.Success) if (combo.Success)
{ {
@@ -136,10 +148,17 @@ internal sealed class General : ISettingsTab
} }
} }
} }
ImGuiUtil.HelpMarker(string.Format(Language.Options_Language_Description, Plugin.PluginName)); ImGuiUtil.HelpMarker(
string.Format(Language.Options_Language_Description, Plugin.PluginName)
);
ImGui.Spacing(); ImGui.Spacing();
using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_CommandHelpSide_Name, Mutable.CommandHelpSide.Name())) using (
var combo = ImGuiUtil.BeginComboVertical(
Language.Options_CommandHelpSide_Name,
Mutable.CommandHelpSide.Name()
)
)
{ {
if (combo.Success) if (combo.Success)
{ {
@@ -152,7 +171,9 @@ internal sealed class General : ISettingsTab
} }
} }
} }
ImGuiUtil.HelpMarker(string.Format(Language.Options_CommandHelpSide_Description, Plugin.PluginName)); ImGuiUtil.HelpMarker(
string.Format(Language.Options_CommandHelpSide_Description, Plugin.PluginName)
);
ImGui.Spacing(); ImGui.Spacing();
ImGui.Checkbox(Language.Options_SortAutoTranslate_Name, ref Mutable.SortAutoTranslate); ImGui.Checkbox(Language.Options_SortAutoTranslate_Name, ref Mutable.SortAutoTranslate);
+43 -16
View File
@@ -1,10 +1,10 @@
using HellionChat.Resources; using Dalamud.Bindings.ImGui;
using HellionChat.Util;
using Dalamud.Interface; using Dalamud.Interface;
using Dalamud.Interface.Colors; using Dalamud.Interface.Colors;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Bindings.ImGui; using HellionChat.Resources;
using HellionChat.Util;
namespace HellionChat.Ui.SettingsTabs; namespace HellionChat.Ui.SettingsTabs;
@@ -19,21 +19,41 @@ internal sealed class Information : ISettingsTab
private readonly List<string> Translators = private readonly List<string> Translators =
[ [
"q673135110", "Akizem", "d0tiKs", "q673135110",
"Moonlight_Everlit", "Dark32", "andreycout", "Akizem",
"Button_", "Cali666", "cassandra308", "d0tiKs",
"lokinmodar", "jtabox", "AkiraYorumoto", "Moonlight_Everlit",
"MKhayle", "elena.space", "imlisa", "Dark32",
"andrei5125", "ShivaMaheshvara", "aislinn87", "andreycout",
"nishinatsu051", "lichuyuan", "Risu64", "Button_",
"yummypillow", "witchymary", "Yuzumi", "Cali666",
"zomsakura", "Sirayuki" "cassandra308",
"lokinmodar",
"jtabox",
"AkiraYorumoto",
"MKhayle",
"elena.space",
"imlisa",
"andrei5125",
"ShivaMaheshvara",
"aislinn87",
"nishinatsu051",
"lichuyuan",
"Risu64",
"yummypillow",
"witchymary",
"Yuzumi",
"zomsakura",
"Sirayuki",
]; ];
internal Information(Configuration mutable) internal Information(Configuration mutable)
{ {
Mutable = mutable; Mutable = mutable;
Translators.Sort((a, b) => string.Compare(a.ToLowerInvariant(), b.ToLowerInvariant(), StringComparison.Ordinal)); Translators.Sort(
(a, b) =>
string.Compare(a.ToLowerInvariant(), b.ToLowerInvariant(), StringComparison.Ordinal)
);
} }
public void Draw(bool changed) public void Draw(bool changed)
@@ -69,14 +89,19 @@ internal sealed class Information : ISettingsTab
ImGui.TextUnformatted(Language.Options_About_Version); ImGui.TextUnformatted(Language.Options_About_Version);
ImGui.SameLine(); ImGui.SameLine();
ImGui.TextColored(ImGuiColors.ParsedOrange, Plugin.Interface.Manifest.AssemblyVersion.ToString(3)); ImGui.TextColored(
ImGuiColors.ParsedOrange,
Plugin.Interface.Manifest.AssemblyVersion.ToString(3)
);
ImGuiHelpers.ScaledDummy(10.0f); ImGuiHelpers.ScaledDummy(10.0f);
ImGui.TextUnformatted(Language.Options_About_Github_Issues); ImGui.TextUnformatted(Language.Options_About_Github_Issues);
ImGui.SameLine(); ImGui.SameLine();
if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "githubIssues")) if (ImGuiUtil.IconButton(FontAwesomeIcon.ExternalLinkAlt, "githubIssues"))
Dalamud.Utility.Util.OpenLink("https://github.com/JonKazama-Hellion/HellionChat/issues"); Dalamud.Utility.Util.OpenLink(
"https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/issues"
);
} }
} }
@@ -169,7 +194,9 @@ internal sealed class Information : ISettingsTab
return; return;
ImGui.TextUnformatted(Language.Options_Changelog_Header); ImGui.TextUnformatted(Language.Options_Changelog_Header);
ImGui.TextUnformatted($"Version {Plugin.Interface.Manifest.AssemblyVersion.ToString(3)}"); ImGui.TextUnformatted(
$"Version {Plugin.Interface.Manifest.AssemblyVersion.ToString(3)}"
);
ImGui.Spacing(); ImGui.Spacing();
foreach (var sentence in changelog.Split("\n")) foreach (var sentence in changelog.Split("\n"))
{ {
+37 -13
View File
@@ -53,16 +53,24 @@ internal sealed class Integrations : ISettingsTab
// toggle when Honorific is missing would force the user to retoggle // toggle when Honorific is missing would force the user to retoggle
// it every time Honorific is reloaded, which is worse UX than the // it every time Honorific is reloaded, which is worse UX than the
// silent auto-hide. // silent auto-hide.
if (ImGui.Checkbox( if (
ImGui.Checkbox(
HellionStrings.Settings_Integrations_Honorific_Toggle, HellionStrings.Settings_Integrations_Honorific_Toggle,
ref Mutable.ShowHonorificTitleInHeader)) ref Mutable.ShowHonorificTitleInHeader
)
)
{ {
Plugin.SaveConfig(); Plugin.SaveConfig();
} }
using (ImRaii.PushIndent()) using (ImRaii.PushIndent())
{ {
using (ImRaii.PushColor(ImGuiCol.Text, ColourUtil.RgbaToAbgr(Plugin.ThemeRegistry.Active.Colors.TextMuted))) using (
ImRaii.PushColor(
ImGuiCol.Text,
ColourUtil.RgbaToAbgr(Plugin.ThemeRegistry.Active.Colors.TextMuted)
)
)
{ {
ImGui.TextWrapped(HellionStrings.Settings_Integrations_Honorific_ToggleHint); ImGui.TextWrapped(HellionStrings.Settings_Integrations_Honorific_ToggleHint);
} }
@@ -94,23 +102,34 @@ internal sealed class Integrations : ISettingsTab
{ {
DrawStatusGlyph('●', theme.Colors.StatusSuccess); DrawStatusGlyph('●', theme.Colors.StatusSuccess);
ImGui.SameLine(); ImGui.SameLine();
ImGui.TextUnformatted(string.Format( ImGui.TextUnformatted(
string.Format(
HellionStrings.Settings_Integrations_Honorific_Status_Detected, HellionStrings.Settings_Integrations_Honorific_Status_Detected,
version.Major, version.Minor)); version.Major,
version.Minor
)
);
} }
else if (service.DetectedApiVersion is { } incompatibleVersion) else if (service.DetectedApiVersion is { } incompatibleVersion)
{ {
DrawStatusGlyph('⚠', theme.Colors.StatusWarning); DrawStatusGlyph('⚠', theme.Colors.StatusWarning);
ImGui.SameLine(); ImGui.SameLine();
ImGui.TextUnformatted(string.Format( ImGui.TextUnformatted(
string.Format(
HellionStrings.Settings_Integrations_Honorific_Status_Incompatible, HellionStrings.Settings_Integrations_Honorific_Status_Incompatible,
HonorificService.ExpectedApiMajor, incompatibleVersion.Major, incompatibleVersion.Minor)); HonorificService.ExpectedApiMajor,
incompatibleVersion.Major,
incompatibleVersion.Minor
)
);
} }
else else
{ {
DrawStatusGlyph('○', theme.Colors.TextMuted); DrawStatusGlyph('○', theme.Colors.TextMuted);
ImGui.SameLine(); ImGui.SameLine();
ImGui.TextUnformatted(HellionStrings.Settings_Integrations_Honorific_Status_NotInstalled); ImGui.TextUnformatted(
HellionStrings.Settings_Integrations_Honorific_Status_NotInstalled
);
} }
} }
@@ -133,19 +152,24 @@ internal sealed class Integrations : ISettingsTab
// full section above the Coming Soon block. // full section above the Coming Soon block.
DrawComingSoonItem( DrawComingSoonItem(
HellionStrings.Settings_Integrations_ComingSoon_ContextMenu_Title, HellionStrings.Settings_Integrations_ComingSoon_ContextMenu_Title,
HellionStrings.Settings_Integrations_ComingSoon_ContextMenu_Description); HellionStrings.Settings_Integrations_ComingSoon_ContextMenu_Description
);
DrawComingSoonItem( DrawComingSoonItem(
HellionStrings.Settings_Integrations_ComingSoon_Notifications_Title, HellionStrings.Settings_Integrations_ComingSoon_Notifications_Title,
HellionStrings.Settings_Integrations_ComingSoon_Notifications_Description); HellionStrings.Settings_Integrations_ComingSoon_Notifications_Description
);
DrawComingSoonItem( DrawComingSoonItem(
HellionStrings.Settings_Integrations_ComingSoon_RPStatus_Title, HellionStrings.Settings_Integrations_ComingSoon_RPStatus_Title,
HellionStrings.Settings_Integrations_ComingSoon_RPStatus_Description); HellionStrings.Settings_Integrations_ComingSoon_RPStatus_Description
);
DrawComingSoonItem( DrawComingSoonItem(
HellionStrings.Settings_Integrations_ComingSoon_ExtraChat_Title, HellionStrings.Settings_Integrations_ComingSoon_ExtraChat_Title,
HellionStrings.Settings_Integrations_ComingSoon_ExtraChat_Description); HellionStrings.Settings_Integrations_ComingSoon_ExtraChat_Description
);
DrawComingSoonItem( DrawComingSoonItem(
HellionStrings.Settings_Integrations_ComingSoon_QuickDM_Title, HellionStrings.Settings_Integrations_ComingSoon_QuickDM_Title,
HellionStrings.Settings_Integrations_ComingSoon_QuickDM_Description); HellionStrings.Settings_Integrations_ComingSoon_QuickDM_Description
);
} }
private void DrawComingSoonItem(string title, string description) private void DrawComingSoonItem(string title, string description)
+91 -27
View File
@@ -1,9 +1,9 @@
using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Utility.Raii;
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.Bindings.ImGui;
namespace HellionChat.Ui.SettingsTabs; namespace HellionChat.Ui.SettingsTabs;
@@ -24,28 +24,90 @@ internal sealed class Privacy : ISettingsTab
// a runtime LanguageChanged call updates the labels immediately. // a runtime LanguageChanged call updates the labels immediately.
private static readonly (Func<string> Heading, ChatType[] Types)[] Groups = private static readonly (Func<string> Heading, ChatType[] Types)[] Groups =
[ [
(() => HellionStrings.Privacy_Group_DirectMessages, [ChatType.TellIncoming, ChatType.TellOutgoing]), (
(() => HellionStrings.Privacy_Group_PartyAlliance, [ChatType.Party, ChatType.CrossParty, ChatType.Alliance, ChatType.PvpTeam]), () => HellionStrings.Privacy_Group_DirectMessages,
(() => HellionStrings.Privacy_Group_FreeCompany, [ChatType.FreeCompany, ChatType.FreeCompanyAnnouncement, ChatType.FreeCompanyLoginLogout]), [ChatType.TellIncoming, ChatType.TellOutgoing]
(() => HellionStrings.Privacy_Group_Linkshells, [ ),
ChatType.Linkshell1, ChatType.Linkshell2, ChatType.Linkshell3, ChatType.Linkshell4, (
ChatType.Linkshell5, ChatType.Linkshell6, ChatType.Linkshell7, ChatType.Linkshell8, () => HellionStrings.Privacy_Group_PartyAlliance,
]), [ChatType.Party, ChatType.CrossParty, ChatType.Alliance, ChatType.PvpTeam]
(() => HellionStrings.Privacy_Group_CrossLinkshells, [ ),
ChatType.CrossLinkshell1, ChatType.CrossLinkshell2, ChatType.CrossLinkshell3, ChatType.CrossLinkshell4, (
ChatType.CrossLinkshell5, ChatType.CrossLinkshell6, ChatType.CrossLinkshell7, ChatType.CrossLinkshell8, () => HellionStrings.Privacy_Group_FreeCompany,
]), [
(() => HellionStrings.Privacy_Group_ExtraChat, [ ChatType.FreeCompany,
ChatType.ExtraChatLinkshell1, ChatType.ExtraChatLinkshell2, ChatType.ExtraChatLinkshell3, ChatType.ExtraChatLinkshell4, ChatType.FreeCompanyAnnouncement,
ChatType.ExtraChatLinkshell5, ChatType.ExtraChatLinkshell6, ChatType.ExtraChatLinkshell7, ChatType.ExtraChatLinkshell8, ChatType.FreeCompanyLoginLogout,
]), ]
(() => HellionStrings.Privacy_Group_PublicChat, [ChatType.Say, ChatType.Shout, ChatType.Yell, ChatType.NoviceNetwork, ChatType.CustomEmote, ChatType.StandardEmote]), ),
(() => HellionStrings.Privacy_Group_SystemLogs, [ (
ChatType.System, ChatType.Notice, ChatType.Urgent, ChatType.Echo, () => HellionStrings.Privacy_Group_Linkshells,
ChatType.NpcDialogue, ChatType.NpcAnnouncement, [
ChatType.LootNotice, ChatType.LootRoll, ChatType.RetainerSale, ChatType.Linkshell1,
ChatType.Crafting, ChatType.Gathering, ChatType.Sign, ChatType.RandomNumber, ChatType.Linkshell2,
]), ChatType.Linkshell3,
ChatType.Linkshell4,
ChatType.Linkshell5,
ChatType.Linkshell6,
ChatType.Linkshell7,
ChatType.Linkshell8,
]
),
(
() => HellionStrings.Privacy_Group_CrossLinkshells,
[
ChatType.CrossLinkshell1,
ChatType.CrossLinkshell2,
ChatType.CrossLinkshell3,
ChatType.CrossLinkshell4,
ChatType.CrossLinkshell5,
ChatType.CrossLinkshell6,
ChatType.CrossLinkshell7,
ChatType.CrossLinkshell8,
]
),
(
() => HellionStrings.Privacy_Group_ExtraChat,
[
ChatType.ExtraChatLinkshell1,
ChatType.ExtraChatLinkshell2,
ChatType.ExtraChatLinkshell3,
ChatType.ExtraChatLinkshell4,
ChatType.ExtraChatLinkshell5,
ChatType.ExtraChatLinkshell6,
ChatType.ExtraChatLinkshell7,
ChatType.ExtraChatLinkshell8,
]
),
(
() => HellionStrings.Privacy_Group_PublicChat,
[
ChatType.Say,
ChatType.Shout,
ChatType.Yell,
ChatType.NoviceNetwork,
ChatType.CustomEmote,
ChatType.StandardEmote,
]
),
(
() => HellionStrings.Privacy_Group_SystemLogs,
[
ChatType.System,
ChatType.Notice,
ChatType.Urgent,
ChatType.Echo,
ChatType.NpcDialogue,
ChatType.NpcAnnouncement,
ChatType.LootNotice,
ChatType.LootRoll,
ChatType.RetainerSale,
ChatType.Crafting,
ChatType.Gathering,
ChatType.Sign,
ChatType.RandomNumber,
]
),
]; ];
public void Draw(bool changed) public void Draw(bool changed)
@@ -68,7 +130,8 @@ internal sealed class Privacy : ISettingsTab
ImGuiUtil.OptionCheckbox( ImGuiUtil.OptionCheckbox(
ref Mutable.PrivacyFilterEnabled, ref Mutable.PrivacyFilterEnabled,
HellionStrings.Privacy_FilterEnabled_Name, HellionStrings.Privacy_FilterEnabled_Name,
HellionStrings.Privacy_FilterEnabled_Description); HellionStrings.Privacy_FilterEnabled_Description
);
ImGuiUtil.HelpMarker(HellionStrings.Privacy_FilterEnabled_StorageOnly_Help); ImGuiUtil.HelpMarker(HellionStrings.Privacy_FilterEnabled_StorageOnly_Help);
ImGui.Spacing(); ImGui.Spacing();
@@ -82,7 +145,7 @@ internal sealed class Privacy : ISettingsTab
ImGui.Spacing(); ImGui.Spacing();
if (ImGui.Button(HellionStrings.Privacy_Preset_PrivacyFirst)) if (ImGui.Button(HellionStrings.Privacy_Preset_PrivacyFirst))
Mutable.PrivacyPersistChannels = [..PrivacyDefaults.PrivacyFirstWhitelist]; Mutable.PrivacyPersistChannels = [.. PrivacyDefaults.PrivacyFirstWhitelist];
ImGui.SameLine(); ImGui.SameLine();
if (ImGui.Button(HellionStrings.Privacy_Preset_ClearAll)) if (ImGui.Button(HellionStrings.Privacy_Preset_ClearAll))
@@ -128,7 +191,8 @@ internal sealed class Privacy : ISettingsTab
ImGuiUtil.OptionCheckbox( ImGuiUtil.OptionCheckbox(
ref Mutable.PrivacyPersistUnknownChannels, ref Mutable.PrivacyPersistUnknownChannels,
HellionStrings.Privacy_PersistUnknown_Name, HellionStrings.Privacy_PersistUnknown_Name,
HellionStrings.Privacy_PersistUnknown_Description); HellionStrings.Privacy_PersistUnknown_Description
);
} }
} }
} }

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