Compare commits
462
Commits
v1.4.9
...
2f762a9410
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2f762a9410 | ||
|
|
bc88fe3431 | ||
|
|
73257328b6 | ||
|
|
1be0730679 | ||
|
|
3c8d8fe1aa | ||
|
|
04169ddcf1 | ||
|
|
eca566321a | ||
|
|
522545c7a2 | ||
|
|
63c68327dd | ||
|
|
0f9ced8f86 | ||
|
|
60e3dd87a2 | ||
|
|
5ab4312cad | ||
|
|
c1d6ca3bbd | ||
|
|
4ab9202533 | ||
|
|
5e15d34eeb | ||
|
|
b9feb8650f | ||
|
|
0f9858a3d3 | ||
|
|
a3379818eb | ||
|
|
d5c7db9f43 | ||
|
|
6e24885241 | ||
|
|
16730d5ed9 | ||
|
|
39e2d91288 | ||
|
|
3309386fbe | ||
|
|
38c6707970 | ||
|
|
a4c4e15c3b | ||
|
|
226174bf12 | ||
|
|
e316a9b400 | ||
|
|
97d31bb8e4 | ||
|
|
89c73be71c | ||
|
|
16557213cd | ||
|
|
5b738e6885 | ||
|
|
52237fda7e | ||
|
|
5958bceb1c | ||
|
|
6fadbb1659 | ||
|
|
dcc8ff1867 | ||
|
|
9e62ed762d | ||
|
|
eeffb5bc6b | ||
|
|
12a445e08f | ||
|
|
8a9692a71d | ||
|
|
3e46600fc3 | ||
|
|
d7a308b522 | ||
|
|
6bdfecb1df | ||
|
|
df6296024b | ||
|
|
6449a51daa | ||
|
|
0abbbc8f8a | ||
|
|
de094a8d4f | ||
|
|
b57ca23b9f | ||
|
|
64f48b1131 | ||
|
|
3b5001e616 | ||
|
|
439c919d77 | ||
|
|
e2b6e7a992 | ||
|
|
80ec7450c8 | ||
|
|
b63e1eda9b | ||
|
|
1604186aa1 | ||
|
|
8fea9113b9 | ||
|
|
0399b68d8c | ||
|
|
63d1b34b00 | ||
|
|
81e4c9367a | ||
|
|
ba16ab59e3 | ||
|
|
611dd368cb | ||
|
|
a841942b41 | ||
|
|
ad7421fbed | ||
|
|
56a9f3f474 | ||
|
|
e810d2479d | ||
|
|
dfc0cda806 | ||
|
|
100290ea4d | ||
|
|
74f9ff7f16 | ||
|
|
0551116a0c | ||
|
|
64f7d9b975 | ||
|
|
81456c981b | ||
|
|
0916f8d1fb | ||
|
|
147034bda5 | ||
|
|
34e343d8f2 | ||
|
|
6d2bb95528 | ||
|
|
58830aecec | ||
|
|
fc67c0852a | ||
|
|
b388dcb2de | ||
|
|
e0c9efca05 | ||
|
|
fdb1a98519 | ||
|
|
9ea9e96145 | ||
|
|
e7b76fb21b | ||
|
|
bbfb9fc630 | ||
|
|
3a1b863def | ||
|
|
5991f49c59 | ||
|
|
b3c0ec73ca | ||
|
|
83306f1f47 | ||
|
|
6bb020547d | ||
|
|
8e38e3e805 | ||
|
|
6829a80ff2 | ||
|
|
e8d06e05fa | ||
|
|
3cb20b6f65 | ||
|
|
75c4acd19a | ||
|
|
1bb968211b | ||
|
|
4f3bdc3c7b | ||
|
|
9b634f54e9 | ||
|
|
4f4f5fc86a | ||
|
|
06ef0bfb1c | ||
|
|
0279a1a9d6 | ||
|
|
1987d745d8 | ||
|
|
e24ea79302 | ||
|
|
1ab7ba8377 | ||
|
|
94af81a961 | ||
|
|
d59ee62223 | ||
|
|
90bf986f76 | ||
|
|
22de2de234 | ||
|
|
6a3bbe2357 | ||
|
|
d0eb2934ed | ||
|
|
125a57167e | ||
|
|
8bf351ba02 | ||
|
|
f205dd4e54 | ||
|
|
d1e12ce866 | ||
|
|
051fd64857 | ||
|
|
9c7be4106d | ||
|
|
d30922af8c | ||
|
|
04f8f1ace8 | ||
|
|
33bcc38581 | ||
|
|
ae9b503776 | ||
|
|
57780351d4 | ||
|
|
7df18bd552 | ||
|
|
05b203c85c | ||
|
|
c1f1c0563c | ||
|
|
8b96ffb2ec | ||
|
|
8ebed6846d | ||
|
|
76416afe3a | ||
|
|
ced7ea0c55 | ||
|
|
2f4518a6b1 | ||
|
|
5a4c3b6707 | ||
|
|
18d43f9afa | ||
|
|
6397916712 | ||
|
|
588b886537 | ||
|
|
64db8986e6 | ||
|
|
0c3023c8cb | ||
|
|
c5a0c4d0d7 | ||
|
|
1c78a84b9b | ||
|
|
f999036e50 | ||
|
|
fa15130468 | ||
|
|
688c05cd77 | ||
|
|
cade398b4e | ||
|
|
cbc4b17e1e | ||
|
|
86992c70f2 | ||
|
|
5b51f7dcfd | ||
|
|
9a31bbba03 | ||
|
|
81b68a1681 | ||
|
|
af242db6f6 | ||
|
|
2686a8f74b | ||
|
|
30c495849d | ||
|
|
ca60c851cd | ||
|
|
d79188c7b0 | ||
|
|
929188e5eb | ||
|
|
891f8ac0ec | ||
|
|
bfc61909cf | ||
|
|
0d6877ddc6 | ||
|
|
a7ed8e1146 | ||
|
|
f2dd49e454 | ||
|
|
918cdc8111 | ||
|
|
5696eac55a | ||
|
|
e4659bc597 | ||
|
|
5caa266287 | ||
|
|
9936638bb3 | ||
|
|
293d56bdbe | ||
|
|
eacefb355d | ||
|
|
464bd52887 | ||
|
|
1e8a60ac80 | ||
|
|
10b345821f | ||
|
|
460217459c | ||
|
|
d6ad81e8ca | ||
|
|
31fa410875 | ||
|
|
bf0c3e2bd7 | ||
|
|
28b97b3f70 | ||
|
|
0ef33934a2 | ||
|
|
39a8e95581 | ||
|
|
3583dfc032 | ||
|
|
c34024a18b | ||
|
|
eaed0b13e0 | ||
|
|
2b4243599e | ||
|
|
24dff3cc2e | ||
|
|
89c66e0d3d | ||
|
|
d2da51a4f7 | ||
|
|
99dca8cb31 | ||
|
|
ce5973aea9 | ||
|
|
fd8e5a1a17 | ||
|
|
d50f2cea90 | ||
|
|
de9d11ba4a | ||
|
|
618e029ff4 | ||
|
|
93f4fbba72 | ||
|
|
1d69d0cc30 | ||
|
|
b048a51534 | ||
|
|
7d2fd1ab65 | ||
|
|
2c5c40524d | ||
|
|
0508a05bab | ||
|
|
32013babaf | ||
|
|
430c8f235a | ||
|
|
68c4e28495 | ||
|
|
458df3b4bd | ||
|
|
6733c7f92e | ||
|
|
fa20b53455 | ||
|
|
ea3f00f107 | ||
|
|
5bdf4217d6 | ||
|
|
97e58934d6 | ||
|
|
f05d7104af | ||
|
|
e98cefa0b2 | ||
|
|
c1765ce8ca | ||
|
|
7ead120213 | ||
|
|
f5ba1c0246 | ||
|
|
b372ab84c3 | ||
|
|
c27785f9f6 | ||
|
|
6f71b09331 | ||
|
|
49f5119b17 | ||
|
|
6578c10b13 | ||
|
|
3878869904 | ||
|
|
88491902eb | ||
|
|
47a49de8c0 | ||
|
|
7b6871fea4 | ||
|
|
8e2d333130 | ||
|
|
4db2ad99b9 | ||
|
|
a73f4d0d0c | ||
|
|
b397591ba4 | ||
|
|
6813b80d58 | ||
|
|
0352e6c199 | ||
|
|
8cbf9c554f | ||
|
|
18834cddae | ||
|
|
fe0414dd2b | ||
|
|
ec92cf2c04 | ||
|
|
512533ed3a | ||
|
|
a2d8a9c223 | ||
|
|
dcf089b886 | ||
|
|
c4562dd6a0 | ||
|
|
74f7bb3fc1 | ||
|
|
8afcb87624 | ||
|
|
f9ed487ae2 | ||
|
|
72099c8871 | ||
|
|
fe766285ad | ||
|
|
8db2dee38c | ||
|
|
a38afbcf67 | ||
|
|
5dfe8e3b49 | ||
|
|
0ca8513065 | ||
|
|
ad635c77c1 | ||
|
|
593eb30c9f | ||
|
|
11ef5951a4 | ||
|
|
c28e3f72a1 | ||
|
|
dc51e295ea | ||
|
|
540cb7ac52 | ||
|
|
1f2c354471 | ||
|
|
ac7f74b227 | ||
|
|
c7047407f5 | ||
|
|
e5a17ee798 | ||
|
|
83de7cd989 | ||
|
|
51c8f79846 | ||
|
|
d40b120b91 | ||
|
|
99901b64ed | ||
|
|
7ef1337ea0 | ||
|
|
a13713752e | ||
|
|
a9f42e32c5 | ||
|
|
e372afc8ac | ||
|
|
b0bee25770 | ||
|
|
92f1736ea9 | ||
|
|
83b1708d5d | ||
|
|
8fcb10cf51 | ||
|
|
71cf6234b5 | ||
|
|
78d56f0e3e | ||
|
|
ca00f528d6 | ||
|
|
a7a5aee982 | ||
|
|
caacb87a6a | ||
|
|
336f722eef | ||
|
|
7792b327dc | ||
|
|
6581943bf1 | ||
|
|
c84891e75d | ||
|
|
6af9e05664 | ||
|
|
ea549ebcd0 | ||
|
|
d33c25e77a | ||
|
|
ad892cbcb6 | ||
|
|
a9e70ce2af | ||
|
|
db47708264 | ||
|
|
e786257cb3 | ||
|
|
b221a6e418 | ||
|
|
0319636fc5 | ||
|
|
b954a19b67 | ||
|
|
29fb4b92eb | ||
|
|
24d3f69041 | ||
|
|
f6749d206b | ||
|
|
d1bfddd9b8 | ||
|
|
cba6a16f8e | ||
|
|
c652a1c450 | ||
|
|
830d247eda | ||
|
|
8431fbcf80 | ||
|
|
931a152d00 | ||
|
|
4fb5ee6128 | ||
|
|
2e143686af | ||
|
|
d6012a9459 | ||
|
|
121c96f79e | ||
|
|
6da8ac93fe | ||
|
|
abc0617d58 | ||
|
|
63f5a28834 | ||
|
|
e46b6a7520 | ||
|
|
2067a54467 | ||
|
|
61a1e6bf87 | ||
|
|
dec0daf30c | ||
|
|
7e541ac842 | ||
|
|
94fdef38ad | ||
|
|
01fc69efda | ||
|
|
f5f9a4e4da | ||
|
|
ced22d73b2 | ||
|
|
d2b2ebf17f | ||
|
|
125a41c6a0 | ||
|
|
dc8d2ae8b7 | ||
|
|
22bf1dd110 | ||
|
|
4595de5efc | ||
|
|
730e15d108 | ||
|
|
545ddfbfcc | ||
|
|
f510d01f46 | ||
|
|
490da3e908 | ||
|
|
262fb3022a | ||
|
|
0512d4c9d2 | ||
|
|
1f9afe182a | ||
|
|
2c23a88e9d | ||
|
|
2507ed5197 | ||
|
|
7e933cb8ba | ||
|
|
26c395419a | ||
|
|
12bf83b826 | ||
|
|
6bbdc67089 | ||
|
|
13ca241ac7 | ||
|
|
304e1aab20 | ||
|
|
cce56610fc | ||
|
|
eed919e961 | ||
|
|
21689655da | ||
|
|
c6f7266194 | ||
|
|
a73cad1534 | ||
|
|
bb37e19176 | ||
|
|
ffef5634ed | ||
|
|
947c4b2061 | ||
|
|
d156ff4c56 | ||
|
|
7979568165 | ||
|
|
93bfd408bc | ||
|
|
e01de0403a | ||
|
|
11eb7b9e90 | ||
|
|
4f81cd1f24 | ||
|
|
8e7149cadc | ||
|
|
2f099fd4e1 | ||
|
|
52b0fa7c67 | ||
|
|
0109bfd222 | ||
|
|
cf4705e01f | ||
|
|
c9e746a8e3 | ||
|
|
ec02a5f381 | ||
|
|
576cd6dafd | ||
|
|
0fc2512f3e | ||
|
|
36afce21e5 | ||
|
|
bdfb1298ad | ||
|
|
eb95968750 | ||
|
|
6ab2e9cece | ||
|
|
0e0c563608 | ||
|
|
9c490fa066 | ||
|
|
44c14ace2c | ||
|
|
53ed154103 | ||
|
|
620dfe9ea0 | ||
|
|
cd9e43c183 | ||
|
|
b8299a90ca | ||
|
|
d89540de52 | ||
|
|
1d3b429f1b | ||
|
|
c640a05a8a | ||
|
|
73a8532e26 | ||
|
|
32840623ff | ||
|
|
2acac78b4c | ||
|
|
ce4c5d9cf9 | ||
|
|
4cf7aa5501 | ||
|
|
0da4751b0f | ||
|
|
ee39fd0eec | ||
|
|
78efd654e6 | ||
|
|
d3cea8c6c0 | ||
|
|
3058e6bc6d | ||
|
|
8a8c6ccae2 | ||
|
|
eafa20748c | ||
|
|
b3fc96f424 | ||
|
|
a18ac130b3 | ||
|
|
c652b102fc | ||
|
|
ba4cd918da | ||
|
|
a6e2a75422 | ||
|
|
d05770fd6d | ||
|
|
921dd701c4 | ||
|
|
ba30b1e742 | ||
|
|
5771573a94 | ||
|
|
d4bcbc93e2 | ||
|
|
ca801a006a | ||
|
|
cc1c05add0 | ||
|
|
969d5e6aa6 | ||
|
|
aaeca76bfd | ||
|
|
4f6c916bd9 | ||
|
|
ce7dda9e48 | ||
|
|
80699b27e4 | ||
|
|
3296a12516 | ||
|
|
81123ccddf | ||
|
|
636a62814f | ||
|
|
b5aebaad35 | ||
|
|
bd75f2453c | ||
|
|
c909d1646b | ||
|
|
5781be2e41 | ||
|
|
65fea0e5f5 | ||
|
|
3de6e4a3cb | ||
|
|
e0289962b1 | ||
|
|
95375c8516 | ||
|
|
36ea8ddcfc | ||
|
|
246f0e2511 | ||
|
|
2e81c42e3b | ||
|
|
a46d89c197 | ||
|
|
57b6ead003 | ||
|
|
a42cc2a97e | ||
|
|
96ff4ddfd8 | ||
|
|
0bfe3a62cb | ||
|
|
01a7f9b4ec | ||
|
|
0237602ab7 | ||
|
|
a600f014eb | ||
|
|
a35067f80a | ||
|
|
74b07519f5 | ||
|
|
8dade8c4b2 | ||
|
|
35e8d3a7fe | ||
|
|
38586db9d8 | ||
|
|
c357873604 | ||
|
|
67bec11f10 | ||
|
|
35efdd4628 | ||
|
|
271a6ae650 | ||
|
|
003bd5c695 | ||
|
|
e1f84a9b10 | ||
|
|
9745abea0c | ||
|
|
1e418ab86f | ||
|
|
1c820b7f53 | ||
|
|
2cc260170e | ||
|
|
de86084dbc | ||
|
|
f56b968768 | ||
|
|
edab5c7a6d | ||
|
|
82cbf4c281 | ||
|
|
00ae81751b | ||
|
|
89384702b4 | ||
|
|
54316313dc | ||
|
|
4059b363a3 | ||
|
|
0220e5d756 | ||
|
|
2315f10d91 | ||
|
|
3283e51381 | ||
|
|
7e960371a3 | ||
|
|
f2a2daf39d | ||
|
|
7d87f1c4fe | ||
|
|
fe84fd558e | ||
|
|
624ad20404 | ||
|
|
54ff88d6d4 | ||
|
|
c955f30422 | ||
|
|
7a1bd1babc | ||
|
|
d0be75e79d | ||
|
|
e0ead86616 | ||
|
|
b66005daea | ||
|
|
0fe66d2c3c | ||
|
|
169168cea9 | ||
|
|
f6d3794d87 | ||
|
|
763f5a3f5d | ||
|
|
8a18f7caaa | ||
|
|
5f7bfb5890 | ||
|
|
3be4e73c27 | ||
|
|
667950c98e | ||
|
|
3e91177833 | ||
|
|
51f18e46a0 | ||
|
|
f66316161b | ||
|
|
679b8f0f5e | ||
|
|
0e470fcdce | ||
|
|
abbbf95002 | ||
|
|
fbbbeebade |
+237
-152
@@ -1,167 +1,252 @@
|
|||||||
[*]
|
# ##############################################################
|
||||||
indent_style=space
|
# #
|
||||||
tab_width=4
|
# # .editorconfig – Hellion Forge / Hellion Media
|
||||||
indent_size=4
|
# #
|
||||||
trim_trailing_whitespace=true
|
# # Überarbeitet: Mai 2026
|
||||||
insert_final_newline=false
|
# #
|
||||||
|
# # Strategie:
|
||||||
|
# # - Standard-.NET-Conventions (private Fields = _camelCase)
|
||||||
|
# # - CSharpier übernimmt die meiste Formatierung
|
||||||
|
# # - Hier: Naming, IDE-Hints, Backup-Format-Regeln
|
||||||
|
# #
|
||||||
|
# # ##############################################################
|
||||||
|
|
||||||
# JetBrains Rider custom properties for code formatting styles
|
root = true
|
||||||
resharper_csharp_brace_style=next_line
|
|
||||||
# Allman für standard Tooling (VS Code)
|
|
||||||
|
# =====================================================
|
||||||
|
# Defaults (alle Files)
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
[*]
|
||||||
|
indent_style = space
|
||||||
|
tab_width = 4
|
||||||
|
indent_size = 4
|
||||||
|
charset = utf-8
|
||||||
|
end_of_line = lf
|
||||||
|
trim_trailing_whitespace = true
|
||||||
|
insert_final_newline = true
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Markdown: Trailing Spaces erlaubt (2 Spaces = <br>)
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
[*.md]
|
||||||
|
trim_trailing_whitespace = false
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# JSON / YAML / Web-Configs: 2-Space-Indent
|
||||||
|
# Konsistent mit yamllint und Prettier-Override
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
[*.{yaml,yml}]
|
||||||
|
indent_size = 2
|
||||||
|
|
||||||
|
[*.{json,jsonc,har,jsb2,jsb3,postman_collection,postman_environment}]
|
||||||
|
indent_size = 2
|
||||||
|
|
||||||
|
[{.babelrc,.eslintrc,.prettierrc,.markdownlintrc,.stylelintrc,bowerrc}]
|
||||||
|
indent_size = 2
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# .NET / XAML / Razor / Resources: 4-Space-Indent
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
[*.{cs,csx,vb,fs,fsi,fsx}]
|
||||||
|
indent_size = 4
|
||||||
|
|
||||||
|
[*.{xml,xsd,xaml,axaml,paml,resx,resw,nuspec,config}]
|
||||||
|
indent_size = 4
|
||||||
|
|
||||||
|
[*.{cshtml,razor,aspx,ascx,asax,master,axaml}]
|
||||||
|
indent_size = 4
|
||||||
|
|
||||||
|
|
||||||
|
# ##############################################################
|
||||||
|
# #
|
||||||
|
# # C# Sektion: Style, Naming, Format
|
||||||
|
# #
|
||||||
|
# ##############################################################
|
||||||
|
|
||||||
|
[*.{cs,csx}]
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# C# Style – var-Präferenz
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
csharp_style_var_for_built_in_types = true:suggestion
|
||||||
|
csharp_style_var_when_type_is_apparent = true:suggestion
|
||||||
|
csharp_style_var_elsewhere = true:suggestion
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# C# Style – Sonstiges
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
# UTF-8 String Literals (C# 11+)
|
||||||
|
csharp_style_prefer_utf8_string_literals = true:suggestion
|
||||||
|
|
||||||
|
# Reihenfolge der Access-Modifier (Microsoft-Empfehlung)
|
||||||
|
csharp_preferred_modifier_order = public, private, protected, internal, file, new, static, abstract, virtual, sealed, readonly, override, extern, unsafe, volatile, async, required:suggestion
|
||||||
|
|
||||||
|
# Initializer: nicht alles auf eine Zeile
|
||||||
|
csharp_new_line_before_members_in_object_initializers = false
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# C# Format – Braces (Backup, falls CSharpier nicht läuft)
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
# Allman Style: Klammern auf neue Zeile
|
||||||
csharp_new_line_before_open_brace = all
|
csharp_new_line_before_open_brace = all
|
||||||
csharp_new_line_before_else = true
|
csharp_new_line_before_else = true
|
||||||
csharp_new_line_before_catch = true
|
csharp_new_line_before_catch = true
|
||||||
csharp_new_line_before_finally = true
|
csharp_new_line_before_finally = true
|
||||||
|
|
||||||
# Switch-Einrückung
|
|
||||||
|
# =====================================================
|
||||||
|
# C# Format – Switch-Einrückung
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
csharp_indent_case_contents = true
|
csharp_indent_case_contents = true
|
||||||
csharp_indent_switch_labels = true
|
csharp_indent_switch_labels = true
|
||||||
|
|
||||||
resharper_csharp_braces_for_foreach=not_required
|
|
||||||
resharper_csharp_braces_for_for=not_required
|
|
||||||
resharper_csharp_braces_for_while=not_required
|
|
||||||
charset=utf-8
|
|
||||||
end_of_line=lf
|
|
||||||
|
|
||||||
# Microsoft .NET properties
|
# =====================================================
|
||||||
csharp_new_line_before_members_in_object_initializers=false
|
# .NET Style – Qualification (kein "this." nötig)
|
||||||
csharp_preferred_modifier_order=public, private, protected, internal, file, new, static, abstract, virtual, sealed, readonly, override, extern, unsafe, volatile, async, required:suggestion
|
# =====================================================
|
||||||
csharp_style_prefer_utf8_string_literals=true:suggestion
|
|
||||||
csharp_style_var_elsewhere=true:suggestion
|
|
||||||
csharp_style_var_for_built_in_types=true:suggestion
|
|
||||||
csharp_style_var_when_type_is_apparent=true:suggestion
|
|
||||||
dotnet_naming_rule.private_constants_rule.import_to_resharper=True
|
|
||||||
dotnet_naming_rule.private_constants_rule.resharper_description=Constant fields (private)
|
|
||||||
dotnet_naming_rule.private_constants_rule.resharper_guid=236f7aa5-7b06-43ca-bf2a-9b31bfcff09a
|
|
||||||
dotnet_naming_rule.private_constants_rule.severity=warning
|
|
||||||
dotnet_naming_rule.private_constants_rule.style=upper_camel_case_style
|
|
||||||
dotnet_naming_rule.private_constants_rule.symbols=private_constants_symbols
|
|
||||||
dotnet_naming_rule.private_instance_fields_rule.import_to_resharper=True
|
|
||||||
dotnet_naming_rule.private_instance_fields_rule.resharper_description=Instance fields (private)
|
|
||||||
dotnet_naming_rule.private_instance_fields_rule.resharper_guid=4a98fdf6-7d98-4f5a-afeb-ea44ad98c70c
|
|
||||||
dotnet_naming_rule.private_instance_fields_rule.severity=warning
|
|
||||||
dotnet_naming_rule.private_instance_fields_rule.style=upper_camel_case_style
|
|
||||||
dotnet_naming_rule.private_instance_fields_rule.symbols=private_instance_fields_symbols
|
|
||||||
dotnet_naming_rule.private_instance_fields_rule_1.import_to_resharper=True
|
|
||||||
dotnet_naming_rule.private_instance_fields_rule_1.resharper_description=Instance fields (private)
|
|
||||||
dotnet_naming_rule.private_instance_fields_rule_1.resharper_guid=4a98fdf6-7d98-4f5a-afeb-ea44ad98c70c
|
|
||||||
dotnet_naming_rule.private_instance_fields_rule_1.severity=warning
|
|
||||||
dotnet_naming_rule.private_instance_fields_rule_1.style=upper_camel_case_style
|
|
||||||
dotnet_naming_rule.private_instance_fields_rule_1.symbols=private_instance_fields_symbols_1
|
|
||||||
dotnet_naming_rule.private_static_fields_rule.import_to_resharper=True
|
|
||||||
dotnet_naming_rule.private_static_fields_rule.resharper_description=Static fields (private)
|
|
||||||
dotnet_naming_rule.private_static_fields_rule.resharper_guid=f9fce829-e6f4-4cb2-80f1-5497c44f51df
|
|
||||||
dotnet_naming_rule.private_static_fields_rule.severity=warning
|
|
||||||
dotnet_naming_rule.private_static_fields_rule.style=upper_camel_case_style
|
|
||||||
dotnet_naming_rule.private_static_fields_rule.symbols=private_static_fields_symbols
|
|
||||||
dotnet_naming_rule.private_static_readonly_rule.import_to_resharper=True
|
|
||||||
dotnet_naming_rule.private_static_readonly_rule.resharper_description=Static readonly fields (private)
|
|
||||||
dotnet_naming_rule.private_static_readonly_rule.resharper_guid=15b5b1f1-457c-4ca6-b278-5615aedc07d3
|
|
||||||
dotnet_naming_rule.private_static_readonly_rule.severity=warning
|
|
||||||
dotnet_naming_rule.private_static_readonly_rule.style=upper_camel_case_style
|
|
||||||
dotnet_naming_rule.private_static_readonly_rule.symbols=private_static_readonly_symbols
|
|
||||||
dotnet_naming_rule.unity_serialized_field_rule.import_to_resharper=True
|
|
||||||
dotnet_naming_rule.unity_serialized_field_rule.resharper_description=Unity serialized field
|
|
||||||
dotnet_naming_rule.unity_serialized_field_rule.resharper_guid=5f0fdb63-c892-4d2c-9324-15c80b22a7ef
|
|
||||||
dotnet_naming_rule.unity_serialized_field_rule.severity=warning
|
|
||||||
dotnet_naming_rule.unity_serialized_field_rule.style=lower_camel_case_style_1
|
|
||||||
dotnet_naming_rule.unity_serialized_field_rule.symbols=unity_serialized_field_symbols
|
|
||||||
dotnet_naming_rule.unity_serialized_field_rule_1.import_to_resharper=True
|
|
||||||
dotnet_naming_rule.unity_serialized_field_rule_1.resharper_description=Unity serialized field
|
|
||||||
dotnet_naming_rule.unity_serialized_field_rule_1.resharper_guid=5f0fdb63-c892-4d2c-9324-15c80b22a7ef
|
|
||||||
dotnet_naming_rule.unity_serialized_field_rule_1.severity=warning
|
|
||||||
dotnet_naming_rule.unity_serialized_field_rule_1.style=lower_camel_case_style_1
|
|
||||||
dotnet_naming_rule.unity_serialized_field_rule_1.symbols=unity_serialized_field_symbols_1
|
|
||||||
dotnet_naming_style.lower_camel_case_style.capitalization=camel_case
|
|
||||||
dotnet_naming_style.lower_camel_case_style.required_prefix=_
|
|
||||||
dotnet_naming_style.lower_camel_case_style_1.capitalization=camel_case
|
|
||||||
dotnet_naming_style.upper_camel_case_style.capitalization=pascal_case
|
|
||||||
dotnet_naming_symbols.private_constants_symbols.applicable_accessibilities=private
|
|
||||||
dotnet_naming_symbols.private_constants_symbols.applicable_kinds=field
|
|
||||||
dotnet_naming_symbols.private_constants_symbols.required_modifiers=const
|
|
||||||
dotnet_naming_symbols.private_constants_symbols.resharper_applicable_kinds=constant_field
|
|
||||||
dotnet_naming_symbols.private_constants_symbols.resharper_required_modifiers=any
|
|
||||||
dotnet_naming_symbols.private_instance_fields_symbols.applicable_accessibilities=private
|
|
||||||
dotnet_naming_symbols.private_instance_fields_symbols.applicable_kinds=field
|
|
||||||
dotnet_naming_symbols.private_instance_fields_symbols.resharper_applicable_kinds=field,readonly_field
|
|
||||||
dotnet_naming_symbols.private_instance_fields_symbols.resharper_required_modifiers=instance
|
|
||||||
dotnet_naming_symbols.private_instance_fields_symbols_1.applicable_accessibilities=private
|
|
||||||
dotnet_naming_symbols.private_instance_fields_symbols_1.applicable_kinds=field
|
|
||||||
dotnet_naming_symbols.private_instance_fields_symbols_1.resharper_applicable_kinds=field,readonly_field
|
|
||||||
dotnet_naming_symbols.private_instance_fields_symbols_1.resharper_required_modifiers=instance
|
|
||||||
dotnet_naming_symbols.private_static_fields_symbols.applicable_accessibilities=private
|
|
||||||
dotnet_naming_symbols.private_static_fields_symbols.applicable_kinds=field
|
|
||||||
dotnet_naming_symbols.private_static_fields_symbols.required_modifiers=static
|
|
||||||
dotnet_naming_symbols.private_static_fields_symbols.resharper_applicable_kinds=field
|
|
||||||
dotnet_naming_symbols.private_static_fields_symbols.resharper_required_modifiers=static
|
|
||||||
dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities=private
|
|
||||||
dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds=field
|
|
||||||
dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers=readonly,static
|
|
||||||
dotnet_naming_symbols.private_static_readonly_symbols.resharper_applicable_kinds=readonly_field
|
|
||||||
dotnet_naming_symbols.private_static_readonly_symbols.resharper_required_modifiers=static
|
|
||||||
dotnet_naming_symbols.unity_serialized_field_symbols.applicable_accessibilities=*
|
|
||||||
dotnet_naming_symbols.unity_serialized_field_symbols.applicable_kinds=
|
|
||||||
dotnet_naming_symbols.unity_serialized_field_symbols.resharper_applicable_kinds=unity_serialised_field
|
|
||||||
dotnet_naming_symbols.unity_serialized_field_symbols.resharper_required_modifiers=instance
|
|
||||||
dotnet_naming_symbols.unity_serialized_field_symbols_1.applicable_accessibilities=*
|
|
||||||
dotnet_naming_symbols.unity_serialized_field_symbols_1.applicable_kinds=
|
|
||||||
dotnet_naming_symbols.unity_serialized_field_symbols_1.resharper_applicable_kinds=unity_serialised_field
|
|
||||||
dotnet_naming_symbols.unity_serialized_field_symbols_1.resharper_required_modifiers=instance
|
|
||||||
dotnet_style_parentheses_in_arithmetic_binary_operators=never_if_unnecessary:none
|
|
||||||
dotnet_style_parentheses_in_other_binary_operators=always_for_clarity:none
|
|
||||||
dotnet_style_parentheses_in_relational_binary_operators=never_if_unnecessary:none
|
|
||||||
dotnet_style_predefined_type_for_locals_parameters_members=true:suggestion
|
|
||||||
dotnet_style_predefined_type_for_member_access=true:suggestion
|
|
||||||
dotnet_style_qualification_for_event=false:suggestion
|
|
||||||
dotnet_style_qualification_for_field=false:suggestion
|
|
||||||
dotnet_style_qualification_for_method=false:suggestion
|
|
||||||
dotnet_style_qualification_for_property=false:suggestion
|
|
||||||
dotnet_style_require_accessibility_modifiers=for_non_interface_members:suggestion
|
|
||||||
|
|
||||||
# ReSharper properties
|
dotnet_style_qualification_for_field = false:suggestion
|
||||||
resharper_autodetect_indent_settings=true
|
dotnet_style_qualification_for_property = false:suggestion
|
||||||
resharper_cpp_insert_final_newline=true
|
dotnet_style_qualification_for_method = false:suggestion
|
||||||
resharper_csharp_insert_final_newline=false
|
dotnet_style_qualification_for_event = false:suggestion
|
||||||
resharper_formatter_off_tag=@formatter:off
|
|
||||||
resharper_formatter_on_tag=@formatter:on
|
|
||||||
resharper_formatter_tags_enabled=true
|
|
||||||
resharper_fsharp_insert_final_newline=false
|
|
||||||
resharper_html_insert_final_newline=false
|
|
||||||
resharper_resx_insert_final_newline=false
|
|
||||||
resharper_shaderlab_insert_final_newline=false
|
|
||||||
resharper_t4_insert_final_newline=false
|
|
||||||
resharper_use_indent_from_vs=false
|
|
||||||
resharper_vb_insert_final_newline=false
|
|
||||||
resharper_xmldoc_insert_final_newline=false
|
|
||||||
resharper_xml_insert_final_newline=false
|
|
||||||
|
|
||||||
# ReSharper inspection severities
|
|
||||||
resharper_arrange_redundant_parentheses_highlighting=hint
|
|
||||||
resharper_arrange_this_qualifier_highlighting=hint
|
|
||||||
resharper_arrange_type_member_modifiers_highlighting=hint
|
|
||||||
resharper_arrange_type_modifiers_highlighting=hint
|
|
||||||
resharper_built_in_type_reference_style_for_member_access_highlighting=hint
|
|
||||||
resharper_built_in_type_reference_style_highlighting=hint
|
|
||||||
resharper_razor_assembly_not_resolved_highlighting=warning
|
|
||||||
resharper_redundant_base_qualifier_highlighting=warning
|
|
||||||
resharper_suggest_var_or_type_built_in_types_highlighting=hint
|
|
||||||
resharper_suggest_var_or_type_elsewhere_highlighting=hint
|
|
||||||
resharper_suggest_var_or_type_simple_types_highlighting=hint
|
|
||||||
resharper_web_config_module_not_resolved_highlighting=warning
|
|
||||||
resharper_web_config_type_not_resolved_highlighting=warning
|
|
||||||
resharper_web_config_wrong_module_highlighting=warning
|
|
||||||
|
|
||||||
[{*.har,*.jsb2,*.jsb3,*.json,*.jsonc,*.postman_collection,*.postman_collection.json,*.postman_environment,*.postman_environment.json,.babelrc,.eslintrc,.prettierrc,.prettierrc.json,.markdownlint.json,.yamllint.json,.stylelintrc,bowerrc,jest.config}]
|
# =====================================================
|
||||||
indent_style=space
|
# .NET Style – Predefined Types (int statt Int32 etc.)
|
||||||
indent_size=2
|
# =====================================================
|
||||||
|
|
||||||
[{*.yaml,*.yml}]
|
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
|
||||||
indent_style=space
|
dotnet_style_predefined_type_for_member_access = true:suggestion
|
||||||
indent_size=2
|
|
||||||
|
|
||||||
[*.{appxmanifest,asax,ascx,aspx,axaml,build,c,c++,c++m,cc,ccm,cginc,compute,cp,cpp,cppm,cs,cshtml,cu,cuh,cxx,cxxm,dtd,fs,fsi,fsscript,fsx,fx,fxh,h,hh,hlsl,hlsli,hlslinc,hpp,hxx,inc,inl,ino,ipp,ixx,master,ml,mli,mpp,mq4,mq5,mqh,mxx,nuspec,paml,razor,resw,resx,shader,skin,tpp,usf,ush,uxml,vb,xaml,xamlx,xoml,xsd}]
|
|
||||||
indent_style=space
|
# =====================================================
|
||||||
indent_size=4
|
# .NET Style – Parentheses
|
||||||
tab_width=4
|
# =====================================================
|
||||||
[*.md]
|
|
||||||
trim_trailing_whitespace=false
|
dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none
|
||||||
|
dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:none
|
||||||
|
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:none
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# .NET Style – Accessibility-Modifier erzwingen
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
|
||||||
|
|
||||||
|
|
||||||
|
# ##############################################################
|
||||||
|
# #
|
||||||
|
# # Naming Conventions (.NET-Standard)
|
||||||
|
# #
|
||||||
|
# # Private Instance Fields: _camelCase
|
||||||
|
# # Private Static Fields: _camelCase
|
||||||
|
# # Private Constants: PascalCase
|
||||||
|
# # Private Static Readonly: PascalCase
|
||||||
|
# #
|
||||||
|
# ##############################################################
|
||||||
|
|
||||||
|
# === Style: Underscore + camelCase ===
|
||||||
|
dotnet_naming_style.underscore_camel_case_style.capitalization = camel_case
|
||||||
|
dotnet_naming_style.underscore_camel_case_style.required_prefix = _
|
||||||
|
|
||||||
|
# === Style: PascalCase ===
|
||||||
|
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
|
||||||
|
|
||||||
|
|
||||||
|
# === Rule: Private Instance Fields → _camelCase ===
|
||||||
|
dotnet_naming_rule.private_instance_fields.severity = warning
|
||||||
|
dotnet_naming_rule.private_instance_fields.symbols = private_instance_fields_symbols
|
||||||
|
dotnet_naming_rule.private_instance_fields.style = underscore_camel_case_style
|
||||||
|
|
||||||
|
dotnet_naming_symbols.private_instance_fields_symbols.applicable_kinds = field
|
||||||
|
dotnet_naming_symbols.private_instance_fields_symbols.applicable_accessibilities = private
|
||||||
|
|
||||||
|
|
||||||
|
# === Rule: Private Static Fields → _camelCase ===
|
||||||
|
dotnet_naming_rule.private_static_fields.severity = warning
|
||||||
|
dotnet_naming_rule.private_static_fields.symbols = private_static_fields_symbols
|
||||||
|
dotnet_naming_rule.private_static_fields.style = underscore_camel_case_style
|
||||||
|
|
||||||
|
dotnet_naming_symbols.private_static_fields_symbols.applicable_kinds = field
|
||||||
|
dotnet_naming_symbols.private_static_fields_symbols.applicable_accessibilities = private
|
||||||
|
dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static
|
||||||
|
|
||||||
|
|
||||||
|
# === Rule: Private Constants → PascalCase ===
|
||||||
|
dotnet_naming_rule.private_constants.severity = warning
|
||||||
|
dotnet_naming_rule.private_constants.symbols = private_constants_symbols
|
||||||
|
dotnet_naming_rule.private_constants.style = pascal_case_style
|
||||||
|
|
||||||
|
dotnet_naming_symbols.private_constants_symbols.applicable_kinds = field
|
||||||
|
dotnet_naming_symbols.private_constants_symbols.applicable_accessibilities = private
|
||||||
|
dotnet_naming_symbols.private_constants_symbols.required_modifiers = const
|
||||||
|
|
||||||
|
|
||||||
|
# === Rule: Private Static Readonly → PascalCase ===
|
||||||
|
dotnet_naming_rule.private_static_readonly.severity = warning
|
||||||
|
dotnet_naming_rule.private_static_readonly.symbols = private_static_readonly_symbols
|
||||||
|
dotnet_naming_rule.private_static_readonly.style = pascal_case_style
|
||||||
|
|
||||||
|
dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field
|
||||||
|
dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private
|
||||||
|
dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static, readonly
|
||||||
|
|
||||||
|
|
||||||
|
# ##############################################################
|
||||||
|
# #
|
||||||
|
# # JetBrains Rider / ReSharper Settings
|
||||||
|
# #
|
||||||
|
# ##############################################################
|
||||||
|
|
||||||
|
# === Brace-Style (für ReSharper-spezifische Formatierung) ===
|
||||||
|
resharper_csharp_brace_style = next_line
|
||||||
|
|
||||||
|
# Kurze Statements ohne Klammern erlaubt (für 1-Zeiler)
|
||||||
|
resharper_csharp_braces_for_foreach = not_required
|
||||||
|
resharper_csharp_braces_for_for = not_required
|
||||||
|
resharper_csharp_braces_for_while = not_required
|
||||||
|
|
||||||
|
# === Auto-Detection und Formatter-Tags ===
|
||||||
|
resharper_autodetect_indent_settings = true
|
||||||
|
resharper_use_indent_from_vs = false
|
||||||
|
|
||||||
|
# Erlaubt @formatter:off / @formatter:on Kommentare im Code
|
||||||
|
resharper_formatter_off_tag = @formatter:off
|
||||||
|
resharper_formatter_on_tag = @formatter:on
|
||||||
|
resharper_formatter_tags_enabled = true
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# ReSharper Inspection Severities
|
||||||
|
# (Hints = blaue Wellen, Warnings = gelb, Errors = rot)
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
# Style-Suggestions: nur als Hint anzeigen
|
||||||
|
resharper_arrange_redundant_parentheses_highlighting = hint
|
||||||
|
resharper_arrange_this_qualifier_highlighting = hint
|
||||||
|
resharper_arrange_type_member_modifiers_highlighting = hint
|
||||||
|
resharper_arrange_type_modifiers_highlighting = hint
|
||||||
|
resharper_built_in_type_reference_style_for_member_access_highlighting = hint
|
||||||
|
resharper_built_in_type_reference_style_highlighting = hint
|
||||||
|
resharper_suggest_var_or_type_built_in_types_highlighting = hint
|
||||||
|
resharper_suggest_var_or_type_elsewhere_highlighting = hint
|
||||||
|
resharper_suggest_var_or_type_simple_types_highlighting = hint
|
||||||
|
|
||||||
|
# Echte Probleme: als Warning
|
||||||
|
resharper_redundant_base_qualifier_highlighting = warning
|
||||||
+47
-16
@@ -1,19 +1,50 @@
|
|||||||
# Local development environment template
|
##############################################################
|
||||||
#
|
##
|
||||||
# Copy this file to `.env` and adjust paths to your setup,
|
## .env.example – Hellion Forge / Hellion Media
|
||||||
# or run: bash scripts/setup-dev-env.sh
|
##
|
||||||
#
|
## Template für lokale Entwicklungsumgebung.
|
||||||
# `.env` is gitignored — never commit your local paths.
|
## Kopiere diese Datei nach `.env` und passe die Pfade
|
||||||
#
|
## an dein Setup an.
|
||||||
# Activate in shell:
|
##
|
||||||
# set -a; source .env; set +a
|
## ⚠️ `.env` ist gitignored – niemals lokale Pfade committen!
|
||||||
#
|
##
|
||||||
# Or use direnv (recommended):
|
##############################################################
|
||||||
# echo 'dotenv .env' > .envrc && direnv allow
|
##
|
||||||
|
## SETUP
|
||||||
|
##
|
||||||
|
## 1) Manuell:
|
||||||
|
## cp .env.example .env
|
||||||
|
## # Pfade in .env anpassen
|
||||||
|
##
|
||||||
|
## 2) Automatisch:
|
||||||
|
## bash scripts/setup-dev-env.sh
|
||||||
|
##
|
||||||
|
## AKTIVIERUNG IN DER SHELL
|
||||||
|
##
|
||||||
|
## Variante A – einmalig pro Shell:
|
||||||
|
## set -a; source .env; set +a
|
||||||
|
##
|
||||||
|
## Variante B – mit direnv (empfohlen):
|
||||||
|
## echo 'dotenv .env' > .envrc
|
||||||
|
## direnv allow
|
||||||
|
##
|
||||||
|
##############################################################
|
||||||
|
|
||||||
# Path to Dalamud development DLLs (Dalamud.dll, FFXIVClientStructs.dll,
|
|
||||||
# Lumina.dll, Lumina.Excel.dll). Required for building ChatTwo.Tests project.
|
# =====================================================
|
||||||
|
# Build & Development Paths
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
# Pfad zu den Dalamud-Development-DLLs:
|
||||||
|
# - Dalamud.dll
|
||||||
|
# - FFXIVClientStructs.dll
|
||||||
|
# - Lumina.dll
|
||||||
|
# - Lumina.Excel.dll
|
||||||
#
|
#
|
||||||
# XIVLauncher Core (Linux): ~/.xlcore/dalamud/Hooks/dev
|
# Wird zum Bauen des HellionChat.Tests-Projekts benötigt.
|
||||||
# XIVLauncher (Windows): %AppData%\XIVLauncher\addon\Hooks\dev
|
#
|
||||||
|
# Standardpfade je nach Plattform:
|
||||||
|
# XIVLauncher Core (Linux): ~/.xlcore/dalamud/Hooks/dev
|
||||||
|
# XIVLauncher (Windows): %AppData%\XIVLauncher\addon\Hooks\dev
|
||||||
|
# XIVLauncher (macOS): ~/Library/Application Support/XIV on Mac/dalamud/Hooks/dev
|
||||||
DALAMUD_HOME=/path/to/dalamud/dev/dlls
|
DALAMUD_HOME=/path/to/dalamud/dev/dlls
|
||||||
|
|||||||
+177
-7
@@ -1,8 +1,178 @@
|
|||||||
# Generated files
|
##############################################################
|
||||||
HellionChat/Resources/Language.*.resx linguist-generated=true
|
##
|
||||||
|
## .gitattributes – Hellion Forge / Hellion Media
|
||||||
|
##
|
||||||
|
## Setup: Linux-First Development
|
||||||
|
## (Hauptentwicklung auf Linux, Target = Dalamud/Windows)
|
||||||
|
## Überarbeitet: Mai 2026
|
||||||
|
##
|
||||||
|
## Strategie:
|
||||||
|
## - Default: Alles LF (Linux-Konvention)
|
||||||
|
## - Windows-Batch-Scripts: CRLF (technische Pflicht!)
|
||||||
|
## - PowerShell: CRLF (Sicherheit für Windows PS 5.1)
|
||||||
|
## - Binärdateien: explizit markiert (gegen Korruption)
|
||||||
|
##
|
||||||
|
## Hinweis:
|
||||||
|
## Moderne Visual-Studio- und MSBuild-Versionen kommen
|
||||||
|
## problemlos mit LF in .sln/.csproj klar.
|
||||||
|
## Falls jemals Probleme auftauchen: hier umstellen.
|
||||||
|
##
|
||||||
|
##############################################################
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Default: Auto-Detect, alles auf LF normalisieren
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
* text=auto eol=lf
|
* text=auto eol=lf
|
||||||
*.cs text eol=lf
|
|
||||||
*.yml text eol=lf
|
|
||||||
*.yaml text eol=lf
|
# =====================================================
|
||||||
*.md text eol=lf
|
# Source Code (LF)
|
||||||
*.json text eol=lf
|
# =====================================================
|
||||||
|
|
||||||
|
*.cs text eol=lf
|
||||||
|
*.csx text eol=lf
|
||||||
|
*.vb text eol=lf
|
||||||
|
*.fs text eol=lf
|
||||||
|
*.fsx text eol=lf
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Configs & Daten (LF)
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
*.json text eol=lf
|
||||||
|
*.yml text eol=lf
|
||||||
|
*.yaml text eol=lf
|
||||||
|
*.xml text eol=lf
|
||||||
|
*.md text eol=lf
|
||||||
|
*.txt text eol=lf
|
||||||
|
*.config text eol=lf
|
||||||
|
*.editorconfig text eol=lf
|
||||||
|
.gitignore text eol=lf
|
||||||
|
.gitattributes text eol=lf
|
||||||
|
.env.example text eol=lf
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Visual Studio / MSBuild Project Files (LF)
|
||||||
|
# Linux-first: moderne Tools kommen mit LF zurecht
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
*.sln text eol=lf
|
||||||
|
*.csproj text eol=lf
|
||||||
|
*.vbproj text eol=lf
|
||||||
|
*.fsproj text eol=lf
|
||||||
|
*.props text eol=lf
|
||||||
|
*.targets text eol=lf
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Resources & Lokalisierung (LF)
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
# Linguist soll generierte Sprachdateien nicht mitzählen
|
||||||
|
HellionChat/Resources/Language.*.resx linguist-generated=true
|
||||||
|
|
||||||
|
*.resx text eol=lf
|
||||||
|
*.resw text eol=lf
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Linux/Mac-Scripts (LF – Pflicht)
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
*.sh text eol=lf
|
||||||
|
*.bash text eol=lf
|
||||||
|
*.zsh text eol=lf
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# >>> AUSNAHMEN <<<
|
||||||
|
# Windows-Scripts brauchen ZWINGEND CRLF.
|
||||||
|
# Mit LF werden diese auf Windows nicht ausgeführt!
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
# Batch-Scripts (cmd.exe braucht CRLF)
|
||||||
|
*.bat text eol=crlf
|
||||||
|
*.cmd text eol=crlf
|
||||||
|
|
||||||
|
# PowerShell (PS 7+ wäre LF-tolerant,
|
||||||
|
# aber Windows PowerShell 5.1 zickt teilweise)
|
||||||
|
*.ps1 text eol=crlf
|
||||||
|
*.psm1 text eol=crlf
|
||||||
|
*.psd1 text eol=crlf
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Binäre Build-Artefakte
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
*.dll binary
|
||||||
|
*.exe binary
|
||||||
|
*.pdb binary
|
||||||
|
*.so binary
|
||||||
|
*.dylib binary
|
||||||
|
*.nupkg binary
|
||||||
|
*.snupkg binary
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Bilder (binary)
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
*.png binary
|
||||||
|
*.jpg binary
|
||||||
|
*.jpeg binary
|
||||||
|
*.gif binary
|
||||||
|
*.ico binary
|
||||||
|
*.bmp binary
|
||||||
|
*.tiff binary
|
||||||
|
*.webp binary
|
||||||
|
|
||||||
|
# SVG ist eigentlich XML – als Text behandeln
|
||||||
|
*.svg text eol=lf
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Fonts (binary)
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
*.ttf binary
|
||||||
|
*.otf binary
|
||||||
|
*.woff binary
|
||||||
|
*.woff2 binary
|
||||||
|
*.eot binary
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Archive (binary)
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
*.zip binary
|
||||||
|
*.7z binary
|
||||||
|
*.tar binary
|
||||||
|
*.gz binary
|
||||||
|
*.rar binary
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Audio / Video (binary)
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
*.wav binary
|
||||||
|
*.mp3 binary
|
||||||
|
*.ogg binary
|
||||||
|
*.mp4 binary
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# FFXIV / Dalamud spezifische Binär-Formate
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
*.tex binary
|
||||||
|
*.pap binary
|
||||||
|
*.avfx binary
|
||||||
|
*.shpk binary
|
||||||
|
*.scd binary
|
||||||
+27
-27
@@ -11,43 +11,43 @@ name: Build
|
|||||||
# Dalamud SDK 15 uses on Linux).
|
# Dalamud SDK 15 uses on Linux).
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [main]
|
branches: [main]
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [main]
|
branches: [main]
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
# Minimum permissions for a build-only workflow: read the repo, nothing
|
# Minimum permissions for a build-only workflow: read the repo, nothing
|
||||||
# else. Closes the CodeQL "Workflow does not contain permissions" alert
|
# else. Closes the CodeQL "Workflow does not contain permissions" alert
|
||||||
# and matches the principle-of-least-privilege the security guide
|
# and matches the principle-of-least-privilege the security guide
|
||||||
# recommends for workflows that don't push or create releases.
|
# recommends for workflows that don't push or create releases.
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
name: Build (Release)
|
name: Build (Release)
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
timeout-minutes: 15
|
timeout-minutes: 15
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
||||||
|
|
||||||
- name: Setup .NET 10
|
- name: Setup .NET 10
|
||||||
uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5
|
uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5
|
||||||
with:
|
with:
|
||||||
dotnet-version: 10.0.x
|
dotnet-version: 10.0.x
|
||||||
|
|
||||||
- name: Download Dalamud staging
|
- name: Download Dalamud staging
|
||||||
run: |
|
run: |
|
||||||
hooks="$HOME/.xlcore/dalamud/Hooks/dev"
|
hooks="$HOME/.xlcore/dalamud/Hooks/dev"
|
||||||
mkdir -p "$hooks"
|
mkdir -p "$hooks"
|
||||||
curl -fsSL https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -o dalamud.zip
|
curl -fsSL https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -o dalamud.zip
|
||||||
unzip -oq dalamud.zip -d "$hooks"
|
unzip -oq dalamud.zip -d "$hooks"
|
||||||
|
|
||||||
- name: Restore
|
- name: Restore
|
||||||
run: dotnet restore HellionChat/HellionChat.csproj
|
run: dotnet restore HellionChat/HellionChat.csproj
|
||||||
|
|
||||||
- name: Build (Release)
|
- name: Build (Release)
|
||||||
run: dotnet build HellionChat/HellionChat.csproj --configuration Release --no-restore
|
run: dotnet build HellionChat/HellionChat.csproj --configuration Release --no-restore
|
||||||
|
|||||||
+220
-215
@@ -17,234 +17,239 @@ name: Forge Announce
|
|||||||
# (issue titles, PR bodies, commit messages, etc.) flows into run-steps.
|
# (issue titles, PR bodies, commit messages, etc.) flows into run-steps.
|
||||||
|
|
||||||
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
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
announce:
|
announce:
|
||||||
name: Post changelog to Hellion Forge
|
name: Post changelog to Hellion Forge
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
# The DISCORD_FORGE_WEBHOOK secret is set as a repo-level Actions Secret
|
# The DISCORD_FORGE_WEBHOOK secret is set as a repo-level Actions Secret
|
||||||
# on Gitea (Settings → Actions → Secrets). Repo-level secrets are in
|
# on Gitea (Settings → Actions → Secrets). Repo-level secrets are in
|
||||||
# scope for every job by default, no environment: declaration needed.
|
# scope for every job by default, no environment: declaration needed.
|
||||||
timeout-minutes: 5
|
timeout-minutes: 5
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
# On push:tags github.ref points at the tag commit; on workflow_dispatch
|
# On push:tags github.ref points at the tag commit; on workflow_dispatch
|
||||||
# the user supplies the tag explicitly. Always check out that tag so
|
# the user supplies the tag explicitly. Always check out that tag so
|
||||||
# the yaml + forge-posts file are read from the tagged tree, not main.
|
# the yaml + forge-posts file are read from the tagged tree, not main.
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
||||||
with:
|
with:
|
||||||
ref: ${{ github.event.inputs.tag || github.ref }}
|
ref: ${{ github.event.inputs.tag || github.ref }}
|
||||||
|
|
||||||
# Build embed-payload as a JSON file on disk. PowerShell-Core (pwsh)
|
# Build embed-payload as a JSON file on disk. PowerShell-Core (pwsh)
|
||||||
# ships pre-installed on ubuntu-latest so we get the same scripting
|
# ships pre-installed on ubuntu-latest so we get the same scripting
|
||||||
# patterns release.yml uses on windows-latest. Tag is read via env: to
|
# patterns release.yml uses on windows-latest. Tag is read via env: to
|
||||||
# treat it as a string variable rather than inline shell text, and
|
# treat it as a string variable rather than inline shell text, and
|
||||||
# validated against the semver regex before any interpolation.
|
# validated against the semver regex before any interpolation.
|
||||||
- name: Build embed payload
|
- name: Build embed payload
|
||||||
id: build
|
id: build
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
env:
|
env:
|
||||||
TAG_NAME: ${{ github.event.inputs.tag || github.ref_name }}
|
TAG_NAME: ${{ github.event.inputs.tag || github.ref_name }}
|
||||||
run: |
|
run: |
|
||||||
$tag = $env:TAG_NAME
|
$tag = $env:TAG_NAME
|
||||||
if ($tag -notmatch '^v\d+\.\d+\.\d+$') {
|
if ($tag -notmatch '^v\d+\.\d+\.\d+$') {
|
||||||
throw "V1: Refusing to announce non-semver tag: $tag"
|
throw "V1: Refusing to announce non-semver tag: $tag"
|
||||||
|
}
|
||||||
|
$version = $tag.Substring(1)
|
||||||
|
|
||||||
|
# ---------- Forge-Post-Datei lesen ----------
|
||||||
|
$forgePath = ".github/forge-posts/$tag.md"
|
||||||
|
if (-not (Test-Path $forgePath)) {
|
||||||
|
throw "V2: Forge-Post-Datei für $tag fehlt unter .github/forge-posts/. Datei vor dem Tag anlegen, dann Tag re-pushen oder workflow_dispatch."
|
||||||
|
}
|
||||||
|
$forgeRaw = Get-Content -Path $forgePath -Raw
|
||||||
|
|
||||||
|
# Frontmatter (--- … ---) am Datei-Anfang
|
||||||
|
if ($forgeRaw -notmatch '(?s)\A---\s*\r?\n(.*?)\r?\n---\s*\r?\n(.*)\z') {
|
||||||
|
throw "V3: Frontmatter (---) fehlt oder ist defekt in $forgePath"
|
||||||
|
}
|
||||||
|
$fmText = $matches[1]
|
||||||
|
$deBody = $matches[2].Trim()
|
||||||
|
|
||||||
|
$subtitle = $null
|
||||||
|
$versionsnatur = $null
|
||||||
|
foreach ($line in ($fmText -split "`r?`n")) {
|
||||||
|
if ($line -match '^subtitle:\s*"?([^"]*)"?\s*$') { $subtitle = $matches[1] }
|
||||||
|
if ($line -match '^versionsnatur:\s*"?([^"]*)"?\s*$') { $versionsnatur = $matches[1] }
|
||||||
|
}
|
||||||
|
if ([string]::IsNullOrWhiteSpace($subtitle)) { throw "V3: Frontmatter-Feld 'subtitle' fehlt in $forgePath" }
|
||||||
|
if ([string]::IsNullOrWhiteSpace($versionsnatur)) { throw "V3: Frontmatter-Feld 'versionsnatur' fehlt in $forgePath" }
|
||||||
|
if ($subtitle.Length -gt 60) { throw "V4: Frontmatter-Feld 'subtitle' überschreitet Limit ($($subtitle.Length) Char, max 60)" }
|
||||||
|
if ($versionsnatur.Length -gt 40) { throw "V4: Frontmatter-Feld 'versionsnatur' überschreitet Limit ($($versionsnatur.Length) Char, max 40)" }
|
||||||
|
if ([string]::IsNullOrWhiteSpace($deBody)) { throw "V3: DE-Body fehlt in $forgePath" }
|
||||||
|
|
||||||
|
# ---------- EN-Block aus HellionChat.yaml ziehen ----------
|
||||||
|
# 1:1 Pattern aus release.yml — gleicher Header-Marker, gleiches
|
||||||
|
# Trailer-Verhalten. Bei Drift die zwei Workflows synchron halten.
|
||||||
|
$yamlPath = "HellionChat/HellionChat.yaml"
|
||||||
|
$raw = Get-Content -Path $yamlPath -Raw
|
||||||
|
$marker = "changelog: |-"
|
||||||
|
$idx = $raw.IndexOf($marker)
|
||||||
|
if ($idx -lt 0) { throw "V5: changelog-Block nicht gefunden in $yamlPath" }
|
||||||
|
$afterMarker = $raw.Substring($idx + $marker.Length)
|
||||||
|
$changelogBody = (($afterMarker -split "`r?`n") | ForEach-Object {
|
||||||
|
if ($_ -match '^ ') { $_.Substring(4) } else { $_ }
|
||||||
|
}) -join "`n"
|
||||||
|
|
||||||
|
$header = "**v$version "
|
||||||
|
$start = $changelogBody.IndexOf($header)
|
||||||
|
if ($start -lt 0) {
|
||||||
|
throw "V5: No changelog entry for version $version found in $yamlPath. Update the changelog block before tagging."
|
||||||
|
}
|
||||||
|
$rest = $changelogBody.Substring($start)
|
||||||
|
$nextHdr = $rest.IndexOf("`n`n**v", 1)
|
||||||
|
$trailer = $rest.IndexOf("`n`n---")
|
||||||
|
if ($nextHdr -ge 0 -and ($trailer -lt 0 -or $nextHdr -lt $trailer)) {
|
||||||
|
$enBlock = $rest.Substring(0, $nextHdr).TrimEnd()
|
||||||
|
} elseif ($trailer -ge 0) {
|
||||||
|
$enBlock = $rest.Substring(0, $trailer).TrimEnd()
|
||||||
|
} else {
|
||||||
|
$enBlock = $rest.TrimEnd()
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---------- Embed-Felder + Per-Field-Caps (Discord-Hard-Limits) ----------
|
||||||
|
# Discord enforces per-embed-field limits separately from the
|
||||||
|
# combined-total limit. We split the DE and EN blocks into two
|
||||||
|
# embeds that share the same release URL so Discord stitches
|
||||||
|
# them into one visual card. Hard caps per Discord docs:
|
||||||
|
# description: 4096 per embed
|
||||||
|
# title: 256 per embed
|
||||||
|
# footer.text: 2048 per embed
|
||||||
|
# combined sum across all embeds: 6000
|
||||||
|
$title = "Hellion Chat $version — $subtitle"
|
||||||
|
$deDesc = "**Deutsch**`n`n$deBody"
|
||||||
|
$enDesc = "**English**`n`n$enBlock"
|
||||||
|
$footerText = "Hellion Forge · $versionsnatur"
|
||||||
|
$releaseUrl = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/$tag"
|
||||||
|
|
||||||
|
if ($deDesc.Length -gt 4096) {
|
||||||
|
throw "V6a: DE-Body too long for one embed ($($deDesc.Length) chars, max 4096). Trim .github/forge-posts/$tag.md or post the announcement manually (see forge style §8)."
|
||||||
|
}
|
||||||
|
if ($enDesc.Length -gt 4096) {
|
||||||
|
throw "V6b: EN-Block too long for one embed ($($enDesc.Length) chars, max 4096). Trim the changelog entry in HellionChat/HellionChat.yaml or post manually."
|
||||||
|
}
|
||||||
|
$totalChars = $title.Length + $deDesc.Length + $enDesc.Length + $footerText.Length
|
||||||
|
if ($totalChars -gt 6000) {
|
||||||
|
throw "V6c: Combined embed chars $totalChars exceed Discord's 6000-total limit. Major-Release detected — post manually via Bot/Multi-Embed (see forge style §8)."
|
||||||
|
}
|
||||||
|
Write-Host "Embed-Caps OK: de=$($deDesc.Length)/4096, en=$($enDesc.Length)/4096, total=$totalChars/6000"
|
||||||
|
|
||||||
|
# ---------- Embed-Payload bauen (zwei gestapelte Embeds) ----------
|
||||||
|
# Discord MERGES embeds in one message that share the same `url`
|
||||||
|
# (the image-gallery merge) and then renders only the FIRST embed's
|
||||||
|
# description — every following embed contributes images only. So
|
||||||
|
# only the DE embed carries the release URL; the EN embed stays
|
||||||
|
# url-less, which makes Discord stack both as separate cards with
|
||||||
|
# both descriptions visible. Title sits on the first embed, footer
|
||||||
|
# + timestamp on the last so it still reads as one post.
|
||||||
|
$payload = [ordered]@{
|
||||||
|
username = "Forge Herald"
|
||||||
|
avatar_url = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/icon.png"
|
||||||
|
content = "<@&1500489631555260446>"
|
||||||
|
allowed_mentions = [ordered]@{
|
||||||
|
parse = @()
|
||||||
|
roles = @("1500489631555260446")
|
||||||
|
}
|
||||||
|
embeds = @(
|
||||||
|
[ordered]@{
|
||||||
|
title = $title
|
||||||
|
url = $releaseUrl
|
||||||
|
color = 12730636
|
||||||
|
description = $deDesc
|
||||||
|
},
|
||||||
|
[ordered]@{
|
||||||
|
# Deliberately no `url` — a shared url would make Discord
|
||||||
|
# merge this embed into the first and drop the EN body.
|
||||||
|
color = 12730636
|
||||||
|
description = $enDesc
|
||||||
|
footer = [ordered]@{ text = $footerText }
|
||||||
|
timestamp = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ")
|
||||||
}
|
}
|
||||||
$version = $tag.Substring(1)
|
)
|
||||||
|
}
|
||||||
|
|
||||||
# ---------- Forge-Post-Datei lesen ----------
|
$payloadJson = $payload | ConvertTo-Json -Depth 8 -Compress
|
||||||
$forgePath = ".github/forge-posts/$tag.md"
|
# Ausgabe-Datei ohne trailing newline für sauberes curl --data-binary @-
|
||||||
if (-not (Test-Path $forgePath)) {
|
[System.IO.File]::WriteAllText("$PWD/embed-payload.json", $payloadJson, [System.Text.UTF8Encoding]::new($false))
|
||||||
throw "V2: Forge-Post-Datei für $tag fehlt unter .github/forge-posts/. Datei vor dem Tag anlegen, dann Tag re-pushen oder workflow_dispatch."
|
|
||||||
}
|
|
||||||
$forgeRaw = Get-Content -Path $forgePath -Raw
|
|
||||||
|
|
||||||
# Frontmatter (--- … ---) am Datei-Anfang
|
Write-Host "Payload size: $($payloadJson.Length) chars"
|
||||||
if ($forgeRaw -notmatch '(?s)\A---\s*\r?\n(.*?)\r?\n---\s*\r?\n(.*)\z') {
|
Write-Host "Embed title: $title"
|
||||||
throw "V3: Frontmatter (---) fehlt oder ist defekt in $forgePath"
|
Write-Host "Embed footer: $footerText"
|
||||||
}
|
|
||||||
$fmText = $matches[1]
|
|
||||||
$deBody = $matches[2].Trim()
|
|
||||||
|
|
||||||
$subtitle = $null
|
# POST to the Hellion Forge changelog webhook. curl from PowerShell-Core
|
||||||
$versionsnatur = $null
|
# so we can pipe the payload via stdin (--data-binary @-) and keep
|
||||||
foreach ($line in ($fmText -split "`r?`n")) {
|
# secrets out of process arg lists. One retry on 5xx, hard fail on 4xx.
|
||||||
if ($line -match '^subtitle:\s*"?([^"]*)"?\s*$') { $subtitle = $matches[1] }
|
- name: POST to Hellion Forge webhook
|
||||||
if ($line -match '^versionsnatur:\s*"?([^"]*)"?\s*$') { $versionsnatur = $matches[1] }
|
shell: pwsh
|
||||||
}
|
env:
|
||||||
if ([string]::IsNullOrWhiteSpace($subtitle)) { throw "V3: Frontmatter-Feld 'subtitle' fehlt in $forgePath" }
|
DISCORD_FORGE_WEBHOOK: ${{ secrets.DISCORD_FORGE_WEBHOOK }}
|
||||||
if ([string]::IsNullOrWhiteSpace($versionsnatur)) { throw "V3: Frontmatter-Feld 'versionsnatur' fehlt in $forgePath" }
|
run: |
|
||||||
if ($subtitle.Length -gt 60) { throw "V4: Frontmatter-Feld 'subtitle' überschreitet Limit ($($subtitle.Length) Char, max 60)" }
|
if ([string]::IsNullOrEmpty($env:DISCORD_FORGE_WEBHOOK)) {
|
||||||
if ($versionsnatur.Length -gt 40) { throw "V4: Frontmatter-Feld 'versionsnatur' überschreitet Limit ($($versionsnatur.Length) Char, max 40)" }
|
throw "V7: DISCORD_FORGE_WEBHOOK secret is empty. Check Settings → Environments → Webhook."
|
||||||
if ([string]::IsNullOrWhiteSpace($deBody)) { throw "V3: DE-Body fehlt in $forgePath" }
|
}
|
||||||
|
|
||||||
# ---------- EN-Block aus HellionChat.yaml ziehen ----------
|
$payloadFile = "$PWD/embed-payload.json"
|
||||||
# 1:1 Pattern aus release.yml — gleicher Header-Marker, gleiches
|
if (-not (Test-Path $payloadFile)) {
|
||||||
# Trailer-Verhalten. Bei Drift die zwei Workflows synchron halten.
|
throw "Embed payload file missing — previous step did not produce embed-payload.json"
|
||||||
$yamlPath = "HellionChat/HellionChat.yaml"
|
}
|
||||||
$raw = Get-Content -Path $yamlPath -Raw
|
|
||||||
$marker = "changelog: |-"
|
|
||||||
$idx = $raw.IndexOf($marker)
|
|
||||||
if ($idx -lt 0) { throw "V5: changelog-Block nicht gefunden in $yamlPath" }
|
|
||||||
$afterMarker = $raw.Substring($idx + $marker.Length)
|
|
||||||
$changelogBody = (($afterMarker -split "`r?`n") | ForEach-Object {
|
|
||||||
if ($_ -match '^ ') { $_.Substring(4) } else { $_ }
|
|
||||||
}) -join "`n"
|
|
||||||
|
|
||||||
$header = "**v$version "
|
$maxAttempts = 2
|
||||||
$start = $changelogBody.IndexOf($header)
|
$attempt = 0
|
||||||
if ($start -lt 0) {
|
while ($attempt -lt $maxAttempts) {
|
||||||
throw "V5: No changelog entry for version $version found in $yamlPath. Update the changelog block before tagging."
|
$attempt++
|
||||||
}
|
Write-Host "POST attempt $attempt of $maxAttempts"
|
||||||
$rest = $changelogBody.Substring($start)
|
$tmpResp = "$PWD/.webhook-response"
|
||||||
$nextHdr = $rest.IndexOf("`n`n**v", 1)
|
$tmpHeaders = "$PWD/.webhook-headers"
|
||||||
$trailer = $rest.IndexOf("`n`n---")
|
# --silent suppresses progress; --show-error prints errors so
|
||||||
if ($nextHdr -ge 0 -and ($trailer -lt 0 -or $nextHdr -lt $trailer)) {
|
# the workflow log shows what happened. -w prints HTTP status
|
||||||
$enBlock = $rest.Substring(0, $nextHdr).TrimEnd()
|
# to stdout for inspection. -o captures body for diagnosis,
|
||||||
} elseif ($trailer -ge 0) {
|
# -D captures headers.
|
||||||
$enBlock = $rest.Substring(0, $trailer).TrimEnd()
|
$rawStatus = Get-Content $payloadFile -Raw |
|
||||||
} else {
|
curl --silent --show-error `
|
||||||
$enBlock = $rest.TrimEnd()
|
--header 'Content-Type: application/json' `
|
||||||
}
|
--data-binary '@-' `
|
||||||
|
-D $tmpHeaders `
|
||||||
|
-o $tmpResp `
|
||||||
|
-w '%{http_code}' `
|
||||||
|
"$env:DISCORD_FORGE_WEBHOOK"
|
||||||
|
$status = [int]$rawStatus
|
||||||
|
Write-Host "HTTP status: $status"
|
||||||
|
|
||||||
# ---------- Embed-Felder + Per-Field-Caps (Discord-Hard-Limits) ----------
|
if ($status -ge 200 -and $status -lt 300) {
|
||||||
# Discord enforces per-embed-field limits separately from the
|
Write-Host "Forge announce POST succeeded."
|
||||||
# combined-total limit. We split the DE and EN blocks into two
|
exit 0
|
||||||
# embeds that share the same release URL so Discord stitches
|
}
|
||||||
# them into one visual card. Hard caps per Discord docs:
|
|
||||||
# description: 4096 per embed
|
|
||||||
# title: 256 per embed
|
|
||||||
# footer.text: 2048 per embed
|
|
||||||
# combined sum across all embeds: 6000
|
|
||||||
$title = "Hellion Chat $version — $subtitle"
|
|
||||||
$deDesc = "**Deutsch**`n`n$deBody"
|
|
||||||
$enDesc = "**English**`n`n$enBlock"
|
|
||||||
$footerText = "Hellion Forge · $versionsnatur"
|
|
||||||
$releaseUrl = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases/tag/$tag"
|
|
||||||
|
|
||||||
if ($deDesc.Length -gt 4096) {
|
$bodySnippet = ""
|
||||||
throw "V6a: DE-Body too long for one embed ($($deDesc.Length) chars, max 4096). Trim .github/forge-posts/$tag.md or post the announcement manually (see forge style §8)."
|
if (Test-Path $tmpResp) {
|
||||||
}
|
$bodySnippet = (Get-Content $tmpResp -Raw -ErrorAction SilentlyContinue)
|
||||||
if ($enDesc.Length -gt 4096) {
|
if ($bodySnippet.Length -gt 500) { $bodySnippet = $bodySnippet.Substring(0, 500) + " …" }
|
||||||
throw "V6b: EN-Block too long for one embed ($($enDesc.Length) chars, max 4096). Trim the changelog entry in HellionChat/HellionChat.yaml or post manually."
|
}
|
||||||
}
|
|
||||||
$totalChars = $title.Length + $deDesc.Length + $enDesc.Length + $footerText.Length
|
|
||||||
if ($totalChars -gt 6000) {
|
|
||||||
throw "V6c: Combined embed chars $totalChars exceed Discord's 6000-total limit. Major-Release detected — post manually via Bot/Multi-Embed (see forge style §8)."
|
|
||||||
}
|
|
||||||
Write-Host "Embed-Caps OK: de=$($deDesc.Length)/4096, en=$($enDesc.Length)/4096, total=$totalChars/6000"
|
|
||||||
|
|
||||||
# ---------- Embed-Payload bauen (zwei Embeds, gleiche url) ----------
|
if ($status -ge 400 -and $status -lt 500) {
|
||||||
# Sharing the same `url` tells Discord to render both embeds as a
|
# E2: 4xx is permanent — webhook revoked, channel deleted,
|
||||||
# single contiguous card block. The title sits on the first embed,
|
# payload malformed. No retry.
|
||||||
# the footer + timestamp on the last so it reads as one post.
|
throw "E2: Discord-Webhook returned permanent $status. Body: $bodySnippet"
|
||||||
$payload = [ordered]@{
|
}
|
||||||
username = "Forge Herald"
|
|
||||||
avatar_url = "https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/icon.png"
|
|
||||||
content = "<@&1500489631555260446>"
|
|
||||||
allowed_mentions = [ordered]@{
|
|
||||||
parse = @()
|
|
||||||
roles = @("1500489631555260446")
|
|
||||||
}
|
|
||||||
embeds = @(
|
|
||||||
[ordered]@{
|
|
||||||
title = $title
|
|
||||||
url = $releaseUrl
|
|
||||||
color = 12730636
|
|
||||||
description = $deDesc
|
|
||||||
},
|
|
||||||
[ordered]@{
|
|
||||||
url = $releaseUrl
|
|
||||||
color = 12730636
|
|
||||||
description = $enDesc
|
|
||||||
footer = [ordered]@{ text = $footerText }
|
|
||||||
timestamp = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ")
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
$payloadJson = $payload | ConvertTo-Json -Depth 8 -Compress
|
# E1: 5xx (or transport-level fail with status 0) — wait + retry once
|
||||||
# Ausgabe-Datei ohne trailing newline für sauberes curl --data-binary @-
|
if ($attempt -lt $maxAttempts) {
|
||||||
[System.IO.File]::WriteAllText("$PWD/embed-payload.json", $payloadJson, [System.Text.UTF8Encoding]::new($false))
|
Write-Host "Transient $status — sleeping 30s before retry."
|
||||||
|
Start-Sleep -Seconds 30
|
||||||
Write-Host "Payload size: $($payloadJson.Length) chars"
|
} else {
|
||||||
Write-Host "Embed title: $title"
|
throw "E1: Discord-Webhook returned transient $status after $maxAttempts attempts. Body: $bodySnippet"
|
||||||
Write-Host "Embed footer: $footerText"
|
}
|
||||||
|
}
|
||||||
# POST to the Hellion Forge changelog webhook. curl from PowerShell-Core
|
|
||||||
# so we can pipe the payload via stdin (--data-binary @-) and keep
|
|
||||||
# secrets out of process arg lists. One retry on 5xx, hard fail on 4xx.
|
|
||||||
- name: POST to Hellion Forge webhook
|
|
||||||
shell: pwsh
|
|
||||||
env:
|
|
||||||
DISCORD_FORGE_WEBHOOK: ${{ secrets.DISCORD_FORGE_WEBHOOK }}
|
|
||||||
run: |
|
|
||||||
if ([string]::IsNullOrEmpty($env:DISCORD_FORGE_WEBHOOK)) {
|
|
||||||
throw "V7: DISCORD_FORGE_WEBHOOK secret is empty. Check Settings → Environments → Webhook."
|
|
||||||
}
|
|
||||||
|
|
||||||
$payloadFile = "$PWD/embed-payload.json"
|
|
||||||
if (-not (Test-Path $payloadFile)) {
|
|
||||||
throw "Embed payload file missing — previous step did not produce embed-payload.json"
|
|
||||||
}
|
|
||||||
|
|
||||||
$maxAttempts = 2
|
|
||||||
$attempt = 0
|
|
||||||
while ($attempt -lt $maxAttempts) {
|
|
||||||
$attempt++
|
|
||||||
Write-Host "POST attempt $attempt of $maxAttempts"
|
|
||||||
$tmpResp = "$PWD/.webhook-response"
|
|
||||||
$tmpHeaders = "$PWD/.webhook-headers"
|
|
||||||
# --silent suppresses progress; --show-error prints errors so
|
|
||||||
# the workflow log shows what happened. -w prints HTTP status
|
|
||||||
# to stdout for inspection. -o captures body for diagnosis,
|
|
||||||
# -D captures headers.
|
|
||||||
$rawStatus = Get-Content $payloadFile -Raw |
|
|
||||||
curl --silent --show-error `
|
|
||||||
--header 'Content-Type: application/json' `
|
|
||||||
--data-binary '@-' `
|
|
||||||
-D $tmpHeaders `
|
|
||||||
-o $tmpResp `
|
|
||||||
-w '%{http_code}' `
|
|
||||||
"$env:DISCORD_FORGE_WEBHOOK"
|
|
||||||
$status = [int]$rawStatus
|
|
||||||
Write-Host "HTTP status: $status"
|
|
||||||
|
|
||||||
if ($status -ge 200 -and $status -lt 300) {
|
|
||||||
Write-Host "Forge announce POST succeeded."
|
|
||||||
exit 0
|
|
||||||
}
|
|
||||||
|
|
||||||
$bodySnippet = ""
|
|
||||||
if (Test-Path $tmpResp) {
|
|
||||||
$bodySnippet = (Get-Content $tmpResp -Raw -ErrorAction SilentlyContinue)
|
|
||||||
if ($bodySnippet.Length -gt 500) { $bodySnippet = $bodySnippet.Substring(0, 500) + " …" }
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($status -ge 400 -and $status -lt 500) {
|
|
||||||
# E2: 4xx is permanent — webhook revoked, channel deleted,
|
|
||||||
# payload malformed. No retry.
|
|
||||||
throw "E2: Discord-Webhook returned permanent $status. Body: $bodySnippet"
|
|
||||||
}
|
|
||||||
|
|
||||||
# E1: 5xx (or transport-level fail with status 0) — wait + retry once
|
|
||||||
if ($attempt -lt $maxAttempts) {
|
|
||||||
Write-Host "Transient $status — sleeping 30s before retry."
|
|
||||||
Start-Sleep -Seconds 30
|
|
||||||
} else {
|
|
||||||
throw "E1: Discord-Webhook returned transient $status after $maxAttempts attempts. Body: $bodySnippet"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
+181
-142
@@ -17,167 +17,206 @@ name: Release
|
|||||||
# Linux when the Dalamud staging assemblies sit under $(HOME)/.xlcore/...
|
# Linux when the Dalamud staging assemblies sit under $(HOME)/.xlcore/...
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
tags:
|
tags:
|
||||||
- "v*"
|
- 'v*'
|
||||||
# Manual recovery trigger. Use Gitea's "Run workflow" UI and select the
|
# Manual recovery trigger. Use Gitea's "Run workflow" UI and select the
|
||||||
# tag (e.g. v1.4.4) from the Ref dropdown - not main. The Validate tag
|
# tag (e.g. v1.4.4) from the Ref dropdown - not main. The Validate tag
|
||||||
# ref step below hard-fails if a non-tag ref is selected, because the
|
# ref step below hard-fails if a non-tag ref is selected: the release
|
||||||
# release-action reads GITHUB_REF directly and rejects anything that
|
# name and body are both derived from the tag, so a branch ref would
|
||||||
# does not start with refs/tags/.
|
# publish a release named after a branch.
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
release:
|
release:
|
||||||
name: Build and attach release ZIP
|
name: Build and attach release ZIP
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
timeout-minutes: 20
|
timeout-minutes: 20
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
# release-action@main reads GITHUB_REF directly (its action.yml
|
# Validate up-front so a manual dispatch from a branch ref fails loud
|
||||||
# does not declare a tag_name input). Validate up-front so manual
|
# here instead of burning a full build before the publish step notices.
|
||||||
# dispatches from a branch ref fail loud here instead of burning
|
- name: Validate tag ref
|
||||||
# a full build before the final step errors out with "ref X is
|
run: |
|
||||||
# not a tag".
|
if [[ "${GITHUB_REF}" != refs/tags/v* ]]; then
|
||||||
- name: Validate tag ref
|
echo "::error::Release workflow must run on a v*.X.Y tag ref, got ${GITHUB_REF}"
|
||||||
run: |
|
echo "::error::Push a tag, or pick the tag (not main) in the workflow_dispatch Ref dropdown."
|
||||||
if [[ "${GITHUB_REF}" != refs/tags/v* ]]; then
|
exit 1
|
||||||
echo "::error::Release workflow must run on a v*.X.Y tag ref, got ${GITHUB_REF}"
|
fi
|
||||||
echo "::error::Push a tag, or pick the tag (not main) in the workflow_dispatch Ref dropdown."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
||||||
|
|
||||||
- name: Setup .NET 10
|
- name: Setup .NET 10
|
||||||
uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5
|
uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5
|
||||||
with:
|
with:
|
||||||
dotnet-version: 10.0.x
|
dotnet-version: 10.0.x
|
||||||
|
|
||||||
- name: Download Dalamud staging
|
- name: Download Dalamud staging
|
||||||
run: |
|
run: |
|
||||||
hooks="$HOME/.xlcore/dalamud/Hooks/dev"
|
hooks="$HOME/.xlcore/dalamud/Hooks/dev"
|
||||||
mkdir -p "$hooks"
|
mkdir -p "$hooks"
|
||||||
curl -fsSL https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -o dalamud.zip
|
curl -fsSL https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -o dalamud.zip
|
||||||
unzip -oq dalamud.zip -d "$hooks"
|
unzip -oq dalamud.zip -d "$hooks"
|
||||||
|
|
||||||
- name: Build (Release)
|
- name: Build (Release)
|
||||||
run: dotnet build HellionChat/HellionChat.csproj --configuration Release
|
run: dotnet build HellionChat/HellionChat.csproj --configuration Release
|
||||||
|
|
||||||
- name: Locate latest.zip
|
- name: Locate latest.zip
|
||||||
id: locate
|
id: locate
|
||||||
run: |
|
run: |
|
||||||
zip="$(find HellionChat/bin/Release -name latest.zip -print -quit)"
|
zip="$(find HellionChat/bin/Release -name latest.zip -print -quit)"
|
||||||
if [ -z "$zip" ]; then
|
if [ -z "$zip" ]; then
|
||||||
echo "latest.zip not found under HellionChat/bin/Release" >&2
|
echo "latest.zip not found under HellionChat/bin/Release" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
echo "Found: $zip"
|
echo "Found: $zip"
|
||||||
echo "path=$zip" >> "$GITHUB_OUTPUT"
|
echo "path=$zip" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
# Build a release body from the matching changelog block in
|
# Build a release body from the matching changelog block in
|
||||||
# HellionChat.yaml plus a static install / docs footer. Fails the
|
# HellionChat.yaml plus a static install / docs footer. Fails the
|
||||||
# workflow if no block exists for the tagged version, which is the
|
# workflow if no block exists for the tagged version, which is the
|
||||||
# automated counterpart to the "yaml + repo.json + release body
|
# automated counterpart to the "yaml + repo.json + release body
|
||||||
# kept in sync" rule.
|
# kept in sync" rule.
|
||||||
#
|
#
|
||||||
# GITHUB_REF_NAME is read via env: (not ${{ }} interpolation) so the
|
# GITHUB_REF_NAME is read via env: (not ${{ }} interpolation) so the
|
||||||
# tag value is treated as a PowerShell variable, not as inline shell
|
# tag value is treated as a PowerShell variable, not as inline shell
|
||||||
# text. The strict regex below rejects anything that is not a clean
|
# text. The strict regex below rejects anything that is not a clean
|
||||||
# semver tag before it is used to build a string.
|
# semver tag before it is used to build a string.
|
||||||
- name: Generate release body
|
- name: Generate release body
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
env:
|
env:
|
||||||
# github.ref_name is the tag because Validate tag ref above
|
# github.ref_name is the tag because Validate tag ref above
|
||||||
# already enforced refs/tags/v*. Read via env: so the value
|
# already enforced refs/tags/v*. Read via env: so the value
|
||||||
# is a PowerShell variable, not inline shell text, and gets
|
# is a PowerShell variable, not inline shell text, and gets
|
||||||
# re-validated against the semver regex below.
|
# re-validated against the semver regex below.
|
||||||
TAG_NAME: ${{ github.ref_name }}
|
TAG_NAME: ${{ github.ref_name }}
|
||||||
run: |
|
run: |
|
||||||
$tag = $env:TAG_NAME
|
$tag = $env:TAG_NAME
|
||||||
if ($tag -notmatch '^v\d+\.\d+\.\d+$') {
|
if ($tag -notmatch '^v\d+\.\d+\.\d+$') {
|
||||||
throw "Refusing to generate release body for non-semver tag: $tag"
|
throw "Refusing to generate release body for non-semver tag: $tag"
|
||||||
}
|
}
|
||||||
$version = $tag.Substring(1)
|
$version = $tag.Substring(1)
|
||||||
|
|
||||||
$yamlPath = "HellionChat/HellionChat.yaml"
|
$yamlPath = "HellionChat/HellionChat.yaml"
|
||||||
$raw = Get-Content -Path $yamlPath -Raw
|
$raw = Get-Content -Path $yamlPath -Raw
|
||||||
|
|
||||||
$marker = "changelog: |-"
|
$marker = "changelog: |-"
|
||||||
$idx = $raw.IndexOf($marker)
|
$idx = $raw.IndexOf($marker)
|
||||||
if ($idx -lt 0) { throw "changelog block not found in $yamlPath" }
|
if ($idx -lt 0) { throw "changelog block not found in $yamlPath" }
|
||||||
|
|
||||||
# changelog: is the last top-level key in the manifest, so
|
# changelog: is the last top-level key in the manifest, so
|
||||||
# everything after the marker is the literal block. Strip the
|
# everything after the marker is the literal block. Strip the
|
||||||
# 4-space yaml indent (prettier convention) from each line.
|
# 4-space yaml indent (prettier convention) from each line.
|
||||||
$afterMarker = $raw.Substring($idx + $marker.Length)
|
$afterMarker = $raw.Substring($idx + $marker.Length)
|
||||||
$changelogBody = (($afterMarker -split "`r?`n") | ForEach-Object {
|
$changelogBody = (($afterMarker -split "`r?`n") | ForEach-Object {
|
||||||
if ($_ -match '^ ') { $_.Substring(4) } else { $_ }
|
if ($_ -match '^ ') { $_.Substring(4) } else { $_ }
|
||||||
}) -join "`n"
|
}) -join "`n"
|
||||||
|
|
||||||
# Subblock convention: "**vX.Y.Z — <subtitle> (<date>)**"
|
# Subblock convention: "**vX.Y.Z — <subtitle> (<date>)**"
|
||||||
# matches verify-changelog-sync.sh and slim-rule grep.
|
# matches verify-changelog-sync.sh and slim-rule grep.
|
||||||
$header = "**v$version "
|
$header = "**v$version "
|
||||||
$start = $changelogBody.IndexOf($header)
|
$start = $changelogBody.IndexOf($header)
|
||||||
if ($start -lt 0) {
|
if ($start -lt 0) {
|
||||||
throw "No changelog entry for version $version found in $yamlPath. Update the changelog block before tagging a release."
|
throw "No changelog entry for version $version found in $yamlPath. Update the changelog block before tagging a release."
|
||||||
}
|
}
|
||||||
|
|
||||||
$rest = $changelogBody.Substring($start)
|
$rest = $changelogBody.Substring($start)
|
||||||
$nextHdr = $rest.IndexOf("`n`n**v", 1)
|
$nextHdr = $rest.IndexOf("`n`n**v", 1)
|
||||||
$trailer = $rest.IndexOf("`n`n---")
|
$trailer = $rest.IndexOf("`n`n---")
|
||||||
|
|
||||||
if ($nextHdr -ge 0 -and ($trailer -lt 0 -or $nextHdr -lt $trailer)) {
|
if ($nextHdr -ge 0 -and ($trailer -lt 0 -or $nextHdr -lt $trailer)) {
|
||||||
$currentBlock = $rest.Substring(0, $nextHdr).TrimEnd()
|
$currentBlock = $rest.Substring(0, $nextHdr).TrimEnd()
|
||||||
} elseif ($trailer -ge 0) {
|
} elseif ($trailer -ge 0) {
|
||||||
$currentBlock = $rest.Substring(0, $trailer).TrimEnd()
|
$currentBlock = $rest.Substring(0, $trailer).TrimEnd()
|
||||||
} else {
|
} else {
|
||||||
$currentBlock = $rest.TrimEnd()
|
$currentBlock = $rest.TrimEnd()
|
||||||
}
|
}
|
||||||
|
|
||||||
# Static install / docs / licence footer is maintained as a
|
# Static install / docs / licence footer is maintained as a
|
||||||
# separate file so the workflow YAML stays clean (no embedded
|
# separate file so the workflow YAML stays clean (no embedded
|
||||||
# heredoc that would have to be indented under the run-block).
|
# heredoc that would have to be indented under the run-block).
|
||||||
$footerPath = ".github/release-footer.md"
|
$footerPath = ".github/release-footer.md"
|
||||||
if (-not (Test-Path $footerPath)) {
|
if (-not (Test-Path $footerPath)) {
|
||||||
throw "Release footer template not found: $footerPath"
|
throw "Release footer template not found: $footerPath"
|
||||||
}
|
}
|
||||||
$footer = Get-Content -Path $footerPath -Raw
|
$footer = Get-Content -Path $footerPath -Raw
|
||||||
|
|
||||||
$body = $currentBlock + "`n" + $footer
|
$body = $currentBlock + "`n" + $footer
|
||||||
$body | Out-File -FilePath release-body.md -Encoding utf8 -NoNewline
|
$body | Out-File -FilePath release-body.md -Encoding utf8 -NoNewline
|
||||||
|
|
||||||
Write-Host "Generated release body for $tag :"
|
Write-Host "Generated release body for $tag :"
|
||||||
Write-Host "----------------------------------------"
|
Write-Host "----------------------------------------"
|
||||||
Write-Host $body
|
Write-Host $body
|
||||||
Write-Host "----------------------------------------"
|
Write-Host "----------------------------------------"
|
||||||
|
|
||||||
# release-action@main only declares files/title/body/pre_release/
|
# The tag comes from GITHUB_REF, the body from the step above. Posted with
|
||||||
# draft/api_key/insecure as inputs (see its action.yml). It silently
|
# curl rather than gitea.com/actions/release-action, which declares
|
||||||
# ignores anything else, including body_path and tag_name. The tag
|
# `using: go` and has to be compiled by the runner -- act cannot do that
|
||||||
# itself comes from GITHUB_REF, the body must be passed inline via
|
# here and the step dies with exec: "go": executable file not found, exit
|
||||||
# body:, so we re-emit release-body.md as a step output first.
|
# 127, after a build that otherwise succeeded. This runs as a plain shell
|
||||||
- name: Expose release body for release-action
|
# step in the job image, which has curl and python3.
|
||||||
id: body
|
#
|
||||||
shell: bash
|
# Idempotent on purpose: a re-run against an existing release reuses it and
|
||||||
run: |
|
# replaces the asset instead of failing on the duplicate.
|
||||||
{
|
- name: Attach to Gitea release
|
||||||
echo 'content<<RELEASE_BODY_EOF'
|
shell: bash
|
||||||
cat release-body.md
|
env:
|
||||||
echo 'RELEASE_BODY_EOF'
|
GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
} >> "$GITHUB_OUTPUT"
|
ZIP_PATH: ${{ steps.locate.outputs.path }}
|
||||||
|
TAG_NAME: ${{ github.ref_name }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
# Gitea-native release action. Creates the release if the tag has no
|
api="${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}"
|
||||||
# release yet, or updates the existing one with latest.zip attached
|
auth="Authorization: token ${GITEA_TOKEN}"
|
||||||
# and the generated body. The auto-injected GITHUB_TOKEN on Gitea
|
|
||||||
# Actions has Gitea-API scope and is sufficient for release write.
|
# Responses land in a file before anything reads them, rather than
|
||||||
- name: Attach to Gitea release
|
# being piped straight into an interpreter. The interpreter is inline
|
||||||
uses: https://gitea.com/actions/release-action@main
|
# either way and the server only ever supplies data, but a scanner
|
||||||
with:
|
# cannot tell those apart from curl-pipe-shell -- and holding the
|
||||||
files: ${{ steps.locate.outputs.path }}
|
# response makes it inspectable when a call misbehaves.
|
||||||
body: ${{ steps.body.outputs.content }}
|
get_release_id() {
|
||||||
api_key: ${{ secrets.GITHUB_TOKEN }}
|
if curl -sf -H "$auth" "$api/releases/tags/${TAG_NAME}" -o release.json; then
|
||||||
|
python3 -c 'import json; print(json.load(open("release.json")).get("id",""))'
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
rel_id="$(get_release_id || true)"
|
||||||
|
|
||||||
|
if [ -z "$rel_id" ]; then
|
||||||
|
python3 - <<'PYCREATE' > create.json
|
||||||
|
import json, os
|
||||||
|
body = open("release-body.md", encoding="utf-8").read()
|
||||||
|
print(json.dumps({
|
||||||
|
"tag_name": os.environ["TAG_NAME"],
|
||||||
|
"name": os.environ["TAG_NAME"],
|
||||||
|
"body": body,
|
||||||
|
"draft": False,
|
||||||
|
"prerelease": False,
|
||||||
|
}))
|
||||||
|
PYCREATE
|
||||||
|
curl -sf -X POST -H "$auth" -H "Content-Type: application/json" \
|
||||||
|
-d @create.json "$api/releases" -o created.json
|
||||||
|
rel_id="$(python3 -c 'import json; print(json.load(open("created.json"))["id"])')"
|
||||||
|
echo "Created release $rel_id for ${TAG_NAME}"
|
||||||
|
else
|
||||||
|
echo "Reusing release $rel_id for ${TAG_NAME}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# A same-named asset from an earlier attempt has to go, or the upload
|
||||||
|
# collides with it. This is the state a recovery run finds.
|
||||||
|
curl -sf -H "$auth" "$api/releases/${rel_id}/assets" -o assets.json
|
||||||
|
old_id="$(python3 -c 'import json; print(next((a["id"] for a in json.load(open("assets.json")) if a["name"]=="latest.zip"), ""))')"
|
||||||
|
if [ -n "$old_id" ]; then
|
||||||
|
curl -sf -X DELETE -H "$auth" "$api/releases/${rel_id}/assets/${old_id}"
|
||||||
|
echo "Replaced existing latest.zip (asset $old_id)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
curl -sf -X POST -H "$auth" \
|
||||||
|
-F "attachment=@${ZIP_PATH};filename=latest.zip" \
|
||||||
|
"$api/releases/${rel_id}/assets?name=latest.zip" -o uploaded.json
|
||||||
|
python3 -c 'import json; a=json.load(open("uploaded.json")); print("Attached", a["name"], a["size"], "bytes")'
|
||||||
|
|||||||
@@ -1,20 +1,20 @@
|
|||||||
name: Security
|
name: Security
|
||||||
|
|
||||||
|
# Ruft den zentralen Scan-Workflow in security-workflows auf
|
||||||
|
# (Semgrep SAST + Trivy filesystem scan).
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
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:
|
||||||
scan:
|
scan:
|
||||||
uses: JonKazama-Hellion/security-workflows/.gitea/workflows/security-scan.yml@main
|
uses: JonKazama-Hellion/security-workflows/.gitea/workflows/security-scan.yml@main
|
||||||
with:
|
with:
|
||||||
# MessageStore.cs uses string-interpolation in CommandText for table
|
# MessageStore.cs interpoliert SQL-Strings, die plugin-lokal sicher sind;
|
||||||
# names and clause-joins that come from internal code constants, not
|
# Semgrep matcht das Pattern, CodeQL mit Datenflussanalyse nicht.
|
||||||
# user input. Values are bound via SqlParameter, the SQL surface is
|
semgrep-exclude-rules: 'csharp.lang.security.sqli.csharp-sqli.csharp-sqli'
|
||||||
# local-only inside a Dalamud plugin. Semgrep matches the pattern
|
|
||||||
# without dataflow, so it flags those eight call sites; CodeQL
|
|
||||||
# would not. Suppressed for this repo only.
|
|
||||||
semgrep-exclude-rules: "csharp.lang.security.sqli.csharp-sqli.csharp-sqli"
|
|
||||||
|
|||||||
@@ -1,73 +1,73 @@
|
|||||||
name: Bug report
|
name: Bug report
|
||||||
description: Something in HellionChat is broken or behaves wrong
|
description: Something in HellionChat is broken or behaves wrong
|
||||||
labels:
|
labels:
|
||||||
- bug
|
- bug
|
||||||
body:
|
body:
|
||||||
- type: markdown
|
- type: markdown
|
||||||
attributes:
|
attributes:
|
||||||
value: |
|
value: |
|
||||||
Thanks for reporting. Please fill in the fields below so I can
|
Thanks for reporting. Please fill in the fields below so I can
|
||||||
reproduce the issue. If this is a security issue, stop here and
|
reproduce the issue. If this is a security issue, stop here and
|
||||||
report it privately to [kontakt@hellion-media.de](mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D)
|
report it privately to [kontakt@hellion-media.de](mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D)
|
||||||
instead.
|
instead.
|
||||||
|
|
||||||
- type: input
|
- type: input
|
||||||
id: version
|
id: version
|
||||||
attributes:
|
attributes:
|
||||||
label: HellionChat version
|
label: HellionChat version
|
||||||
description: From Settings → Information → Version
|
description: From Settings → Information → Version
|
||||||
placeholder: "0.5.4"
|
placeholder: '0.5.4'
|
||||||
validations:
|
validations:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
- type: dropdown
|
||||||
|
id: platform
|
||||||
|
attributes:
|
||||||
|
label: Platform
|
||||||
|
options:
|
||||||
|
- Windows (XIVLauncher)
|
||||||
|
- Linux (XIVLauncher Core)
|
||||||
|
- macOS (XIVLauncher Core / wine)
|
||||||
|
- Other
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: what-happened
|
||||||
|
attributes:
|
||||||
|
label: What happened
|
||||||
|
description: Plain description, no log dumps yet
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: expected
|
||||||
|
attributes:
|
||||||
|
label: What you expected
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: steps
|
||||||
|
attributes:
|
||||||
|
label: How to reproduce
|
||||||
|
description: Step-by-step from "open settings" or "log in" through to the broken behaviour
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: log
|
||||||
|
attributes:
|
||||||
|
label: Relevant /xllog excerpt
|
||||||
|
description: Filter for "HellionChat" if the log is huge
|
||||||
|
render: text
|
||||||
|
|
||||||
|
- type: checkboxes
|
||||||
|
id: confirm
|
||||||
|
attributes:
|
||||||
|
label: Pre-flight
|
||||||
|
options:
|
||||||
|
- label: I am running the latest version of HellionChat
|
||||||
required: true
|
required: true
|
||||||
|
- label: I have searched existing issues for duplicates
|
||||||
- type: dropdown
|
|
||||||
id: platform
|
|
||||||
attributes:
|
|
||||||
label: Platform
|
|
||||||
options:
|
|
||||||
- Windows (XIVLauncher)
|
|
||||||
- Linux (XIVLauncher Core)
|
|
||||||
- macOS (XIVLauncher Core / wine)
|
|
||||||
- Other
|
|
||||||
validations:
|
|
||||||
required: true
|
required: true
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: what-happened
|
|
||||||
attributes:
|
|
||||||
label: What happened
|
|
||||||
description: Plain description, no log dumps yet
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: expected
|
|
||||||
attributes:
|
|
||||||
label: What you expected
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: steps
|
|
||||||
attributes:
|
|
||||||
label: How to reproduce
|
|
||||||
description: Step-by-step from "open settings" or "log in" through to the broken behaviour
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: log
|
|
||||||
attributes:
|
|
||||||
label: Relevant /xllog excerpt
|
|
||||||
description: Filter for "HellionChat" if the log is huge
|
|
||||||
render: text
|
|
||||||
|
|
||||||
- type: checkboxes
|
|
||||||
id: confirm
|
|
||||||
attributes:
|
|
||||||
label: Pre-flight
|
|
||||||
options:
|
|
||||||
- label: I am running the latest version of HellionChat
|
|
||||||
required: true
|
|
||||||
- label: I have searched existing issues for duplicates
|
|
||||||
required: true
|
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
blank_issues_enabled: false
|
blank_issues_enabled: false
|
||||||
|
|
||||||
contact_links:
|
contact_links:
|
||||||
- name: Security vulnerability
|
- name: Security vulnerability
|
||||||
url: mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D
|
url: mailto:kontakt@hellion-media.de?subject=%5BHellionChat%20Security%5D
|
||||||
about: Do not open a public issue for security problems. Report by e-mail instead.
|
about: Do not open a public issue for security problems. Report by e-mail instead.
|
||||||
|
|
||||||
- name: Upstream Chat 2 issue
|
- name: Upstream Chat 2 issue
|
||||||
url: https://github.com/Infiziert90/ChatTwo/issues
|
url: https://github.com/Infiziert90/ChatTwo/issues
|
||||||
about:
|
about:
|
||||||
If the issue exists in upstream Chat 2 too, please report it there so the original maintainers see it as well.
|
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
|
||||||
about: Quick questions, casual feedback. Bug reports still go through the issue tracker for tracking.
|
about: Quick questions, casual feedback. Bug reports still go through the issue tracker for tracking.
|
||||||
|
|||||||
@@ -1,57 +1,55 @@
|
|||||||
name: Feature request
|
name: Feature request
|
||||||
description: Suggest a feature or enhancement for HellionChat
|
description: Suggest a feature or enhancement for HellionChat
|
||||||
labels:
|
labels:
|
||||||
- enhancement
|
- enhancement
|
||||||
body:
|
body:
|
||||||
- type: markdown
|
- type: markdown
|
||||||
attributes:
|
attributes:
|
||||||
value: |
|
value: |
|
||||||
Thanks for the suggestion. HellionChat focuses on privacy by
|
Thanks for the suggestion. HellionChat focuses on privacy by
|
||||||
default and a small, well-scoped feature set. Suggestions that
|
default and a small, well-scoped feature set. Suggestions that
|
||||||
align with that scope are easier to accept than ones that pull
|
align with that scope are easier to accept than ones that pull
|
||||||
the plugin toward "do everything".
|
the plugin toward "do everything".
|
||||||
|
|
||||||
- type: textarea
|
- type: textarea
|
||||||
id: problem
|
id: problem
|
||||||
attributes:
|
attributes:
|
||||||
label: What problem are you trying to solve
|
label: What problem are you trying to solve
|
||||||
description: The user-side problem, not the proposed solution yet
|
description: The user-side problem, not the proposed solution yet
|
||||||
validations:
|
validations:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: solution
|
||||||
|
attributes:
|
||||||
|
label: What you would like HellionChat to do
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: alternatives
|
||||||
|
attributes:
|
||||||
|
label: Alternatives you have considered
|
||||||
|
description: Other plugins, manual workarounds, settings combinations
|
||||||
|
|
||||||
|
- type: dropdown
|
||||||
|
id: scope
|
||||||
|
attributes:
|
||||||
|
label: Scope estimate from your side
|
||||||
|
options:
|
||||||
|
- 'Small (one tab, one toggle, one filter)'
|
||||||
|
- 'Medium (a settings section, persistent state, one new file)'
|
||||||
|
- 'Large (architectural, touches the message pipeline or the database)'
|
||||||
|
- "I don't know"
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
- type: checkboxes
|
||||||
|
id: confirm
|
||||||
|
attributes:
|
||||||
|
label: Pre-flight
|
||||||
|
options:
|
||||||
|
- 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
|
||||||
- type: textarea
|
|
||||||
id: solution
|
|
||||||
attributes:
|
|
||||||
label: What you would like HellionChat to do
|
|
||||||
validations:
|
|
||||||
required: true
|
required: true
|
||||||
|
|
||||||
- type: textarea
|
|
||||||
id: alternatives
|
|
||||||
attributes:
|
|
||||||
label: Alternatives you have considered
|
|
||||||
description: Other plugins, manual workarounds, settings combinations
|
|
||||||
|
|
||||||
- type: dropdown
|
|
||||||
id: scope
|
|
||||||
attributes:
|
|
||||||
label: Scope estimate from your side
|
|
||||||
options:
|
|
||||||
- "Small (one tab, one toggle, one filter)"
|
|
||||||
- "Medium (a settings section, persistent state, one new file)"
|
|
||||||
- "Large (architectural, touches the message pipeline or the database)"
|
|
||||||
- "I don't know"
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
|
|
||||||
- type: checkboxes
|
|
||||||
id: confirm
|
|
||||||
attributes:
|
|
||||||
label: Pre-flight
|
|
||||||
options:
|
|
||||||
- label: I have searched existing issues for similar requests
|
|
||||||
required: true
|
|
||||||
- label:
|
|
||||||
I understand HellionChat is a privacy-focused fork and not a feature parity tool with upstream Chat
|
|
||||||
2
|
|
||||||
required: true
|
|
||||||
|
|||||||
@@ -18,7 +18,8 @@ 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 change that user-visible defaults rely on)
|
- [ ] Breaking change (config migration, removed feature, or behaviour 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
|
||||||
@@ -55,10 +56,11 @@ new commands, new translations, removed behaviour. If none, write
|
|||||||
|
|
||||||
## Checklist
|
## Checklist
|
||||||
|
|
||||||
- [ ] I have read [CONTRIBUTING.md](../CONTRIBUTING.md) and [CODE_OF_CONDUCT.md](../CODE_OF_CONDUCT.md).
|
- [ ] I have read [CONTRIBUTING.md](../CONTRIBUTING.md) and
|
||||||
|
[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 made that practical, or I have explained why tests
|
- [ ] I added or updated tests where the existing test infrastructure made that practical, or I have
|
||||||
are not applicable.
|
explained why tests are not 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 change is user-visible.
|
||||||
- [ ] I did not include any AI-generated code without disclosing it in the PR description (see
|
- [ ] I did not include any AI-generated code without disclosing it in the PR description (see
|
||||||
[AI_DISCLOSURE.md](../docs/AI_DISCLOSURE.md)).
|
[AI_DISCLOSURE.md](../docs/AI_DISCLOSURE.md)).
|
||||||
|
|||||||
+38
-38
@@ -1,42 +1,42 @@
|
|||||||
version: 2
|
version: 2
|
||||||
|
|
||||||
updates:
|
updates:
|
||||||
# NuGet package updates for the plugin project. Weekly cadence keeps the
|
# NuGet package updates for the plugin project. Weekly cadence keeps the
|
||||||
# noise down while still catching transitive security advisories within
|
# noise down while still catching transitive security advisories within
|
||||||
# a few days of disclosure.
|
# a few days of disclosure.
|
||||||
- package-ecosystem: nuget
|
- package-ecosystem: nuget
|
||||||
directory: /HellionChat
|
directory: /HellionChat
|
||||||
schedule:
|
schedule:
|
||||||
interval: weekly
|
interval: weekly
|
||||||
day: monday
|
day: monday
|
||||||
time: "07:00"
|
time: '07:00'
|
||||||
timezone: Europe/Berlin
|
timezone: Europe/Berlin
|
||||||
open-pull-requests-limit: 5
|
open-pull-requests-limit: 5
|
||||||
labels:
|
labels:
|
||||||
- dependencies
|
- dependencies
|
||||||
- nuget
|
- nuget
|
||||||
commit-message:
|
commit-message:
|
||||||
prefix: "chore(deps)"
|
prefix: 'chore(deps)'
|
||||||
groups:
|
groups:
|
||||||
patches:
|
patches:
|
||||||
update-types:
|
update-types:
|
||||||
- patch
|
- patch
|
||||||
minor:
|
minor:
|
||||||
update-types:
|
update-types:
|
||||||
- minor
|
- minor
|
||||||
|
|
||||||
# GitHub Actions versions in .github/workflows. Lower cadence because
|
# GitHub Actions versions in .github/workflows. Lower cadence because
|
||||||
# Action releases ship less frequently and are usually safe to defer
|
# Action releases ship less frequently and are usually safe to defer
|
||||||
# for a month.
|
# for a month.
|
||||||
- package-ecosystem: github-actions
|
- package-ecosystem: github-actions
|
||||||
directory: /
|
directory: /
|
||||||
schedule:
|
schedule:
|
||||||
interval: monthly
|
interval: monthly
|
||||||
time: "07:00"
|
time: '07:00'
|
||||||
timezone: Europe/Berlin
|
timezone: Europe/Berlin
|
||||||
open-pull-requests-limit: 3
|
open-pull-requests-limit: 3
|
||||||
labels:
|
labels:
|
||||||
- dependencies
|
- dependencies
|
||||||
- github-actions
|
- github-actions
|
||||||
commit-message:
|
commit-message:
|
||||||
prefix: "chore(actions)"
|
prefix: 'chore(actions)'
|
||||||
|
|||||||
@@ -3,15 +3,16 @@ 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
|
- Theme-Engine mit fünf Built-In-Themes: Hellion Arctic (Default), Chat 2 Klassik, Event Horizon,
|
||||||
Grove
|
Moonlit Bloom, Mint Grove
|
||||||
- Settings öffnet jetzt eine Card-Grid-Übersicht — Klick auf eine Card führt in den Detail-View, Breadcrumb und ESC
|
- Settings öffnet jetzt eine Card-Grid-Übersicht — Klick auf eine Card führt in den Detail-View,
|
||||||
zurück zur Übersicht
|
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
|
- Eigene Themes als JSON in `pluginConfigs/HellionChat/themes/` — Beispiel-Vorlage wird beim ersten
|
||||||
abgelegt
|
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
|
- Migration v13 → v14: alle User landen auf Hellion Arctic. Wer den Upstream-Look will, wählt Chat 2
|
||||||
→ Themes
|
Klassik in Settings → Themes
|
||||||
- Anleitung zum Schreiben eigener Themes: `docs/THEME-AUTHORING.md`
|
- Anleitung zum Schreiben eigener Themes: `docs/THEME-AUTHORING.md`
|
||||||
|
|||||||
@@ -3,22 +3,22 @@ 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
|
- Sidebar im neuen Look: fix 44 px breit, nur Icons, Tab-Name als Tooltip beim Hover, vertikale
|
||||||
aktiven Tab
|
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
|
- 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
|
(envelope/star/heart/bell/bookmark/flag/fire) plus eigene Farbe aus 12-Farb-Palette — 84
|
||||||
Partner ergibt konsistent dieselbe
|
Kombinationen, gleicher Partner ergibt konsistent dieselbe
|
||||||
- Pulsierender roter Dot oben rechts am Sidebar-Icon zeigt ungelesene Nachrichten an. Sanft, 2-Sekunden-Cycle,
|
- Pulsierender roter Dot oben rechts am Sidebar-Icon zeigt ungelesene Nachrichten an. Sanft,
|
||||||
deaktivierbar über `Configuration.ReduceMotion` (UI-Toggle in v1.3.0)
|
2-Sekunden-Cycle, 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,
|
- Bottom-Status-Bar (22 px) mit fünf Live-Slots: aktiver Channel + Color-Dot, Privacy-Badge,
|
||||||
Auto-Tell-Counter, Plugin-Version. Update 1×/Sek
|
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.
|
- Card-Rows als Default-Message-Render: Sender-Header in Channel-Farbe, Body neue Zeile, dezenter
|
||||||
`Compact Density`-Toggle in Aussehen schaltet zurück auf den Einzeiler
|
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
|
- Bug-Fix: Settings speichern löscht den Chat-Verlauf nicht mehr. Refilter läuft jetzt nur wenn
|
||||||
Settings geändert wurden — Cosmetic-Änderungen lassen den Chat unverändert. Persistente und Auto-Tell-Tabs überleben
|
Filter-relevante Settings geändert wurden — Cosmetic-Änderungen lassen den Chat unverändert.
|
||||||
beide
|
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
|
||||||
|
|
||||||
|
|||||||
@@ -3,27 +3,31 @@ 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
|
- Settings-Übersicht thematisch re-sortiert: zusammenhängende Optionen wohnen jetzt zusammen, jede
|
||||||
Untertitel — kein Raten mehr wo eine Setting steckt
|
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**
|
- Drei neue Cards: **Theme & Layout** (Theme-Picker, Fenster-Style, Zeitstempel-Style), **Schriften
|
||||||
(Schriftart, Schriftgröße, Chat-Farben pro Channel), **Daten-Verwaltung** (Aufbewahrung, Cleanup, Export, DB-Viewer,
|
& Farben** (Schriftart, Schriftgröße, Chat-Farben pro Channel), **Daten-Verwaltung**
|
||||||
Advanced-Tools — vorher zwischen Datenschutz und Datenbank verteilt)
|
(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,
|
- Vier tote Schema-Felder entfernt (alle obsolet seit der Theme-Engine in v1.1.0):
|
||||||
`Stilname`-Auswahl, alter `WindowAlpha`-Slider, ungenutztes `ShowThemeQuickPicker`
|
`Stilüberschreiben`-Toggle, `Stilname`-Auswahl, alter `WindowAlpha`-Slider, ungenutztes
|
||||||
|
`ShowThemeQuickPicker`
|
||||||
- Migration v15 → v16: alter `WindowAlpha`-Wert wird automatisch nach
|
- 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
|
`Theme & Layout → Fenster-Style → Fenster-Transparenz` gemappt (nur wenn der Slider noch auf
|
||||||
gewinnt der User-Wert). Backup der Pre-v16-Config liegt unter `pluginConfigs/HellionChat.json.pre-v16-backup`. User
|
Default 0.85 stand, sonst gewinnt der User-Wert). Backup der Pre-v16-Config liegt unter
|
||||||
die `Stilüberschreiben` aktiv hatten sehen einen einmaligen Hinweis-Toast
|
`pluginConfigs/HellionChat.json.pre-v16-backup`. User die `Stilüberschreiben` aktiv hatten sehen
|
||||||
- UX-Default-Bumps für Bestand-User mit Default-Werten: Card-Rows-Layout zurück auf Single-Line, NG+ standardmäßig
|
einen einmaligen Hinweis-Toast
|
||||||
hidden, gleiche Zeitstempel werden zusammengefasst, MaxLinesToRender auf konservativere 2500
|
- UX-Default-Bumps für Bestand-User mit Default-Werten: Card-Rows-Layout zurück auf Single-Line, NG+
|
||||||
- Frische Installs starten mit dem Hellion-Brand-Chat-Color-Preset out-of-the-box (der First-Run-Wizard hat keine
|
standardmäßig hidden, gleiche Zeitstempel werden zusammengefasst, MaxLinesToRender auf
|
||||||
Preset-Wahl)
|
konservativere 2500
|
||||||
- Hinweis zum Window-Transparenz-Slider in der Beschreibung: Dalamud's per-Window-Hamburger-Menü (oben rechts in der
|
- Frische Installs starten mit dem Hellion-Brand-Chat-Color-Preset out-of-the-box (der
|
||||||
Titelleiste) bietet eigene Overrides für Deckkraft, Hintergrund-Blur, Anpinnen und Durchklick — die haben Vorrang über
|
First-Run-Wizard hat keine Preset-Wahl)
|
||||||
unseren Slider für das jeweilige Fenster
|
- 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)
|
Pure UX-Polish, keine neuen Features. Nächster Cycle (v1.3.0): Animation-Polish (Lerps,
|
||||||
wie ursprünglich geplant.
|
Theme-Crossfade, Quick-Picker) wie ursprünglich geplant.
|
||||||
|
|||||||
@@ -3,21 +3,23 @@ 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
|
- Vier neue Built-in-Themes verlängern die Auswahl im Picker — keine Engine-Änderung, keine Settings
|
||||||
mehr Farboptionen
|
angefasst, einfach mehr Farboptionen
|
||||||
- **Night Blue** — Royal Blue auf tiefem Marineblau. Kühles Tech-Dashboard-Mood, bewusst neutral gehalten damit es sich
|
- **Night Blue** — Royal Blue auf tiefem Marineblau. Kühles Tech-Dashboard-Mood, bewusst neutral
|
||||||
nicht mit den Brand-Themes beißt
|
gehalten damit es sich nicht mit den Brand-Themes beißt
|
||||||
- **Indigo Violet** — Royal Violet auf Deep Indigo mit Türkis-Mint-Counter für Aurora-Glitter-Stimmung. Schwester von
|
- **Indigo Violet** — Royal Violet auf Deep Indigo mit Türkis-Mint-Counter für
|
||||||
Event Horizon, aber dunkler und dichter; der Türkis-Akzent hält die beiden klar auseinander
|
Aurora-Glitter-Stimmung. Schwester von Event Horizon, aber dunkler und dichter; der Türkis-Akzent
|
||||||
- **Forge Merchantman** — Patina-Bronze auf Workshop-Slate mit warmem Bernstein-Counter. Hellion Forge bekommt ein
|
hält die beiden klar auseinander
|
||||||
eigenes Theme im Plugin selbst — Schwester von Hellion Arctic, aber grüner und wärmer statt kaltem Cyan
|
- **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
|
- **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);
|
Wong/Okabe-Ito-Palette. Channel-Identität bleibt erhalten (Tell pink, Yell gelb, Shout orange,
|
||||||
die Töne sind so gewählt dass jeder Channel auch unter Rot-Grün-Schwäche klar trennbar bleibt. Deckt rund 99 % aller
|
Party blau, FC grün); die Töne sind so gewählt dass jeder Channel auch unter Rot-Grün-Schwäche
|
||||||
CVD-Fälle ab
|
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
|
- Kein Schema-Bump, keine Migration. Das Default-Theme bleibt **Hellion Arctic**, eigene
|
||||||
unverändert weiter
|
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)
|
Reines Theme-Pack zwischen v1.2.1 und dem nächsten Polish-Cycle. Eine Tritan-Variante (Spectrum für
|
||||||
kann später nachgeliefert werden, falls Bedarf kommt.
|
Blau-Gelb-Schwäche) kann später nachgeliefert werden, falls Bedarf kommt.
|
||||||
|
|||||||
@@ -4,15 +4,17 @@ 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
|
- **Honorific-Custom-Titles im Chat-Header** — der Titel den du in Honorific gesetzt hast erscheint
|
||||||
Message-Log mit der von dir gewählten Farbe, Auto-Hide wenn Honorific nicht installiert ist oder kein Custom-Titel
|
jetzt links über dem Message-Log mit der von dir gewählten Farbe, Auto-Hide wenn Honorific nicht
|
||||||
aktiv ist
|
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
|
||||||
- **Neuer Integrations-Settings-Tab** mit Status-Indikator (erkannt, nicht installiert, inkompatibel) und Toggle. Plus
|
User raten muss
|
||||||
Vorschau-Block der die fünf weiteren geplanten Cycles ankündigt: Kontextmenü-Aktionen, Smart Notifications
|
- **Neuer Integrations-Settings-Tab** mit Status-Indikator (erkannt, nicht installiert,
|
||||||
(NotificationMaster), RP-Status-Block (Moodles und LightlessClient), ExtraChat-Channels, Quick-DM-Button
|
inkompatibel) und Toggle. Plus Vorschau-Block der die fünf weiteren geplanten Cycles ankündigt:
|
||||||
(XIVInstantMessenger)
|
Kontextmenü-Aktionen, Smart Notifications (NotificationMaster), RP-Status-Block (Moodles und
|
||||||
- **Maintainer-Attribution** im Tab als Höflichkeits-Geste, zwei Buttons zum Honorific-Repo und zum Caraxi-Profil. Plus
|
LightlessClient), ExtraChat-Channels, Quick-DM-Button (XIVInstantMessenger)
|
||||||
Hellion-Forge-Discord-Button für Community-Vorschläge zu künftigen Integrationen
|
- **Maintainer-Attribution** im Tab als Höflichkeits-Geste, zwei Buttons zum Honorific-Repo und zum
|
||||||
- Keine Migration, keine Schema-Änderung. Wer Honorific eh schon nutzt sieht den Custom-Titel automatisch sobald
|
Caraxi-Profil. Plus Hellion-Forge-Discord-Button für Community-Vorschläge zu künftigen
|
||||||
HellionChat aktualisiert
|
Integrationen
|
||||||
|
- Keine Migration, keine Schema-Änderung. Wer Honorific eh schon nutzt sieht den Custom-Titel
|
||||||
|
automatisch sobald HellionChat aktualisiert
|
||||||
|
|||||||
@@ -5,19 +5,20 @@ 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 bekannte Lifecycle- und Race-Bugs aus den Audit-Pässen
|
Erster Sub-Patch der v1.4.x Polish-Sweep-Serie. Sieben bekannte Lifecycle- und Race-Bugs aus den
|
||||||
abgearbeitet, bevor Performance- und Architektur-Refactors draufkommen.
|
Audit-Pässen abgearbeitet, bevor Performance- und Architektur-Refactors draufkommen.
|
||||||
|
|
||||||
- **SQLite-Dispose** lehnt sich nicht mehr an GC-Druck zur Datei-Freigabe an, Pooling=false auf der Connection macht den
|
- **SQLite-Dispose** lehnt sich nicht mehr an GC-Druck zur Datei-Freigabe an, Pooling=false auf der
|
||||||
manuellen GC.Collect überflüssig
|
Connection macht 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
|
||||||
sauber unloaden bei XIVLauncher-Reload ohne darauf zu warten
|
Plugin-Domain kann sauber unloaden bei XIVLauncher-Reload ohne darauf zu warten
|
||||||
- **EmoteCache-Loader** von async-void auf async-Task mit shared Task-Tracker, drain-on-Dispose. Kein Schreib-Risiko
|
- **EmoteCache-Loader** von async-void auf async-Task mit shared Task-Tracker, drain-on-Dispose.
|
||||||
mehr auf disposed EmoteImages-Einträge nach Plugin-Reload
|
Kein Schreib-Risiko mehr auf disposed EmoteImages-Einträge nach Plugin-Reload
|
||||||
- **DisposeAsync-Timeout** (10s) warnt jetzt laut statt silent zu failen
|
- **DisposeAsync-Timeout** (10s) warnt jetzt laut statt silent zu failen
|
||||||
- **Plugin-Dispose** flushed pending DeferredSave bevor Services abgebaut werden, Settings-Änderungen aus den letzten
|
- **Plugin-Dispose** flushed pending DeferredSave bevor Services abgebaut werden,
|
||||||
Frames vor Disable überleben jetzt zuverlässig
|
Settings-Änderungen aus den letzten Frames vor Disable überleben jetzt zuverlässig
|
||||||
- **v13→v14 Config-Migration** liest pre-v13-Backup und überträgt HellionThemeWindowOpacity in das neue
|
- **v13→v14 Config-Migration** liest pre-v13-Backup und überträgt HellionThemeWindowOpacity in das
|
||||||
WindowOpacity-Feld statt auf 0.85 zurückzufallen
|
neue WindowOpacity-Feld statt auf 0.85 zurückzufallen
|
||||||
|
|
||||||
Keine Schema-Bumps, keine User-sichtbaren Funktions-Änderungen außer dass Reload und Shutdown spürbar sauberer laufen.
|
Keine Schema-Bumps, keine User-sichtbaren Funktions-Änderungen außer dass Reload und Shutdown
|
||||||
|
spürbar sauberer laufen.
|
||||||
|
|||||||
@@ -5,23 +5,25 @@ 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 aus dem Theme-Engine-Render-Pfad eliminiert,
|
Zweiter Sub-Patch der v1.4.x Polish-Sweep-Serie. Heap-Pressure aus dem Theme-Engine-Render-Pfad
|
||||||
Custom-Theme- Hot-Reload überlebt transiente File-Locks beim Editor-Save. Plus zehnter Built-In und überarbeitete
|
eliminiert, Custom-Theme- Hot-Reload überlebt transiente File-Locks beim Editor-Save. Plus zehnter
|
||||||
Author-Credits.
|
Built-In und überarbeitete Author-Credits.
|
||||||
|
|
||||||
- **ABGR-Cache auf den Theme-Records.** Beim Theme-Register (Built-In oder Custom) werden alle Color-Slots einmalig in
|
- **ABGR-Cache auf den Theme-Records.** Beim Theme-Register (Built-In oder Custom) werden alle
|
||||||
ABGR-Pack-Form vor-konvertiert. HellionStyle.PushGlobal liest aus dem Cache statt pro Slot pro Frame durch
|
Color-Slots einmalig in ABGR-Pack-Form vor-konvertiert. HellionStyle.PushGlobal liest aus dem
|
||||||
ColourUtil.RgbaToAbgr zu jagen. Real gemessene Frame-Time-Recovery: **~13 %** in typischer Render-Szene
|
Cache statt pro Slot pro Frame durch ColourUtil.RgbaToAbgr zu jagen. Real gemessene
|
||||||
(Plan-Erwartung war 2-6 % konservativ, real ~10-15 %)
|
Frame-Time-Recovery: **~13 %** in typischer Render-Szene (Plan-Erwartung war 2-6 % konservativ,
|
||||||
- **Custom-Theme File-Lock-Härtung.** Wenn der User ein Theme-JSON gerade speichert während HellionChat reloaden will,
|
real ~10-15 %)
|
||||||
fängt der Loader jetzt explizit Sharing-Violation und Lock-Violation ab. Last-Known-Good-Snapshot bleibt im Picker,
|
- **Custom-Theme File-Lock-Härtung.** Wenn der User ein Theme-JSON gerade speichert während
|
||||||
beim nächsten Tick wird automatisch retry'd — vorher fiel das Theme aus der Liste bis zum Plugin-Reload
|
HellionChat reloaden will, fängt der Loader jetzt explizit Sharing-Violation und Lock-Violation
|
||||||
- **Defensive Cache-Refresh beim Theme-Switch.** Falls ein Theme auf einem alten Pfad ohne Cache-Fill in den Speicher
|
ab. Last-Known-Good-Snapshot bleibt im Picker, beim nächsten Tick wird automatisch retry'd —
|
||||||
gekommen ist, holt Switch() das beim Anwenden nach
|
vorher fiel das Theme aus der Liste bis zum Plugin-Reload
|
||||||
- **Synthwave Sunset als zehnter Built-In.** Hot Magenta + Cyan auf Mitternachts-Violett, 80s-Neon-Grid-Vibes für
|
- **Defensive Cache-Refresh beim Theme-Switch.** Falls ein Theme auf einem alten Pfad ohne
|
||||||
Late-Night-Raids
|
Cache-Fill in den Speicher gekommen ist, holt Switch() das beim Anwenden nach
|
||||||
- **Author-Credits konsolidiert.** Brand-Themes laufen jetzt unter „Hellion Forge". Mint Grove und Forge Merchantman
|
- **Synthwave Sunset als zehnter Built-In.** Hot Magenta + Cyan auf Mitternachts-Violett,
|
||||||
werden Carla Beleandis als Community-Geste zugeschrieben.
|
80s-Neon-Grid-Vibes für Late-Night-Raids
|
||||||
|
- **Author-Credits konsolidiert.** Brand-Themes laufen jetzt unter „Hellion Forge". Mint Grove und
|
||||||
|
Forge Merchantman werden Carla Beleandis als Community-Geste zugeschrieben.
|
||||||
|
|
||||||
Keine Schema-Bumps, keine User-sichtbaren Funktions- Änderungen außer dass die Frames in Theme-getrieben rendernden
|
Keine Schema-Bumps, keine User-sichtbaren Funktions- Änderungen außer dass die Frames in
|
||||||
Szenen merklich glatter laufen und ein neues Theme im Picker steht.
|
Theme-getrieben rendernden Szenen merklich glatter laufen und ein neues Theme im Picker steht.
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
---
|
||||||
|
subtitle: Symbol-Picker und Tell-History Fix
|
||||||
|
versionsnatur: Feature-Patch + Hotfix
|
||||||
|
---
|
||||||
|
|
||||||
|
- Symbol-Picker im Chat-Eingang: ein kleiner Smile-Button links neben dem Kanal-Indikator öffnet ein
|
||||||
|
Popup mit zwei Tabs. Der erste listet alle 161 FFXIV-PUA-Glyphen (Dalamuds SeIconChar); der zweite
|
||||||
|
trägt 97 verifizierte BMP-Symbole (Latin-Marken, Währungen, das ganze griechische Alphabet,
|
||||||
|
Geometrie, Spielkarten, Noten) — jedes davon über `/echo` und `/say` in einer vierrundigen
|
||||||
|
Whitelist-Probe durchgereicht, damit der Channel-Render dem entspricht, was der Picker anzeigt.
|
||||||
|
Klick fügt das Symbol an der Cursor-Position ein, Multi-Insert lässt das Popup offen, eine
|
||||||
|
Recent-Used-Leiste zeigt die letzten sechzehn Picks über beide Tabs. Toggle in Settings → Chat →
|
||||||
|
Nachrichten-Verhalten, Default an.
|
||||||
|
- Verlauf in angepinnten Tell-Tabs lädt wieder vollständig: ein versteckter 500-Zeilen-Scan-Cap in
|
||||||
|
PreloadHistory hat das User-Setting `AutoTellTabsHistoryPreload` überschrieben, wodurch
|
||||||
|
weniger-frequente Tell-Partner ihren Backlog verloren haben sobald die Scan-Schicht mit anderen
|
||||||
|
Chat-Partnern voll lief. Cap ist raus, der Index auf `(Receiver, Date)` hält die Query schnell.
|
||||||
|
- Slash-Command-Teardown: /hellion, /hellionView, /hellionDebugger (und im Debug-Build
|
||||||
|
/hellionSeString) sind als private Felder gecached. Plugin-Dispose detached die echte
|
||||||
|
Registrierung, statt mit identischen Args neu zu registrieren — schließt eine latente
|
||||||
|
Wartungs-Falle aus v1.4.9.
|
||||||
|
- v1.4.x-Polish-Sweep endet hier. Der ImGuiListClipper-Refactor von der v1.4.10-Reserve-Liste wurde
|
||||||
|
gecancelt, nachdem der Cross- Plattform-Smoke gezeigt hat dass das Scroll-Gummi ein Wine/Linux-
|
||||||
|
Quirk ist — Windows-User haben es nie gesehen. Spike dafür kommt in einem späteren Patch. Nächster
|
||||||
|
Major-Cycle ist v1.5.0 mit der DI-Container-Adoption (`Microsoft.Extensions.Hosting` +
|
||||||
|
`ILogger<T>`) nach dem Lightless-Vorbild.
|
||||||
|
- Migration v17 unverändert: kein Schema-Bump, kein Config-Migrations-Aufwand.
|
||||||
@@ -5,25 +5,27 @@ 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 Per-Frame-Allokations-Quellen aus dem ChatLogWindow-Render- Pfad
|
Dritter Sub-Patch der v1.4.x Polish-Sweep-Serie. Drei Per-Frame-Allokations-Quellen aus dem
|
||||||
und der Settings-StatusBar eliminiert.
|
ChatLogWindow-Render- Pfad und der Settings-StatusBar eliminiert.
|
||||||
|
|
||||||
- **Card-Mode-Border-Loop entlastet.** DrawMessages hebt Theme, DrawList, Window-Left, Window-Right und die ABGR-
|
- **Card-Mode-Border-Loop entlastet.** DrawMessages hebt Theme, DrawList, Window-Left, Window-Right
|
||||||
Border-Color einmalig vor den Per-Message-Loop. Bei 100 sichtbaren Messages sind das gut 500 redundante P/Invokes und
|
und die ABGR- Border-Color einmalig vor den Per-Message-Loop. Bei 100 sichtbaren Messages sind das
|
||||||
Property-Reads, die der Hoist eliminiert. Pop-Out- Heavy-Setups (mehrere parallele Chat-Windows) profitieren
|
gut 500 redundante P/Invokes und Property-Reads, die der Hoist eliminiert. Pop-Out- Heavy-Setups
|
||||||
proportional, weil der Hoist pro DrawMessages-Call greift, also pro Window
|
(mehrere parallele Chat-Windows) profitieren proportional, weil der Hoist pro DrawMessages-Call
|
||||||
- **Auto-Tell Tab-Tint und Icon gecached.** Die Hash-Color- Berechnung für Auto-Tell-Tabs lief pro Tab pro Frame, mit
|
greift, also pro Window
|
||||||
zwei String-Allokationen pro Tab (eine für Tint-Hash, eine für Icon-Hash). Der neue TabTintCache liest pre-computed
|
- **Auto-Tell Tab-Tint und Icon gecached.** Die Hash-Color- Berechnung für Auto-Tell-Tabs lief pro
|
||||||
Werte aus dem Tab und rechnet nur neu wenn das Tell-Target drifted. Beide Caches haben separate Validation-Keys, also
|
Tab pro Frame, mit zwei String-Allokationen pro Tab (eine für Tint-Hash, eine für Icon-Hash). Der
|
||||||
keine Cross-Invalidation zwischen Tint- und Icon-Pfad. AutoTellTabTint selbst bleibt pure Hash-Helper, weiterhin ohne
|
neue TabTintCache liest pre-computed Werte aus dem Tab und rechnet nur neu wenn das Tell-Target
|
||||||
Tab-Awareness
|
drifted. Beide Caches haben separate Validation-Keys, also keine Cross-Invalidation zwischen Tint-
|
||||||
- **StatusBar-Aggregation hinter Cache-Gate.** Die Status- Leiste am unteren Window-Rand summiert die Tab-Message-
|
und Icon-Pfad. AutoTellTabTint selbst bleibt pure Hash-Helper, weiterhin ohne Tab-Awareness
|
||||||
Counts und zählt die Auto-Tell-Tabs pro Frame. Der Cache- Gate (1 Sekunde) lag bisher hinter den LINQ-Pfaden, also
|
- **StatusBar-Aggregation hinter Cache-Gate.** Die Status- Leiste am unteren Window-Rand summiert
|
||||||
liefen Sum und Count trotzdem pro Frame. Jetzt vor dem Gate, plus die LINQ-Pfade durch eine Single-Pass-Foreach
|
die Tab-Message- Counts und zählt die Auto-Tell-Tabs pro Frame. Der Cache- Gate (1 Sekunde) lag
|
||||||
ersetzt. Die Aggregation läuft auf etwa 1 % der Frames
|
bisher hinter den LINQ-Pfaden, also liefen Sum und Count trotzdem pro Frame. Jetzt vor dem Gate,
|
||||||
|
plus die LINQ-Pfade durch eine Single-Pass-Foreach ersetzt. Die Aggregation läuft auf etwa 1 % der
|
||||||
|
Frames
|
||||||
|
|
||||||
Realistische Frame-Time-Recovery: 2-5 % in typischen Szenen, Pop-Out-Heavy-Setups potenziell mehr durch die Card-Border-
|
Realistische Frame-Time-Recovery: 2-5 % in typischen Szenen, Pop-Out-Heavy-Setups potenziell mehr
|
||||||
Multiplikation pro Window.
|
durch die Card-Border- Multiplikation pro Window.
|
||||||
|
|
||||||
Keine Schema-Bumps, keine User-sichtbaren Funktions- Änderungen außer dass die Frames im Chat-Log und in der
|
Keine Schema-Bumps, keine User-sichtbaren Funktions- Änderungen außer dass die Frames im Chat-Log
|
||||||
Settings-Statusleiste merklich glatter laufen.
|
und in der Settings-Statusleiste merklich glatter laufen.
|
||||||
|
|||||||
@@ -5,25 +5,29 @@ 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- Lifecycle auf Dalamud's `IAsyncDalamudPlugin`-API migriert und
|
Vierter Sub-Patch der v1.4.x Polish-Sweep-Serie. Plugin- Lifecycle auf Dalamud's
|
||||||
das Custom-Repo zieht von GitHub auf Gitea um.
|
`IAsyncDalamudPlugin`-API migriert und das Custom-Repo zieht von GitHub auf Gitea um.
|
||||||
|
|
||||||
- **Async-Plugin-Architektur.** Konstruktor übernimmt nur noch die Bootstrap-Essentials (Config-Load, Language-Init,
|
- **Async-Plugin-Architektur.** Konstruktor übernimmt nur noch die Bootstrap-Essentials
|
||||||
Conflict-Detection). Migrationen, Service-Allokationen, Window-Konstruktion und Hook-Subscription wandern in
|
(Config-Load, Language-Init, 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 LoadAsync, sodass Dalamud die UI während der
|
||||||
DisposeAsync mirrort LightlessSync's Pattern, plus Idempotency-Guard gegen Reload-Races
|
schweren Arbeit responsive halten kann. Per-Line-CaptureFailure in DisposeAsync mirrort
|
||||||
- **Custom-Repo-URL umgezogen auf Gitea.** Bestehende Tester müssen einmalig in XIVLauncher die Custom-Repo-URL auf
|
LightlessSync's Pattern, plus Idempotency-Guard gegen Reload-Races
|
||||||
`https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json` umstellen, dann
|
- **Custom-Repo-URL umgezogen auf Gitea.** Bestehende Tester müssen einmalig in XIVLauncher die
|
||||||
XIVLauncher neu starten. Das alte GitHub-Repo bleibt als eingefrorener v1.4.2-Snapshot stehen und wird nicht mehr
|
Custom-Repo-URL auf
|
||||||
aktualisiert
|
`https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json`
|
||||||
- **Schema-Gate statt Migrations-Kette.** Die v9 → v16 Migrationen sind raus, ersetzt durch einen harten Schema-Check in
|
umstellen, dann XIVLauncher neu starten. Das alte GitHub-Repo bleibt als eingefrorener
|
||||||
Phase 1. Configs auf Schema v16+ laden direkt; ältere Configs (vor v1.2.1) bekommen jetzt eine klare „install v1.4.2
|
v1.4.2-Snapshot stehen und wird nicht mehr aktualisiert
|
||||||
first"-Fehlermeldung statt eines impliziten Migrations-Pfads
|
- **Schema-Gate statt Migrations-Kette.** Die v9 → v16 Migrationen sind raus, ersetzt durch einen
|
||||||
- **AutoTranslate-Cache läuft im Hintergrund.** Der Cache füllt sich jetzt fire-and-forget statt blockierend im
|
harten Schema-Check in Phase 1. Configs auf Schema v16+ laden direkt; ältere Configs (vor v1.2.1)
|
||||||
Plugin-Load. Trade-off: die erste Auto-Translate-Nutzung einer Session kann einen kurzen Hitch haben, dafür kein
|
bekommen jetzt eine klare „install v1.4.2 first"-Fehlermeldung statt eines impliziten
|
||||||
300-ms-Block beim Plugin-Start
|
Migrations-Pfads
|
||||||
- **Plugin-Load-Zeit ehrlich.** Median 3,7 s über fünf Reloads, vergleichbar mit v1.4.2. Der Async-Refactor ist
|
- **AutoTranslate-Cache läuft im Hintergrund.** Der Cache füllt sich jetzt fire-and-forget statt
|
||||||
Foundation für künftige Lazy-Init-Optimierungen (v1.4.4) und Code-Architektur-Hygiene, kein direkter User-spürbarer
|
blockierend im Plugin-Load. Trade-off: die erste Auto-Translate-Nutzung einer Session kann einen
|
||||||
Speed-Win in dieser Release
|
kurzen Hitch haben, dafür kein 300-ms-Block beim Plugin-Start
|
||||||
|
- **Plugin-Load-Zeit ehrlich.** Median 3,7 s über fünf Reloads, vergleichbar mit v1.4.2. Der
|
||||||
|
Async-Refactor ist Foundation für künftige Lazy-Init-Optimierungen (v1.4.4) und
|
||||||
|
Code-Architektur-Hygiene, kein direkter User-spürbarer Speed-Win in dieser Release
|
||||||
|
|
||||||
Keine User-sichtbaren Funktions-Änderungen außer dem Repo-URL-Update. Settings, Themes und Tabs bleiben unangetastet.
|
Keine User-sichtbaren Funktions-Änderungen außer dem Repo-URL-Update. Settings, Themes und Tabs
|
||||||
|
bleiben unangetastet.
|
||||||
|
|||||||
@@ -5,30 +5,33 @@ versionsnatur: Wartung und Robustheit
|
|||||||
|
|
||||||
**Hellion Chat 1.4.4 — Threading- und IPC-Sicherheits-Politur**
|
**Hellion Chat 1.4.4 — Threading- und IPC-Sicherheits-Politur**
|
||||||
|
|
||||||
Fünfter Sub-Patch der v1.4.x Polish-Sweep-Serie. Threading-Annahmen werden explizit pro Methode dokumentiert, ein
|
Fünfter Sub-Patch der v1.4.x Polish-Sweep-Serie. Threading-Annahmen werden explizit pro Methode
|
||||||
Hot-Path-Lock im Auto-Tell-Tab-Counter fällt weg, IPC-Cleanup wird sichtbar wenn er fehlschlägt und der Privacy-Filter
|
dokumentiert, ein Hot-Path-Lock im Auto-Tell-Tab-Counter fällt weg, IPC-Cleanup wird sichtbar wenn
|
||||||
spricht jetzt bei unbekannten ChatTypes.
|
er fehlschlägt und der Privacy-Filter spricht jetzt bei unbekannten ChatTypes.
|
||||||
|
|
||||||
- **AutoTellTabsService Hot-Path-Lock entfernt.** `ActiveTempTabCount` hat bisher pro Render-Frame ein LINQ-Count unter
|
- **AutoTellTabsService Hot-Path-Lock entfernt.** `ActiveTempTabCount` hat bisher pro Render-Frame
|
||||||
einem Lock gemacht. Jetzt läuft das über einen Interlocked-Counter der parallel zur Tabs-Liste mitgeführt wird,
|
ein LINQ-Count unter einem Lock gemacht. Jetzt läuft das über einen Interlocked-Counter der
|
||||||
inklusive Resync-Hook für den Snapshot-Restore-Pfad in `SaveConfig`. Plus Pure-Helper-Test-Mirror in der Build-Suite
|
parallel zur Tabs-Liste mitgeführt wird, inklusive Resync-Hook für den Snapshot-Restore-Pfad in
|
||||||
damit die Atomicity-Semantik nicht versehentlich wegrefactored wird
|
`SaveConfig`. Plus Pure-Helper-Test-Mirror in der Build-Suite damit die Atomicity-Semantik nicht
|
||||||
- **HonorificService selbst-dokumentierende Threading-Banner.** Statt eines Block-Comments am Klassen-Ende hat jede
|
versehentlich wegrefactored wird
|
||||||
IPC-Callback-Methode jetzt einen 1-Zeilen-Banner darüber, der den Thread-Kontext direkt am Call-Site benennt
|
- **HonorificService selbst-dokumentierende Threading-Banner.** Statt eines Block-Comments am
|
||||||
(framework only, framework scheduled, any). Mehr Hilfe für künftige Reviews als ein abstraktes Threading-Kapitel
|
Klassen-Ende hat jede IPC-Callback-Methode jetzt einen 1-Zeilen-Banner darüber, der den
|
||||||
- **Unsubscribe-Failure ist jetzt sichtbar.** `TryUnsubscribe` hat ein Honorific-Unsubscribe-Failure bisher als Debug
|
Thread-Kontext direkt am Call-Site benennt (framework only, framework scheduled, any). Mehr Hilfe
|
||||||
geloggt, was bei Standard-Loglevel verschluckt wurde. Eine geleakte Subscription kann den Service über Plugin-Reloads
|
für künftige Reviews als ein abstraktes Threading-Kapitel
|
||||||
hinweg leben lassen, also läuft der Log jetzt auf Warning
|
- **Unsubscribe-Failure ist jetzt sichtbar.** `TryUnsubscribe` hat ein Honorific-Unsubscribe-Failure
|
||||||
- **AutoTranslate-Warmup blockiert den Plugin-Unload nicht mehr.** Der Cache-Warmup-Thread war ohne `IsBackground=true`
|
bisher als Debug geloggt, was bei Standard-Loglevel verschluckt wurde. Eine geleakte Subscription
|
||||||
unterwegs, was den Unload um 100-300 ms verzögern konnte. Pattern-Match zu MessageManager und RetentionSweep (beide
|
kann den Service über Plugin-Reloads hinweg leben lassen, also läuft der Log jetzt auf Warning
|
||||||
seit v1.4.0)
|
- **AutoTranslate-Warmup blockiert den Plugin-Unload nicht mehr.** Der Cache-Warmup-Thread war ohne
|
||||||
- **Privacy-Filter loggt unbekannte ChatTypes.** Wenn FFXIV durch einen Patch einen neuen ChatType einführt der weder in
|
`IsBackground=true` unterwegs, was den Unload um 100-300 ms verzögern konnte. Pattern-Match zu
|
||||||
der Whitelist noch in den Defaults steht, wird er bisher silent durch den Failsafe geleitet. Jetzt loggt der Filter
|
MessageManager und RetentionSweep (beide seit v1.4.0)
|
||||||
einmalig pro Runtime eine Warning mit dem Type und dem Failsafe-Wert. Dedup über ein NonSerialized-HashSet, also kein
|
- **Privacy-Filter loggt unbekannte ChatTypes.** Wenn FFXIV durch einen Patch einen neuen ChatType
|
||||||
Log-Spam
|
einführt der weder in der Whitelist noch in den Defaults steht, wird er bisher silent durch den
|
||||||
- **Default-Flip für neue Installationen.** `PrivacyPersistUnknownChannels` startet bei neuen Configs jetzt auf `true`,
|
Failsafe geleitet. Jetzt loggt der Filter einmalig pro Runtime eine Warning mit dem Type und dem
|
||||||
damit ein Patch-bedingt neuer ChatType nicht stillschweigend gedroppt wird bevor der User entscheiden kann. Bestehende
|
Failsafe-Wert. Dedup über ein NonSerialized-HashSet, also kein Log-Spam
|
||||||
Configs behalten ihre Wahl, weil der Deserializer den Initializer überschreibt. Keine Migration, kein Schema-Bump
|
- **Default-Flip für neue Installationen.** `PrivacyPersistUnknownChannels` startet bei neuen
|
||||||
|
Configs jetzt auf `true`, damit ein Patch-bedingt neuer ChatType nicht stillschweigend gedroppt
|
||||||
|
wird bevor der User entscheiden kann. Bestehende Configs behalten ihre Wahl, weil der Deserializer
|
||||||
|
den Initializer überschreibt. Keine Migration, kein Schema-Bump
|
||||||
|
|
||||||
Keine User-sichtbaren Funktions-Änderungen außer dem Default-Flip für neue Installationen. Settings, Themes, Tabs und
|
Keine User-sichtbaren Funktions-Änderungen außer dem Default-Flip für neue Installationen. Settings,
|
||||||
das Privacy-Verhalten für Bestand bleiben unangetastet.
|
Themes, Tabs und das Privacy-Verhalten für Bestand bleiben unangetastet.
|
||||||
|
|||||||
@@ -5,24 +5,27 @@ versionsnatur: UX-Polish-Cycle
|
|||||||
|
|
||||||
**Hellion Chat 1.4.5 — UX und Robustheit**
|
**Hellion Chat 1.4.5 — UX und Robustheit**
|
||||||
|
|
||||||
Sechster Sub-Patch der v1.4.x Polish-Sweep-Serie. Render-Fehler im Chat-Fenster werden jetzt sichtbar, der
|
Sechster Sub-Patch der v1.4.x Polish-Sweep-Serie. Render-Fehler im Chat-Fenster werden jetzt
|
||||||
First-Run-Wizard hat eine explizite Cancel-Schaltfläche, der Eingabe-Verlauf bleibt nicht mehr über Plugin-Reloads
|
sichtbar, der First-Run-Wizard hat eine explizite Cancel-Schaltfläche, der Eingabe-Verlauf bleibt
|
||||||
hinweg liegen, und die Statusleiste klippt in schmalen Fenstern nicht mehr.
|
nicht mehr über Plugin-Reloads hinweg liegen, und die Statusleiste klippt in schmalen Fenstern nicht
|
||||||
|
mehr.
|
||||||
|
|
||||||
- **Fehler-Benachrichtigung im Chat-Fenster.** Wenn ein Render-Fehler in `DrawChatLog` auftritt, zeigt das Plugin jetzt
|
- **Fehler-Benachrichtigung im Chat-Fenster.** Wenn ein Render-Fehler in `DrawChatLog` auftritt,
|
||||||
eine einmalige Warning-Notification mit Verweis aufs `/xllog`, statt das Fenster stillschweigend leer zu lassen. Der
|
zeigt das Plugin jetzt eine einmalige Warning-Notification mit Verweis aufs `/xllog`, statt das
|
||||||
Stack-Trace selbst geht weiter via `Plugin.Log.Error` ins Logfile. De-Dup über Per-Session-Bool, damit ein
|
Fenster stillschweigend leer zu lassen. Der Stack-Trace selbst geht weiter via `Plugin.Log.Error`
|
||||||
wiederkehrender Fehler die Notification-Stack nicht pro Frame neu vollkippt
|
ins Logfile. De-Dup über Per-Session-Bool, damit ein wiederkehrender Fehler die Notification-Stack
|
||||||
- **First-Run-Wizard trennt Accept und Close.** `OnClose` setzt nicht mehr stillschweigend `FirstRunCompleted=true`,
|
nicht pro Frame neu vollkippt
|
||||||
also lässt das X den Wizard schwebend zurück und er kommt beim nächsten Plugin-Reload wieder. Eine neue „Später —
|
- **First-Run-Wizard trennt Accept und Close.** `OnClose` setzt nicht mehr stillschweigend
|
||||||
Defaults behalten"-Schaltfläche im Footer ist der explizite Weg, ohne Profil-Auswahl rauszukommen. Strings bilingual
|
`FirstRunCompleted=true`, also lässt das X den Wizard schwebend zurück und er kommt beim nächsten
|
||||||
EN+DE plus Tooltip
|
Plugin-Reload wieder. Eine neue „Später — Defaults behalten"-Schaltfläche im Footer ist der
|
||||||
- **Eingabe-Verlauf wird beim Plugin-Reload geleert.** `InputHistoryService.Reset` hängt jetzt in `Plugin.DisposeAsync`
|
explizite Weg, ohne Profil-Auswahl rauszukommen. Strings bilingual EN+DE plus Tooltip
|
||||||
neben den anderen Pure-Memory-Cleanups, damit der statische Zustand aus der vorigen Session den nächsten Load nicht
|
- **Eingabe-Verlauf wird beim Plugin-Reload geleert.** `InputHistoryService.Reset` hängt jetzt in
|
||||||
mehr erbt
|
`Plugin.DisposeAsync` neben den anderen Pure-Memory-Cleanups, damit der statische Zustand aus der
|
||||||
- **Statusleiste klippt nicht mehr.** Der rechtsbündige Versions-Slot wird ausgeblendet wenn die Chat-Window-Breite
|
vorigen Session den nächsten Load nicht mehr erbt
|
||||||
abzüglich Versions-Text unter 200 px fällt — vorher überlappte er die vier linken Slots. Ab ausreichender Breite
|
- **Statusleiste klippt nicht mehr.** Der rechtsbündige Versions-Slot wird ausgeblendet wenn die
|
||||||
taucht der Slot wieder auf
|
Chat-Window-Breite abzüglich Versions-Text unter 200 px fällt — vorher überlappte er die vier
|
||||||
- **Intern:** `FontManager` fällt auf System-Font zurück wenn die eingebettete Hellion-Font-Resource fehlt
|
linken Slots. Ab ausreichender Breite taucht der Slot wieder auf
|
||||||
(Broken-csproj-Pfad, nie ein Produktions-Build), plus expliziter Session-Only-Invariant-Kommentar für Auto-Tell-Tabs
|
- **Intern:** `FontManager` fällt auf System-Font zurück wenn die eingebettete Hellion-Font-Resource
|
||||||
in `Plugin.cs:167-168` mit einem TempTabCounter-Init-Pin in der Build-Suite. Kein Schema-Bump, keine Migration
|
fehlt (Broken-csproj-Pfad, nie ein Produktions-Build), plus expliziter
|
||||||
|
Session-Only-Invariant-Kommentar für Auto-Tell-Tabs in `Plugin.cs:167-168` mit einem
|
||||||
|
TempTabCounter-Init-Pin in der Build-Suite. Kein Schema-Bump, keine Migration
|
||||||
|
|||||||
@@ -3,31 +3,34 @@ subtitle: Code Hygiene and Refactor
|
|||||||
versionsnatur: Maintenance-Cycle
|
versionsnatur: Maintenance-Cycle
|
||||||
---
|
---
|
||||||
|
|
||||||
Wartungs-Patch ohne User-sichtbare Änderungen. Saubere Code-Basis als Vorbereitung auf das v1.4.7-Backlog-Cleanup, plus
|
Wartungs-Patch ohne User-sichtbare Änderungen. Saubere Code-Basis als Vorbereitung auf das
|
||||||
zwei geerbte Bugfixes aus dem ChatTwo-Upstream `f35b7d3`.
|
v1.4.7-Backlog-Cleanup, plus zwei geerbte Bugfixes aus dem ChatTwo-Upstream `f35b7d3`.
|
||||||
|
|
||||||
- **preflight.sh härter**: csharpier-Reflow-Check (Block E) und markdownlint (Block F) laufen jetzt im Pre-Push-Gate,
|
- **preflight.sh härter**: csharpier-Reflow-Check (Block E) und markdownlint (Block F) laufen jetzt
|
||||||
statt erst beim Pre-Merge-Review aufzufallen.
|
im Pre-Push-Gate, statt erst beim Pre-Merge-Review aufzufallen.
|
||||||
- **FontManager-Fallback robuster**: Atlas-Toolkit-Throws aus kaputten Font-Configs (IO, InvalidOperation,
|
- **FontManager-Fallback robuster**: Atlas-Toolkit-Throws aus kaputten Font-Configs (IO,
|
||||||
ArgumentException) fallen jetzt zuverlässig auf NotoSansCjkRegular, statt den Atlas-Build mitzureißen. Der
|
InvalidOperation, ArgumentException) fallen jetzt zuverlässig auf NotoSansCjkRegular, statt den
|
||||||
Exception-Typ wird im Log mitgegeben für die Diagnose.
|
Atlas-Build mitzureißen. Der Exception-Typ wird im Log mitgegeben für die Diagnose.
|
||||||
- **URL-Validation beim Plugin-Load**: BrandingLinks (5 URLs) und IntegrationLinks (2 URLs) werden via
|
- **URL-Validation beim Plugin-Load**: BrandingLinks (5 URLs) und IntegrationLinks (2 URLs) werden
|
||||||
`[ModuleInitializer]` geprüft. Ein Tippfehler bei einer künftigen URL-Rotation wirft jetzt sofort beim Plugin-Load,
|
via `[ModuleInitializer]` geprüft. Ein Tippfehler bei einer künftigen URL-Rotation wirft jetzt
|
||||||
statt still beim Klick zu scheitern.
|
sofort beim Plugin-Load, statt still beim Klick zu scheitern.
|
||||||
- **Cherry-Pick aus ChatTwo `f35b7d3`** — Memory-Leak in `Chat.SetChannel`: der native `Utf8String` wird jetzt auch dann
|
- **Cherry-Pick aus ChatTwo `f35b7d3`** — Memory-Leak in `Chat.SetChannel`: der native `Utf8String`
|
||||||
freigegeben, wenn der Linkshell-Check den Channel ablehnt (vorher gefangen im early-return).
|
wird jetzt auch dann freigegeben, wenn der Linkshell-Check den Channel ablehnt (vorher gefangen im
|
||||||
- **Cherry-Pick aus ChatTwo `f35b7d3`** — `Tab.Clone()` Deep-cloned jetzt `UsedChannel` und `TellTarget`. Vorher
|
early-return).
|
||||||
Reference-Share-Bug: PopOut- und Temp-Tabs mutierten sich gegenseitig.
|
- **Cherry-Pick aus ChatTwo `f35b7d3`** — `Tab.Clone()` Deep-cloned jetzt `UsedChannel` und
|
||||||
|
`TellTarget`. Vorher Reference-Share-Bug: PopOut- und Temp-Tabs mutierten sich gegenseitig.
|
||||||
- **Aktive-Tab-Underline pixel-perfect bei DPI-Scaling**: Die Underline-Pill skaliert jetzt mit
|
- **Aktive-Tab-Underline pixel-perfect bei DPI-Scaling**: Die Underline-Pill skaliert jetzt mit
|
||||||
`ImGuiHelpers.GlobalScale` und rundet die DrawList-Koordinaten auf physische Pixel. Kein Sub-Pixel-Blur mehr auf
|
`ImGuiHelpers.GlobalScale` und rundet die DrawList-Koordinaten auf physische Pixel. Kein
|
||||||
125/150%-Setups.
|
Sub-Pixel-Blur mehr auf 125/150%-Setups.
|
||||||
- **IconButton-Width-Fix**: der manuelle `width - 2 * CellPadding.X`-Subtract verlor den HUD-Scale (Padding skaliert,
|
- **IconButton-Width-Fix**: der manuelle `width - 2 * CellPadding.X`-Subtract verlor den HUD-Scale
|
||||||
der raw int nicht). Gemessene Breite läuft jetzt unverändert durch.
|
(Padding skaliert, der raw int nicht). Gemessene Breite läuft jetzt unverändert durch.
|
||||||
- **Test-Isolation für MessageStore**: `Dalamud.Utility.Util`-Surface (IsWine, OpenLink) läuft jetzt durch eine
|
- **Test-Isolation für MessageStore**: `Dalamud.Utility.Util`-Surface (IsWine, OpenLink) läuft jetzt
|
||||||
`IPlatformUtil`-Indirektion. MessageStores `IsWine`-Probe ist isoliert testbar in der Build-Suite. Plus:
|
durch eine `IPlatformUtil`-Indirektion. MessageStores `IsWine`-Probe ist isoliert testbar in der
|
||||||
HellionStyle-ChildBgAlpha als Pure-Helper extrahiert, Plugin.SaveConfig kopiert nur Session-Tabs statt der ganzen
|
Build-Suite. Plus: HellionStyle-ChildBgAlpha als Pure-Helper extrahiert, Plugin.SaveConfig kopiert
|
||||||
Tab-Liste, SettingsOverview cached den DrawList einmal pro Frame.
|
nur Session-Tabs statt der ganzen Tab-Liste, SettingsOverview cached den DrawList einmal pro
|
||||||
- **Built-in-Theme-Roster**: Crystal Nocturne (Royal Sapphire + Electric Magenta auf Obsidian, von CRYSTALLITE) ersetzt
|
Frame.
|
||||||
Moonlit Bloom. User mit Moonlit Bloom als aktivem Theme fallen beim ersten Plugin-Load auf Hellion Arctic zurück.
|
- **Built-in-Theme-Roster**: Crystal Nocturne (Royal Sapphire + Electric Magenta auf Obsidian, von
|
||||||
|
CRYSTALLITE) ersetzt Moonlit Bloom. User mit Moonlit Bloom als aktivem Theme fallen beim ersten
|
||||||
|
Plugin-Load auf Hellion Arctic zurück.
|
||||||
|
|
||||||
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
|
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
|
||||||
|
|||||||
@@ -3,27 +3,31 @@ subtitle: Backlog Cleanup and Mid-Features
|
|||||||
versionsnatur: Mid-Feature-Patch
|
versionsnatur: Mid-Feature-Patch
|
||||||
---
|
---
|
||||||
|
|
||||||
Achter Sub-Patch der v1.4.x Polish-Sweep-Serie. Erstes User-sichtbares Feature-Bundle seit v1.4.5 — angepinnte Tell-Tabs
|
Achter Sub-Patch der v1.4.x Polish-Sweep-Serie. Erstes User-sichtbares Feature-Bundle seit v1.4.5 —
|
||||||
die Relog überleben, opt-in Honorific-Glow, plus eine konfigurierbare Sidebar.
|
angepinnte Tell-Tabs die Relog überleben, opt-in Honorific-Glow, plus eine konfigurierbare Sidebar.
|
||||||
|
|
||||||
- **TempTell anpinnen**: Rechtsklick auf einen TempTell-Tab in der Sidebar → „Tab anpinnen". Angepinnte Tabs überleben
|
- **TempTell anpinnen**: Rechtsklick auf einen TempTell-Tab in der Sidebar → „Tab anpinnen".
|
||||||
Plugin-Reload und Char-Logout, behalten ihre Konversations-Historie (wird beim Rehydrate aus dem MessageStore
|
Angepinnte Tabs überleben Plugin-Reload und Char-Logout, behalten ihre Konversations-Historie
|
||||||
nachgeladen) und bleiben an die gleiche /tell-Person gebunden. Hard-Cap 5 angepinnte Tabs in einem separaten Pool —
|
(wird beim Rehydrate aus dem MessageStore nachgeladen) und bleiben an die gleiche /tell-Person
|
||||||
die normalen Auto-Tell-Tabs (15er Cap) sind davon entkoppelt, Gesamt-Decke 20. Die Sidebar gruppiert angepinnte Tabs
|
gebunden. Hard-Cap 5 angepinnte Tabs in einem separaten Pool — die normalen Auto-Tell-Tabs (15er
|
||||||
in einer eigenen „Angepinnt"-Sektion mit eigenem Trenner.
|
Cap) sind davon entkoppelt, Gesamt-Decke 20. Die Sidebar gruppiert angepinnte Tabs in einer
|
||||||
- **Honorific Glow-Outline**: rendert jetzt eine 8-Richtungs-DrawList-Outline wenn der Honorific-Titel eine Glow-Farbe
|
eigenen „Angepinnt"-Sektion mit eigenem Trenner.
|
||||||
trägt. Opt-in via **Settings → Integrationen → Glow-Outline rendern (Honorific)** (Default OFF). Gradient (Color3 /
|
- **Honorific Glow-Outline**: rendert jetzt eine 8-Richtungs-DrawList-Outline wenn der
|
||||||
GradientColourSet / Wave / Pulse) wird geparst und im DTO weitergereicht, rendert aktuell aber statisch als
|
Honorific-Titel eine Glow-Farbe trägt. Opt-in via **Settings → Integrationen → Glow-Outline
|
||||||
Primärfarbe — der volle Gradient-Port (Animations-Algorithmus + Pride-Palette) kommt als eigener Cycle nach.
|
rendern (Honorific)** (Default OFF). Gradient (Color3 / GradientColourSet / Wave / Pulse) wird
|
||||||
- **Sidebar-Breite konfigurierbar**: in **Theme & Layout** ein Slider 44–160 px. Default bleibt 44 px (icon-only), aber
|
geparst und im DTO weitergereicht, rendert aktuell aber statisch als Primärfarbe — der volle
|
||||||
breiter machen damit Sektion-Header wie „Aktive Tells (3)" oder „Angepinnt (2)" nicht abgeschnitten werden.
|
Gradient-Port (Animations-Algorithmus + Pride-Palette) kommt als eigener Cycle nach.
|
||||||
- **Settings-Save Channel-Fix**: ein Save mit aktivem Party- oder Linkshell-Tab konnte den Chat-Input zurück auf
|
- **Sidebar-Breite konfigurierbar**: in **Theme & Layout** ein Slider 44–160 px. Default bleibt 44
|
||||||
`/tell <angepinnte Person>` springen lassen. `Configuration.UpdateFrom` bewahrt jetzt den Runtime-`CurrentChannel`
|
px (icon-only), aber breiter machen damit Sektion-Header wie „Aktive Tells (3)" oder „Angepinnt
|
||||||
über den persistent-Tab-Merge hinweg, und `TabSwitched` deep-cloned den Seed-Channel statt sich den `UsedChannel` mit
|
(2)" nicht abgeschnitten werden.
|
||||||
dem vorigen Tab zu teilen.
|
- **Settings-Save Channel-Fix**: ein Save mit aktivem Party- oder Linkshell-Tab konnte den
|
||||||
- **Internal**: `IPluginLogProxy`-Indirektion vor Dalamud's `IPluginLog` über alle ~91 `Plugin.Log`-Call-Sites. Damit
|
Chat-Input zurück auf `/tell <angepinnte Person>` springen lassen. `Configuration.UpdateFrom`
|
||||||
läuft `MessageStore.Migrate0` voll-isoliert in xUnit (F12.1-Lücke aus v1.4.6 geschlossen). Plus: TempTab-Counter als
|
bewahrt jetzt den Runtime-`CurrentChannel` über den persistent-Tab-Merge hinweg, und `TabSwitched`
|
||||||
abgeleitete Property statt gecachtes Interlocked-Feld — die neuen Pin/Unpin-Übergänge sind Cold-Path, kein
|
deep-cloned den Seed-Channel statt sich den `UsedChannel` mit dem vorigen Tab zu teilen.
|
||||||
Lock-Free-Vorteil mehr. Migration v16 → v17 ist rein additiv (neues `Tab.IsPinned`-Bool, Default false).
|
- **Internal**: `IPluginLogProxy`-Indirektion vor Dalamud's `IPluginLog` über alle ~91
|
||||||
|
`Plugin.Log`-Call-Sites. Damit läuft `MessageStore.Migrate0` voll-isoliert in xUnit (F12.1-Lücke
|
||||||
|
aus v1.4.6 geschlossen). Plus: TempTab-Counter als abgeleitete Property statt gecachtes
|
||||||
|
Interlocked-Feld — die neuen Pin/Unpin-Übergänge sind Cold-Path, kein Lock-Free-Vorteil mehr.
|
||||||
|
Migration v16 → v17 ist rein additiv (neues `Tab.IsPinned`-Bool, Default false).
|
||||||
|
|
||||||
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
|
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
|
||||||
|
|||||||
@@ -3,19 +3,17 @@ subtitle: Hook-Layer und Polish-Quick-Wins
|
|||||||
versionsnatur: Polish-Patch
|
versionsnatur: Polish-Patch
|
||||||
---
|
---
|
||||||
|
|
||||||
- DbViewer Volltext-Suche: optionaler FTS5-Index über die ganze Chat-Historie.
|
- DbViewer Volltext-Suche: optionaler FTS5-Index über die ganze Chat-Historie. Wird beim ersten
|
||||||
Wird beim ersten v1.4.8-Start asynchron im Hintergrund gebaut, Progress als
|
v1.4.8-Start asynchron im Hintergrund gebaut, Progress als Toast. Lokale Page-Suche bleibt
|
||||||
Toast. Lokale Page-Suche bleibt Default. Such-Eingaben werden als exakte
|
Default. Such-Eingaben werden als exakte Wortfolge gematcht; mehrere Wörter werden nur gefunden,
|
||||||
Wortfolge gematcht; mehrere Wörter werden nur gefunden, wenn sie zusammen
|
wenn sie zusammen und in der Reihenfolge stehen. Wer rohe FTS5-MATCH-Syntax nutzen will, setzt
|
||||||
und in der Reihenfolge stehen. Wer rohe FTS5-MATCH-Syntax nutzen will, setzt
|
|
||||||
eigene Anführungszeichen um den Suchbegriff.
|
eigene Anführungszeichen um den Suchbegriff.
|
||||||
- Custom-Theme-Files laden sich beim Speichern automatisch neu, wenn das Theme
|
- Custom-Theme-Files laden sich beim Speichern automatisch neu, wenn das Theme aktiv ist. Kein
|
||||||
aktiv ist. Kein Picker-Klick mehr nötig.
|
Picker-Klick mehr nötig.
|
||||||
- Retention-Sweep blockt nicht mehr den Framework-Thread. Der Mini-Hitch von
|
- Retention-Sweep blockt nicht mehr den Framework-Thread. Der Mini-Hitch von ~194ms pro Sweep ist
|
||||||
~194ms pro Sweep ist weg.
|
weg.
|
||||||
- Statusleiste rendert sauber bei Windows-Skalierung über 100%.
|
- Statusleiste rendert sauber bei Windows-Skalierung über 100%.
|
||||||
- Receive-Suppressed-Tells-Routing wurde in diesem Cycle untersucht und auf
|
- Receive-Suppressed-Tells-Routing wurde in diesem Cycle untersucht und auf v1.5.x verschoben: wenn
|
||||||
v1.5.x verschoben: wenn andere Plugins Tells via CheckMessageHandled
|
andere Plugins Tells via CheckMessageHandled unterdrücken, überspringt FFXIVs Chat-Pipeline den
|
||||||
unterdrücken, überspringt FFXIVs Chat-Pipeline den RaptureLogModule-Resolver
|
RaptureLogModule-Resolver und HellionChats Tab-Routing verliert den Tell-Partner. Der Fix liegt
|
||||||
und HellionChats Tab-Routing verliert den Tell-Partner. Der Fix liegt
|
|
||||||
architektonisch neben dem geplanten Ad-Block-Hook-Layer und kommt dort mit.
|
architektonisch neben dem geplanten Ad-Block-Hook-Layer und kommt dort mit.
|
||||||
|
|||||||
@@ -3,35 +3,26 @@ subtitle: Plugin-Load Render Polish
|
|||||||
versionsnatur: Performance-Patch
|
versionsnatur: Performance-Patch
|
||||||
---
|
---
|
||||||
|
|
||||||
- First-Frame-HITCH unter 100 ms: der erste Render-Frame des Plugins liegt
|
- First-Frame-HITCH unter 100 ms: der erste Render-Frame des Plugins liegt jetzt bei ~76 ms Median
|
||||||
jetzt bei ~76 ms Median (vorher ~127 ms), die Dalamud-Warnung
|
(vorher ~127 ms), die Dalamud-Warnung „UiBuilder(Hellion Chat) > 100ms" beim Plugin-Start ist
|
||||||
„UiBuilder(Hellion Chat) > 100ms" beim Plugin-Start ist damit weg.
|
damit weg. Erreicht durch das Verlagern von sechs nicht-essentiellen Render- Sektionen
|
||||||
Erreicht durch das Verlagern von sechs nicht-essentiellen Render-
|
(Statusleiste, Kanalname-Chunks, Fenster-Bounds-Check, Hinweis-Banner, Autocomplete,
|
||||||
Sektionen (Statusleiste, Kanalname-Chunks, Fenster-Bounds-Check,
|
Input-Preview) auf den zweiten Frame. Bei 60 fps sieht man die deferred-Sektionen ~17 ms später,
|
||||||
Hinweis-Banner, Autocomplete, Input-Preview) auf den zweiten Frame.
|
was im Atlas-Build-Fenster nach einem Reload unsichtbar bleibt.
|
||||||
Bei 60 fps sieht man die deferred-Sektionen ~17 ms später, was im
|
- Slash-Commands zentral registriert: /hellion, /hellionView, /hellionSeString und /hellionDebugger
|
||||||
Atlas-Build-Fenster nach einem Reload unsichtbar bleibt.
|
werden jetzt im Plugin-Load zentral registriert statt erst beim ersten Öffnen ihres Ziel-Fensters.
|
||||||
- Slash-Commands zentral registriert: /hellion, /hellionView,
|
Heißt: die Befehle funktionieren ab dem ersten Tick, auch wenn das jeweilige Fenster nie geöffnet
|
||||||
/hellionSeString und /hellionDebugger werden jetzt im Plugin-Load zentral
|
wurde. Der „Einstellungen"-Button im Plugin-Manager hängt am selben Pfad.
|
||||||
registriert statt erst beim ersten Öffnen ihres Ziel-Fensters. Heißt: die
|
- Plugin-Load-Diagnose-Logs als Tripwire: die Profiling-Logs für MessageStore.Connect,
|
||||||
Befehle funktionieren ab dem ersten Tick, auch wenn das jeweilige Fenster
|
MessageStore.Migrate, FilterAllTabs und den Auto-Translate-Warmup bleiben auf Information-Level
|
||||||
nie geöffnet wurde. Der „Einstellungen"-Button im Plugin-Manager hängt am
|
eingeschaltet. Falls eine zukünftige Änderung die Lade-Zeit wieder über 100 ms drückt, taucht der
|
||||||
selben Pfad.
|
Mehrverbrauch direkt im /xllog auf, ohne dass jemand erst den Debug-Filter einschalten muss.
|
||||||
- Plugin-Load-Diagnose-Logs als Tripwire: die Profiling-Logs für
|
- ChatTwo-IPC-Kompatibilitäts-Layer: HellionChat spiegelt jetzt die komplette ChatTwo-IPC-Surface
|
||||||
MessageStore.Connect, MessageStore.Migrate, FilterAllTabs und den
|
(`GetChatInputState`, `ChatInputStateChanged`, `Register`, `Unregister`, `Available`, `Invoke`)
|
||||||
Auto-Translate-Warmup bleiben auf Information-Level eingeschaltet. Falls
|
zusätzlich zu unseren eigenen `HellionChat.*`-Gates unter dem `ChatTwo.*`-Namensraum. Drittseitige
|
||||||
eine zukünftige Änderung die Lade-Zeit wieder über 100 ms drückt, taucht
|
Integrationen die nur auf ChatTwo's IPC reagieren, etwa die Kontextmenü-Hooks von Artisan und
|
||||||
der Mehrverbrauch direkt im /xllog auf, ohne dass jemand erst den
|
AllaganTools, funktionieren damit weiter ohne Code-Änderung auf ihrer Seite. Die
|
||||||
Debug-Filter einschalten muss.
|
Conflict-Detection blockiert das parallele Laden von ChatTwo, daher kein Namensraum-Konflikt im
|
||||||
- ChatTwo-IPC-Kompatibilitäts-Layer: HellionChat spiegelt jetzt die
|
Live-Betrieb.
|
||||||
komplette ChatTwo-IPC-Surface (`GetChatInputState`,
|
- Migration v17 unverändert: kein Schema-Bump, kein Config-Migrations- Aufwand. Nach dem Update
|
||||||
`ChatInputStateChanged`, `Register`, `Unregister`, `Available`,
|
läuft das Plugin gegen die bestehende v17-Datenbank weiter.
|
||||||
`Invoke`) zusätzlich zu unseren eigenen `HellionChat.*`-Gates unter
|
|
||||||
dem `ChatTwo.*`-Namensraum. Drittseitige Integrationen die nur auf
|
|
||||||
ChatTwo's IPC reagieren, etwa die Kontextmenü-Hooks von Artisan und
|
|
||||||
AllaganTools, funktionieren damit weiter ohne Code-Änderung auf
|
|
||||||
ihrer Seite. Die Conflict-Detection blockiert das parallele Laden
|
|
||||||
von ChatTwo, daher kein Namensraum-Konflikt im Live-Betrieb.
|
|
||||||
- Migration v17 unverändert: kein Schema-Bump, kein Config-Migrations-
|
|
||||||
Aufwand. Nach dem Update läuft das Plugin gegen die bestehende
|
|
||||||
v17-Datenbank weiter.
|
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
---
|
||||||
|
subtitle: DI Foundation und Service-Refactor
|
||||||
|
versionsnatur: Architektur-Cycle
|
||||||
|
---
|
||||||
|
|
||||||
|
- **Architektur-Umbau ohne User-spürbare Verhaltens-Änderung:** der Plugin-Bootstrap wechselt auf
|
||||||
|
einen Generic-Host DI-Container (`Microsoft.Extensions.Hosting` + `IServiceCollection`) nach dem
|
||||||
|
Lightless-Sync-Muster. 18 Service-Klassen wandern von einem statischen `Plugin.LogProxy`-Locator
|
||||||
|
auf typisierte `ILogger<T>`-Constructor-Injection. `DalamudLogger` brückt
|
||||||
|
`Microsoft.Extensions.Logging` über auf Dalamuds `IPluginLog` — im xllog erscheinen jetzt
|
||||||
|
Service-spezifische Spalten wie `[ MessageManager]` und `[Honori...ervice]`.
|
||||||
|
- **Plugin.LogProxy bleibt für die acht Buckets erhalten,** die Constructor-Injection nicht
|
||||||
|
erreicht: Static-Helper (EmoteCache, AutoTranslate, MemoryUtil, WrapperUtil), Dalamud-Reflektion
|
||||||
|
(Configuration), Data-Class mit Massen-Instanziierung (Message) und Instanz-Klassen die nur aus
|
||||||
|
Static-Methods loggen (FontManager, eine GameFunctions-Stelle).
|
||||||
|
- **Performance bestätigt durch Cross-Plugin-Baseline:** HellionChat First-Frame-HITCH 77 ms Median,
|
||||||
|
Chat 2 v1.40.2 74 ms Median — kein DI-Penalty gegenüber dem Upstream-Fork-Origin. Lightless und
|
||||||
|
XIVInstantMessenger liegen bei ~7 ms weil sie ihren FontAtlas-Build deferren; das wird das
|
||||||
|
v1.5.1-Item.
|
||||||
|
- **User-sichtbarer Bug-Fix nebenbei:** Slash-Command-Einfügen in das Chat-Eingabefeld (Friend-List
|
||||||
|
"/tell"-Action plus Plugin-Inserts von Artisan, AllaganTools und ähnlichen) ersetzt jetzt den
|
||||||
|
vorhandenen Input, statt anzukonkatenieren. Cherry-Pick aus ChatTwo upstream `ee7768ac` mit
|
||||||
|
Namespace-Anpassung.
|
||||||
|
- **Foundation für die Plugin-Integrations-Wave:** v1.5.7-11 (Context-Menu, NotificationMaster,
|
||||||
|
Moodles, ExtraChat, XIVIM Quick-DM) werden ab jetzt strukturell handhabbar — neue Services sind
|
||||||
|
ein `services.AddSingleton<T>` plus ein paar Factory-Lambda- Zeilen, kein Plugin.cs-Anflanschen
|
||||||
|
mehr.
|
||||||
|
- Migration v17 unverändert: kein Schema-Bump, kein Config-Migrations-Aufwand.
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
---
|
||||||
|
subtitle: "FontAtlas Refactor and Forge Signature"
|
||||||
|
versionsnatur: "Architecture + Closure + Branding"
|
||||||
|
---
|
||||||
|
|
||||||
|
- **FontManager-Refactor.** Der FontAtlas baut jetzt nur noch einmal pro Plugin-Load statt vier- bis
|
||||||
|
fünfmal. Weniger CPU- und GPU-Druck in den ersten Sekunden nach einem Reload, weniger
|
||||||
|
Atlas-Texture-Memory-Churn. Die acht Font-Einstellungen können live über den neuen
|
||||||
|
`RebuildDelegateFonts`-Pfad geändert werden, ohne dass das Plugin neu geladen werden muss.
|
||||||
|
- **Hellion Forge Signatur.** Das Plugin trägt jetzt eine ASCII-Fuchs-Signatur. Im `/xllog`
|
||||||
|
erscheint beim Plugin-Load ein kleiner Fuchs-Kopf, im First-Run-Wizard und unter Settings →
|
||||||
|
Information taucht eine eingeklappte „Hellion Forge"-Sektion mit dem vollen Fuchs auf. Gezeichnet
|
||||||
|
von Julia Moon, fest in der Plugin-DLL eingebettet.
|
||||||
|
- **Honorific-Integration bleibt unverändert.** Der ursprünglich geplante Gradient-Render-Pfad
|
||||||
|
(Wave/Pulse-Animation) entfällt. Honorific 3.2 stellt keine IPC für den fertig gerenderten
|
||||||
|
Gradient-Frame zur Verfügung, und ein eigener Port der Pride-Palette wurde verworfen. Die
|
||||||
|
Honorific-Anzeige bleibt wie in v1.4.7 etabliert (statischer Glow plus Title).
|
||||||
|
- **Hinweis zum HITCH-Win.** Der ursprünglich angepeilte 10×-First-Frame-Sprung
|
||||||
|
(Lightless/XIVIM-Pattern, ~7 ms statt ~75 ms) ist in diesem Cycle nicht eingetreten. Die
|
||||||
|
Render-Kosten liegen im UiBuilder-First-Frame-Pfad, nicht im FontAtlas-Build. Investigation kommt
|
||||||
|
als eigener späterer Cycle. Keine User-sichtbare Disruption, keine Migration.
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
---
|
||||||
|
subtitle: "First-Run Wizard — neu in 4 Steps, Roleplay-Profil neu"
|
||||||
|
versionsnatur: "UX-Patch"
|
||||||
|
---
|
||||||
|
- **Vier Steps statt Single-Page.** Der First-Run-Wizard öffnet jetzt in vier Bühnen: Willkommen → Privacy-Profil → Power-Settings → Fertig. Pagination-Dots in Forge-Bronze oben rechts, Back/Skip/Next im Footer. Standardgröße 720×480 (Min 600×400) und der Fuchs-Banner sitzt als zugeklappter TreeNode oben in Step 1, damit die Einleitung im Fokus bleibt.
|
||||||
|
- **Neues Privacy-Profil „Roleplay".** Datensparsamkeit plus Sagen und beide Emote-Typen für Story-Logs. Schreien und Rufen bleiben außen vor, Public-Distance-Lärm von Fremden ist kein Story-Inhalt. Aufbewahrung: Sagen 30 Tage, Emotes 90 Tage. Privacy-Picker wird zum 2×2-Grid, Casual bleibt mit ★-Marker als Empfehlung.
|
||||||
|
- **Power-Settings sichtbar.** Bislang versteckte Defaults bekommen eine eigene Bühne: Vorherige Session laden, Filter inkl. alter Messages, N Tell-Messages vorladen, Compact-Density, Prettier-Timestamps und Theme-Picker für die 10 Built-in-Themes. Keine neuen Settings, nur das Bestehende sauber sichtbar.
|
||||||
|
- **Staged-Commit und Test-Hint auf der Fertig-Bühne.** Auswahl wird erst beim Klick auf „Fertig ✓" geschrieben. „Später entscheiden" oder X-Close lässt die bestehende Config unangetastet, ein nicht angefasster Step behält die alten Werte. Direkt darunter sichtbar: „Tipp /tell <Spielername>", plus die aktuelle Preload-Zahl aus Step 3 als Hinweis auf den Auto-Tell-Tab-Spawn.
|
||||||
|
- **Bestehende User sehen den neuen Wizard einmal.** Wer schon v1.5.1 hatte, bekommt den Multi-Step-Flow beim ersten v1.5.2-Boot aufgepoppt. Neues Config-Feld `WizardLastShownVersion` triggert das einmalig pro Wizard-Rework; Skip oder Finish reicht und danach öffnet er nicht mehr automatisch.
|
||||||
|
- **Unter der Haube.** Pure-Helper-Tests für alle vier Profile-Sets in der Build-Suite (zwölf neue Facts), plus ein WizardStateSmokeStep für `/xlperf`. Migration v17 bleibt, nur ein optionales Config-Feld kommt dazu.
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
---
|
||||||
|
subtitle: "24 Sprachen, Inter Light statt Exo 2, HITCH 74 → 20 ms"
|
||||||
|
versionsnatur: "Localisation + Font-Stack"
|
||||||
|
---
|
||||||
|
- **24 wählbare UI-Sprachen.** Aus dem ursprünglich nur als FR-Lokalisierung geplanten Cycle ist eine breite Welle geworden: Catalan, Czech, Danish, Dutch, English, Finnish, French, German, Greek, Hungarian, Italian, Japanese, Korean, Norsk bokmål, Polish, Portuguese (BR), Portuguese (PT), Romanian, Russian, Spanish, Swedish, Turkish, Ukrainian, Simplified Chinese, Traditional Chinese. Dropdown sortiert alphabetisch nach Endonym, „None" oben angepinnt. Nicht-native Übersetzungen sind AI-assisted und für Community-Review im Forge-Discord markiert.
|
||||||
|
- **Inter Light statt Exo 2 als bundled Schrift.** Plus NotoSansCjkRegular als dritte Merge-Schicht. Damit deckt der Stack Latin Extended-A/B, Greek polytonic, Cyrillic Supplement und CJK (inkl. Hangul, Simplified-Han nach Reform) ab — die nicht-vanilla-FFXIV-Sprachen waren mit Exo 2 nicht lesbar.
|
||||||
|
- **HITCH 74 → ~20 ms als Side-Effect.** Der UiBuilder-First-Frame-Lag lag seit v1.4.x stabil bei 74 ms; v1.5.1 wollte ihn in Richtung 7 ms ziehen, fiel als „Hypothese zu optimistisch" durch. Echter Grund: `Plugin.cs:937` push'te `RegularFont` nur wenn `FontsEnabled` true war — die „Mitgelieferte Schrift verwenden"-Logik setzte `FontsEnabled = false` mit, der bundled-Pfad war die ganze v1.5.x-Reihe tot, FFXIVs Axis-Font übernahm und kostete ~50 ms extra. Fix routet `RegularFont` jetzt auch über `UseHellionFont`. Median ~20 ms im 5-Reload-Stresstest (17.9-23.6 ms, Linux/Wine; Windows-Baseline steht aus).
|
||||||
|
- **Glyph-Ranges aktivieren sich automatisch beim Sprachwechsel** plus eine One-Shot-Migration für User die schon eine non-Latin-Sprache eingestellt hatten. Neue WarningText unter dem Sprach-Dropdown weist darauf hin, dass FFXIVs Chat-Engine offiziell nur EN/DE/FR/JA-Glyphen rendert — andere Schriften können in der Game-Eingabe Garbled-Output zeigen.
|
||||||
|
- **Unter der Haube.** Drei-Layer-Font-Stack, zwei neue ExtraGlyphRanges-Flags (`LatinExtended`, `Greek`), `LanguageOverride`-Enum wächst um zehn Locales plus drei reaktivierte (Italian, Korean, Norwegian mit `nb`). Append-only damit User-Configs stabil bleiben. Migration v17 bleibt.
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
---
|
||||||
|
subtitle: "Theme-Crossfade, Quick-Picker, Hover-Animationen"
|
||||||
|
versionsnatur: "Polish & Motion"
|
||||||
|
---
|
||||||
|
- **Theme-Crossfade.** Theme-Wechsel blenden jetzt sanft über rund 300 ms ineinander, statt hart umzuschalten. Alle Hellion-Flächen gleiten mit: Sidebar, Titel, Buttons, Tabs, Scrollbar, Trennlinien. Der Fenster-Hintergrund snappt bewusst weiter, damit das Per-Window-Deckkraft-Setting aus Dalamuds Pinning-Menü unangetastet bleibt.
|
||||||
|
- **Header-Quick-Picker.** Neuer Paletten-Button links vom Zahnrad im Chat-Header. Ein Klick öffnet ein kompaktes Popup mit zwei Sektionen: alle Built-in- und Custom-Themes sowie alle Tabs. Der aktive Eintrag trägt ein Häkchen, ein Klick wechselt ohne das Popup zu schließen. So lassen sich mehrere Wechsel hintereinander erledigen, ohne den Umweg über die Einstellungen.
|
||||||
|
- **Sanfte Hover-Animationen.** Sidebar-Icons faden bei Hover sanft von gedimmt auf volle Deckkraft. Card-Mode-Trennlinien heben sich beim Überfahren einer Zeile für den ganzen Tab dezent ab. Beides framerate-unabhängig gerechnet, also auch bei Wine-Stall-Frames stabil.
|
||||||
|
- **Bewegung reduzieren.** Neuer Toggle im Tab für Theme und Layout. Er deaktiviert Crossfade, Hover-Animationen und das Pulsieren ungelesener Tabs für alle, die eine statische Oberfläche bevorzugen.
|
||||||
|
- Drei P3-Items plus der Accessibility-Toggle, kein Schema-Bump, keine Migration. Eine kleine Polish-Welle vor den größeren Cycles.
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
---
|
||||||
|
subtitle: "Backlog-Sync Tab-Features"
|
||||||
|
versionsnatur: "Bundle-Patch (Hälfte 1 von 2)"
|
||||||
|
---
|
||||||
|
- **Fehlgeschlagener Tell.** Geht ein gesendeter Tell nicht durch (Empfänger offline, in einer Instanz oder blockiert), erscheint jetzt ein Warn-Toast statt dass die Systemmeldung durchrauscht. Abschaltbar in den Einstellungen unter Chat.
|
||||||
|
- **Ton pro Tab.** Jeder Chat-Tab kann einen Benachrichtigungston spielen, wenn eine Nachricht eintrifft, während ein anderer Tab aktiv ist. Zur Wahl stehen die 16 Spiel-Chat-Sounds oder drei mitgelieferte Hellion-Sounds, mit einem Vorhör-Knopf. Standardmäßig aus, hört auf den globalen Sound-Schalter.
|
||||||
|
- **Tab umbenennen.** Das Umbenennen-Feld im Rechtsklick-Menü fokussiert sich beim Öffnen von selbst und nimmt jetzt bis zu 512 Zeichen.
|
||||||
|
- **Sprung ans Ende.** In der Chat-Kopfleiste erscheint ein Knopf, sobald man vom aktuellen Ende weggescrollt ist. Ein Klick springt zurück zur jüngsten Nachricht.
|
||||||
|
- **Karten- und Item-Links.** Kartenmarkierung und verlinktes Item lassen sich aus dem Rechtsklick-Menü der Chat-Eingabe einfügen.
|
||||||
|
- **Fuchs-Banner.** Das Hellion-Forge-Fuchs-Motiv im Einrichtungs-Assistenten und im Informations-Tab ist jetzt ein echtes Bild statt ASCII-Kunst.
|
||||||
|
- Schema-Bump auf v18, rein additiv.
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
---
|
||||||
|
subtitle: "Settings Overhaul + Filter & Notification Polish"
|
||||||
|
versionsnatur: "Settings-Overhaul-Release"
|
||||||
|
---
|
||||||
|
- **Settings komplett neu strukturiert** — die zehn alten Tabs sind auf sieben zusammengefasst (Allgemein, Aussehen, Chat, Fenster, Kanäle, Daten & Privatsphäre, Über). Jeder Tab gliedert sich jetzt in Sektionen, die beim Reingehen eingeklappt sind. Controls innerhalb einer Sektion sind nach Typ gruppiert. Tabs-Tab im Per-Tab-Panel ebenfalls in Sub-Sektionen aufgeteilt.
|
||||||
|
- **Absender-Namen anpassbar** — neue Optionen in Chat → Nachrichten für das Namensformat (Voll / Vorname / Initialen) und das Welt-Suffix (Nie / Andere Welten / Immer).
|
||||||
|
- **Pre-Send-Warnung für Plugin-Symbole** — beim Senden einer Nachricht mit Symbolen, die nur HellionChat-User sehen, kommt eine Warnung. Verhindert leere Kästchen bei anderen.
|
||||||
|
- **Getrennte Fenster-Deckkraft** — Aktiv vs. Inaktiv. Aktiv wie bisher; Inaktiv über einen zweiten Slider unter Aussehen → Fenster-Stil.
|
||||||
|
- **Lautstärke für eigene Notification-Sounds** — Slider in Allgemein → Sound, im Kanäle-Tab pro Tab nochmal angezeigt. Wirkt nur auf die drei mitgelieferten Custom-Sounds, die 16 Game-Sounds bleiben unverändert.
|
||||||
|
- **Regex-Filter pro Tab gestrichen** — kurz dabei, dann verworfen: der eingebaute FFXIV-Blackword-Filter deckt das ab.
|
||||||
|
- **Lokalisierung erweitert** — neue Section-Titel und v1.5.6-Controls in allen 24 Sprachen, maschinell übersetzt. Native-Review läuft weiter über den Hellion Forge Discord.
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
---
|
||||||
|
subtitle: "Rebuilt, Repaired, Reset"
|
||||||
|
versionsnatur: "Major-Release mit Config-Reset"
|
||||||
|
---
|
||||||
|
- **Deine Einstellungen werden zurückgesetzt.** Neun Zyklen Umbau haben gespeicherte Werte hinterlassen, die auf Oberflächen zeigen, die es nicht mehr gibt. Neu anzufangen ist der einzige Weg, dass alle dieselben Vorgaben haben. **Dein Nachrichtenverlauf bleibt unberührt**, der liegt in einer eigenen Datenbank. Die alten Einstellungen liegen als `HellionChat.json.pre-2.0.0.bak` daneben.
|
||||||
|
- **Behoben, und mehrere davon haben Daten verloren oder versteckt:** Die rückwirkende Bereinigung ließ sich nie anwenden. Das Verdichten der Datenbank schlug fehl und meldete danach, es sei nichts gelöscht worden, während alles weg war. Gelöschte Nachrichten blieben im Suchindex. Angepinnte Flüster-Tabs kamen eine ganze Sitzung lang leer hoch. Der Export schrieb ungültiges JSON. Ein Auskoppelfenster mit Titelleiste ließ sich nicht schließen. Ein 403 eines Emote-Dienstes riss alle 65 funktionierenden Emotes mit.
|
||||||
|
- **Was sich am Speichern ändert:** Das Kanalraster entscheidet jetzt allein. Bisher griff die Unbekannt-Absicherung auch bei bekannten Kanälen, ein abgewählter Kanal wurde also trotzdem geschrieben. Wen das betraf, der speichert ab jetzt weniger. Nichts in der Datenbank wird angefasst.
|
||||||
|
- **Jedes Fenster zeichnet das Plugin selbst** und alle sprechen eine Sprache: Struktur trägt die Typografie, alles Drückbare bekommt eine Fläche, jede Farbe wird gegen ihren Untergrund gemessen. Dazu benannte Typo-Rollen, Zeitstempel in eigener Spalte, kursive Systemmeldungen.
|
||||||
|
- **Wieder erreichbar:** Export, Tab-Editor, Datenbankpflege und Anpinnen hatten beim Umbau ihre Zugänge verloren. Der Screenshot-Modus erreichte eine von vier Flächen mit Tab-Namen, jetzt alle vier. Der DSGVO-Hinweis beim Profil "Volle Historie" war in 25 Sprachen übersetzt und seit Mai unsichtbar.
|
||||||
|
- **Gestrichen:** sechs Einstellungen mit Regler, gespeichertem Wert und ohne jeden Leser. Ein Regex-Filter pro Tab, den der spieleigene Wortfilter abdeckt. Ein Assistenten-Häkchen, das abgefragt, als angewendet gemeldet und nie gelesen wurde.
|
||||||
|
- **Neu:** Emote-Tab im Standard-Layout (Testerwunsch), Orts- und Serverzeit in der Statusleiste, Screenshot-Modus aus der Eingabezeile erreichbar, `/hellion wizard`, ein Stil-Labor unter `/hellion lab`, und ein Hinweis im Assistenten, dass Plugins in FFXIV eine Grauzone sind und nicht in öffentliche Kanäle gehören.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
subtitle: "Hotfix"
|
||||||
|
versionsnatur: "Hotfix ohne sichtbare Änderungen"
|
||||||
|
---
|
||||||
|
- **Nichts Neues zu sehen.** Wer 2.0.0 in der ersten Stunde gezogen hat, sollte trotzdem updaten: das 2.0.0-Archiv wurde ohne eine Abhängigkeits-Aktualisierung gebaut, die hier drin ist.
|
||||||
|
- **MessagePack von 3.1.4 auf 3.1.7.** Das Paket serialisiert die Nachrichten-Payloads in der lokalen Datenbank. Die Meldungen betreffen die Rekursionstiefe in `Skip` und einen Fehler in der LZ4-Dekomprimierung, beide nur über präparierte Eingaben erreichbar. Das Plugin schreibt und liest ausschließlich seine eigenen Bytes in einer lokalen Datei, praktisch bräuchte ein Angreifer also schon Schreibzugriff darauf. Trotzdem gehoben, weil es nichts kostet.
|
||||||
|
- **Der Release-Workflow hängt sein Archiv wieder selbst an.** Bei 2.0.0 lief der Build sauber durch und scheiterte dann am Veröffentlichen, weshalb dieses Release von Hand fertiggestellt werden musste.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
subtitle: "Emotes raus, Platzhalter gefixt"
|
||||||
|
versionsnatur: "Aufräum-Release"
|
||||||
|
---
|
||||||
|
- **BetterTTV-Emotes sind raus.** Der Endpunkt für geteilte Emotes liegt hinter einer Anmeldung, und von dort kam fast alles. Übrig blieben 54 überwiegend statische Bilder aus der Twitch-Frühzeit, davon genau eines animiert, und das wollte 492 Einzelbilder und 37 MB Grafikspeicher. Das Plugin macht jetzt **gar keine ausgehenden Netzwerkaufrufe** mehr. Gespeicherte Nachrichten mit Emotes bleiben lesbar und zeigen den getippten Code.
|
||||||
|
- **Fünf Beschreibungen im Fenster-Tab zeigten `{0}` statt des Plugin-Namens.** Betroffen waren alle 25 Sprachen, im Deutschen fiel es zuerst auf, weil der Platzhalter dort am Satzanfang steht. Ein Test prüft das jetzt dauerhaft.
|
||||||
|
- **Neue Vorschaubilder** im Plugin-Installer. Die alten waren vom 8. Mai und zeigten die Oberfläche vor dem Umbau.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
subtitle: "Kontextmenü in Pop-outs, Screenshot-Modus"
|
||||||
|
versionsnatur: "Fehlerbehebung"
|
||||||
|
---
|
||||||
|
- **Das Kontextmenü ging in Pop-out-Fenstern nicht auf.** Ein Rechtsklick auf einen Namen oder ein Item hat dort schlicht nichts gemacht. Alle Chat-Flächen teilen sich einen Popup-Zustand, und das zuerst gezeichnete Fenster hat das Menü verworfen, bevor das Pop-out überhaupt an der Reihe war. Das Menü bleibt jetzt bei dem Fenster, aus dem der Klick kam.
|
||||||
|
- **Der Screenshot-Modus ließ sich nicht ausschalten.** Er wird gespeichert, aber keiner der beiden Schalter hat die Änderung in die Konfiguration geschrieben. Einmal gespeichert kam er bei jedem Laden des Plugins wieder. Beide Schalter speichern jetzt. Wer ihn gerade festhängen hat, klickt ihn einmal aus.
|
||||||
|
- **Vom Spiel eingefärbter Text konnte unsichtbar werden.** Manche dieser Farben kommen ohne Alpha-Byte an und wurden beim Umsortieren vollständig transparent.
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
---
|
||||||
|
subtitle: "Aufgeräumt: Beschreibung und tote Strings"
|
||||||
|
versionsnatur: "Aufräum-Release"
|
||||||
|
---
|
||||||
|
Am Verhalten des Plugins ändert sich nichts. Zwei Dinge, die überfällig waren.
|
||||||
|
|
||||||
|
- **Die Beschreibung im Plugin-Installer war zu lang und an einer Stelle schlicht falsch.** Sie lief über 908 Zeichen und fing damit an, eine Kategorie zu nennen, statt zu sagen was das Plugin tut. Ausserdem stand dort 24 Sprachen, es sind 25. Und die beiden Manifeste trugen unterschiedliche Kurzbeschreibungen, in der Plugin-Liste stand also ein anderer Satz als in den Details. Jetzt sind es 367 Zeichen, überall dieselben.
|
||||||
|
- **30 Übersetzungsschlüssel für das Webinterface sind raus.** Das Feature selbst, seine HTTP-Routen und sein Frontend haben den Code im Mai verlassen, die Texte blieben in allen 25 Sprachen liegen, dazu je eine erzeugte Property. Vor dem Löschen wurde jeder Schlüssel einzeln gegen das gesamte Repository geprüft.
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
---
|
||||||
|
subtitle: "Fokus bleibt, Tabs lassen sich schließen"
|
||||||
|
versionsnatur: "Bugfix-Release"
|
||||||
|
---
|
||||||
|
Zwei Meldungen aus dem Test, beide in derselben Ecke: was ein eintreffendes Flüstern mit dem macht, was du gerade tust — und was du mit einem Tab machen kannst, wenn er erst einmal da ist.
|
||||||
|
|
||||||
|
- **Ein Flüstern, das ankam während du geschrieben hast, hat dir die Tastatur weggenommen.** Der Tab wechselte unter dir weg, und in diesem Spiel heißt das, dass die nächsten Tasten deine Figur bewegen statt Text zu schreiben. Schlimmer: Der halb getippte Satz konnte beim Falschen landen. Was du tippst gehört dem Fenster, der Empfänger wird aber von dem Tab gelesen, der beim Enter gerade aktiv ist. Solange du an einer Zeile schreibst, springt jetzt nichts mehr — in keinem Modus. Der Tab taucht trotzdem auf und wartet mit seinem Ungelesen-Punkt.
|
||||||
|
- **Ein Flüster-Tab ließ sich überhaupt nicht schließen.** Der Eintrag ging beim Fenster-Neubau in 2.0.0 verloren: Er lebte im alten Menü, und das neue hat Umbenennen, Töne, Herauslösen und Anheften zurückgebracht, das Schließen aber nie. Flüster-Tabs sind absichtlich aus dem Einstellungs-Editor ausgenommen, mit einem Verweis auf das Kontextmenü — das sie ebenfalls nicht schließen konnte. Jetzt per Rechtsklick auf jedem Tab. Bei einem angehefteten Flüster-Tab musst du erst die Anheftung lösen, damit ein Fehlklick kein Gespräch beendet, das du behalten wolltest.
|
||||||
|
- **Zwei Einstellungen entschieden, wo ein Flüstern aufgeht, und die ältere gewann immer.** "Neue /tell-Tabs direkt als Pop-out öffnen" feuerte beim Anlegen des Tabs, einen Tick bevor der Modus darunter überhaupt gefragt wurde — deshalb sah der aus, als täte er nichts. Beide sind jetzt eine. Deine bisherige Wahl wird übernommen.
|
||||||
|
- **"Aus" ist aus dieser Auswahl verschwunden.** Es hat nie verhindert, dass ein Flüster-Tab entsteht, das macht der Schalter weiter oben. Es hat nur den Sprung dorthin unterbunden, und genau dafür ist der Schalter darunter da.
|
||||||
|
- **Einen Tab zu schließen konnte ein Pop-out beschädigen, in dem du gerade warst.** Der Fokus sprang immer auf den ersten Tab der Liste, auch wenn der in einem eigenen Fenster offen war, und nahm ihm dabei seine Flüster-Bindung.
|
||||||
|
- **Kleinkram.** "Pop Out" im Kontextmenü war auf jedem Client englisch, die Modusnamen ebenfalls. Der Hinweis zum Anheft-Limit verwies auf eine Funktion, die im Mai entfernt wurde. Im Spanischen stand ein Wort, das es nicht gibt, im Griechischen ein unübersetztes, im europäischen Portugiesisch eines, das seinem eigenen Knopf widersprach. Und segmentierte Einstellungszeilen haben lange Beschriftungen abgeschnitten.
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
---
|
||||||
|
subtitle: "Statusleiste abschaltbar"
|
||||||
|
versionsnatur: "Feature-Patch"
|
||||||
|
---
|
||||||
|
Eine Frage aus dem Discord, klein genug für ein eigenes Release: Sind die Pillen am unteren Rand fest im Code? Waren sie.
|
||||||
|
|
||||||
|
- **Die Statusleiste lässt sich ausschalten.** Die Reihe am unteren Rand des Chatfensters (Kanal, Privatsphäre-Status, Nachrichtenzähler, Flüstern, Uhr, Version) hatte keinen Schalter. Unter Einstellungen → Fenster → Fenster-Style gibt es jetzt „Statusleiste anzeigen". Aus, und der Chat nimmt den Platz. Bleibt für alle an, bis du es ausschaltest, von selbst ändert sich nichts. Eines solltest du wissen: Kamera und Schloss wohnen in dieser Reihe. Ohne Leiste zeigen Screenshot-Modus und Privatsphäre-Filter nichts mehr an.
|
||||||
|
- **Vorgeschlagen von Ashy ^.^, und das steht auch dran.** Der Schalter trägt eine Zeile „Vorgeschlagen von" unter sich. Wer etwas vorschlägt, soll den eigenen Namen dort sehen, wo die Funktion gelandet ist, nicht in einem Changelog, das niemand öffnet. Die Zeile ist in alle 25 Sprachen übersetzt und bereit für den nächsten Vorschlag.
|
||||||
+14
-12
@@ -2,26 +2,28 @@
|
|||||||
|
|
||||||
## How to install
|
## How to install
|
||||||
|
|
||||||
This release is distributed via the HellionChat custom repository, not the Dalamud main plugin repo. To install:
|
This release is distributed via the HellionChat custom repository, not the 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: `https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json`
|
2. Add the URL:
|
||||||
|
`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,
|
- [README](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/README.md)
|
||||||
architecture, build
|
— features, architecture, build
|
||||||
- [Privacy notice](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/PRIVACY.md) — what
|
- [Privacy notice](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/PRIVACY.md)
|
||||||
the plugin stores and sends
|
— what the plugin stores and sends
|
||||||
- [Third-party notices](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/docs/THIRD_PARTY_NOTICES.md)
|
- [Third-party notices](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/docs/THIRD_PARTY_NOTICES.md)
|
||||||
— dependencies and licences
|
— dependencies and licences
|
||||||
- [Security policy](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/SECURITY.md) —
|
- [Security policy](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/SECURITY.md)
|
||||||
vulnerability reporting
|
— vulnerability reporting
|
||||||
- [Support](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/SUPPORT.md) — bug reports,
|
- [Support](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/SUPPORT.md)
|
||||||
questions, contact paths
|
— bug reports, questions, contact paths
|
||||||
|
|
||||||
## Licence
|
## Licence
|
||||||
|
|
||||||
[EUPL-1.2](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/LICENSE). Based on
|
[EUPL-1.2](https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/src/branch/main/LICENSE).
|
||||||
[Chat 2](https://github.com/Infiziert90/ChatTwo) by Infi and Anna, also EUPL-1.2.
|
Based on [Chat 2](https://github.com/Infiziert90/ChatTwo) by Infi and Anna, also EUPL-1.2.
|
||||||
|
|||||||
+483
-256
@@ -1,37 +1,193 @@
|
|||||||
## Ignore Visual Studio temporary files, build results, and
|
##############################################################
|
||||||
## files generated by popular Visual Studio add-ons.
|
|
||||||
##
|
##
|
||||||
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
|
## .gitignore – Hellion Forge / Hellion Media
|
||||||
|
##
|
||||||
|
## Basis: github/gitignore VisualStudio.gitignore
|
||||||
|
## Überarbeitet: Mai 2026
|
||||||
|
## Status: Original-Patterns vollständig erhalten,
|
||||||
|
## neu sortiert in logische Sektionen,
|
||||||
|
## Sicherheits- & Tooling-Sektionen ergänzt.
|
||||||
|
##
|
||||||
|
## Markierungen:
|
||||||
|
## [!! OBSOLET 2026 !!] → Tool offiziell eingestellt,
|
||||||
|
## Pattern bleibt aus Vorsicht drin.
|
||||||
|
##
|
||||||
|
##############################################################
|
||||||
|
|
||||||
# Local development environment (HellionChat fork)
|
|
||||||
|
# =====================================================
|
||||||
|
# [!! KRITISCH !!] Secrets, Keys & Credentials
|
||||||
|
# Diese Sachen dürfen NIEMALS im Repo landen!
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
# Environment Files
|
||||||
.env
|
.env
|
||||||
|
.env.*
|
||||||
.env.bak*
|
.env.bak*
|
||||||
.envrc
|
.envrc
|
||||||
!.env.example
|
!.env.example
|
||||||
|
!.env.sample
|
||||||
|
|
||||||
|
# Private Keys & Zertifikate
|
||||||
|
*.pem
|
||||||
|
*.key
|
||||||
|
*.p12
|
||||||
|
*.pfx
|
||||||
|
*.cer
|
||||||
|
*.crt
|
||||||
|
*.csr
|
||||||
|
*.gpg
|
||||||
|
*.asc
|
||||||
|
|
||||||
|
# SSH Keys (falls jemand die ins Repo legt)
|
||||||
|
id_rsa
|
||||||
|
id_ed25519
|
||||||
|
id_ecdsa
|
||||||
|
known_hosts
|
||||||
|
|
||||||
|
# Auth-/Token-Files
|
||||||
|
auth.json
|
||||||
|
.npmrc
|
||||||
|
.pypirc
|
||||||
|
secrets.json
|
||||||
|
|
||||||
|
# ASP.NET / .NET App-Configs mit lokalen Secrets
|
||||||
|
appsettings.*.local.json
|
||||||
|
appsettings.Local.json
|
||||||
|
local.settings.json
|
||||||
|
|
||||||
|
# Memory Dumps (können Credentials im Heap enthalten!)
|
||||||
|
*.dmp
|
||||||
|
*.mdmp
|
||||||
|
crash.log
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Projekt-spezifisch (HellionChat Fork)
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
# Lokale Entwicklungsumgebung
|
||||||
.vscode/
|
.vscode/
|
||||||
scripts/setup-dev-env.sh
|
scripts/setup-dev-env.sh
|
||||||
|
|
||||||
# Local test project (stays out of the published plugin repo;
|
# Lokales Test-Projekt (bleibt aus dem Plugin-Repo raus;
|
||||||
# pure-function safety net for refactor cycles)
|
# pure-function safety net für Refactor-Cycles)
|
||||||
HellionChat.Tests/
|
HellionChat.Tests/
|
||||||
|
ChatTwo.Tests
|
||||||
|
TestResults
|
||||||
|
*.db-shm
|
||||||
|
*.db-wal
|
||||||
|
|
||||||
# Packaging
|
# Packaging
|
||||||
pack/
|
pack/
|
||||||
|
|
||||||
# User-specific files
|
# Specs und Plan-Dateien
|
||||||
|
/.superpowers/
|
||||||
|
|
||||||
|
# Claude Code lokales Setup (nicht committed)
|
||||||
|
/.claude/
|
||||||
|
/CLAUDE.md
|
||||||
|
|
||||||
|
# Cycle-Working-Notes (im Vault gepflegt, lokales Repo-Pad bei Bedarf)
|
||||||
|
/docs/cycle-notes/
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# OS-spezifische Files
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
# macOS
|
||||||
|
.DS_Store
|
||||||
|
.AppleDouble
|
||||||
|
.LSOverride
|
||||||
|
._*
|
||||||
|
|
||||||
|
# Windows
|
||||||
|
Thumbs.db
|
||||||
|
ehthumbs.db
|
||||||
|
Desktop.ini
|
||||||
|
$RECYCLE.BIN/
|
||||||
|
|
||||||
|
# Linux
|
||||||
|
.directory
|
||||||
|
.Trash-*
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# AI / LLM Tooling (2026 era)
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
# Cursor IDE
|
||||||
|
.cursor/
|
||||||
|
.cursorignore
|
||||||
|
|
||||||
|
# Aider
|
||||||
|
.aider*
|
||||||
|
|
||||||
|
# Continue.dev
|
||||||
|
.continue/
|
||||||
|
.continuerc.json
|
||||||
|
|
||||||
|
# Windsurf
|
||||||
|
.windsurf/
|
||||||
|
|
||||||
|
# Sourcegraph Cody
|
||||||
|
.cody/
|
||||||
|
|
||||||
|
# Lokale Prompt-Sammlungen / Scratch-Pads
|
||||||
|
prompts/local/
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Editor & IDE (neben Visual Studio)
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
# JetBrains (IntelliJ, Rider, etc.)
|
||||||
|
.idea/
|
||||||
|
|
||||||
|
# Vim / Neovim
|
||||||
|
*.swp
|
||||||
|
*.swo
|
||||||
|
*.swn
|
||||||
|
|
||||||
|
# Sublime Text
|
||||||
|
*.sublime-workspace
|
||||||
|
*.sublime-project
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# IDE & Editor – User-spezifische Files (VS)
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
# Visual Studio User Files
|
||||||
*.rsuser
|
*.rsuser
|
||||||
*.suo
|
*.suo
|
||||||
*.user
|
*.user
|
||||||
*.userosscache
|
*.userosscache
|
||||||
*.sln.docstates
|
*.sln.docstates
|
||||||
|
|
||||||
# User-specific files (MonoDevelop/Xamarin Studio)
|
# MonoDevelop/Xamarin Studio
|
||||||
*.userprefs
|
*.userprefs
|
||||||
|
|
||||||
# Mono auto generated files
|
# Visual Studio Cache/Options Directory
|
||||||
mono_crash.*
|
.vs/
|
||||||
|
# Uncomment if you have tasks that create the project's static files in wwwroot
|
||||||
|
#wwwroot/
|
||||||
|
|
||||||
|
# Visual Studio 2017 auto-generated files
|
||||||
|
Generated\ Files/
|
||||||
|
|
||||||
|
# Local History
|
||||||
|
.localhistory/
|
||||||
|
|
||||||
|
# CodeRush personal settings
|
||||||
|
.cr/personal
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Build Output
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
# Build results
|
|
||||||
[Dd]ebug/
|
[Dd]ebug/
|
||||||
[Dd]ebugPublic/
|
[Dd]ebugPublic/
|
||||||
[Rr]elease/
|
[Rr]elease/
|
||||||
@@ -47,43 +203,24 @@ bld/
|
|||||||
[Ll]og/
|
[Ll]og/
|
||||||
[Ll]ogs/
|
[Ll]ogs/
|
||||||
|
|
||||||
# Visual Studio 2015/2017 cache/options directory
|
# ATL Project Build Output
|
||||||
.vs/
|
|
||||||
# Uncomment if you have tasks that create the project's static files in wwwroot
|
|
||||||
#wwwroot/
|
|
||||||
|
|
||||||
# Visual Studio 2017 auto generated files
|
|
||||||
Generated\ Files/
|
|
||||||
|
|
||||||
# MSTest test Results
|
|
||||||
[Tt]est[Rr]esult*/
|
|
||||||
[Bb]uild[Ll]og.*
|
|
||||||
|
|
||||||
# NUnit
|
|
||||||
*.VisualState.xml
|
|
||||||
TestResult.xml
|
|
||||||
nunit-*.xml
|
|
||||||
|
|
||||||
# Build Results of an ATL Project
|
|
||||||
[Dd]ebugPS/
|
[Dd]ebugPS/
|
||||||
[Rr]eleasePS/
|
[Rr]eleasePS/
|
||||||
dlldata.c
|
dlldata.c
|
||||||
|
|
||||||
# Benchmark Results
|
|
||||||
BenchmarkDotNet.Artifacts/
|
|
||||||
|
|
||||||
# .NET Core
|
# .NET Core
|
||||||
project.lock.json
|
project.lock.json
|
||||||
project.fragment.lock.json
|
project.fragment.lock.json
|
||||||
artifacts/
|
artifacts/
|
||||||
|
|
||||||
# ASP.NET Scaffolding
|
# MigrationBackup (Package Reference Convert Tool)
|
||||||
ScaffoldingReadMe.txt
|
MigrationBackup/
|
||||||
|
|
||||||
# StyleCop
|
|
||||||
StyleCopReport.xml
|
|
||||||
|
|
||||||
# Files built by Visual Studio
|
# =====================================================
|
||||||
|
# Build-Artefakte (Files built by Visual Studio)
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
*_i.c
|
*_i.c
|
||||||
*_p.c
|
*_p.c
|
||||||
*_h.h
|
*_h.h
|
||||||
@@ -105,6 +242,7 @@ StyleCopReport.xml
|
|||||||
*.tmp_proj
|
*.tmp_proj
|
||||||
*_wpftmp.csproj
|
*_wpftmp.csproj
|
||||||
*.log
|
*.log
|
||||||
|
*.binlog
|
||||||
*.vspscc
|
*.vspscc
|
||||||
*.vssscc
|
*.vssscc
|
||||||
.builds
|
.builds
|
||||||
@@ -112,10 +250,87 @@ StyleCopReport.xml
|
|||||||
*.svclog
|
*.svclog
|
||||||
*.scc
|
*.scc
|
||||||
|
|
||||||
# Chutzpah Test files
|
|
||||||
|
# =====================================================
|
||||||
|
# Test Results
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
# MSTest
|
||||||
|
[Tt]est[Rr]esult*/
|
||||||
|
[Bb]uild[Ll]og.*
|
||||||
|
|
||||||
|
# NUnit
|
||||||
|
*.VisualState.xml
|
||||||
|
TestResult.xml
|
||||||
|
nunit-*.xml
|
||||||
|
|
||||||
|
# Benchmark Results
|
||||||
|
BenchmarkDotNet.Artifacts/
|
||||||
|
|
||||||
|
# Verify / Snapshot Testing (modern .NET, Spotty Wisdom)
|
||||||
|
*.received.*
|
||||||
|
*.received.txt
|
||||||
|
|
||||||
|
# [!! OBSOLET 2026 !!] Chutzpah – Repository auf GitHub archiviert
|
||||||
_Chutzpah*
|
_Chutzpah*
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Code Coverage
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
# Coverlet
|
||||||
|
coverage*.json
|
||||||
|
coverage*.xml
|
||||||
|
coverage*.info
|
||||||
|
|
||||||
|
# Visual Studio code coverage
|
||||||
|
*.coverage
|
||||||
|
*.coveragexml
|
||||||
|
|
||||||
|
# DotCover (JetBrains)
|
||||||
|
*.dotCover
|
||||||
|
|
||||||
|
# AxoCover
|
||||||
|
.axoCover/*
|
||||||
|
!.axoCover/settings.json
|
||||||
|
|
||||||
|
# NCrunch
|
||||||
|
_NCrunch_*
|
||||||
|
.*crunch*.local.xml
|
||||||
|
nCrunchTemp_*
|
||||||
|
|
||||||
|
# OpenCover UI Analysis
|
||||||
|
OpenCover/
|
||||||
|
|
||||||
|
# [!! OBSOLET 2026 !!] MightyMoose / AutoTest.Net – seit >10 Jahren nicht mehr gepflegt
|
||||||
|
*.mm.*
|
||||||
|
AutoTest.Net/
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Profiler & Trace
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
# Visual Studio Profiler
|
||||||
|
*.psess
|
||||||
|
*.vsp
|
||||||
|
*.vspx
|
||||||
|
*.sap
|
||||||
|
|
||||||
|
# Visual Studio Trace Files
|
||||||
|
*.e2e
|
||||||
|
|
||||||
|
# NVidia Nsight GPU Debugger
|
||||||
|
*.nvuser
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Cache Files (VS, C++, Sass)
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
# Visual C++ cache files
|
# Visual C++ cache files
|
||||||
|
# Hinweis: Manche Patterns hier werden auch vom C#-Linter genutzt (z. B. *.lscache)
|
||||||
ipch/
|
ipch/
|
||||||
*.aps
|
*.aps
|
||||||
*.ncb
|
*.ncb
|
||||||
@@ -125,101 +340,80 @@ ipch/
|
|||||||
*.cachefile
|
*.cachefile
|
||||||
*.VC.db
|
*.VC.db
|
||||||
*.VC.VC.opendb
|
*.VC.VC.opendb
|
||||||
|
*.lscache
|
||||||
|
|
||||||
# Visual Studio profiler
|
# Visual Studio cache (.cache files allgemein, .cache directories behalten)
|
||||||
*.psess
|
*.[Cc]ache
|
||||||
*.vsp
|
!?*.[Cc]ache/
|
||||||
*.vspx
|
|
||||||
*.sap
|
|
||||||
|
|
||||||
# Visual Studio Trace Files
|
# Web Workbench Sass
|
||||||
*.e2e
|
|
||||||
|
|
||||||
# TFS 2012 Local Workspace
|
|
||||||
$tf/
|
|
||||||
|
|
||||||
# Guidance Automation Toolkit
|
|
||||||
*.gpState
|
|
||||||
|
|
||||||
# ReSharper is a .NET coding add-in
|
|
||||||
_ReSharper*/
|
|
||||||
*.[Rr]e[Ss]harper
|
|
||||||
*.DotSettings.user
|
|
||||||
|
|
||||||
# TeamCity is a build add-in
|
|
||||||
_TeamCity*
|
|
||||||
|
|
||||||
# DotCover is a Code Coverage Tool
|
|
||||||
*.dotCover
|
|
||||||
|
|
||||||
# AxoCover is a Code Coverage Tool
|
|
||||||
.axoCover/*
|
|
||||||
!.axoCover/settings.json
|
|
||||||
|
|
||||||
# Coverlet is a free, cross platform Code Coverage Tool
|
|
||||||
coverage*.json
|
|
||||||
coverage*.xml
|
|
||||||
coverage*.info
|
|
||||||
|
|
||||||
# Visual Studio code coverage results
|
|
||||||
*.coverage
|
|
||||||
*.coveragexml
|
|
||||||
|
|
||||||
# NCrunch
|
|
||||||
_NCrunch_*
|
|
||||||
.*crunch*.local.xml
|
|
||||||
nCrunchTemp_*
|
|
||||||
|
|
||||||
# MightyMoose
|
|
||||||
*.mm.*
|
|
||||||
AutoTest.Net/
|
|
||||||
|
|
||||||
# Web workbench (sass)
|
|
||||||
.sass-cache/
|
.sass-cache/
|
||||||
|
|
||||||
# Installshield output folder
|
|
||||||
[Ee]xpress/
|
|
||||||
|
|
||||||
# DocProject is a documentation generator add-in
|
# =====================================================
|
||||||
DocProject/buildhelp/
|
# NuGet & Dependencies
|
||||||
DocProject/Help/*.HxT
|
# =====================================================
|
||||||
DocProject/Help/*.HxC
|
|
||||||
DocProject/Help/*.hhc
|
|
||||||
DocProject/Help/*.hhk
|
|
||||||
DocProject/Help/*.hhp
|
|
||||||
DocProject/Help/Html2
|
|
||||||
DocProject/Help/html
|
|
||||||
|
|
||||||
# Click-Once directory
|
|
||||||
publish/
|
|
||||||
|
|
||||||
# Publish Web Output
|
|
||||||
*.[Pp]ublish.xml
|
|
||||||
*.azurePubxml
|
|
||||||
# Note: Comment the next line if you want to checkin your web deploy settings,
|
|
||||||
# but database connection strings (with potential passwords) will be unencrypted
|
|
||||||
*.pubxml
|
|
||||||
*.publishproj
|
|
||||||
|
|
||||||
# Microsoft Azure Web App publish settings. Comment the next line if you want to
|
|
||||||
# checkin your Azure Web App publish settings, but sensitive information contained
|
|
||||||
# in these scripts will be unencrypted
|
|
||||||
PublishScripts/
|
|
||||||
|
|
||||||
# NuGet Packages
|
# NuGet Packages
|
||||||
*.nupkg
|
*.nupkg
|
||||||
# NuGet Symbol Packages
|
|
||||||
*.snupkg
|
*.snupkg
|
||||||
# The packages folder can be ignored because of Package Restore
|
|
||||||
**/[Pp]ackages/*
|
**/[Pp]ackages/*
|
||||||
# except build/, which is used as an MSBuild target.
|
|
||||||
!**/[Pp]ackages/build/
|
!**/[Pp]ackages/build/
|
||||||
# Uncomment if necessary however generally it will be regenerated when needed
|
# Uncomment if necessary however generally it will be regenerated when needed
|
||||||
#!**/[Pp]ackages/repositories.config
|
#!**/[Pp]ackages/repositories.config
|
||||||
# NuGet v3's project.json files produces more ignorable files
|
|
||||||
*.nuget.props
|
*.nuget.props
|
||||||
*.nuget.targets
|
*.nuget.targets
|
||||||
|
|
||||||
|
# Paket dependency manager
|
||||||
|
.paket/paket.exe
|
||||||
|
paket-files/
|
||||||
|
|
||||||
|
# FAKE - F# Make
|
||||||
|
.fake/
|
||||||
|
|
||||||
|
# Cake - Uncomment if you are using it
|
||||||
|
# tools/**
|
||||||
|
# !tools/packages.config
|
||||||
|
|
||||||
|
# Fody – auto-generated XML schema
|
||||||
|
FodyWeavers.xsd
|
||||||
|
|
||||||
|
# Node (falls JS-Tooling im Build genutzt wird)
|
||||||
|
.ntvs_analysis.dat
|
||||||
|
node_modules/
|
||||||
|
|
||||||
|
# Python Tools für Visual Studio (PTVS)
|
||||||
|
__pycache__/
|
||||||
|
*.pyc
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Mono
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
mono_crash.*
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Publish & Deploy
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
# Click-Once
|
||||||
|
publish/
|
||||||
|
|
||||||
|
# Publish Web Output
|
||||||
|
# Note: Comment the next line if you want to checkin your web deploy settings,
|
||||||
|
# but database connection strings (with potential passwords) will be unencrypted
|
||||||
|
*.[Pp]ublish.xml
|
||||||
|
*.azurePubxml
|
||||||
|
*.pubxml
|
||||||
|
*.publishproj
|
||||||
|
|
||||||
|
# Microsoft Azure Web App Publish Settings
|
||||||
|
# Comment the next line if you want to checkin your Azure Web App publish settings,
|
||||||
|
# but sensitive information contained in these scripts will be unencrypted
|
||||||
|
PublishScripts/
|
||||||
|
|
||||||
# Microsoft Azure Build Output
|
# Microsoft Azure Build Output
|
||||||
csx/
|
csx/
|
||||||
*.build.csdef
|
*.build.csdef
|
||||||
@@ -228,7 +422,35 @@ csx/
|
|||||||
ecf/
|
ecf/
|
||||||
rcf/
|
rcf/
|
||||||
|
|
||||||
# Windows Store app package directories and files
|
# Service Fabric Backup
|
||||||
|
ServiceFabricBackup/
|
||||||
|
|
||||||
|
# Installshield
|
||||||
|
[Ee]xpress/
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Container / Infrastructure-as-Code (Vorsicht: Tokens!)
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
# Docker
|
||||||
|
docker-compose.override.yml
|
||||||
|
|
||||||
|
# Terraform
|
||||||
|
.terraform/
|
||||||
|
*.tfstate
|
||||||
|
*.tfstate.*
|
||||||
|
*.tfvars
|
||||||
|
!example.tfvars
|
||||||
|
|
||||||
|
# Serverless Framework
|
||||||
|
.serverless/
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Windows Store / AppX
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
AppPackages/
|
AppPackages/
|
||||||
BundleArtifacts/
|
BundleArtifacts/
|
||||||
Package.StoreAssociation.xml
|
Package.StoreAssociation.xml
|
||||||
@@ -237,23 +459,155 @@ _pkginfo.txt
|
|||||||
*.appxbundle
|
*.appxbundle
|
||||||
*.appxupload
|
*.appxupload
|
||||||
|
|
||||||
# Visual Studio cache files
|
|
||||||
# files ending in .cache can be ignored
|
|
||||||
*.[Cc]ache
|
|
||||||
# but keep track of directories ending in .cache
|
|
||||||
!?*.[Cc]ache/
|
|
||||||
|
|
||||||
# Others
|
# =====================================================
|
||||||
ClientBin/
|
# Datenbanken & SQL
|
||||||
~$*
|
# =====================================================
|
||||||
*~
|
|
||||||
|
# SQL Server
|
||||||
|
*.mdf
|
||||||
|
*.ldf
|
||||||
|
*.ndf
|
||||||
|
|
||||||
|
# Andere DB-bezogene
|
||||||
*.dbmdl
|
*.dbmdl
|
||||||
*.dbproj.schemaview
|
*.dbproj.schemaview
|
||||||
*.jfm
|
*.jfm
|
||||||
*.pfx
|
|
||||||
*.publishsettings
|
# [!! OBSOLET 2026 !!] BeatPulse – wurde 2019 umbenannt zu AspNetCore.Diagnostics.HealthChecks
|
||||||
|
healthchecksdb
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Business Intelligence / Reporting
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
*.rdl.data
|
||||||
|
*.bim.layout
|
||||||
|
*.bim_*.settings
|
||||||
|
*.rptproj.rsuser
|
||||||
|
*- [Bb]ackup.rdl
|
||||||
|
*- [Bb]ackup ([0-9]).rdl
|
||||||
|
*- [Bb]ackup ([0-9][0-9]).rdl
|
||||||
|
*.rptproj.bak
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Add-ins & Analyzer Tools
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
# ReSharper
|
||||||
|
_ReSharper*/
|
||||||
|
*.[Rr]e[Ss]harper
|
||||||
|
*.DotSettings.user
|
||||||
|
|
||||||
|
# TeamCity
|
||||||
|
_TeamCity*
|
||||||
|
|
||||||
|
# StyleCop
|
||||||
|
StyleCopReport.xml
|
||||||
|
|
||||||
|
# ASP.NET Scaffolding
|
||||||
|
ScaffoldingReadMe.txt
|
||||||
|
|
||||||
|
# Guidance Automation Toolkit
|
||||||
|
*.gpState
|
||||||
|
|
||||||
|
# Microsoft Fakes
|
||||||
|
FakesAssemblies/
|
||||||
|
|
||||||
|
# [!! OBSOLET 2026 !!] GhostDoc Plugin – Submain hat das Tool eingestellt
|
||||||
|
*.GhostDoc.xml
|
||||||
|
|
||||||
|
# Tabs Studio
|
||||||
|
*.tss
|
||||||
|
|
||||||
|
# Telerik JustMock
|
||||||
|
*.jmconfig
|
||||||
|
|
||||||
|
# MFractors (Xamarin productivity tool)
|
||||||
|
.mfractor/
|
||||||
|
|
||||||
|
# DocProject Documentation Generator
|
||||||
|
DocProject/buildhelp/
|
||||||
|
DocProject/Help/*.HxT
|
||||||
|
DocProject/Help/*.HxC
|
||||||
|
DocProject/Help/*.hhc
|
||||||
|
DocProject/Help/*.hhk
|
||||||
|
DocProject/Help/*.hhp
|
||||||
|
DocProject/Help/Html2
|
||||||
|
DocProject/Help/html
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Sonstige Sprachen & Tooling
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
# Ionide (F# VS Code Tools)
|
||||||
|
.ionide/
|
||||||
|
|
||||||
|
# Azure Stream Analytics Local Run
|
||||||
|
ASALocalRun/
|
||||||
|
|
||||||
|
# BizTalk Build Output
|
||||||
|
*.btp.cs
|
||||||
|
*.btm.cs
|
||||||
|
*.odx.cs
|
||||||
|
*.xsd.cs
|
||||||
|
|
||||||
|
# Orleans
|
||||||
orleans.codegen.cs
|
orleans.codegen.cs
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# [!! OBSOLET 2026 !!] Legacy-Tooling (eingestellt)
|
||||||
|
# Patterns bleiben aus Vorsicht drin.
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
# [!! OBSOLET 2026 !!] TFS 2012 Local Workspace – ersetzt durch Azure DevOps
|
||||||
|
$tf/
|
||||||
|
|
||||||
|
# [!! OBSOLET 2026 !!] Visual Studio 6 Build Log – VS6 ist von 1998
|
||||||
|
*.plg
|
||||||
|
|
||||||
|
# [!! OBSOLET 2026 !!] Visual Studio 6 Workspace Options
|
||||||
|
*.opt
|
||||||
|
|
||||||
|
# [!! OBSOLET 2026 !!] Visual Studio 6 Workspace File
|
||||||
|
*.vbw
|
||||||
|
|
||||||
|
# [!! OBSOLET 2026 !!] RIA / Silverlight – Microsoft hat das Okt. 2021 eingestellt
|
||||||
|
Generated_Code/
|
||||||
|
|
||||||
|
# [!! OBSOLET 2026 !!] Visual Studio LightSwitch – von Microsoft eingestellt
|
||||||
|
**/*.HTMLClient/GeneratedArtifacts
|
||||||
|
**/*.DesktopClient/GeneratedArtifacts
|
||||||
|
**/*.DesktopClient/ModelManifest.xml
|
||||||
|
**/*.Server/GeneratedArtifacts
|
||||||
|
**/*.Server/ModelManifest.xml
|
||||||
|
_Pvt_Extensions
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Upgrade / Backup-Reports
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
# Backup-Files vom Konvertieren alter VS-Projekte (wir haben ja git ;-))
|
||||||
|
_UpgradeReport_Files/
|
||||||
|
Backup*/
|
||||||
|
UpgradeLog*.XML
|
||||||
|
UpgradeLog*.htm
|
||||||
|
|
||||||
|
|
||||||
|
# =====================================================
|
||||||
|
# Misc / Temp / Backup
|
||||||
|
# =====================================================
|
||||||
|
|
||||||
|
ClientBin/
|
||||||
|
~$*
|
||||||
|
*~
|
||||||
|
*.publishsettings
|
||||||
|
|
||||||
# Including strong name files can present a security risk
|
# Including strong name files can present a security risk
|
||||||
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
|
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
|
||||||
#*.snk
|
#*.snk
|
||||||
@@ -261,130 +615,3 @@ orleans.codegen.cs
|
|||||||
# Since there are multiple workflows, uncomment next line to ignore bower_components
|
# Since there are multiple workflows, uncomment next line to ignore bower_components
|
||||||
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
|
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
|
||||||
#bower_components/
|
#bower_components/
|
||||||
|
|
||||||
# RIA/Silverlight projects
|
|
||||||
Generated_Code/
|
|
||||||
|
|
||||||
# Backup & report files from converting an old project file
|
|
||||||
# to a newer Visual Studio version. Backup files are not needed,
|
|
||||||
# because we have git ;-)
|
|
||||||
_UpgradeReport_Files/
|
|
||||||
Backup*/
|
|
||||||
UpgradeLog*.XML
|
|
||||||
UpgradeLog*.htm
|
|
||||||
ServiceFabricBackup/
|
|
||||||
*.rptproj.bak
|
|
||||||
|
|
||||||
# SQL Server files
|
|
||||||
*.mdf
|
|
||||||
*.ldf
|
|
||||||
*.ndf
|
|
||||||
|
|
||||||
# Business Intelligence projects
|
|
||||||
*.rdl.data
|
|
||||||
*.bim.layout
|
|
||||||
*.bim_*.settings
|
|
||||||
*.rptproj.rsuser
|
|
||||||
*- [Bb]ackup.rdl
|
|
||||||
*- [Bb]ackup ([0-9]).rdl
|
|
||||||
*- [Bb]ackup ([0-9][0-9]).rdl
|
|
||||||
|
|
||||||
# Microsoft Fakes
|
|
||||||
FakesAssemblies/
|
|
||||||
|
|
||||||
# GhostDoc plugin setting file
|
|
||||||
*.GhostDoc.xml
|
|
||||||
|
|
||||||
# Node.js Tools for Visual Studio
|
|
||||||
.ntvs_analysis.dat
|
|
||||||
node_modules/
|
|
||||||
|
|
||||||
# Visual Studio 6 build log
|
|
||||||
*.plg
|
|
||||||
|
|
||||||
# Visual Studio 6 workspace options file
|
|
||||||
*.opt
|
|
||||||
|
|
||||||
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
|
|
||||||
*.vbw
|
|
||||||
|
|
||||||
# Visual Studio LightSwitch build output
|
|
||||||
**/*.HTMLClient/GeneratedArtifacts
|
|
||||||
**/*.DesktopClient/GeneratedArtifacts
|
|
||||||
**/*.DesktopClient/ModelManifest.xml
|
|
||||||
**/*.Server/GeneratedArtifacts
|
|
||||||
**/*.Server/ModelManifest.xml
|
|
||||||
_Pvt_Extensions
|
|
||||||
|
|
||||||
# Paket dependency manager
|
|
||||||
.paket/paket.exe
|
|
||||||
paket-files/
|
|
||||||
|
|
||||||
# FAKE - F# Make
|
|
||||||
.fake/
|
|
||||||
|
|
||||||
# CodeRush personal settings
|
|
||||||
.cr/personal
|
|
||||||
|
|
||||||
# Python Tools for Visual Studio (PTVS)
|
|
||||||
__pycache__/
|
|
||||||
*.pyc
|
|
||||||
|
|
||||||
# Cake - Uncomment if you are using it
|
|
||||||
# tools/**
|
|
||||||
# !tools/packages.config
|
|
||||||
|
|
||||||
# Tabs Studio
|
|
||||||
*.tss
|
|
||||||
|
|
||||||
# Telerik's JustMock configuration file
|
|
||||||
*.jmconfig
|
|
||||||
|
|
||||||
# BizTalk build output
|
|
||||||
*.btp.cs
|
|
||||||
*.btm.cs
|
|
||||||
*.odx.cs
|
|
||||||
*.xsd.cs
|
|
||||||
|
|
||||||
# OpenCover UI analysis results
|
|
||||||
OpenCover/
|
|
||||||
|
|
||||||
# Azure Stream Analytics local run output
|
|
||||||
ASALocalRun/
|
|
||||||
|
|
||||||
# MSBuild Binary and Structured Log
|
|
||||||
*.binlog
|
|
||||||
|
|
||||||
# NVidia Nsight GPU debugger configuration file
|
|
||||||
*.nvuser
|
|
||||||
|
|
||||||
# MFractors (Xamarin productivity tool) working folder
|
|
||||||
.mfractor/
|
|
||||||
|
|
||||||
# Local History for Visual Studio
|
|
||||||
.localhistory/
|
|
||||||
|
|
||||||
# BeatPulse healthcheck temp database
|
|
||||||
healthchecksdb
|
|
||||||
|
|
||||||
# Backup folder for Package Reference Convert tool in Visual Studio 2017
|
|
||||||
MigrationBackup/
|
|
||||||
|
|
||||||
# Ionide (cross platform F# VS Code tools) working folder
|
|
||||||
.ionide/
|
|
||||||
|
|
||||||
# Fody - auto-generated XML schema
|
|
||||||
FodyWeavers.xsd
|
|
||||||
|
|
||||||
#Specs und Plan datein
|
|
||||||
/.superpowers/
|
|
||||||
|
|
||||||
#Test Datein
|
|
||||||
ChatTwo.Tests
|
|
||||||
TestResults
|
|
||||||
*.db-shm
|
|
||||||
*.db-wal
|
|
||||||
|
|
||||||
# Claude Code projekt-spezifisches Setup (lokal, nicht committed)
|
|
||||||
/.claude/
|
|
||||||
/CLAUDE.md
|
|
||||||
|
|||||||
+10
-2
@@ -1,9 +1,17 @@
|
|||||||
{
|
{
|
||||||
"MD007": { "indent": 4 },
|
"MD003": { "style": "atx" },
|
||||||
|
"MD004": { "style": "dash" },
|
||||||
|
"MD007": { "indent": 2 },
|
||||||
|
"MD009": { "br_spaces": 2, "strict": false, "list_item_empty_lines": false },
|
||||||
"MD013": false,
|
"MD013": false,
|
||||||
"MD024": { "siblings_only": true },
|
"MD024": { "siblings_only": true },
|
||||||
"MD029": false,
|
"MD029": false,
|
||||||
"MD033": false,
|
"MD033": false,
|
||||||
"MD036": false,
|
"MD036": false,
|
||||||
"MD041": false
|
"MD040": true,
|
||||||
|
"MD041": false,
|
||||||
|
"MD046": { "style": "fenced" },
|
||||||
|
"MD048": { "style": "backtick" },
|
||||||
|
"MD049": { "style": "underscore" },
|
||||||
|
"MD050": { "style": "asterisk" }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,50 @@
|
|||||||
|
# ##############################################################
|
||||||
|
# #
|
||||||
|
# # .prettierignore – Hellion Forge / Hellion Media
|
||||||
|
# #
|
||||||
|
# # Files die Prettier NICHT anfassen soll.
|
||||||
|
# # Überarbeitet: Mai 2026
|
||||||
|
# #
|
||||||
|
# # Hinweis: Prettier liest auch .gitignore automatisch mit.
|
||||||
|
# # Hier nur Sachen die zusätzlich ignoriert werden müssen
|
||||||
|
# # oder die im Repo liegen aber nicht formatiert werden dürfen.
|
||||||
|
# #
|
||||||
|
# ##############################################################
|
||||||
|
|
||||||
|
|
||||||
|
# === .NET Build Output ===
|
||||||
bin/
|
bin/
|
||||||
obj/
|
obj/
|
||||||
|
|
||||||
|
# === JS / Web Build Output ===
|
||||||
node_modules/
|
node_modules/
|
||||||
|
dist/
|
||||||
|
out/
|
||||||
|
build/
|
||||||
|
coverage/
|
||||||
|
|
||||||
|
# === Generierte C#-Files (Designer, Source Generators) ===
|
||||||
*.Designer.cs
|
*.Designer.cs
|
||||||
|
*.g.cs
|
||||||
|
*.g.i.cs
|
||||||
|
*.generated.cs
|
||||||
|
*.AssemblyInfo.cs
|
||||||
|
*.AssemblyAttributes.cs
|
||||||
|
|
||||||
|
# === Lock-Files (NIE umformatieren – zerschießt den Hash) ===
|
||||||
|
package-lock.json
|
||||||
|
yarn.lock
|
||||||
|
pnpm-lock.yaml
|
||||||
|
packages.lock.json
|
||||||
|
|
||||||
|
# === Minified Files (bewusst kompakt, niemals anfassen) ===
|
||||||
|
*.min.js
|
||||||
|
*.min.css
|
||||||
|
|
||||||
|
# === Test-Snapshots (z. B. Verify) ===
|
||||||
|
*.received.*
|
||||||
|
*.verified.*
|
||||||
|
**/__snapshots__/
|
||||||
|
|
||||||
|
# === Plugin-Manifest (DalamudPackager-Schema, fix lassen) ===
|
||||||
|
HellionChat/HellionChat.yaml
|
||||||
|
|||||||
+30
-2
@@ -1,7 +1,35 @@
|
|||||||
{
|
{
|
||||||
"printWidth": 120,
|
"printWidth": 120,
|
||||||
"tabWidth": 4,
|
"tabWidth": 4,
|
||||||
"proseWrap": "always",
|
"useTabs": false,
|
||||||
|
"semi": true,
|
||||||
"singleQuote": false,
|
"singleQuote": false,
|
||||||
"endOfLine": "lf"
|
"trailingComma": "all",
|
||||||
|
"bracketSpacing": true,
|
||||||
|
"arrowParens": "always",
|
||||||
|
"proseWrap": "always",
|
||||||
|
"endOfLine": "lf",
|
||||||
|
"overrides": [
|
||||||
|
{
|
||||||
|
"files": "*.md",
|
||||||
|
"options": {
|
||||||
|
"printWidth": 100,
|
||||||
|
"tabWidth": 2
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"files": ["*.yml", "*.yaml"],
|
||||||
|
"options": {
|
||||||
|
"tabWidth": 2,
|
||||||
|
"singleQuote": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"files": "*.json",
|
||||||
|
"options": {
|
||||||
|
"tabWidth": 4,
|
||||||
|
"trailingComma": "none"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
+51
-6
@@ -1,8 +1,53 @@
|
|||||||
|
# ##############################################################
|
||||||
|
# #
|
||||||
|
# # .yamllint.yaml – Hellion Forge / Hellion Media
|
||||||
|
# #
|
||||||
|
# # YAML-Linting Konfiguration.
|
||||||
|
# # Überarbeitet: Mai 2026
|
||||||
|
# #
|
||||||
|
# # Regel-Doku:
|
||||||
|
# # https://yamllint.readthedocs.io/en/stable/rules.html
|
||||||
|
# #
|
||||||
|
# ##############################################################
|
||||||
|
|
||||||
extends: default
|
extends: default
|
||||||
|
|
||||||
|
# Plugin-Manifest folgt DalamudPackager-Konvention (4-space-indent für
|
||||||
|
# image_urls + tags). yamllint-Default verlangt 2 — Konflikt, daher
|
||||||
|
# ignorieren statt das Manifest zu reformatieren.
|
||||||
|
ignore: |
|
||||||
|
HellionChat/HellionChat.yaml
|
||||||
|
|
||||||
rules:
|
rules:
|
||||||
line-length: disable
|
# Zeilenlängen-Check aus (konsistent mit markdownlint MD013)
|
||||||
document-start: disable
|
line-length: disable
|
||||||
truthy:
|
|
||||||
allowed-values: ["true", "false", "on"]
|
# YAML ohne führendes "---" erlaubt
|
||||||
empty-lines:
|
document-start: disable
|
||||||
max: 1
|
|
||||||
|
# GitHub Actions nutzt "on:" als Trigger-Key.
|
||||||
|
# Ohne diesen Override würde yamllint das als boolean "on" beklagen.
|
||||||
|
truthy:
|
||||||
|
allowed-values: ['true', 'false', 'on']
|
||||||
|
|
||||||
|
# Maximal 1 Leerzeile in Folge (saubere Files)
|
||||||
|
empty-lines:
|
||||||
|
max: 1
|
||||||
|
|
||||||
|
# YAML-Standard ist 2 Spaces (auch GitHub Actions erwartet das).
|
||||||
|
# Explizit setzen, um Konsistenz im Repo zu erzwingen.
|
||||||
|
indentation:
|
||||||
|
spaces: 2
|
||||||
|
indent-sequences: true
|
||||||
|
check-multi-line-strings: false
|
||||||
|
|
||||||
|
# Kommentare brauchen Space nach #, müssen mit Content beginnen
|
||||||
|
comments:
|
||||||
|
require-starting-space: true
|
||||||
|
min-spaces-from-content: 1
|
||||||
|
|
||||||
|
# Kein Whitespace am Zeilenende
|
||||||
|
trailing-spaces: enable
|
||||||
|
|
||||||
|
# Datei muss mit Newline enden
|
||||||
|
new-line-at-end-of-file: enable
|
||||||
|
|||||||
+48
-44
@@ -2,14 +2,15 @@
|
|||||||
|
|
||||||
## A Note on This Project
|
## A Note on This Project
|
||||||
|
|
||||||
HellionChat is a one-person side project developed under Hellion Forge. I maintain this in my spare time, which means
|
HellionChat is a one-person side project developed under Hellion Forge. I maintain this in my spare
|
||||||
replies can take a few days. Please do not escalate just because a thread is quiet.
|
time, which means replies can take a few days. Please do not escalate just because a thread is
|
||||||
|
quiet.
|
||||||
|
|
||||||
When in doubt, assume good intent. Contributors come from different backgrounds, time zones and skill levels. A
|
When in doubt, assume good intent. Contributors come from different backgrounds, time zones and
|
||||||
clarifying question is almost always a better first move than an accusation.
|
skill levels. A clarifying question is almost always a better first move than an accusation.
|
||||||
|
|
||||||
Please also keep discussions on topic. This project is about a Dalamud chat plugin. Off-topic arguments belong
|
Please also keep discussions on topic. This project is about a Dalamud chat plugin. Off-topic
|
||||||
elsewhere.
|
arguments belong elsewhere.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -17,20 +18,21 @@ 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 the dignity, rights, and contributions of all
|
We are committed to fostering an environment that respects and promotes the dignity, rights, and
|
||||||
individuals, regardless of characteristics including race, ethnicity, caste, color, age, physical characteristics,
|
contributions of all individuals, regardless of characteristics including race, ethnicity, caste,
|
||||||
neurodiversity, disability, sex or gender, gender identity or expression, sexual orientation, language, philosophy or
|
color, age, physical characteristics, neurodiversity, disability, sex or gender, gender identity or
|
||||||
religion, national or social origin, socio-economic position, level of education, or other status. The same privileges
|
expression, sexual orientation, language, philosophy or religion, national or social origin,
|
||||||
of participation are extended to everyone who participates in good faith and in accordance with this Covenant.
|
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 our community's expectations for positive
|
While acknowledging differences in social norms, we all strive to meet our community's expectations
|
||||||
behavior. We also understand that our words and actions may be interpreted differently than we intend based on culture,
|
for positive behavior. We also understand that our words and actions may be interpreted differently
|
||||||
background, or native language.
|
than we intend based on culture, background, or native language.
|
||||||
|
|
||||||
With these considerations in mind, we agree to behave mindfully toward each other and act in ways that center our shared
|
With these considerations in mind, we agree to behave mindfully toward each other and act in ways
|
||||||
values, including:
|
that center our shared values, including:
|
||||||
|
|
||||||
1. Respecting the **purpose of our community**, our activities, and our ways of gathering.
|
1. Respecting the **purpose of our community**, our activities, and our ways of gathering.
|
||||||
2. Engaging **kindly and honestly** with others.
|
2. Engaging **kindly and honestly** with others.
|
||||||
@@ -42,31 +44,32 @@ values, including:
|
|||||||
|
|
||||||
## Restricted Behaviors
|
## Restricted Behaviors
|
||||||
|
|
||||||
We agree to restrict the following behaviors in our community. Instances, threats, and promotion of these behaviors are
|
We agree to restrict the following behaviors in our community. Instances, threats, and promotion of
|
||||||
violations of this Code of Conduct.
|
these behaviors are violations of this Code of Conduct.
|
||||||
|
|
||||||
1. **Harassment.** Violating explicitly expressed boundaries or engaging in unnecessary personal attention after any
|
1. **Harassment.** Violating explicitly expressed boundaries or engaging in unnecessary personal
|
||||||
clear request to stop.
|
attention after any clear request to stop.
|
||||||
2. **Character attacks.** Making insulting, demeaning, or pejorative comments directed at a community member or group of
|
2. **Character attacks.** Making insulting, demeaning, or pejorative comments directed at a
|
||||||
people.
|
community member or group of people.
|
||||||
3. **Stereotyping or discrimination.** Characterizing anyone's personality or behavior on the basis of immutable
|
3. **Stereotyping or discrimination.** Characterizing anyone's personality or behavior on the basis
|
||||||
identities or traits.
|
of immutable identities or 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 considered inappropriately intimate
|
||||||
purpose of the community.
|
in the context or purpose of the community.
|
||||||
5. **Violating confidentiality.** Sharing or acting on someone's personal or private information without their
|
5. **Violating confidentiality.** Sharing or acting on someone's personal or private information
|
||||||
permission.
|
without their permission.
|
||||||
6. **Endangerment.** Causing, encouraging, or threatening violence or other harm toward any person or group.
|
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.
|
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, or pretending to be someone else to evade
|
1. **Misleading identity.** Impersonating someone else for any reason, or pretending to be someone
|
||||||
enforcement actions.
|
else to evade enforcement actions.
|
||||||
2. **Failing to credit sources.** Not properly crediting the sources of content you contribute.
|
2. **Failing to credit sources.** Not properly crediting the sources of 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 content in a way that is outside
|
||||||
community.
|
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 content which includes, links to,
|
||||||
other restricted behaviors.
|
or describes any other restricted behaviors.
|
||||||
|
|
||||||
## Reporting
|
## Reporting
|
||||||
|
|
||||||
@@ -77,12 +80,13 @@ If something here is being broken, contact me directly. Do not open a public iss
|
|||||||
| 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 (European business hours) and tell you what I plan to do.
|
Reports stay private. I will acknowledge within a few weekdays (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 will pick the lightest measure that actually
|
I am the sole maintainer, so enforcement is a single-person process. I will pick the lightest
|
||||||
resolves the situation:
|
measure that actually 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.
|
||||||
@@ -95,16 +99,16 @@ Severe cases skip the lower steps. I will not negotiate over harassment or threa
|
|||||||
|
|
||||||
## Scope
|
## Scope
|
||||||
|
|
||||||
This Code of Conduct applies to all spaces the project owns or that I run on its behalf: the GitHub repository, GitHub
|
This Code of Conduct applies to all spaces the project owns or that I run on its behalf: the GitHub
|
||||||
Discussions, project-related Discord conversations, and the maintainer contact listed in [`SECURITY.md`](SECURITY.md).
|
repository, GitHub Discussions, 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 is identifiably representing
|
||||||
HellionChat maintainer in the Dalamud Discord.
|
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 3.0, available at
|
This Code of Conduct is adapted from the Contributor Covenant, version 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 Source and licensed under CC BY-SA 4.0. To view a copy
|
Contributor Covenant is stewarded by the Organization for Ethical Source and licensed under CC BY-SA
|
||||||
of this license, visit
|
4.0. To view a copy of this 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/).
|
||||||
|
|||||||
+70
-58
@@ -1,69 +1,75 @@
|
|||||||
# Contributing to HellionChat
|
# Contributing to HellionChat
|
||||||
|
|
||||||
Thanks for taking a look. HellionChat is a one-person side project developed under Hellion Forge. It started as a fork
|
Thanks for taking a look. HellionChat is a one-person side project developed under Hellion Forge. It
|
||||||
of [Chat 2](https://github.com/Infiziert90/ChatTwo) and has since become a standalone plugin under its own namespace,
|
started as a fork of [Chat 2](https://github.com/Infiziert90/ChatTwo) and has since become a
|
||||||
IPC channels and source tree (standalone-cut completed in v1.0.0). Forking HellionChat itself is explicitly permitted
|
standalone plugin under its own namespace, IPC channels and source tree (standalone-cut completed in
|
||||||
under the EUPL-1.2.
|
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 to make a contribution land smoothly.
|
This document explains what I am looking for, what I am not, and how 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 privacy-focused, EUPL-1.2-licensed Dalamud plugin that
|
- Read the [README](README.md) so you understand the scope: a privacy-focused, EUPL-1.2-licensed
|
||||||
intentionally removes the upstream webinterface and ships privacy-first defaults.
|
Dalamud plugin that intentionally removes the upstream webinterface and ships privacy-first
|
||||||
- Read [`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md). Active cherry-picking from upstream Chat 2 has ended in the
|
defaults.
|
||||||
v1.4.x cycle; HellionChat continues as an independent codebase. Existing upstream-derived code keeps its attribution.
|
- Read [`docs/UPSTREAM_SYNC.md`](docs/UPSTREAM_SYNC.md). Active cherry-picking from upstream Chat 2
|
||||||
New contributions stand on their own and do not need to be cherry-pick-compatible.
|
has ended in the v1.4.x cycle; 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 stand on their own and do not need
|
||||||
or PR.
|
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 settings or the changelog.
|
- Bug fixes for behaviour documented in the README, the in-plugin settings or the changelog.
|
||||||
- Translation contributions for Hellion-specific strings via direct pull requests against
|
- Translation contributions for Hellion-specific strings via direct pull requests against
|
||||||
`HellionChat/Resources/HellionStrings.*.resx`. Translations for upstream Chat 2 strings (`Language.*.resx`) are not
|
`HellionChat/Resources/HellionStrings.*.resx`. Translations for upstream Chat 2 strings
|
||||||
handled here; those go to the upstream Chat 2 project.
|
(`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 what an existing Dalamud plugin already does well.
|
- New features that fit the privacy-first scope and do not duplicate 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 removed in v0.2.0 on purpose. See the README
|
- Re-introducing the webinterface or any remote-access feature. It was removed in v0.2.0 on purpose.
|
||||||
section "Was gegenüber Chat 2 fehlt".
|
See the README section "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 retention behaviour without an
|
||||||
opt-in.
|
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 maintenance cost outweighs the
|
||||||
project. (This used to be doubly important because of the upstream cherry-pick path; that path is closed now, but the
|
benefit for a one-person project. (This used to be doubly important because of the upstream
|
||||||
rule still holds on its own merits.)
|
cherry-pick path; that path is closed now, but the rule still holds on its own merits.)
|
||||||
- AI-generated code dropped in without disclosure or human review. See [`docs/AI_DISCLOSURE.md`](docs/AI_DISCLOSURE.md)
|
- AI-generated code dropped in without disclosure or human review. See
|
||||||
for how I handle AI assistance on my side; I expect comparable transparency from contributors.
|
[`docs/AI_DISCLOSURE.md`](docs/AI_DISCLOSURE.md) for how I handle AI assistance on my side; I
|
||||||
|
expect comparable transparency from contributors.
|
||||||
|
|
||||||
If you are unsure whether an idea fits, open a feature-request issue first and ask before writing code. I would rather
|
If you are unsure whether an idea fits, open a feature-request issue first and ask before writing
|
||||||
say "no" to a proposal than to a finished pull request.
|
code. I would rather say "no" to a proposal than to a finished pull request.
|
||||||
|
|
||||||
## Workflow
|
## Workflow
|
||||||
|
|
||||||
1. Open an issue (bug or feature request) using the templates under `.github/ISSUE_TEMPLATE/`. Skip this for trivial
|
1. Open an issue (bug or feature request) using the templates under `.github/ISSUE_TEMPLATE/`. Skip
|
||||||
typos.
|
this for trivial typos.
|
||||||
2. Fork the repository and branch off `main`. Branch naming is informal; something like `fix/auto-tell-history-empty` or
|
2. Fork the repository and branch off `main`. Branch naming is informal; something like
|
||||||
`feat/theme-export` is fine.
|
`fix/auto-tell-history-empty` or `feat/theme-export` is fine.
|
||||||
3. Match the existing code style. The repository ships an `.editorconfig` that VS Code and Rider pick up automatically.
|
3. Match the existing code style. The repository ships an `.editorconfig` that VS Code and Rider
|
||||||
4. Keep commits focused. Several small commits with clear messages are easier to review than one large one.
|
pick up automatically.
|
||||||
Squash-on-merge happens at the PR level if needed.
|
4. Keep commits focused. Several small commits with clear messages are easier to review than one
|
||||||
|
large one. Squash-on-merge happens at the PR level if needed.
|
||||||
5. If your change touches user-visible behaviour, update the README and/or the changelog block in
|
5. If your change touches user-visible behaviour, update the README and/or the changelog block in
|
||||||
`HellionChat/HellionChat.yaml` and `repo.json`. I bump the version number myself at release time.
|
`HellionChat/HellionChat.yaml` and `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
|
6. Open the pull request against `main`. The PR template will ask you to summarise the change, the
|
||||||
any compatibility notes.
|
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 locally you need:
|
The project targets `net10.0-windows` against Dalamud SDK 15. To build locally you need:
|
||||||
|
|
||||||
- .NET 10 SDK
|
- .NET 10 SDK
|
||||||
- A working Dalamud dev environment with `DALAMUD_HOME` set (XIVLauncher installed and launched once is the simplest
|
- A working Dalamud dev environment with `DALAMUD_HOME` set (XIVLauncher installed and launched once
|
||||||
path)
|
is the simplest 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
|
||||||
@@ -71,11 +77,12 @@ 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 project, point it at the relevant subsystems
|
There are currently no tests in `HellionChat.sln`. If you add a test project, point it at the
|
||||||
(privacy filter, configuration migration, message store) and mention it in the PR.
|
relevant subsystems (privacy filter, configuration migration, message store) and mention it in the
|
||||||
|
PR.
|
||||||
|
|
||||||
For a smoke test in-game: build, copy the output into your Dalamud `devPlugins/HellionChat/` directory and load it via
|
For a smoke test in-game: build, copy the output into your Dalamud `devPlugins/HellionChat/`
|
||||||
`/xlplugins`.
|
directory and load it via `/xlplugins`.
|
||||||
|
|
||||||
## Continuous Integration
|
## Continuous Integration
|
||||||
|
|
||||||
@@ -86,30 +93,33 @@ Every push and every pull request runs:
|
|||||||
| `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. CodeQL findings on changed code need to be
|
A pull request will not be merged while either of these is failing. CodeQL findings on changed code
|
||||||
addressed; pre-existing findings on untouched code are tracked separately.
|
need to be addressed; pre-existing findings on untouched code are tracked separately.
|
||||||
|
|
||||||
## Translations
|
## Translations
|
||||||
|
|
||||||
Hellion-specific strings live in `HellionChat/Resources/HellionStrings.resx` (English source) and
|
Hellion-specific strings live in `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` are **not** translated here. They are kept as-is
|
The upstream Chat 2 strings in `HellionChat/Resources/Language.*.resx` are **not** translated here.
|
||||||
from the last upstream sync and remain the work of the Chat 2 Crowdin community. Active cherry-picking from upstream
|
They are kept as-is from the last 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 translation improvements to those
|
||||||
Chat 2 strings, please contribute them to [Infiziert90/ChatTwo](https://github.com/Infiziert90/ChatTwo) directly.
|
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 contribute it under the project licence.
|
- Your contribution is your own work, or you have the right to contribute it under the project
|
||||||
- You agree that your contribution will be released under the [EUPL-1.2](LICENSE), the same licence as the rest of the
|
licence.
|
||||||
project.
|
- You agree that your contribution will be released under the [EUPL-1.2](LICENSE), the same licence
|
||||||
|
as the rest of the project.
|
||||||
|
|
||||||
There is no separate CLA. Forking HellionChat is explicitly permitted under the EUPL-1.2, as with any EUPL-licensed
|
There is no separate CLA. Forking HellionChat is explicitly permitted under the EUPL-1.2, as with
|
||||||
project.
|
any EUPL-licensed project.
|
||||||
|
|
||||||
## Response Times
|
## Response Times
|
||||||
|
|
||||||
@@ -119,8 +129,9 @@ project.
|
|||||||
| 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 and FFXIV patch days off. A pull request that
|
I respond on weekdays during European business hours and take weekends and FFXIV patch days off. A
|
||||||
sits for a few days has not been ignored. Pinging once after a week is fine; please do not ping daily.
|
pull request that sits for a few days has not been ignored. Pinging once after a week is fine;
|
||||||
|
please do not ping daily.
|
||||||
|
|
||||||
## First-time setup
|
## First-time setup
|
||||||
|
|
||||||
@@ -130,9 +141,10 @@ After cloning, run once:
|
|||||||
./scripts/setup-hooks.sh
|
./scripts/setup-hooks.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
This wires `core.hooksPath` to `.githooks/`. The pre-push hook runs preflight (versions/manifest/changelog/build).
|
This wires `core.hooksPath` to `.githooks/`. The pre-push hook runs preflight
|
||||||
|
(versions/manifest/changelog/build).
|
||||||
|
|
||||||
### Test suite
|
### Test suite
|
||||||
|
|
||||||
The plugin's test suite lives in a separate local repository and is not part of this codebase. If you need access for
|
The plugin's test suite lives in a separate local repository and is not part of this codebase. If
|
||||||
development, contact the maintainer.
|
you need access for development, contact the maintainer.
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
using Lumina.Excel.Sheets;
|
||||||
|
|
||||||
|
namespace HellionChat;
|
||||||
|
|
||||||
|
// Ported 1:1 from v1.5.6 ChatLogWindow.SetUpAllCommands. Provides a fast
|
||||||
|
// lookup from slash-command string to the game's TextCommand row so the
|
||||||
|
// InputBar callback can feed descriptions to CommandHelpWindow without
|
||||||
|
// hitting the sheet on every keystroke.
|
||||||
|
internal static class AllCommands
|
||||||
|
{
|
||||||
|
private static readonly Dictionary<string, TextCommand> Commands = BuildCommands();
|
||||||
|
|
||||||
|
private static Dictionary<string, TextCommand> BuildCommands()
|
||||||
|
{
|
||||||
|
var dict = new Dictionary<string, TextCommand>(StringComparer.Ordinal);
|
||||||
|
foreach (var command in Sheets.TextCommandSheet)
|
||||||
|
{
|
||||||
|
if (!command.Command.IsEmpty)
|
||||||
|
dict.TryAdd(command.Command.ToString(), command);
|
||||||
|
|
||||||
|
if (!command.ShortCommand.IsEmpty)
|
||||||
|
dict.TryAdd(command.ShortCommand.ToString(), command);
|
||||||
|
|
||||||
|
if (!command.Alias.IsEmpty)
|
||||||
|
dict.TryAdd(command.Alias.ToString(), command);
|
||||||
|
|
||||||
|
if (!command.ShortAlias.IsEmpty)
|
||||||
|
dict.TryAdd(command.ShortAlias.ToString(), command);
|
||||||
|
}
|
||||||
|
|
||||||
|
return dict;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool TryGetValue(string command, out TextCommand textCommand) =>
|
||||||
|
Commands.TryGetValue(command, out textCommand);
|
||||||
|
}
|
||||||
@@ -9,6 +9,7 @@ using HellionChat.Code;
|
|||||||
using HellionChat.GameFunctions.Types;
|
using HellionChat.GameFunctions.Types;
|
||||||
using HellionChat.Resources;
|
using HellionChat.Resources;
|
||||||
using HellionChat.Util;
|
using HellionChat.Util;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
namespace HellionChat;
|
namespace HellionChat;
|
||||||
|
|
||||||
@@ -19,7 +20,16 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
private readonly Plugin _plugin;
|
private readonly Plugin _plugin;
|
||||||
private readonly MessageManager _messageManager;
|
private readonly MessageManager _messageManager;
|
||||||
private readonly MessageStore _store;
|
private readonly MessageStore _store;
|
||||||
private readonly object _tempTabsLock = new();
|
private readonly ILogger<AutoTellTabsService> _logger;
|
||||||
|
|
||||||
|
// Tabs-list structure lock now lives on Plugin (neutral owner) so the
|
||||||
|
// MessageManager refilter can share it. See Plugin.TabsListLock.
|
||||||
|
private object TabsListLock => _plugin.TabsListLock;
|
||||||
|
|
||||||
|
// Bumped whenever something wipes unpinned temp tabs wholesale (logout).
|
||||||
|
// HandleTell reads it before releasing the lock and re-checks after, so a
|
||||||
|
// tab built in between is discarded instead of outliving the wipe.
|
||||||
|
private int _tabGeneration;
|
||||||
|
|
||||||
// Hard cap on pinned TempTabs so the sidebar doesn't inflate over years
|
// Hard cap on pinned TempTabs so the sidebar doesn't inflate over years
|
||||||
// of usage. Separate pool from AutoTellTabsLimit (15) — pinned tabs live
|
// of usage. Separate pool from AutoTellTabsLimit (15) — pinned tabs live
|
||||||
@@ -29,17 +39,27 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
|
|
||||||
private bool _initialized;
|
private bool _initialized;
|
||||||
|
|
||||||
internal AutoTellTabsService(Plugin plugin, MessageManager messageManager, MessageStore store)
|
// Set when Initialize ran before a character was available; cleared once the
|
||||||
|
// history has actually been loaded.
|
||||||
|
private bool _rehydratePending;
|
||||||
|
|
||||||
|
internal AutoTellTabsService(
|
||||||
|
Plugin plugin,
|
||||||
|
MessageManager messageManager,
|
||||||
|
MessageStore store,
|
||||||
|
ILogger<AutoTellTabsService> logger
|
||||||
|
)
|
||||||
{
|
{
|
||||||
_plugin = plugin;
|
_plugin = plugin;
|
||||||
_messageManager = messageManager;
|
_messageManager = messageManager;
|
||||||
_store = store;
|
_store = store;
|
||||||
|
_logger = logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Derived from the tab list on read. Pin/Unpin/Promote/Logout simply
|
// Derived from the tab list on read. Pin/Unpin/Promote/Logout simply
|
||||||
// mutate IsPinned or remove tabs — the count adapts automatically.
|
// mutate IsPinned or remove tabs — the count adapts automatically.
|
||||||
// Replaces the F2.1 Interlocked counter because the new pin-state
|
// Replaces an Interlocked counter: the pin-state transitions are cold-path
|
||||||
// transitions are cold-path and don't need lock-free reads.
|
// and don't need lock-free reads.
|
||||||
internal int ActiveTempTabCount =>
|
internal int ActiveTempTabCount =>
|
||||||
Plugin.Config.Tabs.Count(TabLifecycleHelpers.IsInUnpinnedPool);
|
Plugin.Config.Tabs.Count(TabLifecycleHelpers.IsInUnpinnedPool);
|
||||||
|
|
||||||
@@ -60,14 +80,32 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
RehydratePinnedTabs();
|
RehydratePinnedTabs();
|
||||||
|
|
||||||
_messageManager.MessageProcessed += HandleTell;
|
_messageManager.MessageProcessed += HandleTell;
|
||||||
|
Plugin.ClientState.Login += OnLogin;
|
||||||
Plugin.ClientState.Logout += OnLogout;
|
Plugin.ClientState.Logout += OnLogout;
|
||||||
_initialized = true;
|
_initialized = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Deferred when the plugin starts before a character is logged in, which is
|
||||||
|
// the normal case: the game loads plugins at boot. CurrentContentId is 0
|
||||||
|
// until then, so the history query would look up tells for character zero,
|
||||||
|
// find none, and leave every pinned tab blank for the whole session.
|
||||||
|
//
|
||||||
|
// Only visible to someone who actually pins a tell tab AND starts the game
|
||||||
|
// with the plugin already installed. Reloading the plugin in a running
|
||||||
|
// session -- what a developer does all day -- hides it completely.
|
||||||
private void RehydratePinnedTabs()
|
private void RehydratePinnedTabs()
|
||||||
{
|
{
|
||||||
|
if (_messageManager.CurrentContentId == 0)
|
||||||
|
{
|
||||||
|
_logger.LogDebug("[Pin] Rehydrate deferred: no character yet, waiting for login");
|
||||||
|
_rehydratePending = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_rehydratePending = false;
|
||||||
|
|
||||||
var pinned = Plugin.Config.Tabs.Count(TabLifecycleHelpers.IsInPinnedPool);
|
var pinned = Plugin.Config.Tabs.Count(TabLifecycleHelpers.IsInPinnedPool);
|
||||||
Plugin.LogProxy.Debug($"[Pin] Rehydrate scan: {pinned} pinned tab(s) found");
|
_logger.LogDebug($"[Pin] Rehydrate scan: {pinned} pinned tab(s) found");
|
||||||
|
|
||||||
foreach (var tab in Plugin.Config.Tabs)
|
foreach (var tab in Plugin.Config.Tabs)
|
||||||
{
|
{
|
||||||
@@ -76,7 +114,7 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
|
|
||||||
if (tab.TellTarget is null || !tab.TellTarget.IsSet())
|
if (tab.TellTarget is null || !tab.TellTarget.IsSet())
|
||||||
{
|
{
|
||||||
Plugin.LogProxy.Warning(
|
_logger.LogWarning(
|
||||||
$"[Pin] Pinned tab '{tab.Name}' has no usable TellTarget "
|
$"[Pin] Pinned tab '{tab.Name}' has no usable TellTarget "
|
||||||
+ $"(Name={tab.TellTarget?.Name ?? "<null>"} World={tab.TellTarget?.World ?? 0}). "
|
+ $"(Name={tab.TellTarget?.Name ?? "<null>"} World={tab.TellTarget?.World ?? 0}). "
|
||||||
+ "Chat input on this tab will be empty until the partner sends a tell or you /tell manually."
|
+ "Chat input on this tab will be empty until the partner sends a tell or you /tell manually."
|
||||||
@@ -93,7 +131,7 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
// sees the recent conversation, not a blank tab.
|
// sees the recent conversation, not a blank tab.
|
||||||
PreloadHistory(tab, tab.TellTarget.Name, tab.TellTarget.World, Guid.Empty);
|
PreloadHistory(tab, tab.TellTarget.Name, tab.TellTarget.World, Guid.Empty);
|
||||||
|
|
||||||
Plugin.LogProxy.Debug(
|
_logger.LogDebug(
|
||||||
$"[Pin] Rehydrated '{tab.Name}' -> Tell target {tab.TellTarget.Name}@{tab.TellTarget.World}"
|
$"[Pin] Rehydrated '{tab.Name}' -> Tell target {tab.TellTarget.Name}@{tab.TellTarget.World}"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -106,6 +144,7 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Plugin.ClientState.Login -= OnLogin;
|
||||||
Plugin.ClientState.Logout -= OnLogout;
|
Plugin.ClientState.Logout -= OnLogout;
|
||||||
_messageManager.MessageProcessed -= HandleTell;
|
_messageManager.MessageProcessed -= HandleTell;
|
||||||
_initialized = false;
|
_initialized = false;
|
||||||
@@ -130,7 +169,7 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
if (partner == null)
|
if (partner == null)
|
||||||
{
|
{
|
||||||
// Diagnostics: helps detect regressions (FFXIV payload changes, new edge cases)
|
// Diagnostics: helps detect regressions (FFXIV payload changes, new edge cases)
|
||||||
Plugin.LogProxy.Warning(
|
_logger.LogWarning(
|
||||||
$"[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}, "
|
||||||
@@ -139,15 +178,19 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
lock (_tempTabsLock)
|
// Three steps, because building the tab pulls history out of the store and
|
||||||
|
// that must not happen under TabsListLock (the query sorts the whole
|
||||||
|
// receiver history). Step 1 and 3 are locked, step 2 is not.
|
||||||
|
int generation;
|
||||||
|
lock (TabsListLock)
|
||||||
{
|
{
|
||||||
var existing = FindTempTab(partner.Value.Name, partner.Value.World);
|
var existing = FindTempTab(partner.Value.Name, partner.Value.World);
|
||||||
if (existing != null)
|
if (existing != null)
|
||||||
{
|
{
|
||||||
// Already routed via MessageManager pipeline. Repair the
|
// Already routed via MessageManager pipeline — no AddMessage here,
|
||||||
// tell-target if the fallback hit a pinned tab whose
|
// HandleTell runs after the delivery loop. Repair the tell-target if
|
||||||
// TellTarget didn't survive a previous round-trip — keeps
|
// the fallback hit a pinned tab whose TellTarget didn't survive a
|
||||||
// FindTempTab fast on the next message.
|
// previous round-trip — keeps FindTempTab fast on the next message.
|
||||||
if (
|
if (
|
||||||
existing.IsPinned
|
existing.IsPinned
|
||||||
&& (existing.TellTarget is null || !existing.TellTarget.IsSet())
|
&& (existing.TellTarget is null || !existing.TellTarget.IsSet())
|
||||||
@@ -164,12 +207,29 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ActiveTempTabCount >= Plugin.Config.AutoTellTabsLimit)
|
generation = _tabGeneration;
|
||||||
|
}
|
||||||
|
|
||||||
|
var tab = BuildTempTabWithHistory(partner.Value, message);
|
||||||
|
|
||||||
|
lock (TabsListLock)
|
||||||
|
{
|
||||||
|
// A logout in between wiped the unpinned pool; committing now would
|
||||||
|
// resurrect a tab for a character we already left.
|
||||||
|
if (generation != _tabGeneration)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// Someone else (self-test, UI) may have created the tab while we built
|
||||||
|
// ours. Hand the message to theirs and drop what we built — unlike the
|
||||||
|
// early return above, this tab appeared after the delivery loop ran.
|
||||||
|
var raced = FindTempTab(partner.Value.Name, partner.Value.World);
|
||||||
|
if (raced != null)
|
||||||
{
|
{
|
||||||
DropOldestTempTab();
|
raced.AddMessage(message, unread: true);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
SpawnTempTab(partner.Value, message);
|
CommitTempTab(tab);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -210,7 +270,7 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Tab? FindTempTab(string name, uint world)
|
internal static Tab? FindTempTab(string name, uint world)
|
||||||
{
|
{
|
||||||
var byTarget = Plugin.Config.Tabs.FirstOrDefault(t =>
|
var byTarget = Plugin.Config.Tabs.FirstOrDefault(t =>
|
||||||
t.IsTempTab
|
t.IsTempTab
|
||||||
@@ -231,45 +291,60 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Lock-protected lookup for the framework-thread caller (TellRouterService).
|
||||||
|
// Config.Tabs is mutated under the shared Plugin.TabsListLock on the worker thread,
|
||||||
|
// so a framework-tick reader must take the same lock to avoid enumerating the list
|
||||||
|
// mid-mutation.
|
||||||
|
internal Tab? FindTempTabSafe(string name, uint world)
|
||||||
|
{
|
||||||
|
lock (TabsListLock)
|
||||||
|
return FindTempTab(name, world);
|
||||||
|
}
|
||||||
|
|
||||||
internal void DropOldestTempTab()
|
internal void DropOldestTempTab()
|
||||||
{
|
{
|
||||||
// Pinned tabs live in their own bucket (MaxPinnedTempTabs) and are
|
// Lock the list-structure ops so the (currently caller-less) Unpin path
|
||||||
// never drop candidates. They leave the bucket only via Unpin or
|
// can't race the worker; re-entrant when HandleTell already holds the lock.
|
||||||
// PromoteToPermanent.
|
lock (TabsListLock)
|
||||||
var victim = Plugin
|
|
||||||
.Config.Tabs.Select((tab, idx) => (Tab: tab, Index: idx))
|
|
||||||
.Where(t => TabLifecycleHelpers.IsInUnpinnedPool(t.Tab))
|
|
||||||
.OrderByDescending(t => t.Tab.IsGreeted)
|
|
||||||
.ThenBy(t => t.Tab.LastActivity)
|
|
||||||
.FirstOrDefault();
|
|
||||||
|
|
||||||
if (victim.Tab == null)
|
|
||||||
{
|
{
|
||||||
return;
|
// Pinned tabs live in their own bucket (MaxPinnedTempTabs) and are
|
||||||
}
|
// never drop candidates. They leave the bucket only via Unpin or
|
||||||
|
// PromoteToPermanent.
|
||||||
|
var victim = Plugin
|
||||||
|
.Config.Tabs.Select((tab, idx) => (Tab: tab, Index: idx))
|
||||||
|
.Where(t => TabLifecycleHelpers.IsInUnpinnedPool(t.Tab))
|
||||||
|
.OrderByDescending(t => t.Tab.IsGreeted)
|
||||||
|
.ThenBy(t => t.Tab.LastActivity)
|
||||||
|
.FirstOrDefault();
|
||||||
|
|
||||||
// Clean up pop-out window if tab is popped out
|
if (victim.Tab == null)
|
||||||
if (victim.Tab.PopOut)
|
|
||||||
{
|
|
||||||
var popout = _plugin.ChatLogWindow.ActivePopouts.FirstOrDefault(p =>
|
|
||||||
p.TabIdentifier == victim.Tab.Identifier
|
|
||||||
);
|
|
||||||
if (popout != null)
|
|
||||||
{
|
{
|
||||||
popout.IsOpen = false;
|
return;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
Plugin.Config.Tabs.RemoveAt(victim.Index);
|
var dropped = victim.Tab;
|
||||||
|
// By reference, not by index: the index came from a Select() earlier in
|
||||||
|
// this block and would point at the wrong tab if anything shifted the list.
|
||||||
|
Plugin.Config.Tabs.Remove(dropped);
|
||||||
|
|
||||||
// Re-anchor active tab to avoid silent switch when tab is dropped
|
// Re-anchor the UI selection if it pointed at the dropped tab, and close any
|
||||||
if (victim.Index <= _plugin.LastTab)
|
// pop-out window the dropped tab owned. Both run on the PendingMessage worker
|
||||||
{
|
// thread and touch window state the Draw path reads (OnTabActivated re-seed +
|
||||||
_plugin.WantedTab = 0;
|
// the pool's Unbind), so marshal onto the framework thread to serialize with
|
||||||
|
// Draw (reference_dalamud_framework_thread). TryClose is idempotent: a tab that
|
||||||
|
// was never popped is a silent no-op.
|
||||||
|
Plugin.Framework.RunOnFrameworkThread(() =>
|
||||||
|
{
|
||||||
|
_plugin.ChannelPopoutPool.TryClose(dropped.Identifier);
|
||||||
|
_plugin.MainWindow?.ResetActiveTabIfRemoved(dropped);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SpawnTempTab((string Name, uint World) partner, Message currentMessage)
|
// Runs WITHOUT TabsListLock: PreloadHistory hits the store, which used to hold
|
||||||
|
// the lock across a query that sorted the whole receiver history. The tab is not
|
||||||
|
// public until CommitTempTab adds it, so building it unlocked is safe.
|
||||||
|
private Tab BuildTempTabWithHistory((string Name, uint World) partner, Message currentMessage)
|
||||||
{
|
{
|
||||||
var tab = BuildTempTab(partner.Name, partner.World);
|
var tab = BuildTempTab(partner.Name, partner.World);
|
||||||
|
|
||||||
@@ -278,13 +353,26 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
|
|
||||||
tab.AddMessage(currentMessage, unread: true);
|
tab.AddMessage(currentMessage, unread: true);
|
||||||
|
|
||||||
// Open as pop-out if configured (set before Tabs.Add for next render-tick)
|
return tab;
|
||||||
if (Plugin.Config.AutoTellTabsOpenAsPopout)
|
}
|
||||||
|
|
||||||
|
// Caller MUST hold TabsListLock.
|
||||||
|
private void CommitTempTab(Tab tab)
|
||||||
|
{
|
||||||
|
if (ActiveTempTabCount >= Plugin.Config.AutoTellTabsLimit)
|
||||||
{
|
{
|
||||||
tab.PopOut = true;
|
DropOldestTempTab();
|
||||||
}
|
}
|
||||||
|
|
||||||
Plugin.Config.Tabs.Add(tab);
|
Plugin.Config.Tabs.Add(tab);
|
||||||
|
|
||||||
|
// No pop-out is opened here any more. This service owns tab CREATION and
|
||||||
|
// lifecycle; where a tell becomes VISIBLE is TellRouterService's single
|
||||||
|
// decision (v2.0.5). It used to be both, and this one always won the race
|
||||||
|
// -- it fired at creation, the router only a tick later -- which is why
|
||||||
|
// TellAutoOpenMode looked like it did nothing for anyone with the old
|
||||||
|
// AutoTellTabsOpenAsPopout flag on, and why the router's "is the user
|
||||||
|
// mid-sentence" guard could be walked straight past.
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Tab BuildTempTab(string playerName, uint worldRowId)
|
private static Tab BuildTempTab(string playerName, uint worldRowId)
|
||||||
@@ -292,6 +380,7 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
return new Tab
|
return new Tab
|
||||||
{
|
{
|
||||||
Name = FormatTabName(playerName, worldRowId),
|
Name = FormatTabName(playerName, worldRowId),
|
||||||
|
NameCameFromPartner = true,
|
||||||
IsTempTab = true,
|
IsTempTab = true,
|
||||||
AllSenderMessages = true,
|
AllSenderMessages = true,
|
||||||
TellTarget = new TellTarget(playerName, worldRowId, 0, TellReason.Direct),
|
TellTarget = new TellTarget(playerName, worldRowId, 0, TellReason.Direct),
|
||||||
@@ -361,7 +450,7 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
// Non-fatal: tab still spawns with visible error notice instead of silent history loss
|
// Non-fatal: tab still spawns with visible error notice instead of silent history loss
|
||||||
Plugin.LogProxy.Error(ex, "[AutoTellTabs] History preload failed");
|
_logger.LogError(ex, "[AutoTellTabs] History preload failed");
|
||||||
tab.Messages.AddPrune(
|
tab.Messages.AddPrune(
|
||||||
MakeSystemMarker(HellionStrings.AutoTellTabs_HistoryLoadError),
|
MakeSystemMarker(HellionStrings.AutoTellTabs_HistoryLoadError),
|
||||||
MessageManager.MessageDisplayLimit
|
MessageManager.MessageDisplayLimit
|
||||||
@@ -399,7 +488,7 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
lock (_tempTabsLock)
|
lock (TabsListLock)
|
||||||
{
|
{
|
||||||
// Guard against frame-race: sidebar might render a tab already removed by LRU or logout
|
// Guard against frame-race: sidebar might render a tab already removed by LRU or logout
|
||||||
if (!Plugin.Config.Tabs.Contains(tab))
|
if (!Plugin.Config.Tabs.Contains(tab))
|
||||||
@@ -411,43 +500,53 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Fires on the login that follows a boot-time start, and on every character
|
||||||
|
// switch after one. Guarded by the pending flag so a switch does not append
|
||||||
|
// a second copy of the history to tabs that already have it.
|
||||||
|
private void OnLogin()
|
||||||
|
{
|
||||||
|
if (!_rehydratePending)
|
||||||
|
return;
|
||||||
|
|
||||||
|
RehydratePinnedTabs();
|
||||||
|
}
|
||||||
|
|
||||||
private void OnLogout(int type, int code)
|
private void OnLogout(int type, int code)
|
||||||
{
|
{
|
||||||
lock (_tempTabsLock)
|
lock (TabsListLock)
|
||||||
{
|
{
|
||||||
// Pinned TempTabs must survive char-switch — that's the whole point
|
// Pinned TempTabs must survive char-switch — that's the whole point
|
||||||
// of pinning. Only unpinned ones get stripped.
|
// of pinning. Only unpinned ones get stripped.
|
||||||
var lastIndex = _plugin.LastTab;
|
var active = _plugin.MainWindow?.ActiveTab;
|
||||||
var lastIndexValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count;
|
|
||||||
var currentWasUnpinnedTempTab =
|
|
||||||
lastIndexValid
|
|
||||||
&& TabLifecycleHelpers.IsInUnpinnedPool(Plugin.Config.Tabs[lastIndex]);
|
|
||||||
|
|
||||||
var poppedTempTabIds = Plugin
|
var poppedTempTabIds = Plugin
|
||||||
.Config.Tabs.Where(t => TabLifecycleHelpers.IsInUnpinnedPool(t) && t.PopOut)
|
.Config.Tabs.Where(t =>
|
||||||
|
TabLifecycleHelpers.IsInUnpinnedPool(t)
|
||||||
|
&& _plugin.ChannelPopoutPool.IsOpen(t.Identifier)
|
||||||
|
)
|
||||||
.Select(t => t.Identifier)
|
.Select(t => t.Identifier)
|
||||||
.ToList();
|
.ToList();
|
||||||
if (poppedTempTabIds.Count > 0)
|
|
||||||
{
|
// Close any pop-out window an unpinned temp tab owns before the tabs leave
|
||||||
var poppedSet = poppedTempTabIds.ToHashSet();
|
// the list. Filtering on the live pool (not the PopOut flag) also catches
|
||||||
foreach (
|
// manually right-clicked pop-outs, which never set the flag.
|
||||||
var popout in _plugin
|
foreach (var id in poppedTempTabIds)
|
||||||
.ChatLogWindow.ActivePopouts.Where(p => poppedSet.Contains(p.TabIdentifier))
|
_plugin.ChannelPopoutPool.TryClose(id);
|
||||||
.ToList()
|
|
||||||
)
|
|
||||||
{
|
|
||||||
popout.IsOpen = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Plugin.Config.Tabs.RemoveAll(TabLifecycleHelpers.IsInUnpinnedPool);
|
Plugin.Config.Tabs.RemoveAll(TabLifecycleHelpers.IsInUnpinnedPool);
|
||||||
|
|
||||||
// Force switch to tab 0 if active tab was an unpinned temp tab or
|
// HandleTell builds a tab outside the lock; bumping here lets it detect
|
||||||
// index is now out of range. Pinned tabs survive — no switch needed.
|
// that the world moved on and drop what it built. Read and compared under
|
||||||
var stillValid = lastIndex >= 0 && lastIndex < Plugin.Config.Tabs.Count;
|
// the same lock, so no volatile needed.
|
||||||
if (currentWasUnpinnedTempTab || !stillValid)
|
_tabGeneration++;
|
||||||
|
|
||||||
|
// Re-anchor the UI selection if the active tab was one of the stripped
|
||||||
|
// unpinned temp tabs (reference predicate, not an index). Logout is a
|
||||||
|
// framework-thread event, so this is already serialized with Draw — no
|
||||||
|
// marshalling needed here, unlike the worker-thread eviction path.
|
||||||
|
if (active is { } a && TabLifecycleHelpers.IsInUnpinnedPool(a))
|
||||||
{
|
{
|
||||||
_plugin.WantedTab = 0;
|
_plugin.MainWindow?.ResetActiveTabIfRemoved(a);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -456,23 +555,30 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
{
|
{
|
||||||
if (!tab.IsTempTab || tab.IsPinned)
|
if (!tab.IsTempTab || tab.IsPinned)
|
||||||
{
|
{
|
||||||
Plugin.LogProxy.Debug(
|
_logger.LogDebug(
|
||||||
$"[Pin] TryPin skipped: IsTempTab={tab.IsTempTab} IsPinned={tab.IsPinned}"
|
$"[Pin] TryPin skipped: IsTempTab={tab.IsTempTab} IsPinned={tab.IsPinned}"
|
||||||
);
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (PinnedTempTabCount >= MaxPinnedTempTabs)
|
// Count and flag under one lock so the cap can't be raced. SaveConfig stays
|
||||||
|
// OUTSIDE -- holding TabsListLock across a save would put an fsync on the
|
||||||
|
// click path, which is what a later cycle just removed elsewhere.
|
||||||
|
lock (TabsListLock)
|
||||||
{
|
{
|
||||||
WrapperUtil.AddNotification(
|
if (PinnedTempTabCount >= MaxPinnedTempTabs)
|
||||||
string.Format(HellionStrings.PinTab_LimitReached, MaxPinnedTempTabs),
|
{
|
||||||
NotificationType.Warning
|
WrapperUtil.AddNotification(
|
||||||
);
|
string.Format(HellionStrings.PinTab_LimitReached, MaxPinnedTempTabs),
|
||||||
return false;
|
NotificationType.Warning
|
||||||
|
);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
tab.IsPinned = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
tab.IsPinned = true;
|
_logger.LogDebug(
|
||||||
Plugin.LogProxy.Debug(
|
|
||||||
$"[Pin] Pinned tab '{tab.Name}' target={tab.TellTarget?.Name}@{tab.TellTarget?.World}"
|
$"[Pin] Pinned tab '{tab.Name}' target={tab.TellTarget?.Name}@{tab.TellTarget?.World}"
|
||||||
);
|
);
|
||||||
_plugin.SaveConfig();
|
_plugin.SaveConfig();
|
||||||
@@ -488,14 +594,19 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
|
|
||||||
// If the unpinned pool is already full, dropping the oldest before
|
// If the unpinned pool is already full, dropping the oldest before
|
||||||
// flipping the flag avoids counting the just-unpinned tab as a drop
|
// flipping the flag avoids counting the just-unpinned tab as a drop
|
||||||
// candidate.
|
// candidate. Under lock, since DropOldestTempTab mutates the list.
|
||||||
if (ActiveTempTabCount >= Plugin.Config.AutoTellTabsLimit)
|
// SaveConfig stays outside, see TryPin.
|
||||||
|
lock (TabsListLock)
|
||||||
{
|
{
|
||||||
DropOldestTempTab();
|
if (ActiveTempTabCount >= Plugin.Config.AutoTellTabsLimit)
|
||||||
|
{
|
||||||
|
DropOldestTempTab();
|
||||||
|
}
|
||||||
|
|
||||||
|
tab.IsPinned = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
tab.IsPinned = false;
|
_logger.LogDebug("[Pin] Unpinned tab '{TabName}'", tab.Name);
|
||||||
Plugin.LogProxy.Debug("[Pin] Unpinned tab '{tab.Name}'");
|
|
||||||
_plugin.SaveConfig();
|
_plugin.SaveConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -506,12 +617,18 @@ internal sealed class AutoTellTabsService : IDisposable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
tab.IsTempTab = false;
|
// Drops the temp/pin flags, the persisted tell target AND the runtime
|
||||||
tab.IsPinned = false;
|
// channel's tell state. The runtime-channel clear is the CORR-1 guard —
|
||||||
tab.TellTarget = TellTarget.Empty();
|
// see StripTellBindingOnPromote; clearing Tab.TellTarget alone would leave
|
||||||
Plugin.LogProxy.Debug(
|
// CurrentChannel.Channel == Tell + a stale target and route a typed line
|
||||||
$"[Pin] Promoted tab '{tab.Name}' to permanent (tell-binding dropped)"
|
// silently as /tell to the old partner.
|
||||||
);
|
// Flips IsTempTab/IsPinned, which decide pool membership and whether a save
|
||||||
|
// strips the tab. Under lock so a concurrent save sees one or the other, never
|
||||||
|
// half. SaveConfig stays outside, see TryPin.
|
||||||
|
lock (TabsListLock)
|
||||||
|
TabLifecycleHelpers.StripTellBindingOnPromote(tab);
|
||||||
|
|
||||||
|
_logger.LogDebug($"[Pin] Promoted tab '{tab.Name}' to permanent (tell-binding dropped)");
|
||||||
_plugin.SaveConfig();
|
_plugin.SaveConfig();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ internal static class BrandingLinks
|
|||||||
public const string HellionForgeGitea = "https://gitea.hellion-forge.cloud/Hellion-Forge";
|
public const string HellionForgeGitea = "https://gitea.hellion-forge.cloud/Hellion-Forge";
|
||||||
public const string HellionChatRepo =
|
public const string HellionChatRepo =
|
||||||
"https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat";
|
"https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat";
|
||||||
|
public const string HellionChatCustomRepoManifest =
|
||||||
|
"https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/repo.json";
|
||||||
public const string HellionForgeWebsite = "https://hellion-forge.cloud";
|
public const string HellionForgeWebsite = "https://hellion-forge.cloud";
|
||||||
public const string HellionMediaWebsite = "https://hellion-media.de/de";
|
public const string HellionMediaWebsite = "https://hellion-media.de/de";
|
||||||
|
|
||||||
@@ -26,6 +28,7 @@ internal static class BrandingLinks
|
|||||||
HellionForgeDiscordInvite,
|
HellionForgeDiscordInvite,
|
||||||
HellionForgeGitea,
|
HellionForgeGitea,
|
||||||
HellionChatRepo,
|
HellionChatRepo,
|
||||||
|
HellionChatCustomRepoManifest,
|
||||||
HellionForgeWebsite,
|
HellionForgeWebsite,
|
||||||
HellionMediaWebsite
|
HellionMediaWebsite
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
using Dalamud.Interface.Textures;
|
||||||
|
|
||||||
|
namespace HellionChat.Branding;
|
||||||
|
|
||||||
|
// UI sibling of HellionForgeAscii.FoxMini: the embedded Hellion Forge fox
|
||||||
|
// banner PNG. Uses ITextureProvider.GetFromManifestResource, a "Get" shared
|
||||||
|
// texture, so Dalamud owns the cache and lifetime. No manual dispose, no async
|
||||||
|
// handling in the plugin. Static to mirror HellionForgeAscii (zero injectable
|
||||||
|
// deps; Plugin.TextureProvider is a static [PluginService]).
|
||||||
|
internal static class FoxBannerTexture
|
||||||
|
{
|
||||||
|
private const string ResourceName = "HellionChat.Branding.fox-banner.png";
|
||||||
|
|
||||||
|
// Resolved fresh on every access. Dalamud keeps the shared texture cached
|
||||||
|
// internally and decodes it asynchronously, so GetWrapOrDefault() returns
|
||||||
|
// null for the first few frames until the decode finishes.
|
||||||
|
public static ISharedImmediateTexture Shared =>
|
||||||
|
Plugin.TextureProvider.GetFromManifestResource(
|
||||||
|
typeof(FoxBannerTexture).Assembly,
|
||||||
|
ResourceName
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
namespace HellionChat.Branding;
|
||||||
|
|
||||||
|
// Lazy-loaded ASCII art that ships embedded with the DLL.
|
||||||
|
//
|
||||||
|
// - FoxMini: the four-line fox-head + curly-tail that gets stitched
|
||||||
|
// into the DI-logger bootstrap line so an xllog reader sees the
|
||||||
|
// same signature on every plugin load.
|
||||||
|
//
|
||||||
|
// The file lives as an embedded resource under HellionChat.Branding.* so
|
||||||
|
// the plugin DLL is self-contained; no on-disk asset lookup that could
|
||||||
|
// silently miss after a partial deploy.
|
||||||
|
internal static class HellionForgeAscii
|
||||||
|
{
|
||||||
|
private static string? _foxMini;
|
||||||
|
|
||||||
|
public static string FoxMini => _foxMini ??= Load("HellionChat.Branding.fox-mini.txt");
|
||||||
|
|
||||||
|
private static string Load(string resourceName)
|
||||||
|
{
|
||||||
|
using var stream = typeof(HellionForgeAscii).Assembly.GetManifestResourceStream(
|
||||||
|
resourceName
|
||||||
|
);
|
||||||
|
if (stream is null)
|
||||||
|
return string.Empty;
|
||||||
|
|
||||||
|
using var reader = new StreamReader(stream);
|
||||||
|
return reader.ReadToEnd();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
namespace HellionChat;
|
||||||
|
|
||||||
|
// Reduced CJK fallback coverage for the v1.5.3 NotoSansCjk fallback merge.
|
||||||
|
// Before that the fallback merged over the full `Ranges` array (Default + endonyms),
|
||||||
|
// duplicating the Latin/Default work already done by the global/Japanese fonts.
|
||||||
|
// This is the trimmed remainder the fallback is actually the sole source for:
|
||||||
|
// - Hangul Syllables (AC00-D7A3): no other merged font ships Korean glyphs.
|
||||||
|
// - The full CJK Unified Ideographs (Han) block: at UseHellionFont=true the global
|
||||||
|
// font is Inter-Light (no CJK), so the fallback is the SOLE Han source. The JpRange
|
||||||
|
// overlap is harmless (MergeMode: the Japanese font wins for shared kanji).
|
||||||
|
// Deliberately excluded: ONLY the ASCII/Latin Default block (0x20-0xFF), which the
|
||||||
|
// global font already owns -- that doubled Latin merge is the waste being removed.
|
||||||
|
// Kept as plain start/end pairs so it is unit-testable without the unsafe ImGui
|
||||||
|
// glyph-range builder (mirrors FontSizeResolver's split-for-test rationale).
|
||||||
|
internal static class CjkFallbackRange
|
||||||
|
{
|
||||||
|
// Hangul Syllables + the full CJK Unified Ideographs (Han) block. Rationale: see
|
||||||
|
// class comment. Plain start/end pairs so it stays unit-testable.
|
||||||
|
internal static readonly ushort[] Pairs =
|
||||||
|
[
|
||||||
|
0xAC00,
|
||||||
|
0xD7A3, // Hangul Syllables
|
||||||
|
0x4E00,
|
||||||
|
0x9FFF, // CJK Unified Ideographs (full Han) -- sole source at UseHellionFont
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -1,10 +1,17 @@
|
|||||||
using Dalamud.Game.Command;
|
using Dalamud.Game.Command;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
namespace HellionChat;
|
namespace HellionChat;
|
||||||
|
|
||||||
internal sealed class Commands : IDisposable
|
internal sealed class Commands : IDisposable
|
||||||
{
|
{
|
||||||
private readonly Dictionary<string, CommandWrapper> Registered = [];
|
private readonly Dictionary<string, CommandWrapper> Registered = [];
|
||||||
|
private readonly ILogger<Commands> _logger;
|
||||||
|
|
||||||
|
public Commands(ILogger<Commands> logger)
|
||||||
|
{
|
||||||
|
_logger = logger;
|
||||||
|
}
|
||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
@@ -52,7 +59,7 @@ internal sealed class Commands : IDisposable
|
|||||||
{
|
{
|
||||||
if (!Registered.TryGetValue(command, out var wrapper))
|
if (!Registered.TryGetValue(command, out var wrapper))
|
||||||
{
|
{
|
||||||
Plugin.LogProxy.Warning($"Missing registration for command {command}");
|
_logger.LogWarning($"Missing registration for command {command}");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,7 +69,7 @@ internal sealed class Commands : IDisposable
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Plugin.LogProxy.Error(ex, $"Error while executing command {command}");
|
_logger.LogError(ex, $"Error while executing command {command}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+328
-199
@@ -1,4 +1,5 @@
|
|||||||
using System.Collections;
|
using System.Collections;
|
||||||
|
using System.Linq;
|
||||||
using Dalamud;
|
using Dalamud;
|
||||||
using Dalamud.Bindings.ImGui;
|
using Dalamud.Bindings.ImGui;
|
||||||
using Dalamud.Configuration;
|
using Dalamud.Configuration;
|
||||||
@@ -34,7 +35,7 @@ public class ConfigKeyBind
|
|||||||
[Serializable]
|
[Serializable]
|
||||||
public class Configuration : IPluginConfiguration
|
public class Configuration : IPluginConfiguration
|
||||||
{
|
{
|
||||||
private const int LatestVersion = 17;
|
internal const int LatestVersion = 28;
|
||||||
|
|
||||||
public int Version { get; set; } = LatestVersion;
|
public int Version { get; set; } = LatestVersion;
|
||||||
|
|
||||||
@@ -44,17 +45,29 @@ public class Configuration : IPluginConfiguration
|
|||||||
// Global window opacity, applied across all themes.
|
// Global window opacity, applied across all themes.
|
||||||
public float WindowOpacity = 0.85f;
|
public float WindowOpacity = 0.85f;
|
||||||
|
|
||||||
|
// Background opacity of the main chat window while unfocused.
|
||||||
|
// WindowOpacity above stays the focused value.
|
||||||
|
public float WindowOpacityInactive = 0.75f;
|
||||||
|
|
||||||
// Reserved for future UI toggles; pre-declared to avoid a migration later.
|
// Reserved for future UI toggles; pre-declared to avoid a migration later.
|
||||||
public bool ReduceMotion;
|
public bool ReduceMotion;
|
||||||
|
|
||||||
// v1.2.1: default flipped false → true. Compact single-line layout is
|
// v1.2.1: default flipped false → true. Compact single-line layout is
|
||||||
// more readable than the card-rows layout introduced in v1.2.0.
|
// more readable than the card-rows layout introduced in v1.2.0.
|
||||||
public bool UseCompactDensity = true;
|
public bool UseCompactDensity;
|
||||||
|
|
||||||
// Privacy by Default master switch. Set false to restore upstream behaviour.
|
// Privacy by Default master switch. Set false to restore upstream behaviour.
|
||||||
public bool PrivacyFilterEnabled = true;
|
public bool PrivacyFilterEnabled = true;
|
||||||
|
|
||||||
// Empty set means the migration has not run yet — see Plugin.cs v6→v7.
|
// Stays empty here. Dalamud deserialises with Json.NET's default settings,
|
||||||
|
// which means ObjectCreationHandling.Auto: a collection field that already
|
||||||
|
// holds items is *populated*, not replaced. A non-empty initializer would
|
||||||
|
// therefore union itself into every config on load and switch channels the
|
||||||
|
// user had unticked back on. Verified against Newtonsoft 13.0.3:
|
||||||
|
// saved [] loads as the initializer, saved [Say] loads as initializer + Say.
|
||||||
|
//
|
||||||
|
// Privacy by Default (DSGVO Art. 25) is seeded in CreateFresh instead, which
|
||||||
|
// only runs when there is no config file at all.
|
||||||
public HashSet<ChatType> PrivacyPersistChannels = [];
|
public HashSet<ChatType> PrivacyPersistChannels = [];
|
||||||
|
|
||||||
// Failsafe for ChatTypes added by future FFXIV patches. New configs default
|
// Failsafe for ChatTypes added by future FFXIV patches. New configs default
|
||||||
@@ -64,24 +77,39 @@ public class Configuration : IPluginConfiguration
|
|||||||
.PrivacyDefaults
|
.PrivacyDefaults
|
||||||
.DefaultPersistUnknownChannels;
|
.DefaultPersistUnknownChannels;
|
||||||
|
|
||||||
// F3.2: dedup unknown-ChatType warnings so a chatty filter doesn't spam
|
// Dedup unknown-ChatType warnings so a chatty filter doesn't spam
|
||||||
// the log every frame. NonSerialized so the warning fires once per
|
// the log every frame. NonSerialized so the warning fires once per
|
||||||
// runtime, not once-ever-per-install.
|
// runtime, not once-ever-per-install.
|
||||||
[NonSerialized]
|
[NonSerialized]
|
||||||
private readonly HashSet<ChatType> _warnedUnknownChannels = new();
|
private readonly HashSet<ChatType> _warnedUnknownChannels = new();
|
||||||
|
|
||||||
|
// A first-ever start records the player's own conversations and nothing
|
||||||
|
// else. Deliberately not a field initializer -- see PrivacyPersistChannels.
|
||||||
|
internal static Configuration CreateFresh()
|
||||||
|
{
|
||||||
|
var config = new Configuration();
|
||||||
|
config.PrivacyPersistChannels = [.. Privacy.PrivacyDefaults.PrivacyFirstWhitelist];
|
||||||
|
return config;
|
||||||
|
}
|
||||||
|
|
||||||
public bool IsAllowedForStorage(ChatType type)
|
public bool IsAllowedForStorage(ChatType type)
|
||||||
{
|
{
|
||||||
if (!PrivacyFilterEnabled)
|
if (!PrivacyFilterEnabled)
|
||||||
return true;
|
return true;
|
||||||
if (PrivacyPersistChannels.Contains(type))
|
|
||||||
return true;
|
|
||||||
|
|
||||||
// F3.2: log first occurrence of a ChatType the running build doesn't
|
// Runs per message on the worker thread while the settings UI can Add to the
|
||||||
// recognise — i.e. one a future FFXIV patch may have added. Known
|
// same set from the draw thread. A HashSet.Contains racing an Add that
|
||||||
// types the user opted out of are routed through the failsafe
|
// resizes buckets can return the wrong answer -- and this answer decides
|
||||||
// silently, like before.
|
// whether a message is persisted. Lock kept tight, this is a hot path.
|
||||||
if (!Enum.IsDefined(typeof(ChatType), type) && _warnedUnknownChannels.Add(type))
|
bool listed;
|
||||||
|
lock (Plugin.Instance.ConfigMapsLock)
|
||||||
|
listed = PrivacyPersistChannels.Contains(type);
|
||||||
|
|
||||||
|
var known = Enum.IsDefined(typeof(ChatType), type);
|
||||||
|
|
||||||
|
// Log the first occurrence of a ChatType the running build doesn't
|
||||||
|
// recognise — i.e. one a future FFXIV patch may have added.
|
||||||
|
if (!known && !listed && _warnedUnknownChannels.Add(type))
|
||||||
{
|
{
|
||||||
Plugin.LogProxy.Warning(
|
Plugin.LogProxy.Warning(
|
||||||
"PrivacyFilter: unrecognised ChatType {Type} — falling back to PrivacyPersistUnknownChannels={Persist}.",
|
"PrivacyFilter: unrecognised ChatType {Type} — falling back to PrivacyPersistUnknownChannels={Persist}.",
|
||||||
@@ -90,7 +118,7 @@ public class Configuration : IPluginConfiguration
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return PrivacyPersistUnknownChannels;
|
return Privacy.StorageRule.Allows(listed, known, PrivacyPersistUnknownChannels);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Retention master switch defaults to false — plugin will not delete
|
// Retention master switch defaults to false — plugin will not delete
|
||||||
@@ -100,6 +128,15 @@ public class Configuration : IPluginConfiguration
|
|||||||
public Dictionary<ChatType, int> RetentionPerChannelDays = [];
|
public Dictionary<ChatType, int> RetentionPerChannelDays = [];
|
||||||
public DateTimeOffset RetentionLastRunAt = DateTimeOffset.MinValue;
|
public DateTimeOffset RetentionLastRunAt = DateTimeOffset.MinValue;
|
||||||
public bool FirstRunCompleted;
|
public bool FirstRunCompleted;
|
||||||
|
|
||||||
|
// Tracks which plugin version last surfaced the first-run wizard.
|
||||||
|
// When the running version is newer than this, Plugin.LoadAsync
|
||||||
|
// re-opens the wizard once so existing users see major UX reworks
|
||||||
|
// (e.g. the v1.5.2 multi-step rewrite). Skip path and Finish both
|
||||||
|
// set FirstRunCompleted = true on close, so the wizard only fires
|
||||||
|
// once per version bump even if the user dismisses it.
|
||||||
|
public string WizardLastShownVersion = string.Empty;
|
||||||
|
|
||||||
public bool UseHellionFont = true;
|
public bool UseHellionFont = true;
|
||||||
public bool ShowHonorificTitleInHeader = true;
|
public bool ShowHonorificTitleInHeader = true;
|
||||||
|
|
||||||
@@ -108,21 +145,38 @@ public class Configuration : IPluginConfiguration
|
|||||||
// who don't care, and dodges the per-frame DrawList overhead on low-end
|
// who don't care, and dodges the per-frame DrawList overhead on low-end
|
||||||
// hardware. Gradient (Color3 / GradientColourSet) is parsed but rendered
|
// hardware. Gradient (Color3 / GradientColourSet) is parsed but rendered
|
||||||
// as the primary Color until a later cycle ports the animation.
|
// as the primary Color until a later cycle ports the animation.
|
||||||
public bool ShowHonorificGlow;
|
public bool ShowHonorificGlow = true;
|
||||||
public bool EnableAutoTellTabs = true;
|
public bool EnableAutoTellTabs = true;
|
||||||
public int AutoTellTabsLimit = 15;
|
public int AutoTellTabsLimit = 15;
|
||||||
public bool AutoTellTabsCompactDisplay;
|
public bool AutoTellTabsCompactDisplay = true;
|
||||||
public int AutoTellTabsHistoryPreload = 20;
|
public int AutoTellTabsHistoryPreload = 100;
|
||||||
|
|
||||||
// Sidebar width in pixels. Default 44 mirrors the icon-only layout from
|
// Expanded sidebar width in pixels. 44 was carried over from the v1.2.0
|
||||||
// v1.2.0; users can widen up to 160 to fit a section-header line like
|
// icon-only layout and stayed the default long after the sidebar started
|
||||||
// "Active Tells (3)" without truncation.
|
// drawing labels beside those icons, so every tab name came out clipped --
|
||||||
public int SidebarWidth = 44;
|
// it only went unnoticed because everyone had widened it by hand. 160 fits
|
||||||
|
// the German tab names, which are the longest of the 25 languages, and the
|
||||||
|
// floor below is set where they stop being readable rather than where the
|
||||||
|
// icons stop fitting.
|
||||||
|
public int SidebarWidth = 160;
|
||||||
public bool AutoTellTabsShowGreetedToggle;
|
public bool AutoTellTabsShowGreetedToggle;
|
||||||
public bool SeenPopOutInputHint;
|
public bool SeenPopOutInputHint;
|
||||||
public bool PopOutInputEnabled = true;
|
public bool PopOutInputEnabled = true;
|
||||||
public bool SeenPopOutHeaderHint;
|
public bool SeenPopOutHeaderHint;
|
||||||
public bool AutoTellTabsOpenAsPopout;
|
|
||||||
|
// On by default: the wizard's closing step tells the user to try /tell and
|
||||||
|
// watch a conversation open on its own, so the behaviour it describes has to
|
||||||
|
// be the behaviour they get.
|
||||||
|
// Retired in v2.0.5: this and TellAutoOpenMode were two settings for one
|
||||||
|
// decision, and this one always won because it fired first -- which made the
|
||||||
|
// other one look broken. The FIELD stays so the v28 migration can still read
|
||||||
|
// what the user actually had; nothing else reads it, and it is gone from the
|
||||||
|
// settings window.
|
||||||
|
public bool AutoTellTabsOpenAsPopout = true;
|
||||||
|
|
||||||
|
// How sender names are rendered in the chat log.
|
||||||
|
public WorldSuffixMode WorldSuffixMode = WorldSuffixMode.OtherWorldOnly;
|
||||||
|
public NameFormMode NameFormMode = NameFormMode.Full;
|
||||||
|
|
||||||
public int GetRetentionDays(ChatType type)
|
public int GetRetentionDays(ChatType type)
|
||||||
{
|
{
|
||||||
@@ -143,45 +197,59 @@ public class Configuration : IPluginConfiguration
|
|||||||
// v1.2.1: default flipped false → true for consistency with other hide defaults.
|
// v1.2.1: default flipped false → true for consistency with other hide defaults.
|
||||||
public bool HideInNewGamePlusMenu = true;
|
public bool HideInNewGamePlusMenu = true;
|
||||||
public bool HideWhenInactive;
|
public bool HideWhenInactive;
|
||||||
public int InactivityHideTimeout = 10;
|
|
||||||
public bool InactivityHideActiveDuringBattle = true;
|
|
||||||
|
|
||||||
[Obsolete("Use InactivityHideChannelsV2 instead")]
|
|
||||||
public Dictionary<ChatType, ChatSource> InactivityHideChannels = [];
|
|
||||||
|
|
||||||
public Dictionary<ChatType, (ChatSource, ChatSource)> InactivityHideChannelsV2 = [];
|
|
||||||
public bool InactivityHideExtraChatAll = true;
|
|
||||||
public HashSet<Guid> InactivityHideExtraChatChannels = [];
|
|
||||||
public bool ShowHideButton = true;
|
public bool ShowHideButton = true;
|
||||||
public bool NativeItemTooltips = true;
|
public bool NativeItemTooltips = true;
|
||||||
|
public bool ScreenshotMode;
|
||||||
|
|
||||||
|
// No control and no reader. Kept so a stored value survives until the
|
||||||
|
// rendering they describe exists; see the reconnect backlog. Note the two
|
||||||
|
// resource sets disagree on what PrettierTimestamps even means -- the wizard
|
||||||
|
// called it "relative time", the settings tab "modern layout".
|
||||||
public bool PrettierTimestamps = true;
|
public bool PrettierTimestamps = true;
|
||||||
public bool MoreCompactPretty;
|
public bool MoreCompactPretty = true;
|
||||||
public bool HideSameTimestamps = true;
|
public bool HideSameTimestamps = true;
|
||||||
|
|
||||||
|
// No reader; see the reconnect backlog.
|
||||||
public bool ShowNoviceNetwork;
|
public bool ShowNoviceNetwork;
|
||||||
|
|
||||||
|
// Migration-only since v23: the 1.5.6 sidebar↔top-tabs switch, superseded by
|
||||||
|
// MainWindowLayoutMode in the v1.6.0 rewrite. No UI control anymore; read by
|
||||||
|
// the v23 migration in Plugin.cs and kept deserializable so a 1.5.6 user's
|
||||||
|
// false value survives one load. Remove in a later schema bump.
|
||||||
public bool SidebarTabView = true;
|
public bool SidebarTabView = true;
|
||||||
|
|
||||||
|
// No reader; see the reconnect backlog.
|
||||||
public bool PrintChangelog = true;
|
public bool PrintChangelog = true;
|
||||||
public bool OnlyPreviewIf;
|
public bool OnlyPreviewIf;
|
||||||
public int PreviewMinimum = 1;
|
public int PreviewMinimum = 1;
|
||||||
public PreviewPosition PreviewPosition = PreviewPosition.Inside;
|
public PreviewPosition PreviewPosition = PreviewPosition.Inside;
|
||||||
public CommandHelpSide CommandHelpSide = CommandHelpSide.None;
|
public CommandHelpSide CommandHelpSide = CommandHelpSide.Right;
|
||||||
public KeybindMode KeybindMode = KeybindMode.Strict;
|
public KeybindMode KeybindMode = KeybindMode.Strict;
|
||||||
public LanguageOverride LanguageOverride = LanguageOverride.None;
|
public LanguageOverride LanguageOverride = LanguageOverride.None;
|
||||||
public bool CanMove = true;
|
public bool CanMove = true;
|
||||||
public bool CanResize = true;
|
public bool CanResize = true;
|
||||||
public bool ShowTitleBar = true;
|
public bool ShowTitleBar;
|
||||||
public bool ShowPopOutTitleBar = true;
|
public bool ShowPopOutTitleBar = true;
|
||||||
|
public bool ShowStatusBar = true;
|
||||||
public bool DatabaseBattleMessages;
|
public bool DatabaseBattleMessages;
|
||||||
public bool LoadPreviousSession;
|
|
||||||
public bool FilterIncludePreviousSessions;
|
public bool FilterIncludePreviousSessions;
|
||||||
public bool SortAutoTranslate;
|
public bool SortAutoTranslate;
|
||||||
public bool CollapseDuplicateMessages;
|
public bool CollapseDuplicateMessages;
|
||||||
public bool CollapseKeepUniqueLinks;
|
public bool CollapseKeepUniqueLinks;
|
||||||
|
public bool SymbolPickerEnabled = true;
|
||||||
public bool PlaySounds = true;
|
public bool PlaySounds = true;
|
||||||
|
|
||||||
|
// AUDIO-1: playback volume (0-1) for the three bundled custom sounds.
|
||||||
|
public float CustomSoundVolume = 0.5f;
|
||||||
|
|
||||||
|
// Toast when a tell the user sent could not be delivered.
|
||||||
|
public bool NotifyFailedTell = true;
|
||||||
|
|
||||||
|
// Warn before sending a message that carries plugin-only glyphs.
|
||||||
|
public bool NotifyPluginDisclosure = true;
|
||||||
public bool KeepInputFocus = true;
|
public bool KeepInputFocus = true;
|
||||||
public int MaxLinesToRender = 2_500; // 1-10000
|
|
||||||
public bool Use24HourClock = true;
|
public bool Use24HourClock = true;
|
||||||
public bool ShowEmotes = true;
|
|
||||||
public HashSet<string> BlockedEmotes = [];
|
|
||||||
public bool FontsEnabled = true;
|
public bool FontsEnabled = true;
|
||||||
public ExtraGlyphRanges ExtraGlyphRanges = 0;
|
public ExtraGlyphRanges ExtraGlyphRanges = 0;
|
||||||
public float FontSizeV2 = 12.75f;
|
public float FontSizeV2 = 12.75f;
|
||||||
@@ -218,144 +286,53 @@ public class Configuration : IPluginConfiguration
|
|||||||
return defaults;
|
return defaults;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// No reader; see the reconnect backlog.
|
||||||
public bool ColorSelectedInputChannelButton = true;
|
public bool ColorSelectedInputChannelButton = true;
|
||||||
public List<Tab> Tabs = [];
|
public List<Tab> Tabs = [];
|
||||||
|
|
||||||
public ConfigKeyBind? ChatTabForward;
|
public ConfigKeyBind? ChatTabForward;
|
||||||
public ConfigKeyBind? ChatTabBackward;
|
public ConfigKeyBind? ChatTabBackward;
|
||||||
|
|
||||||
public void UpdateFrom(Configuration other, bool backToOriginal)
|
// v20 fields: window visibility state, channel popout pool size and
|
||||||
{
|
// sidebar auto-switch threshold. All initializers double as the
|
||||||
if (backToOriginal)
|
// migration defaults for configs loaded at v19 or earlier.
|
||||||
foreach (var tab in Tabs.Where(t => t.PopOut))
|
// Still written on open/close, but no longer read for the start state: the
|
||||||
tab.PopOut = false;
|
// window always shows on login (1.5.6 parity, MainWindow ctor). Kept for the
|
||||||
|
// migration round-trip and a possible future "remember session state" opt-in.
|
||||||
|
public bool MainWindowOpen = true;
|
||||||
|
public bool SettingsWindowOpen;
|
||||||
|
public int MaxParallelPopouts = 8;
|
||||||
|
|
||||||
HideChat = other.HideChat;
|
// Popout, not Sidebar: with AutoTellTabsOpenAsPopout defaulting to true, a
|
||||||
HideDuringCutscenes = other.HideDuringCutscenes;
|
// fresh install has ALWAYS opened tells in their own window. Naming that as
|
||||||
HideWhenNotLoggedIn = other.HideWhenNotLoggedIn;
|
// the default is what keeps a new install behaving the way it always did.
|
||||||
HideWhenUiHidden = other.HideWhenUiHidden;
|
public TellAutoOpenMode TellAutoOpenMode = TellAutoOpenMode.Popout;
|
||||||
HideInLoadingScreens = other.HideInLoadingScreens;
|
|
||||||
HideInBattle = other.HideInBattle;
|
|
||||||
HideInNewGamePlusMenu = other.HideInNewGamePlusMenu;
|
|
||||||
HideWhenInactive = other.HideWhenInactive;
|
|
||||||
InactivityHideTimeout = other.InactivityHideTimeout;
|
|
||||||
InactivityHideActiveDuringBattle = other.InactivityHideActiveDuringBattle;
|
|
||||||
InactivityHideChannelsV2 = other.InactivityHideChannelsV2.ToDictionary(
|
|
||||||
pair => pair.Key,
|
|
||||||
pair => pair.Value
|
|
||||||
);
|
|
||||||
InactivityHideExtraChatAll = other.InactivityHideExtraChatAll;
|
|
||||||
InactivityHideExtraChatChannels = other.InactivityHideExtraChatChannels.ToHashSet();
|
|
||||||
ShowHideButton = other.ShowHideButton;
|
|
||||||
NativeItemTooltips = other.NativeItemTooltips;
|
|
||||||
PrettierTimestamps = other.PrettierTimestamps;
|
|
||||||
MoreCompactPretty = other.MoreCompactPretty;
|
|
||||||
HideSameTimestamps = other.HideSameTimestamps;
|
|
||||||
ShowNoviceNetwork = other.ShowNoviceNetwork;
|
|
||||||
SidebarTabView = other.SidebarTabView;
|
|
||||||
PrintChangelog = other.PrintChangelog;
|
|
||||||
OnlyPreviewIf = other.OnlyPreviewIf;
|
|
||||||
PreviewMinimum = other.PreviewMinimum;
|
|
||||||
PreviewPosition = other.PreviewPosition;
|
|
||||||
CommandHelpSide = other.CommandHelpSide;
|
|
||||||
KeybindMode = other.KeybindMode;
|
|
||||||
LanguageOverride = other.LanguageOverride;
|
|
||||||
CanMove = other.CanMove;
|
|
||||||
CanResize = other.CanResize;
|
|
||||||
ShowTitleBar = other.ShowTitleBar;
|
|
||||||
ShowPopOutTitleBar = other.ShowPopOutTitleBar;
|
|
||||||
DatabaseBattleMessages = other.DatabaseBattleMessages;
|
|
||||||
LoadPreviousSession = other.LoadPreviousSession;
|
|
||||||
FilterIncludePreviousSessions = other.FilterIncludePreviousSessions;
|
|
||||||
SortAutoTranslate = other.SortAutoTranslate;
|
|
||||||
CollapseDuplicateMessages = other.CollapseDuplicateMessages;
|
|
||||||
CollapseKeepUniqueLinks = other.CollapseKeepUniqueLinks;
|
|
||||||
PlaySounds = other.PlaySounds;
|
|
||||||
KeepInputFocus = other.KeepInputFocus;
|
|
||||||
MaxLinesToRender = other.MaxLinesToRender;
|
|
||||||
Use24HourClock = other.Use24HourClock;
|
|
||||||
ShowEmotes = other.ShowEmotes;
|
|
||||||
// Deep-copy so settings window edits don't leak into live config before Save.
|
|
||||||
BlockedEmotes = new HashSet<string>(other.BlockedEmotes);
|
|
||||||
FontsEnabled = other.FontsEnabled;
|
|
||||||
ItalicEnabled = other.ItalicEnabled;
|
|
||||||
ExtraGlyphRanges = other.ExtraGlyphRanges;
|
|
||||||
FontSizeV2 = other.FontSizeV2;
|
|
||||||
GlobalFontV2 = other.GlobalFontV2;
|
|
||||||
JapaneseFontV2 = other.JapaneseFontV2;
|
|
||||||
ItalicFontV2 = other.ItalicFontV2;
|
|
||||||
SymbolsFontSizeV2 = other.SymbolsFontSizeV2;
|
|
||||||
TooltipOffset = other.TooltipOffset;
|
|
||||||
ChatColours = other.ChatColours.ToDictionary(entry => entry.Key, entry => entry.Value);
|
|
||||||
ColorSelectedInputChannelButton = other.ColorSelectedInputChannelButton;
|
|
||||||
|
|
||||||
// Keep live temp tabs alive across UpdateFrom — a settings save must
|
// When true (default) the tell-auto-open router switches the active tab to the
|
||||||
// not destroy open tell conversations. Pinned TempTabs are persistent
|
// incoming tell on every message; when false the tab is still created/revealed
|
||||||
// and come through `other` like regular tabs; unpinned TempTabs are
|
// with its unread badge but the active tab is left where the user is reading.
|
||||||
// session-only and held from the local state. For persistent tabs
|
public bool TellAutoOpenSwitchAlways = true;
|
||||||
// (incl. pinned), capture live runtime state by Identifier and restore
|
public int SidebarAutoSwitchThresholdPx = 800;
|
||||||
// it onto the freshly cloned tabs — CurrentChannel is critical because
|
|
||||||
// the user may have switched channel in-game between settings-open
|
|
||||||
// and settings-save, and we'd otherwise overwrite that with the
|
|
||||||
// settings-time snapshot.
|
|
||||||
var liveUnpinnedTempTabs = Tabs.Where(TabLifecycleHelpers.IsInUnpinnedPool).ToList();
|
|
||||||
var livePersistentSession = Tabs.Where(t => !TabLifecycleHelpers.IsInUnpinnedPool(t))
|
|
||||||
.ToDictionary(t => t.Identifier, t => (t.Messages, t.LastSendUnread, t.CurrentChannel));
|
|
||||||
|
|
||||||
Tabs = other
|
// v22 field: MainWindow layout mode (sidebar vs. horizontal top tabs).
|
||||||
.Tabs.Where(t => !t.IsTempTab || t.IsPinned)
|
// Initializer doubles as the migration default for configs loaded at v21.
|
||||||
.Select(t =>
|
public MainWindowLayoutMode MainWindowLayoutMode = MainWindowLayoutMode.Sidebar;
|
||||||
{
|
}
|
||||||
var clone = t.Clone();
|
|
||||||
if (livePersistentSession.TryGetValue(clone.Identifier, out var live))
|
|
||||||
{
|
|
||||||
clone.Messages = live.Messages;
|
|
||||||
clone.LastSendUnread = live.LastSendUnread;
|
|
||||||
clone.CurrentChannel = live.CurrentChannel;
|
|
||||||
}
|
|
||||||
return clone;
|
|
||||||
})
|
|
||||||
.ToList();
|
|
||||||
Tabs.AddRange(liveUnpinnedTempTabs);
|
|
||||||
|
|
||||||
ChatTabForward = other.ChatTabForward;
|
[Serializable]
|
||||||
ChatTabBackward = other.ChatTabBackward;
|
public enum TellAutoOpenMode
|
||||||
|
{
|
||||||
|
Off,
|
||||||
|
Sidebar,
|
||||||
|
TopTab,
|
||||||
|
Popout,
|
||||||
|
}
|
||||||
|
|
||||||
PrivacyFilterEnabled = other.PrivacyFilterEnabled;
|
[Serializable]
|
||||||
PrivacyPersistChannels = [.. other.PrivacyPersistChannels];
|
public enum MainWindowLayoutMode
|
||||||
PrivacyPersistUnknownChannels = other.PrivacyPersistUnknownChannels;
|
{
|
||||||
|
Sidebar,
|
||||||
RetentionEnabled = other.RetentionEnabled;
|
TopTabs,
|
||||||
RetentionDefaultDays = other.RetentionDefaultDays;
|
|
||||||
RetentionPerChannelDays = other.RetentionPerChannelDays.ToDictionary(
|
|
||||||
p => p.Key,
|
|
||||||
p => p.Value
|
|
||||||
);
|
|
||||||
RetentionLastRunAt = other.RetentionLastRunAt;
|
|
||||||
|
|
||||||
FirstRunCompleted = other.FirstRunCompleted;
|
|
||||||
UseHellionFont = other.UseHellionFont;
|
|
||||||
ShowHonorificTitleInHeader = other.ShowHonorificTitleInHeader;
|
|
||||||
ShowHonorificGlow = other.ShowHonorificGlow;
|
|
||||||
|
|
||||||
// v1.1.0 theme engine fields
|
|
||||||
Theme = other.Theme;
|
|
||||||
WindowOpacity = other.WindowOpacity;
|
|
||||||
ReduceMotion = other.ReduceMotion;
|
|
||||||
UseCompactDensity = other.UseCompactDensity;
|
|
||||||
|
|
||||||
EnableAutoTellTabs = other.EnableAutoTellTabs;
|
|
||||||
AutoTellTabsLimit = other.AutoTellTabsLimit;
|
|
||||||
AutoTellTabsCompactDisplay = other.AutoTellTabsCompactDisplay;
|
|
||||||
AutoTellTabsHistoryPreload = other.AutoTellTabsHistoryPreload;
|
|
||||||
SidebarWidth = other.SidebarWidth;
|
|
||||||
AutoTellTabsShowGreetedToggle = other.AutoTellTabsShowGreetedToggle;
|
|
||||||
|
|
||||||
SeenPopOutInputHint = other.SeenPopOutInputHint;
|
|
||||||
PopOutInputEnabled = other.PopOutInputEnabled;
|
|
||||||
SeenPopOutHeaderHint = other.SeenPopOutHeaderHint;
|
|
||||||
AutoTellTabsOpenAsPopout = other.AutoTellTabsOpenAsPopout;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[Serializable]
|
[Serializable]
|
||||||
@@ -395,9 +372,6 @@ public class Tab
|
|||||||
// Optional FontAwesome glyph name; null falls back to TabIconMapping default.
|
// Optional FontAwesome glyph name; null falls back to TabIconMapping default.
|
||||||
public string? Icon = null;
|
public string? Icon = null;
|
||||||
|
|
||||||
[Obsolete("Removed in favor of SelectedChannels")]
|
|
||||||
public Dictionary<ChatType, ChatSource> ChatCodes = new();
|
|
||||||
|
|
||||||
public Dictionary<ChatType, (ChatSource, ChatSource)> SelectedChannels = new();
|
public Dictionary<ChatType, (ChatSource, ChatSource)> SelectedChannels = new();
|
||||||
public bool ExtraChatAll;
|
public bool ExtraChatAll;
|
||||||
public HashSet<Guid> ExtraChatChannels = [];
|
public HashSet<Guid> ExtraChatChannels = [];
|
||||||
@@ -414,23 +388,37 @@ public class Tab
|
|||||||
public bool CanMove = true;
|
public bool CanMove = true;
|
||||||
public bool CanResize = true;
|
public bool CanResize = true;
|
||||||
|
|
||||||
public bool IndependentHide;
|
// Six per-tab hide conditions used to live here. Their reader was the
|
||||||
public bool HideDuringCutscenes = true;
|
// pop-out window, which stopped consulting them in cf4705e; the equivalents
|
||||||
public bool HideWhenNotLoggedIn = true;
|
// that survive are the window-level fields of the same name further up this
|
||||||
public bool HideWhenUiHidden = true;
|
// file, and v1.12.0 gave every one of those a control.
|
||||||
public bool HideInLoadingScreens;
|
//
|
||||||
public bool HideInBattle;
|
// Per-tab was the wrong unit anyway: "hide during cutscenes" is a statement
|
||||||
|
// about the screen, not about one conversation.
|
||||||
|
//
|
||||||
|
// HideWhenInactive stays -- the auto-tell service writes it.
|
||||||
public bool HideWhenInactive;
|
public bool HideWhenInactive;
|
||||||
|
|
||||||
public bool IsTempTab;
|
public bool IsTempTab;
|
||||||
|
|
||||||
// Pinned TempTabs survive plugin reload and logout — tester feedback from
|
// Pinned TempTabs survive plugin reload and logout -- tester feedback in
|
||||||
// Jin (v1.4.7). Pinned tabs live in their own pool (MaxPinnedTempTabs)
|
// v1.4.7. Pinned tabs live in their own pool (MaxPinnedTempTabs) separate
|
||||||
// separate from the AutoTellTabsLimit bucket.
|
// from the AutoTellTabsLimit bucket.
|
||||||
public bool IsPinned;
|
public bool IsPinned;
|
||||||
public bool AllSenderMessages;
|
public bool AllSenderMessages;
|
||||||
public TellTarget TellTarget = TellTarget.Empty();
|
public TellTarget TellTarget = TellTarget.Empty();
|
||||||
|
|
||||||
|
// Set once, where the name is built from a conversation partner. Never
|
||||||
|
// cleared by promotion, unlike IsTempTab and TellTarget -- both of those are
|
||||||
|
// routing state and are deliberately wiped when a tab is promoted, while the
|
||||||
|
// name they produced stays. Screenshot mode reads this, so it has to outlive
|
||||||
|
// every path that keeps the name but drops the binding.
|
||||||
|
public bool NameCameFromPartner;
|
||||||
|
|
||||||
|
// Per-tab notification sound for messages arriving in an inactive tab.
|
||||||
|
public bool EnableNotificationSound;
|
||||||
|
public uint NotificationSoundId = 1;
|
||||||
|
|
||||||
[NonSerialized]
|
[NonSerialized]
|
||||||
public uint Unread;
|
public uint Unread;
|
||||||
|
|
||||||
@@ -473,6 +461,45 @@ public class Tab
|
|||||||
[NonSerialized]
|
[NonSerialized]
|
||||||
internal string? _cachedTellIcon;
|
internal string? _cachedTellIcon;
|
||||||
|
|
||||||
|
// hover-lerp state. Default 0f means "not hovered". Sidebar
|
||||||
|
// path animates per tab; card-mode-border path is tab-aggregate
|
||||||
|
// (any card-row hover ramps the alpha for all cards in this tab).
|
||||||
|
// Lerp speed lives in the render loop, not here, so the same field
|
||||||
|
// serves both sites at the same animation curve.
|
||||||
|
[NonSerialized]
|
||||||
|
internal float _hoverAlpha;
|
||||||
|
|
||||||
|
[NonSerialized]
|
||||||
|
internal float _cardHoverAlpha;
|
||||||
|
|
||||||
|
// Copy-on-write for the three channel-filter fields. They are read without
|
||||||
|
// any lock from the pending-message thread, the filter worker and the draw
|
||||||
|
// thread, and until v1.12.0 nothing ever wrote them after load -- so the
|
||||||
|
// tab editor is their first writer, and mutating a live Dictionary while
|
||||||
|
// Matches enumerates it is the classic way to get a wrong answer or an
|
||||||
|
// exception on somebody else's thread.
|
||||||
|
//
|
||||||
|
// Building the replacements and swapping the references means a reader sees
|
||||||
|
// either the old set or the new one, never half of either.
|
||||||
|
//
|
||||||
|
// What this deliberately does not do is make the three writes one atomic
|
||||||
|
// step. A reader can catch the new dictionary with the old ExtraChat flag
|
||||||
|
// for a single message. That is harmless: the editor finishes by clearing
|
||||||
|
// and refiltering every tab, so any message placed by a mixed view is
|
||||||
|
// reconsidered a moment later. Making it truly atomic would mean one
|
||||||
|
// reference for all three, and these three are serialized fields with a
|
||||||
|
// shape the config file already has.
|
||||||
|
internal void ReplaceChannelFilter(
|
||||||
|
Dictionary<ChatType, (ChatSource, ChatSource)> selected,
|
||||||
|
bool extraChatAll,
|
||||||
|
HashSet<Guid> extraChatChannels
|
||||||
|
)
|
||||||
|
{
|
||||||
|
Volatile.Write(ref SelectedChannels, selected);
|
||||||
|
Volatile.Write(ref ExtraChatChannels, extraChatChannels);
|
||||||
|
Volatile.Write(ref ExtraChatAll, extraChatAll);
|
||||||
|
}
|
||||||
|
|
||||||
public bool Matches(Message message)
|
public bool Matches(Message message)
|
||||||
{
|
{
|
||||||
if (!message.Matches(SelectedChannels, ExtraChatAll, ExtraChatChannels))
|
if (!message.Matches(SelectedChannels, ExtraChatAll, ExtraChatChannels))
|
||||||
@@ -493,14 +520,14 @@ public class Tab
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
Unread += 1;
|
Unread += 1;
|
||||||
if (
|
|
||||||
message.Matches(
|
// Stamped for every message now. The condition that used to sit here
|
||||||
Plugin.Config.InactivityHideChannelsV2,
|
// filtered on InactivityHideChannels, a setting for the hide-when-
|
||||||
Plugin.Config.InactivityHideExtraChatAll,
|
// inactive feature -- and that feature lost its reader in cf4705e. So
|
||||||
Plugin.Config.InactivityHideExtraChatChannels
|
// which tell tab the auto-tell pool drops first, which is the only
|
||||||
)
|
// thing that reads this stamp, hung on a setting for something that
|
||||||
)
|
// does not happen.
|
||||||
LastActivity = Environment.TickCount64;
|
LastActivity = Environment.TickCount64;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Clear() => Messages.Clear();
|
public void Clear() => Messages.Clear();
|
||||||
@@ -510,6 +537,11 @@ public class Tab
|
|||||||
return new Tab
|
return new Tab
|
||||||
{
|
{
|
||||||
Name = Name,
|
Name = Name,
|
||||||
|
// Icon feeds the sidebar glyph and a clone round-trip used to drop
|
||||||
|
// it silently. ChatCodes sat beside it until v1.12.0, carrying data
|
||||||
|
// for a migration that the v16 schema gate had already made
|
||||||
|
// unreachable.
|
||||||
|
Icon = Icon,
|
||||||
SelectedChannels = SelectedChannels.ToDictionary(pair => pair.Key, pair => pair.Value),
|
SelectedChannels = SelectedChannels.ToDictionary(pair => pair.Key, pair => pair.Value),
|
||||||
ExtraChatAll = ExtraChatAll,
|
ExtraChatAll = ExtraChatAll,
|
||||||
ExtraChatChannels = ExtraChatChannels.ToHashSet(),
|
ExtraChatChannels = ExtraChatChannels.ToHashSet(),
|
||||||
@@ -527,17 +559,13 @@ public class Tab
|
|||||||
CurrentChannel = CurrentChannel.Clone(),
|
CurrentChannel = CurrentChannel.Clone(),
|
||||||
CanMove = CanMove,
|
CanMove = CanMove,
|
||||||
CanResize = CanResize,
|
CanResize = CanResize,
|
||||||
IndependentHide = IndependentHide,
|
|
||||||
HideDuringCutscenes = HideDuringCutscenes,
|
|
||||||
HideWhenNotLoggedIn = HideWhenNotLoggedIn,
|
|
||||||
HideWhenUiHidden = HideWhenUiHidden,
|
|
||||||
HideInLoadingScreens = HideInLoadingScreens,
|
|
||||||
HideInBattle = HideInBattle,
|
|
||||||
HideWhenInactive = HideWhenInactive,
|
HideWhenInactive = HideWhenInactive,
|
||||||
IsTempTab = IsTempTab,
|
IsTempTab = IsTempTab,
|
||||||
IsPinned = IsPinned,
|
IsPinned = IsPinned,
|
||||||
AllSenderMessages = AllSenderMessages,
|
AllSenderMessages = AllSenderMessages,
|
||||||
TellTarget = TellTarget.Clone(),
|
TellTarget = TellTarget.Clone(),
|
||||||
|
EnableNotificationSound = EnableNotificationSound,
|
||||||
|
NotificationSoundId = NotificationSoundId,
|
||||||
IsGreeted = IsGreeted,
|
IsGreeted = IsGreeted,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -821,17 +849,27 @@ public enum LanguageOverride
|
|||||||
French,
|
French,
|
||||||
German,
|
German,
|
||||||
Greek,
|
Greek,
|
||||||
|
|
||||||
// Italian,
|
|
||||||
Japanese,
|
Japanese,
|
||||||
|
|
||||||
// Korean,
|
|
||||||
// Norwegian,
|
|
||||||
PortugueseBrazil,
|
PortugueseBrazil,
|
||||||
Romanian,
|
Romanian,
|
||||||
Russian,
|
Russian,
|
||||||
Spanish,
|
Spanish,
|
||||||
Swedish,
|
Swedish,
|
||||||
|
|
||||||
|
// v1.5.3: Crowdin-heritage activated and Forge-maintained additions.
|
||||||
|
// Append-only to preserve serialized integer values of existing user configs.
|
||||||
|
Italian,
|
||||||
|
Korean,
|
||||||
|
Norwegian,
|
||||||
|
Catalan,
|
||||||
|
Czech,
|
||||||
|
Danish,
|
||||||
|
Finnish,
|
||||||
|
Hungarian,
|
||||||
|
Polish,
|
||||||
|
PortuguesePortugal,
|
||||||
|
Turkish,
|
||||||
|
Ukrainian,
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class LanguageOverrideExt
|
public static class LanguageOverrideExt
|
||||||
@@ -847,15 +885,24 @@ public static class LanguageOverrideExt
|
|||||||
LanguageOverride.French => "Français",
|
LanguageOverride.French => "Français",
|
||||||
LanguageOverride.German => "Deutsch",
|
LanguageOverride.German => "Deutsch",
|
||||||
LanguageOverride.Greek => "Ελληνικά",
|
LanguageOverride.Greek => "Ελληνικά",
|
||||||
// LanguageOverride.Italian => "Italiano",
|
LanguageOverride.Italian => "Italiano",
|
||||||
LanguageOverride.Japanese => "日本語",
|
LanguageOverride.Japanese => "日本語",
|
||||||
// LanguageOverride.Korean => "한국어 (Korean)",
|
LanguageOverride.Korean => "한국어",
|
||||||
// LanguageOverride.Norwegian => "Norsk",
|
LanguageOverride.Norwegian => "Norsk bokmål",
|
||||||
LanguageOverride.PortugueseBrazil => "Português do Brasil",
|
LanguageOverride.PortugueseBrazil => "Português do Brasil",
|
||||||
LanguageOverride.Romanian => "Română",
|
LanguageOverride.Romanian => "Română",
|
||||||
LanguageOverride.Russian => "Русский",
|
LanguageOverride.Russian => "Русский",
|
||||||
LanguageOverride.Spanish => "Español",
|
LanguageOverride.Spanish => "Español",
|
||||||
LanguageOverride.Swedish => "Svenska",
|
LanguageOverride.Swedish => "Svenska",
|
||||||
|
LanguageOverride.Catalan => "Català",
|
||||||
|
LanguageOverride.Czech => "Čeština",
|
||||||
|
LanguageOverride.Danish => "Dansk",
|
||||||
|
LanguageOverride.Finnish => "Suomi",
|
||||||
|
LanguageOverride.Hungarian => "Magyar",
|
||||||
|
LanguageOverride.Polish => "Polski",
|
||||||
|
LanguageOverride.PortuguesePortugal => "Português (Portugal)",
|
||||||
|
LanguageOverride.Turkish => "Türkçe",
|
||||||
|
LanguageOverride.Ukrainian => "Українська",
|
||||||
_ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
|
_ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -870,17 +917,80 @@ public static class LanguageOverrideExt
|
|||||||
LanguageOverride.French => "fr",
|
LanguageOverride.French => "fr",
|
||||||
LanguageOverride.German => "de",
|
LanguageOverride.German => "de",
|
||||||
LanguageOverride.Greek => "el",
|
LanguageOverride.Greek => "el",
|
||||||
// LanguageOverride.Italian => "it",
|
LanguageOverride.Italian => "it",
|
||||||
LanguageOverride.Japanese => "ja",
|
LanguageOverride.Japanese => "ja",
|
||||||
// LanguageOverride.Korean => "ko",
|
LanguageOverride.Korean => "ko",
|
||||||
// LanguageOverride.Norwegian => "no",
|
LanguageOverride.Norwegian => "nb",
|
||||||
LanguageOverride.PortugueseBrazil => "pt-br",
|
LanguageOverride.PortugueseBrazil => "pt-br",
|
||||||
LanguageOverride.Romanian => "ro",
|
LanguageOverride.Romanian => "ro",
|
||||||
LanguageOverride.Russian => "ru",
|
LanguageOverride.Russian => "ru",
|
||||||
LanguageOverride.Spanish => "es",
|
LanguageOverride.Spanish => "es",
|
||||||
LanguageOverride.Swedish => "sv",
|
LanguageOverride.Swedish => "sv",
|
||||||
|
LanguageOverride.Catalan => "ca",
|
||||||
|
LanguageOverride.Czech => "cs",
|
||||||
|
LanguageOverride.Danish => "da",
|
||||||
|
LanguageOverride.Finnish => "fi",
|
||||||
|
LanguageOverride.Hungarian => "hu",
|
||||||
|
LanguageOverride.Polish => "pl",
|
||||||
|
LanguageOverride.PortuguesePortugal => "pt-pt",
|
||||||
|
LanguageOverride.Turkish => "tr",
|
||||||
|
LanguageOverride.Ukrainian => "uk",
|
||||||
_ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
|
_ => throw new ArgumentOutOfRangeException(nameof(mode), mode, null),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Maps a language to the ExtraGlyphRanges flag required for full UI
|
||||||
|
// rendering in that locale. The settings save path ORs this into
|
||||||
|
// Mutable.ExtraGlyphRanges so users do not need to know which range
|
||||||
|
// to tick manually. Returns 0 for locales fully covered by the default
|
||||||
|
// ImGui glyph range (Latin-1) or by the separate Japanese font handle.
|
||||||
|
// The same mapping keyed by culture code, for when the language override is
|
||||||
|
// None and the UI follows Dalamud. Without this the ranges only ever get
|
||||||
|
// filled by an explicit language pick -- installs that never touched the
|
||||||
|
// setting rendered their own locale in whatever the default range covers,
|
||||||
|
// which for Korean, Chinese, Cyrillic and Greek is boxes. It went unnoticed
|
||||||
|
// while configs accumulated ranges over time; a fresh config has none.
|
||||||
|
public static ExtraGlyphRanges RequiredGlyphRangesForCulture(string? cultureCode)
|
||||||
|
{
|
||||||
|
var code = (cultureCode ?? string.Empty).ToLowerInvariant();
|
||||||
|
|
||||||
|
// Longest first: zh-hant has to win over the zh prefix.
|
||||||
|
if (code.StartsWith("zh-hant") || code.StartsWith("zh-tw") || code.StartsWith("zh-hk"))
|
||||||
|
return ExtraGlyphRanges.ChineseFull;
|
||||||
|
if (code.StartsWith("zh"))
|
||||||
|
return ExtraGlyphRanges.ChineseSimplifiedCommon;
|
||||||
|
if (code.StartsWith("ko"))
|
||||||
|
return ExtraGlyphRanges.Korean;
|
||||||
|
if (code.StartsWith("uk") || code.StartsWith("ru") || code.StartsWith("be"))
|
||||||
|
return ExtraGlyphRanges.Cyrillic;
|
||||||
|
if (code.StartsWith("el"))
|
||||||
|
return ExtraGlyphRanges.Greek;
|
||||||
|
if (
|
||||||
|
code.StartsWith("cs")
|
||||||
|
|| code.StartsWith("pl")
|
||||||
|
|| code.StartsWith("ro")
|
||||||
|
|| code.StartsWith("hu")
|
||||||
|
|| code.StartsWith("tr")
|
||||||
|
)
|
||||||
|
return ExtraGlyphRanges.LatinExtended;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ExtraGlyphRanges RequiredGlyphRanges(this LanguageOverride mode) =>
|
||||||
|
mode switch
|
||||||
|
{
|
||||||
|
LanguageOverride.Korean => ExtraGlyphRanges.Korean,
|
||||||
|
LanguageOverride.ChineseSimplified => ExtraGlyphRanges.ChineseSimplifiedCommon,
|
||||||
|
LanguageOverride.ChineseTraditional => ExtraGlyphRanges.ChineseFull,
|
||||||
|
LanguageOverride.Ukrainian => ExtraGlyphRanges.Cyrillic,
|
||||||
|
LanguageOverride.Greek => ExtraGlyphRanges.Greek,
|
||||||
|
LanguageOverride.Czech
|
||||||
|
or LanguageOverride.Polish
|
||||||
|
or LanguageOverride.Romanian
|
||||||
|
or LanguageOverride.Hungarian
|
||||||
|
or LanguageOverride.Turkish => ExtraGlyphRanges.LatinExtended,
|
||||||
|
_ => 0,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
[Serializable]
|
[Serializable]
|
||||||
@@ -894,10 +1004,23 @@ public enum ExtraGlyphRanges
|
|||||||
Korean = 1 << 4,
|
Korean = 1 << 4,
|
||||||
Thai = 1 << 5,
|
Thai = 1 << 5,
|
||||||
Vietnamese = 1 << 6,
|
Vietnamese = 1 << 6,
|
||||||
|
|
||||||
|
// v1.5.3: Custom ranges for languages with Latin Extended-A glyphs (Czech,
|
||||||
|
// Polish, Romanian, Turkish, Hungarian) and Greek polytonic accents.
|
||||||
|
LatinExtended = 1 << 7,
|
||||||
|
Greek = 1 << 8,
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class ExtraGlyphRangesExt
|
public static class ExtraGlyphRangesExt
|
||||||
{
|
{
|
||||||
|
// Custom (start, end) inclusive pair lists for ranges that ImGui does
|
||||||
|
// not ship a built-in helper for. SetUpRanges() feeds these into
|
||||||
|
// ImFontGlyphRangesBuilder.AddChar via the `chars` parameter of
|
||||||
|
// BuildRange so we avoid the lifetime/pinning question that the native
|
||||||
|
// GetGlyphRanges*-pointer pathway papers over.
|
||||||
|
internal static readonly ushort[] LatinExtendedPairs = { 0x0100, 0x024F };
|
||||||
|
internal static readonly ushort[] GreekPairs = { 0x0370, 0x03FF, 0x1F00, 0x1FFF };
|
||||||
|
|
||||||
public static string Name(this ExtraGlyphRanges ranges) =>
|
public static string Name(this ExtraGlyphRanges ranges) =>
|
||||||
ranges switch
|
ranges switch
|
||||||
{
|
{
|
||||||
@@ -909,6 +1032,8 @@ public static class ExtraGlyphRangesExt
|
|||||||
ExtraGlyphRanges.Korean => Language.ExtraGlyphRanges_Korean_Name,
|
ExtraGlyphRanges.Korean => Language.ExtraGlyphRanges_Korean_Name,
|
||||||
ExtraGlyphRanges.Thai => Language.ExtraGlyphRanges_Thai_Name,
|
ExtraGlyphRanges.Thai => Language.ExtraGlyphRanges_Thai_Name,
|
||||||
ExtraGlyphRanges.Vietnamese => Language.ExtraGlyphRanges_Vietnamese_Name,
|
ExtraGlyphRanges.Vietnamese => Language.ExtraGlyphRanges_Vietnamese_Name,
|
||||||
|
ExtraGlyphRanges.LatinExtended => Language.ExtraGlyphRanges_LatinExtended_Name,
|
||||||
|
ExtraGlyphRanges.Greek => Language.ExtraGlyphRanges_Greek_Name,
|
||||||
_ => throw new ArgumentOutOfRangeException(nameof(ranges), ranges, null),
|
_ => throw new ArgumentOutOfRangeException(nameof(ranges), ranges, null),
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -923,6 +1048,10 @@ public static class ExtraGlyphRangesExt
|
|||||||
ExtraGlyphRanges.Korean => (nint)ImGui.GetIO().Fonts.GetGlyphRangesKorean(),
|
ExtraGlyphRanges.Korean => (nint)ImGui.GetIO().Fonts.GetGlyphRangesKorean(),
|
||||||
ExtraGlyphRanges.Thai => (nint)ImGui.GetIO().Fonts.GetGlyphRangesThai(),
|
ExtraGlyphRanges.Thai => (nint)ImGui.GetIO().Fonts.GetGlyphRangesThai(),
|
||||||
ExtraGlyphRanges.Vietnamese => (nint)ImGui.GetIO().Fonts.GetGlyphRangesVietnamese(),
|
ExtraGlyphRanges.Vietnamese => (nint)ImGui.GetIO().Fonts.GetGlyphRangesVietnamese(),
|
||||||
|
// LatinExtended and Greek are applied via builder.AddChar in
|
||||||
|
// FontManager.SetUpRanges, not through a native pointer range.
|
||||||
|
ExtraGlyphRanges.LatinExtended => 0,
|
||||||
|
ExtraGlyphRanges.Greek => 0,
|
||||||
_ => throw new ArgumentOutOfRangeException(nameof(ranges), ranges, null),
|
_ => throw new ArgumentOutOfRangeException(nameof(ranges), ranges, null),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,418 +0,0 @@
|
|||||||
using System.Collections.Concurrent;
|
|
||||||
using System.Numerics;
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
using Dalamud.Bindings.ImGui;
|
|
||||||
using Dalamud.Interface.Textures;
|
|
||||||
using Dalamud.Interface.Textures.TextureWraps;
|
|
||||||
using Dalamud.Utility;
|
|
||||||
using SixLabors.ImageSharp;
|
|
||||||
using SixLabors.ImageSharp.PixelFormats;
|
|
||||||
|
|
||||||
namespace HellionChat;
|
|
||||||
|
|
||||||
public static class EmoteCache
|
|
||||||
{
|
|
||||||
private static readonly string[] NotWorking =
|
|
||||||
[
|
|
||||||
":tf:",
|
|
||||||
"(ditto)",
|
|
||||||
"c!",
|
|
||||||
"h!",
|
|
||||||
"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 const string BetterTTV = "https://api.betterttv.net/3";
|
|
||||||
private const string GlobalEmotes = $"{BetterTTV}/cached/emotes/global";
|
|
||||||
private const string Top100Emotes = "{0}/emotes/shared/top?before={1}&limit=100";
|
|
||||||
private const string EmotePath = "https://cdn.betterttv.net/emote/{0}/3x";
|
|
||||||
|
|
||||||
[Serializable]
|
|
||||||
private struct Top100()
|
|
||||||
{
|
|
||||||
[JsonPropertyName("emote")]
|
|
||||||
public Emote Emote { get; set; }
|
|
||||||
|
|
||||||
[JsonPropertyName("id")]
|
|
||||||
public required string Id { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
[Serializable]
|
|
||||||
public struct Emote()
|
|
||||||
{
|
|
||||||
[JsonPropertyName("id")]
|
|
||||||
public required string Id { get; set; }
|
|
||||||
|
|
||||||
[JsonPropertyName("code")]
|
|
||||||
public required string Code { get; set; }
|
|
||||||
|
|
||||||
[JsonPropertyName("imageType")]
|
|
||||||
public required string ImageType { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum LoadingState
|
|
||||||
{
|
|
||||||
Unloaded,
|
|
||||||
Loading,
|
|
||||||
Done,
|
|
||||||
}
|
|
||||||
|
|
||||||
// All fields below are uninitialised while State != Done.
|
|
||||||
public static LoadingState State = LoadingState.Unloaded;
|
|
||||||
|
|
||||||
private static readonly Dictionary<string, Emote> Cache = new();
|
|
||||||
private static readonly Dictionary<string, EmoteBase> EmoteImages = new();
|
|
||||||
|
|
||||||
public static string[] SortedCodeArray = [];
|
|
||||||
|
|
||||||
// Cancelled on Dispose to stop in-flight downloads; replaced on re-enable.
|
|
||||||
private static CancellationTokenSource Cts = new();
|
|
||||||
internal static CancellationToken Token => Cts.Token;
|
|
||||||
|
|
||||||
// Tracks in-flight loads so Dispose can drain them before teardown.
|
|
||||||
private static readonly ConcurrentBag<Task> PendingLoads = new();
|
|
||||||
|
|
||||||
internal static void TrackLoad(Task loadTask, string emoteCode)
|
|
||||||
{
|
|
||||||
PendingLoads.Add(
|
|
||||||
loadTask.ContinueWith(
|
|
||||||
t =>
|
|
||||||
{
|
|
||||||
if (t.IsFaulted)
|
|
||||||
Plugin.LogProxy.Error(
|
|
||||||
t.Exception!,
|
|
||||||
$"EmoteCache load failed for {emoteCode}"
|
|
||||||
);
|
|
||||||
},
|
|
||||||
TaskScheduler.Default
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static async Task LoadData()
|
|
||||||
{
|
|
||||||
if (State is not LoadingState.Unloaded)
|
|
||||||
return;
|
|
||||||
|
|
||||||
// Reset CTS if Dispose was called and the plugin is being re-enabled.
|
|
||||||
if (Cts.IsCancellationRequested)
|
|
||||||
Cts = new CancellationTokenSource();
|
|
||||||
|
|
||||||
State = LoadingState.Loading;
|
|
||||||
var ct = Cts.Token;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var global = await Client.GetAsync(GlobalEmotes, ct);
|
|
||||||
var globalList = await global.Content.ReadAsStringAsync(ct);
|
|
||||||
|
|
||||||
foreach (var emote in JsonSerializer.Deserialize<Emote[]>(globalList)!)
|
|
||||||
if (!string.IsNullOrEmpty(emote.Code) && !NotWorking.Contains(emote.Code))
|
|
||||||
Cache.TryAdd(emote.Code, emote);
|
|
||||||
|
|
||||||
var lastId = string.Empty;
|
|
||||||
for (var i = 0; i < 15; i++)
|
|
||||||
{
|
|
||||||
var top = await Client.GetAsync(Top100Emotes.Format(BetterTTV, lastId), ct);
|
|
||||||
var topList = await top.Content.ReadAsStringAsync(ct);
|
|
||||||
|
|
||||||
var jsonList = JsonSerializer.Deserialize<List<Top100>>(topList)!;
|
|
||||||
// BetterTTV occasionally returns entries with a null Code;
|
|
||||||
// skip them so a single bad row doesn't break the whole cache.
|
|
||||||
foreach (var emote in jsonList)
|
|
||||||
if (
|
|
||||||
!string.IsNullOrEmpty(emote.Emote.Code)
|
|
||||||
&& !NotWorking.Contains(emote.Emote.Code)
|
|
||||||
)
|
|
||||||
Cache.TryAdd(emote.Emote.Code, emote.Emote);
|
|
||||||
|
|
||||||
lastId = jsonList.Last().Id;
|
|
||||||
}
|
|
||||||
|
|
||||||
SortedCodeArray = Cache.Keys.Order().ToArray();
|
|
||||||
State = LoadingState.Done;
|
|
||||||
}
|
|
||||||
catch (OperationCanceledException)
|
|
||||||
{
|
|
||||||
// Plugin disposed mid-load; State stays on Loading so re-enable can retry.
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
// Reset to Unloaded so a later trigger can retry without a plugin reload.
|
|
||||||
State = LoadingState.Unloaded;
|
|
||||||
Plugin.LogProxy.Error(ex, "BetterTTV cache wasn't initialized");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void Dispose()
|
|
||||||
{
|
|
||||||
Cts.Cancel();
|
|
||||||
|
|
||||||
// 5s upper bound; anything still running gets abandoned.
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Task.WaitAll(PendingLoads.ToArray(), TimeSpan.FromSeconds(5));
|
|
||||||
}
|
|
||||||
catch (AggregateException)
|
|
||||||
{
|
|
||||||
// Faults already logged in TrackLoad.
|
|
||||||
}
|
|
||||||
|
|
||||||
while (PendingLoads.TryTake(out _)) { }
|
|
||||||
|
|
||||||
foreach (var emote in EmoteImages.Values)
|
|
||||||
emote.InnerDispose();
|
|
||||||
}
|
|
||||||
|
|
||||||
internal static bool Exists(string code)
|
|
||||||
{
|
|
||||||
return State is LoadingState.Done && SortedCodeArray.Contains(code);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal static EmoteBase? GetEmote(string code)
|
|
||||||
{
|
|
||||||
if (State is not LoadingState.Done)
|
|
||||||
return null;
|
|
||||||
|
|
||||||
if (!Cache.TryGetValue(code, out var emoteDetail))
|
|
||||||
return null;
|
|
||||||
|
|
||||||
if (EmoteImages.TryGetValue(emoteDetail.Id, out var emote))
|
|
||||||
return emote;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (emoteDetail.ImageType == "gif")
|
|
||||||
{
|
|
||||||
var animatedEmote = new ImGuiGif().Prepare(emoteDetail);
|
|
||||||
EmoteImages.Add(emoteDetail.Id, animatedEmote);
|
|
||||||
return animatedEmote;
|
|
||||||
}
|
|
||||||
|
|
||||||
var staticEmote = new ImGuiEmote().Prepare(emoteDetail);
|
|
||||||
EmoteImages.Add(emoteDetail.Id, staticEmote);
|
|
||||||
|
|
||||||
return staticEmote;
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
Plugin.LogProxy.Error("Failed to convert");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public abstract class EmoteBase
|
|
||||||
{
|
|
||||||
public bool Failed;
|
|
||||||
public bool IsLoaded;
|
|
||||||
|
|
||||||
public byte[] RawData = [];
|
|
||||||
|
|
||||||
protected IDalamudTextureWrap? Texture;
|
|
||||||
|
|
||||||
public virtual void Draw(Vector2 size)
|
|
||||||
{
|
|
||||||
ImGui.Image(Texture!.Handle, size);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal async Task<byte[]> LoadAsync(Emote emote, CancellationToken ct)
|
|
||||||
{
|
|
||||||
// Path-traversal guard: resolve and verify the candidate path stays
|
|
||||||
// inside the cache directory before reading or writing.
|
|
||||||
var dir = Path.GetFullPath(
|
|
||||||
Path.Join(Plugin.Interface.ConfigDirectory.FullName, "EmoteCacheV1")
|
|
||||||
);
|
|
||||||
Directory.CreateDirectory(dir);
|
|
||||||
|
|
||||||
var dirPrefix = dir.EndsWith(Path.DirectorySeparatorChar)
|
|
||||||
? dir
|
|
||||||
: dir + Path.DirectorySeparatorChar;
|
|
||||||
var filePath = Path.GetFullPath(Path.Join(dir, $"{emote.Id}.{emote.ImageType}"));
|
|
||||||
if (!filePath.StartsWith(dirPrefix, StringComparison.Ordinal))
|
|
||||||
throw new InvalidOperationException(
|
|
||||||
$"Emote path escapes cache directory: id={emote.Id}, type={emote.ImageType}"
|
|
||||||
);
|
|
||||||
|
|
||||||
if (File.Exists(filePath))
|
|
||||||
{
|
|
||||||
RawData = await File.ReadAllBytesAsync(filePath, ct);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
var content = await Client.GetAsync(EmotePath.Format(emote.Id), ct);
|
|
||||||
RawData = await content.Content.ReadAsByteArrayAsync(ct);
|
|
||||||
|
|
||||||
await using var stream = new FileStream(
|
|
||||||
filePath,
|
|
||||||
FileMode.Create,
|
|
||||||
FileAccess.Write,
|
|
||||||
FileShare.Read
|
|
||||||
);
|
|
||||||
await stream.WriteAsync(RawData, ct);
|
|
||||||
}
|
|
||||||
|
|
||||||
return RawData;
|
|
||||||
}
|
|
||||||
|
|
||||||
public abstract void InnerDispose();
|
|
||||||
}
|
|
||||||
|
|
||||||
public sealed class ImGuiEmote : EmoteBase
|
|
||||||
{
|
|
||||||
public ImGuiEmote Prepare(Emote emote)
|
|
||||||
{
|
|
||||||
var ct = EmoteCache.Token;
|
|
||||||
// Task.Run keeps the sync prefix off the ImGui render thread.
|
|
||||||
EmoteCache.TrackLoad(Task.Run(() => LoadAsyncTracked(emote, ct), ct), emote.Code);
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task LoadAsyncTracked(Emote emote, CancellationToken ct)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var image = await LoadAsync(emote, ct);
|
|
||||||
if (image.Length <= 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
ct.ThrowIfCancellationRequested();
|
|
||||||
Texture = await Plugin.TextureProvider.CreateFromImageAsync(
|
|
||||||
image,
|
|
||||||
cancellationToken: ct
|
|
||||||
);
|
|
||||||
IsLoaded = true;
|
|
||||||
}
|
|
||||||
catch (OperationCanceledException) { }
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Failed = true;
|
|
||||||
Plugin.LogProxy.Error(ex, $"Unable to load {emote.Code} with id {emote.Id}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void InnerDispose()
|
|
||||||
{
|
|
||||||
Texture?.Dispose();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public sealed class ImGuiGif : EmoteBase
|
|
||||||
{
|
|
||||||
private List<(IDalamudTextureWrap Texture, float Delay)> Frames = [];
|
|
||||||
private float FrameTimer;
|
|
||||||
private int CurrentFrame;
|
|
||||||
private ulong GlobalFrameCount;
|
|
||||||
|
|
||||||
public override void Draw(Vector2 size)
|
|
||||||
{
|
|
||||||
if (Frames.Count == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (CurrentFrame >= Frames.Count)
|
|
||||||
{
|
|
||||||
CurrentFrame = 0;
|
|
||||||
FrameTimer = -1f;
|
|
||||||
}
|
|
||||||
|
|
||||||
var frame = Frames[CurrentFrame];
|
|
||||||
if (FrameTimer <= 0.0f)
|
|
||||||
FrameTimer = frame.Delay;
|
|
||||||
|
|
||||||
ImGui.Image(frame.Texture.Handle, size);
|
|
||||||
|
|
||||||
if (GlobalFrameCount == Plugin.Interface.UiBuilder.FrameCount)
|
|
||||||
return;
|
|
||||||
|
|
||||||
GlobalFrameCount = Plugin.Interface.UiBuilder.FrameCount;
|
|
||||||
|
|
||||||
FrameTimer -= ImGui.GetIO().DeltaTime;
|
|
||||||
if (FrameTimer <= 0f)
|
|
||||||
CurrentFrame++;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void InnerDispose()
|
|
||||||
{
|
|
||||||
Frames.ForEach(f => f.Texture.Dispose());
|
|
||||||
Frames.Clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
public ImGuiGif Prepare(Emote emote)
|
|
||||||
{
|
|
||||||
var ct = EmoteCache.Token;
|
|
||||||
EmoteCache.TrackLoad(Task.Run(() => LoadAsyncTracked(emote, ct), ct), emote.Code);
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task LoadAsyncTracked(Emote emote, CancellationToken ct)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var image = await LoadAsync(emote, ct);
|
|
||||||
if (image.Length <= 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
using var ms = new MemoryStream(image);
|
|
||||||
using var img = Image.Load<Rgba32>(ms);
|
|
||||||
if (img.Frames.Count == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
var frames = new List<(IDalamudTextureWrap Tex, float Delay)>();
|
|
||||||
foreach (var frame in img.Frames)
|
|
||||||
{
|
|
||||||
ct.ThrowIfCancellationRequested();
|
|
||||||
|
|
||||||
var delay = frame.Metadata.GetGifMetadata().FrameDelay / 100f;
|
|
||||||
|
|
||||||
// Match browser behaviour: anything under 20ms rounds up to 100ms.
|
|
||||||
if (delay < 0.02f)
|
|
||||||
delay = 0.1f;
|
|
||||||
|
|
||||||
var buffer = new byte[4 * frame.Width * frame.Height];
|
|
||||||
frame.CopyPixelDataTo(buffer);
|
|
||||||
var tex = await Plugin.TextureProvider.CreateFromRawAsync(
|
|
||||||
RawImageSpecification.Rgba32(frame.Width, frame.Height),
|
|
||||||
buffer,
|
|
||||||
cancellationToken: ct
|
|
||||||
);
|
|
||||||
frames.Add((tex, delay));
|
|
||||||
}
|
|
||||||
|
|
||||||
Frames = frames;
|
|
||||||
IsLoaded = true;
|
|
||||||
}
|
|
||||||
catch (OperationCanceledException)
|
|
||||||
{
|
|
||||||
// Plugin disposed mid-load; release any partial frames.
|
|
||||||
foreach (var f in Frames)
|
|
||||||
f.Texture.Dispose();
|
|
||||||
Frames = [];
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Failed = true;
|
|
||||||
Plugin.LogProxy.Error(ex, $"Unable to load {emote.Code} with id {emote.Id}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using HellionChat.Code;
|
using HellionChat.Code;
|
||||||
|
using HellionChat.Util;
|
||||||
|
|
||||||
namespace HellionChat.Export;
|
namespace HellionChat.Export;
|
||||||
|
|
||||||
@@ -33,9 +34,23 @@ internal static class ExportFormatExt
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Serializes message snapshots to Markdown, JSON, or CSV.
|
// Serializes message snapshots to Markdown, JSON, or CSV.
|
||||||
// Caller handles pre-filtering except sender substring, which requires deserialized SeString.TextValue.
|
//
|
||||||
|
// Text comes from the chunk lists, never from SenderSource/ContentSource. Those
|
||||||
|
// are raw SeStrings, and reading TextValue on one containing an auto-translate
|
||||||
|
// phrase reaches SeStringEvaluator, which asserts it is on the main thread and
|
||||||
|
// throws unconditionally when a macro resolves a global number. An export runs on
|
||||||
|
// a worker, so that would abort it partway and leave half a file behind.
|
||||||
|
//
|
||||||
|
// The chunks are already resolved: ChunkUtil turns auto-translate into text at
|
||||||
|
// ingest, and the full-text index reads them exactly this way. Same strings, no
|
||||||
|
// evaluator, no thread affinity.
|
||||||
|
//
|
||||||
|
// The caller pre-filters by channel and date via StreamForExport; only the sender
|
||||||
|
// substring is applied here.
|
||||||
internal static class MessageExporter
|
internal static class MessageExporter
|
||||||
{
|
{
|
||||||
|
private static readonly UTF8Encoding Utf8NoBom = new(encoderShouldEmitUTF8Identifier: false);
|
||||||
|
|
||||||
internal record FilterDescription(
|
internal record FilterDescription(
|
||||||
IReadOnlyCollection<int>? ChatTypes,
|
IReadOnlyCollection<int>? ChatTypes,
|
||||||
DateTimeOffset? From,
|
DateTimeOffset? From,
|
||||||
@@ -50,22 +65,83 @@ internal static class MessageExporter
|
|||||||
FilterDescription filter
|
FilterDescription filter
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
// Rejected before the file is touched. The old order opened the stream
|
||||||
|
// first, so an unknown format left a zero-byte file where the user's
|
||||||
|
// previous export had been.
|
||||||
|
if (!Enum.IsDefined(format))
|
||||||
|
throw new ArgumentOutOfRangeException(nameof(format), format, null);
|
||||||
|
|
||||||
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))
|
||||||
: messages;
|
: messages;
|
||||||
|
|
||||||
using var writer = new StreamWriter(path, append: false, encoding: Encoding.UTF8);
|
// Written beside the target and moved into place at the end. A crash or
|
||||||
return format switch
|
// an unplugged drive halfway through would otherwise leave a file that
|
||||||
|
// opens fine and is quietly incomplete -- and this is the path a GDPR
|
||||||
|
// access request goes out on, where "looks complete" is the dangerous
|
||||||
|
// failure.
|
||||||
|
var temp = path + ".part";
|
||||||
|
int written;
|
||||||
|
try
|
||||||
{
|
{
|
||||||
ExportFormat.Markdown => WriteMarkdown(writer, matching, filter),
|
// Encoding.UTF8 writes a byte order mark, and that is not a
|
||||||
ExportFormat.Json => WriteJson(writer, matching, filter),
|
// cosmetic detail here: a leading U+FEFF makes the JSON invalid for
|
||||||
ExportFormat.Csv => WriteCsv(writer, matching, filter),
|
// every strict parser, Python's json.load included. CSV is the one
|
||||||
_ => throw new ArgumentOutOfRangeException(nameof(format), format, null),
|
// format that wants it -- without a BOM Excel guesses the codepage
|
||||||
};
|
// and mangles every non-ASCII name in the file.
|
||||||
|
var encoding = format == ExportFormat.Csv ? Encoding.UTF8 : Utf8NoBom;
|
||||||
|
|
||||||
|
using (var writer = new StreamWriter(temp, append: false, encoding))
|
||||||
|
{
|
||||||
|
written = format switch
|
||||||
|
{
|
||||||
|
ExportFormat.Markdown => WriteMarkdown(writer, matching, filter),
|
||||||
|
ExportFormat.Json => WriteJson(writer, matching, filter),
|
||||||
|
_ => WriteCsv(writer, matching, filter),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// An export that matched nothing does not replace anything. The
|
||||||
|
// file still has a header and a footer, so moving it would put a
|
||||||
|
// near-empty file where the user's previous export was -- and then
|
||||||
|
// report "no message matched the filter", which reads as "nothing
|
||||||
|
// happened". Dalamud's save dialog has no overwrite confirmation to
|
||||||
|
// fall back on.
|
||||||
|
if (written == 0)
|
||||||
|
{
|
||||||
|
TryDeleteTemp(temp);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
File.Move(temp, path, overwrite: true);
|
||||||
|
return written;
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
TryDeleteTemp(temp);
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Best effort: the export already failed, and a leftover .part file is a
|
||||||
|
// smaller problem than masking the original exception with an IO one.
|
||||||
|
private static void TryDeleteTemp(string temp)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (File.Exists(temp))
|
||||||
|
File.Delete(temp);
|
||||||
|
}
|
||||||
|
catch (IOException) { }
|
||||||
|
catch (UnauthorizedAccessException) { }
|
||||||
}
|
}
|
||||||
|
|
||||||
private static bool MatchesSender(Message m, string needle) =>
|
private static bool MatchesSender(Message m, string needle) =>
|
||||||
m.SenderSource.TextValue.Contains(needle, StringComparison.OrdinalIgnoreCase);
|
SenderText(m).Contains(needle, StringComparison.OrdinalIgnoreCase);
|
||||||
|
|
||||||
|
private static string SenderText(Message m) => ChunkUtil.ToRawString(m.Sender);
|
||||||
|
|
||||||
|
private static string ContentText(Message m) => ChunkUtil.ToRawString(m.Content);
|
||||||
|
|
||||||
private static int WriteMarkdown(
|
private static int WriteMarkdown(
|
||||||
StreamWriter w,
|
StreamWriter w,
|
||||||
@@ -94,8 +170,8 @@ internal static class MessageExporter
|
|||||||
}
|
}
|
||||||
|
|
||||||
var chatType = (ChatType)(ushort)m.Code.Type;
|
var chatType = (ChatType)(ushort)m.Code.Type;
|
||||||
var sender = m.SenderSource.TextValue.Trim().Trim('<', '>', '[', ']', ':').Trim();
|
var sender = SenderText(m).Trim().Trim('<', '>', '[', ']', ':').Trim();
|
||||||
var content = m.ContentSource.TextValue;
|
var content = ContentText(m);
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(sender))
|
if (string.IsNullOrEmpty(sender))
|
||||||
w.WriteLine($"**[{localDate:HH:mm}] {chatType}:** {content}");
|
w.WriteLine($"**[{localDate:HH:mm}] {chatType}:** {content}");
|
||||||
@@ -170,12 +246,17 @@ internal static class MessageExporter
|
|||||||
w.Write($",\"date\":\"{m.Date.ToString("O", CultureInfo.InvariantCulture)}\"");
|
w.Write($",\"date\":\"{m.Date.ToString("O", CultureInfo.InvariantCulture)}\"");
|
||||||
w.Write($",\"chat_type\":{(int)m.Code.Type}");
|
w.Write($",\"chat_type\":{(int)m.Code.Type}");
|
||||||
w.Write($",\"chat_type_name\":\"{chatType}\"");
|
w.Write($",\"chat_type_name\":\"{chatType}\"");
|
||||||
w.Write($",\"source_kind\":{m.Code.Source}");
|
// Cast, not interpolate. These are XivChatRelationKind, and string
|
||||||
w.Write($",\"target_kind\":{m.Code.Target}");
|
// interpolation of an enum writes the member name -- so every
|
||||||
|
// message with a recognised relation produced
|
||||||
|
// "source_kind":LocalPlayer, which no parser accepts. This is the
|
||||||
|
// file an access request goes out on.
|
||||||
|
w.Write($",\"source_kind\":{(int)m.Code.Source}");
|
||||||
|
w.Write($",\"target_kind\":{(int)m.Code.Target}");
|
||||||
w.Write($",\"receiver\":{m.Receiver}");
|
w.Write($",\"receiver\":{m.Receiver}");
|
||||||
w.Write($",\"content_id\":{m.ContentId}");
|
w.Write($",\"content_id\":{m.ContentId}");
|
||||||
w.Write($",\"sender\":{JsonString(m.SenderSource.TextValue)}");
|
w.Write($",\"sender\":{JsonString(SenderText(m))}");
|
||||||
w.Write($",\"content\":{JsonString(m.ContentSource.TextValue)}");
|
w.Write($",\"content\":{JsonString(ContentText(m))}");
|
||||||
w.Write("}");
|
w.Write("}");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -203,9 +284,9 @@ internal static class MessageExporter
|
|||||||
w.Write(',');
|
w.Write(',');
|
||||||
w.Write(CsvString(chatType.ToString()));
|
w.Write(CsvString(chatType.ToString()));
|
||||||
w.Write(',');
|
w.Write(',');
|
||||||
w.Write(CsvString(m.SenderSource.TextValue));
|
w.Write(CsvString(SenderText(m)));
|
||||||
w.Write(',');
|
w.Write(',');
|
||||||
w.Write(CsvString(m.ContentSource.TextValue));
|
w.Write(CsvString(ContentText(m)));
|
||||||
w.Write(',');
|
w.Write(',');
|
||||||
w.Write(m.Receiver);
|
w.Write(m.Receiver);
|
||||||
w.Write(',');
|
w.Write(',');
|
||||||
@@ -258,8 +339,17 @@ internal static class MessageExporter
|
|||||||
|
|
||||||
private static string CsvString(string s)
|
private static string CsvString(string s)
|
||||||
{
|
{
|
||||||
|
// Leading =, +, - and @ make a spreadsheet treat the cell as a formula.
|
||||||
|
// Every value here is text somebody else typed into a chat channel, and
|
||||||
|
// this file exists to be opened in Excel, so a prefixed apostrophe goes
|
||||||
|
// in front. It is the standard defence and it costs one character that
|
||||||
|
// spreadsheets hide.
|
||||||
|
if (s.Length > 0 && s[0] is '=' or '+' or '-' or '@' or '\t' or '\r')
|
||||||
|
s = "'" + s;
|
||||||
|
|
||||||
if (s.IndexOfAny(['"', ',', '\n', '\r']) < 0)
|
if (s.IndexOfAny(['"', ',', '\n', '\r']) < 0)
|
||||||
return s;
|
return s;
|
||||||
|
|
||||||
return "\"" + s.Replace("\"", "\"\"") + "\"";
|
return "\"" + s.Replace("\"", "\"\"") + "\"";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+423
-132
@@ -1,26 +1,110 @@
|
|||||||
using Dalamud;
|
using Dalamud;
|
||||||
using Dalamud.Bindings.ImGui;
|
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.Plugin;
|
||||||
|
using HellionChat.Themes;
|
||||||
|
using HellionChat.Ui.StyleEngine;
|
||||||
|
|
||||||
namespace HellionChat;
|
namespace HellionChat;
|
||||||
|
|
||||||
public class FontManager
|
// Two LogProxy sites live in static methods (TryGetBundledFontBytes,
|
||||||
|
// AddFontWithFallback); a ctor-injected ILogger would not be reachable
|
||||||
|
// from those scopes, so the class stays on Plugin.LogProxy.
|
||||||
|
//
|
||||||
|
// Hybrid handle model: Axis and AxisItalic mirror the game's current
|
||||||
|
// font state and are init-only. FontAwesome reuses Dalamud's UiBuilder
|
||||||
|
// fixed-width icon handle and is likewise init-only. RegularFont and
|
||||||
|
// ItalicFont depend on user-toggleable settings and get replaced live
|
||||||
|
// via RebuildDelegateFonts when those settings change; they stay as
|
||||||
|
// mutable nullable fields.
|
||||||
|
//
|
||||||
|
// The four atlas-owned handles register inside a single
|
||||||
|
// SuppressAutoRebuild block so the font atlas only rebuilds once for the
|
||||||
|
// whole plugin start instead of once per handle. FontAwesome lives
|
||||||
|
// outside that accounting because the UiBuilder already owns it.
|
||||||
|
public sealed class FontManager : IDisposable
|
||||||
{
|
{
|
||||||
internal IFontHandle Axis = null!;
|
private readonly IDalamudPluginInterface _pluginInterface;
|
||||||
internal IFontHandle AxisItalic = null!;
|
|
||||||
|
|
||||||
internal IFontHandle RegularFont = null!;
|
internal IFontHandle Axis { get; init; }
|
||||||
|
internal IFontHandle AxisItalic { get; init; }
|
||||||
|
internal IFontHandle FontAwesome { get; init; }
|
||||||
|
|
||||||
|
// Mutable because the live font settings replace these via
|
||||||
|
// RebuildDelegateFonts. Reference replacement is atomic for reference
|
||||||
|
// types, so push sites that read the field once per frame see at most
|
||||||
|
// one stale handle.
|
||||||
|
internal IFontHandle? RegularFont;
|
||||||
internal IFontHandle? ItalicFont;
|
internal IFontHandle? ItalicFont;
|
||||||
|
|
||||||
internal IFontHandle FontAwesome = null!;
|
// v1.13.0: one handle per type role that needs a face of its own. Sender
|
||||||
|
// carries extra weight, Meta a smaller size on a tiny glyph range.
|
||||||
|
internal IFontHandle? SenderFont;
|
||||||
|
internal IFontHandle? MetaFont;
|
||||||
|
|
||||||
|
// The mockup asks for weight 600 on the sender. There is no bold face in the
|
||||||
|
// plugin and none in the bundled file, so the weight comes from a denser
|
||||||
|
// rasterisation of the same outline. 1.0 is the SafeFontConfig default;
|
||||||
|
// below ~1.2 the difference is not visible, above ~1.4 the glyphs smear.
|
||||||
|
//
|
||||||
|
// Note on cost: all three delegate handles now carry the full glyph range.
|
||||||
|
// The meta face started with an ASCII-sized one, on the assumption it would
|
||||||
|
// only ever draw clocks and world names -- then the channel header wanted
|
||||||
|
// to use it, and tab names are free user input. An umlaut would have been
|
||||||
|
// enough to break it.
|
||||||
|
//
|
||||||
|
// Not const: the smoke test compares three values side by side, and the
|
||||||
|
// widget gallery exposes it.
|
||||||
|
internal static float SenderWeight = 1.3f;
|
||||||
|
|
||||||
|
// Wired post-build; a Func keeps FontManager off the theme layer.
|
||||||
|
private Func<ThemeTypography?>? _typographySource;
|
||||||
|
|
||||||
|
// Lets RebuildDelegateFontsIfChanged skip rebuilds when the size is unchanged.
|
||||||
|
private (
|
||||||
|
float Global,
|
||||||
|
float Symbols,
|
||||||
|
float Sender,
|
||||||
|
float Meta,
|
||||||
|
float Italic
|
||||||
|
) _lastBuiltFingerprint;
|
||||||
|
|
||||||
|
// True once every required atlas-owned handle reports Available. Components
|
||||||
|
// gate their first-frame draw on this — without it the layout math would
|
||||||
|
// run against placeholder font metrics and snap when the real atlas
|
||||||
|
// finishes building. ItalicFont being null means italics are disabled in
|
||||||
|
// config, which is a ready state, not a pending one.
|
||||||
|
public bool FontsReady =>
|
||||||
|
Axis.Available
|
||||||
|
&& AxisItalic.Available
|
||||||
|
&& FontAwesome.Available
|
||||||
|
&& RegularFont is { Available: true }
|
||||||
|
&& (ItalicFont is null || ItalicFont.Available)
|
||||||
|
// Unconditional, unlike ItalicFont: these two are always built. A handle
|
||||||
|
// that is not ready yet makes SimplePushedFont push nothing at all --
|
||||||
|
// silently -- so the first frame after a rebuild would measure the wrong
|
||||||
|
// face and write those heights into the row cache.
|
||||||
|
&& SenderFont is { Available: true }
|
||||||
|
&& MetaFont is { Available: true };
|
||||||
|
|
||||||
private ushort[] Ranges = [];
|
private ushort[] Ranges = [];
|
||||||
private ushort[] JpRange = [];
|
private ushort[] JpRange = [];
|
||||||
|
|
||||||
|
// Trimmed remainder the NotoSansCjk fallback is the sole source for
|
||||||
|
// (Hangul + full Han); excludes the Default/Latin block already merged
|
||||||
|
// by the global font, so the fallback no longer re-merges the full Ranges array.
|
||||||
|
private ushort[] CjkFallbackGlyphRange = [];
|
||||||
|
|
||||||
|
// Report accessor for the ctor self-test: built glyph-range array lengths so
|
||||||
|
// the step can show the dedup effect (a small trimmed fallback vs the large
|
||||||
|
// primary range) in its on-disk report instead of a bare Pass.
|
||||||
|
internal (int Ranges, int JpRange, int CjkFallback) GlyphRangeLengths =>
|
||||||
|
(Ranges.Length, JpRange.Length, CjkFallbackGlyphRange.Length);
|
||||||
|
|
||||||
public static readonly HashSet<float> AxisFontSizeList =
|
public static readonly HashSet<float> AxisFontSizeList =
|
||||||
[
|
[
|
||||||
9.6f,
|
9.6f,
|
||||||
@@ -41,38 +125,289 @@ public class FontManager
|
|||||||
90f,
|
90f,
|
||||||
];
|
];
|
||||||
|
|
||||||
// Hellion font bytes (Exo 2, OFL-1.1); lazily loaded from manifest resources
|
// Bundled UI font bytes (Inter Light, OFL-1.1); lazily loaded from manifest resources
|
||||||
private static byte[]? HellionFontBytes;
|
private static byte[]? BundledFontBytes;
|
||||||
|
|
||||||
// Returns null when the embedded font resource is missing. Should never
|
public FontManager(IDalamudPluginInterface pluginInterface)
|
||||||
// happen on a signed release build, but a broken csproj or hand-rolled
|
|
||||||
// dev build can land here. Caller falls back to the system font path so
|
|
||||||
// the plugin still loads instead of crashing the whole UiBuilder.
|
|
||||||
private static byte[]? TryGetHellionFontBytes()
|
|
||||||
{
|
{
|
||||||
if (HellionFontBytes is not null)
|
_pluginInterface = pluginInterface;
|
||||||
return HellionFontBytes;
|
SetUpRanges();
|
||||||
|
|
||||||
|
var atlas = _pluginInterface.UiBuilder.FontAtlas;
|
||||||
|
|
||||||
|
using (atlas.SuppressAutoRebuild())
|
||||||
|
{
|
||||||
|
Axis = atlas.NewGameFontHandle(
|
||||||
|
new GameFontStyle(GameFontFamily.Axis, SizeInPx(Plugin.Config.FontSizeV2))
|
||||||
|
);
|
||||||
|
|
||||||
|
AxisItalic = atlas.NewGameFontHandle(
|
||||||
|
new GameFontStyle(GameFontFamily.Axis, SizeInPx(Plugin.Config.FontSizeV2))
|
||||||
|
{
|
||||||
|
SkewStrength = SizeInPx(Plugin.Config.FontSizeV2) / 6,
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
FontAwesome = _pluginInterface.UiBuilder.IconFontFixedWidthHandle;
|
||||||
|
|
||||||
|
RegularFont = BuildRegularFontHandle(atlas);
|
||||||
|
|
||||||
|
if (Plugin.Config.ItalicEnabled)
|
||||||
|
ItalicFont = BuildItalicFontHandle(atlas);
|
||||||
|
|
||||||
|
SenderFont = BuildSenderFontHandle(atlas);
|
||||||
|
MetaFont = BuildMetaFontHandle(atlas);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Source is still null here, so this is the config-only baseline.
|
||||||
|
_lastBuiltFingerprint = EffectiveFontFingerprint();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Called from the settings save path when one of the font-related
|
||||||
|
// settings changed. Game fonts and FontAwesome stay untouched because
|
||||||
|
// none of those settings affect them.
|
||||||
|
//
|
||||||
|
// Thread model: the settings save path runs on the ImGui draw thread,
|
||||||
|
// same as every push site. The rebuild finishes synchronously before
|
||||||
|
// the next push reads the field in the same frame, so there is no
|
||||||
|
// cross-thread race on the handle reference.
|
||||||
|
public void RebuildDelegateFonts()
|
||||||
|
{
|
||||||
|
SetUpRanges();
|
||||||
|
|
||||||
|
var atlas = _pluginInterface.UiBuilder.FontAtlas;
|
||||||
|
|
||||||
|
// Without the suppression each handle triggers its own atlas rebuild.
|
||||||
|
// With two handles that was tolerable; with four it is four rebuilds for
|
||||||
|
// one size change.
|
||||||
|
using (atlas.SuppressAutoRebuild())
|
||||||
|
{
|
||||||
|
RegularFont?.Dispose();
|
||||||
|
RegularFont = BuildRegularFontHandle(atlas);
|
||||||
|
|
||||||
|
ItalicFont?.Dispose();
|
||||||
|
ItalicFont = Plugin.Config.ItalicEnabled ? BuildItalicFontHandle(atlas) : null;
|
||||||
|
|
||||||
|
SenderFont?.Dispose();
|
||||||
|
SenderFont = BuildSenderFontHandle(atlas);
|
||||||
|
|
||||||
|
MetaFont?.Dispose();
|
||||||
|
MetaFont = BuildMetaFontHandle(atlas);
|
||||||
|
}
|
||||||
|
|
||||||
|
_lastBuiltFingerprint = EffectiveFontFingerprint();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetTypographySource(Func<ThemeTypography?> source) => _typographySource = source;
|
||||||
|
|
||||||
|
internal float ResolveGlobalFontPt() =>
|
||||||
|
FontSizeResolver.ResolveGlobalPt(
|
||||||
|
_typographySource?.Invoke(),
|
||||||
|
Plugin.Config.UseHellionFont,
|
||||||
|
Plugin.Config.FontSizeV2,
|
||||||
|
Plugin.Config.GlobalFontV2.SizePt
|
||||||
|
);
|
||||||
|
|
||||||
|
internal float ResolveSymbolsFontPt() =>
|
||||||
|
FontSizeResolver.ResolveSymbolsPt(
|
||||||
|
_typographySource?.Invoke(),
|
||||||
|
Plugin.Config.SymbolsFontSizeV2
|
||||||
|
);
|
||||||
|
|
||||||
|
// Every size that can land in one message row. Roles follow the base size
|
||||||
|
// arithmetically, but the resolved value is what the height cache has to key
|
||||||
|
// on -- a theme override moves the base without moving any factor.
|
||||||
|
internal (
|
||||||
|
float Global,
|
||||||
|
float Symbols,
|
||||||
|
float Sender,
|
||||||
|
float Meta,
|
||||||
|
float Italic
|
||||||
|
) EffectiveFontFingerprint()
|
||||||
|
{
|
||||||
|
var basePt = ResolveGlobalFontPt();
|
||||||
|
return (
|
||||||
|
basePt,
|
||||||
|
ResolveSymbolsFontPt(),
|
||||||
|
TypeScale.SizePtOf(TypeRole.Sender, basePt),
|
||||||
|
TypeScale.SizePtOf(TypeRole.Meta, basePt),
|
||||||
|
Plugin.Config.ItalicFontV2.SizePt
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Rebuilds only when the effective size changed (live fingerprint, TOCTOU-free).
|
||||||
|
// The atlas rebuild must run on the framework/draw thread — callers ensure that.
|
||||||
|
internal void RebuildDelegateFontsIfChanged()
|
||||||
|
{
|
||||||
|
if (EffectiveFontFingerprint() != _lastBuiltFingerprint)
|
||||||
|
{
|
||||||
|
RebuildDelegateFonts();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Instance method so Ranges / JpRange are reachable without parameter
|
||||||
|
// plumbing; PascalCase field names follow the existing class style.
|
||||||
|
// Shared CJK + symbols tail for both the regular and italic delegate
|
||||||
|
// fonts. Earlier-merged fonts win for shared codepoints (imgui MergeMode),
|
||||||
|
// so this runs AFTER the primary font is set as config.MergeFont. The CJK
|
||||||
|
// fallback is the sole Hangul/Simplified-Han source when UseHellionFont=true
|
||||||
|
// (global=Inter-Light), so it stays in the chain — only its glyph range is
|
||||||
|
// trimmed (CjkFallbackGlyphRange) to drop the Default-block/endonym overlap.
|
||||||
|
// The Japanese merge keeps its own configured size and the full JpRange (which
|
||||||
|
// owns Traditional Han such as 體 U+9AD4), so japanese↔fallback no longer overlap.
|
||||||
|
private void AddCjkAndSymbols(
|
||||||
|
IFontAtlasBuildToolkitPreBuild tk,
|
||||||
|
SafeFontConfig config,
|
||||||
|
float basePt
|
||||||
|
)
|
||||||
|
{
|
||||||
|
config.SizePt = Plugin.Config.JapaneseFontV2.SizePt;
|
||||||
|
config.GlyphRanges = JpRange;
|
||||||
|
AddFontWithFallback(tk, Plugin.Config.JapaneseFontV2.FontId, config, "japanese");
|
||||||
|
|
||||||
|
// NotoSansCjk fallback, trimmed to CjkFallbackGlyphRange. Merged last so earlier fonts win.
|
||||||
|
config.SizePt = basePt;
|
||||||
|
config.GlyphRanges = CjkFallbackGlyphRange;
|
||||||
|
AddFontWithFallback(
|
||||||
|
tk,
|
||||||
|
new DalamudAssetFontAndFamilyId(DalamudAsset.NotoSansCjkRegular),
|
||||||
|
config,
|
||||||
|
"noto-cjk-fallback"
|
||||||
|
);
|
||||||
|
|
||||||
|
config.SizePt = ResolveSymbolsFontPt();
|
||||||
|
tk.AddGameSymbol(config);
|
||||||
|
}
|
||||||
|
|
||||||
|
private IFontHandle BuildRegularFontHandle(IFontAtlas atlas) =>
|
||||||
|
atlas.NewDelegateFontHandle(e =>
|
||||||
|
e.OnPreBuild(tk =>
|
||||||
|
{
|
||||||
|
var basePt = ResolveGlobalFontPt();
|
||||||
|
var config = new SafeFontConfig { SizePt = basePt, GlyphRanges = Ranges };
|
||||||
|
// Missing embedded resource falls back to the configured
|
||||||
|
// system font instead of taking the whole UiBuilder down.
|
||||||
|
var bundledBytes = Plugin.Config.UseHellionFont ? TryGetBundledFontBytes() : null;
|
||||||
|
config.MergeFont = bundledBytes is not null
|
||||||
|
? tk.AddFontFromMemory(bundledBytes, config, "Inter-Light")
|
||||||
|
: AddFontWithFallback(tk, Plugin.Config.GlobalFontV2.FontId, config, "global");
|
||||||
|
|
||||||
|
AddCjkAndSymbols(tk, config, basePt);
|
||||||
|
|
||||||
|
tk.Font = config.MergeFont;
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
// Same outline as the body face, rasterised denser. Only works on the
|
||||||
|
// delegate path: with FontsEnabled and UseHellionFont both off the game's own
|
||||||
|
// Axis handle draws, and a game font handle has no such knob. The sender then
|
||||||
|
// leans on channel colour alone, which is a deliberate limitation.
|
||||||
|
private IFontHandle BuildSenderFontHandle(IFontAtlas atlas) =>
|
||||||
|
atlas.NewDelegateFontHandle(e =>
|
||||||
|
e.OnPreBuild(tk =>
|
||||||
|
{
|
||||||
|
var basePt = TypeScale.SizePtOf(TypeRole.Sender, ResolveGlobalFontPt());
|
||||||
|
var config = new SafeFontConfig
|
||||||
|
{
|
||||||
|
SizePt = basePt,
|
||||||
|
GlyphRanges = Ranges,
|
||||||
|
RasterizerMultiply = SenderWeight,
|
||||||
|
};
|
||||||
|
var bundledBytes = Plugin.Config.UseHellionFont ? TryGetBundledFontBytes() : null;
|
||||||
|
config.MergeFont = bundledBytes is not null
|
||||||
|
? tk.AddFontFromMemory(bundledBytes, config, "Inter-Light-Sender")
|
||||||
|
: AddFontWithFallback(tk, Plugin.Config.GlobalFontV2.FontId, config, "sender");
|
||||||
|
|
||||||
|
AddCjkAndSymbols(tk, config, basePt);
|
||||||
|
|
||||||
|
tk.Font = config.MergeFont;
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
private IFontHandle BuildMetaFontHandle(IFontAtlas atlas) =>
|
||||||
|
atlas.NewDelegateFontHandle(e =>
|
||||||
|
e.OnPreBuild(tk =>
|
||||||
|
{
|
||||||
|
var basePt = TypeScale.SizePtOf(TypeRole.Meta, ResolveGlobalFontPt());
|
||||||
|
var config = new SafeFontConfig { SizePt = basePt, GlyphRanges = Ranges };
|
||||||
|
var bundledBytes = Plugin.Config.UseHellionFont ? TryGetBundledFontBytes() : null;
|
||||||
|
config.MergeFont = bundledBytes is not null
|
||||||
|
? tk.AddFontFromMemory(bundledBytes, config, "Inter-Light-Meta")
|
||||||
|
: AddFontWithFallback(tk, Plugin.Config.GlobalFontV2.FontId, config, "meta");
|
||||||
|
|
||||||
|
AddCjkAndSymbols(tk, config, basePt);
|
||||||
|
|
||||||
|
tk.Font = config.MergeFont;
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
private IFontHandle BuildItalicFontHandle(IFontAtlas atlas) =>
|
||||||
|
atlas.NewDelegateFontHandle(e =>
|
||||||
|
e.OnPreBuild(tk =>
|
||||||
|
{
|
||||||
|
var config = new SafeFontConfig
|
||||||
|
{
|
||||||
|
SizePt = Plugin.Config.ItalicFontV2.SizePt,
|
||||||
|
GlyphRanges = Ranges,
|
||||||
|
};
|
||||||
|
config.MergeFont = AddFontWithFallback(
|
||||||
|
tk,
|
||||||
|
Plugin.Config.ItalicFontV2.FontId,
|
||||||
|
config,
|
||||||
|
"italic"
|
||||||
|
);
|
||||||
|
|
||||||
|
AddCjkAndSymbols(tk, config, Plugin.Config.ItalicFontV2.SizePt);
|
||||||
|
|
||||||
|
tk.Font = config.MergeFont;
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
Axis.Dispose();
|
||||||
|
AxisItalic.Dispose();
|
||||||
|
// FontAwesome is shared with the UiBuilder; the host owns its
|
||||||
|
// lifetime, so the plugin must not dispose it.
|
||||||
|
RegularFont?.Dispose();
|
||||||
|
ItalicFont?.Dispose();
|
||||||
|
SenderFont?.Dispose();
|
||||||
|
MetaFont?.Dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Returns null when the embedded font resource is missing. Should not
|
||||||
|
// happen on a signed release build, but a broken csproj or hand-rolled
|
||||||
|
// dev build can land here. Caller falls back to the system font path
|
||||||
|
// so the plugin still loads instead of crashing the whole UiBuilder.
|
||||||
|
private static byte[]? TryGetBundledFontBytes()
|
||||||
|
{
|
||||||
|
if (BundledFontBytes is not null)
|
||||||
|
return BundledFontBytes;
|
||||||
|
|
||||||
using var stream = typeof(FontManager).Assembly.GetManifestResourceStream(
|
using var stream = typeof(FontManager).Assembly.GetManifestResourceStream(
|
||||||
"HellionFont.ttf"
|
"Inter-Light.ttf"
|
||||||
);
|
);
|
||||||
if (stream is null)
|
if (stream is null)
|
||||||
{
|
{
|
||||||
Plugin.LogProxy.Warning(
|
Plugin.LogProxy.Warning(
|
||||||
"Hellion font resource missing — falling back to system default font."
|
"Bundled Inter Light font resource missing, falling back to system default font."
|
||||||
);
|
);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
using var ms = new MemoryStream();
|
using var ms = new MemoryStream();
|
||||||
stream.CopyTo(ms);
|
stream.CopyTo(ms);
|
||||||
HellionFontBytes = ms.ToArray();
|
BundledFontBytes = ms.ToArray();
|
||||||
return HellionFontBytes;
|
return BundledFontBytes;
|
||||||
}
|
}
|
||||||
|
|
||||||
private unsafe void SetUpRanges()
|
private unsafe void SetUpRanges()
|
||||||
{
|
{
|
||||||
ushort[] BuildRange(IReadOnlyList<ushort>? chars, params nint[] ranges)
|
ushort[] BuildRange(
|
||||||
|
IReadOnlyList<ushort>? chars,
|
||||||
|
bool includeCommonExtras,
|
||||||
|
params nint[] ranges
|
||||||
|
)
|
||||||
{
|
{
|
||||||
var builder = new ImFontGlyphRangesBuilderPtr(ImGuiNative.ImFontGlyphRangesBuilder());
|
var builder = new ImFontGlyphRangesBuilderPtr(ImGuiNative.ImFontGlyphRangesBuilder());
|
||||||
foreach (var range in ranges)
|
foreach (var range in ranges)
|
||||||
@@ -90,127 +425,83 @@ public class FontManager
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ingame supported ranges
|
// Common extras (Axis ingame glyphs, endonyms, enclosed alphanumerics)
|
||||||
var reader = new FdtReader(Plugin.DataManager.GetFile("common/font/axis_12.fdt")!.Data);
|
// belong to the primary/Japanese ranges only. The trimmed CJK fallback
|
||||||
foreach (var c in reader.Glyphs)
|
// skips them so it stays a pure Hangul/Simplified-Han remainder and
|
||||||
builder.AddChar(c.Char);
|
// does not re-merge the Default-block work the global font already did.
|
||||||
|
if (includeCommonExtras)
|
||||||
|
{
|
||||||
|
// Ingame supported ranges
|
||||||
|
var reader = new FdtReader(
|
||||||
|
Plugin.DataManager.GetFile("common/font/axis_12.fdt")!.Data
|
||||||
|
);
|
||||||
|
foreach (var c in reader.Glyphs)
|
||||||
|
builder.AddChar(c.Char);
|
||||||
|
|
||||||
// various symbols
|
// French
|
||||||
// French
|
// Romanian
|
||||||
// Romanian
|
builder.AddText("Œœ");
|
||||||
// builder.AddText("←→↑↓《》■※☀★★☆♥♡ヅツッシ☀☁☂℃℉°♀♂♠♣♦♣♧®©™€$£♯♭♪✓√◎◆◇♦■□〇●△▽▼▲‹›≤≥<«“”─\~");
|
builder.AddText("ĂăÂâÎîȘșȚț");
|
||||||
builder.AddText("Œœ");
|
|
||||||
builder.AddText("ĂăÂâÎîȘșȚț");
|
|
||||||
|
|
||||||
// "Enclosed Alphanumerics" (partial) https://www.compart.com/en/unicode/block/U+2460
|
// v1.5.3: language-dropdown endonyms. The dropdown renders
|
||||||
for (var i = 0x2460; i <= 0x24B5; i++)
|
// with the currently active font range; without these glyphs
|
||||||
builder.AddChar((char)i);
|
// a user on an English UI cannot read non-Latin language names
|
||||||
|
// before switching. Auto-activation in Settings.Apply then
|
||||||
|
// pulls in the full ExtraGlyphRange for the chosen locale.
|
||||||
|
builder.AddText(
|
||||||
|
"Català Čeština Dansk Deutsch Ελληνικά English Español Suomi"
|
||||||
|
+ " Français Magyar Italiano 日本語 한국어 Norsk bokmål Nederlands"
|
||||||
|
+ " Polski Português Brasil (Portugal) Română Русский Svenska"
|
||||||
|
+ " Türkçe Українська 简体中文 繁體中文"
|
||||||
|
);
|
||||||
|
|
||||||
|
// "Enclosed Alphanumerics" (partial) https://www.compart.com/en/unicode/block/U+2460
|
||||||
|
for (var i = 0x2460; i <= 0x24B5; i++)
|
||||||
|
builder.AddChar((char)i);
|
||||||
|
|
||||||
|
builder.AddChar('⓪');
|
||||||
|
}
|
||||||
|
|
||||||
builder.AddChar('⓪');
|
|
||||||
return builder.BuildRangesToArray();
|
return builder.BuildRangesToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
var ranges = new List<nint> { (nint)ImGui.GetIO().Fonts.GetGlyphRangesDefault() };
|
var ranges = new List<nint> { (nint)ImGui.GetIO().Fonts.GetGlyphRangesDefault() };
|
||||||
|
var customChars = new List<ushort>();
|
||||||
foreach (var extraRange in Enum.GetValues<ExtraGlyphRanges>())
|
foreach (var extraRange in Enum.GetValues<ExtraGlyphRanges>())
|
||||||
if (Plugin.Config.ExtraGlyphRanges.HasFlag(extraRange))
|
{
|
||||||
ranges.Add(extraRange.Range());
|
if (!Plugin.Config.ExtraGlyphRanges.HasFlag(extraRange))
|
||||||
|
continue;
|
||||||
|
|
||||||
Ranges = BuildRange(null, ranges.ToArray());
|
// LatinExtended and Greek use AddChar pairs because they have no
|
||||||
JpRange = BuildRange(GlyphRangesJapanese.GlyphRanges);
|
// built-in ImGui range helper; everything else points to a native
|
||||||
}
|
// ImGui glyph-range table.
|
||||||
|
switch (extraRange)
|
||||||
// CPU-bound build offloaded to Task.Run; runs parallel with theme init
|
|
||||||
public async Task BuildFontsAsync(CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
|
||||||
await Task.Run(BuildFonts, cancellationToken).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void BuildFonts()
|
|
||||||
{
|
|
||||||
SetUpRanges();
|
|
||||||
|
|
||||||
Axis = Plugin.Interface.UiBuilder.FontAtlas.NewGameFontHandle(
|
|
||||||
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,
|
case ExtraGlyphRanges.LatinExtended:
|
||||||
|
customChars.AddRange(ExtraGlyphRangesExt.LatinExtendedPairs);
|
||||||
|
break;
|
||||||
|
case ExtraGlyphRanges.Greek:
|
||||||
|
customChars.AddRange(ExtraGlyphRangesExt.GreekPairs);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
var ptr = extraRange.Range();
|
||||||
|
if (ptr != 0)
|
||||||
|
ranges.Add(ptr);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
);
|
|
||||||
|
|
||||||
FontAwesome = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
|
|
||||||
{
|
|
||||||
e.OnPreBuild(tk =>
|
|
||||||
tk.AddFontAwesomeIconFont(new SafeFontConfig { SizePx = GetFontSize() })
|
|
||||||
);
|
|
||||||
e.OnPostBuild(tk => tk.FitRatio(tk.Font));
|
|
||||||
});
|
|
||||||
|
|
||||||
RegularFont = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
|
|
||||||
e.OnPreBuild(tk =>
|
|
||||||
{
|
|
||||||
// v1.2.0: UseHellionFont controls font size selection
|
|
||||||
var basePt = Plugin.Config.UseHellionFont
|
|
||||||
? Plugin.Config.FontSizeV2
|
|
||||||
: Plugin.Config.GlobalFontV2.SizePt;
|
|
||||||
var config = new SafeFontConfig { SizePt = basePt, GlyphRanges = Ranges };
|
|
||||||
// F10.2: if the embedded font is missing, drop to the system font
|
|
||||||
// path rather than letting the UiBuilder throw.
|
|
||||||
var hellionBytes = Plugin.Config.UseHellionFont ? TryGetHellionFontBytes() : null;
|
|
||||||
config.MergeFont = hellionBytes is not null
|
|
||||||
? tk.AddFontFromMemory(hellionBytes, config, "Hellion-Exo2")
|
|
||||||
: AddFontWithFallback(tk, Plugin.Config.GlobalFontV2.FontId, config, "global");
|
|
||||||
|
|
||||||
config.SizePt = Plugin.Config.JapaneseFontV2.SizePt;
|
|
||||||
config.GlyphRanges = JpRange;
|
|
||||||
AddFontWithFallback(tk, Plugin.Config.JapaneseFontV2.FontId, config, "japanese");
|
|
||||||
|
|
||||||
config.SizePt = Plugin.Config.SymbolsFontSizeV2;
|
|
||||||
tk.AddGameSymbol(config);
|
|
||||||
|
|
||||||
tk.Font = config.MergeFont;
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
if (Plugin.Config.ItalicEnabled)
|
|
||||||
{
|
|
||||||
ItalicFont = Plugin.Interface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
|
|
||||||
e.OnPreBuild(tk =>
|
|
||||||
{
|
|
||||||
var config = new SafeFontConfig
|
|
||||||
{
|
|
||||||
SizePt = Plugin.Config.ItalicFontV2.SizePt,
|
|
||||||
GlyphRanges = Ranges,
|
|
||||||
};
|
|
||||||
config.MergeFont = AddFontWithFallback(
|
|
||||||
tk,
|
|
||||||
Plugin.Config.ItalicFontV2.FontId,
|
|
||||||
config,
|
|
||||||
"italic"
|
|
||||||
);
|
|
||||||
|
|
||||||
config.SizePt = Plugin.Config.JapaneseFontV2.SizePt;
|
|
||||||
config.GlyphRanges = JpRange;
|
|
||||||
AddFontWithFallback(
|
|
||||||
tk,
|
|
||||||
Plugin.Config.JapaneseFontV2.FontId,
|
|
||||||
config,
|
|
||||||
"japanese"
|
|
||||||
);
|
|
||||||
|
|
||||||
config.SizePt = Plugin.Config.SymbolsFontSizeV2;
|
|
||||||
tk.AddGameSymbol(config);
|
|
||||||
|
|
||||||
tk.Font = config.MergeFont;
|
|
||||||
})
|
|
||||||
);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ItalicFont = null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Ranges = BuildRange(
|
||||||
|
customChars.Count > 0 ? customChars : null,
|
||||||
|
includeCommonExtras: true,
|
||||||
|
ranges.ToArray()
|
||||||
|
);
|
||||||
|
JpRange = BuildRange(GlyphRangesJapanese.GlyphRanges, includeCommonExtras: true);
|
||||||
|
|
||||||
|
// The fallback gets only the trimmed Hangul/Simplified-Han remainder.
|
||||||
|
// No Default block, no endonyms — those are already merged by the global and
|
||||||
|
// Japanese fonts, so re-merging them on the fallback was wasted atlas work.
|
||||||
|
CjkFallbackGlyphRange = BuildRange(CjkFallbackRange.Pairs, includeCommonExtras: false);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add font with fallback to NotoSansCjkRegular if unavailable
|
// Add font with fallback to NotoSansCjkRegular if unavailable
|
||||||
@@ -234,9 +525,9 @@ public class FontManager
|
|||||||
or ArgumentException
|
or ArgumentException
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
// Atlas-toolkit throws span IO and validation failures; routing the
|
// Atlas-toolkit throws span IO and validation failures; routing
|
||||||
// wider set through the fallback keeps a corrupt font config from
|
// the wider set through the fallback keeps a corrupt font config
|
||||||
// taking down the whole atlas build.
|
// from taking down the whole atlas build.
|
||||||
Plugin.LogProxy.Warning(
|
Plugin.LogProxy.Warning(
|
||||||
e,
|
e,
|
||||||
$"Configured {slot} font failed to load ({e.GetType().Name}), "
|
$"Configured {slot} font failed to load ({e.GetType().Name}), "
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
using HellionChat.Themes;
|
||||||
|
|
||||||
|
namespace HellionChat;
|
||||||
|
|
||||||
|
// Pure size resolution, split out of FontManager so it is unit-testable without
|
||||||
|
// building the font atlas. A typography override wins; null falls back to config.
|
||||||
|
internal static class FontSizeResolver
|
||||||
|
{
|
||||||
|
internal static float ResolveGlobalPt(
|
||||||
|
ThemeTypography? typography,
|
||||||
|
bool useHellionFont,
|
||||||
|
float fontSizeV2,
|
||||||
|
float globalSizePt
|
||||||
|
) => typography?.OverrideGlobalFontSizePt ?? (useHellionFont ? fontSizeV2 : globalSizePt);
|
||||||
|
|
||||||
|
internal static float ResolveSymbolsPt(ThemeTypography? typography, float symbolsSizePt) =>
|
||||||
|
typography?.OverrideSymbolsFontSizePt ?? symbolsSizePt;
|
||||||
|
}
|
||||||
@@ -19,6 +19,7 @@ using HellionChat.Resources;
|
|||||||
using HellionChat.Util;
|
using HellionChat.Util;
|
||||||
using InteropGenerator.Runtime;
|
using InteropGenerator.Runtime;
|
||||||
using Lumina.Text.ReadOnly;
|
using Lumina.Text.ReadOnly;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.AtkValueType;
|
using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.AtkValueType;
|
||||||
|
|
||||||
namespace HellionChat.GameFunctions;
|
namespace HellionChat.GameFunctions;
|
||||||
@@ -98,9 +99,12 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
private long LastPlayerNameDisplayTypeRefresh;
|
private long LastPlayerNameDisplayTypeRefresh;
|
||||||
private PlayerNameDisplayType CurrentPlayerNameDisplayType = PlayerNameDisplayType.FullName;
|
private PlayerNameDisplayType CurrentPlayerNameDisplayType = PlayerNameDisplayType.FullName;
|
||||||
|
|
||||||
public Chat(Plugin plugin)
|
private readonly ILogger<Chat> _logger;
|
||||||
|
|
||||||
|
public Chat(Plugin plugin, ILogger<Chat> logger)
|
||||||
{
|
{
|
||||||
Plugin = plugin;
|
Plugin = plugin;
|
||||||
|
_logger = logger;
|
||||||
Plugin.GameInteropProvider.InitializeFromAttributes(this);
|
Plugin.GameInteropProvider.InitializeFromAttributes(this);
|
||||||
|
|
||||||
ChatLogRefreshHook?.Enable();
|
ChatLogRefreshHook?.Enable();
|
||||||
@@ -228,15 +232,13 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
if (c != '\0' && !char.IsControl(c))
|
if (c != '\0' && !char.IsControl(c))
|
||||||
input = c.ToString();
|
input = c.ToString();
|
||||||
|
|
||||||
try
|
// Seed the just-typed character into our input field and focus it, the
|
||||||
|
// same InputBar.AppendPending + Activate prefill path inventory item-links
|
||||||
|
// use. Prefill only, deliberately: no tab switch.
|
||||||
|
if (input != null)
|
||||||
{
|
{
|
||||||
Plugin.ChatLogWindow.Activated(
|
Plugin.InputBar.AppendPending(input);
|
||||||
new ChatActivatedArgs(new ChannelSwitchInfo(null)) { Input = input }
|
Plugin.InputBar.Activate = true;
|
||||||
);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Plugin.LogProxy.Error(ex, "Error in chat Activated event");
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -251,22 +253,12 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
addIfNotPresent = add;
|
addIfNotPresent = add;
|
||||||
}
|
}
|
||||||
|
|
||||||
try
|
// Route the addIfNotPresent token into the InputBar so inventory
|
||||||
|
// right-click "Link item" reaches our input field instead of being lost.
|
||||||
|
if (addIfNotPresent != null && !Plugin.InputBar.PendingMessage.Contains(addIfNotPresent))
|
||||||
{
|
{
|
||||||
// Prevent duplicate calls
|
Plugin.InputBar.AppendPending(addIfNotPresent);
|
||||||
if (Plugin.ChatLogWindow.TellSpecial)
|
Plugin.InputBar.Activate = true;
|
||||||
return ChatLogRefreshHook!.Original(log, eventId, value);
|
|
||||||
|
|
||||||
Plugin.ChatLogWindow.Activated(
|
|
||||||
new ChatActivatedArgs(new ChannelSwitchInfo(null))
|
|
||||||
{
|
|
||||||
AddIfNotPresent = addIfNotPresent,
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Plugin.LogProxy.Error(ex, "Error in chat Activated event");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 1; // Prevent vanilla chat log from gaining focus
|
return 1; // Prevent vanilla chat log from gaining focus
|
||||||
@@ -299,7 +291,7 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
{
|
{
|
||||||
playerName = SeString.Parse(agent->TellPlayerName).TextValue;
|
playerName = SeString.Parse(agent->TellPlayerName).TextValue;
|
||||||
worldId = agent->TellWorldId;
|
worldId = agent->TellWorldId;
|
||||||
Plugin.LogProxy.Debug($"Detected tell target '[redacted]'@{worldId}");
|
_logger.LogDebug($"Detected tell target '[redacted]'@{worldId}");
|
||||||
}
|
}
|
||||||
|
|
||||||
Plugin.CurrentTab.CurrentChannel = new UsedChannel
|
Plugin.CurrentTab.CurrentChannel = new UsedChannel
|
||||||
@@ -325,6 +317,30 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
ReplyInSelectedChatModeHook!.Original(agent);
|
ReplyInSelectedChatModeHook!.Original(agent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Pure /tell-prefill command builder, shared by the two native SetTellTarget
|
||||||
|
// detours and the PayloadHandler Send-Tell payload. Empty/null world drops the
|
||||||
|
// @World suffix (matches the old IsNullOrEmpty guard); trailing space lets the
|
||||||
|
// user type straight after. internal static so the Build-Suite can pin it
|
||||||
|
// frame-free. TEST-MIRROR: ../../../Hellion Build test/GameFunctions/PrefillTellCommandTests.cs
|
||||||
|
internal static string BuildTellCommand(string name, string? world)
|
||||||
|
{
|
||||||
|
var command = $"/tell {name}";
|
||||||
|
if (!string.IsNullOrEmpty(world))
|
||||||
|
command += $"@{world}";
|
||||||
|
command += " ";
|
||||||
|
return command;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Prefills + focuses our own input bar with a /tell command. The DI/Dalamud
|
||||||
|
// plumbing (Plugin.InputBar) lives here; the string assembly is BuildTellCommand.
|
||||||
|
// The in-foray TellSpecial routing (SetEurekaTellChannel) is NOT this helper's
|
||||||
|
// job — it stays at the call-site (v1.8.1 deferral).
|
||||||
|
private void PrefillTellInput(string name, string? world)
|
||||||
|
{
|
||||||
|
Plugin.InputBar.SetPendingMessage(BuildTellCommand(name, world));
|
||||||
|
Plugin.InputBar.Activate = true;
|
||||||
|
}
|
||||||
|
|
||||||
private bool SetContextTellTarget(
|
private bool SetContextTellTarget(
|
||||||
RaptureShellModule* a1,
|
RaptureShellModule* a1,
|
||||||
Utf8String* playerName,
|
Utf8String* playerName,
|
||||||
@@ -338,28 +354,14 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
{
|
{
|
||||||
if (playerName != null)
|
if (playerName != null)
|
||||||
{
|
{
|
||||||
try
|
// Right-click -> Send Tell: prefill our input the same way our own
|
||||||
{
|
// "Send Tell" payload menu does (PayloadHandler), then focus. Prefill
|
||||||
var target = new TellTarget(
|
// only, deliberately: no tab switch, no ChatActivatedArgs revival.
|
||||||
playerName->ToString(),
|
// The game supplies worldName here, so no sheet lookup.
|
||||||
worldId,
|
PrefillTellInput(
|
||||||
contentId,
|
playerName->ToString(),
|
||||||
(TellReason)reason
|
worldName != null ? worldName->ToString() : null
|
||||||
);
|
);
|
||||||
Plugin.ChatLogWindow.Activated(
|
|
||||||
new ChatActivatedArgs(
|
|
||||||
new ChannelSwitchInfo(InputChannel.Tell, permanent: setChatType)
|
|
||||||
)
|
|
||||||
{
|
|
||||||
TellReason = (TellReason)reason,
|
|
||||||
TellTarget = target,
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Plugin.LogProxy.Error(ex, "Error in chat Activated event");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return SetChatLogTellTargetHook!.Original(
|
return SetChatLogTellTargetHook!.Original(
|
||||||
@@ -389,27 +391,13 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
|
|
||||||
if (playerName != null)
|
if (playerName != null)
|
||||||
{
|
{
|
||||||
try
|
// In-foray right-click -> Send Tell: same prefill path as the non-foray
|
||||||
{
|
// tell. The foray-specific TellSpecial channel routing stays deferred
|
||||||
var target = new TellTarget(
|
// (v1.8.1, SetEurekaTellChannel) -- prefill only here as well.
|
||||||
playerName->ToString(),
|
PrefillTellInput(
|
||||||
worldId,
|
playerName->ToString(),
|
||||||
contentId,
|
worldName != null ? worldName->ToString() : null
|
||||||
(TellReason)reason
|
);
|
||||||
);
|
|
||||||
Plugin.ChatLogWindow.Activated(
|
|
||||||
new ChatActivatedArgs(new ChannelSwitchInfo(InputChannel.Tell))
|
|
||||||
{
|
|
||||||
TellReason = (TellReason)reason,
|
|
||||||
TellTarget = target,
|
|
||||||
TellSpecial = Sheets.IsInForay(), // Handle Eureka/Bozja special
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Plugin.LogProxy.Error(ex, "Error in chat Activated event");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ContextMenuTellInForayHook!.Original(
|
ContextMenuTellInForayHook!.Original(
|
||||||
@@ -463,6 +451,17 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
uint currentIndex,
|
uint currentIndex,
|
||||||
RotateMode rotate,
|
RotateMode rotate,
|
||||||
Func<uint, bool> validFn
|
Func<uint, bool> validFn
|
||||||
|
) => RotateLinkshellIndex(currentIndex, rotate, validFn);
|
||||||
|
|
||||||
|
// Pure index-stepper (Dalamud-free): wrap (8 + currentIndex + delta) % 8 and return the
|
||||||
|
// first index validFn accepts within 8 iterations, else null. Extracted so the
|
||||||
|
// modulo/termination logic is unit-testable with a synthetic predicate; the
|
||||||
|
// production caller binds validFn to InfoProxyLinkshell (in-game only).
|
||||||
|
// TEST-MIRROR: ../../../Hellion Build test/_Helpers/RotateLinkshellIndexTests.cs
|
||||||
|
internal static uint? RotateLinkshellIndex(
|
||||||
|
uint currentIndex,
|
||||||
|
RotateMode rotate,
|
||||||
|
Func<uint, bool> validFn
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
if (rotate == RotateMode.None)
|
if (rotate == RotateMode.None)
|
||||||
@@ -566,9 +565,8 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
if (!Plugin.CurrentTab.CurrentChannel.UseTempChannel)
|
if (!Plugin.CurrentTab.CurrentChannel.UseTempChannel)
|
||||||
Plugin.CurrentTab.CurrentChannel.UseTempChannel = true;
|
Plugin.CurrentTab.CurrentChannel.UseTempChannel = true;
|
||||||
|
|
||||||
// Send tell via CommandInner later and let the game handle it
|
// Send tell via CommandInner later and let the game handle it.
|
||||||
// Only works because we use the SetTellTargetInForay function to set all required information
|
// TellSpecial gate is offline until the new chat layer reads it.
|
||||||
Plugin.ChatLogWindow.TellSpecial = true;
|
|
||||||
|
|
||||||
var utfName = Utf8String.FromString(name);
|
var utfName = Utf8String.FromString(name);
|
||||||
var utfWorld = Utf8String.FromString(worldName);
|
var utfWorld = Utf8String.FromString(worldName);
|
||||||
@@ -624,7 +622,7 @@ internal sealed unsafe class Chat : IDisposable
|
|||||||
if (contentId == 0)
|
if (contentId == 0)
|
||||||
{
|
{
|
||||||
Plugin.ChatGui.PrintError(Language.Chat_SendTell_Error);
|
Plugin.ChatGui.PrintError(Language.Chat_SendTell_Error);
|
||||||
Plugin.LogProxy.Warning(
|
_logger.LogWarning(
|
||||||
"Tried to send a tell with ContentId being 0, sorry this is an internal error."
|
"Tried to send a tell with ContentId being 0, sorry this is an internal error."
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ using FFXIVClientStructs.FFXIV.Client.UI.Info;
|
|||||||
using FFXIVClientStructs.FFXIV.Component.GUI;
|
using FFXIVClientStructs.FFXIV.Component.GUI;
|
||||||
using Lumina.Excel;
|
using Lumina.Excel;
|
||||||
using Lumina.Excel.Sheets;
|
using Lumina.Excel.Sheets;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.AtkValueType;
|
using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.AtkValueType;
|
||||||
|
|
||||||
namespace HellionChat.GameFunctions;
|
namespace HellionChat.GameFunctions;
|
||||||
@@ -37,14 +38,20 @@ internal unsafe class GameFunctions : IDisposable
|
|||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
private Plugin Plugin { get; }
|
private Plugin Plugin { get; }
|
||||||
|
private readonly ILogger<GameFunctions> _logger;
|
||||||
internal KeybindManager KeybindManager { get; }
|
internal KeybindManager KeybindManager { get; }
|
||||||
internal Chat Chat { get; }
|
internal Chat Chat { get; }
|
||||||
|
|
||||||
internal GameFunctions(Plugin plugin)
|
internal GameFunctions(
|
||||||
|
Plugin plugin,
|
||||||
|
ILogger<GameFunctions> logger,
|
||||||
|
ILoggerFactory loggerFactory
|
||||||
|
)
|
||||||
{
|
{
|
||||||
Plugin = plugin;
|
Plugin = plugin;
|
||||||
KeybindManager = new KeybindManager(plugin);
|
_logger = logger;
|
||||||
Chat = new Chat(Plugin);
|
KeybindManager = new KeybindManager(plugin, loggerFactory.CreateLogger<KeybindManager>());
|
||||||
|
Chat = new Chat(Plugin, loggerFactory.CreateLogger<Chat>());
|
||||||
|
|
||||||
Plugin.GameInteropProvider.InitializeFromAttributes(this);
|
Plugin.GameInteropProvider.InitializeFromAttributes(this);
|
||||||
ResolveTextCommandPlaceholderHook?.Enable();
|
ResolveTextCommandPlaceholderHook?.Enable();
|
||||||
@@ -215,6 +222,7 @@ internal unsafe class GameFunctions : IDisposable
|
|||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
// Static method, no instance _logger reachable here.
|
||||||
Plugin.LogProxy.Warning(e, "Unable to open adventurer plate");
|
Plugin.LogProxy.Warning(e, "Unable to open adventurer plate");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -255,7 +263,7 @@ internal unsafe class GameFunctions : IDisposable
|
|||||||
var byteCount = System.Text.Encoding.UTF8.GetByteCount(ReplacementName);
|
var byteCount = System.Text.Encoding.UTF8.GetByteCount(ReplacementName);
|
||||||
if (byteCount >= PlaceholderBufferSize)
|
if (byteCount >= PlaceholderBufferSize)
|
||||||
{
|
{
|
||||||
Plugin.LogProxy.Warning(
|
_logger.LogWarning(
|
||||||
$"Replacement name too long for placeholder buffer ({byteCount} bytes >= {PlaceholderBufferSize}); falling back to original."
|
$"Replacement name too long for placeholder buffer ({byteCount} bytes >= {PlaceholderBufferSize}); falling back to original."
|
||||||
);
|
);
|
||||||
ReplacementName = null;
|
ReplacementName = null;
|
||||||
|
|||||||
@@ -7,7 +7,9 @@ using FFXIVClientStructs.FFXIV.Client.System.String;
|
|||||||
using FFXIVClientStructs.FFXIV.Client.UI;
|
using FFXIVClientStructs.FFXIV.Client.UI;
|
||||||
using HellionChat.Code;
|
using HellionChat.Code;
|
||||||
using HellionChat.GameFunctions.Types;
|
using HellionChat.GameFunctions.Types;
|
||||||
|
using HellionChat.Ui.Windows;
|
||||||
using HellionChat.Util;
|
using HellionChat.Util;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
using ModifierFlag = HellionChat.GameFunctions.Types.ModifierFlag;
|
using ModifierFlag = HellionChat.GameFunctions.Types.ModifierFlag;
|
||||||
|
|
||||||
namespace HellionChat.GameFunctions;
|
namespace HellionChat.GameFunctions;
|
||||||
@@ -306,9 +308,12 @@ internal unsafe class KeybindManager : IDisposable
|
|||||||
// VirtualKey.OEM_CLEAR,
|
// VirtualKey.OEM_CLEAR,
|
||||||
};
|
};
|
||||||
|
|
||||||
internal KeybindManager(Plugin plugin)
|
private readonly ILogger<KeybindManager> _logger;
|
||||||
|
|
||||||
|
internal KeybindManager(Plugin plugin, ILogger<KeybindManager> logger)
|
||||||
{
|
{
|
||||||
Plugin = plugin;
|
Plugin = plugin;
|
||||||
|
_logger = logger;
|
||||||
Plugin.GameInteropProvider.InitializeFromAttributes(this);
|
Plugin.GameInteropProvider.InitializeFromAttributes(this);
|
||||||
|
|
||||||
// Handle keybinds from the game on every tick.
|
// Handle keybinds from the game on every tick.
|
||||||
@@ -500,33 +505,188 @@ internal unsafe class KeybindManager : IDisposable
|
|||||||
if (!KeybindsToIntercept.TryGetValue(currentBest.Item2, out var info))
|
if (!KeybindsToIntercept.TryGetValue(currentBest.Item2, out var info))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
// Resolve the surface this keybind acts on FIRST: a focused pop-out otherwise
|
||||||
|
// the main window. Channel-set/REPLY/prefill all write here so the action
|
||||||
|
// follows the input the user is typing in.
|
||||||
|
var (targetWindow, targetTab) = ResolveKeybindTarget();
|
||||||
|
|
||||||
|
// Surface + focus the resolved target ONCE, before routing. Main: ActivateChat
|
||||||
|
// re-surfaces it from a hide/closed state (the chat-activation entry point
|
||||||
|
// retired in v1.6.0). Pop-out: arm only its focus — NOT ActivateChat, which
|
||||||
|
// would yank the main window to front and un-hide it on every pop-out-targeted
|
||||||
|
// keybind: stay where the user types. Exactly one window arms focus per
|
||||||
|
// keybind, so the next frame has no SetKeyboardFocusHere race.
|
||||||
|
if (targetWindow is ChannelPopoutWindow)
|
||||||
|
targetWindow.RequestInputFocus();
|
||||||
|
else
|
||||||
|
Plugin.Instance.MainWindow?.ActivateChat();
|
||||||
|
|
||||||
|
// The routing tail makes native game calls (GetTellHistoryInfo, UIModule,
|
||||||
|
// RotateLinkshellHistory) on the framework tick — wrap it so one bad frame logs
|
||||||
|
// instead of throwing into Dalamud's update loop (v1.5.6 parity).
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
TellReason? reason = info.Channel == InputChannel.Tell ? TellReason.Reply : null;
|
if (info.Channel is { } channel && info.Rotate == RotateMode.None)
|
||||||
Plugin.ChatLogWindow.Activated(new ChatActivatedArgs(info) { TellReason = reason });
|
{
|
||||||
|
// Direct channel-switch binds (CMD_SAY/PARTY/numbered linkshells/…): switch
|
||||||
|
// the game channel AND mirror it onto the resolved tab so the input pill
|
||||||
|
// shows the real send target (pill-sync).
|
||||||
|
Plugin.Instance.Functions.Chat.SetChannel(channel);
|
||||||
|
// Only mirror onto the tab when the game actually accepted the switch — an
|
||||||
|
// empty linkshell slot leaves the game channel untouched, so the pill must
|
||||||
|
// stay put rather than show a target the game will not send to.
|
||||||
|
if (Chat.IsChannelOrExistingLinkshell(channel) && targetTab is { } directTab)
|
||||||
|
{
|
||||||
|
directTab.CurrentChannel.SetChannel(channel);
|
||||||
|
directTab.CurrentChannel.TellTarget = null;
|
||||||
|
directTab.CurrentChannel.ResetTempChannel();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (info.Channel is { } rotateChannel && info.Rotate != RotateMode.None)
|
||||||
|
{
|
||||||
|
// Rotation binds (REPLY / linkshell-cycle). Ported from v1.5.6's
|
||||||
|
// ChatLogWindow.Activated (1d3b429:240-334) without the ChatActivatedArgs
|
||||||
|
// indirection (gone in the rewrite). Writes onto the resolved surface's
|
||||||
|
// tab, not Plugin.CurrentTab.
|
||||||
|
if (targetTab is { } rotTab)
|
||||||
|
{
|
||||||
|
var targetChannel = (InputChannel?)rotateChannel;
|
||||||
|
|
||||||
|
// REPLY rotation: the reply target is ALWAYS temp (never permanent —
|
||||||
|
// a permanent reply would leak the partner onto the tab) and ALWAYS
|
||||||
|
// TellReason.Reply. info.Permanent does not gate this step; only the
|
||||||
|
// channel-set tail below honours the _ALWAYS binds' permanence.
|
||||||
|
if (rotateChannel == InputChannel.Tell)
|
||||||
|
{
|
||||||
|
var idx =
|
||||||
|
rotTab.CurrentChannel.TempChannel != InputChannel.Tell ? 0
|
||||||
|
: info.Rotate == RotateMode.Reverse ? -1
|
||||||
|
: 1;
|
||||||
|
|
||||||
|
var tellInfo = Plugin.Instance.Functions.Chat.GetTellHistoryInfo(idx);
|
||||||
|
if (tellInfo != null)
|
||||||
|
rotTab.CurrentChannel.TempTellTarget = new TellTarget(
|
||||||
|
tellInfo.Name,
|
||||||
|
tellInfo.World,
|
||||||
|
tellInfo.ContentId,
|
||||||
|
TellReason.Reply
|
||||||
|
);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Cycling AWAY from Tell to a linkshell: drop any stale permanent
|
||||||
|
// tell target so a typed line cannot silently route to the old
|
||||||
|
// partner (v1.5.6 ChatLogWindow.cs:280, privacy guard).
|
||||||
|
rotTab.CurrentChannel.TellTarget = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// LS/CWLS cycle: permanent rotates the game's own history and reads the
|
||||||
|
// landed cycle index back; temp resolves the next valid linkshell index
|
||||||
|
// without touching game state. Both leave targetChannel null on failure
|
||||||
|
// (no valid linkshell in 8 iterations) so the tail below logs + skips.
|
||||||
|
if (rotateChannel is InputChannel.Linkshell1 or InputChannel.CrossLinkshell1)
|
||||||
|
{
|
||||||
|
var module = UIModule.Instance();
|
||||||
|
if (info.Permanent)
|
||||||
|
{
|
||||||
|
if (rotateChannel == InputChannel.Linkshell1)
|
||||||
|
{
|
||||||
|
Chat.RotateLinkshellHistory(info.Rotate);
|
||||||
|
targetChannel = rotateChannel + (uint)module->LinkshellCycle;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Chat.RotateCrossLinkshellHistory(info.Rotate);
|
||||||
|
targetChannel =
|
||||||
|
rotateChannel + (uint)module->CrossWorldLinkshellCycle;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
targetChannel = Chat.ResolveTempInputChannel(
|
||||||
|
rotTab.CurrentChannel.TempChannel,
|
||||||
|
rotateChannel,
|
||||||
|
info.Rotate
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Shared channel-set tail (runs for Tell too: IsChannelOrExistingLinkshell
|
||||||
|
// is true for Tell and targetChannel stays Tell). Permanent => commit the
|
||||||
|
// game channel; temp => arm UseTempChannel/TempChannel only. This is the
|
||||||
|
// ONLY place info.Permanent decides temp vs permanent for the channel.
|
||||||
|
if (
|
||||||
|
targetChannel is null
|
||||||
|
|| !Chat.IsChannelOrExistingLinkshell(targetChannel.Value)
|
||||||
|
)
|
||||||
|
{
|
||||||
|
_logger.LogWarning(
|
||||||
|
"Rotation channel resolved to an invalid value '{Channel}', ignoring",
|
||||||
|
targetChannel
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (info.Permanent)
|
||||||
|
{
|
||||||
|
// 1.5.6 parity (ChatLogWindow.SetChannel, 1d3b429:1476-1479):
|
||||||
|
// committing the game channel also pre-targets the game's native input.
|
||||||
|
// Forward the tab's reply target for Tell so the partner is armed
|
||||||
|
// game-side (ChangeChatChannel code 17); null for a linkshell —
|
||||||
|
// targetChannel is the FINAL resolved value (9..16/19..26 for LS, never
|
||||||
|
// 0=Tell), so a stale TempTellTarget can never flip an LS cycle to Tell.
|
||||||
|
var gameTarget =
|
||||||
|
targetChannel.Value == InputChannel.Tell
|
||||||
|
? rotTab.CurrentChannel.TempTellTarget
|
||||||
|
?? rotTab.CurrentChannel.TellTarget
|
||||||
|
: null;
|
||||||
|
Plugin.Instance.Functions.Chat.SetChannel(targetChannel.Value, gameTarget);
|
||||||
|
rotTab.CurrentChannel.SetChannel(targetChannel.Value);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
rotTab.CurrentChannel.UseTempChannel = true;
|
||||||
|
rotTab.CurrentChannel.TempChannel = targetChannel.Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Prefill text binds (CMD_COMMAND seeds "/"): the token always goes to the
|
||||||
|
// main InputBar (the focus contract does not expose pop-out buffers); a
|
||||||
|
// focused pop-out already received focus above, so only token routing matters
|
||||||
|
// here -- a documented scope limit.
|
||||||
|
if (info.Text is { } text)
|
||||||
|
Plugin.Instance.InputBar.SetPendingMessage(text);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Plugin.LogProxy.Error(ex, "Error in chat Activated event");
|
_logger.LogError(ex, "Keybind routing failed for channel {Channel}", info.Channel);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// v0.6.0 — central dispatch for ChatTabForward/Backward. If a pop-out
|
// Resolve which chat surface a keybind action targets: the open pop-out whose
|
||||||
// window currently has its compact input focused, the keybind is
|
// input currently has focus, otherwise the main window. Both paths share it so a
|
||||||
// forwarded into that pop-out's ChatInputBar so the user navigates
|
// channel-switch/REPLY/prefill follows the surface the user is typing in. The
|
||||||
// tabs in the window they are typing in. Otherwise the main window
|
// returned tab is that surface's bound tab (pop-out: Bound; main: ActiveTab).
|
||||||
// handles it (= v0.5.x behavior).
|
// Null tab => skip the tab-write (early-load window where no tab exists yet).
|
||||||
|
private (IFocusableChatWindow Window, Tab? Tab) ResolveKeybindTarget()
|
||||||
|
{
|
||||||
|
foreach (var popout in Plugin.Instance.ChannelPopoutPool.Instances)
|
||||||
|
{
|
||||||
|
if (popout.Bound is { } bound && popout.IsOpen && popout.HasFocusedInput)
|
||||||
|
return (popout, bound);
|
||||||
|
}
|
||||||
|
|
||||||
|
var main = Plugin.Instance.MainWindow;
|
||||||
|
return (main!, main?.ActiveTab);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Tab-delta keybinds (ChatTabForward/Backward) stay main-window-only by design:
|
||||||
|
// a channel-bound pop-out has no tab list to cycle. The focus contract is
|
||||||
|
// consumed by the channel-set/REPLY/prefill tail, not here.
|
||||||
private void DispatchTabDelta(int delta)
|
private void DispatchTabDelta(int delta)
|
||||||
{
|
{
|
||||||
foreach (var popout in Plugin.ChatLogWindow.ActivePopouts)
|
Plugin.Instance.MainWindow?.ChangeTabDelta(delta);
|
||||||
{
|
|
||||||
if (popout.HasFocusedInputBar && popout.InputBar != null)
|
|
||||||
{
|
|
||||||
popout.InputBar.HandleKeybindForward(delta);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Plugin.ChatLogWindow.ChangeTabDelta(delta);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Keybind GetKeybind(string id)
|
private static Keybind GetKeybind(string id)
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Dalamud.NET.Sdk/15.0.0">
|
<Project Sdk="Dalamud.NET.Sdk/15.0.0">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Independent versioning; see yaml changelog for upstream Chat 2 base -->
|
<!-- Independent versioning; see yaml changelog for upstream Chat 2 base -->
|
||||||
<Version>1.4.9</Version>
|
<Version>2.0.6</Version>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<!-- Use lock file to pin exact versions -->
|
<!-- Use lock file to pin exact versions -->
|
||||||
@@ -13,11 +13,24 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- Closed ranges prevent surprise major bumps during lock file regeneration -->
|
<!-- Closed ranges prevent surprise major bumps during lock file regeneration -->
|
||||||
<PackageReference Include="MessagePack" Version="[3.1.4, 4.0.0)" />
|
<PackageReference Include="MessagePack" Version="[3.1.7, 4.0.0)" />
|
||||||
<PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.7" />
|
<PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.8" />
|
||||||
|
<!-- v1.5.0 DI-container foundation; matches Lightless pin (Hosting 10.0.7) -->
|
||||||
|
<PackageReference
|
||||||
|
Include="Microsoft.Extensions.DependencyInjection"
|
||||||
|
Version="[10.0.7, 11.0.0)"
|
||||||
|
/>
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Hosting" Version="[10.0.7, 11.0.0)" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging" Version="[10.0.7, 11.0.0)" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Options" Version="[10.0.7, 11.0.0)" />
|
||||||
<!-- SQLitePCLRaw override for CVE-2025-6965, CVE-2025-7709 (SQLite >= 3.50.3) -->
|
<!-- SQLitePCLRaw override for CVE-2025-6965, CVE-2025-7709 (SQLite >= 3.50.3) -->
|
||||||
<PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" Version="3.50.3" />
|
<PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" Version="3.50.3" />
|
||||||
<PackageReference Include="morelinq" Version="4.4.0" />
|
<PackageReference Include="morelinq" Version="4.4.0" />
|
||||||
|
<!-- NAudio.WinMM 2.2.1 MIT - WaveOutEvent/WinMM path is Wine-safe (WaveOut works under Wine,
|
||||||
|
Media-Foundation-based codecs do not). Using the sub-package avoids pulling in
|
||||||
|
NAudio.WinForms (which requires WindowsDesktop and does not build on Linux hosts).
|
||||||
|
WaveOutEvent and WaveFileReader both live in NAudio.WinMM + NAudio.Core. -->
|
||||||
|
<PackageReference Include="NAudio.WinMM" Version="2.3.0" />
|
||||||
<PackageReference Include="Pidgin" Version="[3.5.1, 4.0.0)" />
|
<PackageReference Include="Pidgin" Version="[3.5.1, 4.0.0)" />
|
||||||
<PackageReference Include="SixLabors.ImageSharp" Version="[3.1.12, 4.0.0)" />
|
<PackageReference Include="SixLabors.ImageSharp" Version="[3.1.12, 4.0.0)" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
@@ -42,22 +55,39 @@
|
|||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- Embedded resources: Hellion font (Exo 2, OFL-1.1) + manifest resource -->
|
<!-- Embedded resources: bundled UI font (Inter Light, OFL-1.1) + manifest resource -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<EmbeddedResource Include="Resources\HellionFont.ttf">
|
<EmbeddedResource Include="Resources\Inter-Light.ttf">
|
||||||
<LogicalName>HellionFont.ttf</LogicalName>
|
<LogicalName>Inter-Light.ttf</LogicalName>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
<EmbeddedResource Include="Resources\HellionFont-OFL.txt">
|
<EmbeddedResource Include="Resources\Inter-OFL.txt">
|
||||||
<LogicalName>HellionFont-OFL.txt</LogicalName>
|
<LogicalName>Inter-OFL.txt</LogicalName>
|
||||||
|
</EmbeddedResource>
|
||||||
|
<EmbeddedResource Include="Resources\Branding\fox-banner.png">
|
||||||
|
<LogicalName>HellionChat.Branding.fox-banner.png</LogicalName>
|
||||||
|
</EmbeddedResource>
|
||||||
|
<!-- Bundled custom notification sounds, Mono 44.1 kHz 16-bit PCM WAV (Wine-safe) -->
|
||||||
|
<EmbeddedResource Include="Resources\Sounds\notification-1.wav">
|
||||||
|
<LogicalName>HellionChat.Sounds.notification-1.wav</LogicalName>
|
||||||
|
</EmbeddedResource>
|
||||||
|
<EmbeddedResource Include="Resources\Sounds\notification-2.wav">
|
||||||
|
<LogicalName>HellionChat.Sounds.notification-2.wav</LogicalName>
|
||||||
|
</EmbeddedResource>
|
||||||
|
<EmbeddedResource Include="Resources\Sounds\notification-3.wav">
|
||||||
|
<LogicalName>HellionChat.Sounds.notification-3.wav</LogicalName>
|
||||||
|
</EmbeddedResource>
|
||||||
|
<EmbeddedResource Include="Resources\Branding\fox-mini.txt">
|
||||||
|
<LogicalName>HellionChat.Branding.fox-mini.txt</LogicalName>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
<EmbeddedResource Include="Themes\Builtin\example-theme.json">
|
<EmbeddedResource Include="Themes\Builtin\example-theme.json">
|
||||||
<LogicalName>HellionChat.Themes.Builtin.example-theme.json</LogicalName>
|
<LogicalName>HellionChat.Themes.Builtin.example-theme.json</LogicalName>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- Plugin icon: copy images/* to output for Dalamud discovery -->
|
<!-- Plugin icon: copy images/* to output for Dalamud discovery. ASCII
|
||||||
|
study folder is source-only material, no need to ship it. -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="images\**">
|
<None Include="images\**" Exclude="images\ascii\**">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
+24
-155
@@ -1,25 +1,11 @@
|
|||||||
name: Hellion Chat
|
name: Hellion Chat
|
||||||
author: Jon Kazama (Hellion Forge)
|
author: Jon Kazama (Hellion Forge)
|
||||||
punchline: A Hellion Forge plugin — privacy-focused chat replacement for FFXIV, built for EU, US and JP data rules.
|
punchline: Chat replacement for FFXIV that keeps your conversations and forgets the rest.
|
||||||
description: |-
|
description: |-
|
||||||
Chat replacement for FINAL FANTASY XIV with privacy controls built around
|
A chat window that stores your own conversations and nothing else. Public chat, NPC dialogue, system messages and battle logs stay out of the database until you switch them on.
|
||||||
EU, US and JP data-protection rules.
|
|
||||||
|
|
||||||
By default only your own conversations are stored. Public chat, NPC
|
Retention per channel, retroactive wipe, export to Markdown, JSON or CSV. Setup wizard with four profiles. 25 languages. Its own config and database.
|
||||||
dialogue and system messages stay out of the database unless you opt in.
|
|
||||||
Retention windows are configurable per channel, history can be wiped
|
|
||||||
retroactively, and everything can be exported on demand.
|
|
||||||
|
|
||||||
Features:
|
|
||||||
- Channel whitelist with a Privacy-First default
|
|
||||||
- Per-channel retention with a daily background sweep
|
|
||||||
- Retroactive cleanup (Ctrl+Shift confirm)
|
|
||||||
- Export to Markdown, JSON or CSV
|
|
||||||
- First-run wizard with three preset profiles
|
|
||||||
- Bilingual UI (EN/DE) with live language switching
|
|
||||||
- Own config and database — no shared state with other plugins
|
|
||||||
|
|
||||||
Based on Chat 2 by Infi and Anna (EUPL-1.2).
|
|
||||||
Support: https://discord.gg/X9V7Kcv5gR
|
Support: https://discord.gg/X9V7Kcv5gR
|
||||||
repo_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat
|
repo_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat
|
||||||
accepts_feedback: true
|
accepts_feedback: true
|
||||||
@@ -27,7 +13,7 @@ icon_url: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/br
|
|||||||
image_urls:
|
image_urls:
|
||||||
- https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/chatWindow.png
|
- https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/chatWindow.png
|
||||||
- https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/settingsOverview.png
|
- https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/settingsOverview.png
|
||||||
- https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/themesPicker.png
|
- https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/raw/branch/main/HellionChat/images/firstRunWizard.png
|
||||||
tags:
|
tags:
|
||||||
- Social
|
- Social
|
||||||
- UI
|
- UI
|
||||||
@@ -35,158 +21,41 @@ tags:
|
|||||||
- Replacement
|
- Replacement
|
||||||
- Privacy
|
- Privacy
|
||||||
changelog: |-
|
changelog: |-
|
||||||
**v1.4.9 — Plugin-Load Render Polish (2026-05-15)**
|
**v2.0.6 — Status bar, optional (2026-09-20)**
|
||||||
|
|
||||||
Tenth sub-patch of the v1.4.x polish-sweep series. First-frame
|
One question from the Discord, small enough to ship on its own: are the pills along the bottom edge fixed in the code? They were.
|
||||||
render cost drops from ~127 ms median to ~76 ms median,
|
|
||||||
comfortably under Dalamud's 100 ms HITCH warning threshold.
|
|
||||||
|
|
||||||
- First-frame defer: six non-essential rendering sections inside
|
- **The status bar can be switched off.** The row at the bottom of the chat window (channel, privacy state, message counts, tells, clock, version) had no switch. Settings → Window → Window style has "Show status bar" now. Off, the chat body takes the space; on for everyone until you turn it off, so nothing changes by itself. One thing to know: the camera and the lock live in that row, so with the bar hidden, screenshot mode and the privacy filter give no visible sign.
|
||||||
ChatLogWindow skip their first Draw and run one frame later
|
- **Suggested by Ashy ^.^, and it says so.** The toggle carries a "Suggested by" line under it. Whoever proposes a feature should see their name where the feature lives, not in a changelog they will never open. The line is translated into all 25 languages and is a generic key, ready for the next suggestion.
|
||||||
(bottom status bar, channel-name SeString chunks, window bounds
|
|
||||||
check, v0.6.1 hint banner, autocomplete, input-preview
|
|
||||||
calculation). User-visible delay is ~17 ms at 60 fps, hidden
|
|
||||||
inside the post-reload font-atlas build window.
|
|
||||||
- Slash-command centralisation: /hellion, /hellionView,
|
|
||||||
/hellionSeString and /hellionDebugger are registered in
|
|
||||||
LoadAsync instead of inside the corresponding window
|
|
||||||
constructors. The plugin-manager Open and configuration buttons
|
|
||||||
hang on the same path.
|
|
||||||
- Plugin-load profiling logs stay on at Information level
|
|
||||||
(MessageStore connect/migrate, FilterAllTabs, auto-translate
|
|
||||||
warmup) as a regression tripwire — a future load past 100 ms
|
|
||||||
will show up in /xllog without a Debug filter.
|
|
||||||
- ChatTwo IPC compatibility layer: HellionChat now mirrors
|
|
||||||
ChatTwo's full IPC surface (GetChatInputState,
|
|
||||||
ChatInputStateChanged, Register, Unregister, Available,
|
|
||||||
Invoke) under the ChatTwo.* namespace in addition to our
|
|
||||||
existing HellionChat.* provider gates. Third-party
|
|
||||||
integrations that historically only subscribe to ChatTwo's
|
|
||||||
IPC — for example Artisan's and AllaganTools' context-menu
|
|
||||||
hooks — keep working without requiring a code change on their
|
|
||||||
side. Conflict detection prevents ChatTwo from loading in
|
|
||||||
parallel with HellionChat, so there is no slot-collision risk
|
|
||||||
at runtime.
|
|
||||||
- Migration v17 stays (no schema bump).
|
|
||||||
|
|
||||||
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
**v1.4.8 — Hook-Layer and Polish Quick-Wins (2026-05-14)**
|
**v2.0.5 — Focus, and a way out (2026-08-23)**
|
||||||
|
|
||||||
Ninth sub-patch of the v1.4.x polish-sweep series. Hook-layer
|
Two tester reports, both about the same corner: what a tell does to what you were doing, and what you can do about a tab once it exists.
|
||||||
cluster (DbViewer FTS5 full-text search, ad-block foundation
|
|
||||||
investigation) plus three polish quick-wins.
|
|
||||||
|
|
||||||
- DbViewer full-text search: optional FTS5 index across the full
|
- **A tell arriving while you were typing took the keyboard.** The tab switched under you, and in this game that means the next thing you type walks your character around. It could also send your sentence to the wrong person: what you have typed belongs to the window, while the recipient is read off whichever tab is active when you press Enter — so a line meant for one person could leave addressed to whoever had just written. Nothing is revealed now while you are mid-sentence, in any mode. The tab still appears with its unread mark and waits for you.
|
||||||
chat history. Built asynchronously on first load after the
|
- **A tell tab could not be closed.** The entry was lost in the 2.0.0 window rebuild: it lived in the old menu, and the rebuilt one restored renaming, sounds, pop-outs and pinning but not this. Tell tabs are kept out of the settings editor on purpose, with a note pointing at the context menu — which could not close them either. Right-click any tab to close it. A pinned tell tab asks you to unpin it first, so one misclick cannot end a conversation you meant to keep.
|
||||||
update with a progress toast. The local page-filter remains
|
- **Two settings decided where a tell opens, and the older one always won.** "Open new /tell tabs as a pop-out" fired when the tab was created, a tick before the mode below it was ever asked — which is why that mode looked like it did nothing. They are one setting now and your existing choice carries over. "Off" went with them: it never stopped tell tabs from being created, that is the switch further up, it only stopped the jump to them, which is what the switch below it does.
|
||||||
available as the default mode. Queries match as exact phrases
|
- **Closing a tab could break a pop-out you were using.** Re-anchoring always jumped to the first tab in the list, even when that tab was open in its own window, and stripped its tell binding on the way there.
|
||||||
-- multi-word terms must appear together in order; advanced
|
- **Smaller things.** "Pop Out" in the context menu was English on every client, as were the tell-open modes. The pinned-tab limit still pointed at a feature removed in May. Spanish had a word that does not exist, Greek had an untranslated one, Portuguese contradicted its own button. Segmented settings rows cut long labels in half. The last compiler warning in the project is gone.
|
||||||
users can opt into raw FTS5 MATCH syntax by wrapping their own
|
|
||||||
double-quotes.
|
|
||||||
- Custom theme files now auto-reload when edited while the theme
|
|
||||||
is active -- no need to re-click the theme in the picker.
|
|
||||||
- Retention sweep no longer blocks the framework thread, removing
|
|
||||||
the ~194ms mini-hitch per sweep.
|
|
||||||
- Status bar renders correctly at Windows display scaling > 100%.
|
|
||||||
- Receive-suppressed-tells routing investigated this cycle and
|
|
||||||
postponed to v1.5.x: when other plugins suppress tells via
|
|
||||||
CheckMessageHandled, the FFXIV chat pipeline skips the
|
|
||||||
RaptureLogModule.AddMsgSourceEntry path so HellionChat's
|
|
||||||
ContentIdResolverHook does not fire and tell-partner
|
|
||||||
identification breaks. The fix belongs next to the planned
|
|
||||||
ad-block hook layer where the same patch surface comes up.
|
|
||||||
- Internal: messages.Id is declared BLOB but stored as TEXT
|
|
||||||
(Microsoft.Data.Sqlite Guid binding). FTS bulk insert and
|
|
||||||
LoadByGuids match the TEXT storage form on both sides.
|
|
||||||
Migration v17 stays (no schema bump).
|
|
||||||
|
|
||||||
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
**v1.4.7 — Backlog Cleanup and Mid-Features (2026-05-13)**
|
**v2.0.4 — Housekeeping (2026-08-20)**
|
||||||
|
|
||||||
Eighth sub-patch of the v1.4.x polish-sweep series. First
|
Nothing changes in how the plugin behaves. Two pieces of tidying that were overdue.
|
||||||
user-visible feature bundle since v1.4.5 — pinned tell tabs that
|
|
||||||
survive relog, opt-in Honorific glow rendering, and a configurable
|
|
||||||
sidebar.
|
|
||||||
|
|
||||||
- TempTell Pin: right-click a TempTell tab in the sidebar to pin
|
- **The installer description was long, and one line of it was wrong.** It ran to 908 characters and opened by naming a category instead of saying what the plugin does. It also claimed 24 interface languages when there are 25, and the two manifests carried different one-line summaries, so the store listing and the plugin details showed different sentences.
|
||||||
it. Pinned tabs survive relog, keep their conversation history
|
- **30 translation keys for the webinterface are gone.** That feature, its HTTP routes and its frontend left the code in May; the strings stayed behind in all 25 languages, along with a generated property for each. Every key was checked against the whole repository before anything was removed.
|
||||||
(loaded on demand from the message store), and stay bound to
|
|
||||||
the same /tell partner. Hard cap of 5 pinned tabs in a pool
|
|
||||||
separate from the 15-tab auto-tell pool — total ceiling is 20
|
|
||||||
tabs. New 'Pinned' section in the sidebar with its own divider
|
|
||||||
header
|
|
||||||
- Honorific Glow outline now renders when the title carries a
|
|
||||||
Glow colour. Opt-in via Settings → Integrations → 'Render glow
|
|
||||||
outlines (Honorific)' (default off, dodges the per-frame
|
|
||||||
DrawList overhead on low-end hardware). Gradient (Color3 /
|
|
||||||
GradientColourSet / Wave / Pulse) is parsed but rendered
|
|
||||||
statically — a later cycle will port the full animation
|
|
||||||
- Sidebar width is now configurable in Theme & Layout (range
|
|
||||||
44–160 px). Default stays icon-only; widen to fit section
|
|
||||||
headers like 'Active Tells (3)' without truncation
|
|
||||||
- Settings Save no longer pops the chat input back to /tell with
|
|
||||||
a pinned partner — Configuration.UpdateFrom now preserves the
|
|
||||||
runtime CurrentChannel across the persistent-tab merge, and
|
|
||||||
TabSwitched deep-clones the seeded channel instead of sharing
|
|
||||||
the previous tab's UsedChannel
|
|
||||||
- Util/ImGuiUtil.cs DrawArrows IconButton id now uses
|
|
||||||
(id + 1).ToString() instead of the operator-precedence quirk
|
|
||||||
id + 1.ToString() — generated IDs stay numerically stable
|
|
||||||
- Internal: IPluginLogProxy indirection over Dalamud's IPluginLog
|
|
||||||
routes all ~91 Plugin.Log call sites through a testable proxy.
|
|
||||||
MessageStore.Migrate0 can now run in xUnit without loading
|
|
||||||
Dalamud.dll, closing the gap F12.1 left in v1.4.6
|
|
||||||
- Internal: TempTab counter switched from an Interlocked cached
|
|
||||||
field to a derived Tabs.Count(predicate) — pin-state transitions
|
|
||||||
are cold-path and don't need lock-free reads
|
|
||||||
|
|
||||||
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
**v1.4.6 — Code Hygiene and Refactor (2026-05-12)**
|
**v2.0.3 — Pop-out context menu, screenshot mode (2026-08-20)**
|
||||||
|
|
||||||
Maintenance patch. No user-visible behaviour changes; tightens the
|
- **The context menu never opened in a pop-out window.** Right-clicking a name or an item there did nothing at all. Every chat surface shares one popup state, and whichever window drew first cleared the menu it had not opened before the pop-out got its turn. The menu now stays with the window the click came from.
|
||||||
development feedback loop, fixes two upstream-inherited bugs, and
|
- **Screenshot mode could not be turned off.** It is a saved setting, but neither of its two toggles wrote the change to the config file, so switching it off never survived a reload and the mode came back on at every plugin load. Both toggles save now. If it is stuck on for you, one click off is enough.
|
||||||
prepares the code for the v1.4.7 backlog cleanup.
|
- **Text the game colours itself could render invisible.** Some of those colours arrive without an alpha byte, and the byte order swap then left them fully transparent.
|
||||||
|
|
||||||
- preflight.sh gains a csharpier reflow check and a markdownlint
|
|
||||||
pass so style drift and markdown violations are caught at the
|
|
||||||
pre-push gate
|
|
||||||
- FontManager fallback catches the full set of atlas-toolkit
|
|
||||||
throws (IO, InvalidOperation, ArgumentException) — a corrupt
|
|
||||||
font config no longer takes down the whole atlas build
|
|
||||||
- BrandingLinks and IntegrationLinks URLs validated on plugin
|
|
||||||
load — a typo in a future URL rotation now throws at startup
|
|
||||||
- Cherry-picked from ChatTwo upstream f35b7d3: Chat.SetChannel
|
|
||||||
no longer leaks the native Utf8String when the linkshell check
|
|
||||||
rejects the channel
|
|
||||||
- Cherry-picked from ChatTwo upstream f35b7d3: Tab.Clone now
|
|
||||||
deep-clones UsedChannel and TellTarget — PopOut and Temp tabs
|
|
||||||
no longer mutate each other's channel state
|
|
||||||
- Active-tab underline scales with DPI and rounds to physical
|
|
||||||
pixels for crisp rendering above 100% scaling
|
|
||||||
- IconButton width parameter no longer subtracts HUD-scaled
|
|
||||||
padding from a raw int (measured width passes through verbatim)
|
|
||||||
- Internal: HellionStyle ChildBgAlpha extracted to a testable
|
|
||||||
helper; Plugin.SaveConfig clones only the temp tabs;
|
|
||||||
SettingsOverview caches the draw-list per frame;
|
|
||||||
Dalamud.Utility.Util surface routed through an IPlatformUtil
|
|
||||||
indirection (MessageStore IsWine probe is now testable in
|
|
||||||
isolation)
|
|
||||||
- Built-in themes: Crystal Nocturne (sapphire and electric
|
|
||||||
magenta over obsidian, by CRYSTALLITE) replaces Moonlit Bloom.
|
|
||||||
Users with Moonlit Bloom selected fall back to Hellion Arctic
|
|
||||||
on first load
|
|
||||||
|
|
||||||
Based on Chat 2 1.35.3 (upstream Infiziert90/ChatTwo, EUPL-1.2).
|
Earlier history: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
Full history: https://gitea.hellion-forge.cloud/JonKazama-Hellion/HellionChat/releases
|
|
||||||
|
|||||||
@@ -0,0 +1,208 @@
|
|||||||
|
using Dalamud.Game.Addon.Lifecycle;
|
||||||
|
using Dalamud.Plugin;
|
||||||
|
using HellionChat.Integrations;
|
||||||
|
using HellionChat.Ipc;
|
||||||
|
using HellionChat.Themes;
|
||||||
|
using HellionChat.Ui;
|
||||||
|
using HellionChat.Ui.Components;
|
||||||
|
using HellionChat.Ui.Windows;
|
||||||
|
using Microsoft.Extensions.Hosting;
|
||||||
|
|
||||||
|
namespace HellionChat.Infrastructure.Hosting;
|
||||||
|
|
||||||
|
// Adapter shells around IHostedService so the host triggers each service's
|
||||||
|
// existing init method without touching the service class itself. Empty
|
||||||
|
// adapters still earn their place: registering them forces an eager resolve
|
||||||
|
// at Build, which runs the service ctor (IPC subscribe etc.) right then
|
||||||
|
// instead of lazily on first GetRequiredService.
|
||||||
|
|
||||||
|
internal sealed class ThemeRegistryInitHostedService(
|
||||||
|
ThemeRegistry registry,
|
||||||
|
FontManager fontManager
|
||||||
|
) : IHostedService
|
||||||
|
{
|
||||||
|
public async Task StartAsync(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
// Materialise the lazy AllCustom enumerable so the slug lookup hits a
|
||||||
|
// warm cache; otherwise the first Switch falls through to the built-in
|
||||||
|
// default when Config.Theme points at a custom slug.
|
||||||
|
foreach (var _ in registry.AllCustom()) { }
|
||||||
|
registry.SwitchSilent(Plugin.Config.Theme);
|
||||||
|
|
||||||
|
// Point font sizes at the active theme's typography, wire future
|
||||||
|
// theme switches to the atlas rebuild, and apply the boot theme's override.
|
||||||
|
fontManager.SetTypographySource(() => registry.Active.Typography);
|
||||||
|
registry.SetActiveChangedCallback(() => fontManager.RebuildDelegateFontsIfChanged());
|
||||||
|
await Plugin.Framework.RunOnFrameworkThread(() =>
|
||||||
|
fontManager.RebuildDelegateFontsIfChanged()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
// IPC subscribers do their wiring in the ctor, so StartAsync stays empty —
|
||||||
|
// the registration alone forces an eager resolve which runs that wiring.
|
||||||
|
|
||||||
|
internal sealed class IpcManagerInitHostedService(IpcManager ipc) : IHostedService
|
||||||
|
{
|
||||||
|
private readonly IpcManager _ipc = ipc;
|
||||||
|
|
||||||
|
public Task StartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
||||||
|
|
||||||
|
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal sealed class TypingIpcInitHostedService(TypingIpc typingIpc) : IHostedService
|
||||||
|
{
|
||||||
|
private readonly TypingIpc _typingIpc = typingIpc;
|
||||||
|
|
||||||
|
public Task StartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
||||||
|
|
||||||
|
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal sealed class ExtraChatInitHostedService(ExtraChat extraChat) : IHostedService
|
||||||
|
{
|
||||||
|
private readonly ExtraChat _extraChat = extraChat;
|
||||||
|
|
||||||
|
public Task StartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
||||||
|
|
||||||
|
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal sealed class MessageManagerInitHostedService(
|
||||||
|
IDalamudPluginInterface pluginInterface,
|
||||||
|
MessageManager manager
|
||||||
|
) : IHostedService
|
||||||
|
{
|
||||||
|
public Task StartAsync(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
// FilterAllTabsAsync rebuilds the per-tab view from the message store;
|
||||||
|
// on Boot, tabs come up empty and the first chat events fill them, so
|
||||||
|
// we skip the rebuild to avoid a pointless full-history scan.
|
||||||
|
if (pluginInterface.Reason is not PluginLoadReason.Boot)
|
||||||
|
manager.FilterAllTabsAsync();
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal sealed class AutoTellTabsServiceInitHostedService(AutoTellTabsService service)
|
||||||
|
: IHostedService
|
||||||
|
{
|
||||||
|
public Task StartAsync(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
service.Initialize();
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal sealed class TellRouterServiceInitHostedService(Services.TellRouterService service)
|
||||||
|
: IHostedService
|
||||||
|
{
|
||||||
|
public Task StartAsync(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
service.Initialize();
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Eager-resolve trigger: resolving FailedTellNotifier in this adapter's ctor
|
||||||
|
// enables its game hook during host startup. StartAsync itself is a no-op.
|
||||||
|
internal sealed class FailedTellNotifierInitHostedService(FailedTellNotifier notifier)
|
||||||
|
: IHostedService
|
||||||
|
{
|
||||||
|
// No-op adapter: the ctor dependency above is the actual eager-resolve
|
||||||
|
// trigger. Field kept to match the IpcManager/TypingIpc/ExtraChat no-op
|
||||||
|
// adapters and to avoid the CS9113 unread-parameter warning.
|
||||||
|
private readonly FailedTellNotifier _notifier = notifier;
|
||||||
|
|
||||||
|
public Task StartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
||||||
|
|
||||||
|
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal sealed class PayloadHandlerInitHostedService(
|
||||||
|
PayloadHandler payloadHandler,
|
||||||
|
MessageList messageList
|
||||||
|
) : IHostedService
|
||||||
|
{
|
||||||
|
public async Task StartAsync(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
// Cycle resolution: both singletons exist by the time HostedServices
|
||||||
|
// run, so this is the first safe point to wire the setter.
|
||||||
|
messageList.AttachPayloadHandler(payloadHandler);
|
||||||
|
|
||||||
|
// IAddonLifecycle thread-affinity is not explicitly documented; wrap is
|
||||||
|
// defensive insurance — mirrors the window-registration RunOnFrameworkThread
|
||||||
|
// pattern established in PluginLifecycle.cs.
|
||||||
|
await Plugin.Framework.RunOnFrameworkThread(() =>
|
||||||
|
{
|
||||||
|
Plugin.AddonLifecycle.RegisterListener(
|
||||||
|
AddonEvent.PostUpdate,
|
||||||
|
"ItemDetail",
|
||||||
|
payloadHandler.MoveTooltip
|
||||||
|
);
|
||||||
|
Plugin.AddonLifecycle.RegisterListener(
|
||||||
|
AddonEvent.PostUpdate,
|
||||||
|
"ActionDetail",
|
||||||
|
payloadHandler.MoveTooltip
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task StopAsync(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
await Plugin.Framework.RunOnFrameworkThread(() =>
|
||||||
|
{
|
||||||
|
// Single call using the params-overload removes the delegate from all addons it was registered for (ItemDetail + ActionDetail both cleaned in one shot).
|
||||||
|
Plugin.AddonLifecycle.UnregisterListener(payloadHandler.MoveTooltip);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wires MainWindow into CommandHelpWindow post-container-build. CommandHelpWindow
|
||||||
|
// cannot take MainWindow as a ctor-param because that would close the cycle
|
||||||
|
// InputBar -> CommandHelpWindow -> MainWindow -> InputBar (MS.DI does not catch
|
||||||
|
// it through FactoryCallSite registrations and the resolve recurses silently).
|
||||||
|
// Both singletons exist by host.StartAsync time, so this is the first safe point
|
||||||
|
// to wire the setter — same setter-injection pattern as MessageList.AttachPayloadHandler.
|
||||||
|
internal sealed class CommandHelpWindowInitHostedService(
|
||||||
|
CommandHelpWindow commandHelpWindow,
|
||||||
|
MainWindow mainWindow
|
||||||
|
) : IHostedService
|
||||||
|
{
|
||||||
|
public Task StartAsync(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
commandHelpWindow.AttachMainWindow(mainWindow);
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Attaches the singleton PayloadHandler to every pre-allocated pop-out
|
||||||
|
// window's MessageList post-container-build. Pool/window cannot take the
|
||||||
|
// PayloadHandler via ctor (that would close the silent FactoryCallSite cycle —
|
||||||
|
// same setter-injection reason as MessageList.AttachPayloadHandler / CommandHelpWindow.
|
||||||
|
// AttachMainWindow). Both singletons exist by host.StartAsync time.
|
||||||
|
internal sealed class ChannelPopoutInitHostedService(
|
||||||
|
ChannelPopoutPool pool,
|
||||||
|
PayloadHandler payloadHandler
|
||||||
|
) : IHostedService
|
||||||
|
{
|
||||||
|
public Task StartAsync(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
foreach (var window in pool.Instances)
|
||||||
|
window.AttachPayloadHandler(payloadHandler);
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
||||||
|
}
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
using System.Text;
|
||||||
|
using Dalamud.Plugin.Services;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
|
namespace HellionChat.Infrastructure.Logging;
|
||||||
|
|
||||||
|
internal sealed class DalamudLogger : ILogger
|
||||||
|
{
|
||||||
|
private readonly string _name;
|
||||||
|
private readonly IPluginLog _pluginLog;
|
||||||
|
|
||||||
|
public DalamudLogger(string name, IPluginLog pluginLog)
|
||||||
|
{
|
||||||
|
_name = name;
|
||||||
|
_pluginLog = pluginLog;
|
||||||
|
}
|
||||||
|
|
||||||
|
IDisposable? ILogger.BeginScope<TState>(TState state) => default!;
|
||||||
|
|
||||||
|
// Filtering happens in Dalamud's /xllog. Letting every level through keeps
|
||||||
|
// the HellionChat side stateless; if we ever want a per-plugin floor we add
|
||||||
|
// a Config.LogLevel and tighten this method.
|
||||||
|
public bool IsEnabled(LogLevel logLevel) => true;
|
||||||
|
|
||||||
|
public void Log<TState>(
|
||||||
|
LogLevel logLevel,
|
||||||
|
EventId eventId,
|
||||||
|
TState state,
|
||||||
|
Exception? exception,
|
||||||
|
Func<TState, Exception?, string> formatter
|
||||||
|
)
|
||||||
|
{
|
||||||
|
if (!IsEnabled(logLevel))
|
||||||
|
return;
|
||||||
|
|
||||||
|
// U+200B between the bracket and the level is a quiet provenance
|
||||||
|
// marker; byte-distinguishable from any 1:1 port of this format.
|
||||||
|
if ((int)logLevel <= (int)LogLevel.Information)
|
||||||
|
{
|
||||||
|
_pluginLog.Information($"[{_name}]{{{(int)logLevel}}} {state}");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var sb = new StringBuilder();
|
||||||
|
sb.Append($"[{_name}]{{{(int)logLevel}}} {state} {exception?.Message}");
|
||||||
|
if (!string.IsNullOrWhiteSpace(exception?.StackTrace))
|
||||||
|
sb.AppendLine(exception.StackTrace);
|
||||||
|
|
||||||
|
var inner = exception?.InnerException;
|
||||||
|
while (inner != null)
|
||||||
|
{
|
||||||
|
sb.AppendLine($"InnerException {inner}: {inner.Message}");
|
||||||
|
sb.AppendLine(inner.StackTrace);
|
||||||
|
inner = inner.InnerException;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (logLevel == LogLevel.Warning)
|
||||||
|
_pluginLog.Warning(sb.ToString());
|
||||||
|
else if (logLevel == LogLevel.Error)
|
||||||
|
_pluginLog.Error(sb.ToString());
|
||||||
|
else
|
||||||
|
_pluginLog.Fatal(sb.ToString());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
using System.Collections.Concurrent;
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Security.Cryptography;
|
||||||
|
using System.Text;
|
||||||
|
using Dalamud.Plugin.Services;
|
||||||
|
using HellionChat.Branding;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
|
namespace HellionChat.Infrastructure.Logging;
|
||||||
|
|
||||||
|
[ProviderAlias("Dalamud")]
|
||||||
|
public sealed class DalamudLoggingProvider : ILoggerProvider
|
||||||
|
{
|
||||||
|
// Hellion Forge Bronze (#C2410C). Mixed into the bootstrap fingerprint.
|
||||||
|
private const string HellionMarker = "HellionForgeBronzeC2410C";
|
||||||
|
|
||||||
|
private readonly ConcurrentDictionary<string, DalamudLogger> _loggers = new(
|
||||||
|
StringComparer.OrdinalIgnoreCase
|
||||||
|
);
|
||||||
|
|
||||||
|
private readonly IPluginLog _pluginLog;
|
||||||
|
|
||||||
|
public DalamudLoggingProvider(IPluginLog pluginLog)
|
||||||
|
{
|
||||||
|
_pluginLog = pluginLog;
|
||||||
|
EmitBootstrapBanner();
|
||||||
|
}
|
||||||
|
|
||||||
|
// One-shot per plugin load. Intentionally visible in xllog so uncredited
|
||||||
|
// ports of the DalamudLogger trio keep announcing their origin — the
|
||||||
|
// mini fox silhouette goes first, then the textual provenance line.
|
||||||
|
private void EmitBootstrapBanner()
|
||||||
|
{
|
||||||
|
var version =
|
||||||
|
typeof(DalamudLoggingProvider).Assembly.GetName().Version?.ToString() ?? "0.0.0";
|
||||||
|
var fingerprint = ComputeFingerprint(version);
|
||||||
|
|
||||||
|
foreach (var line in HellionForgeAscii.FoxMini.Split('\n'))
|
||||||
|
{
|
||||||
|
var trimmed = line.TrimEnd('\r');
|
||||||
|
if (trimmed.Length > 0)
|
||||||
|
_pluginLog.Information(trimmed);
|
||||||
|
}
|
||||||
|
|
||||||
|
_pluginLog.Information("by Julia Moon - Hellion Forge");
|
||||||
|
_pluginLog.Information(
|
||||||
|
$"HellionChat DI-Logger bootstrap v{version} fingerprint={fingerprint}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string ComputeFingerprint(string version)
|
||||||
|
{
|
||||||
|
var seed = Encoding.UTF8.GetBytes($"{HellionMarker}-{version}");
|
||||||
|
var hash = SHA256.HashData(seed);
|
||||||
|
var sb = new StringBuilder(8);
|
||||||
|
for (var i = 0; i < 4; i++)
|
||||||
|
sb.Append(hash[i].ToString("x2"));
|
||||||
|
return sb.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
|
public ILogger CreateLogger(string categoryName)
|
||||||
|
{
|
||||||
|
// Category-name normalisation mirrors Lightless: take the leaf type
|
||||||
|
// name, then either ellipsis-trim long ones or left-pad short ones to
|
||||||
|
// 15 chars so the xllog column stays aligned across services.
|
||||||
|
var catName = categoryName.Split(".", StringSplitOptions.RemoveEmptyEntries).Last();
|
||||||
|
if (catName.Length > 15)
|
||||||
|
catName = string.Concat(
|
||||||
|
catName.AsSpan(0, 6),
|
||||||
|
"...",
|
||||||
|
catName.AsSpan(catName.Length - 6, 6)
|
||||||
|
);
|
||||||
|
else
|
||||||
|
catName = catName.PadLeft(15);
|
||||||
|
|
||||||
|
return _loggers.GetOrAdd(catName, name => new DalamudLogger(name, _pluginLog));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
_loggers.Clear();
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
using Dalamud.Plugin.Services;
|
||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using Microsoft.Extensions.DependencyInjection.Extensions;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
|
namespace HellionChat.Infrastructure.Logging;
|
||||||
|
|
||||||
|
public static class DalamudLoggingProviderExtensions
|
||||||
|
{
|
||||||
|
public static ILoggingBuilder AddDalamudLogging(
|
||||||
|
this ILoggingBuilder builder,
|
||||||
|
IPluginLog pluginLog
|
||||||
|
)
|
||||||
|
{
|
||||||
|
builder.ClearProviders();
|
||||||
|
builder.Services.TryAddEnumerable(
|
||||||
|
ServiceDescriptor.Singleton<ILoggerProvider, DalamudLoggingProvider>(
|
||||||
|
_ => new DalamudLoggingProvider(pluginLog)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
return builder;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,150 @@
|
|||||||
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
using NAudio.Wave;
|
||||||
|
|
||||||
|
namespace HellionChat.Integrations;
|
||||||
|
|
||||||
|
// Plays the three bundled WAV notification sounds via NAudio WaveOutEvent.
|
||||||
|
// WaveOutEvent/WinMM is the correct backend for FFXIV on Wine: it works
|
||||||
|
// without Media Foundation (which Wine does not support for MP3/AAC).
|
||||||
|
//
|
||||||
|
// Playback volume comes from Configuration.CustomSoundVolume via the Play
|
||||||
|
// parameter, clamped to [0,1]. The 16 game sounds are unaffected — they go
|
||||||
|
// through UIGlobals.PlaySoundEffect, which the plugin cannot scale.
|
||||||
|
internal sealed class CustomAudioPlayer : IDisposable
|
||||||
|
{
|
||||||
|
// Sound bytes are read once at construction so each Play() wraps a fresh
|
||||||
|
// MemoryStream rather than re-reading the manifest stream (which becomes
|
||||||
|
// unreadable after the first read and would require Seek support).
|
||||||
|
private readonly byte[][] _soundData;
|
||||||
|
private readonly ILogger<CustomAudioPlayer> _logger;
|
||||||
|
|
||||||
|
private WaveOutEvent? _outputDevice;
|
||||||
|
private WaveFileReader? _reader;
|
||||||
|
private readonly object _lock = new();
|
||||||
|
|
||||||
|
public CustomAudioPlayer(ILogger<CustomAudioPlayer> logger)
|
||||||
|
{
|
||||||
|
_logger = logger;
|
||||||
|
_soundData = new byte[3][];
|
||||||
|
|
||||||
|
for (var i = 0; i < 3; i++)
|
||||||
|
{
|
||||||
|
var resourceName = $"HellionChat.Sounds.notification-{i + 1}.wav";
|
||||||
|
using var stream = typeof(CustomAudioPlayer).Assembly.GetManifestResourceStream(
|
||||||
|
resourceName
|
||||||
|
);
|
||||||
|
if (stream is null)
|
||||||
|
{
|
||||||
|
_logger.LogWarning(
|
||||||
|
"Embedded sound resource not found: {Resource}. "
|
||||||
|
+ "Custom sound {Index} will be silent.",
|
||||||
|
resourceName,
|
||||||
|
i + 1
|
||||||
|
);
|
||||||
|
_soundData[i] = Array.Empty<byte>();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
using var ms = new MemoryStream();
|
||||||
|
stream.CopyTo(ms);
|
||||||
|
_soundData[i] = ms.ToArray();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// customIndex is 1, 2, or 3, matching the sound file suffix.
|
||||||
|
// Stops any currently playing sound before starting the new one.
|
||||||
|
// NAudio playback runs on its own thread; this method returns immediately.
|
||||||
|
public void Play(int customIndex, float volume)
|
||||||
|
{
|
||||||
|
if (customIndex < 1 || customIndex > 3)
|
||||||
|
{
|
||||||
|
_logger.LogWarning(
|
||||||
|
"CustomAudioPlayer.Play called with out-of-range index {Index}",
|
||||||
|
customIndex
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var data = _soundData[customIndex - 1];
|
||||||
|
if (data.Length == 0)
|
||||||
|
{
|
||||||
|
_logger.LogWarning(
|
||||||
|
"Sound data for index {Index} is empty; skipping playback",
|
||||||
|
customIndex
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
lock (_lock)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
StopCurrent();
|
||||||
|
|
||||||
|
var ms = new MemoryStream(data, writable: false);
|
||||||
|
_reader = new WaveFileReader(ms);
|
||||||
|
|
||||||
|
_outputDevice = new WaveOutEvent();
|
||||||
|
// Init opens the device and creates the WinMM handle. Volume
|
||||||
|
// must be set after Init, otherwise waveOutSetVolume fails with
|
||||||
|
// InvalidHandle.
|
||||||
|
_outputDevice.Init(_reader);
|
||||||
|
// AUDIO-1: volume comes from Configuration.CustomSoundVolume.
|
||||||
|
// Clamp here too — a hand-edited config could carry an
|
||||||
|
// out-of-range value, and WaveOutEvent.Volume rejects those.
|
||||||
|
_outputDevice.Volume = Math.Clamp(volume, 0f, 1f);
|
||||||
|
_outputDevice.Play();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogWarning(
|
||||||
|
ex,
|
||||||
|
"Failed to play custom notification sound {Index}",
|
||||||
|
customIndex
|
||||||
|
);
|
||||||
|
StopCurrent();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Stops and tears down the active WaveOutEvent + WaveFileReader without
|
||||||
|
// throwing. Called on Play (to interrupt previous sound) and from Dispose.
|
||||||
|
// Guards Stop() with a PlaybackState check because waveOutReset blocks even
|
||||||
|
// when playback already finished; under Wine this can stall the WinMM
|
||||||
|
// callback thread if many sounds arrive in quick succession.
|
||||||
|
private void StopCurrent()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (_outputDevice?.PlaybackState == PlaybackState.Playing)
|
||||||
|
_outputDevice.Stop();
|
||||||
|
_outputDevice?.Dispose();
|
||||||
|
_outputDevice = null;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogWarning(ex, "Exception while stopping current WaveOutEvent");
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_reader?.Dispose();
|
||||||
|
_reader = null;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogWarning(ex, "Exception while disposing WaveFileReader");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// At plugin unload the PendingMessageThread is already cancelled and the
|
||||||
|
// draw loop is gone, so _lock is uncontended here. Calling StopCurrent
|
||||||
|
// outside the lock avoids holding it across the blocking waveOutReset /
|
||||||
|
// WaveOutEvent.Dispose, which can freeze on Wine during unload.
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
StopCurrent();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
using System;
|
||||||
|
using Dalamud.Hooking;
|
||||||
|
using Dalamud.Interface.ImGuiNotification;
|
||||||
|
using FFXIVClientStructs.FFXIV.Client.System.String;
|
||||||
|
using FFXIVClientStructs.FFXIV.Client.UI.Misc;
|
||||||
|
using HellionChat._Helpers;
|
||||||
|
using HellionChat.Resources;
|
||||||
|
using HellionChat.Util;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
|
namespace HellionChat.Integrations;
|
||||||
|
|
||||||
|
// A minimal, failed-tell-specific game hook. A locale-robust "tell failed"
|
||||||
|
// signal is not reachable over the processed message stream (Message carries
|
||||||
|
// no LogMessage row id, ChatCode 60 is too broad). This hooks the one
|
||||||
|
// ShowLogMessageString overload and toasts on a pinned id set. It is NOT the
|
||||||
|
// broad ad-block hook layer.
|
||||||
|
internal sealed class FailedTellNotifier : IDisposable
|
||||||
|
{
|
||||||
|
private readonly ILogger<FailedTellNotifier> _logger;
|
||||||
|
private readonly Hook<RaptureLogModule.Delegates.ShowLogMessageString>? _hook;
|
||||||
|
|
||||||
|
public unsafe FailedTellNotifier(ILogger<FailedTellNotifier> logger)
|
||||||
|
{
|
||||||
|
_logger = logger;
|
||||||
|
|
||||||
|
// Creating/enabling a hook is safe off the framework thread (the
|
||||||
|
// ctor runs during host startup on the framework thread,
|
||||||
|
// eager-resolved via FailedTellNotifierInitHostedService).
|
||||||
|
_hook =
|
||||||
|
Plugin.GameInteropProvider.HookFromAddress<RaptureLogModule.Delegates.ShowLogMessageString>(
|
||||||
|
RaptureLogModule.MemberFunctionPointers.ShowLogMessageString,
|
||||||
|
ShowLogMessageStringDetour
|
||||||
|
);
|
||||||
|
_hook.Enable();
|
||||||
|
}
|
||||||
|
|
||||||
|
private unsafe void ShowLogMessageStringDetour(
|
||||||
|
RaptureLogModule* module,
|
||||||
|
uint logMessageId,
|
||||||
|
Utf8String* value
|
||||||
|
)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (
|
||||||
|
FailedTellMatcher.ShouldNotify(
|
||||||
|
logMessageId,
|
||||||
|
Plugin.Config.NotifyFailedTell,
|
||||||
|
FailedTellMatcher.FailedTellLogMessageIds
|
||||||
|
)
|
||||||
|
)
|
||||||
|
{
|
||||||
|
var recipient = value is null ? string.Empty : value->ToString();
|
||||||
|
var content = string.IsNullOrEmpty(recipient)
|
||||||
|
? HellionStrings.FailedTell_Notification_Generic
|
||||||
|
: string.Format(HellionStrings.FailedTell_Notification_Named, recipient);
|
||||||
|
WrapperUtil.AddNotification(content, NotificationType.Warning);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogError(ex, "FailedTellNotifier detour threw");
|
||||||
|
}
|
||||||
|
|
||||||
|
_hook!.Original(module, logMessageId, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
_hook?.Disable();
|
||||||
|
_hook?.Dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@ using System;
|
|||||||
using Dalamud.Plugin;
|
using Dalamud.Plugin;
|
||||||
using Dalamud.Plugin.Ipc;
|
using Dalamud.Plugin.Ipc;
|
||||||
using Dalamud.Plugin.Services;
|
using Dalamud.Plugin.Services;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
namespace HellionChat.Integrations;
|
namespace HellionChat.Integrations;
|
||||||
@@ -23,7 +24,7 @@ internal sealed class HonorificService : IDisposable
|
|||||||
private readonly ICallGateSubscriber<object> _ready;
|
private readonly ICallGateSubscriber<object> _ready;
|
||||||
private readonly ICallGateSubscriber<object> _disposing;
|
private readonly ICallGateSubscriber<object> _disposing;
|
||||||
|
|
||||||
private readonly IPluginLog _log;
|
private readonly ILogger<HonorificService> _logger;
|
||||||
private readonly IFramework _framework;
|
private readonly IFramework _framework;
|
||||||
private bool _versionWarningLogged;
|
private bool _versionWarningLogged;
|
||||||
|
|
||||||
@@ -34,12 +35,12 @@ internal sealed class HonorificService : IDisposable
|
|||||||
|
|
||||||
public HonorificService(
|
public HonorificService(
|
||||||
IDalamudPluginInterface pluginInterface,
|
IDalamudPluginInterface pluginInterface,
|
||||||
IPluginLog log,
|
ILogger<HonorificService> logger,
|
||||||
IFramework framework
|
IFramework framework
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
_framework = framework;
|
_framework = framework;
|
||||||
_log = log;
|
_logger = logger;
|
||||||
|
|
||||||
// Gate objects are cached per-name by Dalamud and safe to register
|
// Gate objects are cached per-name by Dalamud and safe to register
|
||||||
// before Honorific loads — they just won't fire until it does.
|
// before Honorific loads — they just won't fire until it does.
|
||||||
@@ -84,7 +85,7 @@ internal sealed class HonorificService : IDisposable
|
|||||||
{
|
{
|
||||||
if (!_versionWarningLogged)
|
if (!_versionWarningLogged)
|
||||||
{
|
{
|
||||||
_log.Warning(
|
_logger.LogWarning(
|
||||||
"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.Item1,
|
||||||
@@ -104,7 +105,7 @@ internal sealed class HonorificService : IDisposable
|
|||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
// Honorific not installed or not yet initialised — Ready will retry.
|
// Honorific not installed or not yet initialised — Ready will retry.
|
||||||
_log.Debug(ex, "Honorific not available at HellionChat startup; awaiting Ready.");
|
_logger.LogDebug(ex, "Honorific not available at HellionChat startup; awaiting Ready.");
|
||||||
IsAvailable = false;
|
IsAvailable = false;
|
||||||
CurrentTitle = null;
|
CurrentTitle = null;
|
||||||
}
|
}
|
||||||
@@ -149,7 +150,7 @@ internal sealed class HonorificService : IDisposable
|
|||||||
{
|
{
|
||||||
// Warning not Debug — a silent unsubscribe failure leaks a live
|
// Warning not Debug — a silent unsubscribe failure leaks a live
|
||||||
// subscription across plugin reloads.
|
// subscription across plugin reloads.
|
||||||
_log.Warning(
|
_logger.LogWarning(
|
||||||
ex,
|
ex,
|
||||||
"Honorific unsubscribe failed (likely API break or gate already gone)."
|
"Honorific unsubscribe failed (likely API break or gate already gone)."
|
||||||
);
|
);
|
||||||
@@ -194,4 +195,23 @@ internal sealed class HonorificService : IDisposable
|
|||||||
return false;
|
return false;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Test seam: the three status fields are private-set and IPC-driven, which a
|
||||||
|
// headless /xlperf run can't reach (Honorific is usually absent in tests).
|
||||||
|
// Callers MUST snapshot the prior values and restore them in CleanUp, and
|
||||||
|
// MUST drive Set -> Draw -> Assert within ONE synchronous RunStep (never
|
||||||
|
// Waiting between Set and Assert) — a between-frame OnReady/OnTitleChanged
|
||||||
|
// would otherwise clobber this state and a CleanUp restore can't un-corrupt a
|
||||||
|
// mid-flight assertion. (A FontsReady precondition gate returning Waiting
|
||||||
|
// BEFORE the snapshot/Set is fine — nothing is mutated yet.)
|
||||||
|
internal void TestOnly_SetState(
|
||||||
|
bool isAvailable,
|
||||||
|
(uint Major, uint Minor)? detectedApiVersion,
|
||||||
|
HonorificTitleData? title
|
||||||
|
)
|
||||||
|
{
|
||||||
|
IsAvailable = isAvailable;
|
||||||
|
DetectedApiVersion = detectedApiVersion;
|
||||||
|
CurrentTitle = title;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
namespace HellionChat.Integrations;
|
||||||
|
|
||||||
|
internal enum HonorificStatusKind
|
||||||
|
{
|
||||||
|
NotInstalled,
|
||||||
|
Incompatible,
|
||||||
|
Detected,
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static class HonorificStatus
|
||||||
|
{
|
||||||
|
// Mirrors the 1.5.6 three-state discriminator (1d3b429:About.cs:171/183/196):
|
||||||
|
// it keys on IsAvailable + the *nullability* of DetectedApiVersion, never a
|
||||||
|
// recomputed major check. IsAvailable already encodes the compatibility
|
||||||
|
// result HonorificService set during the initial pull. Null-safe: an
|
||||||
|
// (isAvailable=true, detectedApiVersion=null) state a test seam can produce
|
||||||
|
// resolves to NotInstalled rather than dereferencing null.
|
||||||
|
internal static HonorificStatusKind Resolve(
|
||||||
|
bool isAvailable,
|
||||||
|
(uint Major, uint Minor)? detectedApiVersion
|
||||||
|
)
|
||||||
|
{
|
||||||
|
if (isAvailable && detectedApiVersion is not null)
|
||||||
|
return HonorificStatusKind.Detected;
|
||||||
|
if (detectedApiVersion is not null)
|
||||||
|
return HonorificStatusKind.Incompatible;
|
||||||
|
return HonorificStatusKind.NotInstalled;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,11 +5,10 @@ namespace HellionChat.Integrations;
|
|||||||
// Local DTO mirroring Honorific's TitleData — no hard reference to Honorific.dll
|
// Local DTO mirroring Honorific's TitleData — no hard reference to Honorific.dll
|
||||||
// so HellionChat loads cleanly when Honorific is absent.
|
// so HellionChat loads cleanly when Honorific is absent.
|
||||||
//
|
//
|
||||||
// v1.4.7: render Glow only. Gradient (Color3 / GradientColourSet / Style) is
|
// Color is rendered in the header title slot (HonorificHeader). Glow, Color3,
|
||||||
// parsed and stashed so a future cycle can render it without re-shaping the
|
// GradientColourSet and GradientAnimationStyle are parsed but not rendered —
|
||||||
// JSON roundtrip — see vault anchor "Honorific Full Gradient Port" (would
|
// the animated gradient lives inside Honorific and is not exposed over IPC.
|
||||||
// need GradientSystem.cs + the hardcoded Pride-palette list ported, or an
|
// The fields stay in the DTO so the JSON roundtrip remains lossless.
|
||||||
// upstream IPC PR exposing the resolved frame colour).
|
|
||||||
internal sealed record HonorificTitleData(
|
internal sealed record HonorificTitleData(
|
||||||
string? Title,
|
string? Title,
|
||||||
bool IsPrefix,
|
bool IsPrefix,
|
||||||
|
|||||||
@@ -1,9 +1,12 @@
|
|||||||
using Dalamud.Plugin.Ipc;
|
using Dalamud.Plugin.Ipc;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
namespace HellionChat.Ipc;
|
namespace HellionChat.Ipc;
|
||||||
|
|
||||||
public sealed class ExtraChat : IDisposable
|
public sealed class ExtraChat : IDisposable
|
||||||
{
|
{
|
||||||
|
private readonly ILogger<ExtraChat> _logger;
|
||||||
|
|
||||||
#pragma warning disable CS0649 // Assigned through IPC
|
#pragma warning disable CS0649 // Assigned through IPC
|
||||||
[Serializable]
|
[Serializable]
|
||||||
private struct OverrideInfo
|
private struct OverrideInfo
|
||||||
@@ -28,7 +31,7 @@ public sealed class ExtraChat : IDisposable
|
|||||||
|
|
||||||
// volatile: IPC callbacks fire on a Dalamud thread while ImGui reads these.
|
// volatile: IPC callbacks fire on a Dalamud thread while ImGui reads these.
|
||||||
// Reference assignment is atomic on x64, but the barrier ensures visibility
|
// Reference assignment is atomic on x64, but the barrier ensures visibility
|
||||||
// across threads (especially Mono/Wine). See AUDIT-2026-05-05 [SEC-01].
|
// across threads (especially Mono/Wine). Raised in the 2026-05-05 audit.
|
||||||
private volatile Dictionary<string, uint> ChannelCommandColoursInternal = new();
|
private volatile Dictionary<string, uint> ChannelCommandColoursInternal = new();
|
||||||
internal IReadOnlyDictionary<string, uint> ChannelCommandColours =>
|
internal IReadOnlyDictionary<string, uint> ChannelCommandColours =>
|
||||||
ChannelCommandColoursInternal;
|
ChannelCommandColoursInternal;
|
||||||
@@ -36,8 +39,9 @@ public sealed class ExtraChat : IDisposable
|
|||||||
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(ILogger<ExtraChat> logger)
|
||||||
{
|
{
|
||||||
|
_logger = logger;
|
||||||
OverrideChannelGate = Plugin.Interface.GetIpcSubscriber<OverrideInfo, object>(
|
OverrideChannelGate = Plugin.Interface.GetIpcSubscriber<OverrideInfo, object>(
|
||||||
"ExtraChat.OverrideChannelColour"
|
"ExtraChat.OverrideChannelColour"
|
||||||
);
|
);
|
||||||
@@ -62,10 +66,7 @@ public sealed class ExtraChat : IDisposable
|
|||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
// ExtraChat is optional; IPC failure is normal when the plugin isn't loaded.
|
// ExtraChat is optional; IPC failure is normal when the plugin isn't loaded.
|
||||||
Plugin.LogProxy.Verbose(
|
_logger.LogTrace(ex, "ExtraChat IPC initial state query failed (peer not loaded?)");
|
||||||
ex,
|
|
||||||
"ExtraChat IPC initial state query failed (peer not loaded?)"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
using Dalamud.Plugin.Ipc;
|
using Dalamud.Plugin.Ipc;
|
||||||
using HellionChat.Code;
|
using HellionChat.Code;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
namespace HellionChat.Ipc;
|
namespace HellionChat.Ipc;
|
||||||
|
|
||||||
@@ -19,7 +20,7 @@ internal sealed class TypingIpc : IDisposable
|
|||||||
private ICallGateProvider<ChatInputState> StateQueryGate { get; }
|
private ICallGateProvider<ChatInputState> StateQueryGate { get; }
|
||||||
private ICallGateProvider<ChatInputState, object?> StateChangedGate { get; }
|
private ICallGateProvider<ChatInputState, object?> StateChangedGate { get; }
|
||||||
|
|
||||||
// v1.4.9 R4: ChatTwo IPC compatibility mirror. Some third-party plugins
|
// v1.4.9: ChatTwo IPC compatibility mirror. Some third-party plugins
|
||||||
// have a no-fork policy and subscribe only to ChatTwo.*-prefixed IPC
|
// have a no-fork policy and subscribe only to ChatTwo.*-prefixed IPC
|
||||||
// gates. HellionChat replaces ChatTwo (conflict detection prevents
|
// gates. HellionChat replaces ChatTwo (conflict detection prevents
|
||||||
// parallel loading), so mirroring the ChatTwo provider slots lets those
|
// parallel loading), so mirroring the ChatTwo provider slots lets those
|
||||||
@@ -33,9 +34,14 @@ internal sealed class TypingIpc : IDisposable
|
|||||||
private ChatInputState LastState;
|
private ChatInputState LastState;
|
||||||
private bool HasState;
|
private bool HasState;
|
||||||
|
|
||||||
internal TypingIpc(Plugin plugin)
|
private readonly Ui.Components.InputBar _inputBar;
|
||||||
|
private readonly ILogger<TypingIpc> _logger;
|
||||||
|
|
||||||
|
internal TypingIpc(Plugin plugin, Ui.Components.InputBar inputBar, ILogger<TypingIpc> logger)
|
||||||
{
|
{
|
||||||
Plugin = plugin;
|
Plugin = plugin;
|
||||||
|
_inputBar = inputBar;
|
||||||
|
_logger = logger;
|
||||||
|
|
||||||
StateQueryGate = Plugin.Interface.GetIpcProvider<ChatInputState>(
|
StateQueryGate = Plugin.Interface.GetIpcProvider<ChatInputState>(
|
||||||
"HellionChat.GetChatInputState"
|
"HellionChat.GetChatInputState"
|
||||||
@@ -44,7 +50,7 @@ internal sealed class TypingIpc : IDisposable
|
|||||||
"HellionChat.ChatInputStateChanged"
|
"HellionChat.ChatInputStateChanged"
|
||||||
);
|
);
|
||||||
|
|
||||||
// v1.4.9 R4: ChatTwo-prefixed compatibility slots (see class-level comment).
|
// v1.4.9: ChatTwo-prefixed compatibility slots (see class-level comment).
|
||||||
ChatTwoStateQueryGate = Plugin.Interface.GetIpcProvider<ChatInputState>(
|
ChatTwoStateQueryGate = Plugin.Interface.GetIpcProvider<ChatInputState>(
|
||||||
"ChatTwo.GetChatInputState"
|
"ChatTwo.GetChatInputState"
|
||||||
);
|
);
|
||||||
@@ -58,25 +64,34 @@ internal sealed class TypingIpc : IDisposable
|
|||||||
|
|
||||||
private ChatInputState BuildState()
|
private ChatInputState BuildState()
|
||||||
{
|
{
|
||||||
var log = Plugin.ChatLogWindow;
|
|
||||||
|
|
||||||
var usedChannel = Plugin.CurrentTab.CurrentChannel;
|
var usedChannel = Plugin.CurrentTab.CurrentChannel;
|
||||||
var inputChannel = usedChannel.UseTempChannel
|
var inputChannel = usedChannel.UseTempChannel
|
||||||
? usedChannel.TempChannel
|
? usedChannel.TempChannel
|
||||||
: usedChannel.Channel;
|
: usedChannel.Channel;
|
||||||
var channelType = inputChannel.ToChatType();
|
var channelType = inputChannel.ToChatType();
|
||||||
|
|
||||||
|
// MainWindow is Phase-1-resolved and never reassigned;
|
||||||
|
// the `?.` is defense-in-depth for pre-Phase-1 IPC-pulls.
|
||||||
|
var mainWindowOpen = Plugin.MainWindow?.IsOpen ?? false;
|
||||||
|
|
||||||
|
// Stale-state guard: InputBar's focus and pending-buffer fields are
|
||||||
|
// only written by DrawInputField. Closing MainWindow freezes them, so
|
||||||
|
// gate all four state fields on mainWindowOpen.
|
||||||
|
var inputFocused = mainWindowOpen && _inputBar.IsFocused;
|
||||||
|
var hasText = mainWindowOpen && _inputBar.PendingLength > 0;
|
||||||
|
var textLength = mainWindowOpen ? _inputBar.PendingLength : 0;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
InputVisible: !log.IsHidden,
|
InputVisible: mainWindowOpen,
|
||||||
log.InputFocused,
|
InputFocused: inputFocused,
|
||||||
HasText: log.Chat.Length > 0,
|
HasText: hasText,
|
||||||
IsTyping: log is { InputFocused: true, Chat.Length: > 0 },
|
IsTyping: hasText,
|
||||||
TextLength: log.Chat.Length,
|
TextLength: textLength,
|
||||||
ChannelType: channelType
|
ChannelType: channelType
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private ChatInputState GetState() => BuildState();
|
internal ChatInputState GetState() => BuildState();
|
||||||
|
|
||||||
internal void Update()
|
internal void Update()
|
||||||
{
|
{
|
||||||
@@ -87,7 +102,7 @@ internal sealed class TypingIpc : IDisposable
|
|||||||
HasState = true;
|
HasState = true;
|
||||||
LastState = state;
|
LastState = state;
|
||||||
StateChangedGate.SendMessage(state);
|
StateChangedGate.SendMessage(state);
|
||||||
// v1.4.9 R4: mirror on ChatTwo-prefixed slot for no-fork-policy plugins.
|
// v1.4.9: mirror on ChatTwo-prefixed slot for no-fork-policy plugins.
|
||||||
ChatTwoStateChangedGate.SendMessage(state);
|
ChatTwoStateChangedGate.SendMessage(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,14 @@
|
|||||||
using Dalamud.Game.Text.SeStringHandling;
|
using Dalamud.Game.Text.SeStringHandling;
|
||||||
using Dalamud.Game.Text.SeStringHandling.Payloads;
|
using Dalamud.Game.Text.SeStringHandling.Payloads;
|
||||||
using Dalamud.Plugin.Ipc;
|
using Dalamud.Plugin.Ipc;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
namespace HellionChat;
|
namespace HellionChat;
|
||||||
|
|
||||||
internal sealed class IpcManager : IDisposable
|
internal sealed class IpcManager : IDisposable
|
||||||
{
|
{
|
||||||
|
private readonly ILogger<IpcManager> _logger;
|
||||||
|
|
||||||
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; }
|
||||||
@@ -19,7 +22,7 @@ internal sealed class IpcManager : IDisposable
|
|||||||
object?
|
object?
|
||||||
> InvokeGate { get; }
|
> InvokeGate { get; }
|
||||||
|
|
||||||
// v1.4.9 R4: ChatTwo IPC compatibility mirror. Third-party plugins with
|
// v1.4.9: ChatTwo IPC compatibility mirror. Third-party plugins with
|
||||||
// a no-fork policy (e.g. Artisan, AllaganTools) only subscribe to the
|
// a no-fork policy (e.g. Artisan, AllaganTools) only subscribe to the
|
||||||
// ChatTwo.*-prefixed context-menu integration gates. Mirroring all four
|
// ChatTwo.*-prefixed context-menu integration gates. Mirroring all four
|
||||||
// provider slots under the ChatTwo namespace lets those plugins keep
|
// provider slots under the ChatTwo namespace lets those plugins keep
|
||||||
@@ -41,8 +44,9 @@ internal sealed class IpcManager : IDisposable
|
|||||||
|
|
||||||
internal List<string> Registered { get; } = [];
|
internal List<string> Registered { get; } = [];
|
||||||
|
|
||||||
public IpcManager()
|
public IpcManager(ILogger<IpcManager> logger)
|
||||||
{
|
{
|
||||||
|
_logger = logger;
|
||||||
RegisterGate = Plugin.Interface.GetIpcProvider<string>("HellionChat.Register");
|
RegisterGate = Plugin.Interface.GetIpcProvider<string>("HellionChat.Register");
|
||||||
RegisterGate.RegisterFunc(Register);
|
RegisterGate.RegisterFunc(Register);
|
||||||
|
|
||||||
@@ -61,7 +65,7 @@ internal sealed class IpcManager : IDisposable
|
|||||||
object?
|
object?
|
||||||
>("HellionChat.Invoke");
|
>("HellionChat.Invoke");
|
||||||
|
|
||||||
// v1.4.9 R4: ChatTwo-prefixed mirrors of the four context-menu slots
|
// v1.4.9: ChatTwo-prefixed mirrors of the four context-menu slots
|
||||||
// above. Share the same Register/Unregister backing methods so a
|
// above. Share the same Register/Unregister backing methods so a
|
||||||
// plugin that subscribes via either namespace lands in the same
|
// plugin that subscribes via either namespace lands in the same
|
||||||
// Registered list. SendMessage on Invoke fans out to both gates.
|
// Registered list. SendMessage on Invoke fans out to both gates.
|
||||||
@@ -99,7 +103,7 @@ internal sealed class IpcManager : IDisposable
|
|||||||
)
|
)
|
||||||
{
|
{
|
||||||
InvokeGate.SendMessage(id, sender, contentId, payload, senderString, content);
|
InvokeGate.SendMessage(id, sender, contentId, payload, senderString, content);
|
||||||
// v1.4.9 R4: fan out the same event to plugins listening on ChatTwo.Invoke.
|
// v1.4.9: fan out the same event to plugins listening on ChatTwo.Invoke.
|
||||||
ChatTwoInvokeGate.SendMessage(id, sender, contentId, payload, senderString, content);
|
ChatTwoInvokeGate.SendMessage(id, sender, contentId, payload, senderString, content);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -175,8 +175,6 @@ public partial class Message
|
|||||||
}
|
}
|
||||||
|
|
||||||
var nextIsAutoTranslate = false;
|
var nextIsAutoTranslate = false;
|
||||||
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
|
||||||
@@ -207,25 +205,6 @@ public partial class Message
|
|||||||
var wordUsed = false;
|
var wordUsed = false;
|
||||||
var tokenUsed = false;
|
var tokenUsed = false;
|
||||||
|
|
||||||
if (
|
|
||||||
checkForEmotes
|
|
||||||
&& EmoteCache.Exists(word)
|
|
||||||
&& !Plugin.Config.BlockedEmotes.Contains(word)
|
|
||||||
)
|
|
||||||
{
|
|
||||||
// Add the previous sentence before adding the emote
|
|
||||||
AddChunkWithMessage(text.NewWithStyle(chunk, sentenceBuilder.ToString()));
|
|
||||||
AddChunkWithMessage(
|
|
||||||
new TextChunk(chunk.Source, EmotePayload.ResolveEmote(word), word)
|
|
||||||
{
|
|
||||||
FallbackColour = text.FallbackColour,
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
wordUsed = true;
|
|
||||||
sentenceBuilder.Clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
||||||
|
|||||||
+186
-30
@@ -7,13 +7,16 @@ using Dalamud.Game.Text.SeStringHandling;
|
|||||||
using Dalamud.Hooking;
|
using Dalamud.Hooking;
|
||||||
using Dalamud.Interface.ImGuiNotification;
|
using Dalamud.Interface.ImGuiNotification;
|
||||||
using Dalamud.Plugin.Services;
|
using Dalamud.Plugin.Services;
|
||||||
|
using FFXIVClientStructs.FFXIV.Client.UI;
|
||||||
using FFXIVClientStructs.FFXIV.Client.UI.Misc;
|
using FFXIVClientStructs.FFXIV.Client.UI.Misc;
|
||||||
|
using HellionChat._Helpers;
|
||||||
using HellionChat.Code;
|
using HellionChat.Code;
|
||||||
using HellionChat.Resources;
|
using HellionChat.Resources;
|
||||||
using HellionChat.Util;
|
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;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
namespace HellionChat;
|
namespace HellionChat;
|
||||||
|
|
||||||
@@ -22,6 +25,7 @@ internal class MessageManager : IAsyncDisposable
|
|||||||
internal const int MessageDisplayLimit = 10_000;
|
internal const int MessageDisplayLimit = 10_000;
|
||||||
|
|
||||||
private Plugin Plugin { get; }
|
private Plugin Plugin { get; }
|
||||||
|
private readonly ILogger<MessageManager> _logger;
|
||||||
internal MessageStore Store { get; }
|
internal MessageStore Store { get; }
|
||||||
|
|
||||||
private Dictionary<ChatType, NameFormatting> Formats { get; } = [];
|
private Dictionary<ChatType, NameFormatting> Formats { get; } = [];
|
||||||
@@ -48,11 +52,21 @@ internal class MessageManager : IAsyncDisposable
|
|||||||
// AutoTellTabsService to spawn or refresh temp tabs without coupling.
|
// AutoTellTabsService to spawn or refresh temp tabs without coupling.
|
||||||
public event Action<Message>? MessageProcessed;
|
public event Action<Message>? MessageProcessed;
|
||||||
|
|
||||||
internal unsafe MessageManager(Plugin plugin)
|
internal unsafe MessageManager(
|
||||||
|
Plugin plugin,
|
||||||
|
ILogger<MessageManager> logger,
|
||||||
|
ILoggerFactory loggerFactory
|
||||||
|
)
|
||||||
{
|
{
|
||||||
Plugin = plugin;
|
Plugin = plugin;
|
||||||
|
_logger = logger;
|
||||||
|
|
||||||
Store = new MessageStore(DatabasePath(), Plugin.PlatformUtil, Plugin.LogProxy);
|
Store = new MessageStore(
|
||||||
|
DatabasePath(),
|
||||||
|
Plugin.PlatformUtil,
|
||||||
|
loggerFactory.CreateLogger<MessageStore>(),
|
||||||
|
loggerFactory
|
||||||
|
);
|
||||||
|
|
||||||
PendingMessageThread = new Thread(() =>
|
PendingMessageThread = new Thread(() =>
|
||||||
ProcessPendingMessages(PendingThreadCancellationToken.Token)
|
ProcessPendingMessages(PendingThreadCancellationToken.Token)
|
||||||
@@ -91,7 +105,7 @@ internal class MessageManager : IAsyncDisposable
|
|||||||
await Task.Delay(100);
|
await Task.Delay(100);
|
||||||
|
|
||||||
if (PendingMessageThread.IsAlive)
|
if (PendingMessageThread.IsAlive)
|
||||||
Plugin.LogProxy.Warning(
|
_logger.LogWarning(
|
||||||
"PendingMessageThread did not observe cancellation within 10s. "
|
"PendingMessageThread did not observe cancellation within 10s. "
|
||||||
+ "Worker remains on background thread; next plugin reload releases it."
|
+ "Worker remains on background thread; next plugin reload releases it."
|
||||||
);
|
);
|
||||||
@@ -137,7 +151,7 @@ internal class MessageManager : IAsyncDisposable
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Plugin.LogProxy.Error(ex, "Error processing pending message");
|
_logger.LogError(ex, "Error processing pending message");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -149,8 +163,15 @@ internal class MessageManager : IAsyncDisposable
|
|||||||
|
|
||||||
internal void ClearAllTabs()
|
internal void ClearAllTabs()
|
||||||
{
|
{
|
||||||
|
// Snapshot the tab LIST under the shared lock so the worker-thread
|
||||||
|
// add/remove can't tear the enumeration; tab.Clear() then runs lock-free
|
||||||
|
// (each tab's Messages has its own SemaphoreSlim — lock order: list outer).
|
||||||
|
List<Tab> tabsSnapshot;
|
||||||
|
lock (Plugin.TabsListLock)
|
||||||
|
tabsSnapshot = Plugin.Config.Tabs.ToList();
|
||||||
|
|
||||||
// TempTabs are session-only (not persisted); exclude them to preserve Tell history
|
// TempTabs are session-only (not persisted); exclude them to preserve Tell history
|
||||||
foreach (var tab in Plugin.Config.Tabs.Where(t => !t.IsTempTab))
|
foreach (var tab in tabsSnapshot.Where(t => !t.IsTempTab))
|
||||||
tab.Clear();
|
tab.Clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -162,18 +183,19 @@ internal class MessageManager : IAsyncDisposable
|
|||||||
|
|
||||||
using var messages = Store.GetMostRecentMessages(CurrentContentId, since);
|
using var messages = Store.GetMostRecentMessages(CurrentContentId, since);
|
||||||
|
|
||||||
// TempTabs are excluded; they maintain live state from AutoTellTabsService
|
// TempTabs excluded (live state from AutoTellTabsService). Bucket via the
|
||||||
var pendingTabs = Plugin
|
// pure MapMessagesToTabs so the assignment stays testable outside Dalamud.
|
||||||
.Config.Tabs.Where(t => !t.IsTempTab)
|
// Snapshot under the shared lock (list copy only — short critical
|
||||||
.Select(tab => (tab, new List<Message>()))
|
// section). The Store query above and the AddSortPrune writes below stay
|
||||||
.ToList();
|
// OUTSIDE the lock (lock order: list outer, MessageList inner).
|
||||||
foreach (var message in messages)
|
List<Tab> nonTempTabs;
|
||||||
foreach (var (_, pendingMessages) in pendingTabs.Where(ptab => ptab.Item1.Matches(message)))
|
lock (Plugin.TabsListLock)
|
||||||
pendingMessages.Add(message);
|
nonTempTabs = Plugin.Config.Tabs.Where(t => !t.IsTempTab).ToList();
|
||||||
|
var buckets = MapMessagesToTabs(nonTempTabs, messages);
|
||||||
|
|
||||||
// Apply messages to chat log all at once.
|
// Apply messages to chat log all at once.
|
||||||
foreach (var (tab, pendingMessages) in pendingTabs)
|
foreach (var tab in nonTempTabs)
|
||||||
tab.Messages.AddSortPrune(pendingMessages, MessageDisplayLimit);
|
tab.Messages.AddSortPrune(buckets[tab], MessageDisplayLimit);
|
||||||
|
|
||||||
if (!messages.DidError)
|
if (!messages.DidError)
|
||||||
return;
|
return;
|
||||||
@@ -182,16 +204,36 @@ internal class MessageManager : IAsyncDisposable
|
|||||||
|
|
||||||
// Mark failed messages as deleted to prevent retry attempts
|
// Mark failed messages as deleted to prevent retry attempts
|
||||||
var failedIds = messages.FailedMessageIds();
|
var failedIds = messages.FailedMessageIds();
|
||||||
Plugin.LogProxy.Info(
|
_logger.LogInformation(
|
||||||
$"Marking {failedIds.Count} messages as deleted due to parse failures"
|
$"Marking {failedIds.Count} messages as deleted due to parse failures"
|
||||||
);
|
);
|
||||||
foreach (var msgId in messages.FailedMessageIds())
|
foreach (var msgId in messages.FailedMessageIds())
|
||||||
{
|
{
|
||||||
Plugin.LogProxy.Debug($"Marking message '{msgId}' as deleted due to parse failure");
|
_logger.LogDebug($"Marking message '{msgId}' as deleted due to parse failure");
|
||||||
Store.DeleteMessage(msgId);
|
Store.DeleteMessage(msgId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Pure message->tab bucketing for the refilter. Dalamud-free + static so the
|
||||||
|
// assignment can be unit-pinned in the build suite; the live caller owns the
|
||||||
|
// Store query, the snapshot and the SemaphoreSlim writes.
|
||||||
|
internal static Dictionary<Tab, List<Message>> MapMessagesToTabs(
|
||||||
|
IReadOnlyList<Tab> tabs,
|
||||||
|
IEnumerable<Message> messages
|
||||||
|
)
|
||||||
|
{
|
||||||
|
var buckets = new Dictionary<Tab, List<Message>>(tabs.Count);
|
||||||
|
foreach (var tab in tabs)
|
||||||
|
buckets[tab] = new List<Message>();
|
||||||
|
|
||||||
|
foreach (var message in messages)
|
||||||
|
foreach (var tab in tabs)
|
||||||
|
if (tab.Matches(message))
|
||||||
|
buckets[tab].Add(message);
|
||||||
|
|
||||||
|
return buckets;
|
||||||
|
}
|
||||||
|
|
||||||
internal void FilterAllTabsAsync()
|
internal void FilterAllTabsAsync()
|
||||||
{
|
{
|
||||||
Task.Run(() =>
|
Task.Run(() =>
|
||||||
@@ -203,13 +245,12 @@ internal class MessageManager : IAsyncDisposable
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Plugin.LogProxy.Error(ex, "Error in FilterAllTabs");
|
_logger.LogError(ex, "Error in FilterAllTabs");
|
||||||
}
|
}
|
||||||
|
|
||||||
// v1.4.9 R3 profiling: Information so the xllog tail surfaces this
|
// Information, not Debug, so the xllog tail surfaces this without a
|
||||||
// without a Debug filter. Belt-and-suspenders for future plugin-load
|
// filter. Kept as a guard against future plugin-load regressions.
|
||||||
// regressions; remains in place after Sub-Task 3.4 Befund.
|
_logger.LogInformation($"FilterAllTabs took {stopwatch.ElapsedMilliseconds}ms");
|
||||||
Plugin.LogProxy.Information($"FilterAllTabs took {stopwatch.ElapsedMilliseconds}ms");
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -264,7 +305,7 @@ internal class MessageManager : IAsyncDisposable
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Plugin.LogProxy.Error(ex, "Error in ContentIdResolver");
|
_logger.LogError(ex, "Error in ContentIdResolver");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -317,20 +358,135 @@ internal class MessageManager : IAsyncDisposable
|
|||||||
if (Plugin.Config.DatabaseBattleMessages || !message.Code.IsBattle())
|
if (Plugin.Config.DatabaseBattleMessages || !message.Code.IsBattle())
|
||||||
Store.UpsertMessage(message);
|
Store.UpsertMessage(message);
|
||||||
|
|
||||||
var currentMatches = Plugin.CurrentTab.Matches(message);
|
// Snapshot the list, not just the active tab. This loop runs on the worker
|
||||||
foreach (var tab in Plugin.Config.Tabs)
|
// thread while SaveConfig's strip and the auto-tell spawn mutate Config.Tabs
|
||||||
{
|
// under TabsListLock — enumerating it live throws "collection was modified",
|
||||||
var unread = !(
|
// and the catch in ProcessPendingMessages swallows that, silently dropping
|
||||||
tab.UnreadMode == UnreadMode.Unseen && Plugin.CurrentTab != tab && currentMatches
|
// the whole message: no tab entry, no sound, no MessageProcessed.
|
||||||
);
|
List<Tab> tabsSnapshot;
|
||||||
|
lock (Plugin.TabsListLock)
|
||||||
|
tabsSnapshot = Plugin.Config.Tabs.ToList();
|
||||||
|
|
||||||
|
// Snapshot the active tab and whether it shows this message ONCE, so the
|
||||||
|
// whole loop sees a consistent value (the getter is a cross-thread read of
|
||||||
|
// MainWindow.ActiveTab).
|
||||||
|
var currentTab = Plugin.CurrentTab;
|
||||||
|
var currentTabMatches = currentTab.Matches(message);
|
||||||
|
foreach (var tab in tabsSnapshot)
|
||||||
|
{
|
||||||
if (tab.Matches(message))
|
if (tab.Matches(message))
|
||||||
tab.AddMessage(message, unread);
|
tab.AddMessage(message, ShouldCountUnread(tab, currentTab, currentTabMatches));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Deliberate O(2n): the sound pick re-walks the tab list so the selection
|
||||||
|
// stays pure and SelfTest-able; AddMessage above and playback below keep
|
||||||
|
// the side effects.
|
||||||
|
var notificationSound = SelectNotificationSound(
|
||||||
|
tabsSnapshot,
|
||||||
|
currentTab,
|
||||||
|
message,
|
||||||
|
Plugin.Config.PlaySounds,
|
||||||
|
out var soundSource
|
||||||
|
);
|
||||||
|
|
||||||
|
// The snapshot can outlive a tab (eviction, logout). Playing its sound would
|
||||||
|
// be an audible artefact for a tab that is already gone, so re-check first.
|
||||||
|
if (notificationSound is not null && soundSource is not null)
|
||||||
|
{
|
||||||
|
bool sourceStillPresent;
|
||||||
|
lock (Plugin.TabsListLock)
|
||||||
|
sourceStillPresent = Plugin.Config.Tabs.Contains(soundSource);
|
||||||
|
if (!sourceStillPresent)
|
||||||
|
notificationSound = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (notificationSound is { } soundId)
|
||||||
|
{
|
||||||
|
if (soundId is >= 1 and <= 16)
|
||||||
|
{
|
||||||
|
// ProcessMessage runs on the PendingMessageThread worker; the native
|
||||||
|
// UIGlobals.PlaySoundEffect must be marshalled onto the framework
|
||||||
|
// thread (reference_dalamud_framework_thread).
|
||||||
|
Plugin.Framework.RunOnFrameworkThread(() =>
|
||||||
|
{
|
||||||
|
unsafe
|
||||||
|
{
|
||||||
|
UIGlobals.PlaySoundEffect(soundId);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else if (soundId >= 17)
|
||||||
|
{
|
||||||
|
// Custom bundled sounds (ids 17-19) go through NAudio WaveOutEvent.
|
||||||
|
// NAudio manages its own playback thread, so no framework marshalling needed.
|
||||||
|
Plugin.CustomAudioPlayer.Play((int)soundId - 16, Plugin.Config.CustomSoundVolume);
|
||||||
|
}
|
||||||
|
// soundId == 0 (hand-edited config) falls through: plays nothing.
|
||||||
}
|
}
|
||||||
|
|
||||||
MessageProcessed?.Invoke(message);
|
MessageProcessed?.Invoke(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Pure: picks the sound id for the first inactive tab that wants one, or null.
|
||||||
|
// No AddMessage, no store write — those stay in the ProcessMessage loop so this
|
||||||
|
// is exercisable from the SelfTest without polluting tab state. The "first
|
||||||
|
// match wins" semantics live here via the running 'picked is null' guard,
|
||||||
|
// keeping a message matching several background tabs from stacking sounds.
|
||||||
|
// TEST-MIRROR: ../_Helpers/TabSoundDecision.cs
|
||||||
|
// Unseen ("count only what you haven't seen") suppresses unread on an inactive
|
||||||
|
// tab when the active tab ALSO shows this message — you already saw it in the
|
||||||
|
// tab you're looking at (1.5.6 / upstream ChatTwo behavior). The "active tab"
|
||||||
|
// used to be pinned to Tabs[0], so this fired against the wrong one until
|
||||||
|
// CurrentTab was recoupled to the real active tab, and currentTabMatches is
|
||||||
|
// now measured against the tab you see. All -> always counts; None ->
|
||||||
|
// counts here and is gated out at the display layer. Pure + SelfTest-able.
|
||||||
|
internal static bool ShouldCountUnread(Tab tab, Tab currentTab, bool currentTabMatches) =>
|
||||||
|
!(
|
||||||
|
tab.UnreadMode == UnreadMode.Unseen
|
||||||
|
&& !ReferenceEquals(currentTab, tab)
|
||||||
|
&& currentTabMatches
|
||||||
|
);
|
||||||
|
|
||||||
|
// Reports the tab the sound came from, so the caller can drop it if that tab
|
||||||
|
// disappeared between snapshot and playback.
|
||||||
|
internal static uint? SelectNotificationSound(
|
||||||
|
IEnumerable<Tab> tabs,
|
||||||
|
Tab currentTab,
|
||||||
|
Message probe,
|
||||||
|
bool playSounds,
|
||||||
|
out Tab? source
|
||||||
|
)
|
||||||
|
{
|
||||||
|
uint? picked = null;
|
||||||
|
source = null;
|
||||||
|
foreach (var tab in tabs)
|
||||||
|
{
|
||||||
|
if (!tab.Matches(probe))
|
||||||
|
continue;
|
||||||
|
if (
|
||||||
|
picked is null
|
||||||
|
&& TabSoundDecision.ShouldPlay(
|
||||||
|
currentTab == tab,
|
||||||
|
tab.EnableNotificationSound,
|
||||||
|
playSounds
|
||||||
|
)
|
||||||
|
)
|
||||||
|
{
|
||||||
|
picked = tab.NotificationSoundId;
|
||||||
|
source = tab;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return picked;
|
||||||
|
}
|
||||||
|
|
||||||
|
// SelfTest hook — same name discipline as InputBar.TestBuildOutgoingForSelfTest.
|
||||||
|
internal static uint? TestSelectNotificationSoundForSelfTest(
|
||||||
|
IEnumerable<Tab> tabs,
|
||||||
|
Tab currentTab,
|
||||||
|
Message probe,
|
||||||
|
bool playSounds
|
||||||
|
) => SelectNotificationSound(tabs, currentTab, probe, playSounds, out _);
|
||||||
|
|
||||||
internal class NameFormatting
|
internal class NameFormatting
|
||||||
{
|
{
|
||||||
internal string Before { get; private set; } = string.Empty;
|
internal string Before { get; private set; } = string.Empty;
|
||||||
|
|||||||
+254
-82
@@ -9,6 +9,7 @@ using MessagePack;
|
|||||||
using MessagePack.Formatters;
|
using MessagePack.Formatters;
|
||||||
using MessagePack.Resolvers;
|
using MessagePack.Resolvers;
|
||||||
using Microsoft.Data.Sqlite;
|
using Microsoft.Data.Sqlite;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
using Encoding = System.Text.Encoding;
|
using Encoding = System.Text.Encoding;
|
||||||
|
|
||||||
namespace HellionChat;
|
namespace HellionChat;
|
||||||
@@ -89,6 +90,8 @@ public class PayloadMessagePackFormatter : IMessagePackFormatter<Payload?>
|
|||||||
return new PartyFinderPayload(reader.ReadUInt32());
|
return new PartyFinderPayload(reader.ReadUInt32());
|
||||||
case PayloadMessagePackType.Uri:
|
case PayloadMessagePackType.Uri:
|
||||||
return new UriPayload(new Uri(reader.ReadString() ?? ""));
|
return new UriPayload(new Uri(reader.ReadString() ?? ""));
|
||||||
|
// Read-only since 2.0.2: nothing writes this any more, but rows
|
||||||
|
// stored before then carry it and must keep deserialising.
|
||||||
case PayloadMessagePackType.Emote:
|
case PayloadMessagePackType.Emote:
|
||||||
return EmotePayload.ResolveEmote(reader.ReadString() ?? "");
|
return EmotePayload.ResolveEmote(reader.ReadString() ?? "");
|
||||||
case PayloadMessagePackType.Other:
|
case PayloadMessagePackType.Other:
|
||||||
@@ -179,7 +182,8 @@ internal class MessageStore : IDisposable
|
|||||||
}
|
}
|
||||||
|
|
||||||
private readonly IPlatformUtil _platformUtil;
|
private readonly IPlatformUtil _platformUtil;
|
||||||
private readonly IPluginLogProxy _logger;
|
private readonly ILogger<MessageStore> _logger;
|
||||||
|
private readonly ILoggerFactory _loggerFactory;
|
||||||
|
|
||||||
// Readiness gate for the FTS5 full-text index. Volatile so the DbViewer's
|
// Readiness gate for the FTS5 full-text index. Volatile so the DbViewer's
|
||||||
// per-frame IsFtsIndexBuilt read sees the flip the moment the bulk-insert
|
// per-frame IsFtsIndexBuilt read sees the flip the moment the bulk-insert
|
||||||
@@ -197,11 +201,17 @@ internal class MessageStore : IDisposable
|
|||||||
// own SqliteConnection via OpenSecondaryConnection.
|
// own SqliteConnection via OpenSecondaryConnection.
|
||||||
private readonly object _readLock = new();
|
private readonly object _readLock = new();
|
||||||
|
|
||||||
internal MessageStore(string dbPath, IPlatformUtil platformUtil, IPluginLogProxy logger)
|
internal MessageStore(
|
||||||
|
string dbPath,
|
||||||
|
IPlatformUtil platformUtil,
|
||||||
|
ILogger<MessageStore> logger,
|
||||||
|
ILoggerFactory loggerFactory
|
||||||
|
)
|
||||||
{
|
{
|
||||||
DbPath = dbPath;
|
DbPath = dbPath;
|
||||||
_platformUtil = platformUtil;
|
_platformUtil = platformUtil;
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
|
_loggerFactory = loggerFactory;
|
||||||
Connection = Connect();
|
Connection = Connect();
|
||||||
Migrate();
|
Migrate();
|
||||||
InitFtsReadyCache();
|
InitFtsReadyCache();
|
||||||
@@ -237,7 +247,7 @@ internal class MessageStore : IDisposable
|
|||||||
|
|
||||||
private SqliteConnection Connect()
|
private SqliteConnection Connect()
|
||||||
{
|
{
|
||||||
// v1.4.9 R3 profiling: trace cost of SQLite open + pragma-apply. Paired
|
// v1.4.9 profiling: trace cost of SQLite open + pragma-apply. Paired
|
||||||
// with the Migrate-Stopwatch below — Connect alone is the cheap half
|
// with the Migrate-Stopwatch below — Connect alone is the cheap half
|
||||||
// (Open + a handful of PRAGMAs); the expensive half typically lives in
|
// (Open + a handful of PRAGMAs); the expensive half typically lives in
|
||||||
// Migrate, especially on a large DB after a schema bump.
|
// Migrate, especially on a large DB after a schema bump.
|
||||||
@@ -246,13 +256,13 @@ internal class MessageStore : IDisposable
|
|||||||
conn.Open();
|
conn.Open();
|
||||||
ApplyPragmas(conn);
|
ApplyPragmas(conn);
|
||||||
connectSw.Stop();
|
connectSw.Stop();
|
||||||
_logger.Information($"MessageStore.Connect took {connectSw.ElapsedMilliseconds}ms");
|
_logger.LogInformation($"MessageStore.Connect took {connectSw.ElapsedMilliseconds}ms");
|
||||||
return conn;
|
return conn;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Migrate()
|
private void Migrate()
|
||||||
{
|
{
|
||||||
// v1.4.9 R3 profiling: trace cost of the schema-migration chain. On a
|
// v1.4.9 profiling: trace cost of the schema-migration chain. On a
|
||||||
// large DB after a fresh schema bump this is the dominant SQLite cost
|
// large DB after a fresh schema bump this is the dominant SQLite cost
|
||||||
// at plugin-load, not Connect.
|
// at plugin-load, not Connect.
|
||||||
var migrateSw = System.Diagnostics.Stopwatch.StartNew();
|
var migrateSw = System.Diagnostics.Stopwatch.StartNew();
|
||||||
@@ -271,18 +281,25 @@ internal class MessageStore : IDisposable
|
|||||||
migrationsToDo.Add(Migrate2);
|
migrationsToDo.Add(Migrate2);
|
||||||
migrationsToDo.Add(Migrate3);
|
migrationsToDo.Add(Migrate3);
|
||||||
migrationsToDo.Add(Migrate4);
|
migrationsToDo.Add(Migrate4);
|
||||||
|
migrationsToDo.Add(Migrate5);
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
migrationsToDo.Add(Migrate2);
|
migrationsToDo.Add(Migrate2);
|
||||||
migrationsToDo.Add(Migrate3);
|
migrationsToDo.Add(Migrate3);
|
||||||
migrationsToDo.Add(Migrate4);
|
migrationsToDo.Add(Migrate4);
|
||||||
|
migrationsToDo.Add(Migrate5);
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
migrationsToDo.Add(Migrate3);
|
migrationsToDo.Add(Migrate3);
|
||||||
migrationsToDo.Add(Migrate4);
|
migrationsToDo.Add(Migrate4);
|
||||||
|
migrationsToDo.Add(Migrate5);
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 3:
|
||||||
migrationsToDo.Add(Migrate4);
|
migrationsToDo.Add(Migrate4);
|
||||||
|
migrationsToDo.Add(Migrate5);
|
||||||
|
break;
|
||||||
|
case 4:
|
||||||
|
migrationsToDo.Add(Migrate5);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -290,12 +307,12 @@ internal class MessageStore : IDisposable
|
|||||||
migration();
|
migration();
|
||||||
|
|
||||||
migrateSw.Stop();
|
migrateSw.Stop();
|
||||||
_logger.Information($"MessageStore.Migrate took {migrateSw.ElapsedMilliseconds}ms");
|
_logger.LogInformation($"MessageStore.Migrate took {migrateSw.ElapsedMilliseconds}ms");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Migrate0()
|
private void Migrate0()
|
||||||
{
|
{
|
||||||
_logger.Information("Running migration 0: Creating tables");
|
_logger.LogInformation("Running migration 0: Creating tables");
|
||||||
Connection.Execute(
|
Connection.Execute(
|
||||||
@"
|
@"
|
||||||
CREATE TABLE IF NOT EXISTS messages (
|
CREATE TABLE IF NOT EXISTS messages (
|
||||||
@@ -322,7 +339,7 @@ internal class MessageStore : IDisposable
|
|||||||
|
|
||||||
private void Migrate1()
|
private void Migrate1()
|
||||||
{
|
{
|
||||||
_logger.Information("Running migration 1: Adding Deleted column");
|
_logger.LogInformation("Running migration 1: Adding Deleted column");
|
||||||
Connection.Execute(
|
Connection.Execute(
|
||||||
@"
|
@"
|
||||||
ALTER TABLE messages ADD COLUMN Deleted BOOLEAN NOT NULL DEFAULT false;
|
ALTER TABLE messages ADD COLUMN Deleted BOOLEAN NOT NULL DEFAULT false;
|
||||||
@@ -334,7 +351,7 @@ internal class MessageStore : IDisposable
|
|||||||
|
|
||||||
private void Migrate2()
|
private void Migrate2()
|
||||||
{
|
{
|
||||||
_logger.Information("Running migration 2: Adding Channel generated column");
|
_logger.LogInformation("Running migration 2: Adding Channel generated column");
|
||||||
Connection.Execute(
|
Connection.Execute(
|
||||||
@"
|
@"
|
||||||
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;
|
||||||
@@ -362,13 +379,15 @@ internal class MessageStore : IDisposable
|
|||||||
|
|
||||||
private void Migrate3()
|
private void Migrate3()
|
||||||
{
|
{
|
||||||
_logger.Information("Running migration 3: Fix log kinds to fit the new format");
|
_logger.LogInformation("Running migration 3: Fix log kinds to fit the new format");
|
||||||
|
|
||||||
// Recovery for partially-applied Migrate3: schema already in target
|
// Recovery for partially-applied Migrate3: schema already in target
|
||||||
// shape but user_version was never bumped -- just record and exit.
|
// shape but user_version was never bumped -- just record and exit.
|
||||||
if (ColumnExists("messages", "ChatType") && !ColumnExists("messages", "Code"))
|
if (ColumnExists("messages", "ChatType") && !ColumnExists("messages", "Code"))
|
||||||
{
|
{
|
||||||
_logger.Information("Migration 3: schema already migrated, only bumping user_version");
|
_logger.LogInformation(
|
||||||
|
"Migration 3: schema already migrated, only bumping user_version"
|
||||||
|
);
|
||||||
SetMigrationVersion(3);
|
SetMigrationVersion(3);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -398,7 +417,7 @@ internal class MessageStore : IDisposable
|
|||||||
|
|
||||||
private void Migrate4()
|
private void Migrate4()
|
||||||
{
|
{
|
||||||
_logger.Information("Running migration 4: Add FTS5 virtual table for full-text search");
|
_logger.LogInformation("Running migration 4: Add FTS5 virtual table for full-text search");
|
||||||
|
|
||||||
// Standalone FTS5 table (no content='messages' linking, no content_rowid).
|
// Standalone FTS5 table (no content='messages' linking, no content_rowid).
|
||||||
// messages.Id is BLOB-PK (Guid), which is incompatible with FTS5's
|
// messages.Id is BLOB-PK (Guid), which is incompatible with FTS5's
|
||||||
@@ -420,9 +439,26 @@ internal class MessageStore : IDisposable
|
|||||||
SetMigrationVersion(4);
|
SetMigrationVersion(4);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void Migrate5()
|
||||||
|
{
|
||||||
|
_logger.LogInformation("Running migration 5: Add (Receiver, Date) index for tell history");
|
||||||
|
|
||||||
|
// GetTellHistoryWithSender filters on Receiver and orders by Date DESC.
|
||||||
|
// Without a matching index SQLite sorts the whole receiver history into a
|
||||||
|
// temp b-tree before returning row one, which defeats the early break in
|
||||||
|
// the caller. (Receiver, ChatType, Date) does NOT help: the ChatType IN
|
||||||
|
// filter sits between the equality prefix and the sort column.
|
||||||
|
using var cmd = Connection.CreateCommand();
|
||||||
|
cmd.CommandText =
|
||||||
|
"CREATE INDEX IF NOT EXISTS idx_messages_receiver_date ON messages (Receiver, Date);";
|
||||||
|
cmd.ExecuteNonQuery();
|
||||||
|
|
||||||
|
SetMigrationVersion(5);
|
||||||
|
}
|
||||||
|
|
||||||
private void SetMigrationVersion(int version)
|
private void SetMigrationVersion(int version)
|
||||||
{
|
{
|
||||||
_logger.Information($"Setting version {version}");
|
_logger.LogInformation($"Setting version {version}");
|
||||||
using var cmd = Connection.CreateCommand();
|
using var cmd = Connection.CreateCommand();
|
||||||
// PRAGMA does not accept SQLite parameter bindings; version is a
|
// PRAGMA does not accept SQLite parameter bindings; version is a
|
||||||
// compile-time int from the migration sequence, never user input.
|
// compile-time int from the migration sequence, never user input.
|
||||||
@@ -430,35 +466,60 @@ internal class MessageStore : IDisposable
|
|||||||
cmd.ExecuteNonQuery();
|
cmd.ExecuteNonQuery();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Drops the full-text index and marks it for a rebuild.
|
||||||
|
//
|
||||||
|
// messages_fts stores sender_text and content_text in the clear, and no
|
||||||
|
// delete path touched it: ClearMessages, CleanupRetainOnly and the retention
|
||||||
|
// sweep all removed rows from `messages` only. The plain text of every
|
||||||
|
// "deleted" message stayed on disk.
|
||||||
|
//
|
||||||
|
// Worse, it was self-sealing. InitFtsReadyCache treats a non-empty index as
|
||||||
|
// ready, so after a wipe the index stayed full, the readiness flag stayed
|
||||||
|
// true, and the rebuild that would have cleared it never ran again.
|
||||||
|
//
|
||||||
|
// Wiping rather than deleting matched rows: message_guid is stored as a GUID
|
||||||
|
// string while messages.Id is a BLOB, so the two cannot be joined in SQL.
|
||||||
|
// The index is derived data and rebuilds from the surviving rows on the next
|
||||||
|
// start, which is the cheap and provably complete option.
|
||||||
|
//
|
||||||
|
// Caller must already hold _readLock.
|
||||||
|
private void InvalidateFtsIndex()
|
||||||
|
{
|
||||||
|
Connection.Execute("DELETE FROM messages_fts;");
|
||||||
|
_ftsReady = false;
|
||||||
|
}
|
||||||
|
|
||||||
internal void ClearMessages()
|
internal void ClearMessages()
|
||||||
{
|
{
|
||||||
lock (_readLock)
|
lock (_readLock)
|
||||||
{
|
{
|
||||||
Connection.Execute("DELETE FROM messages;");
|
Connection.Execute("DELETE FROM messages;");
|
||||||
PerformMaintenance();
|
InvalidateFtsIndex();
|
||||||
|
TryPerformMaintenance();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns a (ChatType, count) snapshot over non-deleted messages.
|
// Returns a (ChatType, count) snapshot over non-deleted messages.
|
||||||
// Used by the Privacy tab to preview retroactive cleanup impact.
|
// Used by the Privacy tab to preview retroactive cleanup impact.
|
||||||
internal Dictionary<int, long> GetMessageCountsByChatType()
|
//
|
||||||
|
// Caller-owned connection, same reasoning as StreamForExport: this is a
|
||||||
|
// GROUP BY over every row, and holding _readLock for it would stall
|
||||||
|
// UpsertMessage on the framework thread for as long as the scan takes.
|
||||||
|
internal Dictionary<int, long> GetMessageCountsByChatType(SqliteConnection conn)
|
||||||
{
|
{
|
||||||
lock (_readLock)
|
var result = new Dictionary<int, long>();
|
||||||
|
using var cmd = conn.CreateCommand();
|
||||||
|
cmd.CommandText =
|
||||||
|
"SELECT ChatType, COUNT(*) FROM messages WHERE deleted = false GROUP BY ChatType;";
|
||||||
|
cmd.CommandTimeout = 120;
|
||||||
|
using var reader = cmd.ExecuteReader();
|
||||||
|
while (reader.Read())
|
||||||
{
|
{
|
||||||
var result = new Dictionary<int, long>();
|
var chatType = reader.GetInt32(0);
|
||||||
using var cmd = Connection.CreateCommand();
|
var count = reader.GetInt64(1);
|
||||||
cmd.CommandText =
|
result[chatType] = count;
|
||||||
"SELECT ChatType, COUNT(*) FROM messages WHERE deleted = false GROUP BY ChatType;";
|
|
||||||
cmd.CommandTimeout = 120;
|
|
||||||
using var reader = cmd.ExecuteReader();
|
|
||||||
while (reader.Read())
|
|
||||||
{
|
|
||||||
var chatType = reader.GetInt32(0);
|
|
||||||
var count = reader.GetInt64(1);
|
|
||||||
result[chatType] = count;
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Deletes messages older than the per-channel retention window, with a global
|
// Deletes messages older than the per-channel retention window, with a global
|
||||||
@@ -495,6 +556,12 @@ internal class MessageStore : IDisposable
|
|||||||
var index = 0;
|
var index = 0;
|
||||||
foreach (var (type, days) in chatTypeDaysMap)
|
foreach (var (type, days) in chatTypeDaysMap)
|
||||||
{
|
{
|
||||||
|
// Careful: 0 here is NOT the "keep forever" it means for
|
||||||
|
// defaultDays below. A per-channel 0 puts the cutoff at now
|
||||||
|
// and deletes the channel's entire history. No profile ships
|
||||||
|
// a 0 and no UI can set one, which is why this is a comment
|
||||||
|
// and not a guard -- but any editor added later has to
|
||||||
|
// reconcile the two meanings before it exposes the value.
|
||||||
var cutoff = nowMs - days * 86400000L;
|
var cutoff = nowMs - days * 86400000L;
|
||||||
var typeParam = $"$type{index}";
|
var typeParam = $"$type{index}";
|
||||||
var cutoffParam = $"$cutoff{index}";
|
var cutoffParam = $"$cutoff{index}";
|
||||||
@@ -528,7 +595,11 @@ internal class MessageStore : IDisposable
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (deleted > 0)
|
if (deleted > 0)
|
||||||
PerformMaintenance();
|
{
|
||||||
|
InvalidateFtsIndex();
|
||||||
|
TryPerformMaintenance();
|
||||||
|
}
|
||||||
|
|
||||||
return deleted;
|
return deleted;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -552,7 +623,51 @@ internal class MessageStore : IDisposable
|
|||||||
cmd.CommandTimeout = 600;
|
cmd.CommandTimeout = 600;
|
||||||
deleted = cmd.ExecuteNonQuery();
|
deleted = cmd.ExecuteNonQuery();
|
||||||
}
|
}
|
||||||
PerformMaintenance();
|
|
||||||
|
// Skipped when nothing matched: VACUUM rewrites the whole file, and
|
||||||
|
// running it for zero deleted rows costs seconds on a large database
|
||||||
|
// for no benefit. DeleteByRetentionPolicy already guards this way.
|
||||||
|
if (deleted > 0)
|
||||||
|
{
|
||||||
|
InvalidateFtsIndex();
|
||||||
|
TryPerformMaintenance();
|
||||||
|
}
|
||||||
|
|
||||||
|
return deleted;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hard-deletes every message whose ChatType IS in the list, then VACUUMs.
|
||||||
|
// Returns the number of rows deleted.
|
||||||
|
//
|
||||||
|
// The mirror image of CleanupRetainOnly, and the privacy filter needs both.
|
||||||
|
// With the unknown-channel failsafe on, the rule keeps every channel this
|
||||||
|
// build does not recognise -- and a retain-list can only name the ones that
|
||||||
|
// were already in the database when the list was built, so a channel whose
|
||||||
|
// first message arrives after that would be deleted. Naming what goes
|
||||||
|
// instead of what stays removes the window entirely.
|
||||||
|
internal long CleanupDeleteTypes(IReadOnlyCollection<int> deleteTypes)
|
||||||
|
{
|
||||||
|
if (deleteTypes.Count == 0)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
lock (_readLock)
|
||||||
|
{
|
||||||
|
long deleted;
|
||||||
|
using (var cmd = Connection.CreateCommand())
|
||||||
|
{
|
||||||
|
var placeholders = BindIntList(cmd, "dt", deleteTypes);
|
||||||
|
cmd.CommandText = $"DELETE FROM messages WHERE ChatType IN ({placeholders});";
|
||||||
|
cmd.CommandTimeout = 600;
|
||||||
|
deleted = cmd.ExecuteNonQuery();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (deleted > 0)
|
||||||
|
{
|
||||||
|
InvalidateFtsIndex();
|
||||||
|
TryPerformMaintenance();
|
||||||
|
}
|
||||||
|
|
||||||
return deleted;
|
return deleted;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -571,6 +686,33 @@ internal class MessageStore : IDisposable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Runs maintenance and swallows a failure, for the delete paths only.
|
||||||
|
//
|
||||||
|
// VACUUM needs the database to itself, and a lazily consumed reader on the
|
||||||
|
// primary connection -- which GetMostRecentMessages hands out and the
|
||||||
|
// refilter walks outside the lock -- makes it fail immediately with "cannot
|
||||||
|
// VACUUM - SQL statements in progress". That happens after the DELETE has
|
||||||
|
// committed, so letting it escape means the caller reports "nothing was
|
||||||
|
// removed" about a wipe that emptied the database.
|
||||||
|
//
|
||||||
|
// The rows are gone either way. An uncompacted file is a housekeeping
|
||||||
|
// problem; telling somebody their history is still there when it is not is
|
||||||
|
// a different kind of problem.
|
||||||
|
private void TryPerformMaintenance()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
PerformMaintenance();
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
_logger.LogWarning(
|
||||||
|
e,
|
||||||
|
"Maintenance after a delete failed; the rows are gone but the file was not compacted."
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
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;
|
||||||
@@ -633,9 +775,21 @@ internal class MessageStore : IDisposable
|
|||||||
internal SqliteConnection OpenSecondaryConnection()
|
internal SqliteConnection OpenSecondaryConnection()
|
||||||
{
|
{
|
||||||
var conn = new SqliteConnection(BuildConnectionString(DbPath));
|
var conn = new SqliteConnection(BuildConnectionString(DbPath));
|
||||||
conn.Open();
|
try
|
||||||
ApplyPragmas(conn);
|
{
|
||||||
return conn;
|
conn.Open();
|
||||||
|
ApplyPragmas(conn);
|
||||||
|
return conn;
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// Open can succeed and ApplyPragmas still throw: journal_mode=WAL
|
||||||
|
// needs a lock and gives up after DefaultTimeout. Without this the
|
||||||
|
// connection is neither returned nor closed, and with Pooling=false
|
||||||
|
// it survives until a finalizer gets to it.
|
||||||
|
conn.Dispose();
|
||||||
|
throw;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Worker-only mutator. The bulk-insert worker is the single legitimate
|
// Worker-only mutator. The bulk-insert worker is the single legitimate
|
||||||
@@ -787,8 +941,7 @@ internal class MessageStore : IDisposable
|
|||||||
// storage form on both sides so the IN(...) compare matches. SQLite has a
|
// storage form on both sides so the IN(...) compare matches. SQLite has a
|
||||||
// hard parameter limit of 999 in default builds, so we chunk the input --
|
// hard parameter limit of 999 in default builds, so we chunk the input --
|
||||||
// a 1000-hit FTS query never explodes the SELECT. Result ordering is not
|
// a 1000-hit FTS query never explodes the SELECT. Result ordering is not
|
||||||
// guaranteed; callers re-sort (e.g. DbViewer sorts by Date descending in
|
// guaranteed; callers re-sort (DbViewer sorts by Date descending).
|
||||||
// Sub-Task 4.4).
|
|
||||||
public IReadOnlyList<Message> LoadByGuids(IReadOnlyList<string> guidStrings)
|
public IReadOnlyList<Message> LoadByGuids(IReadOnlyList<string> guidStrings)
|
||||||
{
|
{
|
||||||
if (guidStrings.Count == 0)
|
if (guidStrings.Count == 0)
|
||||||
@@ -837,7 +990,7 @@ internal class MessageStore : IDisposable
|
|||||||
// Privacy filter -- drop disallowed ChatTypes before they reach storage.
|
// Privacy filter -- drop disallowed ChatTypes before they reach storage.
|
||||||
if (!Plugin.Config.IsAllowedForStorage(message.Code.Type))
|
if (!Plugin.Config.IsAllowedForStorage(message.Code.Type))
|
||||||
{
|
{
|
||||||
_logger.Verbose($"Privacy filter dropped message: ChatType={message.Code.Type}");
|
_logger.LogTrace($"Privacy filter dropped message: ChatType={message.Code.Type}");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -899,50 +1052,57 @@ internal class MessageStore : IDisposable
|
|||||||
|
|
||||||
// Streams messages for export, sorted ascending by Date, excluding soft-deleted rows.
|
// Streams messages for export, sorted ascending by Date, excluding soft-deleted rows.
|
||||||
// Optional filters: chatTypes, from/to inclusive date range.
|
// Optional filters: chatTypes, from/to inclusive date range.
|
||||||
// Caller is responsible for disposing the enumerator.
|
// Caller is responsible for disposing the enumerator and the connection.
|
||||||
// Lock caveat: lock guards command setup and ExecuteReader; the returned
|
//
|
||||||
// MessageEnumerator is iterated lazily by the caller outside the lock.
|
// Takes a caller-owned connection from OpenSecondaryConnection rather than
|
||||||
// Acceptable for v1.4.8 -- DbViewer iterates on its filter-worker Task and
|
// using the primary one, and therefore takes no lock. The reader stays open
|
||||||
// any clash with UpsertMessage on the primary Connection is rare and
|
// for as long as the export writes, which is seconds to minutes on a large
|
||||||
// serialised by SQLite's own connection-level lock. v1.5.x DI cycle should
|
// history, and chat keeps arriving throughout -- so the primary connection
|
||||||
// address this with a snapshot-to-list or connection pool.
|
// would be read here and written by UpsertMessage at the same time, and
|
||||||
|
// SqliteConnection is not thread-safe. Holding _readLock for the whole
|
||||||
|
// export would trade that for freezing the game instead.
|
||||||
|
//
|
||||||
|
// WAL gives readers their own snapshot, so a live write cannot tear the
|
||||||
|
// export mid-file either.
|
||||||
internal MessageEnumerator StreamForExport(
|
internal MessageEnumerator StreamForExport(
|
||||||
|
SqliteConnection conn,
|
||||||
IReadOnlyCollection<int>? chatTypes,
|
IReadOnlyCollection<int>? chatTypes,
|
||||||
DateTimeOffset? from,
|
DateTimeOffset? from,
|
||||||
DateTimeOffset? to
|
DateTimeOffset? to
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
lock (_readLock)
|
var cmd = conn.CreateCommand();
|
||||||
{
|
|
||||||
var cmd = Connection.CreateCommand();
|
|
||||||
|
|
||||||
var clauses = new List<string> { "deleted = false" };
|
var clauses = new List<string> { "deleted = false" };
|
||||||
if (chatTypes is { Count: > 0 })
|
if (chatTypes is { Count: > 0 })
|
||||||
clauses.Add($"ChatType IN ({BindIntList(cmd, "exct", chatTypes)})");
|
clauses.Add($"ChatType IN ({BindIntList(cmd, "exct", chatTypes)})");
|
||||||
if (from is not null)
|
if (from is not null)
|
||||||
clauses.Add("Date >= $From");
|
clauses.Add("Date >= $From");
|
||||||
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, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
|
Id, Receiver, ContentId, Date, ChatType, SourceKind, TargetKind,
|
||||||
Sender, Content, SenderSource, ContentSource, ExtraChatChannel
|
Sender, Content, SenderSource, ContentSource, ExtraChatChannel
|
||||||
FROM messages
|
FROM messages
|
||||||
WHERE "
|
WHERE "
|
||||||
+ string.Join(" AND ", clauses)
|
+ string.Join(" AND ", clauses)
|
||||||
+ @"
|
+ @"
|
||||||
ORDER BY Date ASC;";
|
ORDER BY Date ASC;";
|
||||||
cmd.CommandTimeout = 600;
|
cmd.CommandTimeout = 600;
|
||||||
|
|
||||||
if (from is not null)
|
if (from is not null)
|
||||||
cmd.Parameters.AddWithValue("$From", from.Value.ToUnixTimeMilliseconds());
|
cmd.Parameters.AddWithValue("$From", from.Value.ToUnixTimeMilliseconds());
|
||||||
if (to is not null)
|
if (to is not null)
|
||||||
cmd.Parameters.AddWithValue("$To", to.Value.ToUnixTimeMilliseconds());
|
cmd.Parameters.AddWithValue("$To", to.Value.ToUnixTimeMilliseconds());
|
||||||
|
|
||||||
return new MessageEnumerator(cmd.ExecuteReader(), _logger);
|
// Logger first: an argument list evaluates left to right, so a throwing
|
||||||
}
|
// CreateLogger -- which is what a disposed host gives you -- would leave
|
||||||
|
// an open reader that no MessageEnumerator owns.
|
||||||
|
var logger = _loggerFactory.CreateLogger<MessageEnumerator>();
|
||||||
|
return new MessageEnumerator(cmd.ExecuteReader(), logger);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns the most recent messages, oldest-first.
|
// Returns the most recent messages, oldest-first.
|
||||||
@@ -993,20 +1153,25 @@ internal class MessageStore : IDisposable
|
|||||||
|
|
||||||
cmd.Parameters.AddWithValue("$Count", count);
|
cmd.Parameters.AddWithValue("$Count", count);
|
||||||
|
|
||||||
return new MessageEnumerator(cmd.ExecuteReader(), _logger);
|
return new MessageEnumerator(
|
||||||
|
cmd.ExecuteReader(),
|
||||||
|
_loggerFactory.CreateLogger<MessageEnumerator>()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns up to limit tells exchanged with the named player, oldest-first.
|
// Returns up to `limit` tells exchanged with the named player, oldest-first.
|
||||||
// SQL narrows by Receiver + ChatType (indexed); client does the final
|
// SQL narrows by Receiver + ChatType via the (Receiver, Date) index (migration
|
||||||
// PlayerPayload comparison. sqlScanLimit caps the scan to stay within
|
// 5; before that the ordering fell back to a temp b-tree over all rows), then
|
||||||
// the message-processing worker thread budget.
|
// the client-side loop runs PlayerPayload comparison and breaks once
|
||||||
|
// `limit` partner matches accumulate. Earlier versions had a hardcoded
|
||||||
|
// 500-row scan cap that cut less-frequent pinned partners off the back of
|
||||||
|
// the window in chatty sessions; removed in v1.4.10.
|
||||||
internal IReadOnlyList<Message> GetTellHistoryWithSender(
|
internal IReadOnlyList<Message> GetTellHistoryWithSender(
|
||||||
ulong receiver,
|
ulong receiver,
|
||||||
string senderName,
|
string senderName,
|
||||||
uint senderWorld,
|
uint senderWorld,
|
||||||
int limit,
|
int limit
|
||||||
int sqlScanLimit = 500
|
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
if (limit <= 0)
|
if (limit <= 0)
|
||||||
@@ -1024,17 +1189,18 @@ internal class MessageStore : IDisposable
|
|||||||
WHERE deleted = false
|
WHERE deleted = false
|
||||||
AND Receiver = $Receiver
|
AND Receiver = $Receiver
|
||||||
AND ChatType IN ($TellIncoming, $TellOutgoing)
|
AND ChatType IN ($TellIncoming, $TellOutgoing)
|
||||||
ORDER BY Date DESC
|
ORDER BY Date DESC;
|
||||||
LIMIT $ScanLimit;
|
|
||||||
";
|
";
|
||||||
cmd.CommandTimeout = 60;
|
cmd.CommandTimeout = 60;
|
||||||
cmd.Parameters.AddWithValue("$Receiver", receiver);
|
cmd.Parameters.AddWithValue("$Receiver", receiver);
|
||||||
cmd.Parameters.AddWithValue("$TellIncoming", (int)ChatType.TellIncoming);
|
cmd.Parameters.AddWithValue("$TellIncoming", (int)ChatType.TellIncoming);
|
||||||
cmd.Parameters.AddWithValue("$TellOutgoing", (int)ChatType.TellOutgoing);
|
cmd.Parameters.AddWithValue("$TellOutgoing", (int)ChatType.TellOutgoing);
|
||||||
cmd.Parameters.AddWithValue("$ScanLimit", sqlScanLimit);
|
|
||||||
|
|
||||||
var collected = new List<Message>();
|
var collected = new List<Message>();
|
||||||
using var enumerator = new MessageEnumerator(cmd.ExecuteReader(), _logger);
|
using var enumerator = new MessageEnumerator(
|
||||||
|
cmd.ExecuteReader(),
|
||||||
|
_loggerFactory.CreateLogger<MessageEnumerator>()
|
||||||
|
);
|
||||||
foreach (var message in enumerator)
|
foreach (var message in enumerator)
|
||||||
{
|
{
|
||||||
if (!ChunkUtil.MatchesSender(message, senderName, senderWorld))
|
if (!ChunkUtil.MatchesSender(message, senderName, senderWorld))
|
||||||
@@ -1146,7 +1312,10 @@ internal class MessageStore : IDisposable
|
|||||||
((DateTimeOffset)before).ToUnixTimeMilliseconds()
|
((DateTimeOffset)before).ToUnixTimeMilliseconds()
|
||||||
);
|
);
|
||||||
|
|
||||||
return new MessageEnumerator(cmd.ExecuteReader(), _logger);
|
return new MessageEnumerator(
|
||||||
|
cmd.ExecuteReader(),
|
||||||
|
_loggerFactory.CreateLogger<MessageEnumerator>()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1199,7 +1368,10 @@ internal class MessageStore : IDisposable
|
|||||||
cmd.Parameters.AddWithValue("$Offset", DbViewer.RowPerPage * page);
|
cmd.Parameters.AddWithValue("$Offset", DbViewer.RowPerPage * page);
|
||||||
cmd.Parameters.AddWithValue("$OffsetCount", DbViewer.RowPerPage);
|
cmd.Parameters.AddWithValue("$OffsetCount", DbViewer.RowPerPage);
|
||||||
|
|
||||||
return new MessageEnumerator(cmd.ExecuteReader(), _logger);
|
return new MessageEnumerator(
|
||||||
|
cmd.ExecuteReader(),
|
||||||
|
_loggerFactory.CreateLogger<MessageEnumerator>()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1220,14 +1392,14 @@ internal class MessageStore : IDisposable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal class MessageEnumerator(DbDataReader reader, IPluginLogProxy logger)
|
internal class MessageEnumerator(DbDataReader reader, ILogger<MessageEnumerator> logger)
|
||||||
: IEnumerable<Message>,
|
: IEnumerable<Message>,
|
||||||
IDisposable,
|
IDisposable,
|
||||||
IAsyncDisposable
|
IAsyncDisposable
|
||||||
{
|
{
|
||||||
private const int MaxErrorLogs = 10;
|
private const int MaxErrorLogs = 10;
|
||||||
|
|
||||||
private readonly IPluginLogProxy _logger = logger;
|
private readonly ILogger<MessageEnumerator> _logger = logger;
|
||||||
private readonly List<Guid> FailedIds = [];
|
private readonly List<Guid> FailedIds = [];
|
||||||
private int FailedCount;
|
private int FailedCount;
|
||||||
public bool DidError => FailedCount > 0;
|
public bool DidError => FailedCount > 0;
|
||||||
@@ -1248,10 +1420,10 @@ internal class MessageEnumerator(DbDataReader reader, IPluginLogProxy logger)
|
|||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
if (FailedCount < MaxErrorLogs)
|
if (FailedCount < MaxErrorLogs)
|
||||||
_logger.Error($"Exception while reading message '{id}' from database: {e}");
|
_logger.LogError($"Exception while reading message '{id}' from database: {e}");
|
||||||
FailedCount++;
|
FailedCount++;
|
||||||
if (FailedCount == MaxErrorLogs)
|
if (FailedCount == MaxErrorLogs)
|
||||||
_logger.Error("Further parsing errors will not be logged");
|
_logger.LogError("Further parsing errors will not be logged");
|
||||||
if (id != Guid.Empty)
|
if (id != Guid.Empty)
|
||||||
FailedIds.Add(id);
|
FailedIds.Add(id);
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
using HellionChat.Resources;
|
||||||
|
|
||||||
|
namespace HellionChat;
|
||||||
|
|
||||||
|
// How a sender's name is rendered in the chat log. Kept in its own file
|
||||||
|
// (no Dalamud usings) so the SenderNameFormatter pure-helper test stays
|
||||||
|
// AppDomain-isolated (feedback_dalamud_test_isolation).
|
||||||
|
|
||||||
|
public enum WorldSuffixMode
|
||||||
|
{
|
||||||
|
Never,
|
||||||
|
OtherWorldOnly,
|
||||||
|
Always,
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum NameFormMode
|
||||||
|
{
|
||||||
|
Full,
|
||||||
|
FirstNameOnly,
|
||||||
|
Initials,
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class NameDisplayModeExt
|
||||||
|
{
|
||||||
|
public static string Name(this WorldSuffixMode mode) =>
|
||||||
|
mode switch
|
||||||
|
{
|
||||||
|
WorldSuffixMode.Never => HellionStrings.NameDisplay_WorldSuffix_Never,
|
||||||
|
WorldSuffixMode.OtherWorldOnly => HellionStrings.NameDisplay_WorldSuffix_OtherWorldOnly,
|
||||||
|
WorldSuffixMode.Always => HellionStrings.NameDisplay_WorldSuffix_Always,
|
||||||
|
_ => mode.ToString(),
|
||||||
|
};
|
||||||
|
|
||||||
|
public static string Name(this NameFormMode mode) =>
|
||||||
|
mode switch
|
||||||
|
{
|
||||||
|
NameFormMode.Full => HellionStrings.NameDisplay_NameForm_Full,
|
||||||
|
NameFormMode.FirstNameOnly => HellionStrings.NameDisplay_NameForm_FirstNameOnly,
|
||||||
|
NameFormMode.Initials => HellionStrings.NameDisplay_NameForm_Initials,
|
||||||
|
_ => mode.ToString(),
|
||||||
|
};
|
||||||
|
}
|
||||||
Executable → Regular
+539
-484
File diff suppressed because it is too large
Load Diff
+838
-277
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,480 @@
|
|||||||
|
using Dalamud.Interface.ImGuiFileDialog;
|
||||||
|
using Dalamud.Plugin;
|
||||||
|
using Dalamud.Plugin.Services;
|
||||||
|
using HellionChat.Infrastructure.Hosting;
|
||||||
|
using HellionChat.Infrastructure.Logging;
|
||||||
|
using HellionChat.Ipc;
|
||||||
|
using HellionChat.Themes;
|
||||||
|
using HellionChat.Ui;
|
||||||
|
using HellionChat.Util;
|
||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using Microsoft.Extensions.Hosting;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
|
namespace HellionChat;
|
||||||
|
|
||||||
|
// Builds the generic-host DI container that drives v1.5.0+. The factory is
|
||||||
|
// invoked synchronously from Plugin.ctor (after the schema gate clears) so the
|
||||||
|
// container exists before PluginLifecycle.LoadAsync runs. For the
|
||||||
|
// deliberate divergence from Lightless' deferred Func-delegate pattern.
|
||||||
|
internal static class PluginHostFactory
|
||||||
|
{
|
||||||
|
public static IHost Build(Plugin plugin, PluginHostDependencies dependencies)
|
||||||
|
{
|
||||||
|
return new HostBuilder()
|
||||||
|
.UseContentRoot(dependencies.PluginInterface.ConfigDirectory.FullName)
|
||||||
|
.ConfigureLogging(logging =>
|
||||||
|
{
|
||||||
|
logging.ClearProviders();
|
||||||
|
logging.AddDalamudLogging(dependencies.PluginLog);
|
||||||
|
logging.SetMinimumLevel(LogLevel.Trace);
|
||||||
|
})
|
||||||
|
// ValidateOnBuild eagerly instantiates every singleton at Build time
|
||||||
|
// so missing registrations / ConstructorCallSite cycles throw on
|
||||||
|
// load instead of producing a silent hang. ValidateScopes is cheap
|
||||||
|
// (we only use singletons) but guards against future Scoped misuse.
|
||||||
|
.UseDefaultServiceProvider(o =>
|
||||||
|
{
|
||||||
|
o.ValidateOnBuild = true;
|
||||||
|
o.ValidateScopes = true;
|
||||||
|
})
|
||||||
|
.ConfigureServices(services => ConfigureServices(services, plugin, dependencies))
|
||||||
|
.Build();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void ConfigureServices(
|
||||||
|
IServiceCollection services,
|
||||||
|
Plugin plugin,
|
||||||
|
PluginHostDependencies dependencies
|
||||||
|
)
|
||||||
|
{
|
||||||
|
// Dalamud services (21 [PluginService] singletons).
|
||||||
|
services.AddSingleton(dependencies);
|
||||||
|
services.AddSingleton(dependencies.PluginInterface);
|
||||||
|
services.AddSingleton(dependencies.PluginLog);
|
||||||
|
services.AddSingleton(dependencies.ChatGui);
|
||||||
|
services.AddSingleton(dependencies.ClientState);
|
||||||
|
services.AddSingleton(dependencies.CommandManager);
|
||||||
|
services.AddSingleton(dependencies.Condition);
|
||||||
|
services.AddSingleton(dependencies.DataManager);
|
||||||
|
services.AddSingleton(dependencies.Framework);
|
||||||
|
services.AddSingleton(dependencies.GameGui);
|
||||||
|
services.AddSingleton(dependencies.KeyState);
|
||||||
|
services.AddSingleton(dependencies.ObjectTable);
|
||||||
|
services.AddSingleton(dependencies.PartyList);
|
||||||
|
services.AddSingleton(dependencies.TargetManager);
|
||||||
|
services.AddSingleton(dependencies.TextureProvider);
|
||||||
|
services.AddSingleton(dependencies.GameInteropProvider);
|
||||||
|
services.AddSingleton(dependencies.GameConfig);
|
||||||
|
services.AddSingleton(dependencies.Notification);
|
||||||
|
services.AddSingleton(dependencies.AddonLifecycle);
|
||||||
|
services.AddSingleton(dependencies.PlayerState);
|
||||||
|
services.AddSingleton(dependencies.Evaluator);
|
||||||
|
services.AddSingleton(dependencies.SelfTestRegistry);
|
||||||
|
|
||||||
|
// Self-references: Plugin and its WindowSystem already exist.
|
||||||
|
services.AddSingleton(plugin);
|
||||||
|
services.AddSingleton(plugin.WindowSystem);
|
||||||
|
services.AddSingleton<PluginLifecycle>();
|
||||||
|
|
||||||
|
// HellionChat singletons. Factory lambdas because most
|
||||||
|
// classes are internal-sealed and the default activator only sees
|
||||||
|
// public ctors.
|
||||||
|
services.AddSingleton<IPlatformUtil>(_ => new DalamudPlatformUtil());
|
||||||
|
services.AddSingleton<IPluginLogProxy>(sp => new DalamudPluginLogProxy(
|
||||||
|
sp.GetRequiredService<IPluginLog>()
|
||||||
|
));
|
||||||
|
services.AddSingleton<FileDialogManager>(_ => new FileDialogManager());
|
||||||
|
services.AddSingleton(sp => new Commands(sp.GetRequiredService<ILogger<Commands>>()));
|
||||||
|
services.AddSingleton(sp => new FontManager(
|
||||||
|
sp.GetRequiredService<IDalamudPluginInterface>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new IpcManager(sp.GetRequiredService<ILogger<IpcManager>>()));
|
||||||
|
services.AddSingleton(sp => new ExtraChat(sp.GetRequiredService<ILogger<ExtraChat>>()));
|
||||||
|
|
||||||
|
services.AddSingleton(sp => new ThemeRegistry(
|
||||||
|
Path.Combine(
|
||||||
|
sp.GetRequiredService<IDalamudPluginInterface>().ConfigDirectory.FullName,
|
||||||
|
"themes"
|
||||||
|
),
|
||||||
|
sp.GetRequiredService<ILogger<ThemeRegistry>>()
|
||||||
|
));
|
||||||
|
|
||||||
|
services.AddSingleton(_ => new Ui.StyleEngine.TokenResolver());
|
||||||
|
|
||||||
|
// Transient: each surface owns its motes, so two backdrops on screen do
|
||||||
|
// not drift in lockstep.
|
||||||
|
services.AddSingleton(sp => new Ui.Components.Settings.SectionRenderer(
|
||||||
|
sp.GetRequiredService<ThemeRegistry>(),
|
||||||
|
sp.GetRequiredService<Ui.StyleEngine.TokenResolver>()
|
||||||
|
));
|
||||||
|
|
||||||
|
services.AddTransient(sp => new Ui.StyleEngine.SurfaceBackdrop(
|
||||||
|
sp.GetRequiredService<ThemeRegistry>(),
|
||||||
|
sp.GetRequiredService<Ui.StyleEngine.TokenResolver>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.StyleEngine.PushStack(
|
||||||
|
sp.GetRequiredService<Ui.StyleEngine.TokenResolver>()
|
||||||
|
));
|
||||||
|
|
||||||
|
services.AddSingleton(sp => new GameFunctions.GameFunctions(
|
||||||
|
sp.GetRequiredService<Plugin>(),
|
||||||
|
sp.GetRequiredService<ILogger<GameFunctions.GameFunctions>>(),
|
||||||
|
sp.GetRequiredService<ILoggerFactory>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new TypingIpc(
|
||||||
|
sp.GetRequiredService<Plugin>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.InputBar>(),
|
||||||
|
sp.GetRequiredService<ILogger<TypingIpc>>()
|
||||||
|
));
|
||||||
|
|
||||||
|
services.AddSingleton(sp => new Integrations.HonorificService(
|
||||||
|
sp.GetRequiredService<IDalamudPluginInterface>(),
|
||||||
|
sp.GetRequiredService<ILogger<Integrations.HonorificService>>(),
|
||||||
|
sp.GetRequiredService<IFramework>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Services.TellRouterService(
|
||||||
|
sp.GetRequiredService<MessageManager>(),
|
||||||
|
sp.GetRequiredService<ILogger<Services.TellRouterService>>()
|
||||||
|
));
|
||||||
|
|
||||||
|
services.AddSingleton(sp => new Ui.Components.HonorificHeader(
|
||||||
|
sp.GetRequiredService<Integrations.HonorificService>(),
|
||||||
|
sp.GetRequiredService<FontManager>(),
|
||||||
|
sp.GetRequiredService<ThemeRegistry>(),
|
||||||
|
sp.GetRequiredService<Ui.StyleEngine.TokenResolver>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.Components.Sidebar(
|
||||||
|
sp.GetRequiredService<ThemeRegistry>(),
|
||||||
|
sp.GetRequiredService<Ui.StyleEngine.TokenResolver>(),
|
||||||
|
sp.GetRequiredService<FontManager>(),
|
||||||
|
sp.GetRequiredService<ILogger<Ui.Components.Sidebar>>(),
|
||||||
|
sp.GetRequiredService<Ui.Windows.ChannelPopoutPool>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.Components.MessageList(
|
||||||
|
sp.GetRequiredService<FontManager>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.ChunkRenderer>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(_ => new Ui.Components.SymbolPicker());
|
||||||
|
services.AddSingleton(sp => new Ui.Components.ThemeQuickPicker(
|
||||||
|
sp.GetRequiredService<ThemeRegistry>(),
|
||||||
|
sp.GetRequiredService<Plugin>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.Components.InputBar(
|
||||||
|
sp.GetRequiredService<Ui.Components.SymbolPicker>(),
|
||||||
|
sp.GetRequiredService<FontManager>(),
|
||||||
|
sp.GetRequiredService<ThemeRegistry>(),
|
||||||
|
sp.GetRequiredService<Ui.StyleEngine.TokenResolver>(),
|
||||||
|
sp.GetRequiredService<ILogger<Ui.Components.InputBar>>(),
|
||||||
|
() => sp.GetRequiredService<Plugin>().SettingsWindow.Toggle(),
|
||||||
|
sp.GetRequiredService<Ui.CommandHelpWindow>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.ThemeQuickPicker>(),
|
||||||
|
() => sp.GetRequiredService<Plugin>().MainWindow.UserHide()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.Components.Settings.TabSidebar(
|
||||||
|
sp.GetRequiredService<FontManager>(),
|
||||||
|
sp.GetRequiredService<ThemeRegistry>(),
|
||||||
|
sp.GetRequiredService<Ui.StyleEngine.TokenResolver>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.Components.Settings.ContentArea(
|
||||||
|
sp.GetRequiredService<Ui.StyleEngine.SurfaceBackdrop>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.Components.Settings.ThemePicker(
|
||||||
|
sp.GetRequiredService<ThemeRegistry>(),
|
||||||
|
sp.GetRequiredService<Plugin>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.SectionRenderer>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.Components.Settings.ColorPicker(
|
||||||
|
sp.GetRequiredService<ThemeRegistry>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.SectionRenderer>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.Components.Settings.LivePreviewPanel(
|
||||||
|
sp.GetRequiredService<ThemeRegistry>(),
|
||||||
|
sp.GetRequiredService<Ui.StyleEngine.TokenResolver>(),
|
||||||
|
sp.GetRequiredService<FontManager>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.Components.Settings.ThemeImportExportRow(
|
||||||
|
sp.GetRequiredService<ThemeRegistry>(),
|
||||||
|
sp.GetRequiredService<ILogger<Ui.Components.Settings.ThemeImportExportRow>>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.Components.Settings.FontsSection(
|
||||||
|
sp.GetRequiredService<Plugin>(),
|
||||||
|
sp.GetRequiredService<FontManager>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.SectionRenderer>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.Components.Settings.ChatColourPicker(
|
||||||
|
sp.GetRequiredService<Plugin>(),
|
||||||
|
sp.GetRequiredService<ThemeRegistry>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.SectionRenderer>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.Components.Settings.Tabs.AppearanceTab(
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.ThemePicker>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.ColorPicker>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.LivePreviewPanel>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.ThemeImportExportRow>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.FontsSection>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.ChatColourPicker>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.Components.Settings.Tabs.GeneralTab(
|
||||||
|
sp.GetRequiredService<Plugin>(),
|
||||||
|
sp.GetRequiredService<FontManager>(),
|
||||||
|
sp.GetRequiredService<Ui.StyleEngine.TokenResolver>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.Components.Settings.Tabs.ChatTab(
|
||||||
|
sp.GetRequiredService<Plugin>(),
|
||||||
|
sp.GetRequiredService<Ui.StyleEngine.TokenResolver>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.Components.Settings.Tabs.WindowTab(
|
||||||
|
sp.GetRequiredService<Plugin>(),
|
||||||
|
sp.GetRequiredService<Ui.StyleEngine.TokenResolver>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.Components.Settings.Tabs.ChannelsTab(
|
||||||
|
sp.GetRequiredService<Plugin>(),
|
||||||
|
sp.GetRequiredService<Ui.StyleEngine.TokenResolver>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.Components.Settings.Tabs.DataPrivacyTab(
|
||||||
|
sp.GetRequiredService<Plugin>(),
|
||||||
|
sp.GetRequiredService<Ui.StyleEngine.TokenResolver>(),
|
||||||
|
sp.GetRequiredService<ILogger<Ui.Components.Settings.Tabs.DataPrivacyTab>>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.Components.Settings.Tabs.AboutTab(
|
||||||
|
sp.GetRequiredService<FontManager>(),
|
||||||
|
sp.GetRequiredService<Plugin>(),
|
||||||
|
sp.GetRequiredService<Integrations.HonorificService>(),
|
||||||
|
sp.GetRequiredService<ThemeRegistry>(),
|
||||||
|
sp.GetRequiredService<IPlatformUtil>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.Components.StatusBar(
|
||||||
|
sp.GetRequiredService<ThemeRegistry>(),
|
||||||
|
sp.GetRequiredService<FontManager>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.Components.TopTabBar(
|
||||||
|
sp.GetRequiredService<Ui.Windows.ChannelPopoutPool>(),
|
||||||
|
sp.GetRequiredService<ThemeRegistry>(),
|
||||||
|
sp.GetRequiredService<Ui.StyleEngine.TokenResolver>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Ui.Windows.MainWindow(
|
||||||
|
sp.GetRequiredService<Ui.Components.HonorificHeader>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Sidebar>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.TopTabBar>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.MessageList>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.InputBar>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.StatusBar>(),
|
||||||
|
sp.GetRequiredService<Lender<PayloadHandler>>(),
|
||||||
|
sp.GetRequiredService<Ui.Windows.ChannelPopoutPool>(),
|
||||||
|
sp.GetRequiredService<Ui.StyleEngine.SurfaceBackdrop>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Integrations.FailedTellNotifier(
|
||||||
|
sp.GetRequiredService<ILogger<Integrations.FailedTellNotifier>>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new Integrations.CustomAudioPlayer(
|
||||||
|
sp.GetRequiredService<ILogger<Integrations.CustomAudioPlayer>>()
|
||||||
|
));
|
||||||
|
|
||||||
|
services.AddSingleton(sp => new MessageManager(
|
||||||
|
sp.GetRequiredService<Plugin>(),
|
||||||
|
sp.GetRequiredService<ILogger<MessageManager>>(),
|
||||||
|
sp.GetRequiredService<ILoggerFactory>()
|
||||||
|
));
|
||||||
|
|
||||||
|
// MessageStore is allocated inside MessageManager.ctor; a separate
|
||||||
|
// container singleton would double-construct the SQLite handle.
|
||||||
|
services.AddSingleton(sp =>
|
||||||
|
{
|
||||||
|
var pluginRef = sp.GetRequiredService<Plugin>();
|
||||||
|
var manager = sp.GetRequiredService<MessageManager>();
|
||||||
|
return new AutoTellTabsService(
|
||||||
|
pluginRef,
|
||||||
|
manager,
|
||||||
|
manager.Store,
|
||||||
|
sp.GetRequiredService<ILogger<AutoTellTabsService>>()
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Factory-lambdas for ChunkRenderer, PayloadHandler, and Lender<PayloadHandler>
|
||||||
|
// because all three are internal-sealed (ActivatorUtilities can't reflect into
|
||||||
|
// internal ctors) and Lender<T> has an internal ctor by design.
|
||||||
|
// PayloadHandler registered twice: once as singleton for G/H, once via Lender<T> for per-frame isolation (I/J/K).
|
||||||
|
services.AddSingleton(sp => new Ui.Components.ChunkRenderer(
|
||||||
|
sp.GetRequiredService<ThemeRegistry>(),
|
||||||
|
sp.GetRequiredService<FontManager>(),
|
||||||
|
sp.GetRequiredService<ILogger<Ui.Components.ChunkRenderer>>(),
|
||||||
|
sp.GetRequiredService<GameFunctions.GameFunctions>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => MakePayloadHandler(sp));
|
||||||
|
services.AddSingleton(sp => new Lender<PayloadHandler>(() => MakePayloadHandler(sp)));
|
||||||
|
|
||||||
|
// Pop-out windows: each gets its OWN MessageList + InputBar so the
|
||||||
|
// channel pill and message scroll are per-window. The PayloadHandler is
|
||||||
|
// attached post-build (ChannelPopoutInitHostedService), NEVER via ctor
|
||||||
|
// (would close a silent FactoryCallSite cycle).
|
||||||
|
services.AddSingleton<Func<int, Ui.Windows.ChannelPopoutWindow>>(sp =>
|
||||||
|
slot => new Ui.Windows.ChannelPopoutWindow(
|
||||||
|
slot,
|
||||||
|
new Ui.Components.MessageList(
|
||||||
|
sp.GetRequiredService<FontManager>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.ChunkRenderer>()
|
||||||
|
),
|
||||||
|
new Ui.Components.InputBar(
|
||||||
|
sp.GetRequiredService<Ui.Components.SymbolPicker>(),
|
||||||
|
sp.GetRequiredService<FontManager>(),
|
||||||
|
sp.GetRequiredService<ThemeRegistry>(),
|
||||||
|
sp.GetRequiredService<Ui.StyleEngine.TokenResolver>(),
|
||||||
|
sp.GetRequiredService<ILogger<Ui.Components.InputBar>>(),
|
||||||
|
() => sp.GetRequiredService<Plugin>().SettingsWindow.Toggle(),
|
||||||
|
sp.GetRequiredService<Ui.CommandHelpWindow>()
|
||||||
|
),
|
||||||
|
sp.GetRequiredService<ILogger<Ui.Windows.ChannelPopoutWindow>>(),
|
||||||
|
sp.GetRequiredService<FontManager>(),
|
||||||
|
sp.GetRequiredService<Ui.StyleEngine.SurfaceBackdrop>(),
|
||||||
|
sp.GetRequiredService<ThemeRegistry>(),
|
||||||
|
sp.GetRequiredService<Ui.StyleEngine.TokenResolver>()
|
||||||
|
)
|
||||||
|
);
|
||||||
|
services.AddSingleton(sp => new Ui.Windows.ChannelPopoutPool(
|
||||||
|
sp.GetRequiredService<Func<int, Ui.Windows.ChannelPopoutWindow>>(),
|
||||||
|
sp.GetRequiredService<ILogger<Ui.Windows.ChannelPopoutPool>>()
|
||||||
|
));
|
||||||
|
|
||||||
|
// Windows. WindowSystem.AddWindow is called from
|
||||||
|
// PluginLifecycle.LoadAsync on the framework thread.
|
||||||
|
services.AddSingleton(sp => new Ui.Windows.SettingsWindow(
|
||||||
|
sp.GetRequiredService<Plugin>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.TabSidebar>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.ContentArea>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.ThemePicker>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.ColorPicker>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.LivePreviewPanel>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.Tabs.AppearanceTab>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.Tabs.GeneralTab>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.Tabs.ChatTab>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.Tabs.WindowTab>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.Tabs.ChannelsTab>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.Tabs.DataPrivacyTab>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.Settings.Tabs.AboutTab>(),
|
||||||
|
sp.GetRequiredService<ILoggerFactory>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new DbViewer(
|
||||||
|
sp.GetRequiredService<Plugin>(),
|
||||||
|
sp.GetRequiredService<ILogger<DbViewer>>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new InputPreview(
|
||||||
|
sp.GetRequiredService<Ui.Components.ChunkRenderer>(),
|
||||||
|
sp.GetRequiredService<Lender<PayloadHandler>>(),
|
||||||
|
sp.GetRequiredService<Ui.Windows.MainWindow>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.InputBar>(),
|
||||||
|
sp.GetRequiredService<ILogger<InputPreview>>()
|
||||||
|
));
|
||||||
|
// No MainWindow ctor-param: breaks the InputBar -> CommandHelpWindow ->
|
||||||
|
// MainWindow -> InputBar singleton cycle. MainWindow is wired post-build
|
||||||
|
// via CommandHelpWindowInitHostedService.
|
||||||
|
services.AddSingleton(sp => new CommandHelpWindow(
|
||||||
|
sp.GetRequiredService<Ui.Components.ChunkRenderer>(),
|
||||||
|
sp.GetRequiredService<ILogger<CommandHelpWindow>>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new SeStringDebugger(sp.GetRequiredService<Plugin>()));
|
||||||
|
#if DEBUG
|
||||||
|
services.AddSingleton(sp => new Ui.Windows.WidgetGalleryWindow(
|
||||||
|
sp.GetRequiredService<Plugin>(),
|
||||||
|
sp.GetRequiredService<Ui.StyleEngine.TokenResolver>()
|
||||||
|
));
|
||||||
|
#endif
|
||||||
|
// The style lab: variants side by side, in-game, against the live theme.
|
||||||
|
// Permanent, and deliberately not behind DEBUG: style decisions get
|
||||||
|
// made in the build that actually ships.
|
||||||
|
services.AddSingleton(sp => new Ui.Windows.InputBarLabWindow(
|
||||||
|
sp.GetRequiredService<Plugin>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new DebuggerWindow(
|
||||||
|
sp.GetRequiredService<Plugin>(),
|
||||||
|
sp.GetRequiredService<PayloadHandler>()
|
||||||
|
));
|
||||||
|
services.AddSingleton(sp => new FirstRunWizard(
|
||||||
|
sp.GetRequiredService<Plugin>(),
|
||||||
|
sp.GetRequiredService<Ui.StyleEngine.SurfaceBackdrop>()
|
||||||
|
));
|
||||||
|
|
||||||
|
// Hosted-service adapters: thin wrappers around the existing init
|
||||||
|
// methods so the service class bodies stay unchanged. FontManager
|
||||||
|
// does not need one — its ctor runs the init inline inside a single
|
||||||
|
// SuppressAutoRebuild block on eager resolve.
|
||||||
|
services.AddHostedService(sp => new ThemeRegistryInitHostedService(
|
||||||
|
sp.GetRequiredService<ThemeRegistry>(),
|
||||||
|
sp.GetRequiredService<FontManager>()
|
||||||
|
));
|
||||||
|
services.AddHostedService(sp => new IpcManagerInitHostedService(
|
||||||
|
sp.GetRequiredService<IpcManager>()
|
||||||
|
));
|
||||||
|
services.AddHostedService(sp => new TypingIpcInitHostedService(
|
||||||
|
sp.GetRequiredService<TypingIpc>()
|
||||||
|
));
|
||||||
|
services.AddHostedService(sp => new ExtraChatInitHostedService(
|
||||||
|
sp.GetRequiredService<ExtraChat>()
|
||||||
|
));
|
||||||
|
services.AddHostedService(sp => new MessageManagerInitHostedService(
|
||||||
|
sp.GetRequiredService<IDalamudPluginInterface>(),
|
||||||
|
sp.GetRequiredService<MessageManager>()
|
||||||
|
));
|
||||||
|
services.AddHostedService(sp => new AutoTellTabsServiceInitHostedService(
|
||||||
|
sp.GetRequiredService<AutoTellTabsService>()
|
||||||
|
));
|
||||||
|
// Must come AFTER AutoTell's registration: both subscribe MessageProcessed,
|
||||||
|
// and AutoTell subscribing first lets the router's IsOpen-guard see the
|
||||||
|
// already-opened pop-out (FIFO framework-tick ordering, no double-pop).
|
||||||
|
services.AddHostedService(sp => new TellRouterServiceInitHostedService(
|
||||||
|
sp.GetRequiredService<Services.TellRouterService>()
|
||||||
|
));
|
||||||
|
services.AddHostedService(
|
||||||
|
sp => new Infrastructure.Hosting.FailedTellNotifierInitHostedService(
|
||||||
|
sp.GetRequiredService<Integrations.FailedTellNotifier>()
|
||||||
|
)
|
||||||
|
);
|
||||||
|
services.AddHostedService(sp => new PayloadHandlerInitHostedService(
|
||||||
|
sp.GetRequiredService<PayloadHandler>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.MessageList>()
|
||||||
|
));
|
||||||
|
services.AddHostedService(sp => new CommandHelpWindowInitHostedService(
|
||||||
|
sp.GetRequiredService<Ui.CommandHelpWindow>(),
|
||||||
|
sp.GetRequiredService<Ui.Windows.MainWindow>()
|
||||||
|
));
|
||||||
|
services.AddHostedService(sp => new ChannelPopoutInitHostedService(
|
||||||
|
sp.GetRequiredService<Ui.Windows.ChannelPopoutPool>(),
|
||||||
|
sp.GetRequiredService<PayloadHandler>()
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static PayloadHandler MakePayloadHandler(IServiceProvider sp) =>
|
||||||
|
new(
|
||||||
|
sp.GetRequiredService<ThemeRegistry>(),
|
||||||
|
sp.GetRequiredService<IpcManager>(),
|
||||||
|
sp.GetRequiredService<GameFunctions.GameFunctions>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.InputBar>(),
|
||||||
|
sp.GetRequiredService<Ui.Windows.MainWindow>(),
|
||||||
|
sp.GetRequiredService<Ui.Components.ChunkRenderer>(),
|
||||||
|
sp.GetRequiredService<ILogger<PayloadHandler>>()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal sealed record PluginHostDependencies(
|
||||||
|
IDalamudPluginInterface PluginInterface,
|
||||||
|
IPluginLog PluginLog,
|
||||||
|
IChatGui ChatGui,
|
||||||
|
IClientState ClientState,
|
||||||
|
ICommandManager CommandManager,
|
||||||
|
ICondition Condition,
|
||||||
|
IDataManager DataManager,
|
||||||
|
IFramework Framework,
|
||||||
|
IGameGui GameGui,
|
||||||
|
IKeyState KeyState,
|
||||||
|
IObjectTable ObjectTable,
|
||||||
|
IPartyList PartyList,
|
||||||
|
ITargetManager TargetManager,
|
||||||
|
ITextureProvider TextureProvider,
|
||||||
|
IGameInteropProvider GameInteropProvider,
|
||||||
|
IGameConfig GameConfig,
|
||||||
|
INotificationManager Notification,
|
||||||
|
IAddonLifecycle AddonLifecycle,
|
||||||
|
IPlayerState PlayerState,
|
||||||
|
ISeStringEvaluator Evaluator,
|
||||||
|
ISelfTestRegistry SelfTestRegistry
|
||||||
|
);
|
||||||
@@ -0,0 +1,152 @@
|
|||||||
|
using System.Runtime.ExceptionServices;
|
||||||
|
using Dalamud.Plugin.Services;
|
||||||
|
using Microsoft.Extensions.Hosting;
|
||||||
|
|
||||||
|
namespace HellionChat;
|
||||||
|
|
||||||
|
// Orchestrates Host.StartAsync / StopAsync and the framework-thread dispose.
|
||||||
|
// Plugin.ctor builds the host and assigns it via the Host property, so
|
||||||
|
// PluginLifecycle never constructs the host itself.
|
||||||
|
internal sealed class PluginLifecycle : IAsyncDisposable
|
||||||
|
{
|
||||||
|
private readonly IFramework _framework;
|
||||||
|
private readonly Plugin _plugin;
|
||||||
|
|
||||||
|
private int _disposeStarted;
|
||||||
|
private bool _hostStartRequested;
|
||||||
|
|
||||||
|
public PluginLifecycle(IFramework framework, Plugin plugin)
|
||||||
|
{
|
||||||
|
_framework = framework;
|
||||||
|
_plugin = plugin;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Plugin.ctor fills this immediately after PluginHostFactory.Build and
|
||||||
|
// before invoking LoadAsync; LoadAsync may NRE-suppress on Host! safely.
|
||||||
|
public IHost? Host { get; set; }
|
||||||
|
|
||||||
|
public async Task LoadAsync(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_hostStartRequested = true;
|
||||||
|
await Host!.StartAsync(cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
// WindowSystem.AddWindow mutates an internal List<>; v1.4.9 Stage-2
|
||||||
|
// verified the list is non-thread-safe, so we marshal the entire
|
||||||
|
// registration block to the framework thread.
|
||||||
|
await _framework
|
||||||
|
.RunOnFrameworkThread(() => RegisterWindows(_plugin))
|
||||||
|
.ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await DisposeAsync().ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// Swallow secondary dispose failure so the original load throw wins.
|
||||||
|
}
|
||||||
|
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void RegisterWindows(Plugin plugin)
|
||||||
|
{
|
||||||
|
plugin.WindowSystem.AddWindow(plugin.MainWindow);
|
||||||
|
plugin.WindowSystem.AddWindow(plugin.SettingsWindow);
|
||||||
|
plugin.WindowSystem.AddWindow(plugin.DbViewer);
|
||||||
|
plugin.WindowSystem.AddWindow(Plugin.InputPreview);
|
||||||
|
plugin.WindowSystem.AddWindow(plugin.CommandHelpWindow);
|
||||||
|
plugin.WindowSystem.AddWindow(plugin.SeStringDebugger);
|
||||||
|
#if DEBUG
|
||||||
|
plugin.WindowSystem.AddWindow(plugin.WidgetGallery);
|
||||||
|
#endif
|
||||||
|
plugin.WindowSystem.AddWindow(plugin.InputBarLab);
|
||||||
|
plugin.WindowSystem.AddWindow(plugin.DebuggerWindow);
|
||||||
|
plugin.WindowSystem.AddWindow(plugin.FirstRunWizard);
|
||||||
|
|
||||||
|
// Pop-out pool: register all pre-allocated instances ONCE here on the
|
||||||
|
// framework thread. Open/Close at runtime is IsOpen-only, never AddWindow.
|
||||||
|
foreach (var popout in plugin.ChannelPopoutPool.Instances)
|
||||||
|
plugin.WindowSystem.AddWindow(popout);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask DisposeAsync()
|
||||||
|
{
|
||||||
|
// Idempotency guard — Dalamud may fire DisposeAsync twice in a reload race.
|
||||||
|
if (Interlocked.Exchange(ref _disposeStarted, 1) != 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
Exception? failure = null;
|
||||||
|
|
||||||
|
if (_hostStartRequested && Host is not null)
|
||||||
|
failure = await CaptureFailureAsync(failure, () => Host.StopAsync())
|
||||||
|
.ConfigureAwait(false);
|
||||||
|
|
||||||
|
failure = await DisposeHostOnFrameworkThreadAsync(failure).ConfigureAwait(false);
|
||||||
|
|
||||||
|
ThrowIfFailed(failure);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<Exception?> DisposeHostOnFrameworkThreadAsync(Exception? failure)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await _framework
|
||||||
|
.RunOnFrameworkThread(() =>
|
||||||
|
{
|
||||||
|
failure = CaptureFailure(failure, () => Host?.Dispose());
|
||||||
|
})
|
||||||
|
.ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
failure ??= ex;
|
||||||
|
}
|
||||||
|
|
||||||
|
return failure;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Exception? CaptureFailure(Exception? failure, Action action)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
action();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
failure ??= ex;
|
||||||
|
}
|
||||||
|
|
||||||
|
return failure;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static async ValueTask<Exception?> CaptureFailureAsync(
|
||||||
|
Exception? failure,
|
||||||
|
Func<Task> action
|
||||||
|
)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await action().ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
failure ??= ex;
|
||||||
|
}
|
||||||
|
|
||||||
|
return failure;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void ThrowIfFailed(Exception? failure)
|
||||||
|
{
|
||||||
|
if (failure is not null)
|
||||||
|
ExceptionDispatchInfo.Capture(failure).Throw();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,154 @@
|
|||||||
|
using HellionChat.Code;
|
||||||
|
using HellionChat.Resources;
|
||||||
|
|
||||||
|
namespace HellionChat.Privacy;
|
||||||
|
|
||||||
|
// The eight buckets the privacy surface sorts channels into. Eighty-nine
|
||||||
|
// checkboxes in one flat list is not a choice anybody makes; eight named groups
|
||||||
|
// is. Shared by the export form and the persist grid so the two screens
|
||||||
|
// describe channels the same way.
|
||||||
|
//
|
||||||
|
// Headings are functions, not strings, so a language switch at runtime relabels
|
||||||
|
// them on the next frame. A captured string would keep the language the window
|
||||||
|
// happened to be opened in.
|
||||||
|
//
|
||||||
|
// Game Master channels follow ChatTypeExt.Parent(), which already pairs each of
|
||||||
|
// them with its player counterpart. Filing them all under system traffic reads
|
||||||
|
// tidier but puts GmTell -- a private two-person conversation -- outside the
|
||||||
|
// direct-messages group, and an access request that quietly drops part of what
|
||||||
|
// it promises is the dangerous kind of gap.
|
||||||
|
//
|
||||||
|
// Every ChatType belongs to exactly one group, and a build-suite test pins that.
|
||||||
|
// A channel in no group cannot be picked in any of these screens, which reads as
|
||||||
|
// a missing checkbox rather than as an omission.
|
||||||
|
internal static class ChannelGroups
|
||||||
|
{
|
||||||
|
internal static readonly (Func<string> Heading, ChatType[] Types)[] All =
|
||||||
|
[
|
||||||
|
(
|
||||||
|
() => HellionStrings.Privacy_Group_DirectMessages,
|
||||||
|
[ChatType.TellIncoming, ChatType.TellOutgoing, ChatType.GmTell]
|
||||||
|
),
|
||||||
|
(
|
||||||
|
() => HellionStrings.Privacy_Group_PartyAlliance,
|
||||||
|
[
|
||||||
|
ChatType.Party,
|
||||||
|
ChatType.CrossParty,
|
||||||
|
ChatType.Alliance,
|
||||||
|
ChatType.PvpTeam,
|
||||||
|
ChatType.PvpTeamAnnouncement,
|
||||||
|
ChatType.PvpTeamLoginLogout,
|
||||||
|
ChatType.GmParty,
|
||||||
|
]
|
||||||
|
),
|
||||||
|
(
|
||||||
|
() => HellionStrings.Privacy_Group_FreeCompany,
|
||||||
|
[
|
||||||
|
ChatType.FreeCompany,
|
||||||
|
ChatType.FreeCompanyAnnouncement,
|
||||||
|
ChatType.FreeCompanyLoginLogout,
|
||||||
|
ChatType.GmFreeCompany,
|
||||||
|
]
|
||||||
|
),
|
||||||
|
(
|
||||||
|
() => HellionStrings.Privacy_Group_Linkshells,
|
||||||
|
[
|
||||||
|
ChatType.Linkshell1,
|
||||||
|
ChatType.Linkshell2,
|
||||||
|
ChatType.Linkshell3,
|
||||||
|
ChatType.Linkshell4,
|
||||||
|
ChatType.Linkshell5,
|
||||||
|
ChatType.Linkshell6,
|
||||||
|
ChatType.Linkshell7,
|
||||||
|
ChatType.Linkshell8,
|
||||||
|
ChatType.GmLinkshell1,
|
||||||
|
ChatType.GmLinkshell2,
|
||||||
|
ChatType.GmLinkshell3,
|
||||||
|
ChatType.GmLinkshell4,
|
||||||
|
ChatType.GmLinkshell5,
|
||||||
|
ChatType.GmLinkshell6,
|
||||||
|
ChatType.GmLinkshell7,
|
||||||
|
ChatType.GmLinkshell8,
|
||||||
|
]
|
||||||
|
),
|
||||||
|
(
|
||||||
|
() => 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.NoviceNetworkSystem,
|
||||||
|
ChatType.CustomEmote,
|
||||||
|
ChatType.StandardEmote,
|
||||||
|
ChatType.GmSay,
|
||||||
|
ChatType.GmShout,
|
||||||
|
ChatType.GmYell,
|
||||||
|
ChatType.GmNoviceNetwork,
|
||||||
|
]
|
||||||
|
),
|
||||||
|
(
|
||||||
|
() => 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,
|
||||||
|
ChatType.MessageBook,
|
||||||
|
ChatType.Alarm,
|
||||||
|
ChatType.Orchestrion,
|
||||||
|
ChatType.GlamourNotifications,
|
||||||
|
ChatType.PeriodicRecruitmentNotification,
|
||||||
|
ChatType.GatheringSystem,
|
||||||
|
ChatType.Progress,
|
||||||
|
ChatType.Debug,
|
||||||
|
ChatType.Error,
|
||||||
|
ChatType.Item,
|
||||||
|
ChatType.Action,
|
||||||
|
ChatType.BattleSystem,
|
||||||
|
ChatType.Damage,
|
||||||
|
ChatType.Healing,
|
||||||
|
ChatType.Miss,
|
||||||
|
ChatType.GainBuff,
|
||||||
|
ChatType.GainDebuff,
|
||||||
|
ChatType.LoseBuff,
|
||||||
|
ChatType.LoseDebuff,
|
||||||
|
]
|
||||||
|
),
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -4,7 +4,7 @@ namespace HellionChat.Privacy;
|
|||||||
|
|
||||||
internal static class PrivacyDefaults
|
internal static class PrivacyDefaults
|
||||||
{
|
{
|
||||||
// F3.1: failsafe for ChatTypes added by future FFXIV patches. New installs
|
// Failsafe for ChatTypes added by future FFXIV patches. New installs
|
||||||
// persist unknown channels so a major patch's added ChatType isn't silently
|
// persist unknown channels so a major patch's added ChatType isn't silently
|
||||||
// dropped before the user can opt in or out. Existing configs keep their
|
// dropped before the user can opt in or out. Existing configs keep their
|
||||||
// explicit choice — see Configuration.cs PrivacyPersistUnknownChannels.
|
// explicit choice — see Configuration.cs PrivacyPersistUnknownChannels.
|
||||||
@@ -114,4 +114,29 @@ internal static class PrivacyDefaults
|
|||||||
[ChatType.StandardEmote] = 1,
|
[ChatType.StandardEmote] = 1,
|
||||||
[ChatType.NoviceNetwork] = 1,
|
[ChatType.NoviceNetwork] = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Roleplay: Privacy-First + Say + both emote types. Public-distance
|
||||||
|
// channels (Shout, Yell) stay out — they are public-noise from
|
||||||
|
// strangers, not story content. Novice Network also stays out;
|
||||||
|
// it is not RP-adjacent and would dilute the profile's intent.
|
||||||
|
internal static readonly IReadOnlySet<ChatType> RoleplayWhitelist = new HashSet<ChatType>(
|
||||||
|
PrivacyFirstWhitelist
|
||||||
|
)
|
||||||
|
{
|
||||||
|
ChatType.Say,
|
||||||
|
ChatType.CustomEmote,
|
||||||
|
ChatType.StandardEmote,
|
||||||
|
};
|
||||||
|
|
||||||
|
// RP sessions function as story logs: Say + emotes need a longer
|
||||||
|
// window than Casual's 1-day public-chat window. 30 days for Say
|
||||||
|
// keeps in-character dialogue scrollable across multiple sessions,
|
||||||
|
// 90 days for emotes mirrors the Privacy-First conversation default.
|
||||||
|
internal static readonly IReadOnlyDictionary<ChatType, int> RoleplayRetentionOverrides =
|
||||||
|
new Dictionary<ChatType, int>
|
||||||
|
{
|
||||||
|
[ChatType.Say] = 30,
|
||||||
|
[ChatType.CustomEmote] = 90,
|
||||||
|
[ChatType.StandardEmote] = 90,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,51 @@
|
|||||||
|
namespace HellionChat.Privacy;
|
||||||
|
|
||||||
|
// The rule that decides whether a message is written to disk, as plain logic.
|
||||||
|
//
|
||||||
|
// It lives apart from Configuration because Configuration implements a Dalamud
|
||||||
|
// interface, and the build suite cannot load Dalamud.dll -- the runtime resolves
|
||||||
|
// the declaring type before it ever reaches the method body, so even a static
|
||||||
|
// call on it fails. This is the single most consequential branch in the plugin,
|
||||||
|
// and it belongs where it can be pinned.
|
||||||
|
internal static class StorageRule
|
||||||
|
{
|
||||||
|
// v1.12.0 corrected the last term. A known channel the user had unticked
|
||||||
|
// used to fall through to the unknown-type failsafe, so the channel grid did
|
||||||
|
// nothing at all whenever that failsafe was on. It is on by default, so the
|
||||||
|
// filter stored everything while its own description promised "only messages
|
||||||
|
// from allowed channels are written to the database".
|
||||||
|
internal static bool Allows(bool listed, bool knownType, bool persistUnknownTypes) =>
|
||||||
|
listed || (!knownType && persistUnknownTypes);
|
||||||
|
|
||||||
|
// Carry-over for configs written before that correction. Where the failsafe
|
||||||
|
// made the list irrelevant and no channel was ever picked, the old rule
|
||||||
|
// stored everything; the corrected rule would store nothing. Switching the
|
||||||
|
// filter off keeps the behaviour and states it where the user can see it.
|
||||||
|
//
|
||||||
|
// A config that does have picks keeps them and starts honouring them, which
|
||||||
|
// is the point of the change.
|
||||||
|
internal static bool ShouldDisableFilterOnV24(
|
||||||
|
bool filterEnabled,
|
||||||
|
bool persistUnknownTypes,
|
||||||
|
int listedCount
|
||||||
|
) => filterEnabled && persistUnknownTypes && listedCount == 0;
|
||||||
|
|
||||||
|
// Why a retroactive cleanup cannot be offered, or that it can.
|
||||||
|
internal enum CleanupAvailability
|
||||||
|
{
|
||||||
|
Available,
|
||||||
|
|
||||||
|
// Nothing is filtered, so nothing in the database contradicts the rule.
|
||||||
|
FilterDisabled,
|
||||||
|
|
||||||
|
// The rule keeps no channel at all. CleanupRetainOnly refuses an empty
|
||||||
|
// allowlist on purpose -- that request is a full wipe, and a full wipe
|
||||||
|
// has its own button with its own confirmation.
|
||||||
|
NothingListed,
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static CleanupAvailability CleanupState(bool filterEnabled, int listedCount) =>
|
||||||
|
!filterEnabled ? CleanupAvailability.FilterDisabled
|
||||||
|
: listedCount == 0 ? CleanupAvailability.NothingListed
|
||||||
|
: CleanupAvailability.Available;
|
||||||
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 419 KiB |
@@ -0,0 +1,4 @@
|
|||||||
|
|\_/|,,_____,~~`
|
||||||
|
(.".)~~ )`~}}
|
||||||
|
\o/\ /---~\\ ~}}
|
||||||
|
_// _// ~}
|
||||||
Binary file not shown.
+255
-80
@@ -41,11 +41,9 @@ internal class HellionStrings
|
|||||||
private static string Get(string key)
|
private static string Get(string key)
|
||||||
=> ResourceManager.GetString(key, resourceCulture) ?? key;
|
=> ResourceManager.GetString(key, resourceCulture) ?? key;
|
||||||
|
|
||||||
internal static string Privacy_Tab_Title => Get(nameof(Privacy_Tab_Title));
|
|
||||||
internal static string Privacy_FilterEnabled_Name => Get(nameof(Privacy_FilterEnabled_Name));
|
internal static string Privacy_FilterEnabled_Name => Get(nameof(Privacy_FilterEnabled_Name));
|
||||||
internal static string Privacy_FilterEnabled_Description => Get(nameof(Privacy_FilterEnabled_Description));
|
internal static string Privacy_FilterEnabled_Description => Get(nameof(Privacy_FilterEnabled_Description));
|
||||||
internal static string Privacy_FilterEnabled_StorageOnly_Help => Get(nameof(Privacy_FilterEnabled_StorageOnly_Help));
|
internal static string Privacy_FilterEnabled_StorageOnly_Help => Get(nameof(Privacy_FilterEnabled_StorageOnly_Help));
|
||||||
internal static string Privacy_Filter_Tree_Heading => Get(nameof(Privacy_Filter_Tree_Heading));
|
|
||||||
internal static string Privacy_Whitelist_Help => Get(nameof(Privacy_Whitelist_Help));
|
internal static string Privacy_Whitelist_Help => Get(nameof(Privacy_Whitelist_Help));
|
||||||
internal static string Privacy_Preset_PrivacyFirst => Get(nameof(Privacy_Preset_PrivacyFirst));
|
internal static string Privacy_Preset_PrivacyFirst => Get(nameof(Privacy_Preset_PrivacyFirst));
|
||||||
internal static string Privacy_Preset_ClearAll => Get(nameof(Privacy_Preset_ClearAll));
|
internal static string Privacy_Preset_ClearAll => Get(nameof(Privacy_Preset_ClearAll));
|
||||||
@@ -61,11 +59,10 @@ internal class HellionStrings
|
|||||||
internal static string Privacy_PersistUnknown_Name => Get(nameof(Privacy_PersistUnknown_Name));
|
internal static string Privacy_PersistUnknown_Name => Get(nameof(Privacy_PersistUnknown_Name));
|
||||||
internal static string Privacy_PersistUnknown_Description => Get(nameof(Privacy_PersistUnknown_Description));
|
internal static string Privacy_PersistUnknown_Description => Get(nameof(Privacy_PersistUnknown_Description));
|
||||||
|
|
||||||
internal static string Cleanup_Heading => Get(nameof(Cleanup_Heading));
|
internal static string Cleanup_Unavailable_FilterOff => Get(nameof(Cleanup_Unavailable_FilterOff));
|
||||||
|
internal static string Cleanup_Unavailable_NothingListed => Get(nameof(Cleanup_Unavailable_NothingListed));
|
||||||
internal static string Cleanup_Help_Intro => Get(nameof(Cleanup_Help_Intro));
|
internal static string Cleanup_Help_Intro => Get(nameof(Cleanup_Help_Intro));
|
||||||
internal static string Cleanup_Help_SavedNote => Get(nameof(Cleanup_Help_SavedNote));
|
|
||||||
internal static string Cleanup_Preview_Stale => Get(nameof(Cleanup_Preview_Stale));
|
internal static string Cleanup_Preview_Stale => Get(nameof(Cleanup_Preview_Stale));
|
||||||
internal static string Retention_Help_SavedNote => Get(nameof(Retention_Help_SavedNote));
|
|
||||||
internal static string Cleanup_RefreshPreview => Get(nameof(Cleanup_RefreshPreview));
|
internal static string Cleanup_RefreshPreview => Get(nameof(Cleanup_RefreshPreview));
|
||||||
internal static string Cleanup_NoPreview => Get(nameof(Cleanup_NoPreview));
|
internal static string Cleanup_NoPreview => Get(nameof(Cleanup_NoPreview));
|
||||||
internal static string Cleanup_TotalStored => Get(nameof(Cleanup_TotalStored));
|
internal static string Cleanup_TotalStored => Get(nameof(Cleanup_TotalStored));
|
||||||
@@ -94,8 +91,8 @@ internal class HellionStrings
|
|||||||
internal static string Retention_Tag_Global => Get(nameof(Retention_Tag_Global));
|
internal static string Retention_Tag_Global => Get(nameof(Retention_Tag_Global));
|
||||||
internal static string Retention_Reset_Button => Get(nameof(Retention_Reset_Button));
|
internal static string Retention_Reset_Button => Get(nameof(Retention_Reset_Button));
|
||||||
internal static string Retention_Apply_Label => Get(nameof(Retention_Apply_Label));
|
internal static string Retention_Apply_Label => Get(nameof(Retention_Apply_Label));
|
||||||
internal static string Retention_Apply_Tooltip => Get(nameof(Retention_Apply_Tooltip));
|
|
||||||
internal static string Retention_Running => Get(nameof(Retention_Running));
|
internal static string Retention_Running => Get(nameof(Retention_Running));
|
||||||
|
internal static string Retention_RunNow_Tooltip => Get(nameof(Retention_RunNow_Tooltip));
|
||||||
internal static string Retention_LastRun_Never => Get(nameof(Retention_LastRun_Never));
|
internal static string Retention_LastRun_Never => Get(nameof(Retention_LastRun_Never));
|
||||||
internal static string Retention_LastRun_At => Get(nameof(Retention_LastRun_At));
|
internal static string Retention_LastRun_At => Get(nameof(Retention_LastRun_At));
|
||||||
internal static string Retention_Success => Get(nameof(Retention_Success));
|
internal static string Retention_Success => Get(nameof(Retention_Success));
|
||||||
@@ -116,8 +113,41 @@ internal class HellionStrings
|
|||||||
internal static string Wizard_Reopen_Button => Get(nameof(Wizard_Reopen_Button));
|
internal static string Wizard_Reopen_Button => Get(nameof(Wizard_Reopen_Button));
|
||||||
internal static string Wizard_Cancel_Label => Get(nameof(Wizard_Cancel_Label));
|
internal static string Wizard_Cancel_Label => Get(nameof(Wizard_Cancel_Label));
|
||||||
internal static string Wizard_Cancel_Tooltip => Get(nameof(Wizard_Cancel_Tooltip));
|
internal static string Wizard_Cancel_Tooltip => Get(nameof(Wizard_Cancel_Tooltip));
|
||||||
|
internal static string Wizard_Step1_Title => Get(nameof(Wizard_Step1_Title));
|
||||||
|
internal static string Wizard_Step1_Subtitle => Get(nameof(Wizard_Step1_Subtitle));
|
||||||
|
internal static string Wizard_Step1_Footer_Hint => Get(nameof(Wizard_Step1_Footer_Hint));
|
||||||
|
internal static string Wizard_Step1_PluginNotice => Get(nameof(Wizard_Step1_PluginNotice));
|
||||||
|
internal static string Wizard_Step1_Heritage => Get(nameof(Wizard_Step1_Heritage));
|
||||||
|
internal static string Wizard_Step1_Skip_Label => Get(nameof(Wizard_Step1_Skip_Label));
|
||||||
|
internal static string Wizard_Step1_Skip_Tooltip => Get(nameof(Wizard_Step1_Skip_Tooltip));
|
||||||
|
internal static string Wizard_Step2_Title => Get(nameof(Wizard_Step2_Title));
|
||||||
|
internal static string Wizard_Profile_Recommended_Badge => Get(nameof(Wizard_Profile_Recommended_Badge));
|
||||||
|
internal static string Wizard_Profile_Roleplay_Heading => Get(nameof(Wizard_Profile_Roleplay_Heading));
|
||||||
|
internal static string Wizard_Profile_Roleplay_Description => Get(nameof(Wizard_Profile_Roleplay_Description));
|
||||||
|
internal static string Wizard_Profile_Roleplay_Apply => Get(nameof(Wizard_Profile_Roleplay_Apply));
|
||||||
|
internal static string Wizard_Nav_Back => Get(nameof(Wizard_Nav_Back));
|
||||||
|
internal static string Wizard_Nav_Next => Get(nameof(Wizard_Nav_Next));
|
||||||
|
internal static string Wizard_Nav_Finish => Get(nameof(Wizard_Nav_Finish));
|
||||||
|
internal static string Wizard_Step3_Title => Get(nameof(Wizard_Step3_Title));
|
||||||
|
internal static string Wizard_Step3_Section_History => Get(nameof(Wizard_Step3_Section_History));
|
||||||
|
internal static string Wizard_Step3_Section_TellTabs => Get(nameof(Wizard_Step3_Section_TellTabs));
|
||||||
|
internal static string Wizard_Step3_Section_Visual => Get(nameof(Wizard_Step3_Section_Visual));
|
||||||
|
internal static string Wizard_Step3_FilterIncludePreviousSessions_Label => Get(nameof(Wizard_Step3_FilterIncludePreviousSessions_Label));
|
||||||
|
internal static string Wizard_Step3_AutoTellTabsHistoryPreload_Label => Get(nameof(Wizard_Step3_AutoTellTabsHistoryPreload_Label));
|
||||||
|
internal static string Wizard_Step3_UseCompactDensity_Label => Get(nameof(Wizard_Step3_UseCompactDensity_Label));
|
||||||
|
internal static string Wizard_Step3_PrettierTimestamps_Label => Get(nameof(Wizard_Step3_PrettierTimestamps_Label));
|
||||||
|
internal static string Wizard_Step3_Theme_Label => Get(nameof(Wizard_Step3_Theme_Label));
|
||||||
|
internal static string Wizard_Step4_Title => Get(nameof(Wizard_Step4_Title));
|
||||||
|
internal static string Wizard_Step4_SummaryHeading => Get(nameof(Wizard_Step4_SummaryHeading));
|
||||||
|
internal static string Wizard_Step4_Summary_Profile => Get(nameof(Wizard_Step4_Summary_Profile));
|
||||||
|
internal static string Wizard_Step4_Summary_History => Get(nameof(Wizard_Step4_Summary_History));
|
||||||
|
internal static string Wizard_Step4_Summary_TellTabs => Get(nameof(Wizard_Step4_Summary_TellTabs));
|
||||||
|
internal static string Wizard_Step4_Summary_Visual => Get(nameof(Wizard_Step4_Summary_Visual));
|
||||||
|
internal static string Wizard_Step4_Summary_Unchanged => Get(nameof(Wizard_Step4_Summary_Unchanged));
|
||||||
|
internal static string Wizard_Step4_Summary_Off => Get(nameof(Wizard_Step4_Summary_Off));
|
||||||
|
internal static string Wizard_Step4_TestHint => Get(nameof(Wizard_Step4_TestHint));
|
||||||
|
internal static string Wizard_Step4_SettingsHint => Get(nameof(Wizard_Step4_SettingsHint));
|
||||||
|
|
||||||
internal static string Export_Heading => Get(nameof(Export_Heading));
|
|
||||||
internal static string Export_Help => Get(nameof(Export_Help));
|
internal static string Export_Help => Get(nameof(Export_Help));
|
||||||
internal static string Export_Range_Label => Get(nameof(Export_Range_Label));
|
internal static string Export_Range_Label => Get(nameof(Export_Range_Label));
|
||||||
internal static string Export_Sender_Label => Get(nameof(Export_Sender_Label));
|
internal static string Export_Sender_Label => Get(nameof(Export_Sender_Label));
|
||||||
@@ -172,8 +202,6 @@ internal class HellionStrings
|
|||||||
internal static string AutoTellTabs_UnGreetedTooltip => Get(nameof(AutoTellTabs_UnGreetedTooltip));
|
internal static string AutoTellTabs_UnGreetedTooltip => Get(nameof(AutoTellTabs_UnGreetedTooltip));
|
||||||
internal static string PinTab_MenuPin => Get(nameof(PinTab_MenuPin));
|
internal static string PinTab_MenuPin => Get(nameof(PinTab_MenuPin));
|
||||||
internal static string PinTab_MenuUnpin => Get(nameof(PinTab_MenuUnpin));
|
internal static string PinTab_MenuUnpin => Get(nameof(PinTab_MenuUnpin));
|
||||||
internal static string PinTab_MenuPromote => Get(nameof(PinTab_MenuPromote));
|
|
||||||
internal static string PinTab_PromoteTooltip => Get(nameof(PinTab_PromoteTooltip));
|
|
||||||
internal static string PinTab_LimitReached => Get(nameof(PinTab_LimitReached));
|
internal static string PinTab_LimitReached => Get(nameof(PinTab_LimitReached));
|
||||||
internal static string PinTab_PinnedTooltip => Get(nameof(PinTab_PinnedTooltip));
|
internal static string PinTab_PinnedTooltip => Get(nameof(PinTab_PinnedTooltip));
|
||||||
internal static string PinTab_PinTooltip => Get(nameof(PinTab_PinTooltip));
|
internal static string PinTab_PinTooltip => Get(nameof(PinTab_PinTooltip));
|
||||||
@@ -191,8 +219,6 @@ internal class HellionStrings
|
|||||||
internal static string ChatLog_AutoTellTabs_Compact_Description => Get(nameof(ChatLog_AutoTellTabs_Compact_Description));
|
internal static string ChatLog_AutoTellTabs_Compact_Description => Get(nameof(ChatLog_AutoTellTabs_Compact_Description));
|
||||||
internal static string ChatLog_AutoTellTabs_GreetedToggle_Name => Get(nameof(ChatLog_AutoTellTabs_GreetedToggle_Name));
|
internal static string ChatLog_AutoTellTabs_GreetedToggle_Name => Get(nameof(ChatLog_AutoTellTabs_GreetedToggle_Name));
|
||||||
internal static string ChatLog_AutoTellTabs_GreetedToggle_Description => Get(nameof(ChatLog_AutoTellTabs_GreetedToggle_Description));
|
internal static string ChatLog_AutoTellTabs_GreetedToggle_Description => Get(nameof(ChatLog_AutoTellTabs_GreetedToggle_Description));
|
||||||
internal static string ChatLog_AutoTellTabs_OpenAsPopout_Name => Get(nameof(ChatLog_AutoTellTabs_OpenAsPopout_Name));
|
|
||||||
internal static string ChatLog_AutoTellTabs_OpenAsPopout_Description => Get(nameof(ChatLog_AutoTellTabs_OpenAsPopout_Description));
|
|
||||||
internal static string ChatLog_AutoTellTabs_PreloadHint => Get(nameof(ChatLog_AutoTellTabs_PreloadHint));
|
internal static string ChatLog_AutoTellTabs_PreloadHint => Get(nameof(ChatLog_AutoTellTabs_PreloadHint));
|
||||||
internal static string ChatLog_AutoTellTabs_ConflictHint => Get(nameof(ChatLog_AutoTellTabs_ConflictHint));
|
internal static string ChatLog_AutoTellTabs_ConflictHint => Get(nameof(ChatLog_AutoTellTabs_ConflictHint));
|
||||||
|
|
||||||
@@ -203,8 +229,6 @@ internal class HellionStrings
|
|||||||
internal static string Privacy_AutoTellTabs_Preload_Hint => Get(nameof(Privacy_AutoTellTabs_Preload_Hint));
|
internal static string Privacy_AutoTellTabs_Preload_Hint => Get(nameof(Privacy_AutoTellTabs_Preload_Hint));
|
||||||
|
|
||||||
// Hellion Chat — Settings UX Polish v10 wipe migration
|
// Hellion Chat — Settings UX Polish v10 wipe migration
|
||||||
internal static string SettingsRefactor_Migration_Title => Get(nameof(SettingsRefactor_Migration_Title));
|
|
||||||
internal static string SettingsRefactor_Migration_Content => Get(nameof(SettingsRefactor_Migration_Content));
|
|
||||||
|
|
||||||
// Hellion Chat — Settings UX Polish 8-tab structure
|
// Hellion Chat — Settings UX Polish 8-tab structure
|
||||||
internal static string Settings_Tab_General => Get(nameof(Settings_Tab_General));
|
internal static string Settings_Tab_General => Get(nameof(Settings_Tab_General));
|
||||||
@@ -216,24 +240,6 @@ internal class HellionStrings
|
|||||||
internal static string Settings_Tab_Information => Get(nameof(Settings_Tab_Information));
|
internal static string Settings_Tab_Information => Get(nameof(Settings_Tab_Information));
|
||||||
|
|
||||||
// v1.1.0 — Settings card-grid overview
|
// v1.1.0 — Settings card-grid overview
|
||||||
internal static string Settings_Card_General_Title => Get(nameof(Settings_Card_General_Title));
|
|
||||||
internal static string Settings_Card_General_Subtext => Get(nameof(Settings_Card_General_Subtext));
|
|
||||||
internal static string Settings_Card_Appearance_Title => Get(nameof(Settings_Card_Appearance_Title));
|
|
||||||
internal static string Settings_Card_Appearance_Subtext => Get(nameof(Settings_Card_Appearance_Subtext));
|
|
||||||
internal static string Settings_Card_Themes_Title => Get(nameof(Settings_Card_Themes_Title));
|
|
||||||
internal static string Settings_Card_Themes_Subtext => Get(nameof(Settings_Card_Themes_Subtext));
|
|
||||||
internal static string Settings_Card_Window_Title => Get(nameof(Settings_Card_Window_Title));
|
|
||||||
internal static string Settings_Card_Window_Subtext => Get(nameof(Settings_Card_Window_Subtext));
|
|
||||||
internal static string Settings_Card_Chat_Title => Get(nameof(Settings_Card_Chat_Title));
|
|
||||||
internal static string Settings_Card_Chat_Subtext => Get(nameof(Settings_Card_Chat_Subtext));
|
|
||||||
internal static string Settings_Card_Tabs_Title => Get(nameof(Settings_Card_Tabs_Title));
|
|
||||||
internal static string Settings_Card_Tabs_Subtext => Get(nameof(Settings_Card_Tabs_Subtext));
|
|
||||||
internal static string Settings_Card_Privacy_Title => Get(nameof(Settings_Card_Privacy_Title));
|
|
||||||
internal static string Settings_Card_Privacy_Subtext => Get(nameof(Settings_Card_Privacy_Subtext));
|
|
||||||
internal static string Settings_Card_Database_Title => Get(nameof(Settings_Card_Database_Title));
|
|
||||||
internal static string Settings_Card_Database_Subtext => Get(nameof(Settings_Card_Database_Subtext));
|
|
||||||
internal static string Settings_Card_Information_Title => Get(nameof(Settings_Card_Information_Title));
|
|
||||||
internal static string Settings_Card_Information_Subtext => Get(nameof(Settings_Card_Information_Subtext));
|
|
||||||
|
|
||||||
// v1.1.0 — Themes-Settings-Tab
|
// v1.1.0 — Themes-Settings-Tab
|
||||||
internal static string Settings_Tab_Themes => Get(nameof(Settings_Tab_Themes));
|
internal static string Settings_Tab_Themes => Get(nameof(Settings_Tab_Themes));
|
||||||
@@ -246,11 +252,7 @@ internal class HellionStrings
|
|||||||
internal static string Settings_Themes_ApplyChatColors_Apply => Get(nameof(Settings_Themes_ApplyChatColors_Apply));
|
internal static string Settings_Themes_ApplyChatColors_Apply => Get(nameof(Settings_Themes_ApplyChatColors_Apply));
|
||||||
internal static string Settings_Themes_ApplyChatColors_Keep => Get(nameof(Settings_Themes_ApplyChatColors_Keep));
|
internal static string Settings_Themes_ApplyChatColors_Keep => Get(nameof(Settings_Themes_ApplyChatColors_Keep));
|
||||||
|
|
||||||
// Hellion Chat — General-Tab section headings
|
internal static string Settings_Language_FFXIVCoverage_Warning => Get(nameof(Settings_Language_FFXIVCoverage_Warning));
|
||||||
internal static string Settings_General_Input_Heading => Get(nameof(Settings_General_Input_Heading));
|
|
||||||
internal static string Settings_General_Audio_Heading => Get(nameof(Settings_General_Audio_Heading));
|
|
||||||
internal static string Settings_General_Performance_Heading => Get(nameof(Settings_General_Performance_Heading));
|
|
||||||
internal static string Settings_General_Language_Heading => Get(nameof(Settings_General_Language_Heading));
|
|
||||||
|
|
||||||
// Hellion Chat — Appearance-Tab section headings
|
// Hellion Chat — Appearance-Tab section headings
|
||||||
internal static string Settings_Appearance_Theme_Heading => Get(nameof(Settings_Appearance_Theme_Heading));
|
internal static string Settings_Appearance_Theme_Heading => Get(nameof(Settings_Appearance_Theme_Heading));
|
||||||
@@ -258,30 +260,27 @@ internal class HellionStrings
|
|||||||
internal static string Settings_Appearance_Colours_Heading => Get(nameof(Settings_Appearance_Colours_Heading));
|
internal static string Settings_Appearance_Colours_Heading => Get(nameof(Settings_Appearance_Colours_Heading));
|
||||||
internal static string Settings_Appearance_Timestamps_Heading => Get(nameof(Settings_Appearance_Timestamps_Heading));
|
internal static string Settings_Appearance_Timestamps_Heading => Get(nameof(Settings_Appearance_Timestamps_Heading));
|
||||||
|
|
||||||
// Hellion Chat — Window-Tab section headings
|
// Hellion Chat — Window-Tab section headings (pre-cycle legacy, kept for reference)
|
||||||
internal static string Settings_Window_Hide_Heading => Get(nameof(Settings_Window_Hide_Heading));
|
|
||||||
internal static string Settings_Window_InactivityHide_Heading => Get(nameof(Settings_Window_InactivityHide_Heading));
|
|
||||||
internal static string Settings_Window_Frame_Heading => Get(nameof(Settings_Window_Frame_Heading));
|
internal static string Settings_Window_Frame_Heading => Get(nameof(Settings_Window_Frame_Heading));
|
||||||
internal static string Settings_Window_Tooltips_Heading => Get(nameof(Settings_Window_Tooltips_Heading));
|
|
||||||
|
|
||||||
// Hellion Chat — Chat-Tab section headings
|
// Hellion Chat — Chat-Tab SymbolPicker
|
||||||
internal static string Settings_Chat_AutoTellTabs_Heading => Get(nameof(Settings_Chat_AutoTellTabs_Heading));
|
internal static string Settings_Chat_SymbolPicker_Enable_Name => Get(nameof(Settings_Chat_SymbolPicker_Enable_Name));
|
||||||
internal static string Settings_Chat_Behaviour_Heading => Get(nameof(Settings_Chat_Behaviour_Heading));
|
internal static string Settings_Chat_SymbolPicker_Enable_Description => Get(nameof(Settings_Chat_SymbolPicker_Enable_Description));
|
||||||
internal static string Settings_Chat_Preview_Heading => Get(nameof(Settings_Chat_Preview_Heading));
|
|
||||||
internal static string Settings_Chat_Emotes_Heading => Get(nameof(Settings_Chat_Emotes_Heading));
|
|
||||||
|
|
||||||
// Hellion Chat — Database-Tab section headings
|
// Hellion Chat — Database-Tab section headings
|
||||||
internal static string Settings_Database_Storage_Heading => Get(nameof(Settings_Database_Storage_Heading));
|
internal static string Settings_Database_Busy => Get(nameof(Settings_Database_Busy));
|
||||||
internal static string Settings_Database_Viewer_Heading => Get(nameof(Settings_Database_Viewer_Heading));
|
internal static string Settings_Database_ClearHint => Get(nameof(Settings_Database_ClearHint));
|
||||||
internal static string Settings_Database_Stats_Heading => Get(nameof(Settings_Database_Stats_Heading));
|
internal static string Settings_Database_ClearError => Get(nameof(Settings_Database_ClearError));
|
||||||
|
internal static string Settings_Database_Op_RetentionSweep => Get(nameof(Settings_Database_Op_RetentionSweep));
|
||||||
// Hellion Chat — Information-Tab section headings
|
internal static string Settings_Database_Op_Export => Get(nameof(Settings_Database_Op_Export));
|
||||||
internal static string Settings_Information_VersionInfo_Heading => Get(nameof(Settings_Information_VersionInfo_Heading));
|
internal static string Settings_Database_Op_Cleanup => Get(nameof(Settings_Database_Op_Cleanup));
|
||||||
internal static string Settings_Information_About_Heading => Get(nameof(Settings_Information_About_Heading));
|
internal static string Settings_Database_Op_Clear => Get(nameof(Settings_Database_Op_Clear));
|
||||||
internal static string Settings_Information_Changelog_Heading => Get(nameof(Settings_Information_Changelog_Heading));
|
internal static string Settings_Database_Op_Preview => Get(nameof(Settings_Database_Op_Preview));
|
||||||
|
internal static string Settings_Database_Op_Maintenance => Get(nameof(Settings_Database_Op_Maintenance));
|
||||||
|
|
||||||
// Hellion Chat — Default tab presets (channel-themed)
|
// Hellion Chat — Default tab presets (channel-themed)
|
||||||
internal static string Tabs_Presets_System => Get(nameof(Tabs_Presets_System));
|
internal static string Tabs_Presets_System => Get(nameof(Tabs_Presets_System));
|
||||||
|
internal static string Tabs_Presets_Emote => Get(nameof(Tabs_Presets_Emote));
|
||||||
internal static string Tabs_Presets_FreeCompany => Get(nameof(Tabs_Presets_FreeCompany));
|
internal static string Tabs_Presets_FreeCompany => Get(nameof(Tabs_Presets_FreeCompany));
|
||||||
internal static string Tabs_Presets_Party => Get(nameof(Tabs_Presets_Party));
|
internal static string Tabs_Presets_Party => Get(nameof(Tabs_Presets_Party));
|
||||||
internal static string Tabs_Presets_Beginner => Get(nameof(Tabs_Presets_Beginner));
|
internal static string Tabs_Presets_Beginner => Get(nameof(Tabs_Presets_Beginner));
|
||||||
@@ -314,14 +313,8 @@ internal class HellionStrings
|
|||||||
internal static string Settings_Window_ResetPosition_Description => Get(nameof(Settings_Window_ResetPosition_Description));
|
internal static string Settings_Window_ResetPosition_Description => Get(nameof(Settings_Window_ResetPosition_Description));
|
||||||
|
|
||||||
// Hellion Chat — v0.6.0 one-time hint banner shown inside pop-outs
|
// Hellion Chat — v0.6.0 one-time hint banner shown inside pop-outs
|
||||||
internal static string Popout_v060_HintText => Get(nameof(Popout_v060_HintText));
|
|
||||||
internal static string Popout_v060_HintAck => Get(nameof(Popout_v060_HintAck));
|
|
||||||
internal static string Popout_v060_HintOpenSettings => Get(nameof(Popout_v060_HintOpenSettings));
|
|
||||||
|
|
||||||
// Hellion Chat — v0.6.1 pop-out header hint banner (discoverability)
|
// Hellion Chat — v0.6.1 pop-out header hint banner (discoverability)
|
||||||
internal static string Hint_v061_PopOutHeader_Body => Get(nameof(Hint_v061_PopOutHeader_Body));
|
|
||||||
internal static string Hint_v061_PopOutHeader_Ack => Get(nameof(Hint_v061_PopOutHeader_Ack));
|
|
||||||
internal static string Hint_v061_PopOutHeader_OpenSettings => Get(nameof(Hint_v061_PopOutHeader_OpenSettings));
|
|
||||||
|
|
||||||
// Hellion Chat — v1.0.0 Chat 2 parallel-load conflict detection
|
// Hellion Chat — v1.0.0 Chat 2 parallel-load conflict detection
|
||||||
internal static string ChatTwoConflictTitle => Get(nameof(ChatTwoConflictTitle));
|
internal static string ChatTwoConflictTitle => Get(nameof(ChatTwoConflictTitle));
|
||||||
@@ -337,14 +330,7 @@ internal class HellionStrings
|
|||||||
internal static string Appearance_UseCompactDensity_Description => Get(nameof(Appearance_UseCompactDensity_Description));
|
internal static string Appearance_UseCompactDensity_Description => Get(nameof(Appearance_UseCompactDensity_Description));
|
||||||
|
|
||||||
// Hellion Chat — v1.2.1 Settings Cleanup: new card titles + subtexts
|
// Hellion Chat — v1.2.1 Settings Cleanup: new card titles + subtexts
|
||||||
internal static string Settings_Card_ThemeAndLayout_Title => Get(nameof(Settings_Card_ThemeAndLayout_Title));
|
|
||||||
internal static string Settings_Card_ThemeAndLayout_Subtext => Get(nameof(Settings_Card_ThemeAndLayout_Subtext));
|
|
||||||
internal static string Settings_Card_FontsAndColours_Title => Get(nameof(Settings_Card_FontsAndColours_Title));
|
|
||||||
internal static string Settings_Card_FontsAndColours_Subtext => Get(nameof(Settings_Card_FontsAndColours_Subtext));
|
|
||||||
internal static string Settings_Card_DataManagement_Title => Get(nameof(Settings_Card_DataManagement_Title));
|
internal static string Settings_Card_DataManagement_Title => Get(nameof(Settings_Card_DataManagement_Title));
|
||||||
internal static string Settings_Card_DataManagement_Subtext => Get(nameof(Settings_Card_DataManagement_Subtext));
|
|
||||||
internal static string Settings_Card_Integrations_Title => Get(nameof(Settings_Card_Integrations_Title));
|
|
||||||
internal static string Settings_Card_Integrations_Subtext => Get(nameof(Settings_Card_Integrations_Subtext));
|
|
||||||
|
|
||||||
// Hellion Chat — v1.2.1 Theme & Layout tab section headings + WindowOpacity slider
|
// Hellion Chat — v1.2.1 Theme & Layout tab section headings + WindowOpacity slider
|
||||||
internal static string Settings_ThemeAndLayout_Theme_Heading => Get(nameof(Settings_ThemeAndLayout_Theme_Heading));
|
internal static string Settings_ThemeAndLayout_Theme_Heading => Get(nameof(Settings_ThemeAndLayout_Theme_Heading));
|
||||||
@@ -353,26 +339,112 @@ internal class HellionStrings
|
|||||||
internal static string Settings_ThemeAndLayout_WindowOpacity_Name => Get(nameof(Settings_ThemeAndLayout_WindowOpacity_Name));
|
internal static string Settings_ThemeAndLayout_WindowOpacity_Name => Get(nameof(Settings_ThemeAndLayout_WindowOpacity_Name));
|
||||||
internal static string Settings_ThemeAndLayout_WindowOpacity_Description => Get(nameof(Settings_ThemeAndLayout_WindowOpacity_Description));
|
internal static string Settings_ThemeAndLayout_WindowOpacity_Description => Get(nameof(Settings_ThemeAndLayout_WindowOpacity_Description));
|
||||||
|
|
||||||
// Hellion Chat — v1.2.1 Fonts & Colours tab section headings
|
|
||||||
internal static string Settings_FontsAndColours_Fonts_Heading => Get(nameof(Settings_FontsAndColours_Fonts_Heading));
|
|
||||||
internal static string Settings_FontsAndColours_Colours_Heading => Get(nameof(Settings_FontsAndColours_Colours_Heading));
|
|
||||||
|
|
||||||
// Hellion Chat — v1.2.1 Data Management tab section headings
|
// Hellion Chat — v1.2.1 Data Management tab section headings
|
||||||
internal static string Settings_DataManagement_Storage_Heading => Get(nameof(Settings_DataManagement_Storage_Heading));
|
|
||||||
internal static string Settings_DataManagement_Retention_Heading => Get(nameof(Settings_DataManagement_Retention_Heading));
|
|
||||||
internal static string Settings_DataManagement_Cleanup_Heading => Get(nameof(Settings_DataManagement_Cleanup_Heading));
|
|
||||||
internal static string Settings_DataManagement_Export_Heading => Get(nameof(Settings_DataManagement_Export_Heading));
|
|
||||||
internal static string Settings_DataManagement_DbViewer_Heading => Get(nameof(Settings_DataManagement_DbViewer_Heading));
|
|
||||||
internal static string Settings_DataManagement_Advanced_Heading => Get(nameof(Settings_DataManagement_Advanced_Heading));
|
internal static string Settings_DataManagement_Advanced_Heading => Get(nameof(Settings_DataManagement_Advanced_Heading));
|
||||||
|
|
||||||
// Hellion Chat — v1.2.1 Window-tab Behaviour heading (replaces Frame heading)
|
// v1.5.6: Data & Privacy tab section titles
|
||||||
internal static string Settings_Window_Frame_Behaviour_Heading => Get(nameof(Settings_Window_Frame_Behaviour_Heading));
|
internal static string Settings_Section_PrivacyFilter => Get(nameof(Settings_Section_PrivacyFilter));
|
||||||
|
internal static string Settings_Section_Storage => Get(nameof(Settings_Section_Storage));
|
||||||
|
internal static string Settings_Section_Retention => Get(nameof(Settings_Section_Retention));
|
||||||
|
internal static string Settings_Section_Cleanup => Get(nameof(Settings_Section_Cleanup));
|
||||||
|
internal static string Settings_Section_Export => Get(nameof(Settings_Section_Export));
|
||||||
|
internal static string Settings_Section_Telemetry => Get(nameof(Settings_Section_Telemetry));
|
||||||
|
internal static string Settings_Theme_ActiveTheme => Get(nameof(Settings_Theme_ActiveTheme));
|
||||||
|
internal static string Settings_Theme_ForkAndEdit => Get(nameof(Settings_Theme_ForkAndEdit));
|
||||||
|
internal static string Settings_Theme_ForkTooltip => Get(nameof(Settings_Theme_ForkTooltip));
|
||||||
|
internal static string Settings_Theme_EditTheme => Get(nameof(Settings_Theme_EditTheme));
|
||||||
|
internal static string Settings_Theme_Editing => Get(nameof(Settings_Theme_Editing));
|
||||||
|
internal static string Settings_Theme_Group_Surfaces => Get(nameof(Settings_Theme_Group_Surfaces));
|
||||||
|
internal static string Settings_Theme_Group_Borders => Get(nameof(Settings_Theme_Group_Borders));
|
||||||
|
internal static string Settings_Theme_Group_Text => Get(nameof(Settings_Theme_Group_Text));
|
||||||
|
internal static string Settings_Theme_Group_Identity => Get(nameof(Settings_Theme_Group_Identity));
|
||||||
|
internal static string Settings_Theme_Group_Status => Get(nameof(Settings_Theme_Group_Status));
|
||||||
|
internal static string Settings_Theme_Save => Get(nameof(Settings_Theme_Save));
|
||||||
|
internal static string Settings_Theme_Cancel => Get(nameof(Settings_Theme_Cancel));
|
||||||
|
internal static string Settings_Theme_ResetToSource => Get(nameof(Settings_Theme_ResetToSource));
|
||||||
|
internal static string Settings_Theme_ResetUnavailable => Get(nameof(Settings_Theme_ResetUnavailable));
|
||||||
|
internal static string Settings_Theme_LockedTooltip => Get(nameof(Settings_Theme_LockedTooltip));
|
||||||
|
internal static string Settings_Theme_Custom => Get(nameof(Settings_Theme_Custom));
|
||||||
|
internal static string Settings_Tabs_Duplicate => Get(nameof(Settings_Tabs_Duplicate));
|
||||||
|
internal static string Settings_Theme_ForkActive => Get(nameof(Settings_Theme_ForkActive));
|
||||||
|
internal static string Settings_Theme_ImportFile => Get(nameof(Settings_Theme_ImportFile));
|
||||||
|
internal static string Settings_Theme_ImportPathHint => Get(nameof(Settings_Theme_ImportPathHint));
|
||||||
|
internal static string Settings_Theme_ExportDialogTitle => Get(nameof(Settings_Theme_ExportDialogTitle));
|
||||||
|
internal static string Settings_Theme_Category_Cool => Get(nameof(Settings_Theme_Category_Cool));
|
||||||
|
internal static string Settings_Theme_Category_Natural => Get(nameof(Settings_Theme_Category_Natural));
|
||||||
|
internal static string Settings_Theme_Category_Classic => Get(nameof(Settings_Theme_Category_Classic));
|
||||||
|
internal static string Settings_Theme_Category_Retro => Get(nameof(Settings_Theme_Category_Retro));
|
||||||
|
internal static string Settings_Fonts_Bundled => Get(nameof(Settings_Fonts_Bundled));
|
||||||
|
internal static string Settings_Fonts_GameFont => Get(nameof(Settings_Fonts_GameFont));
|
||||||
|
internal static string Settings_Fonts_Global => Get(nameof(Settings_Fonts_Global));
|
||||||
|
internal static string Settings_Fonts_Active => Get(nameof(Settings_Fonts_Active));
|
||||||
|
internal static string Settings_Preview_TypeAMessage => Get(nameof(Settings_Preview_TypeAMessage));
|
||||||
|
internal static string StatusBar_Tabs_One => Get(nameof(StatusBar_Tabs_One));
|
||||||
|
internal static string StatusBar_Tabs_Other => Get(nameof(StatusBar_Tabs_Other));
|
||||||
|
internal static string StatusBar_Tells_One => Get(nameof(StatusBar_Tells_One));
|
||||||
|
internal static string StatusBar_Tells_Other => Get(nameof(StatusBar_Tells_Other));
|
||||||
|
internal static string StatusBar_Messages => Get(nameof(StatusBar_Messages));
|
||||||
|
internal static string StatusBar_MessagesThousands => Get(nameof(StatusBar_MessagesThousands));
|
||||||
|
internal static string Settings_Preview_TitleMock => Get(nameof(Settings_Preview_TitleMock));
|
||||||
|
internal static string Settings_Preview_StatusOpen => Get(nameof(Settings_Preview_StatusOpen));
|
||||||
|
internal static string ChannelHeader_NotLoggedIn => Get(nameof(ChannelHeader_NotLoggedIn));
|
||||||
|
internal static string InputBar_More_Tooltip => Get(nameof(InputBar_More_Tooltip));
|
||||||
|
internal static string Settings_Section_Links => Get(nameof(Settings_Section_Links));
|
||||||
|
internal static string Settings_Section_Behaviour => Get(nameof(Settings_Section_Behaviour));
|
||||||
|
internal static string Settings_Section_Keybinds => Get(nameof(Settings_Section_Keybinds));
|
||||||
|
internal static string Settings_Section_Notifications => Get(nameof(Settings_Section_Notifications));
|
||||||
|
internal static string Settings_Section_DisplayModes => Get(nameof(Settings_Section_DisplayModes));
|
||||||
|
internal static string Settings_Section_History => Get(nameof(Settings_Section_History));
|
||||||
|
internal static string Settings_Section_CommandHelp => Get(nameof(Settings_Section_CommandHelp));
|
||||||
|
internal static string Settings_Section_PluginDisclosure => Get(nameof(Settings_Section_PluginDisclosure));
|
||||||
|
internal static string Settings_Section_LayoutMode => Get(nameof(Settings_Section_LayoutMode));
|
||||||
|
internal static string Settings_Section_Opacity => Get(nameof(Settings_Section_Opacity));
|
||||||
|
internal static string Settings_Section_ResizeBehaviour => Get(nameof(Settings_Section_ResizeBehaviour));
|
||||||
|
internal static string Settings_Section_TellAutoOpen => Get(nameof(Settings_Section_TellAutoOpen));
|
||||||
|
internal static string Settings_Section_Sidebar => Get(nameof(Settings_Section_Sidebar));
|
||||||
|
internal static string Settings_Section_Brand => Get(nameof(Settings_Section_Brand));
|
||||||
|
internal static string Settings_Section_Integrations => Get(nameof(Settings_Section_Integrations));
|
||||||
|
internal static string Settings_Section_Credits => Get(nameof(Settings_Section_Credits));
|
||||||
|
internal static string Settings_Section_License => Get(nameof(Settings_Section_License));
|
||||||
|
internal static string Settings_Keybinds_Hint => Get(nameof(Settings_Keybinds_Hint));
|
||||||
|
internal static string Settings_Keybinds_CycleNext => Get(nameof(Settings_Keybinds_CycleNext));
|
||||||
|
internal static string Settings_Keybinds_CyclePrevious => Get(nameof(Settings_Keybinds_CyclePrevious));
|
||||||
|
internal static string Settings_General_Language_Description => Get(nameof(Settings_General_Language_Description));
|
||||||
|
internal static string Settings_Chat_Clock24_Name => Get(nameof(Settings_Chat_Clock24_Name));
|
||||||
|
internal static string Settings_Chat_PreviousSessions_Name => Get(nameof(Settings_Chat_PreviousSessions_Name));
|
||||||
|
internal static string Settings_Chat_PreviousSessions_Description => Get(nameof(Settings_Chat_PreviousSessions_Description));
|
||||||
|
internal static string Settings_Chat_CommandHelpSide_Name => Get(nameof(Settings_Chat_CommandHelpSide_Name));
|
||||||
|
internal static string Settings_Chat_CommandHelpSide_Description => Get(nameof(Settings_Chat_CommandHelpSide_Description));
|
||||||
|
internal static string Settings_Channels_TellAutoOpenMode_Name => Get(nameof(Settings_Channels_TellAutoOpenMode_Name));
|
||||||
|
internal static string Settings_Channels_TellAutoOpenMode_Description => Get(nameof(Settings_Channels_TellAutoOpenMode_Description));
|
||||||
|
internal static string Settings_Channels_TellAutoOpen_MainWindow => Get(nameof(Settings_Channels_TellAutoOpen_MainWindow));
|
||||||
|
internal static string Settings_Channels_TellAutoOpen_Popout => Get(nameof(Settings_Channels_TellAutoOpen_Popout));
|
||||||
|
internal static string Settings_Channels_TellAutoOpen_BusyHint => Get(nameof(Settings_Channels_TellAutoOpen_BusyHint));
|
||||||
|
internal static string Settings_Channels_TellSwitchAlways_Name => Get(nameof(Settings_Channels_TellSwitchAlways_Name));
|
||||||
|
internal static string Settings_Channels_TellSwitchAlways_Description => Get(nameof(Settings_Channels_TellSwitchAlways_Description));
|
||||||
|
internal static string Settings_Window_LayoutSidebar => Get(nameof(Settings_Window_LayoutSidebar));
|
||||||
|
internal static string Settings_Window_LayoutTopTabs => Get(nameof(Settings_Window_LayoutTopTabs));
|
||||||
|
internal static string Settings_Window_TabPlacement_Name => Get(nameof(Settings_Window_TabPlacement_Name));
|
||||||
|
internal static string Settings_Window_TabPlacement_Description => Get(nameof(Settings_Window_TabPlacement_Description));
|
||||||
|
internal static string Settings_Window_TitleBar_Name => Get(nameof(Settings_Window_TitleBar_Name));
|
||||||
|
internal static string Settings_Window_PopoutTitleBar_Name => Get(nameof(Settings_Window_PopoutTitleBar_Name));
|
||||||
|
internal static string Settings_Window_StatusBar_Name => Get(nameof(Settings_Window_StatusBar_Name));
|
||||||
|
internal static string Settings_SuggestedBy => Get(nameof(Settings_SuggestedBy));
|
||||||
|
internal static string Settings_Window_AllowMove_Name => Get(nameof(Settings_Window_AllowMove_Name));
|
||||||
|
internal static string Settings_Window_AllowResize_Name => Get(nameof(Settings_Window_AllowResize_Name));
|
||||||
|
internal static string Settings_Window_SidebarThreshold_Name => Get(nameof(Settings_Window_SidebarThreshold_Name));
|
||||||
|
internal static string Settings_Window_SidebarThreshold_Description => Get(nameof(Settings_Window_SidebarThreshold_Description));
|
||||||
|
internal static string Settings_Window_PreviewPosition_Name => Get(nameof(Settings_Window_PreviewPosition_Name));
|
||||||
|
internal static string Settings_Window_PreviewOnlyTyping_Name => Get(nameof(Settings_Window_PreviewOnlyTyping_Name));
|
||||||
|
internal static string Settings_About_GiteaRepo => Get(nameof(Settings_About_GiteaRepo));
|
||||||
|
internal static string Settings_About_CustomRepo => Get(nameof(Settings_About_CustomRepo));
|
||||||
|
internal static string Settings_Section_AutoTranslate => Get(nameof(Settings_Section_AutoTranslate));
|
||||||
|
internal static string Settings_Telemetry_None => Get(nameof(Settings_Telemetry_None));
|
||||||
|
internal static string Settings_Section_Database => Get(nameof(Settings_Section_Database));
|
||||||
|
|
||||||
// Hellion Chat — v1.2.1 Migration v15 → v16 toast
|
// Hellion Chat — v1.2.1 Migration v15 → v16 toast
|
||||||
internal static string Migration_v16_OverrideStyle_Toast => Get(nameof(Migration_v16_OverrideStyle_Toast));
|
|
||||||
|
|
||||||
// Hellion Chat — v1.3.0 Integrations tab (Honorific + Coming-Soon roadmap)
|
// Hellion Chat — v1.3.0 Integrations (Honorific + Coming-Soon roadmap) — now in About tab
|
||||||
internal static string Settings_Tab_Integrations => Get(nameof(Settings_Tab_Integrations));
|
|
||||||
internal static string Settings_Integrations_Intro => Get(nameof(Settings_Integrations_Intro));
|
internal static string Settings_Integrations_Intro => Get(nameof(Settings_Integrations_Intro));
|
||||||
internal static string Settings_Integrations_Honorific_SectionHeader => Get(nameof(Settings_Integrations_Honorific_SectionHeader));
|
internal static string Settings_Integrations_Honorific_SectionHeader => Get(nameof(Settings_Integrations_Honorific_SectionHeader));
|
||||||
internal static string Settings_Integrations_Honorific_Status_Detected => Get(nameof(Settings_Integrations_Honorific_Status_Detected));
|
internal static string Settings_Integrations_Honorific_Status_Detected => Get(nameof(Settings_Integrations_Honorific_Status_Detected));
|
||||||
@@ -407,4 +479,107 @@ internal class HellionStrings
|
|||||||
internal static string DbViewer_FullTextToggle => Get(nameof(DbViewer_FullTextToggle));
|
internal static string DbViewer_FullTextToggle => Get(nameof(DbViewer_FullTextToggle));
|
||||||
internal static string DbViewer_FullTextToggle_Hint_Indexing => Get(nameof(DbViewer_FullTextToggle_Hint_Indexing));
|
internal static string DbViewer_FullTextToggle_Hint_Indexing => Get(nameof(DbViewer_FullTextToggle_Hint_Indexing));
|
||||||
internal static string DbViewer_FullTextToggle_Hint_PhraseMode => Get(nameof(DbViewer_FullTextToggle_Hint_PhraseMode));
|
internal static string DbViewer_FullTextToggle_Hint_PhraseMode => Get(nameof(DbViewer_FullTextToggle_Hint_PhraseMode));
|
||||||
|
|
||||||
|
// Hellion Chat — v1.5.4 header quick-picker + reduce-motion toggle
|
||||||
|
internal static string Settings_QuickPicker_Tooltip => Get(nameof(Settings_QuickPicker_Tooltip));
|
||||||
|
|
||||||
|
internal static string InputBar_InsertSymbol_Tooltip =>
|
||||||
|
Get(nameof(InputBar_InsertSymbol_Tooltip));
|
||||||
|
|
||||||
|
internal static string InputBar_Settings_Tooltip => Get(nameof(InputBar_Settings_Tooltip));
|
||||||
|
|
||||||
|
internal static string InputBar_HideChat_Tooltip => Get(nameof(InputBar_HideChat_Tooltip));
|
||||||
|
internal static string InputBar_PopIn_Tooltip => Get(nameof(InputBar_PopIn_Tooltip));
|
||||||
|
internal static string Settings_QuickPicker_Themes_Header => Get(nameof(Settings_QuickPicker_Themes_Header));
|
||||||
|
internal static string Settings_QuickPicker_Tabs_Header => Get(nameof(Settings_QuickPicker_Tabs_Header));
|
||||||
|
internal static string Settings_ThemeAndLayout_ReduceMotion_Name => Get(nameof(Settings_ThemeAndLayout_ReduceMotion_Name));
|
||||||
|
internal static string Settings_ThemeAndLayout_ReduceMotion_Description => Get(nameof(Settings_ThemeAndLayout_ReduceMotion_Description));
|
||||||
|
|
||||||
|
// Failed-tell notification
|
||||||
|
internal static string FailedTell_Notification_Generic => Get(nameof(FailedTell_Notification_Generic));
|
||||||
|
internal static string FailedTell_Notification_Named => Get(nameof(FailedTell_Notification_Named));
|
||||||
|
internal static string Settings_Chat_NotifyFailedTell_Name => Get(nameof(Settings_Chat_NotifyFailedTell_Name));
|
||||||
|
internal static string Settings_Chat_NotifyFailedTell_Description => Get(nameof(Settings_Chat_NotifyFailedTell_Description));
|
||||||
|
|
||||||
|
// Per-tab notification sound
|
||||||
|
internal static string Tabs_NotificationSound_Enable_Name => Get(nameof(Tabs_NotificationSound_Enable_Name));
|
||||||
|
internal static string Tabs_NotificationSound_Description => Get(nameof(Tabs_NotificationSound_Description));
|
||||||
|
internal static string Tabs_NotificationSound_Option => Get(nameof(Tabs_NotificationSound_Option));
|
||||||
|
internal static string Tabs_NotificationSound_Preview => Get(nameof(Tabs_NotificationSound_Preview));
|
||||||
|
internal static string Tabs_NotificationSound_CustomOption => Get(nameof(Tabs_NotificationSound_CustomOption));
|
||||||
|
internal static string Tabs_Close_MenuItem => Get(nameof(Tabs_Close_MenuItem));
|
||||||
|
internal static string Tabs_Close_UnpinFirst => Get(nameof(Tabs_Close_UnpinFirst));
|
||||||
|
internal static string Tabs_Close_LastTab => Get(nameof(Tabs_Close_LastTab));
|
||||||
|
|
||||||
|
// Scroll-to-bottom and item/flag linking
|
||||||
|
internal static string ChatLog_ScrollToBottom_Tooltip => Get(nameof(ChatLog_ScrollToBottom_Tooltip));
|
||||||
|
internal static string ChatLog_Insert_MapFlag => Get(nameof(ChatLog_Insert_MapFlag));
|
||||||
|
internal static string ChatLog_Insert_ItemLink => Get(nameof(ChatLog_Insert_ItemLink));
|
||||||
|
|
||||||
|
// v1.5.6: plugin-disclosure warning
|
||||||
|
internal static string Settings_Chat_NotifyPluginDisclosure_Name => Get(nameof(Settings_Chat_NotifyPluginDisclosure_Name));
|
||||||
|
internal static string Settings_Chat_NotifyPluginDisclosure_Description => Get(nameof(Settings_Chat_NotifyPluginDisclosure_Description));
|
||||||
|
internal static string ChatInput_PluginDisclosure_Warning => Get(nameof(ChatInput_PluginDisclosure_Warning));
|
||||||
|
|
||||||
|
// v1.5.6: world suffix + name format display options
|
||||||
|
internal static string Settings_Chat_WorldSuffix_Name => Get(nameof(Settings_Chat_WorldSuffix_Name));
|
||||||
|
internal static string Settings_Chat_WorldSuffix_Description => Get(nameof(Settings_Chat_WorldSuffix_Description));
|
||||||
|
internal static string Settings_Chat_NameForm_Name => Get(nameof(Settings_Chat_NameForm_Name));
|
||||||
|
internal static string Settings_Chat_NameForm_Description => Get(nameof(Settings_Chat_NameForm_Description));
|
||||||
|
internal static string NameDisplay_WorldSuffix_Never => Get(nameof(NameDisplay_WorldSuffix_Never));
|
||||||
|
internal static string NameDisplay_WorldSuffix_OtherWorldOnly => Get(nameof(NameDisplay_WorldSuffix_OtherWorldOnly));
|
||||||
|
internal static string NameDisplay_WorldSuffix_Always => Get(nameof(NameDisplay_WorldSuffix_Always));
|
||||||
|
internal static string NameDisplay_NameForm_Full => Get(nameof(NameDisplay_NameForm_Full));
|
||||||
|
internal static string NameDisplay_NameForm_FirstNameOnly => Get(nameof(NameDisplay_NameForm_FirstNameOnly));
|
||||||
|
internal static string NameDisplay_NameForm_Initials => Get(nameof(NameDisplay_NameForm_Initials));
|
||||||
|
|
||||||
|
// v1.5.6: inactive window opacity
|
||||||
|
internal static string Settings_ThemeAndLayout_WindowOpacityInactive_Name => Get(nameof(Settings_ThemeAndLayout_WindowOpacityInactive_Name));
|
||||||
|
internal static string Settings_ThemeAndLayout_WindowOpacityInactive_Description => Get(nameof(Settings_ThemeAndLayout_WindowOpacityInactive_Description));
|
||||||
|
|
||||||
|
// v1.5.6: custom sound volume
|
||||||
|
internal static string Settings_General_CustomSoundVolume_Name => Get(nameof(Settings_General_CustomSoundVolume_Name));
|
||||||
|
internal static string Settings_General_CustomSoundVolume_Description => Get(nameof(Settings_General_CustomSoundVolume_Description));
|
||||||
|
|
||||||
|
// v1.5.6: General tab collapsible section titles
|
||||||
|
internal static string Settings_Section_Input => Get(nameof(Settings_Section_Input));
|
||||||
|
internal static string Settings_Section_Sound => Get(nameof(Settings_Section_Sound));
|
||||||
|
internal static string Settings_Section_Language => Get(nameof(Settings_Section_Language));
|
||||||
|
internal static string Settings_Section_Performance => Get(nameof(Settings_Section_Performance));
|
||||||
|
internal static string Settings_Section_Sound_TabsHint => Get(nameof(Settings_Section_Sound_TabsHint));
|
||||||
|
|
||||||
|
// v1.5.6: Chat tab collapsible section titles
|
||||||
|
internal static string Settings_Section_Messages => Get(nameof(Settings_Section_Messages));
|
||||||
|
internal static string Settings_Section_InputPreview => Get(nameof(Settings_Section_InputPreview));
|
||||||
|
internal static string Settings_Section_AutoTellTabs => Get(nameof(Settings_Section_AutoTellTabs));
|
||||||
|
internal static string Settings_Section_LinksTooltips => Get(nameof(Settings_Section_LinksTooltips));
|
||||||
|
internal static string Settings_Section_NoviceNetwork => Get(nameof(Settings_Section_NoviceNetwork));
|
||||||
|
|
||||||
|
// v1.5.6: Appearance tab collapsible section titles
|
||||||
|
internal static string Settings_Section_Theme => Get(nameof(Settings_Section_Theme));
|
||||||
|
internal static string Settings_Section_Fonts => Get(nameof(Settings_Section_Fonts));
|
||||||
|
internal static string Settings_Section_Colours => Get(nameof(Settings_Section_Colours));
|
||||||
|
internal static string Settings_Section_WindowStyle => Get(nameof(Settings_Section_WindowStyle));
|
||||||
|
internal static string Settings_Section_Timestamps => Get(nameof(Settings_Section_Timestamps));
|
||||||
|
internal static string Settings_Section_Animations => Get(nameof(Settings_Section_Animations));
|
||||||
|
|
||||||
|
// v1.5.6: Window tab collapsible section titles
|
||||||
|
internal static string Settings_Section_Hide => Get(nameof(Settings_Section_Hide));
|
||||||
|
internal static string Settings_Section_InactivityHide => Get(nameof(Settings_Section_InactivityHide));
|
||||||
|
internal static string Settings_Section_Frame => Get(nameof(Settings_Section_Frame));
|
||||||
|
|
||||||
|
// v1.5.6: Tabs tab per-tab-item sub-section titles
|
||||||
|
internal static string Settings_Section_Tab_Channels => Get(nameof(Settings_Section_Tab_Channels));
|
||||||
|
internal static string Settings_Section_Tab_Display => Get(nameof(Settings_Section_Tab_Display));
|
||||||
|
internal static string Settings_Section_Tab_Notification => Get(nameof(Settings_Section_Tab_Notification));
|
||||||
|
internal static string Settings_Section_Tab_Input => Get(nameof(Settings_Section_Tab_Input));
|
||||||
|
internal static string Settings_Section_Tab_PopOut => Get(nameof(Settings_Section_Tab_PopOut));
|
||||||
|
internal static string Settings_Section_Tab_Volume_AllTabsHint => Get(nameof(Settings_Section_Tab_Volume_AllTabsHint));
|
||||||
|
|
||||||
|
// v1.5.6: About tab collapsible section titles
|
||||||
|
internal static string Settings_Section_Extensions => Get(nameof(Settings_Section_Extensions));
|
||||||
|
internal static string Settings_Section_PluginInfo => Get(nameof(Settings_Section_PluginInfo));
|
||||||
|
internal static string Settings_Section_Project => Get(nameof(Settings_Section_Project));
|
||||||
|
internal static string Settings_Section_Translators => Get(nameof(Settings_Section_Translators));
|
||||||
|
internal static string Settings_Section_Changelog => Get(nameof(Settings_Section_Changelog));
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user