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.
This commit is contained in:
2026-05-10 13:01:00 +02:00
parent cd01fa63a1
commit 699d4ede1d
141 changed files with 8833 additions and 5733 deletions
+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
+2 -3
View File
@@ -4,7 +4,7 @@ on:
branches: [main, master] branches: [main, master]
pull_request: pull_request:
schedule: schedule:
- cron: '0 6 * * 1' - cron: "0 6 * * 1"
workflow_dispatch: workflow_dispatch:
jobs: jobs:
@@ -17,5 +17,4 @@ jobs:
# local-only inside a Dalamud plugin. Semgrep matches the pattern # local-only inside a Dalamud plugin. Semgrep matches the pattern
# without dataflow, so it flags those eight call sites; CodeQL # without dataflow, so it flags those eight call sites; CodeQL
# would not. Suppressed for this repo only. # would not. Suppressed for this repo only.
semgrep-exclude-rules: 'csharp.lang.security.sqli.csharp-sqli.csharp-sqli' semgrep-exclude-rules: "csharp.lang.security.sqli.csharp-sqli.csharp-sqli"
+2 -1
View File
@@ -7,7 +7,8 @@ contact_links:
- 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
+8 -13
View File
@@ -18,8 +18,7 @@ mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D
- [ ] 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
@@ -56,15 +55,11 @@ new commands, new translations, removed behaviour. If none, write
## Checklist ## Checklist
- [ ] I have read [CONTRIBUTING.md](../CONTRIBUTING.md) and - [ ] I have read [CONTRIBUTING.md](../CONTRIBUTING.md) and [CODE_OF_CONDUCT.md](../CODE_OF_CONDUCT.md).
[CODE_OF_CONDUCT.md](../CODE_OF_CONDUCT.md).
- [ ] My change matches the existing code style (`.editorconfig`). - [ ] My change matches the existing code style (`.editorconfig`).
- [ ] I added or updated tests where the existing test infrastructure - [ ] I added or updated tests where the existing test infrastructure made that practical, or I have explained why tests
made that practical, or I have explained why tests are not are not applicable.
applicable. - [ ] I updated the README, in-plugin strings or documentation if my change is user-visible.
- [ ] I updated the README, in-plugin strings or documentation if my - [ ] I did not include any AI-generated code without disclosing it in the PR description (see
change is user-visible. [AI_DISCLOSURE.md](../docs/AI_DISCLOSURE.md)).
- [ ] I did not include any AI-generated code without disclosing it - [ ] I confirm my contribution is released under the [EUPL-1.2](../LICENSE).
in the PR description (see [AI_DISCLOSURE.md](../docs/AI_DISCLOSURE.md)).
- [ ] I confirm my contribution is released under the
[EUPL-1.2](../LICENSE).
+9 -4
View File
@@ -2,11 +2,16 @@
subtitle: "Theme Foundation" subtitle: "Theme Foundation"
versionsnatur: "Major-UI-Cycle" versionsnatur: "Major-UI-Cycle"
--- ---
- Theme-Engine mit fünf Built-In-Themes: Hellion Arctic (Default), Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint Grove
- Settings öffnet jetzt eine Card-Grid-Übersicht Klick auf eine Card führt in den Detail-View, Breadcrumb und ESC zurück zur Übersicht - Theme-Engine mit fünf Built-In-Themes: Hellion Arctic (Default), Chat 2 Klassik, Event Horizon, Moonlit Bloom, Mint
Grove
- Settings öffnet jetzt eine Card-Grid-Übersicht — Klick auf eine Card führt in den Detail-View, Breadcrumb und ESC
zurück zur Übersicht
- Themes-Tab mit Mini-Mockup pro Theme, Live-Switch beim Klick - Themes-Tab mit Mini-Mockup pro Theme, Live-Switch beim Klick
- Eigene Themes als JSON in `pluginConfigs/HellionChat/themes/` — Beispiel-Vorlage wird beim ersten Start automatisch abgelegt - Eigene Themes als JSON in `pluginConfigs/HellionChat/themes/` — Beispiel-Vorlage wird beim ersten Start automatisch
abgelegt
- Optional pro Theme eigene Chat-Channel-Farben mit Übernehmen/Behalten-Banner — niemals automatisch überschrieben - Optional pro Theme eigene Chat-Channel-Farben mit Übernehmen/Behalten-Banner — niemals automatisch überschrieben
- Plugin-Icon zum Hellion-Forge-Hammer gewechselt - Plugin-Icon zum Hellion-Forge-Hammer gewechselt
- Migration v13 → v14: alle User landen auf Hellion Arctic. Wer den Upstream-Look will, wählt Chat 2 Klassik in Settings → Themes - Migration v13 → v14: alle User landen auf Hellion Arctic. Wer den Upstream-Look will, wählt Chat 2 Klassik in Settings
→ Themes
- Anleitung zum Schreiben eigener Themes: `docs/THEME-AUTHORING.md` - Anleitung zum Schreiben eigener Themes: `docs/THEME-AUTHORING.md`
+15 -6
View File
@@ -2,14 +2,23 @@
subtitle: "Layout Refresh" subtitle: "Layout Refresh"
versionsnatur: "Major-UI-Cycle" versionsnatur: "Major-UI-Cycle"
--- ---
- Sidebar im neuen Look: fix 44 px breit, nur Icons, Tab-Name als Tooltip beim Hover, vertikale Akzent-Pill markiert den aktiven Tab
- Sidebar im neuen Look: fix 44 px breit, nur Icons, Tab-Name als Tooltip beim Hover, vertikale Akzent-Pill markiert den
aktiven Tab
- Top-Tabs bekommen eine Akzent-Underline statt Background-Fill am aktiven Tab - Top-Tabs bekommen eine Akzent-Underline statt Background-Fill am aktiven Tab
- Pro Tab eigenes Icon wählbar in Einstellungen → Tabs (FontAwesome-Pool) - Pro Tab eigenes Icon wählbar in Einstellungen → Tabs (FontAwesome-Pool)
- Auto-Tell-Tabs sind jetzt visuell unterscheidbar: jeder Tell-Partner bekommt ein eigenes Icon (envelope/star/heart/bell/bookmark/flag/fire) plus eigene Farbe aus 12-Farb-Palette — 84 Kombinationen, gleicher Partner ergibt konsistent dieselbe - Auto-Tell-Tabs sind jetzt visuell unterscheidbar: jeder Tell-Partner bekommt ein eigenes Icon
- Pulsierender roter Dot oben rechts am Sidebar-Icon zeigt ungelesene Nachrichten an. Sanft, 2-Sekunden-Cycle, deaktivierbar über `Configuration.ReduceMotion` (UI-Toggle in v1.3.0) (envelope/star/heart/bell/bookmark/flag/fire) plus eigene Farbe aus 12-Farb-Palette — 84 Kombinationen, gleicher
- Bottom-Status-Bar (22 px) mit fünf Live-Slots: aktiver Channel + Color-Dot, Privacy-Badge, Tab/Message-Counter, Auto-Tell-Counter, Plugin-Version. Update 1×/Sek Partner ergibt konsistent dieselbe
- Card-Rows als Default-Message-Render: Sender-Header in Channel-Farbe, Body neue Zeile, dezenter Trenner. `Compact Density`-Toggle in Aussehen schaltet zurück auf den Einzeiler - Pulsierender roter Dot oben rechts am Sidebar-Icon zeigt ungelesene Nachrichten an. Sanft, 2-Sekunden-Cycle,
- Bug-Fix: Settings speichern löscht den Chat-Verlauf nicht mehr. Refilter läuft jetzt nur wenn Filter-relevante Settings geändert wurden — Cosmetic-Änderungen lassen den Chat unverändert. Persistente und Auto-Tell-Tabs überleben beide deaktivierbar über `Configuration.ReduceMotion` (UI-Toggle in v1.3.0)
- Bottom-Status-Bar (22 px) mit fünf Live-Slots: aktiver Channel + Color-Dot, Privacy-Badge, Tab/Message-Counter,
Auto-Tell-Counter, Plugin-Version. Update 1×/Sek
- Card-Rows als Default-Message-Render: Sender-Header in Channel-Farbe, Body neue Zeile, dezenter Trenner.
`Compact Density`-Toggle in Aussehen schaltet zurück auf den Einzeiler
- Bug-Fix: Settings speichern löscht den Chat-Verlauf nicht mehr. Refilter läuft jetzt nur wenn Filter-relevante
Settings geändert wurden — Cosmetic-Änderungen lassen den Chat unverändert. Persistente und Auto-Tell-Tabs überleben
beide
- Bug-Fix: Hellion-Schrift (Exo 2) blockt die Schriftgröße nicht mehr — 4K-User können hochskalieren - Bug-Fix: Hellion-Schrift (Exo 2) blockt die Schriftgröße nicht mehr — 4K-User können hochskalieren
- Migration v14 → v15: alte Theme-Felder entfernt, alle anderen Settings bleiben - Migration v14 → v15: alte Theme-Felder entfernt, alle anderen Settings bleiben
+21 -8
View File
@@ -2,15 +2,28 @@
subtitle: "Settings Cleanup" subtitle: "Settings Cleanup"
versionsnatur: "UX-Polish-Cycle" versionsnatur: "UX-Polish-Cycle"
--- ---
- Settings-Übersicht thematisch re-sortiert: zusammenhängende Optionen wohnen jetzt zusammen, jede Card hat einen kurzen Untertitel — kein Raten mehr wo eine Setting steckt
- Drei neue Cards: **Theme & Layout** (Theme-Picker, Fenster-Style, Zeitstempel-Style), **Schriften & Farben** (Schriftart, Schriftgröße, Chat-Farben pro Channel), **Daten-Verwaltung** (Aufbewahrung, Cleanup, Export, DB-Viewer, Advanced-Tools — vorher zwischen Datenschutz und Datenbank verteilt) - Settings-Übersicht thematisch re-sortiert: zusammenhängende Optionen wohnen jetzt zusammen, jede Card hat einen kurzen
Untertitel — kein Raten mehr wo eine Setting steckt
- Drei neue Cards: **Theme & Layout** (Theme-Picker, Fenster-Style, Zeitstempel-Style), **Schriften & Farben**
(Schriftart, Schriftgröße, Chat-Farben pro Channel), **Daten-Verwaltung** (Aufbewahrung, Cleanup, Export, DB-Viewer,
Advanced-Tools — vorher zwischen Datenschutz und Datenbank verteilt)
- Datenschutz fokussiert sich jetzt auf eine Aufgabe: den Privacy-Filter - Datenschutz fokussiert sich jetzt auf eine Aufgabe: den Privacy-Filter
- Der Auto-Tell-Tabs-History-Preload-Slider ist von Datenschutz nach Chat → Auto-Tell-Tabs umgezogen - Der Auto-Tell-Tabs-History-Preload-Slider ist von Datenschutz nach Chat → Auto-Tell-Tabs umgezogen
- KeybindMode wohnt jetzt unter Allgemein → Eingabe statt unter Sprache - KeybindMode wohnt jetzt unter Allgemein → Eingabe statt unter Sprache
- Vier tote Schema-Felder entfernt (alle obsolet seit der Theme-Engine in v1.1.0): `Stilüberschreiben`-Toggle, `Stilname`-Auswahl, alter `WindowAlpha`-Slider, ungenutztes `ShowThemeQuickPicker` - Vier tote Schema-Felder entfernt (alle obsolet seit der Theme-Engine in v1.1.0): `Stilüberschreiben`-Toggle,
- Migration v15 → v16: alter `WindowAlpha`-Wert wird automatisch nach `Theme & Layout → Fenster-Style → Fenster-Transparenz` gemappt (nur wenn der Slider noch auf Default 0.85 stand, sonst gewinnt der User-Wert). Backup der Pre-v16-Config liegt unter `pluginConfigs/HellionChat.json.pre-v16-backup`. User die `Stilüberschreiben` aktiv hatten sehen einen einmaligen Hinweis-Toast `Stilname`-Auswahl, alter `WindowAlpha`-Slider, ungenutztes `ShowThemeQuickPicker`
- UX-Default-Bumps für Bestand-User mit Default-Werten: Card-Rows-Layout zurück auf Single-Line, NG+ standardmäßig hidden, gleiche Zeitstempel werden zusammengefasst, MaxLinesToRender auf konservativere 2500 - Migration v15 → v16: alter `WindowAlpha`-Wert wird automatisch nach
- Frische Installs starten mit dem Hellion-Brand-Chat-Color-Preset out-of-the-box (der First-Run-Wizard hat keine Preset-Wahl) `Theme & Layout → Fenster-Style → Fenster-Transparenz` gemappt (nur wenn der Slider noch auf Default 0.85 stand, sonst
- Hinweis zum Window-Transparenz-Slider in der Beschreibung: Dalamud's per-Window-Hamburger-Menü (oben rechts in der Titelleiste) bietet eigene Overrides für Deckkraft, Hintergrund-Blur, Anpinnen und Durchklick — die haben Vorrang über unseren Slider für das jeweilige Fenster gewinnt der User-Wert). Backup der Pre-v16-Config liegt unter `pluginConfigs/HellionChat.json.pre-v16-backup`. User
die `Stilüberschreiben` aktiv hatten sehen einen einmaligen Hinweis-Toast
- UX-Default-Bumps für Bestand-User mit Default-Werten: Card-Rows-Layout zurück auf Single-Line, NG+ standardmäßig
hidden, gleiche Zeitstempel werden zusammengefasst, MaxLinesToRender auf konservativere 2500
- Frische Installs starten mit dem Hellion-Brand-Chat-Color-Preset out-of-the-box (der First-Run-Wizard hat keine
Preset-Wahl)
- Hinweis zum Window-Transparenz-Slider in der Beschreibung: Dalamud's per-Window-Hamburger-Menü (oben rechts in der
Titelleiste) bietet eigene Overrides für Deckkraft, Hintergrund-Blur, Anpinnen und Durchklick — die haben Vorrang über
unseren Slider für das jeweilige Fenster
Pure UX-Polish, keine neuen Features. Nächster Cycle (v1.3.0): Animation-Polish (Lerps, Theme-Crossfade, Quick-Picker) wie ursprünglich geplant. Pure UX-Polish, keine neuen Features. Nächster Cycle (v1.3.0): Animation-Polish (Lerps, Theme-Crossfade, Quick-Picker)
wie ursprünglich geplant.
+17 -7
View File
@@ -2,12 +2,22 @@
subtitle: "Theme Expansion" subtitle: "Theme Expansion"
versionsnatur: "Theme-Pack-Patch" versionsnatur: "Theme-Pack-Patch"
--- ---
- Vier neue Built-in-Themes verlängern die Auswahl im Picker — keine Engine-Änderung, keine Settings angefasst, einfach mehr Farboptionen
- **Night Blue** — Royal Blue auf tiefem Marineblau. Kühles Tech-Dashboard-Mood, bewusst neutral gehalten damit es sich nicht mit den Brand-Themes beißt - Vier neue Built-in-Themes verlängern die Auswahl im Picker — keine Engine-Änderung, keine Settings angefasst, einfach
- **Indigo Violet** — Royal Violet auf Deep Indigo mit Türkis-Mint-Counter für Aurora-Glitter-Stimmung. Schwester von Event Horizon, aber dunkler und dichter; der Türkis-Akzent hält die beiden klar auseinander mehr Farboptionen
- **Forge Merchantman** — Patina-Bronze auf Workshop-Slate mit warmem Bernstein-Counter. Hellion Forge bekommt ein eigenes Theme im Plugin selbst — Schwester von Hellion Arctic, aber grüner und wärmer statt kaltem Cyan - **Night Blue** — Royal Blue auf tiefem Marineblau. Kühles Tech-Dashboard-Mood, bewusst neutral gehalten damit es sich
- **Hellion Spectrum** — Farbenblind-sichere Channel-Farben (Deuteranopie/Protanopie) auf Basis der Wong/Okabe-Ito-Palette. Channel-Identität bleibt erhalten (Tell pink, Yell gelb, Shout orange, Party blau, FC grün); die Töne sind so gewählt dass jeder Channel auch unter Rot-Grün-Schwäche klar trennbar bleibt. Deckt rund 99 % aller CVD-Fälle ab nicht mit den Brand-Themes beißt
- Kein Schema-Bump, keine Migration. Das Default-Theme bleibt **Hellion Arctic**, eigene Custom-Themes laufen unverändert weiter - **Indigo Violet** — Royal Violet auf Deep Indigo mit Türkis-Mint-Counter für Aurora-Glitter-Stimmung. Schwester von
Event Horizon, aber dunkler und dichter; der Türkis-Akzent hält die beiden klar auseinander
- **Forge Merchantman** — Patina-Bronze auf Workshop-Slate mit warmem Bernstein-Counter. Hellion Forge bekommt ein
eigenes Theme im Plugin selbst — Schwester von Hellion Arctic, aber grüner und wärmer statt kaltem Cyan
- **Hellion Spectrum** — Farbenblind-sichere Channel-Farben (Deuteranopie/Protanopie) auf Basis der
Wong/Okabe-Ito-Palette. Channel-Identität bleibt erhalten (Tell pink, Yell gelb, Shout orange, Party blau, FC grün);
die Töne sind so gewählt dass jeder Channel auch unter Rot-Grün-Schwäche klar trennbar bleibt. Deckt rund 99 % aller
CVD-Fälle ab
- Kein Schema-Bump, keine Migration. Das Default-Theme bleibt **Hellion Arctic**, eigene Custom-Themes laufen
unverändert weiter
- Theme-Katalog wächst damit von fünf auf neun Built-ins - Theme-Katalog wächst damit von fünf auf neun Built-ins
Reines Theme-Pack zwischen v1.2.1 und dem nächsten Polish-Cycle. Eine Tritan-Variante (Spectrum für Blau-Gelb-Schwäche) kann später nachgeliefert werden, falls Bedarf kommt. Reines Theme-Pack zwischen v1.2.1 und dem nächsten Polish-Cycle. Eine Tritan-Variante (Spectrum für Blau-Gelb-Schwäche)
kann später nachgeliefert werden, falls Bedarf kommt.
+12 -4
View File
@@ -2,9 +2,17 @@
subtitle: "Plugin Integrations: Honorific" subtitle: "Plugin Integrations: Honorific"
versionsnatur: "Plugin-Integration-Cycle 1" versionsnatur: "Plugin-Integration-Cycle 1"
--- ---
- Erste Plugin-Integration eingebaut, Cycle 1 von 6 auf der Roadmap - Erste Plugin-Integration eingebaut, Cycle 1 von 6 auf der Roadmap
- **Honorific-Custom-Titles im Chat-Header** — der Titel den du in Honorific gesetzt hast erscheint jetzt links über dem Message-Log mit der von dir gewählten Farbe, Auto-Hide wenn Honorific nicht installiert ist oder kein Custom-Titel aktiv ist - **Honorific-Custom-Titles im Chat-Header** — der Titel den du in Honorific gesetzt hast erscheint jetzt links über dem
Message-Log mit der von dir gewählten Farbe, Auto-Hide wenn Honorific nicht installiert ist oder kein Custom-Titel
aktiv ist
- **Krone-Icon plus Tooltip** vor dem Titel-Text, damit klar ist woher der Slot kommt ohne dass der User raten muss - **Krone-Icon plus Tooltip** vor dem Titel-Text, damit klar ist woher der Slot kommt ohne dass der User raten muss
- **Neuer Integrations-Settings-Tab** mit Status-Indikator (erkannt, nicht installiert, inkompatibel) und Toggle. Plus Vorschau-Block der die fünf weiteren geplanten Cycles ankündigt: Kontextmenü-Aktionen, Smart Notifications (NotificationMaster), RP-Status-Block (Moodles und LightlessClient), ExtraChat-Channels, Quick-DM-Button (XIVInstantMessenger) - **Neuer Integrations-Settings-Tab** mit Status-Indikator (erkannt, nicht installiert, inkompatibel) und Toggle. Plus
- **Maintainer-Attribution** im Tab als Höflichkeits-Geste, zwei Buttons zum Honorific-Repo und zum Caraxi-Profil. Plus Hellion-Forge-Discord-Button für Community-Vorschläge zu künftigen Integrationen Vorschau-Block der die fünf weiteren geplanten Cycles ankündigt: Kontextmenü-Aktionen, Smart Notifications
- Keine Migration, keine Schema-Änderung. Wer Honorific eh schon nutzt sieht den Custom-Titel automatisch sobald HellionChat aktualisiert (NotificationMaster), RP-Status-Block (Moodles und LightlessClient), ExtraChat-Channels, Quick-DM-Button
(XIVInstantMessenger)
- **Maintainer-Attribution** im Tab als Höflichkeits-Geste, zwei Buttons zum Honorific-Repo und zum Caraxi-Profil. Plus
Hellion-Forge-Discord-Button für Community-Vorschläge zu künftigen Integrationen
- Keine Migration, keine Schema-Änderung. Wer Honorific eh schon nutzt sieht den Custom-Titel automatisch sobald
HellionChat aktualisiert
+12 -21
View File
@@ -5,28 +5,19 @@ versionsnatur: Stability-Hotfix
**Hellion Chat 1.4.0 — Critical Lifecycle Fixes** **Hellion Chat 1.4.0 — Critical Lifecycle Fixes**
Erster Sub-Patch der v1.4.x Polish-Sweep-Serie. Sieben Erster Sub-Patch der v1.4.x Polish-Sweep-Serie. Sieben bekannte Lifecycle- und Race-Bugs aus den Audit-Pässen
bekannte Lifecycle- und Race-Bugs aus den Audit-Pässen abgearbeitet, bevor Performance- und Architektur-Refactors draufkommen.
abgearbeitet, bevor Performance- und Architektur-Refactors
draufkommen.
- **SQLite-Dispose** lehnt sich nicht mehr an GC-Druck zur - **SQLite-Dispose** lehnt sich nicht mehr an GC-Druck zur Datei-Freigabe an, Pooling=false auf der Connection macht den
Datei-Freigabe an, Pooling=false auf der Connection macht manuellen GC.Collect überflüssig
den manuellen GC.Collect überflüssig - **Worker-Threads** (PendingMessage, RetentionSweep) sind jetzt explizit IsBackground=true, das Plugin-Domain kann
- **Worker-Threads** (PendingMessage, RetentionSweep) sind
jetzt explizit IsBackground=true, das Plugin-Domain kann
sauber unloaden bei XIVLauncher-Reload ohne darauf zu warten sauber unloaden bei XIVLauncher-Reload ohne darauf zu warten
- **EmoteCache-Loader** von async-void auf async-Task mit - **EmoteCache-Loader** von async-void auf async-Task mit shared Task-Tracker, drain-on-Dispose. Kein Schreib-Risiko
shared Task-Tracker, drain-on-Dispose. Kein Schreib-Risiko
mehr auf disposed EmoteImages-Einträge nach Plugin-Reload mehr auf disposed EmoteImages-Einträge nach Plugin-Reload
- **DisposeAsync-Timeout** (10s) warnt jetzt laut statt silent - **DisposeAsync-Timeout** (10s) warnt jetzt laut statt silent zu failen
zu failen - **Plugin-Dispose** flushed pending DeferredSave bevor Services abgebaut werden, Settings-Änderungen aus den letzten
- **Plugin-Dispose** flushed pending DeferredSave bevor Services Frames vor Disable überleben jetzt zuverlässig
abgebaut werden, Settings-Änderungen aus den letzten Frames - **v13→v14 Config-Migration** liest pre-v13-Backup und überträgt HellionThemeWindowOpacity in das neue
vor Disable überleben jetzt zuverlässig WindowOpacity-Feld statt auf 0.85 zurückzufallen
- **v13→v14 Config-Migration** liest pre-v13-Backup und überträgt
HellionThemeWindowOpacity in das neue WindowOpacity-Feld statt
auf 0.85 zurückzufallen
Keine Schema-Bumps, keine User-sichtbaren Funktions-Änderungen Keine Schema-Bumps, keine User-sichtbaren Funktions-Änderungen außer dass Reload und Shutdown spürbar sauberer laufen.
außer dass Reload und Shutdown spürbar sauberer laufen.
+14 -26
View File
@@ -5,35 +5,23 @@ versionsnatur: Performance-Patch
**Hellion Chat 1.4.1 — Theme Engine Performance** **Hellion Chat 1.4.1 — Theme Engine Performance**
Zweiter Sub-Patch der v1.4.x Polish-Sweep-Serie. Heap-Pressure Zweiter Sub-Patch der v1.4.x Polish-Sweep-Serie. Heap-Pressure aus dem Theme-Engine-Render-Pfad eliminiert,
aus dem Theme-Engine-Render-Pfad eliminiert, Custom-Theme- Custom-Theme- Hot-Reload überlebt transiente File-Locks beim Editor-Save. Plus zehnter Built-In und überarbeitete
Hot-Reload überlebt transiente File-Locks beim Editor-Save. Author-Credits.
Plus zehnter Built-In und überarbeitete Author-Credits.
- **ABGR-Cache auf den Theme-Records.** Beim Theme-Register - **ABGR-Cache auf den Theme-Records.** Beim Theme-Register (Built-In oder Custom) werden alle Color-Slots einmalig in
(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
ABGR-Pack-Form vor-konvertiert. HellionStyle.PushGlobal ColourUtil.RgbaToAbgr zu jagen. Real gemessene Frame-Time-Recovery: **~13 %** in typischer Render-Szene
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 %) (Plan-Erwartung war 2-6 % konservativ, real ~10-15 %)
- **Custom-Theme File-Lock-Härtung.** Wenn der User ein - **Custom-Theme File-Lock-Härtung.** Wenn der User ein Theme-JSON gerade speichert während HellionChat reloaden will,
Theme-JSON gerade speichert während HellionChat reloaden fängt der Loader jetzt explizit Sharing-Violation und Lock-Violation ab. Last-Known-Good-Snapshot bleibt im Picker,
will, fängt der Loader jetzt explizit Sharing-Violation beim nächsten Tick wird automatisch retry'd — vorher fiel das Theme aus der Liste bis zum Plugin-Reload
und Lock-Violation ab. Last-Known-Good-Snapshot bleibt im - **Defensive Cache-Refresh beim Theme-Switch.** Falls ein Theme auf einem alten Pfad ohne Cache-Fill in den Speicher
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 gekommen ist, holt Switch() das beim Anwenden nach
- **Synthwave Sunset als zehnter Built-In.** Hot Magenta + - **Synthwave Sunset als zehnter Built-In.** Hot Magenta + Cyan auf Mitternachts-Violett, 80s-Neon-Grid-Vibes für
Cyan auf Mitternachts-Violett, 80s-Neon-Grid-Vibes für
Late-Night-Raids Late-Night-Raids
- **Author-Credits konsolidiert.** Brand-Themes laufen jetzt - **Author-Credits konsolidiert.** Brand-Themes laufen jetzt unter „Hellion Forge". Mint Grove und Forge Merchantman
unter „Hellion Forge". Mint Grove und Forge Merchantman
werden Carla Beleandis als Community-Geste zugeschrieben. werden Carla Beleandis als Community-Geste zugeschrieben.
Keine Schema-Bumps, keine User-sichtbaren Funktions- Keine Schema-Bumps, keine User-sichtbaren Funktions- Änderungen außer dass die Frames in Theme-getrieben rendernden
Änderungen außer dass die Frames in Theme-getrieben Szenen merklich glatter laufen und ein neues Theme im Picker steht.
rendernden Szenen merklich glatter laufen und ein neues
Theme im Picker steht.
+16 -30
View File
@@ -5,39 +5,25 @@ versionsnatur: Performance-Patch
**Hellion Chat 1.4.2 — ChatLog Frame-Hot-Path** **Hellion Chat 1.4.2 — ChatLog Frame-Hot-Path**
Dritter Sub-Patch der v1.4.x Polish-Sweep-Serie. Drei Dritter Sub-Patch der v1.4.x Polish-Sweep-Serie. Drei Per-Frame-Allokations-Quellen aus dem ChatLogWindow-Render- Pfad
Per-Frame-Allokations-Quellen aus dem ChatLogWindow-Render- und der Settings-StatusBar eliminiert.
Pfad und der Settings-StatusBar eliminiert.
- **Card-Mode-Border-Loop entlastet.** DrawMessages hebt - **Card-Mode-Border-Loop entlastet.** DrawMessages hebt Theme, DrawList, Window-Left, Window-Right und die ABGR-
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
Border-Color einmalig vor den Per-Message-Loop. Bei 100 Property-Reads, die der Hoist eliminiert. Pop-Out- Heavy-Setups (mehrere parallele Chat-Windows) profitieren
sichtbaren Messages sind das gut 500 redundante P/Invokes proportional, weil der Hoist pro DrawMessages-Call greift, also pro Window
und Property-Reads, die der Hoist eliminiert. Pop-Out- - **Auto-Tell Tab-Tint und Icon gecached.** Die Hash-Color- Berechnung für Auto-Tell-Tabs lief pro Tab pro Frame, mit
Heavy-Setups (mehrere parallele Chat-Windows) profitieren zwei String-Allokationen pro Tab (eine für Tint-Hash, eine für Icon-Hash). Der neue TabTintCache liest pre-computed
proportional, weil der Hoist pro DrawMessages-Call greift, Werte aus dem Tab und rechnet nur neu wenn das Tell-Target drifted. Beide Caches haben separate Validation-Keys, also
also pro Window keine Cross-Invalidation zwischen Tint- und Icon-Pfad. AutoTellTabTint selbst bleibt pure Hash-Helper, weiterhin ohne
- **Auto-Tell Tab-Tint und Icon gecached.** Die Hash-Color- Tab-Awareness
Berechnung für Auto-Tell-Tabs lief pro Tab pro Frame, mit - **StatusBar-Aggregation hinter Cache-Gate.** Die Status- Leiste am unteren Window-Rand summiert die Tab-Message-
zwei String-Allokationen pro Tab (eine für Tint-Hash, eine Counts und zählt die Auto-Tell-Tabs pro Frame. Der Cache- Gate (1 Sekunde) lag bisher hinter den LINQ-Pfaden, also
für Icon-Hash). Der neue TabTintCache liest pre-computed liefen Sum und Count trotzdem pro Frame. Jetzt vor dem Gate, plus die LINQ-Pfade durch eine Single-Pass-Foreach
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 ersetzt. Die Aggregation läuft auf etwa 1 % der Frames
Realistische Frame-Time-Recovery: 2-5 % in typischen Szenen, Realistische Frame-Time-Recovery: 2-5 % in typischen Szenen, Pop-Out-Heavy-Setups potenziell mehr durch die Card-Border-
Pop-Out-Heavy-Setups potenziell mehr durch die Card-Border-
Multiplikation pro Window. Multiplikation pro Window.
Keine Schema-Bumps, keine User-sichtbaren Funktions- Keine Schema-Bumps, keine User-sichtbaren Funktions- Änderungen außer dass die Frames im Chat-Log und in der
Änderungen außer dass die Frames im Chat-Log und in der
Settings-Statusleiste merklich glatter laufen. Settings-Statusleiste merklich glatter laufen.
+19 -35
View File
@@ -5,41 +5,25 @@ versionsnatur: Architecture-Refactor
**Hellion Chat 1.4.3 — Plugin-Load Async-Init + Repo-Cutover** **Hellion Chat 1.4.3 — Plugin-Load Async-Init + Repo-Cutover**
Vierter Sub-Patch der v1.4.x Polish-Sweep-Serie. Plugin- Vierter Sub-Patch der v1.4.x Polish-Sweep-Serie. Plugin- Lifecycle auf Dalamud's `IAsyncDalamudPlugin`-API migriert und
Lifecycle auf Dalamud's `IAsyncDalamudPlugin`-API migriert das Custom-Repo zieht von GitHub auf Gitea um.
und das Custom-Repo zieht von GitHub auf Gitea um.
- **Async-Plugin-Architektur.** Konstruktor übernimmt nur - **Async-Plugin-Architektur.** Konstruktor übernimmt nur noch die Bootstrap-Essentials (Config-Load, Language-Init,
noch die Bootstrap-Essentials (Config-Load, Language-Init, Conflict-Detection). Migrationen, Service-Allokationen, Window-Konstruktion und Hook-Subscription wandern in
Conflict-Detection). Migrationen, Service-Allokationen, LoadAsync, sodass Dalamud die UI während der schweren Arbeit responsive halten kann. Per-Line-CaptureFailure in
Window-Konstruktion und Hook-Subscription wandern in DisposeAsync mirrort LightlessSync's Pattern, plus Idempotency-Guard gegen Reload-Races
LoadAsync, sodass Dalamud die UI während der schweren - **Custom-Repo-URL umgezogen auf Gitea.** Bestehende Tester müssen einmalig in XIVLauncher die Custom-Repo-URL auf
Arbeit responsive halten kann. Per-Line-CaptureFailure in `https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json` umstellen, dann
DisposeAsync mirrort LightlessSync's Pattern, plus XIVLauncher neu starten. Das alte GitHub-Repo bleibt als eingefrorener v1.4.2-Snapshot stehen und wird nicht mehr
Idempotency-Guard gegen Reload-Races aktualisiert
- **Custom-Repo-URL umgezogen auf Gitea.** Bestehende Tester - **Schema-Gate statt Migrations-Kette.** Die v9 → v16 Migrationen sind raus, ersetzt durch einen harten Schema-Check in
müssen einmalig in XIVLauncher die Custom-Repo-URL auf Phase 1. Configs auf Schema v16+ laden direkt; ältere Configs (vor v1.2.1) bekommen jetzt eine klare „install v1.4.2
`https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json` first"-Fehlermeldung statt eines impliziten Migrations-Pfads
umstellen, dann XIVLauncher neu starten. Das alte - **AutoTranslate-Cache läuft im Hintergrund.** Der Cache füllt sich jetzt fire-and-forget statt blockierend im
GitHub-Repo bleibt als eingefrorener v1.4.2-Snapshot Plugin-Load. Trade-off: die erste Auto-Translate-Nutzung einer Session kann einen kurzen Hitch haben, dafür kein
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 300-ms-Block beim Plugin-Start
- **Plugin-Load-Zeit ehrlich.** Median 3,7 s über fünf - **Plugin-Load-Zeit ehrlich.** Median 3,7 s über fünf Reloads, vergleichbar mit v1.4.2. Der Async-Refactor ist
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
Foundation für künftige Lazy-Init-Optimierungen (v1.4.4) Speed-Win in dieser Release
und Code-Architektur-Hygiene, kein direkter
User-spürbarer Speed-Win in dieser Release
Keine User-sichtbaren Funktions-Änderungen außer dem Keine User-sichtbaren Funktions-Änderungen außer dem Repo-URL-Update. Settings, Themes und Tabs bleiben unangetastet.
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://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/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://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/README.md) — features, architecture, build - [README](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/README.md) — features,
- [Privacy notice](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/PRIVACY.md) — what the plugin stores and sends architecture, build
- [Third-party notices](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/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://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/SECURITY.md) — vulnerability reporting the plugin stores and sends
- [Support](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/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://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/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.
+2 -2
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
+2 -2
View File
@@ -19,7 +19,7 @@ name: Release
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
@@ -27,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
+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/).
+66 -101
View File
@@ -1,91 +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). Active v1.4.x cycle; HellionChat continues as an independent codebase. Existing upstream-derived code keeps its attribution.
cherry-picking from upstream Chat 2 has ended in the v1.4.x cycle; New contributions stand on their own and do not need to be cherry-pick-compatible.
HellionChat continues as an independent codebase. Existing - Read [`SECURITY.md`](SECURITY.md). Anything security-sensitive goes through a private advisory, never a public issue
upstream-derived code keeps its attribution. New contributions or PR.
stand on their own and do not need to be cherry-pick-compatible.
- Read [`SECURITY.md`](SECURITY.md). Anything security-sensitive goes
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. The project. (This used to be doubly important because of the upstream cherry-pick path; that path is closed now, but the
maintenance cost outweighs the benefit for a one-person project. rule still holds on its own merits.)
(This used to be doubly important because of the upstream - AI-generated code dropped in without disclosure or human review. See [`docs/AI_DISCLOSURE.md`](docs/AI_DISCLOSURE.md)
cherry-pick path; that path is closed now, but the rule still for how I handle AI assistance on my side; I expect comparable transparency from contributors.
holds on its own merits.)
- AI-generated code dropped in without disclosure or human review. See
[`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
@@ -93,68 +71,56 @@ 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 kept as-is from the last from the last upstream sync and remain the work of the Chat 2 Crowdin community. Active cherry-picking from upstream
upstream sync and remain the work of the Chat 2 Crowdin community. ended in the v1.4.x cycle (see [`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md)), so future translation improvements to
Active cherry-picking from upstream ended in the v1.4.x cycle (see those upstream strings will not flow into HellionChat automatically anymore. If you have improvements for the original
[`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md)), so future Chat 2 strings, please contribute them to [Infiziert90/ChatTwo](https://github.com/Infiziert90/ChatTwo) directly.
translation improvements to 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 ## First-time setup
@@ -164,10 +130,9 @@ After cloning, run once:
./scripts/setup-hooks.sh ./scripts/setup-hooks.sh
``` ```
This wires `core.hooksPath` to `.githooks/`. The pre-push hook runs preflight This wires `core.hooksPath` to `.githooks/`. The pre-push hook runs preflight (versions/manifest/changelog/build).
(versions/manifest/changelog/build).
### Test suite ### Test suite
The plugin's test suite lives in a separate local repository and is not part of The plugin's test suite lives in a separate local repository and is not part of this codebase. If you need access for
this codebase. If you need access for development, contact the maintainer. development, contact the maintainer.
+2 -2
View File
@@ -4,7 +4,7 @@ HellionChat — a privacy-focused fork of ChatTwo for FINAL FANTASY XIV
Source code Source code
═══════════════════════════════════════════════════════════════════ ═══════════════════════════════════════════════════════════════════
Copyright (c) 2022-2026 Infiziert90 (Infi) and Anna Clemens (ascclemens) Copyright (c) 2022-2026 **[Infiziert90 (Infi)](https://github.com/Infiziert90)** and **[Anna](https://github.com/anna-is-cute)**
Original ChatTwo authors and copyright holders of the upstream Original ChatTwo authors and copyright holders of the upstream
plugin this fork is built on. Their work covers the message store, plugin this fork is built on. Their work covers the message store,
the channel filtering, the sidebar tab system, the FFXIV chat the channel filtering, the sidebar tab system, the FFXIV chat
@@ -19,7 +19,7 @@ Copyright (c) 2025-2026 Florian Wathling / Hellion Online Media
Source code is licensed under the European Union Public Licence Source code is licensed under the European Union Public Licence
(EUPL), Version 1.2 only. The full Licence text lives in the LICENSE (EUPL), Version 1.2 only. The full Licence text lives in the LICENSE
file at the root of this repository. The official Licence website is file at the root of this repository. The official Licence website is
at: https://eupl.eu/1.2/en/ at: <https://eupl.eu/1.2/en/>
This Work is provided "AS IS" without warranties of any kind. See This Work is provided "AS IS" without warranties of any kind. See
Article 7 (Disclaimer of Warranty) and Article 8 (Disclaimer of Article 7 (Disclaimer of Warranty) and Article 8 (Disclaimer of
+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;
} }
+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;
} }
+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))
{ {
+112 -44
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;
@@ -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,7 +380,8 @@ public class Configuration : IPluginConfiguration
clone.LastSendUnread = live.LastSendUnread; clone.LastSendUnread = live.LastSendUnread;
} }
return clone; return clone;
}).ToList(); })
.ToList();
Tabs.AddRange(liveTempTabs); Tabs.AddRange(liveTempTabs);
ChatTabForward = other.ChatTabForward; ChatTabForward = other.ChatTabForward;
@@ -374,7 +393,10 @@ public class Configuration : IPluginConfiguration
RetentionEnabled = other.RetentionEnabled; RetentionEnabled = other.RetentionEnabled;
RetentionDefaultDays = other.RetentionDefaultDays; RetentionDefaultDays = other.RetentionDefaultDays;
RetentionPerChannelDays = other.RetentionPerChannelDays.ToDictionary(p => p.Key, p => p.Value); RetentionPerChannelDays = other.RetentionPerChannelDays.ToDictionary(
p => p.Key,
p => p.Value
);
RetentionLastRunAt = other.RetentionLastRunAt; RetentionLastRunAt = other.RetentionLastRunAt;
FirstRunCompleted = other.FirstRunCompleted; FirstRunCompleted = other.FirstRunCompleted;
@@ -410,7 +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,29 +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 // v1.4.2 — TabTintCache uses separate validation keys per cache so a
// TellTarget change picked up by GetTint can't strand GetIcon (or vice // TellTarget change picked up by GetTint can't strand GetIcon (or vice
// versa) with a stale entry that looks fresh on the shared key. // versa) with a stale entry that looks fresh on the shared key.
[NonSerialized] internal string? _cachedTintTellName; [NonSerialized]
[NonSerialized] internal uint _cachedTintTellWorld; internal string? _cachedTintTellName;
[NonSerialized] internal uint _cachedTellTint;
[NonSerialized] internal string? _cachedIconTellName; [NonSerialized]
[NonSerialized] internal uint _cachedIconTellWorld; internal uint _cachedTintTellWorld;
[NonSerialized] internal string? _cachedTellIcon;
[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)
{ {
@@ -517,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()
{ {
@@ -660,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();
}
} }
} }
@@ -691,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()
{ {
@@ -750,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,
@@ -771,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,
@@ -789,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,
@@ -830,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 => "简体中文",
@@ -852,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",
@@ -890,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,
@@ -902,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(),
+63 -19
View File
@@ -2,10 +2,10 @@
using System.Numerics; using System.Numerics;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Textures; using Dalamud.Interface.Textures;
using Dalamud.Interface.Textures.TextureWraps; using Dalamud.Interface.Textures.TextureWraps;
using Dalamud.Utility; using Dalamud.Utility;
using Dalamud.Bindings.ImGui;
using SixLabors.ImageSharp; using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.PixelFormats;
@@ -15,11 +15,31 @@ public static class EmoteCache
{ {
private static readonly string[] NotWorking = private static readonly string[] NotWorking =
[ [
":tf:", "(ditto)", "c!", "h!", "l!", "M&Mjc", "LUL3D", "p!", ":tf:",
"POLICE2", "r!", "Pussy", "s!", "v!", "w!", "x0r6ztGiggle", "(ditto)",
"z!", "xar2EDM", "iron95Pls", "Clap2", "AlienPls3", "Life", "c!",
"peepoPogClimbingTreeHard4House", "monkaGIGAftRobertDowneyJr", "h!",
"DogLookingSussyAndCold", "DICKS" "l!",
"M&Mjc",
"LUL3D",
"p!",
"POLICE2",
"r!",
"Pussy",
"s!",
"v!",
"w!",
"x0r6ztGiggle",
"z!",
"xar2EDM",
"iron95Pls",
"Clap2",
"AlienPls3",
"Life",
"peepoPogClimbingTreeHard4House",
"monkaGIGAftRobertDowneyJr",
"DogLookingSussyAndCold",
"DICKS",
]; ];
private static readonly HttpClient Client = new(); private static readonly HttpClient Client = new();
@@ -56,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`
@@ -80,11 +100,16 @@ public static class EmoteCache
internal static void TrackLoad(Task loadTask, string emoteCode) internal static void TrackLoad(Task loadTask, string emoteCode)
{ {
PendingLoads.Add(loadTask.ContinueWith(t => PendingLoads.Add(
loadTask.ContinueWith(
t =>
{ {
if (t.IsFaulted) if (t.IsFaulted)
Plugin.Log.Error(t.Exception!, $"EmoteCache load failed for {emoteCode}"); Plugin.Log.Error(t.Exception!, $"EmoteCache load failed for {emoteCode}");
}, TaskScheduler.Default)); },
TaskScheduler.Default
)
);
} }
public static async Task LoadData() public static async Task LoadData()
@@ -121,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;
@@ -225,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))
{ {
@@ -242,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);
} }
@@ -271,12 +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) { }
{
}
catch (Exception ex) catch (Exception ex)
{ {
Failed = true; Failed = true;
@@ -363,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}");
+76 -28
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();
@@ -117,21 +133,26 @@ public class FontManager
{ {
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.
@@ -155,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
{ {
@@ -191,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 SizeInPx(float pt) => (float)(pt * 4.0 / 3.0);
public static float GetFontSize() => Plugin.Config.FontsEnabled ? Plugin.Config.GlobalFontV2.SizePx : SizeInPx(Plugin.Config.FontSizeV2);
public static float GetFontSize() =>
Plugin.Config.FontsEnabled
? Plugin.Config.GlobalFontV2.SizePx
: SizeInPx(Plugin.Config.FontSizeV2);
} }
+228 -51
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,
@@ -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)
{ {
@@ -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)
{ {
@@ -259,7 +313,7 @@ internal sealed unsafe class Chat : IDisposable
{ {
Channel = (InputChannel)channel, Channel = (InputChannel)channel,
Name = nameChunks, Name = nameChunks,
TellTarget = playerName != null ? new TellTarget(playerName, worldId, 0, 0) : null TellTarget = playerName != null ? new TellTarget(playerName, worldId, 0, 0) : null,
}; };
return ret; return ret;
@@ -278,18 +332,36 @@ internal sealed unsafe class Chat : IDisposable
ReplyInSelectedChatModeHook!.Original(agent); ReplyInSelectedChatModeHook!.Original(agent);
} }
private bool SetContextTellTarget(RaptureShellModule* a1, Utf8String* playerName, Utf8String* worldName, ushort worldId, ulong accountId, ulong contentId, ushort reason, bool setChatType) private bool SetContextTellTarget(
RaptureShellModule* a1,
Utf8String* playerName,
Utf8String* worldName,
ushort worldId,
ulong accountId,
ulong contentId,
ushort reason,
bool setChatType
)
{ {
if (playerName != null) if (playerName != null)
{ {
try try
{ {
var target = new TellTarget(playerName->ToString(), worldId, contentId, (TellReason) reason); var target = new TellTarget(
Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(new ChannelSwitchInfo(InputChannel.Tell, permanent: setChatType)) playerName->ToString(),
worldId,
contentId,
(TellReason)reason
);
Plugin.ChatLogWindow.Activated(
new ChatActivatedArgs(
new ChannelSwitchInfo(InputChannel.Tell, permanent: setChatType)
)
{ {
TellReason = (TellReason)reason, TellReason = (TellReason)reason,
TellTarget = target, TellTarget = target,
}); }
);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -297,10 +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>
@@ -353,10 +457,15 @@ internal sealed unsafe class Chat : IDisposable
{ {
if (idx > 7) if (idx > 7)
return false; return false;
return InfoProxyCrossWorldLinkshell.Instance()->CrossWorldLinkshells[(int) idx].Name.Length > 0; return InfoProxyCrossWorldLinkshell.Instance()->CrossWorldLinkshells[(int)idx].Name.Length
> 0;
} }
private static uint? RotateLinkshell(uint currentIndex, RotateMode rotate, Func<uint, bool> validFn) private static uint? RotateLinkshell(
uint currentIndex,
RotateMode rotate,
Func<uint, bool> validFn
)
{ {
if (rotate == RotateMode.None) if (rotate == RotateMode.None)
return null; return null;
@@ -365,7 +474,7 @@ 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.
@@ -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();
@@ -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);
} }
} }
+5 -2
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;
@@ -27,7 +27,10 @@ public unsafe class ChatBox
// Utf8String->SanitizeString, which only resolves in-process. Returns the // Utf8String->SanitizeString, which only resolves in-process. Returns the
// already-encoded bytes so SendMessage doesn't pay GetBytes twice. // already-encoded bytes so SendMessage doesn't pay GetBytes twice.
// TEST-MIRROR: ../../../Hellion Build test/GameFunctions/ChatBoxTests.cs // TEST-MIRROR: ../../../Hellion Build test/GameFunctions/ChatBoxTests.cs
internal static byte[] ValidateMessage(string message, Func<string, string>? sanitiserOverride = null) 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)
+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)
+34 -9
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;
@@ -165,7 +174,8 @@ 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
@@ -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
@@ -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);
} }
+67 -21
View File
@@ -1,23 +1,25 @@
using System.Numerics; using System.Numerics;
using HellionChat.Code; using Dalamud.Bindings.ImGui;
using HellionChat.GameFunctions.Types;
using HellionChat.Util;
using Dalamud.Game.ClientState.Keys; using Dalamud.Game.ClientState.Keys;
using Dalamud.Game.Config; using Dalamud.Game.Config;
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.System.String; using FFXIVClientStructs.FFXIV.Client.System.String;
using FFXIVClientStructs.FFXIV.Client.UI; using FFXIVClientStructs.FFXIV.Client.UI;
using Dalamud.Bindings.ImGui; using HellionChat.Code;
using HellionChat.GameFunctions.Types;
using HellionChat.Util;
using ModifierFlag = HellionChat.GameFunctions.Types.ModifierFlag; using ModifierFlag = HellionChat.GameFunctions.Types.ModifierFlag;
namespace HellionChat.GameFunctions; namespace HellionChat.GameFunctions;
internal enum KeyboardSource { internal enum KeyboardSource
{
Game, Game,
ImGui ImGui,
} }
internal unsafe class KeybindManager : IDisposable { internal unsafe class KeybindManager : IDisposable
{
private Plugin Plugin { get; } private Plugin Plugin { get; }
internal bool DirectChat; internal bool DirectChat;
@@ -26,7 +28,8 @@ internal unsafe class KeybindManager : IDisposable {
private bool VanillaTextInputHasFocus; private bool VanillaTextInputHasFocus;
private readonly Dictionary<string, Keybind> Keybinds = new(); private readonly Dictionary<string, Keybind> Keybinds = new();
private static readonly IReadOnlyDictionary<string, ChannelSwitchInfo> KeybindsToIntercept = new Dictionary<string, ChannelSwitchInfo> private static readonly IReadOnlyDictionary<string, ChannelSwitchInfo> KeybindsToIntercept =
new Dictionary<string, ChannelSwitchInfo>
{ {
["CMD_CHAT"] = new(null), ["CMD_CHAT"] = new(null),
["CMD_COMMAND"] = new(null, text: "/"), ["CMD_COMMAND"] = new(null, text: "/"),
@@ -68,8 +71,16 @@ internal unsafe class KeybindManager : IDisposable {
["CMD_ALLIANCE_ALWAYS"] = new(InputChannel.Alliance, true), ["CMD_ALLIANCE_ALWAYS"] = new(InputChannel.Alliance, true),
["CMD_FREECOM_ALWAYS"] = new(InputChannel.FreeCompany, true), ["CMD_FREECOM_ALWAYS"] = new(InputChannel.FreeCompany, true),
["PVPTEAM_CHAT_ALWAYS"] = new(InputChannel.PvpTeam, true), ["PVPTEAM_CHAT_ALWAYS"] = new(InputChannel.PvpTeam, true),
["CMD_CWLINKSHELL_ALWAYS"] = new(InputChannel.CrossLinkshell1, true, RotateMode.Forward), ["CMD_CWLINKSHELL_ALWAYS"] = new(
["CMD_CWLINKSHELL_ALWAYS_REV"] = new(InputChannel.CrossLinkshell1, true, RotateMode.Reverse), InputChannel.CrossLinkshell1,
true,
RotateMode.Forward
),
["CMD_CWLINKSHELL_ALWAYS_REV"] = new(
InputChannel.CrossLinkshell1,
true,
RotateMode.Reverse
),
["CMD_CWLINKSHELL_1_ALWAYS"] = new(InputChannel.CrossLinkshell1, true), ["CMD_CWLINKSHELL_1_ALWAYS"] = new(InputChannel.CrossLinkshell1, true),
["CMD_CWLINKSHELL_2_ALWAYS"] = new(InputChannel.CrossLinkshell2, true), ["CMD_CWLINKSHELL_2_ALWAYS"] = new(InputChannel.CrossLinkshell2, true),
["CMD_CWLINKSHELL_3_ALWAYS"] = new(InputChannel.CrossLinkshell3, true), ["CMD_CWLINKSHELL_3_ALWAYS"] = new(InputChannel.CrossLinkshell3, true),
@@ -88,7 +99,7 @@ internal unsafe class KeybindManager : IDisposable {
["CMD_LINKSHELL_6_ALWAYS"] = new(InputChannel.Linkshell6, true), ["CMD_LINKSHELL_6_ALWAYS"] = new(InputChannel.Linkshell6, true),
["CMD_LINKSHELL_7_ALWAYS"] = new(InputChannel.Linkshell7, true), ["CMD_LINKSHELL_7_ALWAYS"] = new(InputChannel.Linkshell7, true),
["CMD_LINKSHELL_8_ALWAYS"] = new(InputChannel.Linkshell8, true), ["CMD_LINKSHELL_8_ALWAYS"] = new(InputChannel.Linkshell8, true),
["CMD_BEGINNER_ALWAYS"] = new(InputChannel.NoviceNetwork, true) ["CMD_BEGINNER_ALWAYS"] = new(InputChannel.NoviceNetwork, true),
}; };
// List of keys that can be used as a part of keybinds while the chat is // List of keys that can be used as a part of keybinds while the chat is
@@ -353,12 +364,22 @@ internal unsafe class KeybindManager : IDisposable {
return key.TryToImGui(out var imguiKey) && ImGui.IsKeyPressed(imguiKey); return key.TryToImGui(out var imguiKey) && ImGui.IsKeyPressed(imguiKey);
} }
private static bool ComboPressed(KeyboardSource source, VirtualKey key, ModifierFlag modifier, ModifierFlag? modifierState = null, bool modifiersOnly = false) private static bool ComboPressed(
KeyboardSource source,
VirtualKey key,
ModifierFlag modifier,
ModifierFlag? modifierState = null,
bool modifiersOnly = false
)
{ {
// When we're in an input, we don't want to process any keybinds that // When we're in an input, we don't want to process any keybinds that
// don't have a modifier (or only use shift) and are not explicitly // don't have a modifier (or only use shift) and are not explicitly
// whitelisted. // whitelisted.
if (modifiersOnly && !ModifierlessChatKeys.Contains(key) && modifier is ModifierFlag.None or ModifierFlag.Shift) if (
modifiersOnly
&& !ModifierlessChatKeys.Contains(key)
&& modifier is ModifierFlag.None or ModifierFlag.Shift
)
return false; return false;
modifierState ??= GetModifiers(source); modifierState ??= GetModifiers(source);
@@ -366,26 +387,43 @@ internal unsafe class KeybindManager : IDisposable {
{ {
KeybindMode.Strict => modifier == modifierState.Value, KeybindMode.Strict => modifier == modifierState.Value,
KeybindMode.Flexible => modifierState.Value.HasFlag(modifier), KeybindMode.Flexible => modifierState.Value.HasFlag(modifier),
_ => false _ => false,
}; };
return KeyPressed(source, key) && modifierPressed; return KeyPressed(source, key) && modifierPressed;
} }
private static bool ConfigKeybindPressed(KeyboardSource source, ConfigKeyBind? bind, ModifierFlag? modifierState = null, bool modifiersOnly = false) private static bool ConfigKeybindPressed(
KeyboardSource source,
ConfigKeyBind? bind,
ModifierFlag? modifierState = null,
bool modifiersOnly = false
)
{ {
return bind != null && ComboPressed(source, bind.Key, bind.Modifier, modifierState: modifierState, modifiersOnly: modifiersOnly); return bind != null
&& ComboPressed(
source,
bind.Key,
bind.Modifier,
modifierState: modifierState,
modifiersOnly: modifiersOnly
);
} }
private void HandleKeybinds(IFramework _) => HandleKeybinds(KeyboardSource.Game); private void HandleKeybinds(IFramework _) => HandleKeybinds(KeyboardSource.Game);
internal void HandleKeybinds(KeyboardSource source, bool ignoreChatOpen = false, bool modifiersOnly = false) internal void HandleKeybinds(
KeyboardSource source,
bool ignoreChatOpen = false,
bool modifiersOnly = false
)
{ {
// Refresh current keybinds every 5s // Refresh current keybinds every 5s
if (LastRefresh + 5 * 1000 < Environment.TickCount64) if (LastRefresh + 5 * 1000 < Environment.TickCount64)
{ {
UpdateKeybinds(); UpdateKeybinds();
DirectChat = Plugin.GameConfig.TryGet(UiControlOption.DirectChat, out bool option) && option; DirectChat =
Plugin.GameConfig.TryGet(UiControlOption.DirectChat, out bool option) && option;
LastRefresh = Environment.TickCount64; LastRefresh = Environment.TickCount64;
} }
@@ -433,7 +471,15 @@ internal unsafe class KeybindManager : IDisposable {
void Intercept(VirtualKey vk, ModifierFlag modifier) void Intercept(VirtualKey vk, ModifierFlag modifier)
{ {
if (!ComboPressed(source, vk, modifier, modifierState: modifierState, modifiersOnly: modifiersOnly)) if (
!ComboPressed(
source,
vk,
modifier,
modifierState: modifierState,
modifiersOnly: modifiersOnly
)
)
return; return;
var bits = BitOperations.PopCount((uint)modifier); var bits = BitOperations.PopCount((uint)modifier);
@@ -457,7 +503,7 @@ internal unsafe class KeybindManager : IDisposable {
try try
{ {
TellReason? reason = info.Channel == InputChannel.Tell ? TellReason.Reply : null; TellReason? reason = info.Channel == InputChannel.Tell ? TellReason.Reply : null;
Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(info) { TellReason = reason, }); Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(info) { TellReason = reason });
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -508,7 +554,7 @@ internal unsafe class KeybindManager : IDisposable {
{ {
VirtualKey.F23 => VirtualKey.OEM_2, // /? VirtualKey.F23 => VirtualKey.OEM_2, // /?
(VirtualKey)140 => VirtualKey.OEM_7, // '" (VirtualKey)140 => VirtualKey.OEM_7, // '"
_ => key _ => key,
}; };
} }
} }
+8 -5
View File
@@ -1,8 +1,8 @@
using HellionChat.Resources;
using HellionChat.Util;
using Dalamud.Interface.ImGuiNotification; using Dalamud.Interface.ImGuiNotification;
using FFXIVClientStructs.FFXIV.Client.UI.Agent; using FFXIVClientStructs.FFXIV.Client.UI.Agent;
using FFXIVClientStructs.FFXIV.Client.UI.Info; using FFXIVClientStructs.FFXIV.Client.UI.Info;
using HellionChat.Resources;
using HellionChat.Util;
namespace HellionChat.GameFunctions; namespace HellionChat.GameFunctions;
@@ -11,7 +11,8 @@ internal static unsafe class Party
internal static void InviteSameWorld(string name, ushort world, ulong contentId) internal static void InviteSameWorld(string name, ushort world, ulong contentId)
{ {
// this only works if target is on the same world // this only works if target is on the same world
fixed (byte* namePtr = name.ToTerminatedBytes()) { fixed (byte* namePtr = name.ToTerminatedBytes())
{
InfoProxyPartyInvite.Instance()->InviteToParty(contentId, namePtr, world); InfoProxyPartyInvite.Instance()->InviteToParty(contentId, namePtr, world);
} }
} }
@@ -44,14 +45,16 @@ internal static unsafe class Party
internal static void Kick(string name, ulong contentId) internal static void Kick(string name, ulong contentId)
{ {
fixed (byte* namePtr = name.ToTerminatedBytes()) { fixed (byte* namePtr = name.ToTerminatedBytes())
{
AgentPartyMember.Instance()->Kick(namePtr, 0, contentId); AgentPartyMember.Instance()->Kick(namePtr, 0, contentId);
} }
} }
internal static void Promote(string name, ulong contentId) internal static void Promote(string name, ulong contentId)
{ {
fixed (byte* namePtr = name.ToTerminatedBytes()) { fixed (byte* namePtr = name.ToTerminatedBytes())
{
AgentPartyMember.Instance()->Promote(namePtr, 0, contentId); AgentPartyMember.Instance()->Promote(namePtr, 0, contentId);
} }
} }
@@ -2,13 +2,19 @@ using HellionChat.Code;
namespace HellionChat.GameFunctions.Types; namespace HellionChat.GameFunctions.Types;
internal class ChannelSwitchInfo { internal class ChannelSwitchInfo
{
internal InputChannel? Channel { get; } internal InputChannel? Channel { get; }
internal bool Permanent { get; } internal bool Permanent { get; }
internal RotateMode Rotate { get; } internal RotateMode Rotate { get; }
internal string? Text { get; } internal string? Text { get; }
internal ChannelSwitchInfo(InputChannel? channel, bool permanent = false, RotateMode rotate = RotateMode.None, string? text = null) internal ChannelSwitchInfo(
InputChannel? channel,
bool permanent = false,
RotateMode rotate = RotateMode.None,
string? text = null
)
{ {
Channel = channel; Channel = channel;
Permanent = permanent; Permanent = permanent;
@@ -19,14 +19,14 @@ public class TellTarget
Reason = reason; Reason = reason;
} }
public bool IsSet() public bool IsSet() => !string.IsNullOrEmpty(Name) && World > 0;
=> !string.IsNullOrEmpty(Name) && World > 0;
public string ToWorldString() public string ToWorldString() =>
=> Sheets.WorldSheet.TryGetRow(World, out var worldRow) ? worldRow.Name.ToString() : string.Empty; Sheets.WorldSheet.TryGetRow(World, out var worldRow)
? worldRow.Name.ToString()
: string.Empty;
public string ToTargetString() public string ToTargetString() => $"{Name}@{ToWorldString()}";
=> $"{Name}@{ToWorldString()}";
public unsafe void FromTarget(IPlayerCharacter target) public unsafe void FromTarget(IPlayerCharacter target)
{ {
@@ -39,5 +39,6 @@ public class TellTarget
} }
public static TellTarget Empty() => new(string.Empty, 0, 0, TellReason.Direct); public static TellTarget Empty() => new(string.Empty, 0, 0, TellReason.Direct);
public static TellTarget From(TellTarget t) => new(t.Name, t.World, t.ContentId, t.Reason); public static TellTarget From(TellTarget t) => new(t.Name, t.World, t.ContentId, t.Reason);
} }
-2
View File
@@ -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>
+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)
{ {
+76 -25
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;
@@ -68,13 +68,19 @@ internal class MessageManager : IAsyncDisposable
// IsBackground so a stuck worker never blocks plugin unload. // IsBackground so a stuck worker never blocks plugin unload.
// Cooperative cancel via PendingThreadCancellationToken first, background flag is the safety net. // Cooperative cancel via PendingThreadCancellationToken first, background flag is the safety net.
PendingMessageThread = new Thread(() => ProcessPendingMessages(PendingThreadCancellationToken.Token)) PendingMessageThread = new Thread(() =>
ProcessPendingMessages(PendingThreadCancellationToken.Token)
)
{ {
IsBackground = true, IsBackground = true,
}; };
PendingMessageThread.Start(); PendingMessageThread.Start();
ContentIdResolverHook = Plugin.GameInteropProvider.HookFromAddress<RaptureLogModule.Delegates.AddMsgSourceEntry>(RaptureLogModule.MemberFunctionPointers.AddMsgSourceEntry, ContentIdResolver); ContentIdResolverHook =
Plugin.GameInteropProvider.HookFromAddress<RaptureLogModule.Delegates.AddMsgSourceEntry>(
RaptureLogModule.MemberFunctionPointers.AddMsgSourceEntry,
ContentIdResolver
);
ContentIdResolverHook.Enable(); ContentIdResolverHook.Enable();
Plugin.ChatGui.ChatMessageUnhandled += ChatMessage; Plugin.ChatGui.ChatMessageUnhandled += ChatMessage;
@@ -100,9 +106,10 @@ internal class MessageManager : IAsyncDisposable
if (PendingMessageThread.IsAlive) if (PendingMessageThread.IsAlive)
Plugin.Log.Warning( Plugin.Log.Warning(
"PendingMessageThread did not observe cancellation within 10s. " + "PendingMessageThread did not observe cancellation within 10s. "
"Worker remains on a background thread; next plugin reload releases it. " + + "Worker remains on a background thread; next plugin reload releases it. "
"If this recurs, file a bug with /xllog after the previous reload."); + "If this recurs, file a bug with /xllog after the previous reload."
);
// CTS owns an unmanaged WaitHandle; dispose even if the worker is // CTS owns an unmanaged WaitHandle; dispose even if the worker is
// alive — it checks IsCancellationRequested via the linked token. // alive — it checks IsCancellationRequested via the linked token.
@@ -183,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);
@@ -192,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);
@@ -226,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);
@@ -254,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;
@@ -273,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)
@@ -282,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);
@@ -296,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);
@@ -313,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,
};
} }
} }
+164 -52
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)
{ {
@@ -193,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)
@@ -210,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);
} }
@@ -218,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);
} }
@@ -229,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);
} }
@@ -263,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
@@ -293,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);
} }
@@ -325,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())
@@ -343,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();
@@ -381,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)
@@ -411,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;
@@ -428,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()
@@ -461,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,
@@ -513,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();
@@ -532,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();
@@ -544,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,
@@ -559,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;
@@ -577,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)
@@ -590,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
@@ -607,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
) )
@@ -645,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)
{ {
@@ -653,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,
@@ -714,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();
@@ -729,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;
@@ -744,7 +821,12 @@ internal class MessageStore : IDisposable
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();
@@ -759,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,
@@ -786,7 +869,13 @@ internal class MessageStore : IDisposable
return new MessageEnumerator(cmd.ExecuteReader()); return new MessageEnumerator(cmd.ExecuteReader());
} }
internal MessageEnumerator GetPagedDateRange(DateTime after, DateTime before, IEnumerable<byte> channels, ulong? receiver = null, int page = 0) internal MessageEnumerator GetPagedDateRange(
DateTime after,
DateTime before,
IEnumerable<byte> channels,
ulong? receiver = null,
int page = 0
)
{ {
var cmd = Connection.CreateCommand(); var cmd = Connection.CreateCommand();
@@ -801,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,
@@ -816,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;
"; ";
@@ -852,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;
@@ -876,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)
); );
} }
@@ -915,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();
+175 -43
View File
@@ -1,8 +1,5 @@
using System.Numerics; using System.Numerics;
using HellionChat.Code; using Dalamud.Bindings.ImGui;
using HellionChat.Resources;
using HellionChat.Ui;
using HellionChat.Util;
using Dalamud.Game.Addon.Lifecycle; using Dalamud.Game.Addon.Lifecycle;
using Dalamud.Game.Addon.Lifecycle.AddonArgTypes; using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
using Dalamud.Game.ClientState.Objects.SubKinds; using Dalamud.Game.ClientState.Objects.SubKinds;
@@ -18,11 +15,14 @@ using Dalamud.Interface.Utility.Raii;
using Dalamud.Utility; using Dalamud.Utility;
using FFXIVClientStructs.FFXIV.Client.UI; using FFXIVClientStructs.FFXIV.Client.UI;
using FFXIVClientStructs.FFXIV.Component.GUI; using FFXIVClientStructs.FFXIV.Component.GUI;
using Dalamud.Bindings.ImGui; using HellionChat.Code;
using HellionChat.Resources;
using HellionChat.Ui;
using HellionChat.Util;
using Lumina.Excel.Sheets; using Lumina.Excel.Sheets;
using Action = System.Action; using Action = System.Action;
using DalamudPartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload;
using ChatTwoPartyFinderPayload = HellionChat.Util.PartyFinderPayload; using ChatTwoPartyFinderPayload = HellionChat.Util.PartyFinderPayload;
using DalamudPartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload;
namespace HellionChat; namespace HellionChat;
@@ -107,7 +107,9 @@ public sealed class PayloadHandler
ImGui.Separator(); ImGui.Separator();
var contentId = chunk.Message?.ContentId ?? 0; var contentId = chunk.Message?.ContentId ?? 0;
var sender = chunk.Message?.Sender.Select(c => c.Link).FirstOrDefault(p => p is PlayerPayload) as PlayerPayload; var sender =
chunk.Message?.Sender.Select(c => c.Link).FirstOrDefault(p => p is PlayerPayload)
as PlayerPayload;
using var menu = ImRaii.Menu(Language.Context_Integrations); using var menu = ImRaii.Menu(Language.Context_Integrations);
if (!menu.Success) if (!menu.Success)
@@ -118,7 +120,14 @@ public sealed class PayloadHandler
{ {
try try
{ {
LogWindow.Plugin.Ipc.Invoke(id, sender, contentId, payload, chunk.Message?.SenderSource, chunk.Message?.ContentSource); LogWindow.Plugin.Ipc.Invoke(
id,
sender,
contentId,
payload,
chunk.Message?.SenderSource,
chunk.Message?.ContentSource
);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -128,7 +137,10 @@ public sealed class PayloadHandler
if (cursor == ImGui.GetCursorPos()) if (cursor == ImGui.GetCursorPos())
{ {
using var pushedColor = ImRaii.PushColor(ImGuiCol.Text, ImGui.GetStyle().Colors[(int)ImGuiCol.TextDisabled]); using var pushedColor = ImRaii.PushColor(
ImGuiCol.Text,
ImGui.GetStyle().Colors[(int)ImGuiCol.TextDisabled]
);
ImGui.Text("No integrations available"); ImGui.Text("No integrations available");
} }
} }
@@ -168,10 +180,16 @@ public sealed class PayloadHandler
if (message.Sender.Count > 0 && ImGui.Selectable(Language.Context_CopyContent)) if (message.Sender.Count > 0 && ImGui.Selectable(Language.Context_CopyContent))
{ {
ImGui.SetClipboardText(StringifyMessage(message)); ImGui.SetClipboardText(StringifyMessage(message));
WrapperUtil.AddNotification(Language.Context_CopyContentSuccess, NotificationType.Info); WrapperUtil.AddNotification(
Language.Context_CopyContentSuccess,
NotificationType.Info
);
} }
using var pushedColor = ImRaii.PushColor(ImGuiCol.Text, ImGui.GetStyle().Colors[(int) ImGuiCol.TextDisabled]); using var pushedColor = ImRaii.PushColor(
ImGuiCol.Text,
ImGui.GetStyle().Colors[(int)ImGuiCol.TextDisabled]
);
ImGui.TextUnformatted(message.Code.Type.Name()); ImGui.TextUnformatted(message.Code.Type.Name());
} }
@@ -184,7 +202,8 @@ public sealed class PayloadHandler
return string.Empty; return string.Empty;
var chunks = withSender ? message.Sender.Concat(message.Content) : message.Content; var chunks = withSender ? message.Sender.Concat(message.Content) : message.Content;
return chunks.Where(chunk => chunk is TextChunk) return chunks
.Where(chunk => chunk is TextChunk)
.Cast<TextChunk>() .Cast<TextChunk>()
.Select(text => text.Content) .Select(text => text.Content)
.Aggregate(string.Concat); .Aggregate(string.Concat);
@@ -255,7 +274,10 @@ public sealed class PayloadHandler
public unsafe void MoveTooltip(AddonEvent type, AddonArgs args) public unsafe void MoveTooltip(AddonEvent type, AddonArgs args)
{ {
// Only move if the user has the "Next to Cursor" option selected // Only move if the user has the "Next to Cursor" option selected
if (!Plugin.GameConfig.TryGet(UiControlOption.DetailTrackingType, out uint selected) || selected != 0) if (
!Plugin.GameConfig.TryGet(UiControlOption.DetailTrackingType, out uint selected)
|| selected != 0
)
return; return;
if (LogWindow.LastViewport != ImGuiHelpers.MainViewport.Handle) if (LogWindow.LastViewport != ImGuiHelpers.MainViewport.Handle)
@@ -274,7 +296,10 @@ public sealed class PayloadHandler
var component = atkBase->WindowNode->AtkResNode; var component = atkBase->WindowNode->AtkResNode;
var atkPos = new Vector2(component.ScreenX, component.ScreenY); var atkPos = new Vector2(component.ScreenX, component.ScreenY);
var atkSize = new Vector2(component.GetWidth() * component.ScaleX, component.GetHeight() * component.GetScaleY()); var atkSize = new Vector2(
component.GetWidth() * component.ScaleX,
component.GetHeight() * component.GetScaleY()
);
var chatRect = new MathUtil.Rectangle(LogWindow.LastWindowPos, LogWindow.LastWindowSize); var chatRect = new MathUtil.Rectangle(LogWindow.LastWindowPos, LogWindow.LastWindowSize);
var addonRect = new MathUtil.Rectangle(atkPos, atkSize); var addonRect = new MathUtil.Rectangle(atkPos, atkSize);
@@ -347,12 +372,17 @@ public sealed class PayloadHandler
var cursor = ImGui.GetCursorPos(); var cursor = ImGui.GetCursorPos();
ImGui.Image(icon.Handle, size); ImGui.Image(icon.Handle, size);
ImGui.SameLine(); ImGui.SameLine();
ImGui.SetCursorPos(cursor + new Vector2(size.X + 4, size.Y - ImGui.GetTextLineHeightWithSpacing())); ImGui.SetCursorPos(
cursor + new Vector2(size.X + 4, size.Y - ImGui.GetTextLineHeightWithSpacing())
);
} }
private void HoverStatus(StatusPayload status) private void HoverStatus(StatusPayload status)
{ {
if (Plugin.TextureProvider.GetFromGameIcon(status.Status.Value.Icon).GetWrapOrDefault() is { } icon) if (
Plugin.TextureProvider.GetFromGameIcon(status.Status.Value.Icon).GetWrapOrDefault() is
{ } icon
)
InlineIcon(icon); InlineIcon(icon);
var builder = new SeStringBuilder(); var builder = new SeStringBuilder();
@@ -374,7 +404,11 @@ public sealed class PayloadHandler
LogWindow.DrawChunks(name.ToList()); LogWindow.DrawChunks(name.ToList());
ImGui.Separator(); ImGui.Separator();
var desc = ChunkUtil.ToChunks(status.Status.Value.Description.ToDalamudString(), ChunkSource.None, null); var desc = ChunkUtil.ToChunks(
status.Status.Value.Description.ToDalamudString(),
ChunkSource.None,
null
);
LogWindow.DrawChunks(desc.ToList()); LogWindow.DrawChunks(desc.ToList());
} }
@@ -389,14 +423,23 @@ public sealed class PayloadHandler
if (!item.Item.TryGetValue(out Item resolvedItem)) if (!item.Item.TryGetValue(out Item resolvedItem))
return; return;
if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(resolvedItem.Icon, item.IsHQ)).GetWrapOrDefault() is { } icon) if (
Plugin
.TextureProvider.GetFromGameIcon(new GameIconLookup(resolvedItem.Icon, item.IsHQ))
.GetWrapOrDefault() is
{ } icon
)
InlineIcon(icon); InlineIcon(icon);
var name = ChunkUtil.ToChunks(resolvedItem.Name.ToDalamudString(), ChunkSource.None, null); var name = ChunkUtil.ToChunks(resolvedItem.Name.ToDalamudString(), ChunkSource.None, null);
LogWindow.DrawChunks(name.ToList()); LogWindow.DrawChunks(name.ToList());
ImGui.Separator(); ImGui.Separator();
var desc = ChunkUtil.ToChunks(resolvedItem.Description.ToDalamudString(), ChunkSource.None, null); var desc = ChunkUtil.ToChunks(
resolvedItem.Description.ToDalamudString(),
ChunkSource.None,
null
);
LogWindow.DrawChunks(desc.ToList()); LogWindow.DrawChunks(desc.ToList());
} }
@@ -405,7 +448,12 @@ public sealed class PayloadHandler
if (!Sheets.EventItemSheet.TryGetRow(payload.RawItemId, out var itemRow)) if (!Sheets.EventItemSheet.TryGetRow(payload.RawItemId, out var itemRow))
return; return;
if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(itemRow.Icon)).GetWrapOrDefault() is { } icon) if (
Plugin
.TextureProvider.GetFromGameIcon(new GameIconLookup(itemRow.Icon))
.GetWrapOrDefault() is
{ } icon
)
InlineIcon(icon); InlineIcon(icon);
var name = ChunkUtil.ToChunks(itemRow.Name.ToDalamudString(), ChunkSource.None, null); var name = ChunkUtil.ToChunks(itemRow.Name.ToDalamudString(), ChunkSource.None, null);
@@ -415,7 +463,11 @@ public sealed class PayloadHandler
if (!Sheets.EventItemHelpSheet.TryGetRow(payload.RawItemId, out var itemHelpRow)) if (!Sheets.EventItemHelpSheet.TryGetRow(payload.RawItemId, out var itemHelpRow))
return; return;
LogWindow.DrawChunks(ChunkUtil.ToChunks(itemHelpRow.Description.ToDalamudString(), ChunkSource.None, null).ToList()); LogWindow.DrawChunks(
ChunkUtil
.ToChunks(itemHelpRow.Description.ToDalamudString(), ChunkSource.None, null)
.ToList()
);
} }
private void HoverUri(UriPayload uri) private void HoverUri(UriPayload uri)
@@ -438,7 +490,10 @@ public sealed class PayloadHandler
ClickLinkPayload(chunk, payload, link); ClickLinkPayload(chunk, payload, link);
break; break;
case DalamudPartyFinderPayload pf: case DalamudPartyFinderPayload pf:
if (pf.LinkType == DalamudPartyFinderPayload.PartyFinderLinkType.PartyFinderNotification) if (
pf.LinkType
== DalamudPartyFinderPayload.PartyFinderLinkType.PartyFinderNotification
)
GameFunctions.GameFunctions.OpenPartyFinder(); GameFunctions.GameFunctions.OpenPartyFinder();
else else
GameFunctions.GameFunctions.OpenPartyFinder(pf.ListingId); GameFunctions.GameFunctions.OpenPartyFinder(pf.ListingId);
@@ -473,7 +528,12 @@ public sealed class PayloadHandler
return; return;
var payloads = source.Payloads.Skip(start).Take(end - start + 1).ToList(); var payloads = source.Payloads.Skip(start).Take(end - start + 1).ToList();
if (!Plugin.ChatGui.RegisteredLinkHandlers.TryGetValue((link.Plugin, link.CommandId), out var value)) if (
!Plugin.ChatGui.RegisteredLinkHandlers.TryGetValue(
(link.Plugin, link.CommandId),
out var value
)
)
{ {
Plugin.Log.Warning("Could not find DalamudLinkHandlers"); Plugin.Log.Warning("Could not find DalamudLinkHandlers");
return; return;
@@ -508,7 +568,12 @@ public sealed class PayloadHandler
return; return;
var hq = payload.Kind == ItemKind.Hq; var hq = payload.Kind == ItemKind.Hq;
if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(itemRow.Icon, hq)).GetWrapOrDefault() is { } icon) if (
Plugin
.TextureProvider.GetFromGameIcon(new GameIconLookup(itemRow.Icon, hq))
.GetWrapOrDefault() is
{ } icon
)
InlineIcon(icon); InlineIcon(icon);
var name = itemRow.Name.ToDalamudString(); var name = itemRow.Name.ToDalamudString();
@@ -554,10 +619,18 @@ public sealed class PayloadHandler
return; return;
var item = Sheets.EventItemSheet.GetRow(payload.ItemId); var item = Sheets.EventItemSheet.GetRow(payload.ItemId);
if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(item.Icon)).GetWrapOrDefault() is { } icon) if (
Plugin
.TextureProvider.GetFromGameIcon(new GameIconLookup(item.Icon))
.GetWrapOrDefault() is
{ } icon
)
InlineIcon(icon); InlineIcon(icon);
LogWindow.DrawChunks(ChunkUtil.ToChunks(item.Name.ToDalamudString(), ChunkSource.None, null).ToList(), false); LogWindow.DrawChunks(
ChunkUtil.ToChunks(item.Name.ToDalamudString(), ChunkSource.None, null).ToList(),
false
);
ImGui.Separator(); ImGui.Separator();
var realItemId = payload.RawItemId; var realItemId = payload.RawItemId;
@@ -585,7 +658,7 @@ public sealed class PayloadHandler
{ {
name.AddRange([ name.AddRange([
new IconChunk(ChunkSource.None, null, BitmapFontIcon.CrossWorld), new IconChunk(ChunkSource.None, null, BitmapFontIcon.CrossWorld),
new TextChunk(ChunkSource.None, null, world.Value.Name.ExtractText()) new TextChunk(ChunkSource.None, null, world.Value.Name.ExtractText()),
]); ]);
} }
@@ -606,7 +679,15 @@ public sealed class PayloadHandler
} }
else if (validContentId) else if (validContentId)
{ {
LogWindow.Plugin.Functions.Chat.SetEurekaTellChannel(player.PlayerName, world.Value.Name.ToString(), (ushort) world.RowId, 0, chunk.Message!.ContentId, 0, false); LogWindow.Plugin.Functions.Chat.SetEurekaTellChannel(
player.PlayerName,
world.Value.Name.ToString(),
(ushort)world.RowId,
0,
chunk.Message!.ContentId,
0,
false
);
} }
LogWindow.Activate = true; LogWindow.Activate = true;
@@ -617,10 +698,16 @@ public sealed class PayloadHandler
var party = Plugin.PartyList; var party = Plugin.PartyList;
var leader = party[(int)party.PartyLeaderIndex]?.ContentId; var leader = party[(int)party.PartyLeaderIndex]?.ContentId;
var isLeader = party.Length == 0 || Plugin.PlayerState.ContentId == leader; var isLeader = party.Length == 0 || Plugin.PlayerState.ContentId == leader;
var member = party.FirstOrDefault(member => member.Name.TextValue == player.PlayerName && member.World.RowId == world.RowId); var member = party.FirstOrDefault(member =>
member.Name.TextValue == player.PlayerName && member.World.RowId == world.RowId
);
var isInParty = member != null; var isInParty = member != null;
var inInstance = GameFunctions.GameFunctions.IsInInstance(); var inInstance = GameFunctions.GameFunctions.IsInInstance();
var inPartyInstance = Sheets.TerritorySheet.GetRow(Plugin.ClientState.TerritoryType).TerritoryIntendedUse.RowId is (41 or 47 or 48 or 52 or 53 or 61); var inPartyInstance =
Sheets
.TerritorySheet.GetRow(Plugin.ClientState.TerritoryType)
.TerritoryIntendedUse.RowId
is (41 or 47 or 48 or 52 or 53 or 61);
if (isLeader) if (isLeader)
{ {
if (!isInParty) if (!isInParty)
@@ -636,10 +723,20 @@ public sealed class PayloadHandler
if (menu.Success) if (menu.Success)
{ {
if (ImGui.Selectable(Language.Context_InviteToParty_SameWorld)) if (ImGui.Selectable(Language.Context_InviteToParty_SameWorld))
GameFunctions.Party.InviteSameWorld(player.PlayerName, (ushort)world.RowId, chunk.Message?.ContentId ?? 0); GameFunctions.Party.InviteSameWorld(
player.PlayerName,
(ushort)world.RowId,
chunk.Message?.ContentId ?? 0
);
if (validContentId && ImGui.Selectable(Language.Context_InviteToParty_DifferentWorld)) if (
GameFunctions.Party.InviteOtherWorld(chunk.Message!.ContentId, (ushort)world.RowId); validContentId
&& ImGui.Selectable(Language.Context_InviteToParty_DifferentWorld)
)
GameFunctions.Party.InviteOtherWorld(
chunk.Message!.ContentId,
(ushort)world.RowId
);
} }
} }
} }
@@ -654,23 +751,41 @@ public sealed class PayloadHandler
} }
} }
var isFriend = GameFunctions.GameFunctions.GetFriends().Any(friend => friend.NameString == player.PlayerName && friend.HomeWorld == world.RowId); var isFriend = GameFunctions
.GameFunctions.GetFriends()
.Any(friend =>
friend.NameString == player.PlayerName && friend.HomeWorld == world.RowId
);
if (!isFriend && ImGui.Selectable(Language.Context_SendFriendRequest)) if (!isFriend && ImGui.Selectable(Language.Context_SendFriendRequest))
LogWindow.Plugin.Functions.SendFriendRequest(player.PlayerName, (ushort) world.RowId); LogWindow.Plugin.Functions.SendFriendRequest(
player.PlayerName,
(ushort)world.RowId
);
using (var menuBlockFunctions = ImRaii.Menu(Language.Context_BlockFunctions)) using (var menuBlockFunctions = ImRaii.Menu(Language.Context_BlockFunctions))
{ {
if (menuBlockFunctions.Success) if (menuBlockFunctions.Success)
{ {
if (ImGui.Selectable(Language.Context_AddToBlacklist)) if (ImGui.Selectable(Language.Context_AddToBlacklist))
LogWindow.Plugin.Functions.AddToBlacklist(player.PlayerName, (ushort)world.RowId); LogWindow.Plugin.Functions.AddToBlacklist(
player.PlayerName,
(ushort)world.RowId
);
if (chunk.Message != null) if (chunk.Message != null)
{ {
var message = chunk.Message; var message = chunk.Message;
if (message.AccountId != 0 && ImGui.Selectable(Language.Context_AddToMuteList)) if (
LogWindow.Plugin.Functions.AddToMuteList(message.AccountId, message.ContentId, player.PlayerName, (short) world.RowId); message.AccountId != 0
&& ImGui.Selectable(Language.Context_AddToMuteList)
)
LogWindow.Plugin.Functions.AddToMuteList(
message.AccountId,
message.ContentId,
player.PlayerName,
(short)world.RowId
);
if (ImGui.Selectable(Language.Context_AddToTermsFilter)) if (ImGui.Selectable(Language.Context_AddToTermsFilter))
LogWindow.Plugin.Functions.AddToTermsList(message.ContentSource); LogWindow.Plugin.Functions.AddToTermsList(message.ContentSource);
@@ -678,7 +793,10 @@ public sealed class PayloadHandler
} }
} }
if (GameFunctions.GameFunctions.IsMentor() && ImGui.Selectable(Language.Context_InviteToNoviceNetwork)) if (
GameFunctions.GameFunctions.IsMentor()
&& ImGui.Selectable(Language.Context_InviteToNoviceNetwork)
)
GameFunctions.Context.InviteToNoviceNetwork(player.PlayerName, (ushort)world.RowId); GameFunctions.Context.InviteToNoviceNetwork(player.PlayerName, (ushort)world.RowId);
} }
@@ -694,7 +812,10 @@ public sealed class PayloadHandler
if (validContentId && ImGui.Selectable(Language.Context_AdventurerPlate)) if (validContentId && ImGui.Selectable(Language.Context_AdventurerPlate))
if (!GameFunctions.GameFunctions.TryOpenAdventurerPlate(chunk.Message!.ContentId)) if (!GameFunctions.GameFunctions.TryOpenAdventurerPlate(chunk.Message!.ContentId))
WrapperUtil.AddNotification(Language.Context_AdventurerPlateError, NotificationType.Warning); WrapperUtil.AddNotification(
Language.Context_AdventurerPlateError,
NotificationType.Warning
);
} }
private IPlayerCharacter? FindCharacterForPayload(PlayerPayload payload) private IPlayerCharacter? FindCharacterForPayload(PlayerPayload payload)
@@ -728,13 +849,21 @@ public sealed class PayloadHandler
if (ImGui.Selectable(Language.Context_CopyLink)) if (ImGui.Selectable(Language.Context_CopyLink))
{ {
ImGui.SetClipboardText(uri.Uri.ToString()); ImGui.SetClipboardText(uri.Uri.ToString());
WrapperUtil.AddNotification(Language.Context_CopyLinkNotification, NotificationType.Info); WrapperUtil.AddNotification(
Language.Context_CopyLinkNotification,
NotificationType.Info
);
} }
} }
private void DrawStatusPopup(StatusPayload status) private void DrawStatusPopup(StatusPayload status)
{ {
if (Plugin.TextureProvider.GetFromGameIcon(new GameIconLookup(status.Status.Value.Icon)).GetWrapOrDefault() is { } icon) if (
Plugin
.TextureProvider.GetFromGameIcon(new GameIconLookup(status.Status.Value.Icon))
.GetWrapOrDefault() is
{ } icon
)
InlineIcon(icon); InlineIcon(icon);
var builder = new SeStringBuilder(); var builder = new SeStringBuilder();
@@ -752,7 +881,10 @@ public sealed class PayloadHandler
break; break;
} }
LogWindow.DrawChunks(ChunkUtil.ToChunks(builder.BuiltString, ChunkSource.None, null).ToList(), false); LogWindow.DrawChunks(
ChunkUtil.ToChunks(builder.BuiltString, ChunkSource.None, null).ToList(),
false
);
ImGui.Separator(); ImGui.Separator();
if (ImGui.Selectable(Language.Context_Link)) if (ImGui.Selectable(Language.Context_Link))
+175 -65
View File
@@ -3,17 +3,17 @@ using System.Diagnostics.CodeAnalysis;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Runtime.ExceptionServices; using System.Runtime.ExceptionServices;
using HellionChat.Ipc; using Dalamud.Bindings.ImGui;
using HellionChat.Resources;
using HellionChat.Ui;
using HellionChat.Util;
using Dalamud.Game.ClientState.Conditions; using Dalamud.Game.ClientState.Conditions;
using Dalamud.Interface.ImGuiFileDialog;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using Dalamud.IoC; using Dalamud.IoC;
using Dalamud.Plugin; using Dalamud.Plugin;
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using Dalamud.Bindings.ImGui; using HellionChat.Ipc;
using Dalamud.Interface.ImGuiFileDialog; using HellionChat.Resources;
using HellionChat.Ui;
using HellionChat.Util;
namespace HellionChat; namespace HellionChat;
@@ -22,27 +22,68 @@ public sealed class Plugin : IAsyncDalamudPlugin
{ {
public const string PluginName = "Hellion Chat"; public const string PluginName = "Hellion Chat";
[PluginService] public static IPluginLog Log { get; private set; } = null!; [PluginService]
[PluginService] public static IDalamudPluginInterface Interface { get; private set; } = null!; public static IPluginLog Log { get; private set; } = null!;
[PluginService] public static IChatGui ChatGui { get; private set; } = null!;
[PluginService] public static IClientState ClientState { get; private set; } = null!; [PluginService]
[PluginService] public static ICommandManager CommandManager { get; private set; } = null!; public static IDalamudPluginInterface Interface { get; private set; } = null!;
[PluginService] public static ICondition Condition { get; private set; } = null!;
[PluginService] public static IDataManager DataManager { get; private set; } = null!; [PluginService]
[PluginService] public static IFramework Framework { get; private set; } = null!; public static IChatGui ChatGui { get; private set; } = null!;
[PluginService] public static IGameGui GameGui { get; private set; } = null!;
[PluginService] public static IKeyState KeyState { get; private set; } = null!; [PluginService]
[PluginService] public static IObjectTable ObjectTable { get; private set; } = null!; public static IClientState ClientState { get; private set; } = null!;
[PluginService] public static IPartyList PartyList { get; private set; } = null!;
[PluginService] public static ITargetManager TargetManager { get; private set; } = null!; [PluginService]
[PluginService] public static ITextureProvider TextureProvider { get; private set; } = null!; public static ICommandManager CommandManager { get; private set; } = null!;
[PluginService] public static IGameInteropProvider GameInteropProvider { get; private set; } = null!;
[PluginService] public static IGameConfig GameConfig { get; private set; } = null!; [PluginService]
[PluginService] public static INotificationManager Notification { get; private set; } = null!; public static ICondition Condition { get; private set; } = null!;
[PluginService] public static IAddonLifecycle AddonLifecycle { get; private set; } = null!;
[PluginService] public static IPlayerState PlayerState { get; private set; } = null!; [PluginService]
[PluginService] public static ISeStringEvaluator Evaluator { get; private set; } = null!; public static IDataManager DataManager { get; private set; } = null!;
[PluginService] public static ISelfTestRegistry SelfTestRegistry { get; private set; } = null!;
[PluginService]
public static IFramework Framework { get; private set; } = null!;
[PluginService]
public static IGameGui GameGui { get; private set; } = null!;
[PluginService]
public static IKeyState KeyState { get; private set; } = null!;
[PluginService]
public static IObjectTable ObjectTable { get; private set; } = null!;
[PluginService]
public static IPartyList PartyList { get; private set; } = null!;
[PluginService]
public static ITargetManager TargetManager { get; private set; } = null!;
[PluginService]
public static ITextureProvider TextureProvider { get; private set; } = null!;
[PluginService]
public static IGameInteropProvider GameInteropProvider { get; private set; } = null!;
[PluginService]
public static IGameConfig GameConfig { get; private set; } = null!;
[PluginService]
public static INotificationManager Notification { get; private set; } = null!;
[PluginService]
public static IAddonLifecycle AddonLifecycle { get; private set; } = null!;
[PluginService]
public static IPlayerState PlayerState { get; private set; } = null!;
[PluginService]
public static ISeStringEvaluator Evaluator { get; private set; } = null!;
[PluginService]
public static ISelfTestRegistry SelfTestRegistry { get; private set; } = null!;
public static Configuration Config = null!; public static Configuration Config = null!;
public static FileDialogManager FileDialogManager { get; private set; } = null!; public static FileDialogManager FileDialogManager { get; private set; } = null!;
@@ -136,8 +177,9 @@ public sealed class Plugin : IAsyncDalamudPlugin
if (Config.Version < 16) if (Config.Version < 16)
{ {
throw new InvalidOperationException( throw new InvalidOperationException(
$"HellionChat v1.4.3 requires config schema v16, got v{Config.Version}. " + $"HellionChat v1.4.3 requires config schema v16, got v{Config.Version}. "
"Please install v1.4.2 first to migrate the configuration, then upgrade to v1.4.3."); + "Please install v1.4.2 first to migrate the configuration, then upgrade to v1.4.3."
);
} }
// Hellion Chat — Auto-Tell-Tabs Defense-in-Depth. SaveConfig // Hellion Chat — Auto-Tell-Tabs Defense-in-Depth. SaveConfig
@@ -219,13 +261,15 @@ public sealed class Plugin : IAsyncDalamudPlugin
// Auto-Tell-Tabs subscribes to MessageManager.MessageProcessed for // Auto-Tell-Tabs subscribes to MessageManager.MessageProcessed for
// live tells and to ClientState.Logout for cleanup; needs the live // live tells and to ClientState.Logout for cleanup; needs the live
// store handed in at construction. // store handed in at construction.
AutoTellTabsService = new AutoTellTabsService(this, MessageManager, MessageManager.Store); AutoTellTabsService = new AutoTellTabsService(
this,
MessageManager,
MessageManager.Store
);
AutoTellTabsService.Initialize(); AutoTellTabsService.Initialize();
// SelfTest steps poll Active per frame and need the registry wired. // SelfTest steps poll Active per frame and need the registry wired.
SelfTestRegistry.RegisterTestSteps([ SelfTestRegistry.RegisterTestSteps([new SelfTests.ThemeSwitchSelfTestStep(this)]);
new SelfTests.ThemeSwitchSelfTestStep(this),
]);
ChatLogWindow = new ChatLogWindow(this); ChatLogWindow = new ChatLogWindow(this);
SettingsWindow = new SettingsWindow(this); SettingsWindow = new SettingsWindow(this);
@@ -296,8 +340,13 @@ public sealed class Plugin : IAsyncDalamudPlugin
// Mirror the v1.4.0 load-failure recovery: hand off to DisposeAsync // Mirror the v1.4.0 load-failure recovery: hand off to DisposeAsync
// so partially-built services are torn down. Swallow the cleanup // so partially-built services are torn down. Swallow the cleanup
// exception so the original load failure stays the visible cause. // exception so the original load failure stays the visible cause.
try { await DisposeAsync().ConfigureAwait(false); } try
catch { /* keep original failure */ } {
await DisposeAsync().ConfigureAwait(false);
}
catch
{ /* keep original failure */
}
throw; throw;
} }
} }
@@ -324,14 +373,17 @@ public sealed class Plugin : IAsyncDalamudPlugin
// v1.4.0 F5.3 — flush a pending DeferredSave before service teardown, // v1.4.0 F5.3 — flush a pending DeferredSave before service teardown,
// since FrameworkUpdate just got unsubscribed and won't fire it. // since FrameworkUpdate just got unsubscribed and won't fire it.
failure = CaptureFailure(failure, () => failure = CaptureFailure(
failure,
() =>
{ {
if (DeferredSaveFrames >= 0) if (DeferredSaveFrames >= 0)
{ {
SaveConfig(); SaveConfig();
DeferredSaveFrames = -1; DeferredSaveFrames = -1;
} }
}); }
);
// Auto-Tell-Tabs unsubscribes from MessageProcessed before MessageManager // Auto-Tell-Tabs unsubscribes from MessageProcessed before MessageManager
// goes away. Pure-memory cleanup, no framework-thread requirement. // goes away. Pure-memory cleanup, no framework-thread requirement.
@@ -342,7 +394,10 @@ public sealed class Plugin : IAsyncDalamudPlugin
// framework-block so the worker threads are quiesced first. // framework-block so the worker threads are quiesced first.
if (MessageManager is not null) if (MessageManager is not null)
{ {
failure = await CaptureFailureAsync(failure, () => MessageManager.DisposeAsync().AsTask()) failure = await CaptureFailureAsync(
failure,
() => MessageManager.DisposeAsync().AsTask()
)
.ConfigureAwait(false); .ConfigureAwait(false);
} }
@@ -354,11 +409,15 @@ public sealed class Plugin : IAsyncDalamudPlugin
// behind it; mirrors Lightless DisposeFrameworkBoundServicesAsync. // behind it; mirrors Lightless DisposeFrameworkBoundServicesAsync.
try try
{ {
await Framework.RunOnFrameworkThread(() => await Framework
.RunOnFrameworkThread(() =>
{ {
// Game-Functions first — other services may still query // Game-Functions first — other services may still query
// chat-interactable state during their Dispose. // chat-interactable state during their Dispose.
failure = CaptureFailure(failure, () => GameFunctions.GameFunctions.SetChatInteractable(true)); failure = CaptureFailure(
failure,
() => GameFunctions.GameFunctions.SetChatInteractable(true)
);
// IPC subscribers — dispose before windows so any final // IPC subscribers — dispose before windows so any final
// event firing from the IPC source can't reach a half-torn // event firing from the IPC source can't reach a half-torn
@@ -379,7 +438,8 @@ public sealed class Plugin : IAsyncDalamudPlugin
failure = CaptureFailure(failure, () => SettingsWindow?.Dispose()); failure = CaptureFailure(failure, () => SettingsWindow?.Dispose());
failure = CaptureFailure(failure, () => DebuggerWindow?.Dispose()); failure = CaptureFailure(failure, () => DebuggerWindow?.Dispose());
failure = CaptureFailure(failure, () => SeStringDebugger?.Dispose()); failure = CaptureFailure(failure, () => SeStringDebugger?.Dispose());
}).ConfigureAwait(false); })
.ConfigureAwait(false);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -401,15 +461,30 @@ public sealed class Plugin : IAsyncDalamudPlugin
// skip every cleanup behind it and leave services half-torn. // skip every cleanup behind it and leave services half-torn.
private static Exception? CaptureFailure(Exception? failure, Action action) private static Exception? CaptureFailure(Exception? failure, Action action)
{ {
try { action(); } try
catch (Exception ex) { failure ??= ex; } {
action();
}
catch (Exception ex)
{
failure ??= ex;
}
return failure; return failure;
} }
private static async ValueTask<Exception?> CaptureFailureAsync(Exception? failure, Func<Task> action) private static async ValueTask<Exception?> CaptureFailureAsync(
Exception? failure,
Func<Task> action
)
{ {
try { await action().ConfigureAwait(false); } try
catch (Exception ex) { failure ??= ex; } {
await action().ConfigureAwait(false);
}
catch (Exception ex)
{
failure ??= ex;
}
return failure; return failure;
} }
@@ -434,12 +509,17 @@ public sealed class Plugin : IAsyncDalamudPlugin
if (!File.Exists(ourConfigFile) && File.Exists(legacyConfigFile)) if (!File.Exists(ourConfigFile) && File.Exists(legacyConfigFile))
{ {
File.Move(legacyConfigFile, ourConfigFile); File.Move(legacyConfigFile, ourConfigFile);
Log.Information($"HellionChat: migrated config file {legacyConfigFile} → {ourConfigFile}"); Log.Information(
$"HellionChat: migrated config file {legacyConfigFile} → {ourConfigFile}"
);
} }
} }
catch (IOException e) catch (IOException e)
{ {
Log.Warning(e, $"HellionChat: config file move blocked, leaving {legacyConfigFile} in place"); Log.Warning(
e,
$"HellionChat: config file move blocked, leaving {legacyConfigFile} in place"
);
lockedBlocker = true; lockedBlocker = true;
} }
@@ -469,7 +549,10 @@ public sealed class Plugin : IAsyncDalamudPlugin
} }
catch (IOException e) catch (IOException e)
{ {
Log.Warning(e, $"HellionChat: file move blocked for {file}, will retry on next load"); Log.Warning(
e,
$"HellionChat: file move blocked for {file}, will retry on next load"
);
lockedBlocker = true; lockedBlocker = true;
} }
} }
@@ -486,7 +569,10 @@ public sealed class Plugin : IAsyncDalamudPlugin
} }
catch (IOException e) catch (IOException e)
{ {
Log.Warning(e, $"HellionChat: subdir move blocked for {dir}, will retry on next load"); Log.Warning(
e,
$"HellionChat: subdir move blocked for {dir}, will retry on next load"
);
lockedBlocker = true; lockedBlocker = true;
} }
} }
@@ -507,15 +593,18 @@ public sealed class Plugin : IAsyncDalamudPlugin
// Surface the most common cause to the user as a notification // Surface the most common cause to the user as a notification
// so they don't think Hellion Chat lost their history when in // so they don't think Hellion Chat lost their history when in
// fact upstream Chat 2 was still holding the database file. // fact upstream Chat 2 was still holding the database file.
Notification.AddNotification(new Dalamud.Interface.ImGuiNotification.Notification Notification.AddNotification(
new Dalamud.Interface.ImGuiNotification.Notification
{ {
Title = "Hellion Chat", Title = "Hellion Chat",
Content = "Could not migrate the Chat 2 database — the file appears to be in use. " + Content =
"Disable Chat 2, fully close the game, then start it again. " + "Could not migrate the Chat 2 database the file appears to be in use. "
"See the README troubleshooting section if the issue persists.", + "Disable Chat 2, fully close the game, then start it again. "
+ "See the README troubleshooting section if the issue persists.",
Type = Dalamud.Interface.ImGuiNotification.NotificationType.Warning, Type = Dalamud.Interface.ImGuiNotification.NotificationType.Warning,
InitialDuration = TimeSpan.FromSeconds(30), InitialDuration = TimeSpan.FromSeconds(30),
}); }
);
} }
} }
@@ -575,11 +664,13 @@ public sealed class Plugin : IAsyncDalamudPlugin
// — the .Wait() here would return as soon as the inner Task.Run was // — the .Wait() here would return as soon as the inner Task.Run was
// dispatched, racing the next sweep cycle against the still-running // dispatched, racing the next sweep cycle against the still-running
// filter pass. See AUDIT-2026-05-05 [QUAL-02]. // filter pass. See AUDIT-2026-05-05 [QUAL-02].
Framework.Run(() => Framework
.Run(() =>
{ {
MessageManager.ClearAllTabs(); MessageManager.ClearAllTabs();
MessageManager.FilterAllTabs(); MessageManager.FilterAllTabs();
}).Wait(); })
.Wait();
} }
else else
{ {
@@ -595,7 +686,10 @@ public sealed class Plugin : IAsyncDalamudPlugin
lock (RetentionSweepLock) lock (RetentionSweepLock)
RetentionSweepRunning = false; RetentionSweepRunning = false;
} }
}) { IsBackground = true }.Start(); })
{
IsBackground = true,
}.Start();
} }
private void Draw() private void Draw()
@@ -603,7 +697,10 @@ public sealed class Plugin : IAsyncDalamudPlugin
// Theme-Engine ist ab v14 immer aktiv; Klassik ist jetzt ein eigenes // Theme-Engine ist ab v14 immer aktiv; Klassik ist jetzt ein eigenes
// Theme statt einem deaktivierten Hellion-Theme. Active wird einmal // Theme statt einem deaktivierten Hellion-Theme. Active wird einmal
// pro Frame aus der Registry gelesen. // pro Frame aus der Registry gelesen.
using IDisposable _style = HellionStyle.PushGlobal(ThemeRegistry.Active, Config.WindowOpacity); using IDisposable _style = HellionStyle.PushGlobal(
ThemeRegistry.Active,
Config.WindowOpacity
);
ChatLogWindow.BeginFrame(); ChatLogWindow.BeginFrame();
@@ -617,7 +714,12 @@ public sealed class Plugin : IAsyncDalamudPlugin
// v1.0.2 — global skip while the New Game+ menu (QuestRedo addon) is // v1.0.2 — global skip while the New Game+ menu (QuestRedo addon) is
// open. Hides every plugin window in one shot (chat log, pop-outs, // open. Hides every plugin window in one shot (chat log, pop-outs,
// settings, db viewer, etc.), matching the LoadingScreens pattern. // settings, db viewer, etc.), matching the LoadingScreens pattern.
if (Config.HideInNewGamePlusMenu && GameFunctions.GameFunctions.IsAddonInteractable(GameFunctions.GameFunctions.NewGamePlusAddonName)) if (
Config.HideInNewGamePlusMenu
&& GameFunctions.GameFunctions.IsAddonInteractable(
GameFunctions.GameFunctions.NewGamePlusAddonName
)
)
{ {
ChatLogWindow.FinalizeFrame(); ChatLogWindow.FinalizeFrame();
TypingIpc.Update(); TypingIpc.Update();
@@ -655,7 +757,8 @@ public sealed class Plugin : IAsyncDalamudPlugin
internal void LanguageChanged(string langCode) internal void LanguageChanged(string langCode)
{ {
var info = Config.LanguageOverride is LanguageOverride.None var info =
Config.LanguageOverride is LanguageOverride.None
? new CultureInfo(langCode) ? new CultureInfo(langCode)
: new CultureInfo(Config.LanguageOverride.Code()); : new CultureInfo(Config.LanguageOverride.Code());
@@ -669,7 +772,7 @@ public sealed class Plugin : IAsyncDalamudPlugin
"ChatLogPanel_0", "ChatLogPanel_0",
"ChatLogPanel_1", "ChatLogPanel_1",
"ChatLogPanel_2", "ChatLogPanel_2",
"ChatLogPanel_3" "ChatLogPanel_3",
]; ];
private void FrameworkUpdate(IFramework framework) private void FrameworkUpdate(IFramework framework)
@@ -687,7 +790,9 @@ public sealed class Plugin : IAsyncDalamudPlugin
public static bool InBattle => Condition[ConditionFlag.InCombat]; public static bool InBattle => Condition[ConditionFlag.InCombat];
public static bool GposeActive => Condition[ConditionFlag.WatchingCutscene]; public static bool GposeActive => Condition[ConditionFlag.WatchingCutscene];
public static bool CutsceneActive => Condition[ConditionFlag.OccupiedInCutSceneEvent] || Condition[ConditionFlag.WatchingCutscene78]; public static bool CutsceneActive =>
Condition[ConditionFlag.OccupiedInCutSceneEvent]
|| Condition[ConditionFlag.WatchingCutscene78];
// v1.1.0 — wenn der themes/-Ordner leer ist, schreiben wir die embedded // v1.1.0 — wenn der themes/-Ordner leer ist, schreiben wir die embedded
// example-theme.json als Vorlage rein. Bestehende User-Customs werden // example-theme.json als Vorlage rein. Bestehende User-Customs werden
@@ -698,7 +803,9 @@ public sealed class Plugin : IAsyncDalamudPlugin
return; return;
var examplePath = Path.Combine(dir, "example-theme.json"); var examplePath = Path.Combine(dir, "example-theme.json");
var resourceStream = typeof(Plugin).Assembly.GetManifestResourceStream("HellionChat.Themes.Builtin.example-theme.json"); var resourceStream = typeof(Plugin).Assembly.GetManifestResourceStream(
"HellionChat.Themes.Builtin.example-theme.json"
);
if (resourceStream is null) if (resourceStream is null)
{ {
Log.Warning("Themes example template not found in assembly resources; skipping seed."); Log.Warning("Themes example template not found in assembly resources; skipping seed.");
@@ -713,7 +820,10 @@ public sealed class Plugin : IAsyncDalamudPlugin
} }
catch (IOException ex) catch (IOException ex)
{ {
Log.Warning(ex, "Failed to seed example-theme.json; user can create custom themes manually."); Log.Warning(
ex,
"Failed to seed example-theme.json; user can create custom themes manually."
);
} }
finally finally
{ {
+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,
+16 -8
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()
),
}; };
} }
@@ -40,7 +40,9 @@ internal sealed class ThemeSwitchSelfTestStep : ISelfTestStep
if (this.initialSlug is null) if (this.initialSlug is null)
{ {
this.initialSlug = active.Slug; this.initialSlug = active.Slug;
ImGui.Text($"Initial theme: \"{this.initialSlug}\". Open Settings -> Theme & Layout and pick a different theme."); ImGui.Text(
$"Initial theme: \"{this.initialSlug}\". Open Settings -> Theme & Layout and pick a different theme."
);
return SelfTestStepResult.Waiting; return SelfTestStepResult.Waiting;
} }
@@ -77,9 +79,6 @@ internal sealed class ThemeSwitchSelfTestStep : ISelfTestStep
private static bool HasPopulatedCache(Theme theme) private static bool HasPopulatedCache(Theme theme)
{ {
var cache = theme.AbgrCache; var cache = theme.AbgrCache;
return (cache.Primary return (cache.Primary | cache.WindowBg | cache.TextPrimary | cache.Border) != 0u;
| 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
+15 -11
View File
@@ -6,7 +6,8 @@ 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 Forge", Author: "Hellion Forge",
@@ -16,37 +17,39 @@ internal static class EventHorizon
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"),
}) }
)
); );
} }
+15 -11
View File
@@ -6,7 +6,8 @@ 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: "Carla Beleandis", Author: "Carla Beleandis",
@@ -16,37 +17,39 @@ internal static class ForgeMerchantman
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"),
}) }
)
); );
} }
+15 -11
View File
@@ -6,7 +6,8 @@ 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 Forge", Author: "Hellion Forge",
@@ -16,37 +17,39 @@ internal static class HellionArctic
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"),
}) }
)
); );
} }
+15 -11
View File
@@ -12,7 +12,8 @@ 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 Forge", Author: "Hellion Forge",
@@ -22,37 +23,39 @@ internal static class HellionSpectrum
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"),
}) }
)
); );
} }
+15 -11
View File
@@ -6,7 +6,8 @@ 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: "Carla Beleandis", Author: "Carla Beleandis",
@@ -16,37 +17,39 @@ internal static class MintGrove
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"),
}) }
)
); );
} }
+15 -11
View File
@@ -6,7 +6,8 @@ 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 Forge", Author: "Hellion Forge",
@@ -16,37 +17,39 @@ internal static class MoonlitBloom
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"),
}) }
)
); );
} }
+15 -11
View File
@@ -6,7 +6,8 @@ internal static class SynthwaveSunset
{ {
public const string Slug = "synthwave-sunset"; public const string Slug = "synthwave-sunset";
public static Theme Build() => new( public static Theme Build() =>
new(
Slug: Slug, Slug: Slug,
Name: "Synthwave Sunset", Name: "Synthwave Sunset",
Author: "Hellion Forge", Author: "Hellion Forge",
@@ -16,37 +17,39 @@ internal static class SynthwaveSunset
Primary: ColourUtil.HexToRgba("#FF2D95"), Primary: ColourUtil.HexToRgba("#FF2D95"),
PrimaryLight: ColourUtil.HexToRgba("#FF6BB6"), PrimaryLight: ColourUtil.HexToRgba("#FF6BB6"),
PrimaryGlow: ColourUtil.HexToRgba("#FF2D9599"), PrimaryGlow: ColourUtil.HexToRgba("#FF2D9599"),
AccentDark: ColourUtil.HexToRgba("#0098B8"), AccentDark: ColourUtil.HexToRgba("#0098B8"),
Accent: ColourUtil.HexToRgba("#00F0FF"), Accent: ColourUtil.HexToRgba("#00F0FF"),
AccentLight: ColourUtil.HexToRgba("#5CFFFE"), AccentLight: ColourUtil.HexToRgba("#5CFFFE"),
Identity: ColourUtil.HexToRgba("#FF2D95"), Identity: ColourUtil.HexToRgba("#FF2D95"),
WindowBg: ColourUtil.HexToRgba("#13041F"), WindowBg: ColourUtil.HexToRgba("#13041F"),
ChildBg: ColourUtil.HexToRgba("#1E0A35"), ChildBg: ColourUtil.HexToRgba("#1E0A35"),
FrameBg: ColourUtil.HexToRgba("#2A1247"), FrameBg: ColourUtil.HexToRgba("#2A1247"),
Surface: ColourUtil.HexToRgba("#3A1860"), Surface: ColourUtil.HexToRgba("#3A1860"),
SurfaceHover: ColourUtil.HexToRgba("#4A2475"), SurfaceHover: ColourUtil.HexToRgba("#4A2475"),
Border: ColourUtil.HexToRgba("#FF2D9566"), Border: ColourUtil.HexToRgba("#FF2D9566"),
TextPrimary: ColourUtil.HexToRgba("#F0DFFF"), TextPrimary: ColourUtil.HexToRgba("#F0DFFF"),
TextMuted: ColourUtil.HexToRgba("#A88BC4"), TextMuted: ColourUtil.HexToRgba("#A88BC4"),
TextDim: ColourUtil.HexToRgba("#6F4D8E"), TextDim: ColourUtil.HexToRgba("#6F4D8E"),
StatusSuccess: ColourUtil.HexToRgba("#39FF14"), StatusSuccess: ColourUtil.HexToRgba("#39FF14"),
StatusDanger: ColourUtil.HexToRgba("#FF3838"), StatusDanger: ColourUtil.HexToRgba("#FF3838"),
StatusWarning: ColourUtil.HexToRgba("#FFD700"), StatusWarning: ColourUtil.HexToRgba("#FFD700"),
StatusInfo: ColourUtil.HexToRgba("#00F0FF") StatusInfo: ColourUtil.HexToRgba("#00F0FF")
), ),
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>
{ {
// Synthwave Sunset — Magenta dominiert die warmen Channels (Yell/Shout/FC), // Synthwave Sunset — Magenta dominiert die warmen Channels (Yell/Shout/FC),
// Cyan dominiert die kühlen (Tell/Party). Neon-Akzente für Status-nahe Channels. // Cyan dominiert die kühlen (Tell/Party). Neon-Akzente für Status-nahe Channels.
@@ -71,6 +74,7 @@ internal static class SynthwaveSunset
[HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#FF6BB6"), [HellionChat.Code.ChatType.CustomEmote] = ColourUtil.HexToRgba("#FF6BB6"),
[HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#A88BC4"), [HellionChat.Code.ChatType.StandardEmote] = ColourUtil.HexToRgba("#A88BC4"),
[HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#A88BC4"), [HellionChat.Code.ChatType.Echo] = ColourUtil.HexToRgba("#A88BC4"),
}) }
)
); );
} }
+22 -7
View File
@@ -41,18 +41,33 @@ public sealed record Theme(
StatusSuccess: ColourUtil.RgbaToAbgr(Colors.StatusSuccess), StatusSuccess: ColourUtil.RgbaToAbgr(Colors.StatusSuccess),
StatusDanger: ColourUtil.RgbaToAbgr(Colors.StatusDanger), StatusDanger: ColourUtil.RgbaToAbgr(Colors.StatusDanger),
StatusWarning: ColourUtil.RgbaToAbgr(Colors.StatusWarning), StatusWarning: ColourUtil.RgbaToAbgr(Colors.StatusWarning),
StatusInfo: ColourUtil.RgbaToAbgr(Colors.StatusInfo)); StatusInfo: ColourUtil.RgbaToAbgr(Colors.StatusInfo)
);
} }
} }
// Mirrors ThemeColors slot-for-slot. The FillsAll21Slots test pins the // Mirrors ThemeColors slot-for-slot. The FillsAll21Slots test pins the
// contract — a new slot without its mirror fails the build. // contract — a new slot without its mirror fails the build.
public readonly record struct ThemeAbgrCache( public readonly record struct ThemeAbgrCache(
uint PrimaryDark, uint Primary, uint PrimaryLight, uint PrimaryGlow, uint PrimaryDark,
uint AccentDark, uint Accent, uint AccentLight, uint Primary,
uint PrimaryLight,
uint PrimaryGlow,
uint AccentDark,
uint Accent,
uint AccentLight,
uint Identity, uint Identity,
uint WindowBg, uint ChildBg, uint FrameBg, uint WindowBg,
uint Surface, uint SurfaceHover, uint Border, uint ChildBg,
uint TextPrimary, uint TextMuted, uint TextDim, uint FrameBg,
uint StatusSuccess, uint StatusDanger, uint StatusWarning, uint StatusInfo 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,
+37 -13
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;
@@ -71,36 +98,33 @@ internal static class ThemeJsonLoader
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"),
+14 -6
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;
@@ -39,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];
} }
@@ -75,8 +79,10 @@ public sealed class ThemeRegistry
// 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))
@@ -111,7 +117,9 @@ public sealed class ThemeRegistry
{ {
// Editor mid-save: keep the cached snapshot, leave the stamp // Editor mid-save: keep the cached snapshot, leave the stamp
// alone so the next refresh retries automatically. // alone so the next refresh retries automatically.
Plugin.Log.Debug($"Custom theme {Path.GetFileName(path)} is locked, keeping last known good"); Plugin.Log.Debug(
$"Custom theme {Path.GetFileName(path)} is locked, keeping last known good"
);
if (cached.Theme is not null) if (cached.Theme is not null)
theme = cached.Theme; theme = cached.Theme;
} }
+22 -11
View File
@@ -1,10 +1,10 @@
using System; using System;
using System.Numerics; using System.Numerics;
using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Utility.Raii;
using HellionChat._Helpers; using HellionChat._Helpers;
using HellionChat.Code; using HellionChat.Code;
using HellionChat.Util; using HellionChat.Util;
using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Utility.Raii;
namespace HellionChat.Ui; namespace HellionChat.Ui;
@@ -36,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.
// //
@@ -79,12 +77,20 @@ 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);
} }
@@ -118,7 +124,8 @@ public sealed class ChatInputBar
_state.Buffer, _state.Buffer,
() => InputHistoryService.Count, () => InputHistoryService.Count,
InputHistoryService.Push, InputHistoryService.Push,
InputHistoryService.GetByCursor); InputHistoryService.GetByCursor
);
_state.HistoryCursor = cursor; _state.HistoryCursor = cursor;
if (replacement is null) if (replacement is null)
@@ -156,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);
} }
@@ -181,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()
);
} }
} }
+183 -42
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,7 +276,13 @@ public class DbViewer : Window
AdjustDates(); AdjustDates();
IsProcessing = true; IsProcessing = true;
ProcessingStart = Environment.TickCount64 + 1_000; // + 1 second ProcessingStart = Environment.TickCount64 + 1_000; // + 1 second
LastProcessed = (AfterDate, BeforeDate, CurrentPage, OnlyCurrentCharacter, SelectedChannels.Count); LastProcessed = (
AfterDate,
BeforeDate,
CurrentPage,
OnlyCurrentCharacter,
SelectedChannels.Count
);
Task.Run(() => Task.Run(() =>
{ {
try try
@@ -208,9 +292,21 @@ public class DbViewer : Window
// We only want to fetch count if this is the first page // We only want to fetch count if this is the first page
if (CurrentPage == 1) if (CurrentPage == 1)
Count = Plugin.MessageManager.Store.CountDateRange(AfterDate, BeforeDate, channels, character); Count = Plugin.MessageManager.Store.CountDateRange(
AfterDate,
BeforeDate,
channels,
character
);
using var rangeMessageEnumerator = Plugin.MessageManager.Store.GetPagedDateRange(AfterDate, BeforeDate, channels, character, CurrentPage - 1); using var rangeMessageEnumerator =
Plugin.MessageManager.Store.GetPagedDateRange(
AfterDate,
BeforeDate,
channels,
character,
CurrentPage - 1
);
Messages = rangeMessageEnumerator.ToArray(); Messages = rangeMessageEnumerator.ToArray();
Filtered = Filter(Messages); Filtered = Filter(Messages);
@@ -231,7 +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
} }
}); });
} }
} }
+26 -11
View File
@@ -1,10 +1,10 @@
using System.Numerics; using System.Numerics;
using HellionChat.Code; using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Colors; using Dalamud.Interface.Colors;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using FFXIVClientStructs.FFXIV.Client.UI.Agent; using FFXIVClientStructs.FFXIV.Client.UI.Agent;
using Dalamud.Bindings.ImGui; using HellionChat.Code;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
namespace HellionChat.Ui; namespace HellionChat.Ui;
@@ -14,7 +14,8 @@ public class DebuggerWindow : Window, IDisposable
private readonly Plugin Plugin; private readonly Plugin Plugin;
private readonly ChatLogWindow ChatLogWindow; private readonly ChatLogWindow ChatLogWindow;
public DebuggerWindow(Plugin plugin) : base("Debugger###chat2-debugger") public DebuggerWindow(Plugin plugin)
: base("Debugger###chat2-debugger")
{ {
Plugin = plugin; Plugin = plugin;
ChatLogWindow = plugin.ChatLogWindow; ChatLogWindow = plugin.ChatLogWindow;
@@ -22,7 +23,7 @@ public class DebuggerWindow : Window, IDisposable
SizeConstraints = new WindowSizeConstraints SizeConstraints = new WindowSizeConstraints
{ {
MinimumSize = new Vector2(475, 600), MinimumSize = new Vector2(475, 600),
MaximumSize = new Vector2(float.MaxValue, float.MaxValue) MaximumSize = new Vector2(float.MaxValue, float.MaxValue),
}; };
RespectCloseHotkey = false; RespectCloseHotkey = false;
@@ -50,23 +51,37 @@ public class DebuggerWindow : Window, IDisposable
ImGui.TextUnformatted($"Handle Tooltips: {ChatLogWindow.PayloadHandler.HandleTooltips}"); ImGui.TextUnformatted($"Handle Tooltips: {ChatLogWindow.PayloadHandler.HandleTooltips}");
ImGui.TextUnformatted($"Hovered Item: {ChatLogWindow.PayloadHandler.HoveredItem}"); ImGui.TextUnformatted($"Hovered Item: {ChatLogWindow.PayloadHandler.HoveredItem}");
ImGui.TextUnformatted($"Hover Counter: {ChatLogWindow.PayloadHandler.HoverCounter}"); ImGui.TextUnformatted($"Hover Counter: {ChatLogWindow.PayloadHandler.HoverCounter}");
ImGui.TextUnformatted($"Last Hover Counter: {ChatLogWindow.PayloadHandler.LastHoverCounter}"); ImGui.TextUnformatted(
$"Last Hover Counter: {ChatLogWindow.PayloadHandler.LastHoverCounter}"
);
ImGuiHelpers.ScaledDummy(5.0f); ImGuiHelpers.ScaledDummy(5.0f);
ImGui.TextColored(ImGuiColors.DalamudOrange, "Current Tab"); ImGui.TextColored(ImGuiColors.DalamudOrange, "Current Tab");
ImGui.TextUnformatted($"Name: {Plugin.CurrentTab.Name}"); ImGui.TextUnformatted($"Name: {Plugin.CurrentTab.Name}");
ImGui.TextUnformatted($"Channel: {Plugin.CurrentTab.CurrentChannel.Channel.ToChatType().Name()}"); ImGui.TextUnformatted(
ImGui.TextUnformatted($"Tell Target: {Plugin.CurrentTab.CurrentChannel.TellTarget?.ToTargetString() ?? "Null"}"); $"Channel: {Plugin.CurrentTab.CurrentChannel.Channel.ToChatType().Name()}"
);
ImGui.TextUnformatted(
$"Tell Target: {Plugin.CurrentTab.CurrentChannel.TellTarget?.ToTargetString() ?? "Null"}"
);
ImGui.TextUnformatted($"Use Temp? {Plugin.CurrentTab.CurrentChannel.UseTempChannel}"); ImGui.TextUnformatted($"Use Temp? {Plugin.CurrentTab.CurrentChannel.UseTempChannel}");
ImGui.TextUnformatted($"Temp Channel: {Plugin.CurrentTab.CurrentChannel.TempChannel.ToChatType().Name()}"); ImGui.TextUnformatted(
ImGui.TextUnformatted($"Temp Tell Target: {Plugin.CurrentTab.CurrentChannel.TempTellTarget?.ToTargetString() ?? "Null"}"); $"Temp Channel: {Plugin.CurrentTab.CurrentChannel.TempChannel.ToChatType().Name()}"
);
ImGui.TextUnformatted(
$"Temp Tell Target: {Plugin.CurrentTab.CurrentChannel.TempTellTarget?.ToTargetString() ?? "Null"}"
);
ImGui.TextUnformatted($"Name Set? {Plugin.CurrentTab.CurrentChannel.Name.Count > 0}"); ImGui.TextUnformatted($"Name Set? {Plugin.CurrentTab.CurrentChannel.Name.Count > 0}");
ImGui.TextUnformatted($"Name {string.Join(" ", Plugin.CurrentTab.CurrentChannel.Name.Select(c => c.StringValue()))}"); ImGui.TextUnformatted(
$"Name {string.Join(" ", Plugin.CurrentTab.CurrentChannel.Name.Select(c => c.StringValue()))}"
);
ImGuiHelpers.ScaledDummy(5.0f); ImGuiHelpers.ScaledDummy(5.0f);
ImGui.TextColored(ImGuiColors.DalamudOrange, "Vanilla Chat"); ImGui.TextColored(ImGuiColors.DalamudOrange, "Vanilla Chat");
ImGui.TextUnformatted($"Channel: {new ReadOnlySeString(AgentChatLog.Instance()->ChannelLabel).ExtractText()}"); ImGui.TextUnformatted(
$"Channel: {new ReadOnlySeString(AgentChatLog.Instance()->ChannelLabel).ExtractText()}"
);
} }
} }
+37 -13
View File
@@ -1,11 +1,11 @@
using System.Numerics; using System.Numerics;
using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing;
using HellionChat.Code; using HellionChat.Code;
using HellionChat.Privacy; using HellionChat.Privacy;
using HellionChat.Resources; using HellionChat.Resources;
using HellionChat.Util; using HellionChat.Util;
using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing;
using Dalamud.Bindings.ImGui;
namespace HellionChat.Ui; namespace HellionChat.Ui;
@@ -13,7 +13,8 @@ public sealed class FirstRunWizard : Window
{ {
private readonly Plugin Plugin; private readonly Plugin Plugin;
internal FirstRunWizard(Plugin plugin) : base($"{HellionStrings.Wizard_Title}###hellion-firstrun") internal FirstRunWizard(Plugin plugin)
: base($"{HellionStrings.Wizard_Title}###hellion-firstrun")
{ {
Plugin = plugin; Plugin = plugin;
@@ -50,33 +51,54 @@ public sealed class FirstRunWizard : Window
var cardWidth = (avail.X - ImGui.GetStyle().ItemSpacing.X * 2) / 3f; var cardWidth = (avail.X - ImGui.GetStyle().ItemSpacing.X * 2) / 3f;
var cardHeight = avail.Y - ImGui.GetTextLineHeightWithSpacing(); var cardHeight = avail.Y - ImGui.GetTextLineHeightWithSpacing();
DrawCard("privacy-first", cardWidth, cardHeight, DrawCard(
"privacy-first",
cardWidth,
cardHeight,
HellionStrings.Wizard_Profile_PrivacyFirst_Heading, HellionStrings.Wizard_Profile_PrivacyFirst_Heading,
HellionStrings.Wizard_Profile_PrivacyFirst_Description, HellionStrings.Wizard_Profile_PrivacyFirst_Description,
null, null,
HellionStrings.Wizard_Profile_PrivacyFirst_Apply, HellionStrings.Wizard_Profile_PrivacyFirst_Apply,
ApplyPrivacyFirst); ApplyPrivacyFirst
);
ImGui.SameLine(); ImGui.SameLine();
DrawCard("casual", cardWidth, cardHeight, DrawCard(
"casual",
cardWidth,
cardHeight,
HellionStrings.Wizard_Profile_Casual_Heading, HellionStrings.Wizard_Profile_Casual_Heading,
HellionStrings.Wizard_Profile_Casual_Description, HellionStrings.Wizard_Profile_Casual_Description,
null, null,
HellionStrings.Wizard_Profile_Casual_Apply, HellionStrings.Wizard_Profile_Casual_Apply,
ApplyCasual); ApplyCasual
);
ImGui.SameLine(); ImGui.SameLine();
DrawCard("full-history", cardWidth, cardHeight, DrawCard(
"full-history",
cardWidth,
cardHeight,
HellionStrings.Wizard_Profile_FullHistory_Heading, HellionStrings.Wizard_Profile_FullHistory_Heading,
HellionStrings.Wizard_Profile_FullHistory_Description, HellionStrings.Wizard_Profile_FullHistory_Description,
HellionStrings.Wizard_Profile_FullHistory_GdprWarning, HellionStrings.Wizard_Profile_FullHistory_GdprWarning,
HellionStrings.Wizard_Profile_FullHistory_Apply, HellionStrings.Wizard_Profile_FullHistory_Apply,
ApplyFullHistory); ApplyFullHistory
);
} }
private void DrawCard(string id, float width, float height, string heading, string description, string? warning, string buttonLabel, Action onApply) private void DrawCard(
string id,
float width,
float height,
string heading,
string description,
string? warning,
string buttonLabel,
Action onApply
)
{ {
using var child = ImRaii.Child($"##wizard-card-{id}", new Vector2(width, height), true); using var child = ImRaii.Child($"##wizard-card-{id}", new Vector2(width, height), true);
if (!child.Success) if (!child.Success)
@@ -118,8 +140,10 @@ public sealed class FirstRunWizard : Window
Plugin.Config.RetentionEnabled = true; Plugin.Config.RetentionEnabled = true;
Plugin.Config.RetentionDefaultDays = 30; Plugin.Config.RetentionDefaultDays = 30;
Plugin.Config.RetentionPerChannelDays = Plugin.Config.RetentionPerChannelDays = PrivacyDefaults.DefaultRetentionDays.ToDictionary(
PrivacyDefaults.DefaultRetentionDays.ToDictionary(p => p.Key, p => p.Value); p => p.Key,
p => p.Value
);
} }
private void ApplyCasual() private void ApplyCasual()
+8 -8
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;
@@ -140,14 +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 PushColorAbgr(ImGuiCol slot, uint abgr) internal void PushColorAbgr(ImGuiCol slot, uint abgr) =>
=> _items.Add(ImRaii.PushColor(slot, abgr)); _items.Add(ImRaii.PushColor(slot, abgr));
internal void PushStyleVar(ImGuiStyleVar var, float value) internal void PushStyleVar(ImGuiStyleVar var, float value) =>
=> _items.Add(ImRaii.PushStyle(var, 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);
} }
} }
+120 -53
View File
@@ -1,13 +1,13 @@
using System.Globalization; using System.Globalization;
using System.Numerics; using System.Numerics;
using System.Text; using System.Text;
using HellionChat.Util; using Dalamud.Bindings.ImGui;
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using Dalamud.Bindings.ImGui;
using Dalamud.Utility; using Dalamud.Utility;
using HellionChat.Util;
using DalamudPartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload; using DalamudPartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload;
namespace HellionChat.Ui; namespace HellionChat.Ui;
@@ -16,14 +16,15 @@ public class SeStringDebugger : Window
{ {
private readonly Plugin Plugin; private readonly Plugin Plugin;
public SeStringDebugger(Plugin plugin) : base("SeString Debugger###chat2-sestringdebugger") public SeStringDebugger(Plugin plugin)
: base("SeString Debugger###chat2-sestringdebugger")
{ {
Plugin = plugin; Plugin = plugin;
SizeConstraints = new WindowSizeConstraints SizeConstraints = new WindowSizeConstraints
{ {
MinimumSize = new Vector2(475, 600), MinimumSize = new Vector2(475, 600),
MaximumSize = new Vector2(float.MaxValue, float.MaxValue) MaximumSize = new Vector2(float.MaxValue, float.MaxValue),
}; };
RespectCloseHotkey = false; RespectCloseHotkey = false;
@@ -75,21 +76,35 @@ public class SeStringDebugger : Window
{ {
case UIForegroundPayload color: case UIForegroundPayload color:
{ {
RenderMetadataDictionary("Link ForegroundColor", new Dictionary<string, string?> RenderMetadataDictionary(
"Link ForegroundColor",
new Dictionary<string, string?>
{ {
{ "Enabled?", color.IsEnabled.ToString() }, { "Enabled?", color.IsEnabled.ToString() },
{ "ColorKey", color.IsEnabled ? color.ColorKey.ToString() : "Color Ended" }, {
}); "ColorKey",
color.IsEnabled ? color.ColorKey.ToString() : "Color Ended"
},
}
);
break; break;
} }
case MapLinkPayload map: case MapLinkPayload map:
{ {
RenderMetadataDictionary("Link MapLinkPayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link MapLinkPayload",
new Dictionary<string, string?>
{ {
{ "Map.RowId", map.Map.RowId.ToString() }, { "Map.RowId", map.Map.RowId.ToString() },
{ "Map.PlaceName", map.Map.Value.PlaceName.Value.Name.ToString() }, { "Map.PlaceName", map.Map.Value.PlaceName.Value.Name.ToString() },
{ "Map.PlaceNameRegion", map.Map.Value.PlaceNameRegion.Value.Name.ToString() }, {
{ "Map.PlaceNameSub", map.Map.Value.PlaceNameSub.Value.Name.ToString() }, "Map.PlaceNameRegion",
map.Map.Value.PlaceNameRegion.Value.Name.ToString()
},
{
"Map.PlaceNameSub",
map.Map.Value.PlaceNameSub.Value.Name.ToString()
},
{ "TerritoryType.RowId", map.TerritoryType.RowId.ToString() }, { "TerritoryType.RowId", map.TerritoryType.RowId.ToString() },
{ "RawX", map.RawX.ToString() }, { "RawX", map.RawX.ToString() },
{ "RawY", map.RawY.ToString() }, { "RawY", map.RawY.ToString() },
@@ -97,77 +112,107 @@ public class SeStringDebugger : Window
{ "YCoord", map.YCoord.ToString(CultureInfo.InvariantCulture) }, { "YCoord", map.YCoord.ToString(CultureInfo.InvariantCulture) },
{ "CoordinateString", map.CoordinateString }, { "CoordinateString", map.CoordinateString },
{ "DataString", map.DataString }, { "DataString", map.DataString },
}); }
);
break; break;
} }
case QuestPayload quest: case QuestPayload quest:
{ {
RenderMetadataDictionary("Link QuestPayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link QuestPayload",
new Dictionary<string, string?>
{ {
{ "Quest.RowId", quest.Quest.RowId.ToString() }, { "Quest.RowId", quest.Quest.RowId.ToString() },
{ "Quest.Name", quest.Quest.Value.Name.ToString() }, { "Quest.Name", quest.Quest.Value.Name.ToString() },
}); }
);
break; break;
} }
case DalamudLinkPayload link: case DalamudLinkPayload link:
{ {
RenderMetadataDictionary("Link DalamudLinkPayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link DalamudLinkPayload",
new Dictionary<string, string?>
{ {
{ "CommandId", link.CommandId.ToString() }, { "CommandId", link.CommandId.ToString() },
{ "Plugin", link.Plugin }, { "Plugin", link.Plugin },
}); }
);
break; break;
} }
case DalamudPartyFinderPayload pf: case DalamudPartyFinderPayload pf:
{ {
RenderMetadataDictionary("Link PartyFinderPayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link PartyFinderPayload",
new Dictionary<string, string?>
{ {
{ "ListingId", pf.ListingId.ToString() }, { "ListingId", pf.ListingId.ToString() },
{ "LinkType", EnumName(pf.LinkType) }, { "LinkType", EnumName(pf.LinkType) },
}); }
);
break; break;
} }
case PlayerPayload player: case PlayerPayload player:
{ {
RenderMetadataDictionary("Link PlayerPayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link PlayerPayload",
new Dictionary<string, string?>
{ {
{ "Displayed", player.DisplayedName }, { "Displayed", player.DisplayedName },
{ "Player Name", player.PlayerName }, { "Player Name", player.PlayerName },
{ "World Name", player.World.Value.Name.ExtractText() }, { "World Name", player.World.Value.Name.ExtractText() },
{ "Data", string.Join(" ", player.Encode().Select(b => b.ToString("X2"))) }, {
}); "Data",
string.Join(" ", player.Encode().Select(b => b.ToString("X2")))
},
}
);
break; break;
} }
case ItemPayload item: case ItemPayload item:
{ {
RenderMetadataDictionary("Link ItemPayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link ItemPayload",
new Dictionary<string, string?>
{ {
{ "ItemId", item.ItemId.ToString() }, { "ItemId", item.ItemId.ToString() },
{ "RawItemId", item.RawItemId.ToString() }, { "RawItemId", item.RawItemId.ToString() },
{ "Kind", EnumName(item.Kind) }, { "Kind", EnumName(item.Kind) },
{ "IsHQ", item.IsHQ.ToString() }, { "IsHQ", item.IsHQ.ToString() },
{ "Item.Name", item.Kind == ItemKind.EventItem ? Sheets.EventItemSheet.GetRow(item.ItemId).Name.ExtractText() : Sheets.ItemSheet.GetRow(item.ItemId).Name.ExtractText() }, {
}); "Item.Name",
item.Kind == ItemKind.EventItem
? Sheets.EventItemSheet.GetRow(item.ItemId).Name.ExtractText()
: Sheets.ItemSheet.GetRow(item.ItemId).Name.ExtractText()
},
}
);
break; break;
} }
case AutoTranslatePayload at: case AutoTranslatePayload at:
{ {
RenderMetadataDictionary("Link AutoTranslatePayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link AutoTranslatePayload",
new Dictionary<string, string?>
{ {
{ "Text", at.Text }, { "Text", at.Text },
{ "Key/Group", $"{at.Key}/{at.Group}" }, { "Key/Group", $"{at.Key}/{at.Group}" },
{ "Data", string.Join(" ", at.Encode().Select(b => b.ToString("X2"))) }, { "Data", string.Join(" ", at.Encode().Select(b => b.ToString("X2"))) },
}); }
);
break; break;
} }
case IconPayload icon: case IconPayload icon:
{ {
var found = IconUtil.GfdFileView.TryGetEntry((uint)icon.Icon, out _); var found = IconUtil.GfdFileView.TryGetEntry((uint)icon.Icon, out _);
RenderMetadataDictionary("Link IconPayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link IconPayload",
new Dictionary<string, string?>
{ {
{ "Found", found.ToString() }, { "Found", found.ToString() },
{ "Icon ID", ((uint)icon.Icon).ToString() }, { "Icon ID", ((uint)icon.Icon).ToString() },
}); }
);
break; break;
} }
case RawPayload raw: case RawPayload raw:
@@ -175,48 +220,60 @@ public class SeStringDebugger : Window
var colorPayload = ColorPayload.From(raw.Data); var colorPayload = ColorPayload.From(raw.Data);
if (colorPayload != null) if (colorPayload != null)
{ {
RenderMetadataDictionary("Link ColorPayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link ColorPayload",
new Dictionary<string, string?>
{ {
{ "Unshifted", colorPayload.UnshiftedColor.ToString("X8") }, { "Unshifted", colorPayload.UnshiftedColor.ToString("X8") },
{ "Color", colorPayload.Color.ToString("X8") }, { "Color", colorPayload.Color.ToString("X8") },
{ "Enabled?", colorPayload.Enabled.ToString() }, { "Enabled?", colorPayload.Enabled.ToString() },
}); }
);
} }
else else
{ {
RenderMetadataDictionary("Link RawPayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link RawPayload",
new Dictionary<string, string?>
{ {
{ "Data", string.Join(" ", raw.Data.Select(b => b.ToString("X2"))) }, {
"Data",
string.Join(" ", raw.Data.Select(b => b.ToString("X2")))
},
{ "Type", EnumName(raw.Type) }, { "Type", EnumName(raw.Type) },
}); }
);
} }
break; break;
} }
case StatusPayload status: case StatusPayload status:
{ {
RenderMetadataDictionary("Link StatusPayload", new Dictionary<string, string?> RenderMetadataDictionary(
"Link StatusPayload",
new Dictionary<string, string?>
{ {
{ "Status.RowId", status.Status.RowId.ToString() }, { "Status.RowId", status.Status.RowId.ToString() },
{ "Status.Name", status.Status.Value.Name.ExtractText() }, { "Status.Name", status.Status.Value.Name.ExtractText() },
{ "Status.Icon", status.Status.Value.Icon.ToString() } { "Status.Icon", status.Status.Value.Icon.ToString() },
}); }
);
break; break;
} }
case Util.PartyFinderPayload pf: case Util.PartyFinderPayload pf:
{ {
RenderMetadataDictionary("Link PartyFinderPayload", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Link PartyFinderPayload",
{ "Id", pf.Id.ToString() } new Dictionary<string, string?> { { "Id", pf.Id.ToString() } }
}); );
break; break;
} }
case AchievementPayload achievement: case AchievementPayload achievement:
{ {
RenderMetadataDictionary("Link AchievementPayload", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Link AchievementPayload",
{ "Id", achievement.Id.ToString() } new Dictionary<string, string?> { { "Id", achievement.Id.ToString() } }
}); );
break; break;
} }
default: default:
@@ -224,35 +281,45 @@ public class SeStringDebugger : Window
if (payloadData.Length == 0) if (payloadData.Length == 0)
{ {
RenderMetadataDictionary("Empty Payload", new Dictionary<string, string?> RenderMetadataDictionary(
{ "Empty Payload",
{ "Type", payload.GetType().Name }, new Dictionary<string, string?> { { "Type", payload.GetType().Name } }
}); );
break; break;
} }
var initialByte = payloadData[0]; var initialByte = payloadData[0];
if (initialByte != 0x02) if (initialByte != 0x02)
{ {
RenderMetadataDictionary("Text Payload", new Dictionary<string, string?> RenderMetadataDictionary(
"Text Payload",
new Dictionary<string, string?>
{ {
{ "Content", Encoding.UTF8.GetString(payloadData) }, { "Content", Encoding.UTF8.GetString(payloadData) },
}); }
);
} }
else else
{ {
var unknown = new RawPayload(payloadData); var unknown = new RawPayload(payloadData);
RenderMetadataDictionary("Link Unknown", new Dictionary<string, string?> RenderMetadataDictionary(
"Link Unknown",
new Dictionary<string, string?>
{ {
{ "Unknown", string.Join(" ", unknown.Data.Select(b => b.ToString("X2"))) }, {
}); "Unknown",
string.Join(" ", unknown.Data.Select(b => b.ToString("X2")))
},
}
);
} }
break; break;
} }
} }
} }
private static string? EnumName<T>(T? value) where T : Enum private static string? EnumName<T>(T? value)
where T : Enum
{ {
if (value == null) if (value == null)
{ {
+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://gitea.hellion-forge.cloud/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)
+90 -26
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();
@@ -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
);
} }
} }
} }
+142 -34
View File
@@ -1,10 +1,10 @@
using Dalamud.Bindings.ImGui;
using Dalamud.Game.ClientState.Objects.SubKinds;
using Dalamud.Interface;
using Dalamud.Interface.Utility.Raii;
using HellionChat.Code; using HellionChat.Code;
using HellionChat.Resources; using HellionChat.Resources;
using HellionChat.Util; using HellionChat.Util;
using Dalamud.Interface;
using Dalamud.Interface.Utility.Raii;
using Dalamud.Bindings.ImGui;
using Dalamud.Game.ClientState.Objects.SubKinds;
namespace HellionChat.Ui.SettingsTabs; namespace HellionChat.Ui.SettingsTabs;
@@ -42,13 +42,25 @@ internal sealed class Tabs : ISettingsTab
ImGui.Separator(); ImGui.Separator();
if (ImGui.Selectable(string.Format(Language.Options_Tabs_Preset, Language.Tabs_Presets_General))) if (
ImGui.Selectable(
string.Format(Language.Options_Tabs_Preset, Language.Tabs_Presets_General)
)
)
Mutable.Tabs.Add(TabsUtil.VanillaGeneral); Mutable.Tabs.Add(TabsUtil.VanillaGeneral);
if (ImGui.Selectable(string.Format(Language.Options_Tabs_Preset, Language.Tabs_Presets_Event))) if (
ImGui.Selectable(
string.Format(Language.Options_Tabs_Preset, Language.Tabs_Presets_Event)
)
)
Mutable.Tabs.Add(TabsUtil.VanillaEvent); Mutable.Tabs.Add(TabsUtil.VanillaEvent);
if (ImGui.Selectable(string.Format(Language.Options_Tabs_Preset, Language.Tabs_Presets_Tell))) if (
ImGui.Selectable(
string.Format(Language.Options_Tabs_Preset, Language.Tabs_Presets_Tell)
)
)
Mutable.Tabs.Add(TabsUtil.VanillaTellExclusive); Mutable.Tabs.Add(TabsUtil.VanillaTellExclusive);
} }
} }
@@ -68,7 +80,12 @@ internal sealed class Tabs : ISettingsTab
using var pushedId = ImRaii.PushId($"tab-{i}"); using var pushedId = ImRaii.PushId($"tab-{i}");
if (ImGuiUtil.IconButton(FontAwesomeIcon.TrashAlt, tooltip: Language.Options_Tabs_Delete)) if (
ImGuiUtil.IconButton(
FontAwesomeIcon.TrashAlt,
tooltip: Language.Options_Tabs_Delete
)
)
{ {
toRemove = i; toRemove = i;
ToOpen = -1; ToOpen = -1;
@@ -76,7 +93,10 @@ internal sealed class Tabs : ISettingsTab
ImGui.SameLine(); ImGui.SameLine();
if (ImGuiUtil.IconButton(FontAwesomeIcon.ArrowUp, tooltip: Language.Options_Tabs_MoveUp) && i > 0) if (
ImGuiUtil.IconButton(FontAwesomeIcon.ArrowUp, tooltip: Language.Options_Tabs_MoveUp)
&& i > 0
)
{ {
(Mutable.Tabs[i - 1], Mutable.Tabs[i]) = (Mutable.Tabs[i], Mutable.Tabs[i - 1]); (Mutable.Tabs[i - 1], Mutable.Tabs[i]) = (Mutable.Tabs[i], Mutable.Tabs[i - 1]);
ToOpen = i - 1; ToOpen = i - 1;
@@ -84,13 +104,24 @@ internal sealed class Tabs : ISettingsTab
ImGui.SameLine(); ImGui.SameLine();
if (ImGuiUtil.IconButton(FontAwesomeIcon.ArrowDown, tooltip: Language.Options_Tabs_MoveDown) && i < Mutable.Tabs.Count - 1) if (
ImGuiUtil.IconButton(
FontAwesomeIcon.ArrowDown,
tooltip: Language.Options_Tabs_MoveDown
)
&& i < Mutable.Tabs.Count - 1
)
{ {
(Mutable.Tabs[i + 1], Mutable.Tabs[i]) = (Mutable.Tabs[i], Mutable.Tabs[i + 1]); (Mutable.Tabs[i + 1], Mutable.Tabs[i]) = (Mutable.Tabs[i], Mutable.Tabs[i + 1]);
ToOpen = i + 1; ToOpen = i + 1;
} }
ImGui.InputText(Language.Options_Tabs_Name, ref tab.Name, 512, ImGuiInputTextFlags.EnterReturnsTrue); ImGui.InputText(
Language.Options_Tabs_Name,
ref tab.Name,
512,
ImGuiInputTextFlags.EnterReturnsTrue
);
// v1.2.0 — Per-Tab Icon-Override. Default-Mapping greift falls nichts gesetzt. // v1.2.0 — Per-Tab Icon-Override. Default-Mapping greift falls nichts gesetzt.
ImGui.TextUnformatted(HellionStrings.Tabs_Icon_Label); ImGui.TextUnformatted(HellionStrings.Tabs_Icon_Label);
@@ -98,15 +129,19 @@ internal sealed class Tabs : ISettingsTab
ImGuiUtil.HelpMarker(HellionStrings.Tabs_Icon_HelpMarker); ImGuiUtil.HelpMarker(HellionStrings.Tabs_Icon_HelpMarker);
var iconCurrent = string.IsNullOrEmpty(tab.Icon) ? "" : tab.Icon; var iconCurrent = string.IsNullOrEmpty(tab.Icon) ? "" : tab.Icon;
var iconPreview = iconCurrent.Length == 0 var iconPreview =
? HellionStrings.Tabs_Icon_DefaultOption iconCurrent.Length == 0 ? HellionStrings.Tabs_Icon_DefaultOption : iconCurrent;
: iconCurrent;
using (var combo = ImRaii.Combo($"##icon-{i}", iconPreview)) using (var combo = ImRaii.Combo($"##icon-{i}", iconPreview))
{ {
if (combo.Success) if (combo.Success)
{ {
// Erste Option: Default (löscht Icon, lässt Mapping greifen). // Erste Option: Default (löscht Icon, lässt Mapping greifen).
if (ImGui.Selectable(HellionStrings.Tabs_Icon_DefaultOption, iconCurrent.Length == 0)) if (
ImGui.Selectable(
HellionStrings.Tabs_Icon_DefaultOption,
iconCurrent.Length == 0
)
)
{ {
tab.Icon = null; tab.Icon = null;
} }
@@ -116,7 +151,11 @@ internal sealed class Tabs : ISettingsTab
// Pool-Optionen aus TabIconGlyphResolver.PickerOptions (Single-Source-of-Truth). // Pool-Optionen aus TabIconGlyphResolver.PickerOptions (Single-Source-of-Truth).
foreach (var option in TabIconGlyphResolver.PickerOptions) foreach (var option in TabIconGlyphResolver.PickerOptions)
{ {
var isSelected = string.Equals(iconCurrent, option, StringComparison.OrdinalIgnoreCase); var isSelected = string.Equals(
iconCurrent,
option,
StringComparison.OrdinalIgnoreCase
);
if (ImGui.Selectable(option, isSelected)) if (ImGui.Selectable(option, isSelected))
{ {
tab.Icon = option; tab.Icon = option;
@@ -130,27 +169,53 @@ internal sealed class Tabs : ISettingsTab
if (tab.PopOut) if (tab.PopOut)
{ {
using var _ = ImRaii.PushIndent(10.0f); using var _ = ImRaii.PushIndent(10.0f);
ImGui.Checkbox(Language.Options_Tabs_IndependentOpacity, ref tab.IndependentOpacity); ImGui.Checkbox(
Language.Options_Tabs_IndependentOpacity,
ref tab.IndependentOpacity
);
if (tab.IndependentOpacity) if (tab.IndependentOpacity)
ImGuiUtil.DragFloatVertical(Language.Options_Tabs_Opacity, ref tab.Opacity, 0.25f, 0f, 100f, $"{tab.Opacity:N2}%%", ImGuiSliderFlags.AlwaysClamp); ImGuiUtil.DragFloatVertical(
Language.Options_Tabs_Opacity,
ref tab.Opacity,
0.25f,
0f,
100f,
$"{tab.Opacity:N2}%%",
ImGuiSliderFlags.AlwaysClamp
);
ImGui.Checkbox(Language.Options_Tabs_IndependentHide, ref tab.IndependentHide); ImGui.Checkbox(Language.Options_Tabs_IndependentHide, ref tab.IndependentHide);
if (tab.IndependentHide) if (tab.IndependentHide)
{ {
using var __ = ImRaii.PushIndent(10.0f); using var __ = ImRaii.PushIndent(10.0f);
ImGuiUtil.OptionCheckbox(ref tab.HideDuringCutscenes, Language.Options_HideDuringCutscenes_Name); ImGuiUtil.OptionCheckbox(
ref tab.HideDuringCutscenes,
Language.Options_HideDuringCutscenes_Name
);
ImGui.Spacing(); ImGui.Spacing();
ImGuiUtil.OptionCheckbox(ref tab.HideWhenNotLoggedIn, Language.Options_HideWhenNotLoggedIn_Name); ImGuiUtil.OptionCheckbox(
ref tab.HideWhenNotLoggedIn,
Language.Options_HideWhenNotLoggedIn_Name
);
ImGui.Spacing(); ImGui.Spacing();
ImGuiUtil.OptionCheckbox(ref tab.HideWhenUiHidden, Language.Options_HideWhenUiHidden_Name); ImGuiUtil.OptionCheckbox(
ref tab.HideWhenUiHidden,
Language.Options_HideWhenUiHidden_Name
);
ImGui.Spacing(); ImGui.Spacing();
ImGuiUtil.OptionCheckbox(ref tab.HideInLoadingScreens, Language.Options_HideInLoadingScreens_Name); ImGuiUtil.OptionCheckbox(
ref tab.HideInLoadingScreens,
Language.Options_HideInLoadingScreens_Name
);
ImGui.Spacing(); ImGui.Spacing();
ImGuiUtil.OptionCheckbox(ref tab.HideInBattle, Language.Options_HideInBattle_Name); ImGuiUtil.OptionCheckbox(
ref tab.HideInBattle,
Language.Options_HideInBattle_Name
);
ImGui.Spacing(); ImGui.Spacing();
} }
@@ -161,7 +226,12 @@ internal sealed class Tabs : ISettingsTab
ImGui.Spacing(); ImGui.Spacing();
} }
using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_Tabs_UnreadMode, tab.UnreadMode.Name())) using (
var combo = ImGuiUtil.BeginComboVertical(
Language.Options_Tabs_UnreadMode,
tab.UnreadMode.Name()
)
)
{ {
if (combo.Success) if (combo.Success)
{ {
@@ -182,16 +252,32 @@ internal sealed class Tabs : ISettingsTab
ImGui.Checkbox(Language.Options_Tabs_NoInput, ref tab.InputDisabled); ImGui.Checkbox(Language.Options_Tabs_NoInput, ref tab.InputDisabled);
if (!tab.InputDisabled) if (!tab.InputDisabled)
{ {
var input = tab.Channel?.ToChatType().Name() ?? Language.Options_Tabs_NoInputChannel; var input =
using (var combo = ImGuiUtil.BeginComboVertical(Language.Options_Tabs_InputChannel, input)) tab.Channel?.ToChatType().Name() ?? Language.Options_Tabs_NoInputChannel;
using (
var combo = ImGuiUtil.BeginComboVertical(
Language.Options_Tabs_InputChannel,
input
)
)
{ {
if (combo.Success) if (combo.Success)
{ {
if (ImGui.Selectable(Language.Options_Tabs_NoInputChannel, tab.Channel == null)) if (
ImGui.Selectable(
Language.Options_Tabs_NoInputChannel,
tab.Channel == null
)
)
tab.Channel = null; tab.Channel = null;
foreach (var channel in Enum.GetValues<InputChannel>()) foreach (var channel in Enum.GetValues<InputChannel>())
if (ImGui.Selectable(channel.ToChatType().Name(), tab.Channel == channel)) if (
ImGui.Selectable(
channel.ToChatType().Name(),
tab.Channel == channel
)
)
tab.Channel = channel; tab.Channel = channel;
} }
} }
@@ -202,7 +288,11 @@ internal sealed class Tabs : ISettingsTab
ImGui.Checkbox(Language.Options_Tabs_SenderMessages, ref tab.AllSenderMessages); ImGui.Checkbox(Language.Options_Tabs_SenderMessages, ref tab.AllSenderMessages);
ImGuiUtil.HelpText(Language.Options_Help_SenderMessages); ImGuiUtil.HelpText(Language.Options_Help_SenderMessages);
var worlds = Sheets.WorldsOnDatacenter(player).OrderByDescending(world => world.DataCenter.RowId).ThenBy(world => world.Name.ToString()).ToList(); var worlds = Sheets
.WorldsOnDatacenter(player)
.OrderByDescending(world => world.DataCenter.RowId)
.ThenBy(world => world.Name.ToString())
.ToList();
using (ImRaii.ItemWidth(ImGui.GetWindowWidth() / 3f)) using (ImRaii.ItemWidth(ImGui.GetWindowWidth() / 3f))
{ {
@@ -225,18 +315,30 @@ internal sealed class Tabs : ISettingsTab
} }
else else
{ {
var selectedWorld = worlds.FindIndex(world => world.RowId == tab.TellTarget.World); var selectedWorld = worlds.FindIndex(world =>
world.RowId == tab.TellTarget.World
);
if (selectedWorld == -1) if (selectedWorld == -1)
selectedWorld = 0; selectedWorld = 0;
using (var combo = ImRaii.Combo("###player-world", worlds[selectedWorld].Name.ToString())) using (
var combo = ImRaii.Combo(
"###player-world",
worlds[selectedWorld].Name.ToString()
)
)
{ {
if (combo.Success) if (combo.Success)
{ {
var lastDc = worlds.First().DataCenter.RowId; var lastDc = worlds.First().DataCenter.RowId;
foreach (var (idx, world) in worlds.Index()) foreach (var (idx, world) in worlds.Index())
{ {
if (ImGui.Selectable(world.Name.ToString(), selectedWorld == idx)) if (
ImGui.Selectable(
world.Name.ToString(),
selectedWorld == idx
)
)
{ {
selectedWorld = idx; selectedWorld = idx;
tab.TellTarget.World = worlds[selectedWorld].RowId; tab.TellTarget.World = worlds[selectedWorld].RowId;
@@ -253,7 +355,9 @@ internal sealed class Tabs : ISettingsTab
} }
} }
var target = (Plugin.TargetManager.SoftTarget ?? Plugin.TargetManager.Target) as IPlayerCharacter; var target =
(Plugin.TargetManager.SoftTarget ?? Plugin.TargetManager.Target)
as IPlayerCharacter;
using (ImRaii.Disabled(target == null)) using (ImRaii.Disabled(target == null))
{ {
if (ImGui.Button("Set to target") && target != null) if (ImGui.Button("Set to target") && target != null)
@@ -263,7 +367,11 @@ internal sealed class Tabs : ISettingsTab
} }
ImGuiUtil.ChannelSelector(Language.Options_Tabs_Channels, tab.SelectedChannels); ImGuiUtil.ChannelSelector(Language.Options_Tabs_Channels, tab.SelectedChannels);
ImGuiUtil.ExtraChatSelector(Language.Options_Tabs_ExtraChatChannels, ref tab.ExtraChatAll, tab.ExtraChatChannels); ImGuiUtil.ExtraChatSelector(
Language.Options_Tabs_ExtraChatChannels,
ref tab.ExtraChatAll,
tab.ExtraChatChannels
);
} }
if (toRemove > -1) if (toRemove > -1)
+74 -22
View File
@@ -14,7 +14,8 @@ internal sealed class ThemeAndLayout : ISettingsTab
private string? _applyDismissedFor; private string? _applyDismissedFor;
public string Name => HellionStrings.Settings_Card_ThemeAndLayout_Title + "###tabs-themeandlayout"; public string Name =>
HellionStrings.Settings_Card_ThemeAndLayout_Title + "###tabs-themeandlayout";
internal ThemeAndLayout(Plugin plugin, Configuration mutable) internal ThemeAndLayout(Plugin plugin, Configuration mutable)
{ {
@@ -42,7 +43,8 @@ internal sealed class ThemeAndLayout : ISettingsTab
var registry = Plugin.ThemeRegistry; var registry = Plugin.ThemeRegistry;
var active = registry.Get(Mutable.Theme); var active = registry.Get(Mutable.Theme);
var activeLabelTemplate = HellionStrings.ResourceManager.GetString("Settings_Themes_Active") ?? "Active: {0}"; var activeLabelTemplate =
HellionStrings.ResourceManager.GetString("Settings_Themes_Active") ?? "Active: {0}";
ImGui.TextUnformatted(string.Format(activeLabelTemplate, active.Name)); ImGui.TextUnformatted(string.Format(activeLabelTemplate, active.Name));
using (ImRaii.PushColor(ImGuiCol.Text, 0xFF8FA3B5u)) using (ImRaii.PushColor(ImGuiCol.Text, 0xFF8FA3B5u))
ImGui.TextUnformatted(active.Author); ImGui.TextUnformatted(active.Author);
@@ -53,7 +55,9 @@ internal sealed class ThemeAndLayout : ISettingsTab
ImGui.Separator(); ImGui.Separator();
ImGui.Spacing(); ImGui.Spacing();
var builtInsLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_BuiltIns") ?? "Built-in themes"; var builtInsLabel =
HellionStrings.ResourceManager.GetString("Settings_Themes_BuiltIns")
?? "Built-in themes";
ImGui.TextUnformatted(builtInsLabel); ImGui.TextUnformatted(builtInsLabel);
ImGui.Spacing(); ImGui.Spacing();
DrawThemeGrid(registry.AllBuiltIns(), active.Slug); DrawThemeGrid(registry.AllBuiltIns(), active.Slug);
@@ -64,7 +68,9 @@ internal sealed class ThemeAndLayout : ISettingsTab
ImGui.Spacing(); ImGui.Spacing();
ImGui.Separator(); ImGui.Separator();
ImGui.Spacing(); ImGui.Spacing();
var customLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_Custom") ?? "Custom themes"; var customLabel =
HellionStrings.ResourceManager.GetString("Settings_Themes_Custom")
?? "Custom themes";
ImGui.TextUnformatted(customLabel); ImGui.TextUnformatted(customLabel);
ImGui.Spacing(); ImGui.Spacing();
DrawThemeGrid(customs, active.Slug); DrawThemeGrid(customs, active.Slug);
@@ -74,7 +80,9 @@ internal sealed class ThemeAndLayout : ISettingsTab
ImGui.Separator(); ImGui.Separator();
ImGui.Spacing(); ImGui.Spacing();
var openFolderLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_OpenFolder") ?? "Open themes folder"; var openFolderLabel =
HellionStrings.ResourceManager.GetString("Settings_Themes_OpenFolder")
?? "Open themes folder";
if (ImGui.Button(openFolderLabel)) if (ImGui.Button(openFolderLabel))
{ {
var dir = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "themes"); var dir = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "themes");
@@ -83,7 +91,9 @@ internal sealed class ThemeAndLayout : ISettingsTab
} }
ImGui.SameLine(); ImGui.SameLine();
var exportLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_ExportActive") ?? "Export active..."; var exportLabel =
HellionStrings.ResourceManager.GetString("Settings_Themes_ExportActive")
?? "Export active...";
if (ImGui.Button(exportLabel)) if (ImGui.Button(exportLabel))
{ {
var dir = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "themes"); var dir = Path.Combine(Plugin.Interface.ConfigDirectory.FullName, "themes");
@@ -130,12 +140,26 @@ internal sealed class ThemeAndLayout : ISettingsTab
if (isActive) if (isActive)
{ {
var border = ColourUtil.RgbaToAbgr(theme.Colors.Primary); var border = ColourUtil.RgbaToAbgr(theme.Colors.Primary);
draw.AddRect(cursorBefore, cursorBefore + new Vector2(w, h), border, 4f, ImDrawFlags.None, 2f); draw.AddRect(
cursorBefore,
cursorBefore + new Vector2(w, h),
border,
4f,
ImDrawFlags.None,
2f
);
} }
else if (hovered) else if (hovered)
{ {
var border = ColourUtil.RgbaToAbgr(theme.Colors.PrimaryLight & 0xFFFFFF99u); var border = ColourUtil.RgbaToAbgr(theme.Colors.PrimaryLight & 0xFFFFFF99u);
draw.AddRect(cursorBefore, cursorBefore + new Vector2(w, h), border, 4f, ImDrawFlags.None, 1f); draw.AddRect(
cursorBefore,
cursorBefore + new Vector2(w, h),
border,
4f,
ImDrawFlags.None,
1f
);
} }
var mockupOrigin = cursorBefore + new Vector2(12f, 12f); var mockupOrigin = cursorBefore + new Vector2(12f, 12f);
@@ -166,7 +190,8 @@ internal sealed class ThemeAndLayout : ISettingsTab
return; return;
var alreadyMatching = themeChatColors.Channels.All(kvp => var alreadyMatching = themeChatColors.Channels.All(kvp =>
Mutable.ChatColours.TryGetValue(kvp.Key, out var current) && current == kvp.Value); Mutable.ChatColours.TryGetValue(kvp.Key, out var current) && current == kvp.Value
);
if (alreadyMatching) if (alreadyMatching)
return; return;
@@ -181,11 +206,14 @@ internal sealed class ThemeAndLayout : ISettingsTab
draw.AddRectFilled(origin, origin + new Vector2(width, height), bgFill, 4f); draw.AddRectFilled(origin, origin + new Vector2(width, height), bgFill, 4f);
draw.AddRect(origin, origin + new Vector2(width, height), border, 4f, ImDrawFlags.None, 1f); draw.AddRect(origin, origin + new Vector2(width, height), border, 4f, ImDrawFlags.None, 1f);
var hint = HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Hint") var hint =
HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Hint")
?? "This theme suggests its own chat channel colours."; ?? "This theme suggests its own chat channel colours.";
var applyLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Apply") var applyLabel =
HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Apply")
?? "Apply"; ?? "Apply";
var keepLabel = HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Keep") var keepLabel =
HellionStrings.ResourceManager.GetString("Settings_Themes_ApplyChatColors_Keep")
?? "Keep current"; ?? "Keep current";
var textColor = ColourUtil.RgbaToAbgr(active.Colors.TextPrimary); var textColor = ColourUtil.RgbaToAbgr(active.Colors.TextPrimary);
@@ -217,7 +245,9 @@ internal sealed class ThemeAndLayout : ISettingsTab
private void DrawWindowStyleSection() private void DrawWindowStyleSection()
{ {
using var tree = ImRaii.TreeNode(HellionStrings.Settings_ThemeAndLayout_WindowStyle_Heading); using var tree = ImRaii.TreeNode(
HellionStrings.Settings_ThemeAndLayout_WindowStyle_Heading
);
if (!tree.Success) if (!tree.Success)
return; return;
@@ -225,13 +255,18 @@ internal sealed class ThemeAndLayout : ISettingsTab
{ {
ImGui.Checkbox(Language.Options_ShowTitleBar_Name, ref Mutable.ShowTitleBar); ImGui.Checkbox(Language.Options_ShowTitleBar_Name, ref Mutable.ShowTitleBar);
ImGui.Checkbox(Language.Options_ShowPopOutTitleBar_Name, ref Mutable.ShowPopOutTitleBar); ImGui.Checkbox(
Language.Options_ShowPopOutTitleBar_Name,
ref Mutable.ShowPopOutTitleBar
);
ImGui.Checkbox(Language.Options_ShowHideButton_Name, ref Mutable.ShowHideButton); ImGui.Checkbox(Language.Options_ShowHideButton_Name, ref Mutable.ShowHideButton);
ImGuiUtil.HelpMarker(Language.Options_ShowHideButton_Description); ImGuiUtil.HelpMarker(Language.Options_ShowHideButton_Description);
ImGui.Checkbox(Language.Options_SidebarTabView_Name, ref Mutable.SidebarTabView); ImGui.Checkbox(Language.Options_SidebarTabView_Name, ref Mutable.SidebarTabView);
ImGuiUtil.HelpMarker(string.Format(Language.Options_SidebarTabView_Description, Plugin.PluginName)); ImGuiUtil.HelpMarker(
string.Format(Language.Options_SidebarTabView_Description, Plugin.PluginName)
);
ImGui.Spacing(); ImGui.Spacing();
ImGui.Separator(); ImGui.Separator();
@@ -241,14 +276,17 @@ internal sealed class ThemeAndLayout : ISettingsTab
// Untere Schwelle 50 % verhindert versehentliches Komplett-Wegblenden // Untere Schwelle 50 % verhindert versehentliches Komplett-Wegblenden
// des Chat-Hintergrunds (war v1.2.0 Bug bei WindowAlpha=0). // des Chat-Hintergrunds (war v1.2.0 Bug bei WindowAlpha=0).
var opacityPercent = Mutable.WindowOpacity * 100f; var opacityPercent = Mutable.WindowOpacity * 100f;
if (ImGuiUtil.DragFloatVertical( if (
ImGuiUtil.DragFloatVertical(
HellionStrings.Settings_ThemeAndLayout_WindowOpacity_Name, HellionStrings.Settings_ThemeAndLayout_WindowOpacity_Name,
ref opacityPercent, ref opacityPercent,
.25f, .25f,
50f, 50f,
100f, 100f,
$"{opacityPercent:N0}%%", $"{opacityPercent:N0}%%",
ImGuiSliderFlags.AlwaysClamp)) ImGuiSliderFlags.AlwaysClamp
)
)
{ {
Mutable.WindowOpacity = opacityPercent / 100f; Mutable.WindowOpacity = opacityPercent / 100f;
} }
@@ -258,24 +296,38 @@ internal sealed class ThemeAndLayout : ISettingsTab
private void DrawTimestampStyleSection() private void DrawTimestampStyleSection()
{ {
using var tree = ImRaii.TreeNode(HellionStrings.Settings_ThemeAndLayout_TimestampStyle_Heading); using var tree = ImRaii.TreeNode(
HellionStrings.Settings_ThemeAndLayout_TimestampStyle_Heading
);
if (!tree.Success) if (!tree.Success)
return; return;
using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false)) using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
{ {
ImGui.Checkbox(Language.Options_PrettierTimestamps_Name, ref Mutable.PrettierTimestamps); ImGui.Checkbox(
Language.Options_PrettierTimestamps_Name,
ref Mutable.PrettierTimestamps
);
ImGuiUtil.HelpMarker(Language.Options_PrettierTimestamps_Description); ImGuiUtil.HelpMarker(Language.Options_PrettierTimestamps_Description);
if (Mutable.PrettierTimestamps) if (Mutable.PrettierTimestamps)
{ {
ImGui.Checkbox(Language.Options_MoreCompactPretty_Name, ref Mutable.MoreCompactPretty); ImGui.Checkbox(
Language.Options_MoreCompactPretty_Name,
ref Mutable.MoreCompactPretty
);
ImGuiUtil.HelpMarker(Language.Options_MoreCompactPretty_Description); ImGuiUtil.HelpMarker(Language.Options_MoreCompactPretty_Description);
ImGui.Checkbox(HellionStrings.Appearance_UseCompactDensity_Name, ref Mutable.UseCompactDensity); ImGui.Checkbox(
HellionStrings.Appearance_UseCompactDensity_Name,
ref Mutable.UseCompactDensity
);
ImGuiUtil.HelpMarker(HellionStrings.Appearance_UseCompactDensity_Description); ImGuiUtil.HelpMarker(HellionStrings.Appearance_UseCompactDensity_Description);
ImGui.Checkbox(Language.Options_HideSameTimestamps_Name, ref Mutable.HideSameTimestamps); ImGui.Checkbox(
Language.Options_HideSameTimestamps_Name,
ref Mutable.HideSameTimestamps
);
ImGuiUtil.HelpMarker(Language.Options_HideSameTimestamps_Description); ImGuiUtil.HelpMarker(Language.Options_HideSameTimestamps_Description);
} }
+26 -7
View File
@@ -16,14 +16,21 @@ internal static class ThemeMockup
var c = theme.Colors; var c = theme.Colors;
// Window-Bg // Window-Bg
draw.AddRectFilled(origin, origin + size, ColourUtil.RgbaToAbgr(c.WindowBg | 0xFFu), theme.Layout.WindowRounding); draw.AddRectFilled(
origin,
origin + size,
ColourUtil.RgbaToAbgr(c.WindowBg | 0xFFu),
theme.Layout.WindowRounding
);
// Title-Bar // Title-Bar
var titleHeight = 14f; var titleHeight = 14f;
draw.AddRectFilled( draw.AddRectFilled(
origin, origin,
new Vector2(origin.X + size.X, origin.Y + titleHeight), new Vector2(origin.X + size.X, origin.Y + titleHeight),
ColourUtil.RgbaToAbgr(c.Identity), theme.Layout.WindowRounding); ColourUtil.RgbaToAbgr(c.Identity),
theme.Layout.WindowRounding
);
// Tab-Bar — 3 Mini-Tabs // Tab-Bar — 3 Mini-Tabs
var tabY = origin.Y + titleHeight + 4f; var tabY = origin.Y + titleHeight + 4f;
@@ -35,14 +42,17 @@ internal static class ThemeMockup
draw.AddRectFilled( draw.AddRectFilled(
new Vector2(tabX, tabY), new Vector2(tabX, tabY),
new Vector2(tabX + 26f, tabY + tabHeight), new Vector2(tabX + 26f, tabY + tabHeight),
ColourUtil.RgbaToAbgr(color), theme.Layout.TabRounding); ColourUtil.RgbaToAbgr(color),
theme.Layout.TabRounding
);
if (i == 0) // Active-Pill if (i == 0) // Active-Pill
{ {
draw.AddRectFilled( draw.AddRectFilled(
new Vector2(tabX, tabY + tabHeight - 2f), new Vector2(tabX, tabY + tabHeight - 2f),
new Vector2(tabX + 26f, tabY + tabHeight), new Vector2(tabX + 26f, tabY + tabHeight),
ColourUtil.RgbaToAbgr(c.Primary)); ColourUtil.RgbaToAbgr(c.Primary)
);
} }
} }
@@ -52,7 +62,9 @@ internal static class ThemeMockup
draw.AddRectFilled( draw.AddRectFilled(
new Vector2(origin.X + 6f, rowY), new Vector2(origin.X + 6f, rowY),
new Vector2(origin.X + size.X - 6f, rowY + rowHeight), new Vector2(origin.X + size.X - 6f, rowY + rowHeight),
ColourUtil.RgbaToAbgr(c.Surface), 2f); ColourUtil.RgbaToAbgr(c.Surface),
2f
);
// Akzent-Button rechts unten // Akzent-Button rechts unten
var btnW = 28f; var btnW = 28f;
@@ -62,9 +74,16 @@ internal static class ThemeMockup
draw.AddRectFilled( draw.AddRectFilled(
new Vector2(btnX, btnY), new Vector2(btnX, btnY),
new Vector2(btnX + btnW, btnY + btnH), new Vector2(btnX + btnW, btnY + btnH),
ColourUtil.RgbaToAbgr(c.Accent), theme.Layout.FrameRounding); ColourUtil.RgbaToAbgr(c.Accent),
theme.Layout.FrameRounding
);
// Border um das gesamte Mockup // Border um das gesamte Mockup
draw.AddRect(origin, origin + size, ColourUtil.RgbaToAbgr(c.Border), theme.Layout.WindowRounding); draw.AddRect(
origin,
origin + size,
ColourUtil.RgbaToAbgr(c.Border),
theme.Layout.WindowRounding
);
} }
} }
+83 -20
View File
@@ -1,7 +1,7 @@
using Dalamud.Bindings.ImGui;
using Dalamud.Interface.Utility.Raii;
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;
@@ -42,22 +42,42 @@ internal sealed class Window : ISettingsTab
ImGui.Checkbox(Language.Options_HideChat_Name, ref Mutable.HideChat); ImGui.Checkbox(Language.Options_HideChat_Name, ref Mutable.HideChat);
ImGuiUtil.HelpMarker(Language.Options_HideChat_Description); ImGuiUtil.HelpMarker(Language.Options_HideChat_Description);
ImGui.Checkbox(Language.Options_HideDuringCutscenes_Name, ref Mutable.HideDuringCutscenes); ImGui.Checkbox(
ImGuiUtil.HelpMarker(string.Format(Language.Options_HideDuringCutscenes_Description, Plugin.PluginName)); Language.Options_HideDuringCutscenes_Name,
ref Mutable.HideDuringCutscenes
);
ImGuiUtil.HelpMarker(
string.Format(Language.Options_HideDuringCutscenes_Description, Plugin.PluginName)
);
ImGui.Checkbox(Language.Options_HideWhenNotLoggedIn_Name, ref Mutable.HideWhenNotLoggedIn); ImGui.Checkbox(
ImGuiUtil.HelpMarker(string.Format(Language.Options_HideWhenNotLoggedIn_Description, Plugin.PluginName)); Language.Options_HideWhenNotLoggedIn_Name,
ref Mutable.HideWhenNotLoggedIn
);
ImGuiUtil.HelpMarker(
string.Format(Language.Options_HideWhenNotLoggedIn_Description, Plugin.PluginName)
);
ImGui.Checkbox(Language.Options_HideWhenUiHidden_Name, ref Mutable.HideWhenUiHidden); ImGui.Checkbox(Language.Options_HideWhenUiHidden_Name, ref Mutable.HideWhenUiHidden);
ImGuiUtil.HelpMarker(string.Format(Language.Options_HideWhenUiHidden_Description, Plugin.PluginName)); ImGuiUtil.HelpMarker(
string.Format(Language.Options_HideWhenUiHidden_Description, Plugin.PluginName)
);
ImGui.Checkbox(Language.Options_HideInLoadingScreens_Name, ref Mutable.HideInLoadingScreens); ImGui.Checkbox(
ImGuiUtil.HelpMarker(string.Format(Language.Options_HideInLoadingScreens_Description, Plugin.PluginName)); Language.Options_HideInLoadingScreens_Name,
ref Mutable.HideInLoadingScreens
);
ImGuiUtil.HelpMarker(
string.Format(Language.Options_HideInLoadingScreens_Description, Plugin.PluginName)
);
ImGui.Checkbox(Language.Options_HideInBattle_Name, ref Mutable.HideInBattle); ImGui.Checkbox(Language.Options_HideInBattle_Name, ref Mutable.HideInBattle);
ImGuiUtil.HelpMarker(Language.Options_HideInBattle_Description); ImGuiUtil.HelpMarker(Language.Options_HideInBattle_Description);
ImGui.Checkbox(Language.Options_HideInNewGamePlusMenu_Name, ref Mutable.HideInNewGamePlusMenu); ImGui.Checkbox(
Language.Options_HideInNewGamePlusMenu_Name,
ref Mutable.HideInNewGamePlusMenu
);
ImGuiUtil.HelpMarker(Language.Options_HideInNewGamePlusMenu_Description); ImGuiUtil.HelpMarker(Language.Options_HideInNewGamePlusMenu_Description);
} }
} }
@@ -80,13 +100,22 @@ internal sealed class Window : ISettingsTab
return; return;
} }
ImGuiUtil.InputIntVertical(Language.Options_InactivityHideTimeout_Name, Language.Options_InactivityHideTimeout_Description, ref Mutable.InactivityHideTimeout, 1, 10); ImGuiUtil.InputIntVertical(
Language.Options_InactivityHideTimeout_Name,
Language.Options_InactivityHideTimeout_Description,
ref Mutable.InactivityHideTimeout,
1,
10
);
// Untergrenze von 2 Sekunden gegen Selbst-Soft-Lock. // Untergrenze von 2 Sekunden gegen Selbst-Soft-Lock.
Mutable.InactivityHideTimeout = Math.Max(2, Mutable.InactivityHideTimeout); Mutable.InactivityHideTimeout = Math.Max(2, Mutable.InactivityHideTimeout);
using (ImRaii.Disabled(Mutable.HideInBattle)) using (ImRaii.Disabled(Mutable.HideInBattle))
{ {
ImGui.Checkbox(Language.Options_InactivityHideActiveDuringBattle_Name, ref Mutable.InactivityHideActiveDuringBattle); ImGui.Checkbox(
Language.Options_InactivityHideActiveDuringBattle_Name,
ref Mutable.InactivityHideActiveDuringBattle
);
ImGuiUtil.HelpMarker(Language.Options_InactivityHideActiveDuringBattle_Description); ImGuiUtil.HelpMarker(Language.Options_InactivityHideActiveDuringBattle_Description);
} }
@@ -96,7 +125,12 @@ internal sealed class Window : ISettingsTab
return; return;
} }
if (ImGuiUtil.CtrlShiftButton(Language.Options_InactivityHideChannels_All_Label, Language.Options_InactivityHideChannels_Button_Tooltip)) if (
ImGuiUtil.CtrlShiftButton(
Language.Options_InactivityHideChannels_All_Label,
Language.Options_InactivityHideChannels_Button_Tooltip
)
)
{ {
Mutable.InactivityHideChannelsV2 = TabsUtil.AllChannels(); Mutable.InactivityHideChannelsV2 = TabsUtil.AllChannels();
Mutable.InactivityHideExtraChatAll = true; Mutable.InactivityHideExtraChatAll = true;
@@ -104,7 +138,12 @@ internal sealed class Window : ISettingsTab
} }
ImGui.SameLine(); ImGui.SameLine();
if (ImGuiUtil.CtrlShiftButton(Language.Options_InactivityHideChannels_None_Label, Language.Options_InactivityHideChannels_Button_Tooltip)) if (
ImGuiUtil.CtrlShiftButton(
Language.Options_InactivityHideChannels_None_Label,
Language.Options_InactivityHideChannels_Button_Tooltip
)
)
{ {
Mutable.InactivityHideChannelsV2 = []; Mutable.InactivityHideChannelsV2 = [];
Mutable.InactivityHideExtraChatAll = false; Mutable.InactivityHideExtraChatAll = false;
@@ -113,8 +152,15 @@ internal sealed class Window : ISettingsTab
ImGui.Spacing(); ImGui.Spacing();
ImGuiUtil.ChannelSelector(Language.Options_Tabs_Channels, Mutable.InactivityHideChannelsV2); ImGuiUtil.ChannelSelector(
ImGuiUtil.ExtraChatSelector(Language.Options_Tabs_ExtraChatChannels, ref Mutable.InactivityHideExtraChatAll, Mutable.InactivityHideExtraChatChannels); Language.Options_Tabs_Channels,
Mutable.InactivityHideChannelsV2
);
ImGuiUtil.ExtraChatSelector(
Language.Options_Tabs_ExtraChatChannels,
ref Mutable.InactivityHideExtraChatAll,
Mutable.InactivityHideExtraChatChannels
);
} }
} }
@@ -132,7 +178,10 @@ internal sealed class Window : ISettingsTab
ImGui.Checkbox(Language.Options_CanResize_Name, ref Mutable.CanResize); ImGui.Checkbox(Language.Options_CanResize_Name, ref Mutable.CanResize);
// v0.6.0 — global master switch for the pop-out input bar. // v0.6.0 — global master switch for the pop-out input bar.
ImGui.Checkbox(HellionStrings.Settings_Window_PopOutInputEnabled_Name, ref Mutable.PopOutInputEnabled); ImGui.Checkbox(
HellionStrings.Settings_Window_PopOutInputEnabled_Name,
ref Mutable.PopOutInputEnabled
);
ImGuiUtil.HelpMarker(HellionStrings.Settings_Window_PopOutInputEnabled_Description); ImGuiUtil.HelpMarker(HellionStrings.Settings_Window_PopOutInputEnabled_Description);
ImGui.Spacing(); ImGui.Spacing();
@@ -156,12 +205,26 @@ internal sealed class Window : ISettingsTab
using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false)) using (ImRaii.PushIndent(ImGui.GetStyle().IndentSpacing, false))
{ {
ImGui.Checkbox(Language.Options_NativeItemTooltips_Name, ref Mutable.NativeItemTooltips); ImGui.Checkbox(
ImGuiUtil.HelpMarker(string.Format(Language.Options_NativeItemTooltips_Description, Plugin.PluginName)); Language.Options_NativeItemTooltips_Name,
ref Mutable.NativeItemTooltips
);
ImGuiUtil.HelpMarker(
string.Format(Language.Options_NativeItemTooltips_Description, Plugin.PluginName)
);
if (Mutable.NativeItemTooltips) if (Mutable.NativeItemTooltips)
{ {
ImGuiUtil.DragFloatVertical(Language.Options_TooltipOffset_Name, Language.Options_TooltipOffset_Desc, ref Mutable.TooltipOffset, 1, 0f, 400f, $"{Mutable.TooltipOffset:N0}px", ImGuiSliderFlags.AlwaysClamp); ImGuiUtil.DragFloatVertical(
Language.Options_TooltipOffset_Name,
Language.Options_TooltipOffset_Desc,
ref Mutable.TooltipOffset,
1,
0f,
400f,
$"{Mutable.TooltipOffset:N0}px",
ImGuiSliderFlags.AlwaysClamp
);
} }
} }
} }
+24 -9
View File
@@ -35,7 +35,8 @@ internal sealed class StatusBar
{ {
// InvariantCulture: User-System-Locale darf das Format nicht // InvariantCulture: User-System-Locale darf das Format nicht
// verändern (de_DE würde sonst "1,2k" statt "1.2k" liefern). // verändern (de_DE würde sonst "1,2k" statt "1.2k" liefern).
var msgPart = messages >= 1000 var msgPart =
messages >= 1000
? string.Format(CultureInfo.InvariantCulture, "{0:0.0}k msg", messages / 1000.0) ? string.Format(CultureInfo.InvariantCulture, "{0:0.0}k msg", messages / 1000.0)
: $"{messages} msg"; : $"{messages} msg";
var tabsPart = $"{tabs} {(tabs == 1 ? "tab" : "tabs")}"; var tabsPart = $"{tabs} {(tabs == 1 ? "tab" : "tabs")}";
@@ -48,7 +49,8 @@ internal sealed class StatusBar
/// </summary> /// </summary>
public static string FormatTells(int count) public static string FormatTells(int count)
{ {
if (count <= 0) return string.Empty; if (count <= 0)
return string.Empty;
return $"{count} {(count == 1 ? "tell" : "tells")}"; return $"{count} {(count == 1 ? "tell" : "tells")}";
} }
@@ -56,11 +58,13 @@ internal sealed class StatusBar
// helper so a future LINQ regression gets pinned by xUnit. // helper so a future LINQ regression gets pinned by xUnit.
internal static (int messages, int tells) AggregateForStatusBar(IList<Tab> tabs) internal static (int messages, int tells) AggregateForStatusBar(IList<Tab> tabs)
{ {
int messages = 0, tells = 0; int messages = 0,
tells = 0;
foreach (var t in tabs) foreach (var t in tabs)
{ {
messages += t.Messages.Count; messages += t.Messages.Count;
if (t.IsTempTab) tells++; if (t.IsTempTab)
tells++;
} }
return (messages, tells); return (messages, tells);
} }
@@ -69,7 +73,12 @@ internal sealed class StatusBar
/// Test-Hook: Cache-Logic ohne reale Time-Source verifizieren. /// Test-Hook: Cache-Logic ohne reale Time-Source verifizieren.
/// Nicht für Production-Render. /// Nicht für Production-Render.
/// </summary> /// </summary>
internal (string counts, string tells) SnapshotForTest(long now, int tabs, int messages, int tells) internal (string counts, string tells) SnapshotForTest(
long now,
int tabs,
int messages,
int tells
)
{ {
UpdateCacheIfDue(now, tabs, messages, tells); UpdateCacheIfDue(now, tabs, messages, tells);
return (_cachedCountsText, _cachedTellsText); return (_cachedCountsText, _cachedTellsText);
@@ -105,11 +114,14 @@ internal sealed class StatusBar
var cursorY = ImGui.GetCursorScreenPos().Y; var cursorY = ImGui.GetCursorScreenPos().Y;
var winLeft = ImGui.GetWindowPos().X; var winLeft = ImGui.GetWindowPos().X;
var winRight = winLeft + ImGui.GetWindowSize().X; var winRight = winLeft + ImGui.GetWindowSize().X;
ImGui.GetWindowDrawList().AddLine( ImGui
.GetWindowDrawList()
.AddLine(
new Vector2(winLeft, cursorY), new Vector2(winLeft, cursorY),
new Vector2(winRight, cursorY), new Vector2(winRight, cursorY),
ColourUtil.RgbaToAbgr(theme.Colors.Border), ColourUtil.RgbaToAbgr(theme.Colors.Border),
1f); 1f
);
ImGui.Dummy(new Vector2(0, 2)); // BorderTop-Spacing ImGui.Dummy(new Vector2(0, 2)); // BorderTop-Spacing
@@ -169,10 +181,13 @@ internal sealed class StatusBar
{ {
var pos = ImGui.GetCursorScreenPos(); var pos = ImGui.GetCursorScreenPos();
const float radius = 4f; const float radius = 4f;
ImGui.GetWindowDrawList().AddCircleFilled( ImGui
.GetWindowDrawList()
.AddCircleFilled(
new Vector2(pos.X + radius, pos.Y + ImGui.GetTextLineHeight() / 2f), new Vector2(pos.X + radius, pos.Y + ImGui.GetTextLineHeight() / 2f),
radius, radius,
ColourUtil.RgbaToAbgr(rgba)); ColourUtil.RgbaToAbgr(rgba)
);
ImGui.Dummy(new Vector2(radius * 2 + 4, ImGui.GetTextLineHeight())); ImGui.Dummy(new Vector2(radius * 2 + 4, ImGui.GetTextLineHeight()));
} }
+24 -6
View File
@@ -18,23 +18,41 @@ internal static class TabIconGlyphResolver
/// Reihenfolge ist die UI-Reihenfolge im Settings-Tab Icon-Combobox. /// Reihenfolge ist die UI-Reihenfolge im Settings-Tab Icon-Combobox.
/// </summary> /// </summary>
public static readonly IReadOnlyList<string> PickerOptions = public static readonly IReadOnlyList<string> PickerOptions =
["comment", "comments", "cog", "users", "user-friends", "link", [
"envelope", "clock", "hashtag", "star", "heart", "bell", "comment",
"bookmark", "flag", "fire"]; "comments",
"cog",
"users",
"user-friends",
"link",
"envelope",
"clock",
"hashtag",
"star",
"heart",
"bell",
"bookmark",
"flag",
"fire",
];
/// <summary> /// <summary>
/// Glyph-Set, das überhaupt als Override akzeptiert wird. Aus /// Glyph-Set, das überhaupt als Override akzeptiert wird. Aus
/// <see cref="PickerOptions"/> abgeleitet — KnownGlyphs nie /// <see cref="PickerOptions"/> abgeleitet — KnownGlyphs nie
/// manuell pflegen. /// manuell pflegen.
/// </summary> /// </summary>
private static readonly HashSet<string> KnownGlyphs = private static readonly HashSet<string> KnownGlyphs = new(
new(PickerOptions, StringComparer.OrdinalIgnoreCase); PickerOptions,
StringComparer.OrdinalIgnoreCase
);
/// <summary> /// <summary>
/// Tab-Name → Default-Glyph-Name. Tab.Name wird per Lokalisierung /// Tab-Name → Default-Glyph-Name. Tab.Name wird per Lokalisierung
/// gesetzt; wir matchen daher gegen einen Pool aus DE/EN-Synonymen. /// gesetzt; wir matchen daher gegen einen Pool aus DE/EN-Synonymen.
/// </summary> /// </summary>
private static readonly Dictionary<string, string> NameDefaults = new(StringComparer.OrdinalIgnoreCase) private static readonly Dictionary<string, string> NameDefaults = new(
StringComparer.OrdinalIgnoreCase
)
{ {
["allgemein"] = "comment", ["allgemein"] = "comment",
["general"] = "comment", ["general"] = "comment",
+4 -4
View File
@@ -27,7 +27,9 @@ internal static class TabIconMapping
/// zurück (degraded, kein Crash). Build-Time-Enforcement ist nicht /// zurück (degraded, kein Crash). Build-Time-Enforcement ist nicht
/// möglich, weil PickerOptions ohne Dalamud-Reference auskommt. /// möglich, weil PickerOptions ohne Dalamud-Reference auskommt.
/// </summary> /// </summary>
private static readonly Dictionary<string, FontAwesomeIcon> GlyphLookup = new(StringComparer.OrdinalIgnoreCase) private static readonly Dictionary<string, FontAwesomeIcon> GlyphLookup = new(
StringComparer.OrdinalIgnoreCase
)
{ {
["comment"] = FontAwesomeIcon.Comment, ["comment"] = FontAwesomeIcon.Comment,
["comments"] = FontAwesomeIcon.Comments, ["comments"] = FontAwesomeIcon.Comments,
@@ -65,8 +67,6 @@ internal static class TabIconMapping
} }
var glyph = TabIconGlyphResolver.ResolveGlyphName(tab, autoTellGlyph); var glyph = TabIconGlyphResolver.ResolveGlyphName(tab, autoTellGlyph);
return GlyphLookup.TryGetValue(glyph, out var icon) return GlyphLookup.TryGetValue(glyph, out var icon) ? icon : FontAwesomeIcon.Hashtag;
? icon
: FontAwesomeIcon.Hashtag;
} }
} }
+4 -2
View File
@@ -23,9 +23,11 @@ internal static class TabTintCache
{ {
var name = tab.TellTarget.Name; var name = tab.TellTarget.Name;
var world = tab.TellTarget.World; var world = tab.TellTarget.World;
if (tab._cachedTellIcon is null if (
tab._cachedTellIcon is null
|| tab._cachedIconTellName != name || tab._cachedIconTellName != name
|| tab._cachedIconTellWorld != world) || tab._cachedIconTellWorld != world
)
{ {
tab._cachedIconTellName = name; tab._cachedIconTellName = name;
tab._cachedIconTellWorld = world; tab._cachedIconTellWorld = world;
+69 -27
View File
@@ -7,7 +7,6 @@ using Lumina.Excel;
using Lumina.Text.Payloads; using Lumina.Text.Payloads;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
using Pidgin; using Pidgin;
using static Pidgin.Parser; using static Pidgin.Parser;
using static Pidgin.Parser<char>; using static Pidgin.Parser<char>;
@@ -26,14 +25,18 @@ internal static class AutoTranslate
private static Parser<char, (string name, Maybe<IEnumerable<ISelectorPart>> selector)> Parser() private static Parser<char, (string name, Maybe<IEnumerable<ISelectorPart>> selector)> Parser()
{ {
var sheetName = Any var sheetName = Any.AtLeastOnceUntil(Lookahead(Char('[').IgnoreResult().Or(End)))
.AtLeastOnceUntil(Lookahead(Char('[').IgnoreResult().Or(End)))
.Select(string.Concat) .Select(string.Concat)
.Labelled("sheetName"); .Labelled("sheetName");
var numPair = Map(ISelectorPart (first, second) => var numPair = Map(
new IndexRange(uint.Parse(string.Concat(first)), uint.Parse(string.Concat(second))), ISelectorPart (first, second) =>
new IndexRange(
uint.Parse(string.Concat(first)),
uint.Parse(string.Concat(second))
),
Digit.AtLeastOnce().Before(Char('-')), Digit.AtLeastOnce().Before(Char('-')),
Digit.AtLeastOnce()) Digit.AtLeastOnce()
)
.Labelled("numPair"); .Labelled("numPair");
var singleRow = Digit var singleRow = Digit
.AtLeastOnce() .AtLeastOnce()
@@ -43,14 +46,11 @@ internal static class AutoTranslate
.Then(Digit.AtLeastOnce()) .Then(Digit.AtLeastOnce())
.Select(string.Concat) .Select(string.Concat)
.Select(ISelectorPart (num) => new ColumnSpecifier(uint.Parse(num))); .Select(ISelectorPart (num) => new ColumnSpecifier(uint.Parse(num)));
var noun = String("noun") var noun = String("noun").Select(ISelectorPart (_) => new NounMarker());
.Select(ISelectorPart (_) => new NounMarker());
var selectorItems = OneOf(Try(numPair), singleRow, column, noun) var selectorItems = OneOf(Try(numPair), singleRow, column, noun)
.Separated(Char(',')) .Separated(Char(','))
.Labelled("selectorItems"); .Labelled("selectorItems");
var selector = selectorItems var selector = selectorItems.Between(Char('['), Char(']')).Labelled("selector");
.Between(Char('['), Char(']'))
.Labelled("selector");
return Map((name, sel) => (name, sel), sheetName, selector.Optional()); return Map((name, sel) => (name, sel), sheetName, selector.Optional());
} }
@@ -90,7 +90,16 @@ internal static class AutoTranslate
var list = new List<AutoTranslateEntry>(); var list = new List<AutoTranslateEntry>();
foreach (var row in Sheets.CompletionSheet) foreach (var row in Sheets.CompletionSheet)
{ {
var lookup = string.Concat(row.LookupTable.Select(p => p.Type == ReadOnlySePayloadType.Text ? Encoding.UTF8.GetString(p.Body.Span) : p.MacroCode == MacroCode.Num && p.TryGetExpression(out var num) && num.TryGetInt(out var val) ? val.ToString(CultureInfo.InvariantCulture) : ",,,unexpected macro code,,,")); var lookup = string.Concat(
row.LookupTable.Select(p =>
p.Type == ReadOnlySePayloadType.Text ? Encoding.UTF8.GetString(p.Body.Span)
: p.MacroCode == MacroCode.Num
&& p.TryGetExpression(out var num)
&& num.TryGetInt(out var val)
? val.ToString(CultureInfo.InvariantCulture)
: ",,,unexpected macro code,,,"
)
);
try try
{ {
if (lookup is not ("" or "@")) if (lookup is not ("" or "@"))
@@ -158,7 +167,14 @@ internal static class AutoTranslate
var rawName = rowParser.ReadStringColumn(col); var rawName = rowParser.ReadStringColumn(col);
if (!rawName.IsEmpty) if (!rawName.IsEmpty)
{ {
list.Add(new AutoTranslateEntry(row.Group, (uint)i, rawName.ToString(), string.Empty)); list.Add(
new AutoTranslateEntry(
row.Group,
(uint)i,
rawName.ToString(),
string.Empty
)
);
if (shouldAdd) if (shouldAdd)
ValidEntries.Add((row.Group, (uint)i)); ValidEntries.Add((row.Group, (uint)i));
@@ -172,7 +188,14 @@ internal static class AutoTranslate
if (row.Text.IsEmpty) if (row.Text.IsEmpty)
continue; continue;
list.Add(new AutoTranslateEntry(row.Group, row.RowId, row.Text.ToString(), row.GroupTitle.ToString())); list.Add(
new AutoTranslateEntry(
row.Group,
row.RowId,
row.Text.ToString(),
row.GroupTitle.ToString()
)
);
if (shouldAdd) if (shouldAdd)
ValidEntries.Add((row.Group, row.RowId)); ValidEntries.Add((row.Group, row.RowId));
@@ -220,16 +243,16 @@ internal static class AutoTranslate
if (sort) if (sort)
{ {
return wholeMatches.OrderBy(entry => entry.Text, StringComparer.OrdinalIgnoreCase) return wholeMatches
.Concat(prefixMatches.OrderBy(entry => entry.Text, StringComparer.OrdinalIgnoreCase)) .OrderBy(entry => entry.Text, StringComparer.OrdinalIgnoreCase)
.Concat(
prefixMatches.OrderBy(entry => entry.Text, StringComparer.OrdinalIgnoreCase)
)
.Concat(otherMatches.OrderBy(entry => entry.Text, StringComparer.OrdinalIgnoreCase)) .Concat(otherMatches.OrderBy(entry => entry.Text, StringComparer.OrdinalIgnoreCase))
.ToList(); .ToList();
} }
return wholeMatches return wholeMatches.Concat(prefixMatches).Concat(otherMatches).ToList();
.Concat(prefixMatches)
.Concat(otherMatches)
.ToList();
} }
internal static void ReplaceWithPayload(ref byte[] bytes) internal static void ReplaceWithPayload(ref byte[] bytes)
@@ -255,7 +278,11 @@ internal static class AutoTranslate
var tag = Encoding.UTF8.GetString(bytes[start..(i + 1)]); var tag = Encoding.UTF8.GetString(bytes[start..(i + 1)]);
var parts = tag[4..^1].Split(',', 2); var parts = tag[4..^1].Split(',', 2);
if (parts.Length == 2 && uint.TryParse(parts[0], out var group) && uint.TryParse(parts[1], out var key)) if (
parts.Length == 2
&& uint.TryParse(parts[0], out var group)
&& uint.TryParse(parts[1], out var key)
)
{ {
bool isValid; bool isValid;
lock (EntriesLock) lock (EntriesLock)
@@ -267,7 +294,13 @@ internal static class AutoTranslate
bytes = new byte[oldBytes.Length + lengthDiff]; bytes = new byte[oldBytes.Length + lengthDiff];
Array.Copy(oldBytes, bytes, start); Array.Copy(oldBytes, bytes, start);
Array.Copy(payload, 0, bytes, start, payload.Length); Array.Copy(payload, 0, bytes, start, payload.Length);
Array.Copy(oldBytes, i + 1, bytes, start + payload.Length, oldBytes.Length - (i + 1)); Array.Copy(
oldBytes,
i + 1,
bytes,
start + payload.Length,
oldBytes.Length - (i + 1)
);
i += lengthDiff; i += lengthDiff;
} }
@@ -278,7 +311,10 @@ internal static class AutoTranslate
// Pure managed comparison via Span avoids the msvcrt.dll P/Invoke, // Pure managed comparison via Span avoids the msvcrt.dll P/Invoke,
// which is fragile under Wine and triggered an extra managed-to- // which is fragile under Wine and triggered an extra managed-to-
// unmanaged copy per check. // unmanaged copy per check.
if (i + search.Length < bytes.Length && bytes.AsSpan(i, search.Length).SequenceEqual(search)) if (
i + search.Length < bytes.Length
&& bytes.AsSpan(i, search.Length).SequenceEqual(search)
)
start = i; start = i;
} }
} }
@@ -309,7 +345,11 @@ internal static class AutoTranslate
var tag = Encoding.UTF8.GetString(bytes[..(i + 1)]); var tag = Encoding.UTF8.GetString(bytes[..(i + 1)]);
var parts = tag[4..^1].Split(',', 2); var parts = tag[4..^1].Split(',', 2);
if (parts.Length == 2 && uint.TryParse(parts[0], out var group) && uint.TryParse(parts[1], out var key)) if (
parts.Length == 2
&& uint.TryParse(parts[0], out var group)
&& uint.TryParse(parts[1], out var key)
)
{ {
bool isValid; bool isValid;
lock (EntriesLock) lock (EntriesLock)
@@ -317,7 +357,9 @@ internal static class AutoTranslate
if (!isValid) if (!isValid)
return false; return false;
var evaluated = Plugin.Evaluator.Evaluate(new ReadOnlySeString(CreateFixedTranslation(group, key))).ToString(); var evaluated = Plugin
.Evaluator.Evaluate(new ReadOnlySeString(CreateFixedTranslation(group, key)))
.ToString();
if (!evaluated.StartsWith('/')) if (!evaluated.StartsWith('/'))
return false; return false;
@@ -332,8 +374,8 @@ internal static class AutoTranslate
private static byte[] CreateFixedTranslation(uint group, uint key) private static byte[] CreateFixedTranslation(uint group, uint key)
{ {
using var rssb = new RentedSeStringBuilder(); using var rssb = new RentedSeStringBuilder();
return rssb.Builder return rssb
.BeginMacro(MacroCode.Fixed) .Builder.BeginMacro(MacroCode.Fixed)
.AppendUIntExpression(group - 1) .AppendUIntExpression(group - 1)
.AppendUIntExpression(key) .AppendUIntExpression(key)
.EndMacro() .EndMacro()

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